feat: 定义超管全局变量

project-gateway/src/main/java/com/dituhui/pea/gateway/config/AuthFilter.java

@@ -12,6 +12,7 @@ import org.springframework.http.server.reactive.ServerHttpRequest;
 import org.springframework.stereotype.Component;
 import org.springframework.stereotype.Component;
 import org.springframework.web.server.ServerWebExchange;
 import org.springframework.web.server.ServerWebExchange;
 
 
+import com.dituhui.pea.constants.Globals;
 import com.dituhui.pea.enums.RedisKeyGroup;
 import com.dituhui.pea.enums.RedisKeyGroup;
 import com.dituhui.pea.gateway.commom.RedisService;
 import com.dituhui.pea.gateway.commom.RedisService;
 import com.dituhui.pea.pojo.UserLoginDTO;
 import com.dituhui.pea.pojo.UserLoginDTO;
@@ -85,7 +86,7 @@ public class AuthFilter implements GlobalFilter, Ordered {
 					// AppDTO appDTO = gson.fromJson(value, AppDTO.class);
 					// AppDTO appDTO = gson.fromJson(value, AppDTO.class);
 					// String secret = appDTO.getSecret();
 					// String secret = appDTO.getSecret();
 					userDTO = new UserLoginDTO();
 					userDTO = new UserLoginDTO();
-					userDTO.setId("1");
+					userDTO.setId(Globals.SUPER_ADMIN_ID);
 				}
 				}
 			}
 			}
 		}
 		}

project-interface/src/main/java/com/dituhui/pea/constants/TeamConstant.java → project-interface/src/main/java/com/dituhui/pea/constants/Globals.java

 package com.dituhui.pea.constants;
 package com.dituhui.pea.constants;
 
 
 /**
 /**
- * 团队相关常量
- * @author zl
+ * 全局常量
  */
  */
-public interface TeamConstant {
-
-    /**
-     * 团队名称默认后缀
-     */
-    String TEAM_NAME_SUFFIX = "的团队";
+public interface Globals {
+    
+	/**
+	 * 超管用户id
+	 */
+	public static final String SUPER_ADMIN_ID = "1";
 
 
 }
 }

project-user/src/main/java/com/dituhui/pea/user/controller/UserController.java

@@ -4,21 +4,17 @@ package com.dituhui.pea.user.controller;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.bind.annotation.RestController;
 
 
 import com.dituhui.pea.common.Result;
 import com.dituhui.pea.common.Result;
-import com.dituhui.pea.enums.RedisKeyGroup;
 import com.dituhui.pea.enums.StatusCodeEnum;
 import com.dituhui.pea.enums.StatusCodeEnum;
 import com.dituhui.pea.enums.ThirdPartyEnum;
 import com.dituhui.pea.enums.ThirdPartyEnum;
 import com.dituhui.pea.pojo.ThirdUserInfo;
 import com.dituhui.pea.pojo.ThirdUserInfo;
-import com.dituhui.pea.pojo.UserAuthInfo;
 import com.dituhui.pea.pojo.UserInfo;
 import com.dituhui.pea.pojo.UserInfo;
 import com.dituhui.pea.pojo.UserLoginDTO;
 import com.dituhui.pea.pojo.UserLoginDTO;
 import com.dituhui.pea.pojo.UserLoginParam;
 import com.dituhui.pea.pojo.UserLoginParam;
 import com.dituhui.pea.pojo.WebResult;
 import com.dituhui.pea.pojo.WebResult;
 import com.dituhui.pea.user.IUser;
 import com.dituhui.pea.user.IUser;
-import com.dituhui.pea.user.commom.RedisService;
 import com.dituhui.pea.user.service.UserService;
 import com.dituhui.pea.user.service.UserService;
 
 
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.ObjectUtil;

project-user/src/main/java/com/dituhui/pea/user/service/UserService.java

@@ -18,6 +18,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 
 import com.dituhui.pea.common.Result;
 import com.dituhui.pea.common.Result;
 import com.dituhui.pea.common.ResultEnum;
 import com.dituhui.pea.common.ResultEnum;
+import com.dituhui.pea.constants.Globals;
 import com.dituhui.pea.enums.RedisKeyGroup;
 import com.dituhui.pea.enums.RedisKeyGroup;
 import com.dituhui.pea.enums.StatusCodeEnum;
 import com.dituhui.pea.enums.StatusCodeEnum;
 import com.dituhui.pea.enums.ThirdPartyEnum;
 import com.dituhui.pea.enums.ThirdPartyEnum;
@@ -71,10 +72,6 @@ public class UserService {
 	 */
 	 */
 	private static final int LIVE_TIME_MILLIS = 7200000;
 	private static final int LIVE_TIME_MILLIS = 7200000;
 	private static final Gson gson = new Gson();
 	private static final Gson gson = new Gson();
-	/**
-	 * 超管id
-	 */
-	private static final String SUPER_ADMIN_ID = "1";
 
 
 	@Autowired
 	@Autowired
 	UserDao userDao;
 	UserDao userDao;
@@ -132,7 +129,7 @@ public class UserService {
 
 
 				// 获取资源
 				// 获取资源
 				List<ResourceEntity> resources = null;
 				List<ResourceEntity> resources = null;
-				if (ids.contains(SUPER_ADMIN_ID)) {
+				if (ids.contains(Globals.SUPER_ADMIN_ID)) {
 					// 超管处理，不用配置资源自动拥有所有权限
 					// 超管处理，不用配置资源自动拥有所有权限
 					resources = resourceDao.findAll();
 					resources = resourceDao.findAll();
 				} else {
 				} else {
@@ -598,7 +595,7 @@ public class UserService {
 //			List<String> ids = userRoles.stream().map(r -> r.getRoleId()).collect(Collectors.toList());
 //			List<String> ids = userRoles.stream().map(r -> r.getRoleId()).collect(Collectors.toList());
 //			List<RoleEntity> roles = roleDao.findAllById(ids);
 //			List<RoleEntity> roles = roleDao.findAllById(ids);
 //			if (CollectionUtils.isNotEmpty(roles)) {
 //			if (CollectionUtils.isNotEmpty(roles)) {
-//				role = roles.stream().filter(r -> StringUtils.equals(r.getId(), SUPER_ADMIN_ID)).findFirst()
+//				role = roles.stream().filter(r -> StringUtils.equals(r.getId(), Globals.SUPER_ADMIN_ID)).findFirst()
 //						.orElse(null);
 //						.orElse(null);
 //			}
 //			}
 //		}
 //		}