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

Merge remote-tracking branch 'origin/dev' into dev
feat():修复yml配置名称
2024-10-10 14:05:26 +08:00 · 2024-10-10 10:30:21 +08:00 · 2024-10-10 10:29:42 +08:00
16 changed files with 65 additions and 79 deletions
--- a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/constant/ServiceNameConstants.java
+++ b/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";

 }
--- a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/constant/TokenConstants.java
+++ b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/constant/TokenConstants.java
@ -19,6 +19,6 @@ public class TokenConstants {
    /**
     * 令牌秘钥
     */
-    public final static String SECRET = "abcdefghijklmnsalieopadfaqawefwerstuvwxyz";
+    public final static String SECRET = "abcdefghijklmnsalieopadfaqawefwerstuvxyryz";

 }
--- a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/exception/ServiceException.java
+++ b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/exception/ServiceException.java
@ -21,7 +21,7 @@ public class ServiceException extends RuntimeException {
    /**
     * 错误明细，内部调试错误
     * <p>
-     * 和 {@link CommonResult#getDetailMessage()} 一致的设计
+     * 和 {@link #()} 一致的设计
     */
    private String detailMessage;

--- a/cloud-gateway/src/main/resources/bootstrap.yml
+++ b/cloud-gateway/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
 spring:
--- a/cloud-modules/cloud-modules-enterprise/enterpise-remote/src/main/java/com/muyu/remote/RemoteFirmUserService.java
+++ b/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}")
-    public Result<SysUser> info(@PathVariable("username") String username);
+    @GetMapping("/saas/firmUser/info/{username}")
+    public Result<SysUser> info(@PathVariable("username") String username, @RequestHeader(SecurityConstants.FIRM_KEY) String firmKey);



--- a/cloud-modules/cloud-modules-enterprise/enterpise-remote/src/main/java/com/muyu/remote/factory/RemoteFirmFallbackFactory.java
+++ b/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());
            }
        };
--- a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/resources/bootstrap.yml
+++ b/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:
--- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysUserServiceImpl.java
+++ b/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
--- a/cloud-modules/cloud-vx/cloud-ui/public/html/ie.html
+++ b/cloud-modules/cloud-vx/cloud-ui/public/html/ie.html
--- a/cloud-modules/cloud-vx/cloud-ui/src/utils/jsencrypt.js
+++ b/cloud-modules/cloud-vx/cloud-ui/src/utils/jsencrypt.js
@ -9,7 +9,7 @@ const privateKey = 'MIIBVAIBADANBgkqhkiG9w0BAQEFAASCAT4wggE6AgEAAkEAqhHyZfSsYour
  '7Nt+PrgrxkiA50efORdI5U5lsW79MmFnusUA355oaSXcLhu5xxB38SMSyP2KvuKN\n' +
  'PuH3owIDAQABAkAfoiLyL+Z4lf4Myxk6xUDgLaWGximj20CUf+5BKKnlrK+Ed8gA\n' +
  'kM0HqoTt2UZwA5E2MzS4EI2gjfQhz5X28uqxAiEA3wNFxfrCZlSZHb0gn2zDpWow\n' +
-  'cSxQAgiCstxGUoOqlW8CIQDDOerGKH5OmCJ4Z21v+F25WaHYPxCFMvwxpcw99Ecv\n' +
+  'cSxQAgiCstxGUoOqlW8CIQDDOerGKH5OmCJ4Z21v+F25WaHYPxCFMvxyrpcw99Ecv\n' +
  'DQIgIdhDTIqD2jfYjPTY8Jj3EDGPbH2HHuffvflECt3Ek60CIQCFRlCkHpi7hthh\n' +
  'YhovyloRYsM+IS9h/0BzlEAuO0ktMQIgSPT3aFAgJYwKpqRYKlLDVcflZFCKY7u3\n' +
  'UP8iWi1Qw0Y='
--- a/cloud-modules/cloud-vx/src/main/java/com/muyu/WxApplication.java
+++ b/cloud-modules/cloud-vx/src/main/java/com/muyu/WxApplication.java
@ -4,16 +4,16 @@ import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;

 /**
- * @className: WxApplication  ️✈️
+ * @className: xyrApplication  ️✈️
 * @author: Yang 鹏  🦅
 * @date: 2024/9/16 20:39 ⏰
 * @Version: 1.0
 * @description:
 */
@SpringBootApplication
-public class WxApplication {
+public class xyrApplication {
    public static void main(String[] args) {
        System.out.println("微信服务启动成功");
-        SpringApplication.run(WxApplication.class);
+        SpringApplication.run(xyrApplication.class);
    }
 }
--- a/cloud-modules/cloud-vx/src/main/java/com/muyu/controller/WxController.java
+++ b/cloud-modules/cloud-vx/src/main/java/com/muyu/controller/WxController.java
@ -3,7 +3,7 @@ import jakarta.servlet.http.HttpServletRequest;
 import lombok.extern.log4j.Log4j2;
 import org.springframework.beans.factory.annotation.Autowired;

-import com.muyu.service.WxService;
+import com.muyu.service.xyrService;
 import com.muyu.util.WechatUtil;
 import io.micrometer.common.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
@ -13,7 +13,7 @@ import java.security.NoSuchAlgorithmException;
 import java.util.*;

 /**
- * @className: GetWxController  ️✈️
+ * @className: GetxyrController  ️✈️
 * @author: Yang 鹏  🦅
 * @date: 2024/9/16 20:38 ⏰
 * @Version: 1.0
@ -21,13 +21,13 @@ import java.util.*;
 */
@Log4j2
@RestController
-public class WxController {
+public class xyrController {

 //    @Autowired
 //    private RedisService redisService;

    @Autowired
-    private WxService wxService;
+    private xyrService xyrService;

    @GetMapping("/")
    public String check(@RequestParam("signature") String signature,@RequestParam("timestamp") String timestamp ,
@ -71,7 +71,7 @@ public class WxController {
    public String receiveMessage(HttpServletRequest request){


-        String message = wxService.handleMessage(request);
+        String message = xyrService.handleMessage(request);

        return message;
    }
@ -82,17 +82,17 @@ public class WxController {

        String code = request.getParameter("code");

-        return wxService.getSignUpUserInfo(code);
+        return xyrService.getSignUpUserInfo(code);
    }


    @GetMapping("/send")
-    public void sendWxMsg(@RequestParam("toUser") String toUser,@RequestParam("content") String content) {
+    public void sendxyrMsg(@RequestParam("toUser") String toUser,@RequestParam("content") String content) {
        WechatUtil.send(toUser,content);
    }


-//    @GetMapping("/getWxUserList")
+//    @GetMapping("/getxyrUserList")
 //    public List getUserList(){
 //        String accessToken = TokenUtil.getAccessToken();
 //       String url="https://api.weixin.qq.com/cgi-bin/user/get?access_token="+accessToken;
--- a/cloud-modules/cloud-vx/src/main/java/com/muyu/service/Impl/WxServiceImpl.java
+++ b/cloud-modules/cloud-vx/src/main/java/com/muyu/service/Impl/WxServiceImpl.java
@ -4,7 +4,7 @@ import com.alibaba.fastjson2.JSONObject;
 import com.muyu.domain.Message;
 import com.muyu.domain.SubscribedUser;

-import com.muyu.service.WxService;
+import com.muyu.service.xyrService;
 import com.muyu.util.OkHttpUtils;
 import com.muyu.util.TokenUtil;
 import com.muyu.util.WechatUtil;
@ -24,14 +24,14 @@ import java.util.HashMap;
 import java.util.List;

 /**
- * @className: WxServiceImpl  ️✈️
+ * @className: xyrServiceImpl  ️✈️
 * @author: Yang 鹏  🦅
 * @date: 2024/9/18 12:05 ⏰
 * @Version: 1.0
 * @description:
 */
@Service
-public class WxServiceImpl implements WxService {
+public class xyrServiceImpl implements xyrService {


    /**
--- a/cloud-modules/cloud-vx/src/main/java/com/muyu/service/WxService.java
+++ b/cloud-modules/cloud-vx/src/main/java/com/muyu/service/WxService.java
@ -3,13 +3,13 @@ package com.muyu.service;
 import jakarta.servlet.http.HttpServletRequest;

 /**
- * @className: WxService  ️✈️
+ * @className: xyrService  ️✈️
 * @author: Yang 鹏  🦅
 * @date: 2024/9/18 12:05 ⏰
 * @Version: 1.0
 * @description:
 */
-public interface WxService {
+public interface xyrService {
    String handleMessage(HttpServletRequest request);

    String getSignUpUserInfo(String code);
--- a/cloud-modules/cloud-vx/src/main/java/com/muyu/util/TokenUtil.java
+++ b/cloud-modules/cloud-vx/src/main/java/com/muyu/util/TokenUtil.java
@ -13,7 +13,7 @@ import org.springframework.stereotype.Component;
 */
@Component
 public class TokenUtil {
-    public final static String APP_ID = "wxa10c6f55da3c0553";
+    public final static String APP_ID = "xyra10c6f55da3c0553";

    public final static String APP_SECRET ="72d285981f3f51274e79dcda5e498a81";

--- a/cloud-modules/cloud-vx/src/main/resources/bootstrap.yml
+++ b/cloud-modules/cloud-vx/src/main/resources/bootstrap.yml
@ -5,7 +5,7 @@ server:
 #redirect:
 #  domain:123
 ##公众号appId和secret
-#wx:
+#xyr:
 #  appId:123
 #  secret:123
Author	SHA1	Message	Date
王鑫	223d2c5a21	fix():修复admin账号为空的问题	2024-10-10 14:05:26 +08:00
ruyaxie	37a42ccd3c	Merge remote-tracking branch 'origin/dev' into dev	2024-10-10 10:30:21 +08:00
ruyaxie	214962ff9a	feat():修复yml配置名称	2024-10-10 10:29:42 +08:00