fix():修复admin账号为空的问题

cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/constant/ServiceNameConstants.java

@@ -24,6 +24,6 @@ public class ServiceNameConstants {
     /**
      * 车辆服务的serviceid
      */
-    public static final String ENTERPRISE_SERVICE = "cloud-enterprise";
+    public static final String ENTERPRISE_SERVICE = "cloud-saas";
 
 }

cloud-gateway/src/main/resources/bootstrap.yml

@@ -1,6 +1,6 @@
 # Tomcat
 server:
-  port: 8080
+  port: 18080
 
 # nacos线上地址
 nacos:

cloud-modules/cloud-modules-enterprise/enterpise-remote/src/main/java/com/muyu/remote/RemoteFirmUserService.java

@@ -1,5 +1,6 @@
 package com.muyu.remote;
 
+import com.muyu.common.core.constant.SecurityConstants;
 import com.muyu.common.core.constant.ServiceNameConstants;
 import com.muyu.common.core.domain.Result;
 import com.muyu.common.system.domain.SysUser;
@@ -21,8 +22,8 @@ import java.util.List;
 @FeignClient(contextId = "remoteMessageValueService", value = ServiceNameConstants.ENTERPRISE_SERVICE, fallbackFactory = RemoteMessageValueFallbackFactory.class,path = "messageValue")
 public interface RemoteFirmUserService {
 
-    @GetMapping("/firmUser/info/{username}")
+    @GetMapping("/saas/firmUser/info/{username}")
-    public Result<SysUser> info(@PathVariable("username") String username);
+    public Result<SysUser> info(@PathVariable("username") String username, @RequestHeader(SecurityConstants.FIRM_KEY) String firmKey);
 
 
 

cloud-modules/cloud-modules-enterprise/enterpise-remote/src/main/java/com/muyu/remote/factory/RemoteFirmFallbackFactory.java

@@ -20,7 +20,7 @@ public class RemoteFirmFallbackFactory implements FallbackFactory<RemoteFirmUser
         return new RemoteFirmUserService() {
 
             @Override
-            public Result<SysUser> info(String username) {
+            public Result<SysUser> info(String username, String firmKey) {
                 return Result.error("查询数据失败："+cause.getMessage());
             }
         };

cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/resources/bootstrap.yml

@@ -7,7 +7,7 @@ nacos:
   addr: 123.57.152.124:8848
   user-name: nacos
   password: nacos
-  namespace: xyr
+  namespace: wx
 # SPRING_AMQP_DESERIALIZATION_TRUST_ALL=true spring.amqp.deserialization.trust.all
 # Spring
 spring:

cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysUserServiceImpl.java

@@ -9,6 +9,7 @@ import com.muyu.common.core.utils.StringUtils;
 import com.muyu.common.core.utils.bean.BeanValidators;
 import com.muyu.common.datascope.annotation.DataScope;
 import com.muyu.common.security.utils.SecurityUtils;
+import com.muyu.common.system.domain.SysFirmDatasource;
 import com.muyu.common.system.domain.SysRole;
 import com.muyu.common.system.domain.SysUser;
 import com.muyu.remote.RemoteFirmUserService;
@@ -16,6 +17,7 @@ import com.muyu.system.domain.SysPost;
 import com.muyu.system.domain.SysUserPost;
 import com.muyu.system.domain.SysUserRole;
 import com.muyu.system.mapper.*;
+import com.muyu.system.service.SysFirmDatasourceService;
 import com.muyu.system.service.SysUserService;
 import com.muyu.system.service.SysConfigService;
 import jakarta.annotation.Resource;
@@ -55,12 +57,13 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     private SysConfigService configService;
     @Resource
     private RemoteFirmUserService remoteFirmUserService;
+    @Resource
+    private SysFirmDatasourceService sysFirmDatasourceService;
 
     /**
      * 根据条件分页查询用户列表
      *
      * @param user 用户信息
-     *
      * @return 用户信息集合信息
      */
     @Override
@@ -73,7 +76,6 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
      * 根据条件分页查询已分配用户角色列表
      *
      * @param user 用户信息
-     *
      * @return 用户信息集合信息
      */
     @Override
@@ -86,7 +88,6 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
      * 根据条件分页查询未分配用户角色列表
      *
      * @param user 用户信息
-     *
      * @return 用户信息集合信息
      */
     @Override
@@ -109,7 +110,8 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         if (firmId == 1) {
             sysUser = userMapper.selectUserByUserName(userName);
         } else {
-            Result<SysUser> result = remoteFirmUserService.info(userName);
+            SysFirmDatasource datasource = sysFirmDatasourceService.getById(firmId);
+            Result<SysUser> result = remoteFirmUserService.info(userName, datasource.getDatabaseName());
             if (result.getCode() == Result.SUCCESS) {
                 sysUser = result.getData();
             }
@@ -124,7 +126,6 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
      * 通过用户ID查询用户
      *
      * @param userId 用户ID
-     *
      * @return 用户对象信息
      */
     @Override
@@ -136,7 +137,6 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
      * 查询用户所属角色组
      *
      * @param userName 用户名
-     *
      * @return 结果
      */
     @Override
@@ -152,7 +152,6 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
      * 查询用户所属岗位组
      *
      * @param userName 用户名
-     *
      * @return 结果
      */
     @Override
@@ -168,7 +167,6 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
      * 校验用户名称是否唯一
      *
      * @param user 用户信息
-     *
      * @return 结果
      */
     @Override
@@ -185,7 +183,6 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
      * 校验手机号码是否唯一
      *
      * @param user 用户信息
-     *
      * @return
      */
     @Override
@@ -202,7 +199,6 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
      * 校验email是否唯一
      *
      * @param user 用户信息
-     *
      * @return
      */
     @Override
@@ -248,7 +244,6 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
      * 新增保存用户信息
      *
      * @param user 用户信息
-     *
      * @return 结果
      */
     @Override
@@ -267,7 +262,6 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
      * 注册用户信息
      *
      * @param user 用户信息
-     *
      * @return 结果
      */
     @Override
@@ -279,7 +273,6 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
      * 修改保存用户信息
      *
      * @param user 用户信息
-     *
      * @return 结果
      */
     @Override
@@ -314,7 +307,6 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
      * 修改用户状态
      *
      * @param user 用户信息
-     *
      * @return 结果
      */
     @Override
@@ -326,7 +318,6 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
      * 修改用户基本信息
      *
      * @param user 用户信息
-     *
      * @return 结果
      */
     @Override
@@ -339,7 +330,6 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
      *
      * @param userName 用户名
      * @param avatar   头像地址
-     *
      * @return 结果
      */
     @Override
@@ -351,7 +341,6 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
      * 重置用户密码
      *
      * @param user 用户信息
-     *
      * @return 结果
      */
     @Override
@@ -364,7 +353,6 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
      *
      * @param userName 用户名
      * @param password 密码
-     *
      * @return 结果
      */
     @Override
@@ -425,7 +413,6 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
      * 通过用户ID删除用户
      *
      * @param userId 用户ID
-     *
      * @return 结果
      */
     @Override
@@ -442,7 +429,6 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
      * 批量删除用户信息
      *
      * @param userIds 需要删除的用户ID
-     *
      * @return 结果
      */
     @Override
@@ -465,7 +451,6 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
      * @param userList        用户数据列表
      * @param isUpdateSupport 是否更新支持，如果已存在，则进行更新数据
      * @param operName        操作用户
-     *
      * @return 结果
      */
     @Override