车辆管理更新

cloud-auth/src/main/java/com/muyu/auth/form/LoginBody.java

@@ -16,6 +16,7 @@ public class LoginBody {
      */
     private String password;
 
+
     public String getUsername () {
         return username;
     }

cloud-common/cloud-common-saas/pom.xml

@@ -29,6 +29,10 @@
             <groupId>com.muyu</groupId>
             <artifactId>cloud-common-security</artifactId>
         </dependency>
+
+
+
+
     </dependencies>
 
 </project>

cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/many/datasource/ManyDataSource.java

@@ -1,34 +1,26 @@
 package com.muyu.cloud.common.many.datasource;
 
-import cn.hutool.json.JSONObject;
 import com.alibaba.druid.pool.DruidDataSource;
 import com.alibaba.fastjson2.JSON;
 import com.baomidou.mybatisplus.autoconfigure.MybatisPlusAutoConfiguration;
 import com.muyu.cloud.common.many.datasource.constents.DatasourceContent;
-import com.muyu.cloud.common.saas.domain.model.EntInfo;
-import com.muyu.cloud.common.many.datasource.factory.DruidDataSourceFactory;
 import com.muyu.cloud.common.many.datasource.domain.model.DataSourceInfo;
+import com.muyu.cloud.common.many.datasource.factory.DruidDataSourceFactory;
 import com.muyu.cloud.common.many.datasource.role.DynamicDataSource;
+import com.muyu.cloud.common.saas.domain.model.EntInfo;
 import com.muyu.cloud.common.saas.exception.SaaSException;
 import com.muyu.common.core.domain.Result;
 import com.muyu.common.core.utils.SpringUtils;
-import com.muyu.common.core.web.page.TableDataInfo;
-import com.muyu.common.system.domain.SysFirmUser;
 import com.muyu.common.system.domain.SysUser;
 import com.muyu.common.system.remote.RemoteUserService;
 import lombok.extern.log4j.Log4j2;
-import org.apache.ibatis.session.SqlSessionFactory;
+import org.mybatis.spring.boot.autoconfigure.MybatisAutoConfiguration;
-import org.mybatis.spring.SqlSessionFactoryBean;
-import org.springframework.beans.factory.InitializingBean;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.ApplicationArguments;
 import org.springframework.boot.ApplicationRunner;
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Primary;
 import org.springframework.stereotype.Component;
 
-import javax.annotation.PostConstruct;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -42,10 +34,8 @@ import java.util.Map;
  */
 @Log4j2
 @Component
-@AutoConfiguration(before = MybatisPlusAutoConfiguration.class)
+@AutoConfiguration(before = {MybatisPlusAutoConfiguration.class, MybatisAutoConfiguration.class})
 public class ManyDataSource implements ApplicationRunner{
-
-
     private List<EntInfo> dataSourceInfoList(){
         RemoteUserService remoteUserService = SpringUtils.getBean(RemoteUserService.class);
         Result<List<SysUser>> tableDataInfoResult = remoteUserService.companyList();
@@ -114,5 +104,4 @@ public class ManyDataSource implements ApplicationRunner{
             log.info("存储数据连接池为：key:{}",dataSourceInfo.getKey());
         }
     }
-
 }

cloud-modules/cloud-modules-car/pom.xml

@@ -80,11 +80,13 @@
             <artifactId>cloud-common-api-doc</artifactId>
         </dependency>
 
-
         <dependency>
             <groupId>com.muyu</groupId>
-            <artifactId>cloud-common-rabbit</artifactId>
+            <artifactId>cloud-common-saas</artifactId>
         </dependency>
+
+
+
     </dependencies>
 
     <build>
@@ -104,6 +106,4 @@
         </plugins>
     </build>
 
-
-
 </project>

cloud-modules/cloud-modules-car/src/main/java/com/muyu/CarSystemApplication.java

@@ -1,11 +1,18 @@
 package com.muyu;
 
+import com.alibaba.druid.spring.boot3.autoconfigure.DruidDataSourceAutoConfigure;
+import com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DynamicDataSourceAutoConfiguration;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 import org.springframework.cloud.openfeign.EnableFeignClients;
 
-@SpringBootApplication
+@SpringBootApplication(exclude = {
+        DataSourceAutoConfiguration.class,
+        DruidDataSourceAutoConfigure.class,
+        DynamicDataSourceAutoConfiguration.class
+})
 @EnableFeignClients
 @MapperScan(value = "com.muyu.mapper")
 public class CarSystemApplication {

cloud-modules/cloud-modules-fence/pom.xml

@@ -17,6 +17,10 @@
     </description>
 
     <dependencies>
+        <dependency>
+            <groupId>com.muyu</groupId>
+            <artifactId>cloud-common-saas</artifactId>
+        </dependency>
 
         <!-- SpringCloud Alibaba Nacos -->
         <dependency>

cloud-modules/cloud-modules-fence/src/main/java/com/muyu/fence/FenceApplication.java

@@ -1,8 +1,11 @@
 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.EnableMyFeignClients;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 
 /**
  * @Author YuPing
@@ -10,7 +13,11 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
  * @Version 1.0
  * @Data 2024-09-18 11:27:38
  */
-@SpringBootApplication
+@SpringBootApplication(exclude = {
+        DataSourceAutoConfiguration.class,
+        DruidDataSourceAutoConfigure.class,
+        DynamicDataSourceAutoConfiguration.class
+})
 @EnableMyFeignClients
 public class FenceApplication {
     public static void main(String[] args) {

cloud-modules/cloud-modules-system/pom.xml

@@ -17,6 +17,7 @@
 
     <dependencies>
 
+
         <!-- SpringCloud Alibaba Nacos -->
         <dependency>
             <groupId>com.alibaba.cloud</groupId>

cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysRoleController.java

@@ -16,6 +16,7 @@ import com.muyu.system.domain.resp.DeptTreeResp;
 import com.muyu.system.service.SysDeptService;
 import com.muyu.system.service.SysRoleService;
 import com.muyu.system.service.SysUserService;
+import jakarta.websocket.server.PathParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -194,7 +195,7 @@ public class SysRoleController extends BaseController {
     @RequiresPermissions("system:role:edit")
     @Log(title = "角色管理", businessType = BusinessType.GRANT)
     @PutMapping("/authUser/selectAll")
-    public Result selectAuthUserAll (Long roleId, Long[] userIds) {
+    public Result selectAuthUserAll (@RequestParam("roleId") Long roleId,@RequestParam("userIds") Long[] userIds) {
         roleService.checkRoleDataScope(roleId);
         return toAjax(roleService.insertAuthUsers(roleId, userIds));
     }

cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysUserController.java

@@ -282,7 +282,7 @@ public class SysUserController extends BaseController {
     @RequiresPermissions("system:user:edit")
     @Log(title = "用户管理", businessType = BusinessType.GRANT)
     @PutMapping("/authRole")
-    public Result insertAuthRole (Long userId, Long[] roleIds) {
+    public Result insertAuthRole (@RequestParam("userId") Long userId,@RequestParam("roleIds") Long[] roleIds) {
         userService.checkUserDataScope(userId);
         userService.insertUserAuth(userId, roleIds);
         return success();

cloud-modules/cloud-modules-warn/pom.xml

@@ -86,6 +86,10 @@
             <groupId>com.muyu</groupId>
             <artifactId>cloud-common-rabbit</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-autoconfigure</artifactId>
+        </dependency>
     </dependencies>
 
     <build>

cloud-modules/cloud-modules-warn/src/main/java/com/muyu/WarnCarApplication.java

@@ -1,5 +1,6 @@
 package com.muyu;
 
+
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;