|
|
@@ -1,5 +1,6 @@
|
|
|
package com.uas.eis.core.support;
|
|
|
|
|
|
+import com.uas.eis.core.config.SpObserver;
|
|
|
import com.uas.eis.core.support.TokenProperties;
|
|
|
import com.uas.eis.dao.BaseDao;
|
|
|
import com.uas.eis.entity.ErrorMessage;
|
|
|
@@ -38,10 +39,10 @@ public class ApiSignLoginInterceptor extends HandlerInterceptorAdapter {
|
|
|
String timestamp = request.getHeader(TIMESTAMP_KEY);
|
|
|
String accessKey = request.getHeader(ACCESS_KEY);
|
|
|
String requestId = request.getHeader(RequestId);
|
|
|
-
|
|
|
+ // System.out.println("master:"+SpObserver.getSp());
|
|
|
//String accessSecret = tokenConfig.get(accessKey);
|
|
|
//改用中心账套表取账户密码
|
|
|
- Object accessSecret_O = baseDao.getFieldDataByCondition("APIEMPLOYEE", "AE_SECRET", "AE_KEY='" + accessKey + "'");
|
|
|
+ Object accessSecret_O = baseDao.getFieldDataByCondition("APIEMPLOYEE1", "AE_SECRET", "AE_KEY='" + accessKey + "'");
|
|
|
String accessSecret = accessSecret_O == null ? "" : accessSecret_O.toString();
|
|
|
|
|
|
if (!StringUtils.isNumeric(timestamp)) {
|
|
|
@@ -71,9 +72,9 @@ public class ApiSignLoginInterceptor extends HandlerInterceptorAdapter {
|
|
|
throw new ApiSystemException(apiResult);
|
|
|
}
|
|
|
|
|
|
- /* String uuid = UUID.randomUUID().toString().trim().replaceAll("-", "");
|
|
|
+ /* String uuid = UUID.randomUUID().toString().trim().replaceAll("-", "");
|
|
|
String s = UUID.randomUUID().toString();
|
|
|
- System.out.println("uuid"+s);*/
|
|
|
+ System.out.println("uuid:"+s);*/
|
|
|
|
|
|
String regex = "^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$";
|
|
|
if (!requestId.matches(regex)) {
|
|
|
@@ -103,7 +104,11 @@ public class ApiSignLoginInterceptor extends HandlerInterceptorAdapter {
|
|
|
String originSign = request.getHeader(SIGN_KEY);
|
|
|
String sign = createSign(params, accessSecret);
|
|
|
System.out.println(sign);
|
|
|
-
|
|
|
+ //createSign(params, accessSecret);
|
|
|
+ /* params.put(ACCESS_KEY,"test");
|
|
|
+ params.put(RequestId,"741fef41-ffc5-445f-b427d79278954b7");
|
|
|
+ params.put(TIMESTAMP_KEY,"1636710550042");
|
|
|
+ System.out.println("sign23:"+createSign(params, "testsecret1"));*/
|
|
|
return sign.equals(originSign);
|
|
|
}
|
|
|
|
|
|
@@ -129,8 +134,10 @@ public class ApiSignLoginInterceptor extends HandlerInterceptorAdapter {
|
|
|
}
|
|
|
temp.append("&").append(ACCESS_SECRET).append("=").append(accessSecret);
|
|
|
System.out.println(temp);
|
|
|
- System.out.println(MD5Util.encrypt32Up(temp.toString()));
|
|
|
+ //System.out.println(MD5Util.encrypt32Up(temp.toString()));
|
|
|
// System.out.println(MD5Util.getEncryption(temp.toString()));
|
|
|
+ // MD5( MD5(ApiKey + TimeStamp) + TimeStamp ) + TimeStamp
|
|
|
+ //System.out.println(MD5Util.encrypt32Up(MD5Util.encrypt32Up("EB13E138889143D6AC6C52AECC7F1FEA"+"1722908868436")+"1722908868436"));
|
|
|
return MD5Util.encrypt32Up(temp.toString()).toUpperCase();
|
|
|
}
|
|
|
}
|