成本归集高度调整

This commit is contained in:
z 2026-03-18 10:57:13 +08:00
parent 7e596dfe89
commit ddaf9dbbf5
33 changed files with 59 additions and 1315 deletions

View File

@ -1,26 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-framework</artifactId>
<version>2.0.0-jdk8-snapshot</version>
</parent>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-spring-boot-starter-banner</artifactId>
<version>2.0.0-jdk8-snapshot</version>
<name>${project.artifactId}</name>
<description>Banner 用于在 console 控制台,打印开发文档、接口文档等</description>
<url>https://github.com/YunaiV/ruoyi-vue-pro</url>
<dependencies>
<dependency>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-common</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter</artifactId>
</dependency>
</dependencies>
</project>

View File

@ -1,36 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-framework</artifactId>
<version>2.0.0-jdk8-snapshot</version>
</parent>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-spring-boot-starter-biz-data-permission</artifactId>
<version>2.0.0-jdk8-snapshot</version>
<name>${project.artifactId}</name>
<description>数据权限</description>
<url>https://github.com/YunaiV/ruoyi-vue-pro</url>
<dependencies>
<dependency>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-common</artifactId>
</dependency>
<dependency>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-spring-boot-starter-security</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-spring-boot-starter-mybatis</artifactId>
</dependency>
<dependency>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-module-system-api</artifactId>
<version>${revision}</version>
</dependency>
</dependencies>
</project>

View File

@ -1,35 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-framework</artifactId>
<version>2.0.0-jdk8-snapshot</version>
</parent>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-spring-boot-starter-biz-dict</artifactId>
<version>2.0.0-jdk8-snapshot</version>
<name>${project.artifactId}</name>
<description>字典类型、数据</description>
<url>https://github.com/YunaiV/ruoyi-vue-pro</url>
<dependencies>
<dependency>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-common</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter</artifactId>
</dependency>
<dependency>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-module-system-api</artifactId>
<version>${revision}</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
</dependencies>
</project>

View File

@ -1,39 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-framework</artifactId>
<version>2.0.0-jdk8-snapshot</version>
</parent>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-spring-boot-starter-biz-error-code</artifactId>
<version>2.0.0-jdk8-snapshot</version>
<name>${project.artifactId}</name>
<description>错误码 ErrorCode 的自动配置功能,提供如下功能:
1. 远程读取:项目启动时,从 system-server 服务,读取数据库中的 ErrorCode 错误码,实现错误码的提示可配置;
2. 自动更新:管理员在管理后台修数据库中的 ErrorCode 错误码时,项目自动从 system-server 服务加载最新的 ErrorCode 错误码;
3. 自动写入:项目启动时,将项目本地的错误码写到 system-server 服务中,方便管理员在管理后台编辑;</description>
<url>https://github.com/YunaiV/ruoyi-vue-pro</url>
<dependencies>
<dependency>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-common</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter</artifactId>
</dependency>
<dependency>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-module-system-api</artifactId>
<version>${revision}</version>
</dependency>
<dependency>
<groupId>jakarta.validation</groupId>
<artifactId>jakarta.validation-api</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
</project>

View File

@ -1,39 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-framework</artifactId>
<version>2.0.0-jdk8-snapshot</version>
</parent>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-spring-boot-starter-biz-ip</artifactId>
<version>2.0.0-jdk8-snapshot</version>
<name>${project.artifactId}</name>
<description>IP 拓展,支持如下功能:
1. IP 功能:查询 IP 对应的城市信息
基于 https://gitee.com/lionsoul/ip2region 实现
2. 城市功能:查询城市编码对应的城市信息
基于 https://github.com/modood/Administrative-divisions-of-China 实现</description>
<url>https://github.com/YunaiV/ruoyi-vue-pro</url>
<dependencies>
<dependency>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-common</artifactId>
</dependency>
<dependency>
<groupId>org.lionsoul</groupId>
<artifactId>ip2region</artifactId>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
</project>

View File

@ -1,40 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-framework</artifactId>
<version>2.0.0-jdk8-snapshot</version>
</parent>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-spring-boot-starter-biz-operatelog</artifactId>
<version>2.0.0-jdk8-snapshot</version>
<name>${project.artifactId}</name>
<description>操作日志</description>
<url>https://github.com/YunaiV/ruoyi-vue-pro</url>
<dependencies>
<dependency>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-common</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-aop</artifactId>
</dependency>
<dependency>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-spring-boot-starter-web</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-module-system-api</artifactId>
<version>${revision}</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
</dependencies>
</project>

View File

@ -1,59 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-framework</artifactId>
<version>2.0.0-jdk8-snapshot</version>
</parent>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-spring-boot-starter-biz-sms</artifactId>
<version>2.0.0-jdk8-snapshot</version>
<name>${project.artifactId}</name>
<description>短信拓展,支持阿里云、腾讯云</description>
<url>https://github.com/YunaiV/ruoyi-vue-pro</url>
<dependencies>
<dependency>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-common</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter</artifactId>
</dependency>
<dependency>
<groupId>io.opentracing</groupId>
<artifactId>opentracing-util</artifactId>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
</dependency>
<dependency>
<groupId>jakarta.validation</groupId>
<artifactId>jakarta.validation-api</artifactId>
</dependency>
<dependency>
<groupId>com.aliyun</groupId>
<artifactId>aliyun-java-sdk-core</artifactId>
</dependency>
<dependency>
<groupId>com.aliyun</groupId>
<artifactId>aliyun-java-sdk-dysmsapi</artifactId>
</dependency>
<dependency>
<groupId>com.tencentcloudapi</groupId>
<artifactId>tencentcloud-sdk-java-sms</artifactId>
</dependency>
</dependencies>
</project>

View File

@ -1,62 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-framework</artifactId>
<version>2.0.0-jdk8-snapshot</version>
</parent>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-spring-boot-starter-biz-tenant</artifactId>
<version>2.0.0-jdk8-snapshot</version>
<name>${project.artifactId}</name>
<description>多租户</description>
<url>https://github.com/YunaiV/ruoyi-vue-pro</url>
<dependencies>
<dependency>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-common</artifactId>
</dependency>
<dependency>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-spring-boot-starter-security</artifactId>
</dependency>
<dependency>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-spring-boot-starter-mybatis</artifactId>
</dependency>
<dependency>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-spring-boot-starter-redis</artifactId>
</dependency>
<dependency>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-spring-boot-starter-job</artifactId>
</dependency>
<dependency>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-spring-boot-starter-mq</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework.kafka</groupId>
<artifactId>spring-kafka</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework.amqp</groupId>
<artifactId>spring-rabbit</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.rocketmq</groupId>
<artifactId>rocketmq-spring-boot-starter</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
</dependencies>
</project>

View File

@ -1,30 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-framework</artifactId>
<version>2.0.0-jdk8-snapshot</version>
</parent>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-spring-boot-starter-captcha</artifactId>
<version>2.0.0-jdk8-snapshot</version>
<name>${project.artifactId}</name>
<description>验证码拓展
1. 基于 aj-captcha 实现滑块验证码文档https://ajcaptcha.beliefteam.cn/captcha-doc/</description>
<dependencies>
<dependency>
<groupId>com.xingyuv</groupId>
<artifactId>spring-boot-starter-captcha-plus</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter</artifactId>
</dependency>
<dependency>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-spring-boot-starter-redis</artifactId>
</dependency>
</dependencies>
</project>

View File

@ -1,28 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-framework</artifactId>
<version>2.0.0-jdk8-snapshot</version>
</parent>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-spring-boot-starter-desensitize</artifactId>
<version>2.0.0-jdk8-snapshot</version>
<description>脱敏组件:支持 JSON 返回数据时,将邮箱、手机等字段进行脱敏</description>
<dependencies>
<dependency>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-common</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</dependency>
</dependencies>
</project>

View File

@ -1,41 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-framework</artifactId>
<version>2.0.0-jdk8-snapshot</version>
</parent>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-spring-boot-starter-excel</artifactId>
<version>2.0.0-jdk8-snapshot</version>
<name>${project.artifactId}</name>
<description>Excel 拓展</description>
<url>https://github.com/YunaiV/ruoyi-vue-pro</url>
<dependencies>
<dependency>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-common</artifactId>
</dependency>
<dependency>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-spring-boot-starter-biz-dict</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>easyexcel</artifactId>
</dependency>
</dependencies>
</project>

View File

@ -1,63 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-framework</artifactId>
<version>2.0.0-jdk8-snapshot</version>
</parent>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-spring-boot-starter-file</artifactId>
<version>2.0.0-jdk8-snapshot</version>
<name>${project.artifactId}</name>
<description>文件客户端,支持多种存储器
1. file本地磁盘
2. ftpFTP 服务器
2. sftpSFTP 服务器
4. db数据库
5. s3支持 S3 协议的云存储服务,例如说 MinIO、阿里云、华为云、腾讯云、七牛云等等</description>
<url>https://github.com/YunaiV/ruoyi-vue-pro</url>
<dependencies>
<dependency>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-common</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-validation</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
</dependency>
<dependency>
<groupId>commons-net</groupId>
<artifactId>commons-net</artifactId>
</dependency>
<dependency>
<groupId>com.jcraft</groupId>
<artifactId>jsch</artifactId>
</dependency>
<dependency>
<groupId>org.apache.tika</groupId>
<artifactId>tika-core</artifactId>
</dependency>
<dependency>
<groupId>io.minio</groupId>
<artifactId>minio</artifactId>
</dependency>
</dependencies>
</project>

View File

@ -1,32 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-framework</artifactId>
<version>2.0.0-jdk8-snapshot</version>
</parent>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-spring-boot-starter-job</artifactId>
<version>2.0.0-jdk8-snapshot</version>
<name>${project.artifactId}</name>
<description>任务拓展
1. 定时任务,基于 Quartz 拓展
2. 异步任务,基于 Spring Async 拓展</description>
<url>https://github.com/YunaiV/ruoyi-vue-pro</url>
<dependencies>
<dependency>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-common</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-quartz</artifactId>
</dependency>
<dependency>
<groupId>jakarta.validation</groupId>
<artifactId>jakarta.validation-api</artifactId>
</dependency>
</dependencies>
</project>

View File

@ -1,60 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-framework</artifactId>
<version>2.0.0-jdk8-snapshot</version>
</parent>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-spring-boot-starter-monitor</artifactId>
<version>2.0.0-jdk8-snapshot</version>
<name>${project.artifactId}</name>
<description>服务监控,提供链路追踪、日志服务、指标收集等等功能</description>
<url>https://github.com/YunaiV/ruoyi-vue-pro</url>
<dependencies>
<dependency>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-common</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-aop</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>io.opentracing</groupId>
<artifactId>opentracing-util</artifactId>
</dependency>
<dependency>
<groupId>org.apache.skywalking</groupId>
<artifactId>apm-toolkit-trace</artifactId>
</dependency>
<dependency>
<groupId>org.apache.skywalking</groupId>
<artifactId>apm-toolkit-logback-1.x</artifactId>
</dependency>
<dependency>
<groupId>org.apache.skywalking</groupId>
<artifactId>apm-toolkit-opentracing</artifactId>
</dependency>
<dependency>
<groupId>io.micrometer</groupId>
<artifactId>micrometer-registry-prometheus</artifactId>
</dependency>
<dependency>
<groupId>de.codecentric</groupId>
<artifactId>spring-boot-admin-starter-client</artifactId>
</dependency>
</dependencies>
</project>

View File

@ -1,37 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-framework</artifactId>
<version>2.0.0-jdk8-snapshot</version>
</parent>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-spring-boot-starter-mq</artifactId>
<version>2.0.0-jdk8-snapshot</version>
<name>${project.artifactId}</name>
<description>消息队列,支持 Redis、RocketMQ、RabbitMQ、Kafka 四种</description>
<url>https://github.com/YunaiV/ruoyi-vue-pro</url>
<dependencies>
<dependency>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-spring-boot-starter-redis</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.kafka</groupId>
<artifactId>spring-kafka</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework.amqp</groupId>
<artifactId>spring-rabbit</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.rocketmq</groupId>
<artifactId>rocketmq-spring-boot-starter</artifactId>
<optional>true</optional>
</dependency>
</dependencies>
</project>

View File

@ -1,67 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-framework</artifactId>
<version>2.0.0-jdk8-snapshot</version>
</parent>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-spring-boot-starter-mybatis</artifactId>
<version>2.0.0-jdk8-snapshot</version>
<name>${project.artifactId}</name>
<description>数据库连接池、多数据源、事务、MyBatis 拓展</description>
<url>https://github.com/YunaiV/ruoyi-vue-pro</url>
<dependencies>
<dependency>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-common</artifactId>
</dependency>
<dependency>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-spring-boot-starter-web</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.mysql</groupId>
<artifactId>mysql-connector-j</artifactId>
</dependency>
<dependency>
<groupId>com.oracle.database.jdbc</groupId>
<artifactId>ojdbc8</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>com.microsoft.sqlserver</groupId>
<artifactId>mssql-jdbc</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>com.dameng</groupId>
<artifactId>DmJdbcDriver18</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>druid-spring-boot-starter</artifactId>
</dependency>
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-boot-starter</artifactId>
</dependency>
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>dynamic-datasource-spring-boot-starter</artifactId>
</dependency>
<dependency>
<groupId>com.github.yulichang</groupId>
<artifactId>mybatis-plus-join-boot-starter</artifactId>
</dependency>
</dependencies>
</project>

View File

@ -1,32 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-framework</artifactId>
<version>2.0.0-jdk8-snapshot</version>
</parent>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-spring-boot-starter-protection</artifactId>
<version>2.0.0-jdk8-snapshot</version>
<name>${project.artifactId}</name>
<description>服务保证,提供分布式锁、幂等、限流、熔断等等功能</description>
<url>https://github.com/YunaiV/ruoyi-vue-pro</url>
<dependencies>
<dependency>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-spring-boot-starter-redis</artifactId>
</dependency>
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>lock4j-redisson-spring-boot-starter</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>io.github.resilience4j</groupId>
<artifactId>resilience4j-spring-boot2</artifactId>
<optional>true</optional>
</dependency>
</dependencies>
</project>

View File

@ -1,34 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-framework</artifactId>
<version>2.0.0-jdk8-snapshot</version>
</parent>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-spring-boot-starter-redis</artifactId>
<version>2.0.0-jdk8-snapshot</version>
<name>${project.artifactId}</name>
<description>Redis 封装拓展</description>
<url>https://github.com/YunaiV/ruoyi-vue-pro</url>
<dependencies>
<dependency>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-common</artifactId>
</dependency>
<dependency>
<groupId>org.redisson</groupId>
<artifactId>redisson-spring-boot-starter</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-cache</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-jsr310</artifactId>
</dependency>
</dependencies>
</project>

View File

@ -1,48 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-framework</artifactId>
<version>2.0.0-jdk8-snapshot</version>
</parent>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-spring-boot-starter-security</artifactId>
<version>2.0.0-jdk8-snapshot</version>
<name>${project.artifactId}</name>
<description>用户的认证、权限的校验</description>
<url>https://github.com/YunaiV/ruoyi-vue-pro</url>
<dependencies>
<dependency>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-common</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-aop</artifactId>
</dependency>
<dependency>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-spring-boot-starter-web</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-configuration-processor</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-security</artifactId>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
<dependency>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-module-system-api</artifactId>
<version>${revision}</version>
</dependency>
</dependencies>
</project>

View File

@ -1,57 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-framework</artifactId>
<version>2.0.0-jdk8-snapshot</version>
</parent>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-spring-boot-starter-web</artifactId>
<version>2.0.0-jdk8-snapshot</version>
<name>${project.artifactId}</name>
<description>Web 框架全局异常、API 日志等</description>
<url>https://github.com/YunaiV/ruoyi-vue-pro</url>
<dependencies>
<dependency>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-common</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-configuration-processor</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>com.github.xiaoymin</groupId>
<artifactId>knife4j-openapi3-spring-boot-starter</artifactId>
</dependency>
<dependency>
<groupId>org.springdoc</groupId>
<artifactId>springdoc-openapi-ui</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-module-infra-api</artifactId>
<version>${revision}</version>
</dependency>
<dependency>
<groupId>org.jsoup</groupId>
<artifactId>jsoup</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-tx</artifactId>
</dependency>
</dependencies>
</project>

View File

@ -1,55 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-framework</artifactId>
<version>2.0.0-jdk8-snapshot</version>
</parent>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-spring-boot-starter-websocket</artifactId>
<version>2.0.0-jdk8-snapshot</version>
<name>${project.artifactId}</name>
<description>WebSocket 框架,支持多节点的广播</description>
<url>https://github.com/YunaiV/ruoyi-vue-pro</url>
<dependencies>
<dependency>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-common</artifactId>
</dependency>
<dependency>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-spring-boot-starter-security</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-websocket</artifactId>
</dependency>
<dependency>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-spring-boot-starter-mq</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.kafka</groupId>
<artifactId>spring-kafka</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework.amqp</groupId>
<artifactId>spring-rabbit</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.rocketmq</groupId>
<artifactId>rocketmq-spring-boot-starter</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-spring-boot-starter-biz-tenant</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
</project>

View File

@ -245,6 +245,8 @@ public interface MaterialMapper extends BaseMapperX<MaterialDO> {
.eq(true,PurchaseOrderNoDetailDO::getPurchaseOrderId, pageReqVO.getHeaderId())
.eq(true,MaterialDO::getVirtualPart, YesOrNoEnum.N.name())
.eq(MaterialDO::getStatus,1)
.eq(StorageInventoryDO::getDeleted, 0)
.eq(PurchaseOrderNoDetailDO::getDeleted, 0)
.eq("d.dict_type","heli_material_type")
.eq("d1.dict_type","heli_material_unit")
;

View File

@ -296,58 +296,58 @@ public class PurchaseOrderNoDetailServiceImpl implements PurchaseOrderNoDetailSe
// outMat.setStorageOkQty(detailDO.getPurchaseRemAmounts());
// outMat.setProjectNo(byId.getProjectPlanSubId().toString());
// outMat.setProjectSubName(byId.getName());
ProcessBomDetailDO bomDetailDO = processBomDetailMapper.selectById(detailDO.getBoomDetailId());
StorageLogDO logDO = new StorageLogDO();
StorageLogDO outLogDO = new StorageLogDO();
if (ObjectUtil.isNotEmpty(bomDetailDO)){
String bomCode="";
String blueprintNo="";
String ProcedureName="";
MaterialDO materialDO = new MaterialDO();
materialDO.setUnit(bomDetailDO.getUnit());
materialDO.setSpec(bomDetailDO.getSpec());
materialDO.setName(bomDetailDO.getMaterialName());
ProcessBomDO processBomDO = pocessBomMapper.selectById(bomDetailDO.getBomId());
if (ObjectUtil.isNotEmpty(processBomDO)){
if (ObjectUtil.isNotEmpty(processBomDO.getCode())){
bomCode=processBomDO.getCode();
}
}
if (ObjectUtil.isNotEmpty(bomDetailDO.getBlueprintNo())){
blueprintNo=bomDetailDO.getBlueprintNo();
}
MaterialPlanBoomDO boomDO = materialPlanBoomMapper.selectById(detailDO.getProjectMaterialPlanBoomId());
if (ObjectUtil.isNotEmpty(boomDO)){
ProcedureDO procedure = procedureService.getProcedure(boomDO.getProcedureId());
if (ObjectUtil.isNotEmpty(procedure)){
if (ObjectUtil.isNotEmpty(procedure.getName())){
ProcedureName=procedure.getName();
}
}
}
String code=bomCode+blueprintNo+ProcedureName;
materialDO.setCode(code);
materialDO.setCompositionId(bomDetailDO.getCompositionId());
materialDO.setMaterialType("1");
materialDO.setVirtualPart("Y");
MaterialDO material = materialMapper.selectMaterial(code);
if (ObjectUtil.isEmpty(material)){
// ProcessBomDetailDO bomDetailDO = processBomDetailMapper.selectById(detailDO.getBoomDetailId());
// if (ObjectUtil.isNotEmpty(bomDetailDO)){
// String bomCode="";
// String blueprintNo="";
// String ProcedureName="";
// MaterialDO materialDO = new MaterialDO();
// materialDO.setUnit(bomDetailDO.getUnit());
// materialDO.setSpec(bomDetailDO.getSpec());
// materialDO.setName(bomDetailDO.getMaterialName());
// ProcessBomDO processBomDO = pocessBomMapper.selectById(bomDetailDO.getBomId());
// if (ObjectUtil.isNotEmpty(processBomDO)){
// if (ObjectUtil.isNotEmpty(processBomDO.getCode())){
// bomCode=processBomDO.getCode();
// }
// }
// if (ObjectUtil.isNotEmpty(bomDetailDO.getBlueprintNo())){
// blueprintNo=bomDetailDO.getBlueprintNo();
// }
// MaterialPlanBoomDO boomDO = materialPlanBoomMapper.selectById(detailDO.getProjectMaterialPlanBoomId());
// if (ObjectUtil.isNotEmpty(boomDO)){
// ProcedureDO procedure = procedureService.getProcedure(boomDO.getProcedureId());
// if (ObjectUtil.isNotEmpty(procedure)){
// if (ObjectUtil.isNotEmpty(procedure.getName())){
// ProcedureName=procedure.getName();
// }
// }
// }
// String code=bomCode+blueprintNo+ProcedureName;
// materialDO.setCode(code);
// materialDO.setCompositionId(bomDetailDO.getCompositionId());
// materialDO.setMaterialType("1");
// materialDO.setVirtualPart("Y");
// MaterialDO material = materialMapper.selectMaterial(code);
// if (ObjectUtil.isEmpty(material)){
// materialDOList.add(materialDO);
materialMapper.insert(materialDO);
// materialMapper.insert(materialDO);
// storageMatDO.setMatId(materialDO.getId());
// outMat.setMatId(materialDO.getId());
logDO.setMatId(materialDO.getId());
outLogDO.setMatId(materialDO.getId());
}else {
// logDO.setMatId(materialDO.getId());
// outLogDO.setMatId(materialDO.getId());
// }else {
// storageMatDO.setMatId(material.getId());
// outMat.setMatId(material.getId());
logDO.setMatId(material.getId());
outLogDO.setMatId(material.getId());
}
// logDO.setMatId(material.getId());
// outLogDO.setMatId(material.getId());
// }
}
// storageMatDOS.add(storageMatDO);
// outList.add(outMat);
StorageLogDO logDO = new StorageLogDO();
StorageLogDO outLogDO = new StorageLogDO();
StorageInDetailDO storageInDetailDO = new StorageInDetailDO();
storageInDetailDO.setStorageNoId(storageInDO.getId());
storageInDetailDO.setProjectSubCode(byId.getProjectSubCode());
@ -410,7 +410,7 @@ public class PurchaseOrderNoDetailServiceImpl implements PurchaseOrderNoDetailSe
outLogDO.setGoodsType(2);
outLogList.add(outLogDO);
}
}
// }
storageLogMapper.insertBatch(logList);
// storageLogMapper.insertBatch(outLogList);
// storageMatMapper.insertBatch(storageMatDOS);

View File

@ -1,22 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes</artifactId>
<version>2.0.0-jdk8-snapshot</version>
</parent>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-module-infra</artifactId>
<version>2.0.0-jdk8-snapshot</version>
<packaging>pom</packaging>
<name>${project.artifactId}</name>
<description>infra 模块,主要提供两块能力:
1. 我们放基础设施的运维与管理,支撑上层的通用与核心业务。 例如说:定时任务的管理、服务器的信息等等
2. 研发工具,提升研发效率与质量。 例如说:代码生成器、接口文档等等</description>
<modules>
<module>mes-module-infra-api</module>
<module>mes-module-infra-biz</module>
</modules>
</project>

View File

@ -1,26 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-module-infra</artifactId>
<version>2.0.0-jdk8-snapshot</version>
</parent>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-module-infra-api</artifactId>
<version>2.0.0-jdk8-snapshot</version>
<name>${project.artifactId}</name>
<description>infra 模块 API暴露给其它模块调用</description>
<dependencies>
<dependency>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-common</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-validation</artifactId>
<optional>true</optional>
</dependency>
</dependencies>
</project>

View File

@ -1,89 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-module-infra</artifactId>
<version>2.0.0-jdk8-snapshot</version>
</parent>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-module-infra-biz</artifactId>
<version>2.0.0-jdk8-snapshot</version>
<name>${project.artifactId}</name>
<description>infra 模块,主要提供两块能力:
1. 我们放基础设施的运维与管理,支撑上层的通用与核心业务。 例如说:定时任务的管理、服务器的信息等等
2. 研发工具,提升研发效率与质量。 例如说:代码生成器、接口文档等等</description>
<dependencies>
<dependency>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-module-system-api</artifactId>
<version>${revision}</version>
</dependency>
<dependency>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-module-infra-api</artifactId>
<version>${revision}</version>
</dependency>
<dependency>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-spring-boot-starter-biz-operatelog</artifactId>
</dependency>
<dependency>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-spring-boot-starter-biz-tenant</artifactId>
</dependency>
<dependency>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-spring-boot-starter-security</artifactId>
</dependency>
<dependency>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-spring-boot-starter-websocket</artifactId>
</dependency>
<dependency>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-spring-boot-starter-mybatis</artifactId>
</dependency>
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-generator</artifactId>
</dependency>
<dependency>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-spring-boot-starter-redis</artifactId>
</dependency>
<dependency>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-spring-boot-starter-job</artifactId>
</dependency>
<dependency>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-spring-boot-starter-mq</artifactId>
</dependency>
<dependency>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-spring-boot-starter-excel</artifactId>
</dependency>
<dependency>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity-engine-core</artifactId>
</dependency>
<dependency>
<groupId>cn.smallbun.screw</groupId>
<artifactId>screw-core</artifactId>
</dependency>
<dependency>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-spring-boot-starter-monitor</artifactId>
</dependency>
<dependency>
<groupId>de.codecentric</groupId>
<artifactId>spring-boot-admin-starter-server</artifactId>
</dependency>
<dependency>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-spring-boot-starter-file</artifactId>
</dependency>
</dependencies>
</project>

View File

@ -1,21 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes</artifactId>
<version>2.0.0-jdk8-snapshot</version>
</parent>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-module-system</artifactId>
<version>2.0.0-jdk8-snapshot</version>
<packaging>pom</packaging>
<name>${project.artifactId}</name>
<description>system 模块下,我们放通用业务,支撑上层的核心业务。
例如说:用户、部门、权限、数据字典等等</description>
<modules>
<module>mes-module-system-api</module>
<module>mes-module-system-biz</module>
</modules>
</project>

View File

@ -1,105 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-module-system</artifactId>
<version>2.0.0-jdk8-snapshot</version>
</parent>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-module-system-biz</artifactId>
<version>2.0.0-jdk8-snapshot</version>
<name>${project.artifactId}</name>
<description>system 模块下,我们放通用业务,支撑上层的核心业务。
例如说:用户、部门、权限、数据字典等等</description>
<dependencies>
<dependency>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-module-system-api</artifactId>
<version>${revision}</version>
</dependency>
<dependency>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-module-infra-api</artifactId>
<version>${revision}</version>
</dependency>
<dependency>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
<version>20210307</version>
</dependency>
<dependency>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-spring-boot-starter-biz-operatelog</artifactId>
</dependency>
<dependency>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-spring-boot-starter-biz-sms</artifactId>
</dependency>
<dependency>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-spring-boot-starter-biz-dict</artifactId>
</dependency>
<dependency>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-spring-boot-starter-biz-data-permission</artifactId>
</dependency>
<dependency>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-spring-boot-starter-biz-tenant</artifactId>
</dependency>
<dependency>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-spring-boot-starter-biz-ip</artifactId>
</dependency>
<dependency>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-spring-boot-starter-security</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-validation</artifactId>
</dependency>
<dependency>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-spring-boot-starter-mybatis</artifactId>
</dependency>
<dependency>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-spring-boot-starter-redis</artifactId>
</dependency>
<dependency>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-spring-boot-starter-job</artifactId>
</dependency>
<dependency>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-spring-boot-starter-mq</artifactId>
</dependency>
<dependency>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-spring-boot-starter-excel</artifactId>
</dependency>
<dependency>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-spring-boot-starter-captcha</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-mail</artifactId>
</dependency>
<dependency>
<groupId>com.xingyuv</groupId>
<artifactId>spring-boot-starter-justauth</artifactId>
</dependency>
<dependency>
<groupId>com.github.binarywang</groupId>
<artifactId>wx-java-mp-spring-boot-starter</artifactId>
</dependency>
<dependency>
<groupId>com.github.binarywang</groupId>
<artifactId>wx-java-miniapp-spring-boot-starter</artifactId>
</dependency>
</dependencies>
</project>

View File

@ -1,79 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes</artifactId>
<version>2.0.0-jdk8-snapshot</version>
</parent>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-server</artifactId>
<version>2.0.0-jdk8-snapshot</version>
<name>${project.artifactId}</name>
<description>后端 Server 的主项目,通过引入需要 mes-module-xxx 的依赖,
从而实现提供 RESTful API 给 mes-ui-admin、mes-ui-user 等前端项目。
本质上来说,它就是个空壳(容器)!</description>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
<version>5.4.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-module-system-biz</artifactId>
<version>${revision}</version>
</dependency>
<dependency>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-module-infra-biz</artifactId>
<version>${revision}</version>
</dependency>
<dependency>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-spring-boot-starter-biz-error-code</artifactId>
</dependency>
<dependency>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-module-heli-biz</artifactId>
<version>${revision}</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-configuration-processor</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-spring-boot-starter-banner</artifactId>
</dependency>
<dependency>
<groupId>com.chanko.yunxi</groupId>
<artifactId>mes-spring-boot-starter-protection</artifactId>
</dependency>
</dependencies>
<build>
<finalName>${project.artifactId}</finalName>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<version>${spring.boot.version}</version>
<executions>
<execution>
<goals>
<goal>repackage</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>

View File

@ -1,5 +1,5 @@
server:
port: 33002
port: 8080
--- #################### 数据库相关配置 ####################
@ -44,10 +44,10 @@ spring:
datasource:
master:
name: mes-heli
url: jdbc:mysql://120.48.141.82:3306/mes-heli?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&socketTimeout=30000&connectTimeout=30000
url: jdbc:mysql://218.75.46.166:3306/mes-heli?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&socketTimeout=30000&connectTimeout=30000
driver-class-name: com.mysql.jdbc.Driver
username: root
password: qweasd,.123
password: 'heli,12#$'
# slave: # 模拟从库,可根据自己需要修改 # 模拟从库,可根据自己需要修改
# name: ruoyi-vue-pro
# url: jdbc:mysql://localhost:3306/${spring.datasource.dynamic.datasource.slave.name}?useSSL=false&serverTimezone=CTT&allowPublicKeyRetrieval=true
@ -57,9 +57,9 @@ spring:
# Redis 配置。Redisson 默认的配置足够使用,一般不需要进行调优
redis:
host: localhost # 地址
host: 218.95.153.170 # 地址
port: 6379 # 端口
database: 3 # 数据库索引
database: 15 # 数据库索引
password: 'qweasd,.123' # 密码,建议生产环境开启
--- #################### 定时任务相关配置 ####################
@ -223,3 +223,6 @@ wx:
host: 127.0.0.1
port: 6379
password:
logging:
level:
root: debug

View File

@ -1,5 +1,6 @@
server:
# port: 33859
# port: 33860
port:8080
--- #################### 数据库相关配置 ####################
@ -63,7 +64,7 @@ spring:
# Redis 配置。Redisson 默认的配置足够使用,一般不需要进行调优
redis:
host: 218.95.153.170 # 地址
host: 222.75.128.58 # 地址
port: 6379 # 端口
database: 15 # 数据库索引
password: 'qweasd,.123' # 密码,建议生产环境开启
@ -197,6 +198,7 @@ mes:
ignoreUrls:
- #登录时租户验证
- /admin-api/system/tenant/get-id-by-name
#登出时租户验证
- /admin-api/system/tenant/get-by-website
- /admin-api/biz/app/latest

View File

@ -7,7 +7,6 @@ spring:
profiles:
active: local
main:
allow-circular-references: true # 允许循环依赖,因为项目是三层架构,无法避免这个情况。

View File

@ -66,7 +66,7 @@
<!-- 列表 -->
<ContentWrap>
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true" border class="hl-table" show-summary :summary-method="getSummaries" >
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true" border class="hl-table" show-summary :summary-method="getSummaries" height="700">
<el-table-column type="index" width="70" fixed label="序号" align="center" />
<el-table-column label="项目编号" align="center" prop="code" width="200px" />
<el-table-column label="项目名称" align="center" prop="projectName" width="240px"/>