Showing
2 changed files
with
13 additions
and
21 deletions
| 1 | package com.erry.iclear.dateInterface.interceptor; | 1 | package com.erry.iclear.dateInterface.interceptor; |
| 2 | 2 | ||
| 3 | import com.alibaba.fastjson.JSON; | 3 | import com.alibaba.fastjson.JSON; |
| 4 | -import com.erry.iclear.dateInterface.api.response.ResultHsCode; | ||
| 5 | -import com.erry.iclear.dateInterface.entity.AppInfo; | ||
| 6 | import com.erry.iclear.dateInterface.enums.ErrorCodeEnum; | 4 | import com.erry.iclear.dateInterface.enums.ErrorCodeEnum; |
| 7 | -import com.erry.iclear.dateInterface.repository.AppInfoRepository; | 5 | +import com.erry.iclear.dateInterface.api.response.ResultHsCode; |
| 6 | +import com.erry.iclear.dateInterface.common.Constant; | ||
| 8 | import com.erry.iclear.dateInterface.util.SHA256Util; | 7 | import com.erry.iclear.dateInterface.util.SHA256Util; |
| 9 | import lombok.extern.slf4j.Slf4j; | 8 | import lombok.extern.slf4j.Slf4j; |
| 10 | import org.apache.commons.lang3.StringUtils; | 9 | import org.apache.commons.lang3.StringUtils; |
| 11 | -import org.springframework.beans.factory.annotation.Autowired; | ||
| 12 | import org.springframework.stereotype.Component; | 10 | import org.springframework.stereotype.Component; |
| 13 | import org.springframework.web.servlet.ModelAndView; | 11 | import org.springframework.web.servlet.ModelAndView; |
| 14 | import org.springframework.web.servlet.handler.HandlerInterceptorAdapter; | 12 | import org.springframework.web.servlet.handler.HandlerInterceptorAdapter; |
| ... | @@ -17,6 +15,7 @@ import javax.servlet.http.HttpServletRequest; | ... | @@ -17,6 +15,7 @@ import javax.servlet.http.HttpServletRequest; |
| 17 | import javax.servlet.http.HttpServletResponse; | 15 | import javax.servlet.http.HttpServletResponse; |
| 18 | import java.io.IOException; | 16 | import java.io.IOException; |
| 19 | import java.io.PrintWriter; | 17 | import java.io.PrintWriter; |
| 18 | +import java.util.HashMap; | ||
| 20 | 19 | ||
| 21 | /** | 20 | /** |
| 22 | * @author Administrator | 21 | * @author Administrator |
| ... | @@ -24,8 +23,6 @@ import java.io.PrintWriter; | ... | @@ -24,8 +23,6 @@ import java.io.PrintWriter; |
| 24 | @Component | 23 | @Component |
| 25 | @Slf4j | 24 | @Slf4j |
| 26 | public class HsCodeInterceptor extends HandlerInterceptorAdapter { | 25 | public class HsCodeInterceptor extends HandlerInterceptorAdapter { |
| 27 | - @Autowired | ||
| 28 | - private AppInfoRepository appInfoRepository; | ||
| 29 | 26 | ||
| 30 | @Override | 27 | @Override |
| 31 | public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object o) throws Exception { | 28 | public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object o) throws Exception { |
| ... | @@ -57,14 +54,13 @@ public class HsCodeInterceptor extends HandlerInterceptorAdapter { | ... | @@ -57,14 +54,13 @@ public class HsCodeInterceptor extends HandlerInterceptorAdapter { |
| 57 | return false; | 54 | return false; |
| 58 | } | 55 | } |
| 59 | 56 | ||
| 60 | -// HashMap<String,String> secretMap = Constant.appIdSecurityCache.get(appId); | 57 | + HashMap<String,String> secretMap = Constant.appIdSecurityCache.get(appId); |
| 61 | - AppInfo oneEnableAppInfo = appInfoRepository.getOneEnableAppInfo(appId); | 58 | + if(secretMap==null){ |
| 62 | - if(oneEnableAppInfo==null){ | ||
| 63 | this.returnJson(response,false,ErrorCodeEnum.ERROR_10001.getCode(),ErrorCodeEnum.ERROR_10001.getName()); | 59 | this.returnJson(response,false,ErrorCodeEnum.ERROR_10001.getCode(),ErrorCodeEnum.ERROR_10001.getName()); |
| 64 | return false; | 60 | return false; |
| 65 | } | 61 | } |
| 66 | 62 | ||
| 67 | - String secretInSys = oneEnableAppInfo.getSecurity(); | 63 | + String secretInSys = secretMap.get(appkey); |
| 68 | if (StringUtils.isBlank(secretInSys)) { | 64 | if (StringUtils.isBlank(secretInSys)) { |
| 69 | this.returnJson(response,false,ErrorCodeEnum.ERROR_10002.getCode(),ErrorCodeEnum.ERROR_10002.getName()); | 65 | this.returnJson(response,false,ErrorCodeEnum.ERROR_10002.getCode(),ErrorCodeEnum.ERROR_10002.getName()); |
| 70 | return false; | 66 | return false; | ... | ... |
| 1 | package com.erry.iclear.dateInterface.interceptor; | 1 | package com.erry.iclear.dateInterface.interceptor; |
| 2 | 2 | ||
| 3 | import com.alibaba.fastjson.JSON; | 3 | import com.alibaba.fastjson.JSON; |
| 4 | -import com.erry.iclear.dateInterface.api.response.ResultRS; | ||
| 5 | -import com.erry.iclear.dateInterface.entity.AppInfo; | ||
| 6 | import com.erry.iclear.dateInterface.enums.ErrorCodeEnum; | 4 | import com.erry.iclear.dateInterface.enums.ErrorCodeEnum; |
| 7 | -import com.erry.iclear.dateInterface.repository.AppInfoRepository; | 5 | +import com.erry.iclear.dateInterface.api.response.ResultRS; |
| 6 | +import com.erry.iclear.dateInterface.common.Constant; | ||
| 8 | import com.erry.iclear.dateInterface.util.SHA256Util; | 7 | import com.erry.iclear.dateInterface.util.SHA256Util; |
| 9 | import lombok.extern.slf4j.Slf4j; | 8 | import lombok.extern.slf4j.Slf4j; |
| 10 | import org.apache.commons.lang3.StringUtils; | 9 | import org.apache.commons.lang3.StringUtils; |
| 11 | -import org.springframework.beans.factory.annotation.Autowired; | ||
| 12 | import org.springframework.stereotype.Component; | 10 | import org.springframework.stereotype.Component; |
| 13 | import org.springframework.web.servlet.ModelAndView; | 11 | import org.springframework.web.servlet.ModelAndView; |
| 14 | import org.springframework.web.servlet.handler.HandlerInterceptorAdapter; | 12 | import org.springframework.web.servlet.handler.HandlerInterceptorAdapter; |
| ... | @@ -17,6 +15,7 @@ import javax.servlet.http.HttpServletRequest; | ... | @@ -17,6 +15,7 @@ import javax.servlet.http.HttpServletRequest; |
| 17 | import javax.servlet.http.HttpServletResponse; | 15 | import javax.servlet.http.HttpServletResponse; |
| 18 | import java.io.IOException; | 16 | import java.io.IOException; |
| 19 | import java.io.PrintWriter; | 17 | import java.io.PrintWriter; |
| 18 | +import java.util.HashMap; | ||
| 20 | 19 | ||
| 21 | /** | 20 | /** |
| 22 | * @author Administrator | 21 | * @author Administrator |
| ... | @@ -24,8 +23,7 @@ import java.io.PrintWriter; | ... | @@ -24,8 +23,7 @@ import java.io.PrintWriter; |
| 24 | @Component | 23 | @Component |
| 25 | @Slf4j | 24 | @Slf4j |
| 26 | public class SignInterceptor extends HandlerInterceptorAdapter { | 25 | public class SignInterceptor extends HandlerInterceptorAdapter { |
| 27 | - @Autowired | 26 | + |
| 28 | - private AppInfoRepository appInfoRepository; | ||
| 29 | @Override | 27 | @Override |
| 30 | public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object o) throws Exception { | 28 | public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object o) throws Exception { |
| 31 | String appId = (String) request.getHeader("Appid"); | 29 | String appId = (String) request.getHeader("Appid"); |
| ... | @@ -57,15 +55,13 @@ public class SignInterceptor extends HandlerInterceptorAdapter { | ... | @@ -57,15 +55,13 @@ public class SignInterceptor extends HandlerInterceptorAdapter { |
| 57 | return false; | 55 | return false; |
| 58 | } | 56 | } |
| 59 | 57 | ||
| 60 | -// HashMap<String,String> secretMap = Constant.appIdSecurityCache.get(appId); | 58 | + HashMap<String,String> secretMap = Constant.appIdSecurityCache.get(appId); |
| 61 | - AppInfo oneEnableAppInfo = appInfoRepository.getOneEnableAppInfo(appId); | 59 | + if(secretMap==null){ |
| 62 | - | ||
| 63 | - if(oneEnableAppInfo==null){ | ||
| 64 | this.returnJson(response,false,ErrorCodeEnum.ERROR_10001.getCode(),ErrorCodeEnum.ERROR_10001.getName()); | 60 | this.returnJson(response,false,ErrorCodeEnum.ERROR_10001.getCode(),ErrorCodeEnum.ERROR_10001.getName()); |
| 65 | return false; | 61 | return false; |
| 66 | } | 62 | } |
| 67 | 63 | ||
| 68 | - String secretInSys = oneEnableAppInfo.getSecurity(); | 64 | + String secretInSys = secretMap.get(appkey); |
| 69 | if (StringUtils.isBlank(secretInSys)) { | 65 | if (StringUtils.isBlank(secretInSys)) { |
| 70 | this.returnJson(response,false,ErrorCodeEnum.ERROR_10002.getCode(),ErrorCodeEnum.ERROR_10002.getName()); | 66 | this.returnJson(response,false,ErrorCodeEnum.ERROR_10002.getCode(),ErrorCodeEnum.ERROR_10002.getName()); |
| 71 | return false; | 67 | return false; | ... | ... |
-
Please register or login to post a comment