|
@@ -1,28 +1,27 @@
|
|
|
package cn.efunbox.audio.controller;
|
|
|
|
|
|
-import cn.efunbox.audio.consts.Const;
|
|
|
+import cn.efunbox.audio.consts.Consts;
|
|
|
import cn.efunbox.audio.entity.Admin;
|
|
|
-import cn.efunbox.audio.entity.Channel;
|
|
|
import cn.efunbox.audio.service.AdminService;
|
|
|
-import cn.efunbox.audio.service.ChannelService;
|
|
|
import cn.efunbox.audio.util.ApiCode;
|
|
|
import cn.efunbox.audio.util.Common;
|
|
|
import cn.efunbox.audio.util.HttpUtil;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
-import org.apache.tomcat.util.security.MD5Encoder;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
+import org.springframework.beans.factory.annotation.Value;
|
|
|
import org.springframework.data.redis.core.StringRedisTemplate;
|
|
|
import org.springframework.data.redis.core.ValueOperations;
|
|
|
import org.springframework.web.bind.annotation.RequestMapping;
|
|
|
import org.springframework.web.bind.annotation.RequestMethod;
|
|
|
import org.springframework.web.bind.annotation.RestController;
|
|
|
-import sun.security.provider.MD5;
|
|
|
-import sun.security.rsa.RSASignature;
|
|
|
|
|
|
import javax.servlet.http.HttpServletRequest;
|
|
|
import javax.servlet.http.HttpServletResponse;
|
|
|
+import java.text.SimpleDateFormat;
|
|
|
+import java.util.Date;
|
|
|
import java.util.List;
|
|
|
import java.util.UUID;
|
|
|
+import java.util.concurrent.TimeUnit;
|
|
|
|
|
|
/**
|
|
|
* Created by yao on 17-9-26.
|
|
@@ -36,6 +35,8 @@ public class AdminController {
|
|
|
AdminService adminService;
|
|
|
@Autowired
|
|
|
StringRedisTemplate stringRedisTemplate;
|
|
|
+ @Value("${admin.token.expire}")
|
|
|
+ int tokenExpire = 24*30;
|
|
|
|
|
|
@RequestMapping(value = "/login" ,method = RequestMethod.POST)
|
|
|
public void Search(HttpServletRequest request, HttpServletResponse response){
|
|
@@ -55,7 +56,7 @@ public class AdminController {
|
|
|
// System.out.println(pwdMD5);
|
|
|
// System.out.println(admin.getPwd());
|
|
|
if(pwdMD5.equalsIgnoreCase(admin.getPwd())){
|
|
|
- String token = UUID.randomUUID().toString().substring(0, 16);
|
|
|
+ String token = UUID.randomUUID().toString().replaceAll("-","");
|
|
|
admin.setToken(token);
|
|
|
adminService.Update(admin);
|
|
|
admin.setPwd("");
|
|
@@ -79,8 +80,8 @@ public class AdminController {
|
|
|
}
|
|
|
if(idChannel==null || idChannel.length()==0)
|
|
|
idChannel = "0";
|
|
|
- String salt = UUID.randomUUID().toString().substring(0, 16);
|
|
|
- String token = UUID.randomUUID().toString().substring(0, 16);
|
|
|
+ String salt = UUID.randomUUID().toString().replaceAll("-","");
|
|
|
+ String token = UUID.randomUUID().toString().replaceAll("-", "");
|
|
|
String pwdMD5 = Common.getMD5(Common.getMD5(pwd) + salt);
|
|
|
|
|
|
List<Admin> list = adminService.SearchByName(name);
|
|
@@ -107,6 +108,6 @@ public class AdminController {
|
|
|
*/
|
|
|
public void SaveRedis(Admin admin){
|
|
|
ValueOperations valueOperations = stringRedisTemplate.opsForValue();
|
|
|
- valueOperations.set(Const.REDIS_ADMIN+admin.getId(), admin.getToken());
|
|
|
+ valueOperations.set(Consts.REDIS_ADMIN+admin.getId(), admin.getToken(), tokenExpire*3600, TimeUnit.SECONDS);
|
|
|
}
|
|
|
}
|