diff --git a/pom.xml b/pom.xml deleted file mode 100644 index 0ea61c65..00000000 --- a/pom.xml +++ /dev/null @@ -1,412 +0,0 @@ - - - 4.0.0 - - com.yanzhu - yanzhu - 3.6.2 - - yanzhu - http://www.sxyanzhu.com - 研筑微服务系统 - - - 3.6.2 - UTF-8 - UTF-8 - 1.8 - 2.7.7 - 2021.0.5 - 2021.0.4.0 - 2.7.10 - 3.0.0 - 1.6.2 - 1.27.2 - 2.3.3 - 1.4.6 - 1.2.16 - 3.5.2 - 2.16.1 - 1.18.16 - 2.3 - 2.0.23 - 0.9.1 - 8.2.2 - 5.3.0 - 2.5.1 - 4.0.6.B - 4.0.6.B - 2.14.2 - 5.8.20 - 1.9.1 - 2.1.7 - 1.12.0 - 1.0 - 5.5.13 - 15.8.0 - - - - - - - - - org.springframework.cloud - spring-cloud-dependencies - ${spring-cloud.version} - pom - import - - - - - com.alibaba.cloud - spring-cloud-alibaba-dependencies - ${spring-cloud-alibaba.version} - pom - import - - - - - org.springframework.boot - spring-boot-dependencies - ${spring-boot.version} - pom - import - - - - - com.github.tobato - fastdfs-client - ${tobato.version} - - - - - io.swagger - swagger-models - ${swagger.core.version} - - - io.swagger - swagger-annotations - ${swagger.core.version} - - - - - pro.fessional - kaptcha - ${kaptcha.version} - - - - - com.github.pagehelper - pagehelper-spring-boot-starter - ${pagehelper.boot.version} - - - - - commons-io - commons-io - ${commons.io.version} - - - - - org.apache.poi - poi-ooxml - ${poi.version} - - - - - com.lowagie - itext - ${lowagie.version} - - - - com.lowagie - itext-rtf - ${lowagie.version} - - - - com.lowagie - iTextAsian - ${lowagie.iTextAsian.version} - - - - - org.apache.poi - poi - ${poi.version} - - - - org.apache.poi - poi-ooxml-schemas - 4.1.2 - - - - com.deepoove - poi-tl - ${poi-tl.version} - - - - - org.aspectj - aspectjweaver - ${aspectjweaver.version} - - - - com.aspose - aspose-words - ${aspose.words.version} - - - - - org.apache.velocity - velocity-engine-core - ${velocity.version} - - - - - com.alibaba.fastjson2 - fastjson2 - ${fastjson.version} - - - - - io.jsonwebtoken - jjwt - ${jjwt.version} - - - - - com.alibaba - transmittable-thread-local - ${transmittable-thread-local.version} - - - - - com.belerweb - pinyin4j - ${pinyin4j.version} - - - - - com.github.binarywang - weixin-java-mp - ${weixin.mp.version} - - - - - com.github.binarywang - weixin-java-miniapp - ${weixin.miniapp.version} - - - - - com.yanzhu - yanzhu-common-core - ${yanzhu.version} - - - - - com.yanzhu - yanzhu-common-swagger - ${yanzhu.version} - - - - - com.yanzhu - yanzhu-common-security - ${yanzhu.version} - - - - - com.yanzhu - yanzhu-common-datascope - ${yanzhu.version} - - - - - com.yanzhu - yanzhu-common-datasource - ${yanzhu.version} - - - - - com.yanzhu - yanzhu-common-log - ${yanzhu.version} - - - - - com.yanzhu - yanzhu-common-redis - ${yanzhu.version} - - - - - com.yanzhu - yanzhu-api-system - ${yanzhu.version} - - - - net.sf.mpxj - mpxj - 13.0.2 - - - - - - - yanzhu-api - yanzhu-common - yanzhu-auth - yanzhu-gateway - yanzhu-modules - yanzhu-monitor - yanzhu-rocketmq - - pom - - - - - org.springframework.cloud - spring-cloud-starter-bootstrap - - - - - - - - org.springframework.boot - spring-boot-maven-plugin - ${spring-boot.version} - - - - repackage - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - ${java.version} - ${java.version} - ${project.build.sourceEncoding} - - - - - - - - - public - aliyun nexus - https://maven.aliyun.com/repository/public - - true - - - - - - - public - aliyun nexus - https://maven.aliyun.com/repository/public - - true - - - false - - - - - - - - 本地服务器环境 - - - 本地服务器环境 - 62.234.3.186:8848 - - - - - 测试服务器环境 - - 测试服务器环境 - 62.234.3.186:8848 - - - - true - - - - 线上服务器环境 - - 线上服务器环境 - 0.0.0.0:8848 - - - - - docker测试环境1 - - docker测试环境1 - http://0.0.0.0:5001 - - - - docker测试环境2 - - docker测试环境2 - http://0.0.0.0:5001 - - - - - \ No newline at end of file diff --git a/yanzhu-api/pom.xml b/yanzhu-api/pom.xml deleted file mode 100644 index 47ec57cf..00000000 --- a/yanzhu-api/pom.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - com.yanzhu - yanzhu - 3.6.2 - - 4.0.0 - - - yanzhu-api-system - - - yanzhu-api - pom - - - yanzhu-api系统接口 - - - diff --git a/yanzhu-api/yanzhu-api-system/pom.xml b/yanzhu-api/yanzhu-api-system/pom.xml deleted file mode 100644 index be9fb913..00000000 --- a/yanzhu-api/yanzhu-api-system/pom.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - com.yanzhu - yanzhu-api - 3.6.2 - - 4.0.0 - - yanzhu-api-system - - - yanzhu-api-system系统接口模块 - - - - - - - com.yanzhu - yanzhu-common-core - - - - - \ No newline at end of file diff --git a/yanzhu-auth/pom.xml b/yanzhu-auth/pom.xml deleted file mode 100644 index be53cfe8..00000000 --- a/yanzhu-auth/pom.xml +++ /dev/null @@ -1,154 +0,0 @@ - - - com.yanzhu - yanzhu - 3.6.2 - - 4.0.0 - - yanzhu-auth - - - yanzhu-auth认证授权中心 - - - - - - - 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-web - - - - - org.springframework.boot - spring-boot-starter-actuator - - - - - com.yanzhu - yanzhu-common-security - - - - - - - - org.springframework.boot - spring-boot-maven-plugin - 2.5.15 - - true - - - - - repackage - - - - - - org.apache.maven.plugins - maven-war-plugin - 3.1.0 - - false - ${project.artifactId} - - - - ${project.artifactId} - - - - src/main/resources - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/yanzhu-auth/src/main/resources/bootstrap.yml b/yanzhu-auth/src/main/resources/bootstrap.yml deleted file mode 100644 index d54c82d2..00000000 --- a/yanzhu-auth/src/main/resources/bootstrap.yml +++ /dev/null @@ -1,27 +0,0 @@ -# Tomcat -server: - port: 9200 - -# Spring -spring: - application: - # 应用名称 - name: yanzhu-auth - profiles: - # 环境配置 - active: dev - cloud: - nacos: - discovery: - # 服务注册地址 - server-addr: @discovery.server-addr@ - # 服务分组 - group: lijun - config: - # 配置中心地址 - server-addr: @discovery.server-addr@ - # 配置文件格式 - file-extension: yml - # 共享配置 - shared-configs: - - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} diff --git a/yanzhu-common/pom.xml b/yanzhu-common/pom.xml deleted file mode 100644 index 882033ed..00000000 --- a/yanzhu-common/pom.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - com.yanzhu - yanzhu - 3.6.2 - - 4.0.0 - - - yanzhu-common-log - yanzhu-common-core - yanzhu-common-redis - yanzhu-common-swagger - yanzhu-common-security - yanzhu-common-datascope - yanzhu-common-datasource - yanzhu-common-mapper - - - yanzhu-common - pom - - - yanzhu-common通用模块 - - - diff --git a/yanzhu-common/yanzhu-common-core/pom.xml b/yanzhu-common/yanzhu-common-core/pom.xml deleted file mode 100644 index 474002f4..00000000 --- a/yanzhu-common/yanzhu-common-core/pom.xml +++ /dev/null @@ -1,147 +0,0 @@ - - - - com.yanzhu - yanzhu-common - 3.6.2 - - 4.0.0 - - yanzhu-common-core - - - yanzhu-common-core核心模块 - - - - - - - org.springframework.cloud - spring-cloud-starter-openfeign - - - - - org.springframework.cloud - spring-cloud-starter-loadbalancer - - - - - org.springframework - spring-context-support - - - - - org.springframework - spring-web - - - - - com.alibaba - transmittable-thread-local - - - - - com.github.pagehelper - pagehelper-spring-boot-starter - - - - - org.springframework.boot - spring-boot-starter-validation - - - - - com.fasterxml.jackson.core - jackson-databind - - - - - com.alibaba.fastjson2 - fastjson2 - - - - - io.jsonwebtoken - jjwt - - - - - javax.xml.bind - jaxb-api - - - - - org.apache.commons - commons-lang3 - - - - - commons-io - commons-io - - - - - org.apache.poi - poi-ooxml - - - - - javax.servlet - javax.servlet-api - - - - - io.swagger - swagger-annotations - - - - org.projectlombok - lombok - - - - - com.belerweb - pinyin4j - - - - - com.github.binarywang - weixin-java-mp - - - - - com.github.binarywang - weixin-java-miniapp - - - - - cn.hutool - hutool-core - ${hutool.version} - - - - diff --git a/yanzhu-common/yanzhu-common-datascope/pom.xml b/yanzhu-common/yanzhu-common-datascope/pom.xml deleted file mode 100644 index a836d788..00000000 --- a/yanzhu-common/yanzhu-common-datascope/pom.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - com.yanzhu - yanzhu-common - 3.6.2 - - 4.0.0 - - yanzhu-common-datascope - - - yanzhu-common-datascope权限范围 - - - - - - - com.yanzhu - yanzhu-common-security - - - - \ No newline at end of file diff --git a/yanzhu-common/yanzhu-common-datasource/pom.xml b/yanzhu-common/yanzhu-common-datasource/pom.xml deleted file mode 100644 index d8933f3d..00000000 --- a/yanzhu-common/yanzhu-common-datasource/pom.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - com.yanzhu - yanzhu-common - 3.6.2 - - 4.0.0 - - yanzhu-common-datasource - - - yanzhu-common-datasource多数据源 - - - - - - - com.alibaba - druid-spring-boot-starter - ${druid.version} - - - - - com.baomidou - dynamic-datasource-spring-boot-starter - ${dynamic-ds.version} - - - - \ No newline at end of file diff --git a/yanzhu-common/yanzhu-common-log/pom.xml b/yanzhu-common/yanzhu-common-log/pom.xml deleted file mode 100644 index ee55dd7c..00000000 --- a/yanzhu-common/yanzhu-common-log/pom.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - com.yanzhu - yanzhu-common - 3.6.2 - - 4.0.0 - - yanzhu-common-log - - - yanzhu-common-log日志记录 - - - - - - - com.yanzhu - yanzhu-common-security - - - - \ No newline at end of file diff --git a/yanzhu-common/yanzhu-common-mapper/pom.xml b/yanzhu-common/yanzhu-common-mapper/pom.xml deleted file mode 100644 index 9ec699b0..00000000 --- a/yanzhu-common/yanzhu-common-mapper/pom.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - com.yanzhu - yanzhu-common - 3.6.2 - - 4.0.0 - - yanzhu-common-mapper - - - yanzhu-common-mapper - - - - - - - com.yanzhu - yanzhu-common-security - - - org.projectlombok - lombok - provided - - - - - \ No newline at end of file diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProMilestoneMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProMilestoneMapper.xml index 92b918eb..f4512124 100644 --- a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProMilestoneMapper.xml +++ b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProMilestoneMapper.xml @@ -103,10 +103,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" comid = #{comid}, project_id = #{projectId}, node_name = #{nodeName}, - scheduled_start = #{scheduledStart}, - scheduled_end = #{scheduledEnd}, - actual_start = #{actualStart}, - actual_end = #{actualEnd}, + scheduled_start = #{scheduledStart}, + scheduled_end = #{scheduledEnd}, + actual_start = #{actualStart}, + actual_end = #{actualEnd}, days = #{days}, explain_info = #{explainInfo}, is_del = #{isDel}, diff --git a/yanzhu-common/yanzhu-common-redis/pom.xml b/yanzhu-common/yanzhu-common-redis/pom.xml deleted file mode 100644 index 371bda26..00000000 --- a/yanzhu-common/yanzhu-common-redis/pom.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - com.yanzhu - yanzhu-common - 3.6.2 - - 4.0.0 - - yanzhu-common-redis - - - yanzhu-common-redis缓存服务 - - - - - - - org.springframework.boot - spring-boot-starter-data-redis - - - - - com.yanzhu - yanzhu-common-core - - - - \ No newline at end of file diff --git a/yanzhu-common/yanzhu-common-security/pom.xml b/yanzhu-common/yanzhu-common-security/pom.xml deleted file mode 100644 index ee89269e..00000000 --- a/yanzhu-common/yanzhu-common-security/pom.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - com.yanzhu - yanzhu-common - 3.6.2 - - 4.0.0 - - yanzhu-common-security - - - yanzhu-common-security安全模块 - - - - - - - org.springframework - spring-webmvc - - - - - com.yanzhu - yanzhu-api-system - - - - - com.yanzhu - yanzhu-common-redis - - - - - diff --git a/yanzhu-common/yanzhu-common-swagger/pom.xml b/yanzhu-common/yanzhu-common-swagger/pom.xml deleted file mode 100644 index b8aa9b90..00000000 --- a/yanzhu-common/yanzhu-common-swagger/pom.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - com.yanzhu - yanzhu-common - 3.6.2 - - 4.0.0 - - yanzhu-common-swagger - - - yanzhu-common-swagger系统接口 - - - - - - - org.springframework.boot - spring-boot-starter-web - - - - - io.springfox - springfox-swagger2 - ${swagger.fox.version} - - - - diff --git a/yanzhu-gateway/pom.xml b/yanzhu-gateway/pom.xml deleted file mode 100644 index c9e9bbf2..00000000 --- a/yanzhu-gateway/pom.xml +++ /dev/null @@ -1,190 +0,0 @@ - - - com.yanzhu - yanzhu - 3.6.2 - - 4.0.0 - - yanzhu-gateway - - - yanzhu-gateway网关模块 - - - - - - - org.springframework.cloud - spring-cloud-starter-gateway - - - - - 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 - - - - - com.alibaba.cloud - spring-cloud-alibaba-sentinel-gateway - - - - - com.alibaba.csp - sentinel-datasource-nacos - - - - - org.springframework.boot - spring-boot-starter-actuator - - - - - org.springframework.cloud - spring-cloud-loadbalancer - - - - - pro.fessional - kaptcha - - - - - com.yanzhu - yanzhu-common-redis - - - - - io.springfox - springfox-swagger-ui - ${swagger.fox.version} - - - io.springfox - springfox-swagger2 - ${swagger.fox.version} - - - - - - - - org.springframework.boot - spring-boot-maven-plugin - 2.5.15 - - true - - - - - repackage - - - - - - org.apache.maven.plugins - maven-war-plugin - 3.1.0 - - false - ${project.artifactId} - - - - ${project.artifactId} - - - - src/main/resources - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/yanzhu-gateway/src/main/resources/bootstrap.yml b/yanzhu-gateway/src/main/resources/bootstrap.yml deleted file mode 100644 index 884c5efc..00000000 --- a/yanzhu-gateway/src/main/resources/bootstrap.yml +++ /dev/null @@ -1,42 +0,0 @@ -# Tomcat -server: - port: 8080 - -# Spring -spring: - application: - # 应用名称 - name: yanzhu-gateway - profiles: - # 环境配置 - active: dev - cloud: - nacos: - discovery: - # 服务注册地址 - server-addr: @discovery.server-addr@ - # 服务分组 - group: lijun - config: - # 配置中心地址 - server-addr: @discovery.server-addr@ - # 配置文件格式 - file-extension: yml - # 共享配置 - shared-configs: - - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} - sentinel: - # 取消控制台懒加载 - eager: true - transport: - # 控制台地址 - dashboard: 62.234.3.186:8718 - # nacos配置持久化 - datasource: - ds1: - nacos: - server-addr: @discovery.server-addr@ - dataId: sentinel-ruoyi-gateway - groupId: DEFAULT_GROUP - data-type: json - rule-type: gw-flow diff --git a/yanzhu-modules/pom.xml b/yanzhu-modules/pom.xml deleted file mode 100644 index 800e5a5a..00000000 --- a/yanzhu-modules/pom.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - com.yanzhu - yanzhu - 3.6.2 - - 4.0.0 - - - yanzhu-system - yanzhu-gen - yanzhu-job - yanzhu-file - yanzhu-manage - yanzhu-wechat - yanzhu-flowable - - - yanzhu-modules - pom - - - yanzhu-modules分布式模块 - - - diff --git a/yanzhu-modules/yanzhu-file/pom.xml b/yanzhu-modules/yanzhu-file/pom.xml deleted file mode 100644 index 5296cfce..00000000 --- a/yanzhu-modules/yanzhu-file/pom.xml +++ /dev/null @@ -1,168 +0,0 @@ - - - - com.yanzhu - yanzhu-modules - 3.6.2 - - 4.0.0 - - yanzhu-modules-file - - - yanzhu-modules-file文件服务 - - - - - - - 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 - - - - - com.github.tobato - fastdfs-client - - - - - io.minio - minio - ${minio.version} - - - - - com.yanzhu - yanzhu-api-system - - - - - com.yanzhu - yanzhu-common-swagger - - - - - - - - org.springframework.boot - spring-boot-maven-plugin - 2.5.15 - - true - - - - - repackage - - - - - - org.apache.maven.plugins - maven-war-plugin - 3.1.0 - - false - ${project.artifactId} - - - - ${project.artifactId} - - - - src/main/resources - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/yanzhu-modules/yanzhu-file/src/main/java/com/yanzhu/file/utils/FileUploadUtils.java b/yanzhu-modules/yanzhu-file/src/main/java/com/yanzhu/file/utils/FileUploadUtils.java index fd0e78bf..b6593d10 100644 --- a/yanzhu-modules/yanzhu-file/src/main/java/com/yanzhu/file/utils/FileUploadUtils.java +++ b/yanzhu-modules/yanzhu-file/src/main/java/com/yanzhu/file/utils/FileUploadUtils.java @@ -10,7 +10,10 @@ import java.util.Objects; import cn.hutool.core.img.ImgUtil; import cn.hutool.core.io.FileUtil; +import com.alibaba.nacos.common.utils.MD5Utils; +import com.yanzhu.common.core.utils.ServletUtils; import com.yanzhu.common.core.utils.file.FileUtils; +import com.yanzhu.common.core.utils.uuid.UUID; import org.apache.commons.io.FilenameUtils; import org.springframework.web.multipart.MultipartFile; import com.yanzhu.common.core.exception.file.FileNameLengthLimitExceededException; @@ -260,7 +263,7 @@ public class FileUploadUtils public static final String extractFilename(MultipartFile file) { return StringUtils.format("{}/{}_{}.{}", DateUtils.datePath(), - FilenameUtils.getBaseName(file.getOriginalFilename()), Seq.getId(Seq.uploadSeqType), FileTypeUtils.getExtension(file)); + MD5Utils.md5Hex(FilenameUtils.getBaseName(file.getOriginalFilename()),"utf-8"), Seq.getId(Seq.uploadSeqType), FileTypeUtils.getExtension(file)); } private static final File getAbsoluteFile(String uploadDir, String fileName) throws IOException diff --git a/yanzhu-modules/yanzhu-file/src/main/resources/bootstrap.yml b/yanzhu-modules/yanzhu-file/src/main/resources/bootstrap.yml deleted file mode 100644 index 284fda00..00000000 --- a/yanzhu-modules/yanzhu-file/src/main/resources/bootstrap.yml +++ /dev/null @@ -1,27 +0,0 @@ -# Tomcat -server: - port: 9300 - -# Spring -spring: - application: - # 应用名称 - name: yanzhu-file - profiles: - # 环境配置 - active: dev - cloud: - nacos: - discovery: - # 服务注册地址 - server-addr: @discovery.server-addr@ - # 服务分组 - group: lijun - config: - # 配置中心地址 - server-addr: @discovery.server-addr@ - # 配置文件格式 - file-extension: yml - # 共享配置 - shared-configs: - - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} diff --git a/yanzhu-modules/yanzhu-flowable/pom.xml b/yanzhu-modules/yanzhu-flowable/pom.xml deleted file mode 100644 index 7339194c..00000000 --- a/yanzhu-modules/yanzhu-flowable/pom.xml +++ /dev/null @@ -1,213 +0,0 @@ - - - - yanzhu - com.yanzhu - 3.6.2 - ../../pom.xml - - 4.0.0 - - yanzhu-modules-flowable - - - 6.7.2 - 17 - 17 - - - - yanzhu-modules-flowable工作流模块 - - - - - - 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} - - - - - org.apache.velocity - velocity-engine-core - - - - - mysql - mysql-connector-java - - - - - com.yanzhu - yanzhu-common-log - - - - - com.yanzhu - yanzhu-common-swagger - - - - org.projectlombok - lombok - provided - - - - - com.yanzhu - yanzhu-common-mapper - 3.6.2 - compile - - - - - com.googlecode.aviator - aviator - 5.3.3 - - - - org.flowable - flowable-spring-boot-starter - ${flowable.version} - - - org.flowable - flowable-spring-security - - - - - - - - - - org.springframework.boot - spring-boot-maven-plugin - 2.5.15 - - true - - - - - repackage - - - - - - org.apache.maven.plugins - maven-war-plugin - 3.1.0 - - false - ${project.artifactId} - - - - ${project.artifactId} - - - - src/main/resources - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/yanzhu-modules/yanzhu-flowable/src/main/resources/bootstrap.yml b/yanzhu-modules/yanzhu-flowable/src/main/resources/bootstrap.yml deleted file mode 100644 index caefefeb..00000000 --- a/yanzhu-modules/yanzhu-flowable/src/main/resources/bootstrap.yml +++ /dev/null @@ -1,27 +0,0 @@ -# Tomcat -server: - port: 9205 - -# Spring -spring: - application: - # 应用名称 - name: yanzhu-flowable - profiles: - # 环境配置 - active: dev - cloud: - nacos: - discovery: - # 服务注册地址 - server-addr: @discovery.server-addr@ - # 服务分组 - group: JiangYuQi - config: - # 配置中心地址 - server-addr: @discovery.server-addr@ - # 配置文件格式 - file-extension: yml - # 共享配置 - shared-configs: - - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} diff --git a/yanzhu-modules/yanzhu-gen/pom.xml b/yanzhu-modules/yanzhu-gen/pom.xml deleted file mode 100644 index be477070..00000000 --- a/yanzhu-modules/yanzhu-gen/pom.xml +++ /dev/null @@ -1,137 +0,0 @@ - - - - com.yanzhu - yanzhu-modules - 3.6.2 - - 4.0.0 - - yanzhu-modules-gen - - - yanzhu-modules-gen代码生成 - - - - - - - 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} - - - - - org.apache.velocity - velocity-engine-core - - - - - mysql - mysql-connector-java - - - - - com.yanzhu - yanzhu-common-log - - - - - com.yanzhu - yanzhu-common-swagger - - - - - - ${project.artifactId} - - - org.springframework.boot - spring-boot-maven-plugin - - - - repackage - - - - - - - com.spotify - docker-maven-plugin - 1.2.0 - - - ${project.build.finalName} - latest - - openjdk:latest - - ["java", "-jar", "/${project.build.finalName}.jar"] - - true - ${configuration.docker-one-Host} - - - / - - ${project.build.directory} - - ${project.build.finalName}.jar - - - - - - build-image - package - - build - - - - - - - - - src/main/resources - true - - - - - \ No newline at end of file diff --git a/yanzhu-modules/yanzhu-gen/src/main/resources/bootstrap.yml b/yanzhu-modules/yanzhu-gen/src/main/resources/bootstrap.yml deleted file mode 100644 index 15150440..00000000 --- a/yanzhu-modules/yanzhu-gen/src/main/resources/bootstrap.yml +++ /dev/null @@ -1,27 +0,0 @@ -# Tomcat -server: - port: 9202 - -# Spring -spring: - application: - # 应用名称 - name: yanzhu-gen - profiles: - # 环境配置 - active: dev - cloud: - nacos: - discovery: - # 服务注册地址 - server-addr: @discovery.server-addr@ - # 服务分组 - group: lijun - config: - # 配置中心地址 - server-addr: @discovery.server-addr@ - # 配置文件格式 - file-extension: yml - # 共享配置 - shared-configs: - - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} diff --git a/yanzhu-modules/yanzhu-job/pom.xml b/yanzhu-modules/yanzhu-job/pom.xml deleted file mode 100644 index 3f990b9e..00000000 --- a/yanzhu-modules/yanzhu-job/pom.xml +++ /dev/null @@ -1,143 +0,0 @@ - - - - com.yanzhu - yanzhu-modules - 3.6.2 - - 4.0.0 - - yanzhu-modules-job - - - yanzhu-modules-job定时任务 - - - - - - - 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} - - - - - org.quartz-scheduler - quartz - - - com.mchange - c3p0 - - - - - - - mysql - mysql-connector-java - - - - - com.yanzhu - yanzhu-common-log - - - - - com.yanzhu - yanzhu-common-swagger - - - - - - ${project.artifactId} - - - org.springframework.boot - spring-boot-maven-plugin - - - - repackage - - - - - - - com.spotify - docker-maven-plugin - 1.2.0 - - - ${project.build.finalName} - latest - - openjdk:latest - - ["java", "-jar", "/${project.build.finalName}.jar"] - - true - ${configuration.docker-two-Host} - - - / - - ${project.build.directory} - - ${project.build.finalName}.jar - - - - - - build-image - package - - build - - - - - - - - - src/main/resources - true - - - - - \ No newline at end of file diff --git a/yanzhu-modules/yanzhu-job/src/main/resources/bootstrap.yml b/yanzhu-modules/yanzhu-job/src/main/resources/bootstrap.yml deleted file mode 100644 index 9ac3298f..00000000 --- a/yanzhu-modules/yanzhu-job/src/main/resources/bootstrap.yml +++ /dev/null @@ -1,27 +0,0 @@ -# Tomcat -server: - port: 9203 - -# Spring -spring: - application: - # 应用名称 - name: yanzhu-job - profiles: - # 环境配置 - active: dev - cloud: - nacos: - discovery: - # 服务注册地址 - server-addr: @discovery.server-addr@ - # 服务分组 - group: JiangYuQi - config: - # 配置中心地址 - server-addr: @discovery.server-addr@ - # 配置文件格式 - file-extension: yml - # 共享配置 - shared-configs: - - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} diff --git a/yanzhu-modules/yanzhu-manage/pom.xml b/yanzhu-modules/yanzhu-manage/pom.xml deleted file mode 100644 index efb0abec..00000000 --- a/yanzhu-modules/yanzhu-manage/pom.xml +++ /dev/null @@ -1,279 +0,0 @@ - - - - yanzhu - com.yanzhu - 3.6.2 - ../../pom.xml - - 4.0.0 - - yanzhu-modules-manage - - - 17 - 17 - - - - yanzhu-modules-manage业务模块 - - - - - - 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} - - - - - org.apache.velocity - velocity-engine-core - - - - - mysql - mysql-connector-java - - - - - com.yanzhu - yanzhu-common-log - - - - - com.yanzhu - yanzhu-common-swagger - - - - com.squareup.okhttp3 - okhttp - 4.9.3 - - - - - com.yanzhu - yanzhu-common-mapper - 3.6.2 - compile - - - - - org.apache.poi - poi - - - - - org.apache.poi - poi-ooxml - - - - org.apache.poi - poi-ooxml-schemas - - - - com.lowagie - itext - - - - com.lowagie - itext-rtf - - - - com.lowagie - iTextAsian - 1.0.0 - system - ${pom.basedir}/libs/iTextAsian-1.0.0.jar - - - - com.deepoove - poi-tl - - - - - - org.aspectj - aspectjweaver - - - - com.aspose - aspose-words - 15.8.0 - system - ${pom.basedir}/libs/aspose-words-15.8.0-jdk16.jar - - - - - - com.itextpdf - itextpdf - ${itextpdf.version} - - - - - org.jsoup - jsoup - 1.17.2 - - - - com.aspose - aspose-tasks - 24.10 - system - ${pom.basedir}/libs/aspose-tasks-24.10-jdk17.jar - - - net.sf.mpxj - mpxj - 13.5.1 - - - - - - - org.springframework.boot - spring-boot-maven-plugin - 2.5.15 - - true - true - - - - - repackage - - - - - - org.apache.maven.plugins - maven-war-plugin - 3.1.0 - - false - ${project.artifactId} - - - - ${project.artifactId} - - - - src/main/resources - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/yanzhu-modules/yanzhu-manage/src/main/resources/bootstrap.yml b/yanzhu-modules/yanzhu-manage/src/main/resources/bootstrap.yml deleted file mode 100644 index 629215d5..00000000 --- a/yanzhu-modules/yanzhu-manage/src/main/resources/bootstrap.yml +++ /dev/null @@ -1,31 +0,0 @@ -# Tomcat -server: - port: 9208 - -# Spring -spring: - application: - # 应用名称 - name: yanzhu-manage - profiles: - # 环境配置 - active: dev - cloud: - nacos: - discovery: - # 服务注册地址 - server-addr: @discovery.server-addr@ - # 服务分组 - group: lijun - config: - # 配置中心地址 - server-addr: @discovery.server-addr@ - # 配置文件格式 - file-extension: yml - # 共享配置 - shared-configs: - - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} - -logging: - level: - com.ycx.manage.mapper: DEBUG \ No newline at end of file diff --git a/yanzhu-modules/yanzhu-system/pom.xml b/yanzhu-modules/yanzhu-system/pom.xml deleted file mode 100644 index ad21b65d..00000000 --- a/yanzhu-modules/yanzhu-system/pom.xml +++ /dev/null @@ -1,193 +0,0 @@ - - - - com.yanzhu - yanzhu-modules - 3.6.2 - - 4.0.0 - - yanzhu-modules-system - - - yanzhu-modules-system系统模块 - - - - - - - org.apache.shardingsphere - shardingsphere-jdbc-core-spring-boot-starter - 5.1.2 - - - - - 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} - - - - - mysql - mysql-connector-java - - - - - com.yanzhu - yanzhu-common-datasource - - - - - com.yanzhu - yanzhu-common-log - - - - - com.yanzhu - yanzhu-common-swagger - - - - - com.yanzhu - yanzhu-common-datascope - - - com.yanzhu - yanzhu-common-mapper - 3.6.2 - compile - - - - - - - - org.springframework.boot - spring-boot-maven-plugin - 2.5.15 - - true - - - - - repackage - - - - - - org.apache.maven.plugins - maven-war-plugin - 3.1.0 - - false - ${project.artifactId} - - - - ${project.artifactId} - - - - src/main/resources - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/yanzhu-modules/yanzhu-system/src/main/resources/bootstrap.yml b/yanzhu-modules/yanzhu-system/src/main/resources/bootstrap.yml deleted file mode 100644 index efe975fc..00000000 --- a/yanzhu-modules/yanzhu-system/src/main/resources/bootstrap.yml +++ /dev/null @@ -1,27 +0,0 @@ -# Tomcat -server: - port: 9201 - -# Spring -spring: - application: - # 应用名称 - name: yanzhu-system - profiles: - # 环境配置 - active: dev - cloud: - nacos: - discovery: - # 服务注册地址 - server-addr: @discovery.server-addr@ - # 服务分组 - group: lijun - config: - # 配置中心地址 - server-addr: @discovery.server-addr@ - # 配置文件格式 - file-extension: yml - # 共享配置 - shared-configs: - - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} diff --git a/yanzhu-modules/yanzhu-wechat/pom.xml b/yanzhu-modules/yanzhu-wechat/pom.xml deleted file mode 100644 index 39d06841..00000000 --- a/yanzhu-modules/yanzhu-wechat/pom.xml +++ /dev/null @@ -1,154 +0,0 @@ - - - - yanzhu - com.yanzhu - 3.6.2 - ../../pom.xml - - 4.0.0 - - yanzhu-modules-wechat - - - 17 - 17 - - - - yanzhu-modules-wechat微信模块 - - - - - - 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} - - - - - org.apache.velocity - velocity-engine-core - - - - - mysql - mysql-connector-java - - - - - com.yanzhu - yanzhu-common-log - - - - - com.yanzhu - yanzhu-common-swagger - - - org.projectlombok - lombok - provided - - - - - com.yanzhu - yanzhu-common-mapper - 3.6.2 - compile - - - - - - ${project.artifactId} - - - org.springframework.boot - spring-boot-maven-plugin - - - - repackage - - - - - - - com.spotify - docker-maven-plugin - 1.2.0 - - - ${project.build.finalName} - latest - - openjdk:latest - - ["java", "-jar", "/${project.build.finalName}.jar"] - - true - ${configuration.docker-one-Host} - - - / - - ${project.build.directory} - - ${project.build.finalName}.jar - - - - - - build-image - package - - build - - - - - - - - - src/main/resources - true - - - - \ No newline at end of file diff --git a/yanzhu-modules/yanzhu-wechat/src/main/resources/bootstrap.yml b/yanzhu-modules/yanzhu-wechat/src/main/resources/bootstrap.yml deleted file mode 100644 index c9ae24ee..00000000 --- a/yanzhu-modules/yanzhu-wechat/src/main/resources/bootstrap.yml +++ /dev/null @@ -1,27 +0,0 @@ -# Tomcat -server: - port: 9206 - -# Spring -spring: - application: - # 应用名称 - name: yanzhu-wechat - profiles: - # 环境配置 - active: dev - cloud: - nacos: - discovery: - # 服务注册地址 - server-addr: @discovery.server-addr@ - # 服务分组 - group: JiangYuQi - config: - # 配置中心地址 - server-addr: @discovery.server-addr@ - # 配置文件格式 - file-extension: yml - # 共享配置 - shared-configs: - - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} diff --git a/yanzhu-monitor/pom.xml b/yanzhu-monitor/pom.xml deleted file mode 100644 index 103688b4..00000000 --- a/yanzhu-monitor/pom.xml +++ /dev/null @@ -1,119 +0,0 @@ - - - yanzhu - com.yanzhu - 3.6.2 - - 4.0.0 - - yanzhu-monitor - - - yanzhu-monitor监控中心 - - - - - - - de.codecentric - spring-boot-admin-starter-server - ${spring-boot-admin.version} - - - - - 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-web - - - - - org.springframework.boot - spring-boot-starter-security - - - - - - ${project.artifactId} - - - org.springframework.boot - spring-boot-maven-plugin - - - - repackage - - - - - - - com.spotify - docker-maven-plugin - 1.2.0 - - - ${project.build.finalName} - latest - - openjdk:latest - - ["java", "-jar", "/${project.build.finalName}.jar"] - - true - - ${configuration.docker-one-Host} - - - / - - ${project.build.directory} - - ${project.build.finalName}.jar - - - - - - build-image - package - - build - - - - - - - - - src/main/resources - true - - - - - \ No newline at end of file diff --git a/yanzhu-monitor/src/main/resources/bootstrap.yml b/yanzhu-monitor/src/main/resources/bootstrap.yml deleted file mode 100644 index 2c9a1c66..00000000 --- a/yanzhu-monitor/src/main/resources/bootstrap.yml +++ /dev/null @@ -1,27 +0,0 @@ -# Tomcat -server: - port: 9100 - -# Spring -spring: - application: - # 应用名称 - name: yanzhu-monitor - profiles: - # 环境配置 - active: dev - cloud: - nacos: - discovery: - # 服务注册地址 - server-addr: @discovery.server-addr@ - # 服务分组 - group: JiangYuQi - config: - # 配置中心地址 - server-addr: @discovery.server-addr@ - # 配置文件格式 - file-extension: yml - # 共享配置 - shared-configs: - - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} diff --git a/yanzhu-rocketmq/pom.xml b/yanzhu-rocketmq/pom.xml deleted file mode 100644 index 52ca2869..00000000 --- a/yanzhu-rocketmq/pom.xml +++ /dev/null @@ -1,144 +0,0 @@ - - - - yanzhu - com.yanzhu - 3.6.2 - - 4.0.0 - - yanzhu-rocketmq - - - - - org.apache.rocketmq - rocketmq-client - 4.9.0 - - - - - com.alibaba.cloud - spring-cloud-starter-alibaba-nacos-discovery - - - - - com.alibaba.cloud - spring-cloud-starter-alibaba-nacos-config - - - com.alibaba.nacos - nacos-client - - - - - com.alibaba.cloud - spring-cloud-starter-alibaba-sentinel - - - - - org.springframework.boot - spring-boot-starter-actuator - - - - - mysql - mysql-connector-java - - - - - com.yanzhu - yanzhu-common-log - - - - - com.yanzhu - yanzhu-common-swagger - - - com.yanzhu - yanzhu-common-security - - - org.projectlombok - lombok - - - - - org.yaml - snakeyaml - 1.28 - - - - - ${project.artifactId} - - - org.springframework.boot - spring-boot-maven-plugin - - - - repackage - - - - - - - com.spotify - docker-maven-plugin - 1.2.0 - - - ${project.build.finalName} - latest - - openjdk:latest - - ["java", "-jar", "/${project.build.finalName}.jar"] - - true - ${configuration.docker-one-Host} - - - / - - ${project.build.directory} - - ${project.build.finalName}.jar - - - - - - build-image - package - - build - - - - - - - - - src/main/resources - true - - - - - \ No newline at end of file diff --git a/yanzhu-rocketmq/src/main/resources/bootstrap.yml b/yanzhu-rocketmq/src/main/resources/bootstrap.yml deleted file mode 100644 index 368854c9..00000000 --- a/yanzhu-rocketmq/src/main/resources/bootstrap.yml +++ /dev/null @@ -1,38 +0,0 @@ -# Tomcat -server: - port: 9207 - -# Spring -spring: - application: - # 应用名称 - name: yanzhu-rocketmq - profiles: - # 环境配置 - active: dev - cloud: - nacos: - discovery: - # 服务注册地址 - server-addr: @discovery.server-addr@ - # 服务分组 - group: JiangYuQi - config: - # 配置中心地址 - server-addr: @discovery.server-addr@ - # 配置文件格式 - file-extension: yml - # 共享配置 - shared-configs: - - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} - - redisson: - singleServerConfig: - address: redis://localhost:6379 - -logging: - level: - com.yanzhu.app.mapper: DEBUG - - - diff --git a/yanzhu-ui-vue3/src/views/manage/proProjectInfo/index.vue b/yanzhu-ui-vue3/src/views/manage/proProjectInfo/index.vue index 5da913ae..3cbf6b6d 100644 --- a/yanzhu-ui-vue3/src/views/manage/proProjectInfo/index.vue +++ b/yanzhu-ui-vue3/src/views/manage/proProjectInfo/index.vue @@ -716,6 +716,8 @@ function submitForm() { getList(); }); } + }else{ + proxy.$modal.msgError("请检查必填数据(项目基本信息)"); } }); }