diff --git a/muyu-auth/pom.xml b/muyu-auth/pom.xml index a8ddedc..913f8b2 100644 --- a/muyu-auth/pom.xml +++ b/muyu-auth/pom.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> com.muyu - muyu + clw-server 3.6.3 4.0.0 diff --git a/muyu-common/pom.xml b/muyu-common/pom.xml index 5b58e93..72b9039 100644 --- a/muyu-common/pom.xml +++ b/muyu-common/pom.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> com.muyu - muyu + clw-server 3.6.3 4.0.0 diff --git a/muyu-gateway/pom.xml b/muyu-gateway/pom.xml index 2d3ed58..9378ec8 100644 --- a/muyu-gateway/pom.xml +++ b/muyu-gateway/pom.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> com.muyu - muyu + clw-server 3.6.3 4.0.0 diff --git a/muyu-modules/muyu-businessPlatform/muyu-businessPlatform-server/src/main/java/com/muyu/businessPlatform/service/impl/VehicleServiceImpl.java b/muyu-modules/muyu-businessPlatform/muyu-businessPlatform-server/src/main/java/com/muyu/businessPlatform/service/impl/VehicleServiceImpl.java index 2a2c14f..4a62bbd 100644 --- a/muyu-modules/muyu-businessPlatform/muyu-businessPlatform-server/src/main/java/com/muyu/businessPlatform/service/impl/VehicleServiceImpl.java +++ b/muyu-modules/muyu-businessPlatform/muyu-businessPlatform-server/src/main/java/com/muyu/businessPlatform/service/impl/VehicleServiceImpl.java @@ -9,6 +9,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; +import java.util.UUID; /** * 车辆Service业务层处理 @@ -56,6 +57,8 @@ public class VehicleServiceImpl implements IVehicleService public int insertVehicle(Vehicle vehicle) { vehicle.setCreateTime(DateUtils.getNowDate()); + String userKey = UUID.randomUUID().toString(); + vehicle.setVin(userKey); return vehicleMapper.insertVehicle(vehicle); } diff --git a/muyu-modules/muyu-common-many-dataSourceMany/pom.xml b/muyu-modules/muyu-common-many-dataSourceMany/pom.xml new file mode 100644 index 0000000..27f31e2 --- /dev/null +++ b/muyu-modules/muyu-common-many-dataSourceMany/pom.xml @@ -0,0 +1,110 @@ + + + 4.0.0 + + com.muyu + muyu-common + 3.6.3 + + + muyu-common-many-dataSourceMany + + 动态多数据源 + + 17 + 17 + UTF-8 + + + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-discovery + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-config + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-sentinel + + + + + org.springframework.boot + spring-boot-starter-actuator + + + + + io.springfox + springfox-swagger-ui + ${swagger.fox.version} + + + + + com.mysql + mysql-connector-j + + + + + com.muyu + muyu-common-datasource + + + + + com.muyu + muyu-common-datascope + + + + + com.muyu + muyu-common-log + + + + + com.muyu + muyu-common-swagger + + + + + + ${project.artifactId} + + + org.springframework.boot + spring-boot-maven-plugin + + + + repackage + + + + + + + org.apache.maven.plugins + maven-deploy-plugin + + true + + + + + diff --git a/muyu-modules/muyu-common-many-dataSourceMany/src/main/java/com/muyu/many/DataSourcemanyApplication.java b/muyu-modules/muyu-common-many-dataSourceMany/src/main/java/com/muyu/many/DataSourcemanyApplication.java new file mode 100644 index 0000000..1ef3b13 --- /dev/null +++ b/muyu-modules/muyu-common-many-dataSourceMany/src/main/java/com/muyu/many/DataSourcemanyApplication.java @@ -0,0 +1,31 @@ +package com.muyu.many; + +import com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DynamicDataSourceAutoConfiguration; +import com.muyu.common.security.annotation.EnableCustomConfig; +import com.muyu.common.security.annotation.EnableMyFeignClients; +import com.muyu.common.swagger.annotation.EnableCustomSwagger2; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; +import org.springframework.boot.web.servlet.DynamicRegistrationBean; + +/** + * 多数据源启动类 + * + * @ClassName DataSourcemanyApplication + * @Author AnNan.Wang + * @Date 2024/6/3 18:40 + */ + +@EnableCustomConfig +@EnableCustomSwagger2 +@EnableMyFeignClients +@SpringBootApplication(exclude = { + DynamicDataSourceAutoConfiguration.class, + DataSourceAutoConfiguration.class +}) +public class DataSourcemanyApplication { + public static void main(String[] args) { + SpringApplication.run(DataSourcemanyApplication.class,args); + } +} diff --git a/muyu-modules/muyu-file/src/main/resources/banner.txt b/muyu-modules/muyu-common-many-dataSourceMany/src/main/resources/banner.txt similarity index 100% rename from muyu-modules/muyu-file/src/main/resources/banner.txt rename to muyu-modules/muyu-common-many-dataSourceMany/src/main/resources/banner.txt diff --git a/muyu-modules/muyu-common-many-dataSourceMany/src/main/resources/bootstrap.yml b/muyu-modules/muyu-common-many-dataSourceMany/src/main/resources/bootstrap.yml new file mode 100644 index 0000000..f3fced2 --- /dev/null +++ b/muyu-modules/muyu-common-many-dataSourceMany/src/main/resources/bootstrap.yml @@ -0,0 +1,28 @@ +# Tomcat +server: + port: 9204 + +# Spring +spring: + application: + # 应用名称 + name: ruoyi-many + profiles: + # 环境配置 + active: dev + cloud: + nacos: + discovery: + # 服务注册地址 + server-addr: 101.34.243.166:8848 + config: + # 配置中心地址 + server-addr: 101.34.243.166:8848 + # 配置文件格式 + file-extension: yml + # 共享配置 + shared-configs: + - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} +logging: + level: + com.muyu.system.mapper: DEBUG diff --git a/muyu-modules/muyu-system/src/main/resources/logback.xml b/muyu-modules/muyu-common-many-dataSourceMany/src/main/resources/logback.xml similarity index 98% rename from muyu-modules/muyu-system/src/main/resources/logback.xml rename to muyu-modules/muyu-common-many-dataSourceMany/src/main/resources/logback.xml index aa340cd..8b11901 100644 --- a/muyu-modules/muyu-system/src/main/resources/logback.xml +++ b/muyu-modules/muyu-common-many-dataSourceMany/src/main/resources/logback.xml @@ -1,7 +1,7 @@ - + diff --git a/muyu-modules/muyu-file/pom.xml b/muyu-modules/muyu-modules-file/pom.xml similarity index 100% rename from muyu-modules/muyu-file/pom.xml rename to muyu-modules/muyu-modules-file/pom.xml diff --git a/muyu-modules/muyu-file/src/main/java/com/muyu/file/MuYuFileApplication.java b/muyu-modules/muyu-modules-file/src/main/java/com/muyu/file/MuYuFileApplication.java similarity index 100% rename from muyu-modules/muyu-file/src/main/java/com/muyu/file/MuYuFileApplication.java rename to muyu-modules/muyu-modules-file/src/main/java/com/muyu/file/MuYuFileApplication.java diff --git a/muyu-modules/muyu-file/src/main/java/com/muyu/file/config/MinioConfig.java b/muyu-modules/muyu-modules-file/src/main/java/com/muyu/file/config/MinioConfig.java similarity index 100% rename from muyu-modules/muyu-file/src/main/java/com/muyu/file/config/MinioConfig.java rename to muyu-modules/muyu-modules-file/src/main/java/com/muyu/file/config/MinioConfig.java diff --git a/muyu-modules/muyu-file/src/main/java/com/muyu/file/config/ResourcesConfig.java b/muyu-modules/muyu-modules-file/src/main/java/com/muyu/file/config/ResourcesConfig.java similarity index 100% rename from muyu-modules/muyu-file/src/main/java/com/muyu/file/config/ResourcesConfig.java rename to muyu-modules/muyu-modules-file/src/main/java/com/muyu/file/config/ResourcesConfig.java diff --git a/muyu-modules/muyu-file/src/main/java/com/muyu/file/controller/SysFileController.java b/muyu-modules/muyu-modules-file/src/main/java/com/muyu/file/controller/SysFileController.java similarity index 100% rename from muyu-modules/muyu-file/src/main/java/com/muyu/file/controller/SysFileController.java rename to muyu-modules/muyu-modules-file/src/main/java/com/muyu/file/controller/SysFileController.java diff --git a/muyu-modules/muyu-file/src/main/java/com/muyu/file/service/FastDfsSysFileServiceImpl.java b/muyu-modules/muyu-modules-file/src/main/java/com/muyu/file/service/FastDfsSysFileServiceImpl.java similarity index 100% rename from muyu-modules/muyu-file/src/main/java/com/muyu/file/service/FastDfsSysFileServiceImpl.java rename to muyu-modules/muyu-modules-file/src/main/java/com/muyu/file/service/FastDfsSysFileServiceImpl.java diff --git a/muyu-modules/muyu-file/src/main/java/com/muyu/file/service/ISysFileService.java b/muyu-modules/muyu-modules-file/src/main/java/com/muyu/file/service/ISysFileService.java similarity index 100% rename from muyu-modules/muyu-file/src/main/java/com/muyu/file/service/ISysFileService.java rename to muyu-modules/muyu-modules-file/src/main/java/com/muyu/file/service/ISysFileService.java diff --git a/muyu-modules/muyu-file/src/main/java/com/muyu/file/service/LocalSysFileServiceImpl.java b/muyu-modules/muyu-modules-file/src/main/java/com/muyu/file/service/LocalSysFileServiceImpl.java similarity index 100% rename from muyu-modules/muyu-file/src/main/java/com/muyu/file/service/LocalSysFileServiceImpl.java rename to muyu-modules/muyu-modules-file/src/main/java/com/muyu/file/service/LocalSysFileServiceImpl.java diff --git a/muyu-modules/muyu-file/src/main/java/com/muyu/file/service/MinioSysFileServiceImpl.java b/muyu-modules/muyu-modules-file/src/main/java/com/muyu/file/service/MinioSysFileServiceImpl.java similarity index 100% rename from muyu-modules/muyu-file/src/main/java/com/muyu/file/service/MinioSysFileServiceImpl.java rename to muyu-modules/muyu-modules-file/src/main/java/com/muyu/file/service/MinioSysFileServiceImpl.java diff --git a/muyu-modules/muyu-file/src/main/java/com/muyu/file/utils/FileUploadUtils.java b/muyu-modules/muyu-modules-file/src/main/java/com/muyu/file/utils/FileUploadUtils.java similarity index 100% rename from muyu-modules/muyu-file/src/main/java/com/muyu/file/utils/FileUploadUtils.java rename to muyu-modules/muyu-modules-file/src/main/java/com/muyu/file/utils/FileUploadUtils.java diff --git a/muyu-modules/muyu-gen/src/main/resources/banner.txt b/muyu-modules/muyu-modules-file/src/main/resources/banner.txt similarity index 100% rename from muyu-modules/muyu-gen/src/main/resources/banner.txt rename to muyu-modules/muyu-modules-file/src/main/resources/banner.txt diff --git a/muyu-modules/muyu-file/src/main/resources/bootstrap.yml b/muyu-modules/muyu-modules-file/src/main/resources/bootstrap.yml similarity index 100% rename from muyu-modules/muyu-file/src/main/resources/bootstrap.yml rename to muyu-modules/muyu-modules-file/src/main/resources/bootstrap.yml diff --git a/muyu-modules/muyu-file/src/main/resources/logback.xml b/muyu-modules/muyu-modules-file/src/main/resources/logback.xml similarity index 100% rename from muyu-modules/muyu-file/src/main/resources/logback.xml rename to muyu-modules/muyu-modules-file/src/main/resources/logback.xml diff --git a/muyu-modules/muyu-gen/pom.xml b/muyu-modules/muyu-modules-gen/pom.xml similarity index 100% rename from muyu-modules/muyu-gen/pom.xml rename to muyu-modules/muyu-modules-gen/pom.xml diff --git a/muyu-modules/muyu-gen/src/main/java/com/muyu/gen/MuYuGenApplication.java b/muyu-modules/muyu-modules-gen/src/main/java/com/muyu/gen/MuYuGenApplication.java similarity index 100% rename from muyu-modules/muyu-gen/src/main/java/com/muyu/gen/MuYuGenApplication.java rename to muyu-modules/muyu-modules-gen/src/main/java/com/muyu/gen/MuYuGenApplication.java diff --git a/muyu-modules/muyu-gen/src/main/java/com/muyu/gen/config/GenConfig.java b/muyu-modules/muyu-modules-gen/src/main/java/com/muyu/gen/config/GenConfig.java similarity index 100% rename from muyu-modules/muyu-gen/src/main/java/com/muyu/gen/config/GenConfig.java rename to muyu-modules/muyu-modules-gen/src/main/java/com/muyu/gen/config/GenConfig.java diff --git a/muyu-modules/muyu-gen/src/main/java/com/muyu/gen/controller/GenController.java b/muyu-modules/muyu-modules-gen/src/main/java/com/muyu/gen/controller/GenController.java similarity index 100% rename from muyu-modules/muyu-gen/src/main/java/com/muyu/gen/controller/GenController.java rename to muyu-modules/muyu-modules-gen/src/main/java/com/muyu/gen/controller/GenController.java diff --git a/muyu-modules/muyu-gen/src/main/java/com/muyu/gen/domain/GenTable.java b/muyu-modules/muyu-modules-gen/src/main/java/com/muyu/gen/domain/GenTable.java similarity index 100% rename from muyu-modules/muyu-gen/src/main/java/com/muyu/gen/domain/GenTable.java rename to muyu-modules/muyu-modules-gen/src/main/java/com/muyu/gen/domain/GenTable.java diff --git a/muyu-modules/muyu-gen/src/main/java/com/muyu/gen/domain/GenTableColumn.java b/muyu-modules/muyu-modules-gen/src/main/java/com/muyu/gen/domain/GenTableColumn.java similarity index 100% rename from muyu-modules/muyu-gen/src/main/java/com/muyu/gen/domain/GenTableColumn.java rename to muyu-modules/muyu-modules-gen/src/main/java/com/muyu/gen/domain/GenTableColumn.java diff --git a/muyu-modules/muyu-gen/src/main/java/com/muyu/gen/mapper/GenTableColumnMapper.java b/muyu-modules/muyu-modules-gen/src/main/java/com/muyu/gen/mapper/GenTableColumnMapper.java similarity index 100% rename from muyu-modules/muyu-gen/src/main/java/com/muyu/gen/mapper/GenTableColumnMapper.java rename to muyu-modules/muyu-modules-gen/src/main/java/com/muyu/gen/mapper/GenTableColumnMapper.java diff --git a/muyu-modules/muyu-gen/src/main/java/com/muyu/gen/mapper/GenTableMapper.java b/muyu-modules/muyu-modules-gen/src/main/java/com/muyu/gen/mapper/GenTableMapper.java similarity index 100% rename from muyu-modules/muyu-gen/src/main/java/com/muyu/gen/mapper/GenTableMapper.java rename to muyu-modules/muyu-modules-gen/src/main/java/com/muyu/gen/mapper/GenTableMapper.java diff --git a/muyu-modules/muyu-gen/src/main/java/com/muyu/gen/service/GenTableColumnServiceImpl.java b/muyu-modules/muyu-modules-gen/src/main/java/com/muyu/gen/service/GenTableColumnServiceImpl.java similarity index 100% rename from muyu-modules/muyu-gen/src/main/java/com/muyu/gen/service/GenTableColumnServiceImpl.java rename to muyu-modules/muyu-modules-gen/src/main/java/com/muyu/gen/service/GenTableColumnServiceImpl.java diff --git a/muyu-modules/muyu-gen/src/main/java/com/muyu/gen/service/GenTableServiceImpl.java b/muyu-modules/muyu-modules-gen/src/main/java/com/muyu/gen/service/GenTableServiceImpl.java similarity index 100% rename from muyu-modules/muyu-gen/src/main/java/com/muyu/gen/service/GenTableServiceImpl.java rename to muyu-modules/muyu-modules-gen/src/main/java/com/muyu/gen/service/GenTableServiceImpl.java diff --git a/muyu-modules/muyu-gen/src/main/java/com/muyu/gen/service/IGenTableColumnService.java b/muyu-modules/muyu-modules-gen/src/main/java/com/muyu/gen/service/IGenTableColumnService.java similarity index 100% rename from muyu-modules/muyu-gen/src/main/java/com/muyu/gen/service/IGenTableColumnService.java rename to muyu-modules/muyu-modules-gen/src/main/java/com/muyu/gen/service/IGenTableColumnService.java diff --git a/muyu-modules/muyu-gen/src/main/java/com/muyu/gen/service/IGenTableService.java b/muyu-modules/muyu-modules-gen/src/main/java/com/muyu/gen/service/IGenTableService.java similarity index 100% rename from muyu-modules/muyu-gen/src/main/java/com/muyu/gen/service/IGenTableService.java rename to muyu-modules/muyu-modules-gen/src/main/java/com/muyu/gen/service/IGenTableService.java diff --git a/muyu-modules/muyu-gen/src/main/java/com/muyu/gen/util/GenUtils.java b/muyu-modules/muyu-modules-gen/src/main/java/com/muyu/gen/util/GenUtils.java similarity index 100% rename from muyu-modules/muyu-gen/src/main/java/com/muyu/gen/util/GenUtils.java rename to muyu-modules/muyu-modules-gen/src/main/java/com/muyu/gen/util/GenUtils.java diff --git a/muyu-modules/muyu-gen/src/main/java/com/muyu/gen/util/VelocityInitializer.java b/muyu-modules/muyu-modules-gen/src/main/java/com/muyu/gen/util/VelocityInitializer.java similarity index 100% rename from muyu-modules/muyu-gen/src/main/java/com/muyu/gen/util/VelocityInitializer.java rename to muyu-modules/muyu-modules-gen/src/main/java/com/muyu/gen/util/VelocityInitializer.java diff --git a/muyu-modules/muyu-gen/src/main/java/com/muyu/gen/util/VelocityUtils.java b/muyu-modules/muyu-modules-gen/src/main/java/com/muyu/gen/util/VelocityUtils.java similarity index 100% rename from muyu-modules/muyu-gen/src/main/java/com/muyu/gen/util/VelocityUtils.java rename to muyu-modules/muyu-modules-gen/src/main/java/com/muyu/gen/util/VelocityUtils.java diff --git a/muyu-modules/muyu-job/src/main/resources/banner.txt b/muyu-modules/muyu-modules-gen/src/main/resources/banner.txt similarity index 100% rename from muyu-modules/muyu-job/src/main/resources/banner.txt rename to muyu-modules/muyu-modules-gen/src/main/resources/banner.txt diff --git a/muyu-modules/muyu-gen/src/main/resources/bootstrap.yml b/muyu-modules/muyu-modules-gen/src/main/resources/bootstrap.yml similarity index 100% rename from muyu-modules/muyu-gen/src/main/resources/bootstrap.yml rename to muyu-modules/muyu-modules-gen/src/main/resources/bootstrap.yml diff --git a/muyu-modules/muyu-gen/src/main/resources/logback.xml b/muyu-modules/muyu-modules-gen/src/main/resources/logback.xml similarity index 100% rename from muyu-modules/muyu-gen/src/main/resources/logback.xml rename to muyu-modules/muyu-modules-gen/src/main/resources/logback.xml diff --git a/muyu-modules/muyu-gen/src/main/resources/mapper/generator/GenTableColumnMapper.xml b/muyu-modules/muyu-modules-gen/src/main/resources/mapper/generator/GenTableColumnMapper.xml similarity index 100% rename from muyu-modules/muyu-gen/src/main/resources/mapper/generator/GenTableColumnMapper.xml rename to muyu-modules/muyu-modules-gen/src/main/resources/mapper/generator/GenTableColumnMapper.xml diff --git a/muyu-modules/muyu-gen/src/main/resources/mapper/generator/GenTableMapper.xml b/muyu-modules/muyu-modules-gen/src/main/resources/mapper/generator/GenTableMapper.xml similarity index 100% rename from muyu-modules/muyu-gen/src/main/resources/mapper/generator/GenTableMapper.xml rename to muyu-modules/muyu-modules-gen/src/main/resources/mapper/generator/GenTableMapper.xml diff --git a/muyu-modules/muyu-gen/src/main/resources/vm/java/controller.java.vm b/muyu-modules/muyu-modules-gen/src/main/resources/vm/java/controller.java.vm similarity index 100% rename from muyu-modules/muyu-gen/src/main/resources/vm/java/controller.java.vm rename to muyu-modules/muyu-modules-gen/src/main/resources/vm/java/controller.java.vm diff --git a/muyu-modules/muyu-gen/src/main/resources/vm/java/domain.java.vm b/muyu-modules/muyu-modules-gen/src/main/resources/vm/java/domain.java.vm similarity index 100% rename from muyu-modules/muyu-gen/src/main/resources/vm/java/domain.java.vm rename to muyu-modules/muyu-modules-gen/src/main/resources/vm/java/domain.java.vm diff --git a/muyu-modules/muyu-gen/src/main/resources/vm/java/mapper.java.vm b/muyu-modules/muyu-modules-gen/src/main/resources/vm/java/mapper.java.vm similarity index 100% rename from muyu-modules/muyu-gen/src/main/resources/vm/java/mapper.java.vm rename to muyu-modules/muyu-modules-gen/src/main/resources/vm/java/mapper.java.vm diff --git a/muyu-modules/muyu-gen/src/main/resources/vm/java/service.java.vm b/muyu-modules/muyu-modules-gen/src/main/resources/vm/java/service.java.vm similarity index 100% rename from muyu-modules/muyu-gen/src/main/resources/vm/java/service.java.vm rename to muyu-modules/muyu-modules-gen/src/main/resources/vm/java/service.java.vm diff --git a/muyu-modules/muyu-gen/src/main/resources/vm/java/serviceImpl.java.vm b/muyu-modules/muyu-modules-gen/src/main/resources/vm/java/serviceImpl.java.vm similarity index 100% rename from muyu-modules/muyu-gen/src/main/resources/vm/java/serviceImpl.java.vm rename to muyu-modules/muyu-modules-gen/src/main/resources/vm/java/serviceImpl.java.vm diff --git a/muyu-modules/muyu-gen/src/main/resources/vm/java/sub-domain.java.vm b/muyu-modules/muyu-modules-gen/src/main/resources/vm/java/sub-domain.java.vm similarity index 100% rename from muyu-modules/muyu-gen/src/main/resources/vm/java/sub-domain.java.vm rename to muyu-modules/muyu-modules-gen/src/main/resources/vm/java/sub-domain.java.vm diff --git a/muyu-modules/muyu-gen/src/main/resources/vm/js/api.js.vm b/muyu-modules/muyu-modules-gen/src/main/resources/vm/js/api.js.vm similarity index 100% rename from muyu-modules/muyu-gen/src/main/resources/vm/js/api.js.vm rename to muyu-modules/muyu-modules-gen/src/main/resources/vm/js/api.js.vm diff --git a/muyu-modules/muyu-gen/src/main/resources/vm/sql/sql.vm b/muyu-modules/muyu-modules-gen/src/main/resources/vm/sql/sql.vm similarity index 100% rename from muyu-modules/muyu-gen/src/main/resources/vm/sql/sql.vm rename to muyu-modules/muyu-modules-gen/src/main/resources/vm/sql/sql.vm diff --git a/muyu-modules/muyu-gen/src/main/resources/vm/vue/index-tree.vue.vm b/muyu-modules/muyu-modules-gen/src/main/resources/vm/vue/index-tree.vue.vm similarity index 100% rename from muyu-modules/muyu-gen/src/main/resources/vm/vue/index-tree.vue.vm rename to muyu-modules/muyu-modules-gen/src/main/resources/vm/vue/index-tree.vue.vm diff --git a/muyu-modules/muyu-gen/src/main/resources/vm/vue/index.vue.vm b/muyu-modules/muyu-modules-gen/src/main/resources/vm/vue/index.vue.vm similarity index 100% rename from muyu-modules/muyu-gen/src/main/resources/vm/vue/index.vue.vm rename to muyu-modules/muyu-modules-gen/src/main/resources/vm/vue/index.vue.vm diff --git a/muyu-modules/muyu-gen/src/main/resources/vm/vue/v3/index-tree.vue.vm b/muyu-modules/muyu-modules-gen/src/main/resources/vm/vue/v3/index-tree.vue.vm similarity index 100% rename from muyu-modules/muyu-gen/src/main/resources/vm/vue/v3/index-tree.vue.vm rename to muyu-modules/muyu-modules-gen/src/main/resources/vm/vue/v3/index-tree.vue.vm diff --git a/muyu-modules/muyu-gen/src/main/resources/vm/vue/v3/index.vue.vm b/muyu-modules/muyu-modules-gen/src/main/resources/vm/vue/v3/index.vue.vm similarity index 100% rename from muyu-modules/muyu-gen/src/main/resources/vm/vue/v3/index.vue.vm rename to muyu-modules/muyu-modules-gen/src/main/resources/vm/vue/v3/index.vue.vm diff --git a/muyu-modules/muyu-gen/src/main/resources/vm/vue/v3/readme.txt b/muyu-modules/muyu-modules-gen/src/main/resources/vm/vue/v3/readme.txt similarity index 100% rename from muyu-modules/muyu-gen/src/main/resources/vm/vue/v3/readme.txt rename to muyu-modules/muyu-modules-gen/src/main/resources/vm/vue/v3/readme.txt diff --git a/muyu-modules/muyu-gen/src/main/resources/vm/xml/mapper.xml.vm b/muyu-modules/muyu-modules-gen/src/main/resources/vm/xml/mapper.xml.vm similarity index 100% rename from muyu-modules/muyu-gen/src/main/resources/vm/xml/mapper.xml.vm rename to muyu-modules/muyu-modules-gen/src/main/resources/vm/xml/mapper.xml.vm diff --git a/muyu-modules/muyu-job/pom.xml b/muyu-modules/muyu-modules-job/pom.xml similarity index 100% rename from muyu-modules/muyu-job/pom.xml rename to muyu-modules/muyu-modules-job/pom.xml diff --git a/muyu-modules/muyu-job/src/main/java/com/muyu/job/MuYuJobApplication.java b/muyu-modules/muyu-modules-job/src/main/java/com/muyu/job/MuYuJobApplication.java similarity index 100% rename from muyu-modules/muyu-job/src/main/java/com/muyu/job/MuYuJobApplication.java rename to muyu-modules/muyu-modules-job/src/main/java/com/muyu/job/MuYuJobApplication.java diff --git a/muyu-modules/muyu-job/src/main/java/com/muyu/job/config/ScheduleConfig.java b/muyu-modules/muyu-modules-job/src/main/java/com/muyu/job/config/ScheduleConfig.java similarity index 100% rename from muyu-modules/muyu-job/src/main/java/com/muyu/job/config/ScheduleConfig.java rename to muyu-modules/muyu-modules-job/src/main/java/com/muyu/job/config/ScheduleConfig.java diff --git a/muyu-modules/muyu-job/src/main/java/com/muyu/job/controller/SysJobController.java b/muyu-modules/muyu-modules-job/src/main/java/com/muyu/job/controller/SysJobController.java similarity index 100% rename from muyu-modules/muyu-job/src/main/java/com/muyu/job/controller/SysJobController.java rename to muyu-modules/muyu-modules-job/src/main/java/com/muyu/job/controller/SysJobController.java diff --git a/muyu-modules/muyu-job/src/main/java/com/muyu/job/controller/SysJobLogController.java b/muyu-modules/muyu-modules-job/src/main/java/com/muyu/job/controller/SysJobLogController.java similarity index 100% rename from muyu-modules/muyu-job/src/main/java/com/muyu/job/controller/SysJobLogController.java rename to muyu-modules/muyu-modules-job/src/main/java/com/muyu/job/controller/SysJobLogController.java diff --git a/muyu-modules/muyu-job/src/main/java/com/muyu/job/domain/SysJob.java b/muyu-modules/muyu-modules-job/src/main/java/com/muyu/job/domain/SysJob.java similarity index 100% rename from muyu-modules/muyu-job/src/main/java/com/muyu/job/domain/SysJob.java rename to muyu-modules/muyu-modules-job/src/main/java/com/muyu/job/domain/SysJob.java diff --git a/muyu-modules/muyu-job/src/main/java/com/muyu/job/domain/SysJobLog.java b/muyu-modules/muyu-modules-job/src/main/java/com/muyu/job/domain/SysJobLog.java similarity index 100% rename from muyu-modules/muyu-job/src/main/java/com/muyu/job/domain/SysJobLog.java rename to muyu-modules/muyu-modules-job/src/main/java/com/muyu/job/domain/SysJobLog.java diff --git a/muyu-modules/muyu-job/src/main/java/com/muyu/job/mapper/SysJobLogMapper.java b/muyu-modules/muyu-modules-job/src/main/java/com/muyu/job/mapper/SysJobLogMapper.java similarity index 100% rename from muyu-modules/muyu-job/src/main/java/com/muyu/job/mapper/SysJobLogMapper.java rename to muyu-modules/muyu-modules-job/src/main/java/com/muyu/job/mapper/SysJobLogMapper.java diff --git a/muyu-modules/muyu-job/src/main/java/com/muyu/job/mapper/SysJobMapper.java b/muyu-modules/muyu-modules-job/src/main/java/com/muyu/job/mapper/SysJobMapper.java similarity index 100% rename from muyu-modules/muyu-job/src/main/java/com/muyu/job/mapper/SysJobMapper.java rename to muyu-modules/muyu-modules-job/src/main/java/com/muyu/job/mapper/SysJobMapper.java diff --git a/muyu-modules/muyu-job/src/main/java/com/muyu/job/service/ISysJobLogService.java b/muyu-modules/muyu-modules-job/src/main/java/com/muyu/job/service/ISysJobLogService.java similarity index 100% rename from muyu-modules/muyu-job/src/main/java/com/muyu/job/service/ISysJobLogService.java rename to muyu-modules/muyu-modules-job/src/main/java/com/muyu/job/service/ISysJobLogService.java diff --git a/muyu-modules/muyu-job/src/main/java/com/muyu/job/service/ISysJobService.java b/muyu-modules/muyu-modules-job/src/main/java/com/muyu/job/service/ISysJobService.java similarity index 100% rename from muyu-modules/muyu-job/src/main/java/com/muyu/job/service/ISysJobService.java rename to muyu-modules/muyu-modules-job/src/main/java/com/muyu/job/service/ISysJobService.java diff --git a/muyu-modules/muyu-job/src/main/java/com/muyu/job/service/SysJobLogServiceImpl.java b/muyu-modules/muyu-modules-job/src/main/java/com/muyu/job/service/SysJobLogServiceImpl.java similarity index 100% rename from muyu-modules/muyu-job/src/main/java/com/muyu/job/service/SysJobLogServiceImpl.java rename to muyu-modules/muyu-modules-job/src/main/java/com/muyu/job/service/SysJobLogServiceImpl.java diff --git a/muyu-modules/muyu-job/src/main/java/com/muyu/job/service/SysJobServiceImpl.java b/muyu-modules/muyu-modules-job/src/main/java/com/muyu/job/service/SysJobServiceImpl.java similarity index 100% rename from muyu-modules/muyu-job/src/main/java/com/muyu/job/service/SysJobServiceImpl.java rename to muyu-modules/muyu-modules-job/src/main/java/com/muyu/job/service/SysJobServiceImpl.java diff --git a/muyu-modules/muyu-job/src/main/java/com/muyu/job/task/MyTask.java b/muyu-modules/muyu-modules-job/src/main/java/com/muyu/job/task/MyTask.java similarity index 100% rename from muyu-modules/muyu-job/src/main/java/com/muyu/job/task/MyTask.java rename to muyu-modules/muyu-modules-job/src/main/java/com/muyu/job/task/MyTask.java diff --git a/muyu-modules/muyu-job/src/main/java/com/muyu/job/util/AbstractQuartzJob.java b/muyu-modules/muyu-modules-job/src/main/java/com/muyu/job/util/AbstractQuartzJob.java similarity index 100% rename from muyu-modules/muyu-job/src/main/java/com/muyu/job/util/AbstractQuartzJob.java rename to muyu-modules/muyu-modules-job/src/main/java/com/muyu/job/util/AbstractQuartzJob.java diff --git a/muyu-modules/muyu-job/src/main/java/com/muyu/job/util/CronUtils.java b/muyu-modules/muyu-modules-job/src/main/java/com/muyu/job/util/CronUtils.java similarity index 100% rename from muyu-modules/muyu-job/src/main/java/com/muyu/job/util/CronUtils.java rename to muyu-modules/muyu-modules-job/src/main/java/com/muyu/job/util/CronUtils.java diff --git a/muyu-modules/muyu-job/src/main/java/com/muyu/job/util/JobInvokeUtil.java b/muyu-modules/muyu-modules-job/src/main/java/com/muyu/job/util/JobInvokeUtil.java similarity index 100% rename from muyu-modules/muyu-job/src/main/java/com/muyu/job/util/JobInvokeUtil.java rename to muyu-modules/muyu-modules-job/src/main/java/com/muyu/job/util/JobInvokeUtil.java diff --git a/muyu-modules/muyu-job/src/main/java/com/muyu/job/util/QuartzDisallowConcurrentExecution.java b/muyu-modules/muyu-modules-job/src/main/java/com/muyu/job/util/QuartzDisallowConcurrentExecution.java similarity index 100% rename from muyu-modules/muyu-job/src/main/java/com/muyu/job/util/QuartzDisallowConcurrentExecution.java rename to muyu-modules/muyu-modules-job/src/main/java/com/muyu/job/util/QuartzDisallowConcurrentExecution.java diff --git a/muyu-modules/muyu-job/src/main/java/com/muyu/job/util/QuartzJobExecution.java b/muyu-modules/muyu-modules-job/src/main/java/com/muyu/job/util/QuartzJobExecution.java similarity index 100% rename from muyu-modules/muyu-job/src/main/java/com/muyu/job/util/QuartzJobExecution.java rename to muyu-modules/muyu-modules-job/src/main/java/com/muyu/job/util/QuartzJobExecution.java diff --git a/muyu-modules/muyu-job/src/main/java/com/muyu/job/util/ScheduleUtils.java b/muyu-modules/muyu-modules-job/src/main/java/com/muyu/job/util/ScheduleUtils.java similarity index 100% rename from muyu-modules/muyu-job/src/main/java/com/muyu/job/util/ScheduleUtils.java rename to muyu-modules/muyu-modules-job/src/main/java/com/muyu/job/util/ScheduleUtils.java diff --git a/muyu-modules/muyu-system/src/main/resources/banner.txt b/muyu-modules/muyu-modules-job/src/main/resources/banner.txt similarity index 100% rename from muyu-modules/muyu-system/src/main/resources/banner.txt rename to muyu-modules/muyu-modules-job/src/main/resources/banner.txt diff --git a/muyu-modules/muyu-job/src/main/resources/bootstrap.yml b/muyu-modules/muyu-modules-job/src/main/resources/bootstrap.yml similarity index 100% rename from muyu-modules/muyu-job/src/main/resources/bootstrap.yml rename to muyu-modules/muyu-modules-job/src/main/resources/bootstrap.yml diff --git a/muyu-modules/muyu-job/src/main/resources/logback.xml b/muyu-modules/muyu-modules-job/src/main/resources/logback.xml similarity index 100% rename from muyu-modules/muyu-job/src/main/resources/logback.xml rename to muyu-modules/muyu-modules-job/src/main/resources/logback.xml diff --git a/muyu-modules/muyu-job/src/main/resources/mapper/job/SysJobLogMapper.xml b/muyu-modules/muyu-modules-job/src/main/resources/mapper/job/SysJobLogMapper.xml similarity index 100% rename from muyu-modules/muyu-job/src/main/resources/mapper/job/SysJobLogMapper.xml rename to muyu-modules/muyu-modules-job/src/main/resources/mapper/job/SysJobLogMapper.xml diff --git a/muyu-modules/muyu-job/src/main/resources/mapper/job/SysJobMapper.xml b/muyu-modules/muyu-modules-job/src/main/resources/mapper/job/SysJobMapper.xml similarity index 100% rename from muyu-modules/muyu-job/src/main/resources/mapper/job/SysJobMapper.xml rename to muyu-modules/muyu-modules-job/src/main/resources/mapper/job/SysJobMapper.xml diff --git a/muyu-modules/muyu-system/pom.xml b/muyu-modules/muyu-modules-system/pom.xml similarity index 100% rename from muyu-modules/muyu-system/pom.xml rename to muyu-modules/muyu-modules-system/pom.xml diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/MuYuSystemApplication.java b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/MuYuSystemApplication.java similarity index 100% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/MuYuSystemApplication.java rename to muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/MuYuSystemApplication.java diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysConfigController.java b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/controller/SysConfigController.java similarity index 100% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysConfigController.java rename to muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/controller/SysConfigController.java diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysDeptController.java b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/controller/SysDeptController.java similarity index 100% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysDeptController.java rename to muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/controller/SysDeptController.java diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysDictDataController.java b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/controller/SysDictDataController.java similarity index 100% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysDictDataController.java rename to muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/controller/SysDictDataController.java diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysDictTypeController.java b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/controller/SysDictTypeController.java similarity index 100% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysDictTypeController.java rename to muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/controller/SysDictTypeController.java diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysLogininforController.java b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/controller/SysLogininforController.java similarity index 100% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysLogininforController.java rename to muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/controller/SysLogininforController.java diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysMenuController.java b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/controller/SysMenuController.java similarity index 100% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysMenuController.java rename to muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/controller/SysMenuController.java diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysNoticeController.java b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/controller/SysNoticeController.java similarity index 100% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysNoticeController.java rename to muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/controller/SysNoticeController.java diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysOperlogController.java b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/controller/SysOperlogController.java similarity index 100% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysOperlogController.java rename to muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/controller/SysOperlogController.java diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysPostController.java b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/controller/SysPostController.java similarity index 100% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysPostController.java rename to muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/controller/SysPostController.java diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysProfileController.java b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/controller/SysProfileController.java similarity index 100% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysProfileController.java rename to muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/controller/SysProfileController.java diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysRoleController.java b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/controller/SysRoleController.java similarity index 100% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysRoleController.java rename to muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/controller/SysRoleController.java diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysUserController.java b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/controller/SysUserController.java similarity index 100% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysUserController.java rename to muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/controller/SysUserController.java diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysUserOnlineController.java b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/controller/SysUserOnlineController.java similarity index 100% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/controller/SysUserOnlineController.java rename to muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/controller/SysUserOnlineController.java diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/SysConfig.java b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/domain/SysConfig.java similarity index 100% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/SysConfig.java rename to muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/domain/SysConfig.java diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/SysMenu.java b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/domain/SysMenu.java similarity index 100% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/SysMenu.java rename to muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/domain/SysMenu.java diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/SysNotice.java b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/domain/SysNotice.java similarity index 100% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/SysNotice.java rename to muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/domain/SysNotice.java diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/SysPost.java b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/domain/SysPost.java similarity index 100% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/SysPost.java rename to muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/domain/SysPost.java diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/SysRoleDept.java b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/domain/SysRoleDept.java similarity index 100% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/SysRoleDept.java rename to muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/domain/SysRoleDept.java diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/SysRoleMenu.java b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/domain/SysRoleMenu.java similarity index 100% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/SysRoleMenu.java rename to muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/domain/SysRoleMenu.java diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/SysUserOnline.java b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/domain/SysUserOnline.java similarity index 100% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/SysUserOnline.java rename to muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/domain/SysUserOnline.java diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/SysUserPost.java b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/domain/SysUserPost.java similarity index 100% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/SysUserPost.java rename to muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/domain/SysUserPost.java diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/SysUserRole.java b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/domain/SysUserRole.java similarity index 100% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/SysUserRole.java rename to muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/domain/SysUserRole.java diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/resp/AuthRoleResp.java b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/domain/resp/AuthRoleResp.java similarity index 100% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/resp/AuthRoleResp.java rename to muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/domain/resp/AuthRoleResp.java diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/resp/DeptTreeResp.java b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/domain/resp/DeptTreeResp.java similarity index 100% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/resp/DeptTreeResp.java rename to muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/domain/resp/DeptTreeResp.java diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/resp/ProfileResp.java b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/domain/resp/ProfileResp.java similarity index 100% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/resp/ProfileResp.java rename to muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/domain/resp/ProfileResp.java diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/resp/RoleMenuTreeResp.java b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/domain/resp/RoleMenuTreeResp.java similarity index 100% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/resp/RoleMenuTreeResp.java rename to muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/domain/resp/RoleMenuTreeResp.java diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/resp/UserDetailInfoResp.java b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/domain/resp/UserDetailInfoResp.java similarity index 100% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/resp/UserDetailInfoResp.java rename to muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/domain/resp/UserDetailInfoResp.java diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/resp/UserInfoResp.java b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/domain/resp/UserInfoResp.java similarity index 100% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/resp/UserInfoResp.java rename to muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/domain/resp/UserInfoResp.java diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/vo/MetaVo.java b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/domain/vo/MetaVo.java similarity index 100% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/vo/MetaVo.java rename to muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/domain/vo/MetaVo.java diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/vo/RouterVo.java b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/domain/vo/RouterVo.java similarity index 100% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/vo/RouterVo.java rename to muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/domain/vo/RouterVo.java diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/vo/TreeSelect.java b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/domain/vo/TreeSelect.java similarity index 100% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/domain/vo/TreeSelect.java rename to muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/domain/vo/TreeSelect.java diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysConfigMapper.java b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/mapper/SysConfigMapper.java similarity index 100% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysConfigMapper.java rename to muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/mapper/SysConfigMapper.java diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysDeptMapper.java b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/mapper/SysDeptMapper.java similarity index 100% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysDeptMapper.java rename to muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/mapper/SysDeptMapper.java diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysDictDataMapper.java b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/mapper/SysDictDataMapper.java similarity index 100% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysDictDataMapper.java rename to muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/mapper/SysDictDataMapper.java diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysDictTypeMapper.java b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/mapper/SysDictTypeMapper.java similarity index 100% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysDictTypeMapper.java rename to muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/mapper/SysDictTypeMapper.java diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysLogininforMapper.java b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/mapper/SysLogininforMapper.java similarity index 100% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysLogininforMapper.java rename to muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/mapper/SysLogininforMapper.java diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysMenuMapper.java b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/mapper/SysMenuMapper.java similarity index 100% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysMenuMapper.java rename to muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/mapper/SysMenuMapper.java diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysNoticeMapper.java b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/mapper/SysNoticeMapper.java similarity index 100% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysNoticeMapper.java rename to muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/mapper/SysNoticeMapper.java diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysOperLogMapper.java b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/mapper/SysOperLogMapper.java similarity index 100% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysOperLogMapper.java rename to muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/mapper/SysOperLogMapper.java diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysPostMapper.java b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/mapper/SysPostMapper.java similarity index 100% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysPostMapper.java rename to muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/mapper/SysPostMapper.java diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysRoleDeptMapper.java b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/mapper/SysRoleDeptMapper.java similarity index 100% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysRoleDeptMapper.java rename to muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/mapper/SysRoleDeptMapper.java diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysRoleMapper.java b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/mapper/SysRoleMapper.java similarity index 100% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysRoleMapper.java rename to muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/mapper/SysRoleMapper.java diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysRoleMenuMapper.java b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/mapper/SysRoleMenuMapper.java similarity index 100% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysRoleMenuMapper.java rename to muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/mapper/SysRoleMenuMapper.java diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysUserMapper.java b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/mapper/SysUserMapper.java similarity index 100% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysUserMapper.java rename to muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/mapper/SysUserMapper.java diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysUserPostMapper.java b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/mapper/SysUserPostMapper.java similarity index 100% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysUserPostMapper.java rename to muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/mapper/SysUserPostMapper.java diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysUserRoleMapper.java b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/mapper/SysUserRoleMapper.java similarity index 100% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/mapper/SysUserRoleMapper.java rename to muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/mapper/SysUserRoleMapper.java diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysConfigService.java b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/service/SysConfigService.java similarity index 100% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysConfigService.java rename to muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/service/SysConfigService.java diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysDeptService.java b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/service/SysDeptService.java similarity index 100% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysDeptService.java rename to muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/service/SysDeptService.java diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysDictDataService.java b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/service/SysDictDataService.java similarity index 100% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysDictDataService.java rename to muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/service/SysDictDataService.java diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysDictTypeService.java b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/service/SysDictTypeService.java similarity index 100% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysDictTypeService.java rename to muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/service/SysDictTypeService.java diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysLogininforService.java b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/service/SysLogininforService.java similarity index 100% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysLogininforService.java rename to muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/service/SysLogininforService.java diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysMenuService.java b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/service/SysMenuService.java similarity index 100% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysMenuService.java rename to muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/service/SysMenuService.java diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysNoticeService.java b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/service/SysNoticeService.java similarity index 100% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysNoticeService.java rename to muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/service/SysNoticeService.java diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysOperLogService.java b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/service/SysOperLogService.java similarity index 100% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysOperLogService.java rename to muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/service/SysOperLogService.java diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysPermissionService.java b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/service/SysPermissionService.java similarity index 100% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysPermissionService.java rename to muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/service/SysPermissionService.java diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysPostService.java b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/service/SysPostService.java similarity index 100% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysPostService.java rename to muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/service/SysPostService.java diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysRoleService.java b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/service/SysRoleService.java similarity index 100% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysRoleService.java rename to muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/service/SysRoleService.java diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysUserOnlineService.java b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/service/SysUserOnlineService.java similarity index 100% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysUserOnlineService.java rename to muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/service/SysUserOnlineService.java diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysUserService.java b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/service/SysUserService.java similarity index 100% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/service/SysUserService.java rename to muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/service/SysUserService.java diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysConfigServiceImpl.java b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/service/impl/SysConfigServiceImpl.java similarity index 100% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysConfigServiceImpl.java rename to muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/service/impl/SysConfigServiceImpl.java diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysDeptServiceImpl.java b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/service/impl/SysDeptServiceImpl.java similarity index 100% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysDeptServiceImpl.java rename to muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/service/impl/SysDeptServiceImpl.java diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysDictDataServiceImpl.java b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/service/impl/SysDictDataServiceImpl.java similarity index 100% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysDictDataServiceImpl.java rename to muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/service/impl/SysDictDataServiceImpl.java diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysDictTypeServiceImpl.java b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/service/impl/SysDictTypeServiceImpl.java similarity index 100% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysDictTypeServiceImpl.java rename to muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/service/impl/SysDictTypeServiceImpl.java diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysLogininforServiceImpl.java b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/service/impl/SysLogininforServiceImpl.java similarity index 100% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysLogininforServiceImpl.java rename to muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/service/impl/SysLogininforServiceImpl.java diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysMenuServiceImpl.java b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/service/impl/SysMenuServiceImpl.java similarity index 100% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysMenuServiceImpl.java rename to muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/service/impl/SysMenuServiceImpl.java diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysNoticeServiceImpl.java b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/service/impl/SysNoticeServiceImpl.java similarity index 100% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysNoticeServiceImpl.java rename to muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/service/impl/SysNoticeServiceImpl.java diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysOperLogServiceImpl.java b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/service/impl/SysOperLogServiceImpl.java similarity index 100% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysOperLogServiceImpl.java rename to muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/service/impl/SysOperLogServiceImpl.java diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysPermissionServiceImpl.java b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/service/impl/SysPermissionServiceImpl.java similarity index 100% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysPermissionServiceImpl.java rename to muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/service/impl/SysPermissionServiceImpl.java diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysPostServiceImpl.java b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/service/impl/SysPostServiceImpl.java similarity index 100% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysPostServiceImpl.java rename to muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/service/impl/SysPostServiceImpl.java diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysRoleServiceImpl.java b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/service/impl/SysRoleServiceImpl.java similarity index 100% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysRoleServiceImpl.java rename to muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/service/impl/SysRoleServiceImpl.java diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysUserOnlineServiceImpl.java b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/service/impl/SysUserOnlineServiceImpl.java similarity index 100% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysUserOnlineServiceImpl.java rename to muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/service/impl/SysUserOnlineServiceImpl.java diff --git a/muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysUserServiceImpl.java b/muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/service/impl/SysUserServiceImpl.java similarity index 100% rename from muyu-modules/muyu-system/src/main/java/com/muyu/system/service/impl/SysUserServiceImpl.java rename to muyu-modules/muyu-modules-system/src/main/java/com/muyu/system/service/impl/SysUserServiceImpl.java diff --git a/muyu-modules/muyu-modules-system/src/main/resources/banner.txt b/muyu-modules/muyu-modules-system/src/main/resources/banner.txt new file mode 100644 index 0000000..0dd5eee --- /dev/null +++ b/muyu-modules/muyu-modules-system/src/main/resources/banner.txt @@ -0,0 +1,2 @@ +Spring Boot Version: ${spring-boot.version} +Spring Application Name: ${spring.application.name} diff --git a/muyu-modules/muyu-system/src/main/resources/bootstrap.yml b/muyu-modules/muyu-modules-system/src/main/resources/bootstrap.yml similarity index 100% rename from muyu-modules/muyu-system/src/main/resources/bootstrap.yml rename to muyu-modules/muyu-modules-system/src/main/resources/bootstrap.yml diff --git a/muyu-modules/muyu-modules-system/src/main/resources/logback.xml b/muyu-modules/muyu-modules-system/src/main/resources/logback.xml new file mode 100644 index 0000000..d8ec854 --- /dev/null +++ b/muyu-modules/muyu-modules-system/src/main/resources/logback.xml @@ -0,0 +1,74 @@ + + + + + + + + + + + ${log.pattern} + + + + + + ${log.path}/info.log + + + + ${log.path}/info.%d{yyyy-MM-dd}.log + + 60 + + + ${log.pattern} + + + + INFO + + ACCEPT + + DENY + + + + + ${log.path}/error.log + + + + ${log.path}/error.%d{yyyy-MM-dd}.log + + 60 + + + ${log.pattern} + + + + ERROR + + ACCEPT + + DENY + + + + + + + + + + + + + + + + + + diff --git a/muyu-modules/muyu-system/src/main/resources/mapper/system/SysConfigMapper.xml b/muyu-modules/muyu-modules-system/src/main/resources/mapper/system/SysConfigMapper.xml similarity index 100% rename from muyu-modules/muyu-system/src/main/resources/mapper/system/SysConfigMapper.xml rename to muyu-modules/muyu-modules-system/src/main/resources/mapper/system/SysConfigMapper.xml diff --git a/muyu-modules/muyu-system/src/main/resources/mapper/system/SysDeptMapper.xml b/muyu-modules/muyu-modules-system/src/main/resources/mapper/system/SysDeptMapper.xml similarity index 100% rename from muyu-modules/muyu-system/src/main/resources/mapper/system/SysDeptMapper.xml rename to muyu-modules/muyu-modules-system/src/main/resources/mapper/system/SysDeptMapper.xml diff --git a/muyu-modules/muyu-system/src/main/resources/mapper/system/SysDictDataMapper.xml b/muyu-modules/muyu-modules-system/src/main/resources/mapper/system/SysDictDataMapper.xml similarity index 100% rename from muyu-modules/muyu-system/src/main/resources/mapper/system/SysDictDataMapper.xml rename to muyu-modules/muyu-modules-system/src/main/resources/mapper/system/SysDictDataMapper.xml diff --git a/muyu-modules/muyu-system/src/main/resources/mapper/system/SysDictTypeMapper.xml b/muyu-modules/muyu-modules-system/src/main/resources/mapper/system/SysDictTypeMapper.xml similarity index 100% rename from muyu-modules/muyu-system/src/main/resources/mapper/system/SysDictTypeMapper.xml rename to muyu-modules/muyu-modules-system/src/main/resources/mapper/system/SysDictTypeMapper.xml diff --git a/muyu-modules/muyu-system/src/main/resources/mapper/system/SysLogininforMapper.xml b/muyu-modules/muyu-modules-system/src/main/resources/mapper/system/SysLogininforMapper.xml similarity index 100% rename from muyu-modules/muyu-system/src/main/resources/mapper/system/SysLogininforMapper.xml rename to muyu-modules/muyu-modules-system/src/main/resources/mapper/system/SysLogininforMapper.xml diff --git a/muyu-modules/muyu-system/src/main/resources/mapper/system/SysMenuMapper.xml b/muyu-modules/muyu-modules-system/src/main/resources/mapper/system/SysMenuMapper.xml similarity index 100% rename from muyu-modules/muyu-system/src/main/resources/mapper/system/SysMenuMapper.xml rename to muyu-modules/muyu-modules-system/src/main/resources/mapper/system/SysMenuMapper.xml diff --git a/muyu-modules/muyu-system/src/main/resources/mapper/system/SysNoticeMapper.xml b/muyu-modules/muyu-modules-system/src/main/resources/mapper/system/SysNoticeMapper.xml similarity index 100% rename from muyu-modules/muyu-system/src/main/resources/mapper/system/SysNoticeMapper.xml rename to muyu-modules/muyu-modules-system/src/main/resources/mapper/system/SysNoticeMapper.xml diff --git a/muyu-modules/muyu-system/src/main/resources/mapper/system/SysOperLogMapper.xml b/muyu-modules/muyu-modules-system/src/main/resources/mapper/system/SysOperLogMapper.xml similarity index 100% rename from muyu-modules/muyu-system/src/main/resources/mapper/system/SysOperLogMapper.xml rename to muyu-modules/muyu-modules-system/src/main/resources/mapper/system/SysOperLogMapper.xml diff --git a/muyu-modules/muyu-system/src/main/resources/mapper/system/SysPostMapper.xml b/muyu-modules/muyu-modules-system/src/main/resources/mapper/system/SysPostMapper.xml similarity index 100% rename from muyu-modules/muyu-system/src/main/resources/mapper/system/SysPostMapper.xml rename to muyu-modules/muyu-modules-system/src/main/resources/mapper/system/SysPostMapper.xml diff --git a/muyu-modules/muyu-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml b/muyu-modules/muyu-modules-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml similarity index 100% rename from muyu-modules/muyu-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml rename to muyu-modules/muyu-modules-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml diff --git a/muyu-modules/muyu-system/src/main/resources/mapper/system/SysRoleMapper.xml b/muyu-modules/muyu-modules-system/src/main/resources/mapper/system/SysRoleMapper.xml similarity index 100% rename from muyu-modules/muyu-system/src/main/resources/mapper/system/SysRoleMapper.xml rename to muyu-modules/muyu-modules-system/src/main/resources/mapper/system/SysRoleMapper.xml diff --git a/muyu-modules/muyu-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml b/muyu-modules/muyu-modules-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml similarity index 100% rename from muyu-modules/muyu-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml rename to muyu-modules/muyu-modules-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml diff --git a/muyu-modules/muyu-system/src/main/resources/mapper/system/SysUserMapper.xml b/muyu-modules/muyu-modules-system/src/main/resources/mapper/system/SysUserMapper.xml similarity index 100% rename from muyu-modules/muyu-system/src/main/resources/mapper/system/SysUserMapper.xml rename to muyu-modules/muyu-modules-system/src/main/resources/mapper/system/SysUserMapper.xml diff --git a/muyu-modules/muyu-system/src/main/resources/mapper/system/SysUserPostMapper.xml b/muyu-modules/muyu-modules-system/src/main/resources/mapper/system/SysUserPostMapper.xml similarity index 100% rename from muyu-modules/muyu-system/src/main/resources/mapper/system/SysUserPostMapper.xml rename to muyu-modules/muyu-modules-system/src/main/resources/mapper/system/SysUserPostMapper.xml diff --git a/muyu-modules/muyu-system/src/main/resources/mapper/system/SysUserRoleMapper.xml b/muyu-modules/muyu-modules-system/src/main/resources/mapper/system/SysUserRoleMapper.xml similarity index 100% rename from muyu-modules/muyu-system/src/main/resources/mapper/system/SysUserRoleMapper.xml rename to muyu-modules/muyu-modules-system/src/main/resources/mapper/system/SysUserRoleMapper.xml diff --git a/muyu-modules/pom.xml b/muyu-modules/pom.xml index 34413f7..347ab9b 100644 --- a/muyu-modules/pom.xml +++ b/muyu-modules/pom.xml @@ -3,18 +3,19 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> com.muyu - muyu + clw-server 3.6.3 4.0.0 - muyu-system - muyu-gen - muyu-job - muyu-file + muyu-modules-system + muyu-modules-gen + muyu-modules-job + muyu-modules-file muyu-company muyu-businessPlatform + muyu-common-many-dataSourceMany muyu-modules diff --git a/muyu-visual/pom.xml b/muyu-visual/pom.xml index 883b38c..28843d7 100644 --- a/muyu-visual/pom.xml +++ b/muyu-visual/pom.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> com.muyu - muyu + clw-server 3.6.3 4.0.0 diff --git a/pom.xml b/pom.xml index e1e4812..313ba91 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 com.muyu - muyu + clw-server 3.6.3 muyu