重庆14个市局通用接口、增加ip限制提交

common/service_base/src/main/java/com/founder/servicebase/interceptor/TokenInterceptor.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.founder.commonutils.Exception.TokenException;
 import com.founder.commonutils.model.newPublicEntity.*;
 import com.founder.commonutils.util.JwtUser;
+import com.founder.commonutils.util.NetworkUtil;
 import com.founder.commonutils.util.ResultUtil;
 import com.founder.servicebase.service.SkServiceApplyService;
 import com.founder.servicebase.service.SkServiceService;
@@ -22,6 +23,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * @author jlt
@@ -82,7 +84,7 @@ public class TokenInterceptor implements HandlerInterceptor {
                 JSONObject object = new JSONObject(sub);
                 ThirdToken token = new ThirdToken(object);
                 System.out.println(token);
-                str = verifyToken(token);
+                str = verifyToken(request,token);
                 if (str.equals("")) {
                     name = token.getServiceName();
                     return true;
@@ -163,11 +165,15 @@ public class TokenInterceptor implements HandlerInterceptor {
     /**
      * 校验第三方token
      */
-    public String verifyToken(ThirdToken token) {
+    public String verifyToken(HttpServletRequest request,ThirdToken token) {
         String str = "";
+        // ip验证
+        if(!token.getIp().contains(NetworkUtil.getIpAddr(request))){
+            return "ip限制!";
+        }
         QueryWrapper queryWrapper = new QueryWrapper();
         queryWrapper.eq("applyGs", token.getGsNama());
-        queryWrapper.eq("applyUrl", token.getIp());
+        queryWrapper.like("applyUrl", token.getIp());
         queryWrapper.eq("status", "1");
         List<SkServiceApply> list = skServiceApplyService.list(queryWrapper);
         if (list == null || list.size() == 0) {
@@ -175,6 +181,7 @@ public class TokenInterceptor implements HandlerInterceptor {
         } else {
             QueryWrapper queryWrapper1 = new QueryWrapper();
             queryWrapper1.eq("serviceName", token.getServiceName());
+            queryWrapper1.eq("serviceUrl", request.getRequestURI());
             List<String> serviceIds = getServiceIds(list);
             queryWrapper1.in("xxzjbh", serviceIds);
             List<SkService> list1 = service.list(queryWrapper1);