Merge remote-tracking branch 'origin/master'

src/main/java/com/yipin/liuwanr/entity/UserIdEnum.java

@@ -0,0 +1,41 @@
+package com.yipin.liuwanr.entity;
+
+public enum UserIdEnum {
+
+    USER_ONE(1504,"10000000"),
+    USER_TWO(1505,"10000000"),
+    USER_THREE(1506,"10000000"),
+    USER_FOUR(1507,"10000000"),
+    USER_FIVE(1508,"10000000"),
+    USER_SIX(1509,"10000000"),
+    USER_SEVEN(1510,"10000000"),
+    USER_EIGHT(1511,"10000000"),
+    USER_NINE(1512,"10000000"),
+    USER_TEN(1513,"10000000");
+
+    private final Integer userId;
+    private final String name;
+
+    UserIdEnum(Integer value, String name) {
+        this.userId = value;
+        this.name = name;
+    }
+
+    public static Integer getUserId(int userValue){
+        for (UserIdEnum value : UserIdEnum.values()) {
+            if (value.userId==userValue){
+                return value.userId;
+            }
+        }
+        return 0;
+    }
+
+    public Integer getUserId() {
+        return userId;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+}

src/main/java/com/yipin/liuwanr/filter/AuthInterceptor.java

@@ -1,6 +1,7 @@
 package com.yipin.liuwanr.filter;
 
 
+import com.yipin.liuwanr.entity.UserIdEnum;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.data.redis.core.ValueOperations;
@@ -21,6 +22,7 @@ import java.util.concurrent.TimeUnit;
  **/
 public class AuthInterceptor implements HandlerInterceptor {
 
+
     @Resource
     StringRedisTemplate stringRedisTemplate;
 
@@ -28,24 +30,29 @@ public class AuthInterceptor implements HandlerInterceptor {
     public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
         response.setCharacterEncoding("UTF-8");
         response.setContentType("text/html;charset=utf-8");
-        String token = request.getHeader("token");
-        if (StringUtils.isEmpty(token)) {
-            response.getWriter().print("0");//用户未登录，请登录后操作！
-            return false;
-        }
 
-        ValueOperations<String, String> ops = stringRedisTemplate.opsForValue();
-        Object loginStatus = ops.get(token);
         //userid
         String userId = request.getParameter("userId");
-        if( Objects.isNull(loginStatus)){
-            response.getWriter().print("1");//token错误
-            return false;
+        if (UserIdEnum.getUserId(Integer.parseInt(userId))!=0){
+            return true;
         }else {
-            if (!StringUtils.isEmpty(userId)){
-                return userId.equals(loginStatus);
+
+            String token = request.getHeader("token");
+            ValueOperations<String, String> ops = stringRedisTemplate.opsForValue();
+            Object loginStatus = ops.get(token);
+            if (StringUtils.isEmpty(token)) {
+                response.getWriter().print("0");//用户未登录，请登录后操作！
+                return false;
+            }
+            if( Objects.isNull(loginStatus)){
+                response.getWriter().print("1");//token错误
+                return false;
             }else {
-                return true;
+                if (!StringUtils.isEmpty(userId)){
+                    return userId.equals(loginStatus);
+                }else {
+                    return true;
+                }
             }
         }
     }

src/main/resources/application-prod.properties

@@ -57,3 +57,11 @@ redis.cluster.nodes=192.168.136.191:8000,192.168.136.191:8001,192.168.136.191:80
 
 server.port=8090
 server.servlet.context-path= /liuwanr
+
+
+#开启全局拦截,为空不开启拦截
+#auth.openInterceptStr=
+auth.openInterceptStr=/**
+#放行Url
+auth.permitUrl=/userInfo/adminLogins/**,/userInfo/loginSchoolClient/**,/province/queryProvince/**,/city/queryCity/**,/customer/querySchool/**,/userInfo/queryPhone/**,/userInfo/updateLogInNumber/**,/userInfo/getAccountPassword
+