wei.zhou

提交代码

...@@ -29,43 +29,45 @@ public class SignInterceptor extends HandlerInterceptorAdapter { ...@@ -29,43 +29,45 @@ public class SignInterceptor extends HandlerInterceptorAdapter {
29 String timeStamp = (String) request.getHeader("TimeStamp"); 29 String timeStamp = (String) request.getHeader("TimeStamp");
30 String token = (String) request.getHeader("token"); 30 String token = (String) request.getHeader("token");
31 31
32 + //TODO 增加请求路径是否在权限里的判断
33 + //String uri = request.getRequestURI();
34 +
35 +
32 if(StringUtils.isBlank(appId)){ 36 if(StringUtils.isBlank(appId)){
33 - this.returnJson(response,false,"-1","Appid 不能为空"); 37 + this.returnJson(response,false,"10016","Appid 不能为空");
34 return false; 38 return false;
35 } 39 }
36 40
37 if(StringUtils.isBlank(appkey)){ 41 if(StringUtils.isBlank(appkey)){
38 - this.returnJson(response,false,"-2","Appkey 不能为空"); 42 + this.returnJson(response,false,"10017","Appkey 不能为空");
39 return false; 43 return false;
40 } 44 }
41 45
42 if(StringUtils.isBlank(timeStamp)){ 46 if(StringUtils.isBlank(timeStamp)){
43 - this.returnJson(response,false,"-6","TimeStamp 不能为空"); 47 + this.returnJson(response,false,"10018","TimeStamp 不能为空");
44 return false; 48 return false;
45 } 49 }
46 50
47 if(StringUtils.isBlank(token)){ 51 if(StringUtils.isBlank(token)){
48 - this.returnJson(response,false,"-4","token 不能为空"); 52 + this.returnJson(response,false,"10013","token 不能为空");
49 return false; 53 return false;
50 } 54 }
51 55
52 -
53 HashMap<String,String> secretMap = Constant.appIdSecurityCache.get(appId); 56 HashMap<String,String> secretMap = Constant.appIdSecurityCache.get(appId);
54 if(secretMap==null){ 57 if(secretMap==null){
55 - this.returnJson(response,false,"-100","系统异常,该appId没有注册"); 58 + this.returnJson(response,false,"10001","系统异常,该appId没有注册");
56 return false; 59 return false;
57 } 60 }
58 61
59 String secretInSys = secretMap.get(appkey); 62 String secretInSys = secretMap.get(appkey);
60 if (StringUtils.isBlank(secretInSys)) { 63 if (StringUtils.isBlank(secretInSys)) {
61 - this.returnJson(response,false,"-101","系统异常,该appId没有权限/密码"); 64 + this.returnJson(response,false,"10002","系统异常,该appId没有当前Appkey的权限");
62 return false; 65 return false;
63 } 66 }
64 67
65 -
66 String sha256Str = SHA256Util.getSHA256String(appId+appkey+secretInSys+timeStamp); 68 String sha256Str = SHA256Util.getSHA256String(appId+appkey+secretInSys+timeStamp);
67 if(!token.equals(sha256Str)){ 69 if(!token.equals(sha256Str)){
68 - this.returnJson(response,false,"-4","Token验证失败"); 70 + this.returnJson(response,false,"10014","Token验证失败");
69 return false; 71 return false;
70 } 72 }
71 73
......