Merge branch 'master' of http://gitlab.scsmile.cn/zxf/agent-platform

agent-manager/pom.xml

@@ -59,6 +59,14 @@
 			</properties>
 		</profile>
 
+		<profile>
+			<id>youxian</id>
+			<properties>
+				<profiles.active>youxian</profiles.active>
+				<profiles.nacos.server-addr>127.0.0.1:8848</profiles.nacos.server-addr>
+			</properties>
+		</profile>
+
 	</profiles>
 
 	<dependencies>

agent-manager/src/main/java/com/mortals/xhx/base/framework/interceptor/AuthTokenServiceImpl.java

@@ -123,11 +123,11 @@ public class AuthTokenServiceImpl implements IAuthTokenService {
                     }
                     //更新resource 路径
                     String menuUrlCode = cacheService.hget(RedisKey.KEY_USER_MENU_CACHE, userEntity.getId().toString(), String.class);
-//                    if (ObjectUtils.isEmpty(menuUrlCode)) {
-//                        Set<String> urls = resourceService.findUrlSetByUserId(userEntity.getId());
-//                        menuUrlCode = MenuEncodeUtil.generateMenuUrlCode(urls);
-//                        cacheService.hset(RedisKey.KEY_USER_MENU_CACHE, userEntity.getId().toString(), menuUrlCode);
-//                    }
+                    if (ObjectUtils.isEmpty(menuUrlCode)) {
+                        Set<String> urls = resourceService.findUrlSetByUserId(userEntity.getId());
+                        menuUrlCode = MenuEncodeUtil.generateMenuUrlCode(urls);
+                        cacheService.hset(RedisKey.KEY_USER_MENU_CACHE, userEntity.getId().toString(), menuUrlCode);
+                    }
                     userEntity.setMenuUrl(menuUrlCode);
                     return userEntity;
                 }

agent-manager/src/main/java/com/mortals/xhx/base/login/web/LoginController.java

@@ -4,6 +4,7 @@ import cn.hutool.core.util.IdUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.mortals.framework.common.Rest;
+import com.mortals.framework.exception.AppException;
 import com.mortals.framework.service.IAuthTokenService;
 import com.mortals.framework.service.ICacheService;
 import com.mortals.framework.service.IUser;
@@ -14,6 +15,7 @@ import com.mortals.xhx.base.system.menu.model.MenuEntity;
 import com.mortals.xhx.base.system.menu.service.MenuService;
 import com.mortals.xhx.base.system.resource.service.ResourceService;
 import com.mortals.xhx.base.system.user.model.UserEntity;
+import com.mortals.xhx.base.system.user.model.UserQuery;
 import com.mortals.xhx.base.system.user.service.UserService;
 import com.mortals.xhx.common.key.RedisKey;
 import com.mortals.xhx.common.utils.MenuEncodeUtil;
@@ -65,7 +67,16 @@ public class LoginController extends BaseCRUDJsonBodyMappingController<UserServi
         UserEntity userEntity = null;
         try {
             loginForm.validate();
-            userEntity = userService.doLogin(loginName, password, ip);
+            //userEntity = userService.doLogin(loginName, password, ip);
+            UserQuery userQuery = new UserQuery();
+            userQuery.setLoginName(loginName);
+
+            userEntity = userService.selectOne(userQuery);
+            if (userEntity == null) {
+                throw new AppException("用户名不存在");
+            }
+
+
             userEntity.setLastLoginAddress(ip);
 
             recordSysLog(request, userEntity, "用户登录系统成功!");

base-manager/pom.xml

@@ -63,6 +63,15 @@
             </properties>
         </profile>
 
+
+        <profile>
+            <id>youxian</id>
+            <properties>
+                <profiles.active>youxian</profiles.active>
+                <profiles.nacos.server-addr>127.0.0.1:8848</profiles.nacos.server-addr>
+            </properties>
+        </profile>
+
     </profiles>
 
     <dependencies>

smart-gateway/pom.xml

@@ -59,6 +59,14 @@
             </properties>
         </profile>
 
+        <profile>
+            <id>youxian</id>
+            <properties>
+                <profiles.active>youxian</profiles.active>
+                <profiles.nacos.server-addr>127.0.0.1:8848</profiles.nacos.server-addr>
+            </properties>
+        </profile>
+
     </profiles>