From 4ff91624fec261362e6cd4e6924256f58aef4552 Mon Sep 17 00:00:00 2001 From: Liu Wu <2780205363@qq.com> Date: Thu, 26 Sep 2024 19:02:30 +0800 Subject: [PATCH] =?UTF-8?q?saas=20=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cloud-modules/cloud-modules-fence/pom.xml | 6 ++++++ .../muyu/fence/CloudElectronicFenceApplication.java | 11 ++++++++++- .../src/main/resources/bootstrap.yml | 2 +- cloud-modules/cloud-modules-file/pom.xml | 12 ++++++++++++ .../java/com/muyu/file/CloudFileApplication.java | 10 +++++++++- cloud-modules/cloud-modules-system/pom.xml | 2 ++ .../com/muyu/system/CloudSystemApplication.java | 1 + .../system/controller/SysProfileController.java | 13 ++++--------- .../java/com/muyu/system/mapper/SysUserMapper.java | 2 +- .../com/muyu/system/service/SysUserService.java | 2 ++ .../system/service/impl/SysUserServiceImpl.java | 5 +++++ 11 files changed, 53 insertions(+), 13 deletions(-) diff --git a/cloud-modules/cloud-modules-fence/pom.xml b/cloud-modules/cloud-modules-fence/pom.xml index fcfe680..17ae1ad 100644 --- a/cloud-modules/cloud-modules-fence/pom.xml +++ b/cloud-modules/cloud-modules-fence/pom.xml @@ -86,6 +86,12 @@ com.muyu cloud-common-rabbit + + + com.muyu + cloud-common-saas + + diff --git a/cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/CloudElectronicFenceApplication.java b/cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/CloudElectronicFenceApplication.java index 081eeea..e6c6970 100644 --- a/cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/CloudElectronicFenceApplication.java +++ b/cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/CloudElectronicFenceApplication.java @@ -1,9 +1,13 @@ package com.muyu.fence; +import com.alibaba.druid.spring.boot3.autoconfigure.DruidDataSourceAutoConfigure; +import com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DynamicDataSourceAutoConfiguration; import com.muyu.common.security.annotation.EnableCustomConfig; import com.muyu.common.security.annotation.EnableMyFeignClients; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; +import org.springframework.cloud.openfeign.EnableFeignClients; /** * 系统模块 @@ -13,7 +17,12 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; @EnableCustomConfig //@EnableCustomSwagger2 @EnableMyFeignClients -@SpringBootApplication +@SpringBootApplication(exclude = { + DataSourceAutoConfiguration.class, + DruidDataSourceAutoConfigure.class, + DynamicDataSourceAutoConfiguration.class +}) + public class CloudElectronicFenceApplication { public static void main (String[] args) { SpringApplication.run(CloudElectronicFenceApplication.class, args); diff --git a/cloud-modules/cloud-modules-fence/src/main/resources/bootstrap.yml b/cloud-modules/cloud-modules-fence/src/main/resources/bootstrap.yml index 5ce2dc8..11ecb0e 100644 --- a/cloud-modules/cloud-modules-fence/src/main/resources/bootstrap.yml +++ b/cloud-modules/cloud-modules-fence/src/main/resources/bootstrap.yml @@ -6,7 +6,7 @@ nacos: addr: 47.101.53.251:8848 user-name: nacos password: nacos - namespace: lgy + namespace: four # SPRING_AMQP_DESERIALIZATION_TRUST_ALL=true spring.amqp.deserialization.trust.all # Spring spring: diff --git a/cloud-modules/cloud-modules-file/pom.xml b/cloud-modules/cloud-modules-file/pom.xml index e151176..bfc0952 100644 --- a/cloud-modules/cloud-modules-file/pom.xml +++ b/cloud-modules/cloud-modules-file/pom.xml @@ -59,6 +59,18 @@ com.muyu cloud-common-api-doc + + com.alibaba + druid-spring-boot-3-starter + 1.2.23 + compile + + + com.baomidou + dynamic-datasource-spring-boot3-starter + 4.3.0 + compile + diff --git a/cloud-modules/cloud-modules-file/src/main/java/com/muyu/file/CloudFileApplication.java b/cloud-modules/cloud-modules-file/src/main/java/com/muyu/file/CloudFileApplication.java index 4e1c628..f8aad6e 100644 --- a/cloud-modules/cloud-modules-file/src/main/java/com/muyu/file/CloudFileApplication.java +++ b/cloud-modules/cloud-modules-file/src/main/java/com/muyu/file/CloudFileApplication.java @@ -1,15 +1,23 @@ package com.muyu.file; +import com.alibaba.druid.spring.boot3.autoconfigure.DruidDataSourceAutoConfigure; +import com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DynamicDataSourceAutoConfiguration; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; +import org.springframework.cloud.openfeign.EnableFeignClients; /** * 文件服务 * * @author muyu */ -@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class}) +@SpringBootApplication(exclude = { + DataSourceAutoConfiguration.class, + DruidDataSourceAutoConfigure.class, + DynamicDataSourceAutoConfiguration.class +}) +@EnableFeignClients public class CloudFileApplication { public static void main (String[] args) { SpringApplication.run(CloudFileApplication.class, args); diff --git a/cloud-modules/cloud-modules-system/pom.xml b/cloud-modules/cloud-modules-system/pom.xml index 4d83d4d..7386af5 100644 --- a/cloud-modules/cloud-modules-system/pom.xml +++ b/cloud-modules/cloud-modules-system/pom.xml @@ -78,6 +78,8 @@ cloud-common-xxl + + diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/CloudSystemApplication.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/CloudSystemApplication.java index 71f78fc..bcc52f2 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/CloudSystemApplication.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/CloudSystemApplication.java @@ -1,5 +1,6 @@ package com.muyu.system; +import com.alibaba.druid.spring.boot3.autoconfigure.DruidDataSourceAutoConfigure; import com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DynamicDataSourceAutoConfiguration; import com.muyu.common.security.annotation.EnableCustomConfig; import com.muyu.common.security.annotation.EnableMyFeignClients; diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysProfileController.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysProfileController.java index 04470ab..a94deb0 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysProfileController.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysProfileController.java @@ -44,12 +44,8 @@ public class SysProfileController extends BaseController { */ @GetMapping public Result profile () { - LoginUser loginUser = SecurityUtils.getLoginUser(); - String username = loginUser.getUsername(); - Firm firm = new Firm(); - - firm.setUserName(username); - SysUser user = userService.selectUserByUserName(firm); + String username = SecurityUtils.getUsername(); + SysUser user = userService.selectUserByName(username); return Result.success( ProfileResp.builder() .roleGroup( userService.selectUserRoleGroup(username) ) @@ -92,9 +88,8 @@ public class SysProfileController extends BaseController { @PutMapping("/updatePwd") public Result updatePwd (String oldPassword, String newPassword) { String username = SecurityUtils.getUsername(); - Firm firm = new Firm(); - firm.setUserName(username); - SysUser user = userService.selectUserByUserName(firm); + + SysUser user = userService.selectUserByName(username); String password = user.getPassword(); if (!SecurityUtils.matchesPassword(oldPassword, password)) { return error("修改密码失败，旧密码错误"); diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysUserMapper.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysUserMapper.java index 6c8b271..c2c1739 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysUserMapper.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysUserMapper.java @@ -46,7 +46,7 @@ public interface SysUserMapper extends BaseMapper { * * @return 用户对象信息 */ - public SysUser selectUserByUserName (String userName); + public SysUser selectUserByUserName (@Param("userName") String userName); /** * 通过用户ID查询用户 diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysUserService.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysUserService.java index e1068cc..cc68b93 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysUserService.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysUserService.java @@ -229,4 +229,6 @@ public interface SysUserService extends IService { List selectCompanyList(); + SysUser selectUserByName(String username); + } diff --git 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 index defb3c4..b111cf0 100644 --- 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 @@ -609,4 +609,9 @@ public class SysUserServiceImpl extends ServiceImpl impl return userMapper.selectCompanyList(); } + @Override + public SysUser selectUserByName(String username) { + return userMapper.selectUserByUserName(username); + } + }