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