Merge branch 'dev' of http://180.168.156.212:2903/wanjianbin/kyb-search into dev

src/main/java/com/cesgroup/kingkong/interceptor/TokenInterceptor.java

@@ -45,6 +45,7 @@ public class TokenInterceptor implements HandlerInterceptor {
     @Override
     public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
         log.info("--------------------HTTP BEGIN, PREHANDLE BEGIN--------------------");
+        log.info("--------------------REQUEST FROM: {}", ApiResultUtil.getUserIP(request));
         log.info("--------------------REQUEST URI IS: {}", request.getRequestURI());
         log.info("--------------------PARAMS BEGIN--------------------");
         Map<String, String[]> paramsMap = request.getParameterMap();

src/main/java/com/cesgroup/kingkong/web/TokenController.java

@@ -31,6 +31,9 @@ public class TokenController extends BaseServiceController<IPCheckEntity, IPChec
     public ApiResponse getToken(HttpServletRequest request){
         String ip = ApiResultUtil.getUserIP(request);
         IPCheckEntity ipCheckEntity = this.service.getOne(new QueryWrapper<IPCheckEntity>().eq("ip_address", ip));
+        if(ipCheckEntity == null){
+            return ApiResultUtil.getApiResponse(null, ApiResponseEnum.AUTH_IP_ERROR);
+        }
         JwtUser user = new JwtUser();
         user.setId(ipCheckEntity.getId().toString());
         user.setUserName(ip);

src/main/resources/application.properties

-spring.profiles.active=dev
\ No newline at end of file
+spring.profiles.active=dev
+logging.path=./ 
+logging.file=search.log
+logging.level.root=INFO
+logging.pattern.console=%d{yyyy/MM/dd-HH:mm:ss} [%thread] %-5level %logger- %msg%n 
+logging.pattern.file=%d{yyyy/MM/dd-HH:mm} [%thread] %-5level %logger- %msg%n
\ No newline at end of file