From 72cc175fd408d52ad044d63964f394556568f9f7 Mon Sep 17 00:00:00 2001
From: zhuguifei <312353457@qq.com>
Date: 星期一, 02 三月 2026 12:54:09 +0800
Subject: [PATCH] refactor(module(qa)): 包名修改
---
ruoyi-plus-soybean/src/router/elegant/routes.ts | 20 ++++
RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/analy/domain/HoisterTimeData.java | 3
RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/analy/domain/vo/HoisterTimeDataVo.java | 10 -
RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/analy/domain/bo/RollerTimeDataBo.java | 5
RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/analy/domain/PackerTimeData.java | 3
RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/analy/domain/RollerTimeData.java | 3
RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/analy/mapper/PackerTimeDataMapper.java | 6
RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/analy/domain/MakeupTimeData.java | 2
RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/analy/controller/PackerTimeDataController.java | 8
RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/analy/mapper/HoisterTimeDataMapper.java | 6
RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/analy/controller/RollerTimeDataController.java | 8
RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/analy/domain/FeedmatchTimeData.java | 2
RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/analy/service/IHoisterTimeDataService.java | 6
RuoYi-Vue-Plus/开发日志.md | 2
RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/analy/mapper/RollerTimeDataMapper.java | 8
RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/analy/domain/bo/PackerTimeDataBo.java | 5
RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/analy/service/impl/HoisterTimeDataServiceImpl.java | 12 +-
RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/analy/service/IRollerTimeDataService.java | 6
RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/analy/service/impl/PackerTimeDataServiceImpl.java | 12 +-
RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/analy/domain/BoxTimeData.java | 2
RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/analy/domain/bo/HoisterTimeDataBo.java | 6
RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/resources/mapper/analy/RollerTimeDataMapper.xml | 4
RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/analy/domain/vo/RollerTimeDataVo.java | 10 -
RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/analy/domain/TransTimeData.java | 2
/dev/null | 72 --------------
ruoyi-plus-soybean/src/router/elegant/imports.ts | 1
RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/analy/domain/vo/PackerTimeDataVo.java | 8 -
ruoyi-plus-soybean/src/typings/elegant-router.d.ts | 4
RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/resources/mapper/analy/PackerTimeDataMapper.xml | 2
RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/analy/service/impl/RollerTimeDataServiceImpl.java | 12 +-
RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/analy/controller/HoisterTimeDataController.java | 8
RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/analy/service/IPackerTimeDataService.java | 6
ruoyi-plus-soybean/src/router/elegant/transform.ts | 2
33 files changed, 103 insertions(+), 163 deletions(-)
diff --git a/RuoYi-Vue-Plus/.flattened-pom.xml b/RuoYi-Vue-Plus/.flattened-pom.xml
deleted file mode 100644
index 3816295..0000000
--- a/RuoYi-Vue-Plus/.flattened-pom.xml
+++ /dev/null
@@ -1,419 +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>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-vue-plus</artifactId>
- <version>5.5.3</version>
- <packaging>pom</packaging>
- <name>RuoYi-Vue-Plus</name>
- <description>Dromara RuoYi-Vue-Plus澶氱鎴风鐞嗙郴缁�</description>
- <url>https://gitee.com/dromara/RuoYi-Vue-Plus</url>
- <modules>
- <module>ruoyi-admin</module>
- <module>ruoyi-common</module>
- <module>ruoyi-extend</module>
- <module>ruoyi-modules</module>
- </modules>
- <properties>
- <spring-boot-admin.version>3.5.6</spring-boot-admin.version>
- <dynamic-ds.version>4.3.1</dynamic-ds.version>
- <aws.sdk.version>2.28.22</aws.sdk.version>
- <hutool.version>5.8.43</hutool.version>
- <spring-boot.version>3.5.10</spring-boot.version>
- <p6spy.version>3.9.1</p6spy.version>
- <flatten-maven-plugin.version>1.3.0</flatten-maven-plugin.version>
- <snailjob.version>1.9.0</snailjob.version>
- <springdoc.version>2.8.15</springdoc.version>
- <mapstruct-plus.version>1.5.0</mapstruct-plus.version>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <fastjson.version>1.2.83</fastjson.version>
- <skipTests>true</skipTests>
- <anyline.version>8.7.3-20251210</anyline.version>
- <therapi-javadoc.version>0.15.0</therapi-javadoc.version>
- <lock4j.version>2.2.7</lock4j.version>
- <warm-flow.version>1.8.4</warm-flow.version>
- <sms4j.version>3.3.5</sms4j.version>
- <mybatis.version>3.5.19</mybatis.version>
- <maven-jar-plugin.version>3.4.2</maven-jar-plugin.version>
- <java.version>17</java.version>
- <bouncycastle.version>1.80</bouncycastle.version>
- <maven-compiler-plugin.version>3.14.0</maven-compiler-plugin.version>
- <fastexcel.version>1.3.0</fastexcel.version>
- <mybatis-plus.version>3.5.16</mybatis-plus.version>
- <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <revision>5.5.3</revision>
- <lombok.version>1.18.42</lombok.version>
- <maven-surefire-plugin.version>3.5.3</maven-surefire-plugin.version>
- <mapstruct-plus.lombok.version>0.2.0</mapstruct-plus.lombok.version>
- <ip2region.version>3.3.2</ip2region.version>
- <satoken.version>1.44.0</satoken.version>
- <redisson.version>3.52.0</redisson.version>
- <justauth.version>1.16.7</justauth.version>
- <maven-war-plugin.version>3.4.0</maven-war-plugin.version>
- <velocity.version>2.3</velocity.version>
- </properties>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-dependencies</artifactId>
- <version>${spring-boot.version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- <dependency>
- <groupId>cn.hutool</groupId>
- <artifactId>hutool-bom</artifactId>
- <version>${hutool.version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- <dependency>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-common-bom</artifactId>
- <version>5.5.3</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- <dependency>
- <groupId>org.springdoc</groupId>
- <artifactId>springdoc-openapi-starter-webmvc-api</artifactId>
- <version>${springdoc.version}</version>
- </dependency>
- <dependency>
- <groupId>com.github.therapi</groupId>
- <artifactId>therapi-runtime-javadoc</artifactId>
- <version>${therapi-javadoc.version}</version>
- </dependency>
- <dependency>
- <groupId>org.projectlombok</groupId>
- <artifactId>lombok</artifactId>
- <version>${lombok.version}</version>
- </dependency>
- <dependency>
- <groupId>cn.idev.excel</groupId>
- <artifactId>fastexcel</artifactId>
- <version>${fastexcel.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.velocity</groupId>
- <artifactId>velocity-engine-core</artifactId>
- <version>${velocity.version}</version>
- </dependency>
- <dependency>
- <groupId>cn.dev33</groupId>
- <artifactId>sa-token-spring-boot3-starter</artifactId>
- <version>${satoken.version}</version>
- </dependency>
- <dependency>
- <groupId>cn.dev33</groupId>
- <artifactId>sa-token-jwt</artifactId>
- <version>${satoken.version}</version>
- <exclusions>
- <exclusion>
- <groupId>cn.hutool</groupId>
- <artifactId>hutool-all</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>cn.dev33</groupId>
- <artifactId>sa-token-core</artifactId>
- <version>${satoken.version}</version>
- </dependency>
- <dependency>
- <groupId>com.baomidou</groupId>
- <artifactId>dynamic-datasource-spring-boot3-starter</artifactId>
- <version>${dynamic-ds.version}</version>
- </dependency>
- <dependency>
- <groupId>org.mybatis</groupId>
- <artifactId>mybatis</artifactId>
- <version>${mybatis.version}</version>
- </dependency>
- <dependency>
- <groupId>com.baomidou</groupId>
- <artifactId>mybatis-plus-spring-boot3-starter</artifactId>
- <version>${mybatis-plus.version}</version>
- </dependency>
- <dependency>
- <groupId>com.baomidou</groupId>
- <artifactId>mybatis-plus-jsqlparser</artifactId>
- <version>${mybatis-plus.version}</version>
- </dependency>
- <dependency>
- <groupId>com.baomidou</groupId>
- <artifactId>mybatis-plus-annotation</artifactId>
- <version>${mybatis-plus.version}</version>
- </dependency>
- <dependency>
- <groupId>p6spy</groupId>
- <artifactId>p6spy</artifactId>
- <version>${p6spy.version}</version>
- </dependency>
- <dependency>
- <groupId>software.amazon.awssdk</groupId>
- <artifactId>s3</artifactId>
- <version>${aws.sdk.version}</version>
- </dependency>
- <dependency>
- <groupId>software.amazon.awssdk</groupId>
- <artifactId>s3-transfer-manager</artifactId>
- <version>${aws.sdk.version}</version>
- </dependency>
- <dependency>
- <groupId>software.amazon.awssdk</groupId>
- <artifactId>netty-nio-client</artifactId>
- <version>${aws.sdk.version}</version>
- </dependency>
- <dependency>
- <groupId>org.dromara.sms4j</groupId>
- <artifactId>sms4j-spring-boot-starter</artifactId>
- <version>${sms4j.version}</version>
- </dependency>
- <dependency>
- <groupId>de.codecentric</groupId>
- <artifactId>spring-boot-admin-starter-server</artifactId>
- <version>${spring-boot-admin.version}</version>
- </dependency>
- <dependency>
- <groupId>de.codecentric</groupId>
- <artifactId>spring-boot-admin-starter-client</artifactId>
- <version>${spring-boot-admin.version}</version>
- </dependency>
- <dependency>
- <groupId>org.redisson</groupId>
- <artifactId>redisson-spring-boot-starter</artifactId>
- <version>${redisson.version}</version>
- </dependency>
- <dependency>
- <groupId>com.baomidou</groupId>
- <artifactId>lock4j-redisson-spring-boot-starter</artifactId>
- <version>${lock4j.version}</version>
- </dependency>
- <dependency>
- <groupId>com.aizuda</groupId>
- <artifactId>snail-job-client-starter</artifactId>
- <version>${snailjob.version}</version>
- </dependency>
- <dependency>
- <groupId>com.aizuda</groupId>
- <artifactId>snail-job-client-job-core</artifactId>
- <version>${snailjob.version}</version>
- </dependency>
- <dependency>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-jdk15to18</artifactId>
- <version>${bouncycastle.version}</version>
- </dependency>
- <dependency>
- <groupId>io.github.linpeilie</groupId>
- <artifactId>mapstruct-plus-spring-boot-starter</artifactId>
- <version>${mapstruct-plus.version}</version>
- </dependency>
- <dependency>
- <groupId>org.dromara.warm</groupId>
- <artifactId>warm-flow-mybatis-plus-sb3-starter</artifactId>
- <version>${warm-flow.version}</version>
- </dependency>
- <dependency>
- <groupId>org.dromara.warm</groupId>
- <artifactId>warm-flow-plugin-ui-sb-web</artifactId>
- <version>${warm-flow.version}</version>
- </dependency>
- <dependency>
- <groupId>me.zhyd.oauth</groupId>
- <artifactId>JustAuth</artifactId>
- <version>${justauth.version}</version>
- </dependency>
- <dependency>
- <groupId>org.lionsoul</groupId>
- <artifactId>ip2region</artifactId>
- <version>${ip2region.version}</version>
- </dependency>
- <dependency>
- <groupId>com.alibaba</groupId>
- <artifactId>fastjson</artifactId>
- <version>${fastjson.version}</version>
- </dependency>
- <dependency>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-system</artifactId>
- <version>5.5.3</version>
- </dependency>
- <dependency>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-job</artifactId>
- <version>5.5.3</version>
- </dependency>
- <dependency>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-generator</artifactId>
- <version>5.5.3</version>
- </dependency>
- <dependency>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-demo</artifactId>
- <version>5.5.3</version>
- </dependency>
- <dependency>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-qa</artifactId>
- <version>5.5.3</version>
- </dependency>
- <dependency>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-workflow</artifactId>
- <version>5.5.3</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
- <repositories>
- <repository>
- <releases>
- <enabled>true</enabled>
- </releases>
- <id>public</id>
- <name>huawei nexus</name>
- <url>https://mirrors.huaweicloud.com/repository/maven/</url>
- </repository>
- </repositories>
- <pluginRepositories>
- <pluginRepository>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- <id>public</id>
- <name>huawei nexus</name>
- <url>https://mirrors.huaweicloud.com/repository/maven/</url>
- </pluginRepository>
- </pluginRepositories>
- <build>
- <resources>
- <resource>
- <filtering>false</filtering>
- <directory>src/main/resources</directory>
- </resource>
- <resource>
- <filtering>true</filtering>
- <directory>src/main/resources</directory>
- <includes>
- <include>application*</include>
- <include>bootstrap*</include>
- <include>banner*</include>
- </includes>
- </resource>
- </resources>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>${maven-compiler-plugin.version}</version>
- <configuration>
- <source>${java.version}</source>
- <target>${java.version}</target>
- <encoding>${project.build.sourceEncoding}</encoding>
- <annotationProcessorPaths>
- <path>
- <groupId>com.github.therapi</groupId>
- <artifactId>therapi-runtime-javadoc-scribe</artifactId>
- <version>${therapi-javadoc.version}</version>
- </path>
- <path>
- <groupId>org.projectlombok</groupId>
- <artifactId>lombok</artifactId>
- <version>${lombok.version}</version>
- </path>
- <path>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-configuration-processor</artifactId>
- <version>${spring-boot.version}</version>
- </path>
- <path>
- <groupId>io.github.linpeilie</groupId>
- <artifactId>mapstruct-plus-processor</artifactId>
- <version>${mapstruct-plus.version}</version>
- </path>
- <path>
- <groupId>org.projectlombok</groupId>
- <artifactId>lombok-mapstruct-binding</artifactId>
- <version>${mapstruct-plus.lombok.version}</version>
- </path>
- </annotationProcessorPaths>
- <compilerArgs>
- <arg>-parameters</arg>
- </compilerArgs>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${maven-surefire-plugin.version}</version>
- <configuration>
- <argLine>-Dfile.encoding=UTF-8</argLine>
- <groups>${profiles.active}</groups>
- <excludedGroups>exclude</excludedGroups>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>flatten-maven-plugin</artifactId>
- <version>${flatten-maven-plugin.version}</version>
- <executions>
- <execution>
- <id>flatten</id>
- <phase>process-resources</phase>
- <goals>
- <goal>flatten</goal>
- </goals>
- </execution>
- <execution>
- <id>flatten.clean</id>
- <phase>clean</phase>
- <goals>
- <goal>clean</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <updatePomFile>true</updatePomFile>
- <flattenMode>resolveCiFriendliesOnly</flattenMode>
- </configuration>
- </plugin>
- </plugins>
- </build>
- <profiles>
- <profile>
- <id>local</id>
- <properties>
- <monitor.username>ruoyi</monitor.username>
- <profiles.active>local</profiles.active>
- <monitor.password>123456</monitor.password>
- <logging.level>info</logging.level>
- </properties>
- </profile>
- <profile>
- <id>dev</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <properties>
- <monitor.username>ruoyi</monitor.username>
- <profiles.active>dev</profiles.active>
- <monitor.password>123456</monitor.password>
- <logging.level>info</logging.level>
- </properties>
- </profile>
- <profile>
- <id>prod</id>
- <properties>
- <monitor.username>ruoyi</monitor.username>
- <profiles.active>prod</profiles.active>
- <monitor.password>123456</monitor.password>
- <logging.level>warn</logging.level>
- </properties>
- </profile>
- </profiles>
-</project>
diff --git a/RuoYi-Vue-Plus/ruoyi-admin/.flattened-pom.xml b/RuoYi-Vue-Plus/ruoyi-admin/.flattened-pom.xml
deleted file mode 100644
index bd636d6..0000000
--- a/RuoYi-Vue-Plus/ruoyi-admin/.flattened-pom.xml
+++ /dev/null
@@ -1,98 +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>org.dromara</groupId>
- <artifactId>ruoyi-vue-plus</artifactId>
- <version>5.5.3</version>
- </parent>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-admin</artifactId>
- <version>5.5.3</version>
- <description>web鏈嶅姟鍏ュ彛</description>
- <dependencies>
- <dependency>
- <groupId>org.postgresql</groupId>
- <artifactId>postgresql</artifactId>
- </dependency>
- <dependency>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-common-doc</artifactId>
- </dependency>
- <dependency>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-common-social</artifactId>
- </dependency>
- <dependency>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-common-ratelimiter</artifactId>
- </dependency>
- <dependency>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-common-mail</artifactId>
- </dependency>
- <dependency>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-system</artifactId>
- </dependency>
- <dependency>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-job</artifactId>
- </dependency>
- <dependency>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-generator</artifactId>
- </dependency>
- <dependency>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-demo</artifactId>
- </dependency>
- <dependency>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-qa</artifactId>
- </dependency>
- <dependency>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-workflow</artifactId>
- </dependency>
- <dependency>
- <groupId>de.codecentric</groupId>
- <artifactId>spring-boot-admin-starter-client</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-test</artifactId>
- <scope>test</scope>
- </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>
- <plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <version>${maven-jar-plugin.version}</version>
- </plugin>
- <plugin>
- <artifactId>maven-war-plugin</artifactId>
- <version>${maven-war-plugin.version}</version>
- <configuration>
- <failOnMissingWebXml>false</failOnMissingWebXml>
- <warName>${project.artifactId}</warName>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/RuoYi-Vue-Plus/ruoyi-common/.flattened-pom.xml b/RuoYi-Vue-Plus/ruoyi-common/.flattened-pom.xml
deleted file mode 100644
index 60d91df..0000000
--- a/RuoYi-Vue-Plus/ruoyi-common/.flattened-pom.xml
+++ /dev/null
@@ -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>org.dromara</groupId>
- <artifactId>ruoyi-vue-plus</artifactId>
- <version>5.5.3</version>
- </parent>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-common</artifactId>
- <version>5.5.3</version>
- <packaging>pom</packaging>
- <description>common 閫氱敤妯″潡</description>
- <modules>
- <module>ruoyi-common-bom</module>
- <module>ruoyi-common-social</module>
- <module>ruoyi-common-core</module>
- <module>ruoyi-common-doc</module>
- <module>ruoyi-common-excel</module>
- <module>ruoyi-common-idempotent</module>
- <module>ruoyi-common-job</module>
- <module>ruoyi-common-log</module>
- <module>ruoyi-common-mail</module>
- <module>ruoyi-common-mybatis</module>
- <module>ruoyi-common-oss</module>
- <module>ruoyi-common-ratelimiter</module>
- <module>ruoyi-common-redis</module>
- <module>ruoyi-common-satoken</module>
- <module>ruoyi-common-security</module>
- <module>ruoyi-common-sms</module>
- <module>ruoyi-common-web</module>
- <module>ruoyi-common-translation</module>
- <module>ruoyi-common-sensitive</module>
- <module>ruoyi-common-json</module>
- <module>ruoyi-common-encrypt</module>
- <module>ruoyi-common-tenant</module>
- <module>ruoyi-common-websocket</module>
- <module>ruoyi-common-sse</module>
- </modules>
-</project>
diff --git a/RuoYi-Vue-Plus/ruoyi-common/ruoyi-common-core/.flattened-pom.xml b/RuoYi-Vue-Plus/ruoyi-common/ruoyi-common-core/.flattened-pom.xml
deleted file mode 100644
index ee4b17b..0000000
--- a/RuoYi-Vue-Plus/ruoyi-common/ruoyi-common-core/.flattened-pom.xml
+++ /dev/null
@@ -1,73 +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>org.dromara</groupId>
- <artifactId>ruoyi-common</artifactId>
- <version>5.5.3</version>
- </parent>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-common-core</artifactId>
- <version>5.5.3</version>
- <description>ruoyi-common-core 鏍稿績妯″潡</description>
- <dependencies>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context-support</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-web</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-validation</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-aop</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- </dependency>
- <dependency>
- <groupId>jakarta.servlet</groupId>
- <artifactId>jakarta.servlet-api</artifactId>
- </dependency>
- <dependency>
- <groupId>cn.hutool</groupId>
- <artifactId>hutool-core</artifactId>
- </dependency>
- <dependency>
- <groupId>cn.hutool</groupId>
- <artifactId>hutool-http</artifactId>
- </dependency>
- <dependency>
- <groupId>cn.hutool</groupId>
- <artifactId>hutool-extra</artifactId>
- </dependency>
- <dependency>
- <groupId>org.projectlombok</groupId>
- <artifactId>lombok</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-configuration-processor</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-properties-migrator</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>io.github.linpeilie</groupId>
- <artifactId>mapstruct-plus-spring-boot-starter</artifactId>
- </dependency>
- <dependency>
- <groupId>org.lionsoul</groupId>
- <artifactId>ip2region</artifactId>
- </dependency>
- </dependencies>
-</project>
diff --git a/RuoYi-Vue-Plus/ruoyi-common/ruoyi-common-doc/.flattened-pom.xml b/RuoYi-Vue-Plus/ruoyi-common/ruoyi-common-doc/.flattened-pom.xml
deleted file mode 100644
index cc0be24..0000000
--- a/RuoYi-Vue-Plus/ruoyi-common/ruoyi-common-doc/.flattened-pom.xml
+++ /dev/null
@@ -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>org.dromara</groupId>
- <artifactId>ruoyi-common</artifactId>
- <version>5.5.3</version>
- </parent>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-common-doc</artifactId>
- <version>5.5.3</version>
- <description>ruoyi-common-doc 绯荤粺鎺ュ彛</description>
- <dependencies>
- <dependency>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-common-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springdoc</groupId>
- <artifactId>springdoc-openapi-starter-webmvc-api</artifactId>
- </dependency>
- <dependency>
- <groupId>com.github.therapi</groupId>
- <artifactId>therapi-runtime-javadoc</artifactId>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.module</groupId>
- <artifactId>jackson-module-kotlin</artifactId>
- </dependency>
- </dependencies>
-</project>
diff --git a/RuoYi-Vue-Plus/ruoyi-common/ruoyi-common-encrypt/.flattened-pom.xml b/RuoYi-Vue-Plus/ruoyi-common/ruoyi-common-encrypt/.flattened-pom.xml
deleted file mode 100644
index 064fc5f..0000000
--- a/RuoYi-Vue-Plus/ruoyi-common/ruoyi-common-encrypt/.flattened-pom.xml
+++ /dev/null
@@ -1,43 +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>org.dromara</groupId>
- <artifactId>ruoyi-common</artifactId>
- <version>5.5.3</version>
- </parent>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-common-encrypt</artifactId>
- <version>5.5.3</version>
- <description>ruoyi-common-encrypt 鏁版嵁鍔犺В瀵嗘ā鍧�</description>
- <dependencies>
- <dependency>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-common-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-jdk15to18</artifactId>
- </dependency>
- <dependency>
- <groupId>cn.hutool</groupId>
- <artifactId>hutool-crypto</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-webmvc</artifactId>
- </dependency>
- <dependency>
- <groupId>com.baomidou</groupId>
- <artifactId>mybatis-plus-spring-boot3-starter</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.mybatis</groupId>
- <artifactId>mybatis-spring</artifactId>
- </exclusion>
- </exclusions>
- <optional>true</optional>
- </dependency>
- </dependencies>
-</project>
diff --git a/RuoYi-Vue-Plus/ruoyi-common/ruoyi-common-excel/.flattened-pom.xml b/RuoYi-Vue-Plus/ruoyi-common/ruoyi-common-excel/.flattened-pom.xml
deleted file mode 100644
index 8776ac2..0000000
--- a/RuoYi-Vue-Plus/ruoyi-common/ruoyi-common-excel/.flattened-pom.xml
+++ /dev/null
@@ -1,24 +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>org.dromara</groupId>
- <artifactId>ruoyi-common</artifactId>
- <version>5.5.3</version>
- </parent>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-common-excel</artifactId>
- <version>5.5.3</version>
- <description>ruoyi-common-excel</description>
- <dependencies>
- <dependency>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-common-json</artifactId>
- </dependency>
- <dependency>
- <groupId>cn.idev.excel</groupId>
- <artifactId>fastexcel</artifactId>
- </dependency>
- </dependencies>
-</project>
diff --git a/RuoYi-Vue-Plus/ruoyi-common/ruoyi-common-idempotent/.flattened-pom.xml b/RuoYi-Vue-Plus/ruoyi-common/ruoyi-common-idempotent/.flattened-pom.xml
deleted file mode 100644
index 6a84967..0000000
--- a/RuoYi-Vue-Plus/ruoyi-common/ruoyi-common-idempotent/.flattened-pom.xml
+++ /dev/null
@@ -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>org.dromara</groupId>
- <artifactId>ruoyi-common</artifactId>
- <version>5.5.3</version>
- </parent>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-common-idempotent</artifactId>
- <version>5.5.3</version>
- <description>ruoyi-common-idempotent 骞傜瓑鍔熻兘</description>
- <dependencies>
- <dependency>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-common-json</artifactId>
- </dependency>
- <dependency>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-common-redis</artifactId>
- </dependency>
- <dependency>
- <groupId>cn.hutool</groupId>
- <artifactId>hutool-crypto</artifactId>
- </dependency>
- <dependency>
- <groupId>cn.dev33</groupId>
- <artifactId>sa-token-core</artifactId>
- </dependency>
- </dependencies>
-</project>
diff --git a/RuoYi-Vue-Plus/ruoyi-common/ruoyi-common-job/.flattened-pom.xml b/RuoYi-Vue-Plus/ruoyi-common/ruoyi-common-job/.flattened-pom.xml
deleted file mode 100644
index 80fa967..0000000
--- a/RuoYi-Vue-Plus/ruoyi-common/ruoyi-common-job/.flattened-pom.xml
+++ /dev/null
@@ -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>org.dromara</groupId>
- <artifactId>ruoyi-common</artifactId>
- <version>5.5.3</version>
- </parent>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-common-job</artifactId>
- <version>5.5.3</version>
- <description>ruoyi-common-job 瀹氭椂浠诲姟</description>
- <dependencies>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-autoconfigure</artifactId>
- </dependency>
- <dependency>
- <groupId>com.aizuda</groupId>
- <artifactId>snail-job-client-starter</artifactId>
- </dependency>
- <dependency>
- <groupId>com.aizuda</groupId>
- <artifactId>snail-job-client-job-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.projectlombok</groupId>
- <artifactId>lombok</artifactId>
- </dependency>
- <dependency>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-common-core</artifactId>
- </dependency>
- </dependencies>
-</project>
diff --git a/RuoYi-Vue-Plus/ruoyi-common/ruoyi-common-json/.flattened-pom.xml b/RuoYi-Vue-Plus/ruoyi-common/ruoyi-common-json/.flattened-pom.xml
deleted file mode 100644
index edf9126..0000000
--- a/RuoYi-Vue-Plus/ruoyi-common/ruoyi-common-json/.flattened-pom.xml
+++ /dev/null
@@ -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>org.dromara</groupId>
- <artifactId>ruoyi-common</artifactId>
- <version>5.5.3</version>
- </parent>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-common-json</artifactId>
- <version>5.5.3</version>
- <description>ruoyi-common-json 搴忓垪鍖栨ā鍧�</description>
- <dependencies>
- <dependency>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-common-core</artifactId>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.datatype</groupId>
- <artifactId>jackson-datatype-jsr310</artifactId>
- </dependency>
- </dependencies>
-</project>
diff --git a/RuoYi-Vue-Plus/ruoyi-common/ruoyi-common-log/.flattened-pom.xml b/RuoYi-Vue-Plus/ruoyi-common/ruoyi-common-log/.flattened-pom.xml
deleted file mode 100644
index fe16c95..0000000
--- a/RuoYi-Vue-Plus/ruoyi-common/ruoyi-common-log/.flattened-pom.xml
+++ /dev/null
@@ -1,24 +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>org.dromara</groupId>
- <artifactId>ruoyi-common</artifactId>
- <version>5.5.3</version>
- </parent>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-common-log</artifactId>
- <version>5.5.3</version>
- <description>ruoyi-common-log 鏃ュ織璁板綍</description>
- <dependencies>
- <dependency>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-common-satoken</artifactId>
- </dependency>
- <dependency>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-common-json</artifactId>
- </dependency>
- </dependencies>
-</project>
diff --git a/RuoYi-Vue-Plus/ruoyi-common/ruoyi-common-mail/.flattened-pom.xml b/RuoYi-Vue-Plus/ruoyi-common/ruoyi-common-mail/.flattened-pom.xml
deleted file mode 100644
index cf9d4ff..0000000
--- a/RuoYi-Vue-Plus/ruoyi-common/ruoyi-common-mail/.flattened-pom.xml
+++ /dev/null
@@ -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>org.dromara</groupId>
- <artifactId>ruoyi-common</artifactId>
- <version>5.5.3</version>
- </parent>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-common-mail</artifactId>
- <version>5.5.3</version>
- <description>ruoyi-common-mail 閭欢妯″潡</description>
- <dependencies>
- <dependency>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-common-core</artifactId>
- </dependency>
- <dependency>
- <groupId>jakarta.mail</groupId>
- <artifactId>jakarta.mail-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.eclipse.angus</groupId>
- <artifactId>jakarta.mail</artifactId>
- </dependency>
- </dependencies>
-</project>
diff --git a/RuoYi-Vue-Plus/ruoyi-common/ruoyi-common-mybatis/.flattened-pom.xml b/RuoYi-Vue-Plus/ruoyi-common/ruoyi-common-mybatis/.flattened-pom.xml
deleted file mode 100644
index c578bbd..0000000
--- a/RuoYi-Vue-Plus/ruoyi-common/ruoyi-common-mybatis/.flattened-pom.xml
+++ /dev/null
@@ -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>org.dromara</groupId>
- <artifactId>ruoyi-common</artifactId>
- <version>5.5.3</version>
- </parent>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-common-mybatis</artifactId>
- <version>5.5.3</version>
- <description>ruoyi-common-mybatis 鏁版嵁搴撴湇鍔�</description>
- <dependencies>
- <dependency>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-common-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-common-satoken</artifactId>
- </dependency>
- <dependency>
- <groupId>com.baomidou</groupId>
- <artifactId>dynamic-datasource-spring-boot3-starter</artifactId>
- </dependency>
- <dependency>
- <groupId>com.baomidou</groupId>
- <artifactId>mybatis-plus-spring-boot3-starter</artifactId>
- </dependency>
- <dependency>
- <groupId>com.baomidou</groupId>
- <artifactId>mybatis-plus-jsqlparser</artifactId>
- </dependency>
- <dependency>
- <groupId>p6spy</groupId>
- <artifactId>p6spy</artifactId>
- </dependency>
- </dependencies>
-</project>
diff --git a/RuoYi-Vue-Plus/ruoyi-common/ruoyi-common-oss/.flattened-pom.xml b/RuoYi-Vue-Plus/ruoyi-common/ruoyi-common-oss/.flattened-pom.xml
deleted file mode 100644
index ded2209..0000000
--- a/RuoYi-Vue-Plus/ruoyi-common/ruoyi-common-oss/.flattened-pom.xml
+++ /dev/null
@@ -1,50 +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>org.dromara</groupId>
- <artifactId>ruoyi-common</artifactId>
- <version>5.5.3</version>
- </parent>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-common-oss</artifactId>
- <version>5.5.3</version>
- <description>ruoyi-common-oss oss鏈嶅姟</description>
- <dependencies>
- <dependency>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-common-json</artifactId>
- </dependency>
- <dependency>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-common-redis</artifactId>
- </dependency>
- <dependency>
- <groupId>software.amazon.awssdk</groupId>
- <artifactId>s3</artifactId>
- <exclusions>
- <exclusion>
- <groupId>software.amazon.awssdk</groupId>
- <artifactId>aws-crt-client</artifactId>
- </exclusion>
- <exclusion>
- <groupId>software.amazon.awssdk</groupId>
- <artifactId>apache-client</artifactId>
- </exclusion>
- <exclusion>
- <groupId>software.amazon.awssdk</groupId>
- <artifactId>url-connection-client</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>software.amazon.awssdk</groupId>
- <artifactId>netty-nio-client</artifactId>
- </dependency>
- <dependency>
- <groupId>software.amazon.awssdk</groupId>
- <artifactId>s3-transfer-manager</artifactId>
- </dependency>
- </dependencies>
-</project>
diff --git a/RuoYi-Vue-Plus/ruoyi-common/ruoyi-common-ratelimiter/.flattened-pom.xml b/RuoYi-Vue-Plus/ruoyi-common/ruoyi-common-ratelimiter/.flattened-pom.xml
deleted file mode 100644
index 0ac2882..0000000
--- a/RuoYi-Vue-Plus/ruoyi-common/ruoyi-common-ratelimiter/.flattened-pom.xml
+++ /dev/null
@@ -1,24 +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>org.dromara</groupId>
- <artifactId>ruoyi-common</artifactId>
- <version>5.5.3</version>
- </parent>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-common-ratelimiter</artifactId>
- <version>5.5.3</version>
- <description>ruoyi-common-ratelimiter 闄愭祦鍔熻兘</description>
- <dependencies>
- <dependency>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-common-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-common-redis</artifactId>
- </dependency>
- </dependencies>
-</project>
diff --git a/RuoYi-Vue-Plus/ruoyi-common/ruoyi-common-redis/.flattened-pom.xml b/RuoYi-Vue-Plus/ruoyi-common/ruoyi-common-redis/.flattened-pom.xml
deleted file mode 100644
index b07b09a..0000000
--- a/RuoYi-Vue-Plus/ruoyi-common/ruoyi-common-redis/.flattened-pom.xml
+++ /dev/null
@@ -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>org.dromara</groupId>
- <artifactId>ruoyi-common</artifactId>
- <version>5.5.3</version>
- </parent>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-common-redis</artifactId>
- <version>5.5.3</version>
- <description>ruoyi-common-redis 缂撳瓨鏈嶅姟</description>
- <dependencies>
- <dependency>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-common-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.redisson</groupId>
- <artifactId>redisson-spring-boot-starter</artifactId>
- </dependency>
- <dependency>
- <groupId>com.baomidou</groupId>
- <artifactId>lock4j-redisson-spring-boot-starter</artifactId>
- </dependency>
- <dependency>
- <groupId>com.github.ben-manes.caffeine</groupId>
- <artifactId>caffeine</artifactId>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.datatype</groupId>
- <artifactId>jackson-datatype-jsr310</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.fory</groupId>
- <artifactId>fory-core</artifactId>
- <version>0.13.1</version>
- </dependency>
- </dependencies>
-</project>
diff --git a/RuoYi-Vue-Plus/ruoyi-common/ruoyi-common-satoken/.flattened-pom.xml b/RuoYi-Vue-Plus/ruoyi-common/ruoyi-common-satoken/.flattened-pom.xml
deleted file mode 100644
index b1bec46..0000000
--- a/RuoYi-Vue-Plus/ruoyi-common/ruoyi-common-satoken/.flattened-pom.xml
+++ /dev/null
@@ -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>org.dromara</groupId>
- <artifactId>ruoyi-common</artifactId>
- <version>5.5.3</version>
- </parent>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-common-satoken</artifactId>
- <version>5.5.3</version>
- <dependencies>
- <dependency>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-common-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-common-redis</artifactId>
- </dependency>
- <dependency>
- <groupId>cn.dev33</groupId>
- <artifactId>sa-token-spring-boot3-starter</artifactId>
- </dependency>
- <dependency>
- <groupId>cn.dev33</groupId>
- <artifactId>sa-token-jwt</artifactId>
- </dependency>
- <dependency>
- <groupId>com.github.ben-manes.caffeine</groupId>
- <artifactId>caffeine</artifactId>
- </dependency>
- </dependencies>
-</project>
diff --git a/RuoYi-Vue-Plus/ruoyi-common/ruoyi-common-security/.flattened-pom.xml b/RuoYi-Vue-Plus/ruoyi-common/ruoyi-common-security/.flattened-pom.xml
deleted file mode 100644
index 9cfc494..0000000
--- a/RuoYi-Vue-Plus/ruoyi-common/ruoyi-common-security/.flattened-pom.xml
+++ /dev/null
@@ -1,20 +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>org.dromara</groupId>
- <artifactId>ruoyi-common</artifactId>
- <version>5.5.3</version>
- </parent>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-common-security</artifactId>
- <version>5.5.3</version>
- <description>ruoyi-common-security 瀹夊叏妯″潡</description>
- <dependencies>
- <dependency>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-common-satoken</artifactId>
- </dependency>
- </dependencies>
-</project>
diff --git a/RuoYi-Vue-Plus/ruoyi-common/ruoyi-common-sensitive/.flattened-pom.xml b/RuoYi-Vue-Plus/ruoyi-common/ruoyi-common-sensitive/.flattened-pom.xml
deleted file mode 100644
index 85c14fb..0000000
--- a/RuoYi-Vue-Plus/ruoyi-common/ruoyi-common-sensitive/.flattened-pom.xml
+++ /dev/null
@@ -1,20 +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>org.dromara</groupId>
- <artifactId>ruoyi-common</artifactId>
- <version>5.5.3</version>
- </parent>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-common-sensitive</artifactId>
- <version>5.5.3</version>
- <description>ruoyi-common-sensitive 鑴辨晱妯″潡</description>
- <dependencies>
- <dependency>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-common-json</artifactId>
- </dependency>
- </dependencies>
-</project>
diff --git a/RuoYi-Vue-Plus/ruoyi-common/ruoyi-common-sms/.flattened-pom.xml b/RuoYi-Vue-Plus/ruoyi-common/ruoyi-common-sms/.flattened-pom.xml
deleted file mode 100644
index 4b18ef6..0000000
--- a/RuoYi-Vue-Plus/ruoyi-common/ruoyi-common-sms/.flattened-pom.xml
+++ /dev/null
@@ -1,24 +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>org.dromara</groupId>
- <artifactId>ruoyi-common</artifactId>
- <version>5.5.3</version>
- </parent>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-common-sms</artifactId>
- <version>5.5.3</version>
- <description>ruoyi-common-sms 鐭俊妯″潡</description>
- <dependencies>
- <dependency>
- <groupId>org.dromara.sms4j</groupId>
- <artifactId>sms4j-spring-boot-starter</artifactId>
- </dependency>
- <dependency>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-common-redis</artifactId>
- </dependency>
- </dependencies>
-</project>
diff --git a/RuoYi-Vue-Plus/ruoyi-common/ruoyi-common-social/.flattened-pom.xml b/RuoYi-Vue-Plus/ruoyi-common/ruoyi-common-social/.flattened-pom.xml
deleted file mode 100644
index 8ceb7e4..0000000
--- a/RuoYi-Vue-Plus/ruoyi-common/ruoyi-common-social/.flattened-pom.xml
+++ /dev/null
@@ -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>org.dromara</groupId>
- <artifactId>ruoyi-common</artifactId>
- <version>5.5.3</version>
- </parent>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-common-social</artifactId>
- <version>5.5.3</version>
- <description>ruoyi-common-social 鎺堟潈璁よ瘉</description>
- <dependencies>
- <dependency>
- <groupId>me.zhyd.oauth</groupId>
- <artifactId>JustAuth</artifactId>
- </dependency>
- <dependency>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-common-json</artifactId>
- </dependency>
- <dependency>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-common-redis</artifactId>
- </dependency>
- </dependencies>
-</project>
diff --git a/RuoYi-Vue-Plus/ruoyi-common/ruoyi-common-sse/.flattened-pom.xml b/RuoYi-Vue-Plus/ruoyi-common/ruoyi-common-sse/.flattened-pom.xml
deleted file mode 100644
index 264eb72..0000000
--- a/RuoYi-Vue-Plus/ruoyi-common/ruoyi-common-sse/.flattened-pom.xml
+++ /dev/null
@@ -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>org.dromara</groupId>
- <artifactId>ruoyi-common</artifactId>
- <version>5.5.3</version>
- </parent>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-common-sse</artifactId>
- <version>5.5.3</version>
- <description>ruoyi-common-sse 妯″潡</description>
- <dependencies>
- <dependency>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-common-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-common-redis</artifactId>
- </dependency>
- <dependency>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-common-satoken</artifactId>
- </dependency>
- <dependency>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-common-json</artifactId>
- </dependency>
- </dependencies>
-</project>
diff --git a/RuoYi-Vue-Plus/ruoyi-common/ruoyi-common-tenant/.flattened-pom.xml b/RuoYi-Vue-Plus/ruoyi-common/ruoyi-common-tenant/.flattened-pom.xml
deleted file mode 100644
index da7da3a..0000000
--- a/RuoYi-Vue-Plus/ruoyi-common/ruoyi-common-tenant/.flattened-pom.xml
+++ /dev/null
@@ -1,25 +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>org.dromara</groupId>
- <artifactId>ruoyi-common</artifactId>
- <version>5.5.3</version>
- </parent>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-common-tenant</artifactId>
- <version>5.5.3</version>
- <description>ruoyi-common-tenant 绉熸埛妯″潡</description>
- <dependencies>
- <dependency>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-common-mybatis</artifactId>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-common-redis</artifactId>
- </dependency>
- </dependencies>
-</project>
diff --git a/RuoYi-Vue-Plus/ruoyi-common/ruoyi-common-translation/.flattened-pom.xml b/RuoYi-Vue-Plus/ruoyi-common/ruoyi-common-translation/.flattened-pom.xml
deleted file mode 100644
index 5fdd7c6..0000000
--- a/RuoYi-Vue-Plus/ruoyi-common/ruoyi-common-translation/.flattened-pom.xml
+++ /dev/null
@@ -1,20 +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>org.dromara</groupId>
- <artifactId>ruoyi-common</artifactId>
- <version>5.5.3</version>
- </parent>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-common-translation</artifactId>
- <version>5.5.3</version>
- <description>ruoyi-common-translation 閫氱敤缈昏瘧鍔熻兘</description>
- <dependencies>
- <dependency>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-common-json</artifactId>
- </dependency>
- </dependencies>
-</project>
diff --git a/RuoYi-Vue-Plus/ruoyi-common/ruoyi-common-web/.flattened-pom.xml b/RuoYi-Vue-Plus/ruoyi-common/ruoyi-common-web/.flattened-pom.xml
deleted file mode 100644
index 560a3cf..0000000
--- a/RuoYi-Vue-Plus/ruoyi-common/ruoyi-common-web/.flattened-pom.xml
+++ /dev/null
@@ -1,46 +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>org.dromara</groupId>
- <artifactId>ruoyi-common</artifactId>
- <version>5.5.3</version>
- </parent>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-common-web</artifactId>
- <version>5.5.3</version>
- <description>ruoyi-common-web web鏈嶅姟</description>
- <dependencies>
- <dependency>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-common-json</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-web</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-tomcat</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-undertow</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-actuator</artifactId>
- </dependency>
- <dependency>
- <groupId>cn.hutool</groupId>
- <artifactId>hutool-captcha</artifactId>
- </dependency>
- <dependency>
- <groupId>cn.hutool</groupId>
- <artifactId>hutool-crypto</artifactId>
- </dependency>
- </dependencies>
-</project>
diff --git a/RuoYi-Vue-Plus/ruoyi-common/ruoyi-common-websocket/.flattened-pom.xml b/RuoYi-Vue-Plus/ruoyi-common/ruoyi-common-websocket/.flattened-pom.xml
deleted file mode 100644
index 792d520..0000000
--- a/RuoYi-Vue-Plus/ruoyi-common/ruoyi-common-websocket/.flattened-pom.xml
+++ /dev/null
@@ -1,42 +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>org.dromara</groupId>
- <artifactId>ruoyi-common</artifactId>
- <version>5.5.3</version>
- </parent>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-common-websocket</artifactId>
- <version>5.5.3</version>
- <description>ruoyi-common-websocket 妯″潡</description>
- <dependencies>
- <dependency>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-common-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-common-redis</artifactId>
- </dependency>
- <dependency>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-common-satoken</artifactId>
- </dependency>
- <dependency>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-common-json</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-websocket</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-tomcat</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- </dependencies>
-</project>
diff --git a/RuoYi-Vue-Plus/ruoyi-extend/.flattened-pom.xml b/RuoYi-Vue-Plus/ruoyi-extend/.flattened-pom.xml
deleted file mode 100644
index cdf8a6a..0000000
--- a/RuoYi-Vue-Plus/ruoyi-extend/.flattened-pom.xml
+++ /dev/null
@@ -1,18 +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>org.dromara</groupId>
- <artifactId>ruoyi-vue-plus</artifactId>
- <version>5.5.3</version>
- </parent>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-extend</artifactId>
- <version>5.5.3</version>
- <packaging>pom</packaging>
- <modules>
- <module>ruoyi-monitor-admin</module>
- <module>ruoyi-snailjob-server</module>
- </modules>
-</project>
diff --git a/RuoYi-Vue-Plus/ruoyi-extend/ruoyi-monitor-admin/.flattened-pom.xml b/RuoYi-Vue-Plus/ruoyi-extend/ruoyi-monitor-admin/.flattened-pom.xml
deleted file mode 100644
index 5f3fe13..0000000
--- a/RuoYi-Vue-Plus/ruoyi-extend/ruoyi-monitor-admin/.flattened-pom.xml
+++ /dev/null
@@ -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>org.dromara</groupId>
- <artifactId>ruoyi-extend</artifactId>
- <version>5.5.3</version>
- </parent>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-monitor-admin</artifactId>
- <version>5.5.3</version>
- <dependencies>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-web</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-tomcat</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-undertow</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-security</artifactId>
- </dependency>
- <dependency>
- <groupId>de.codecentric</groupId>
- <artifactId>spring-boot-admin-starter-server</artifactId>
- </dependency>
- <dependency>
- <groupId>de.codecentric</groupId>
- <artifactId>spring-boot-admin-starter-client</artifactId>
- </dependency>
- <dependency>
- <groupId>org.projectlombok</groupId>
- <artifactId>lombok</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>
diff --git a/RuoYi-Vue-Plus/ruoyi-extend/ruoyi-snailjob-server/.flattened-pom.xml b/RuoYi-Vue-Plus/ruoyi-extend/ruoyi-snailjob-server/.flattened-pom.xml
deleted file mode 100644
index 86240f5..0000000
--- a/RuoYi-Vue-Plus/ruoyi-extend/ruoyi-snailjob-server/.flattened-pom.xml
+++ /dev/null
@@ -1,53 +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>org.dromara</groupId>
- <artifactId>ruoyi-extend</artifactId>
- <version>5.5.3</version>
- </parent>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-snailjob-server</artifactId>
- <version>5.5.3</version>
- <dependencies>
- <dependency>
- <groupId>com.aizuda</groupId>
- <artifactId>snail-job-server-starter</artifactId>
- <version>${snailjob.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.scala-lang</groupId>
- <artifactId>scala-library</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.scala-lang</groupId>
- <artifactId>scala-library</artifactId>
- <version>2.13.9</version>
- </dependency>
- <dependency>
- <groupId>de.codecentric</groupId>
- <artifactId>spring-boot-admin-starter-client</artifactId>
- <version>${spring-boot-admin.version}</version>
- </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>
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/.flattened-pom.xml b/RuoYi-Vue-Plus/ruoyi-modules/.flattened-pom.xml
deleted file mode 100644
index 01e849a..0000000
--- a/RuoYi-Vue-Plus/ruoyi-modules/.flattened-pom.xml
+++ /dev/null
@@ -1,23 +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>org.dromara</groupId>
- <artifactId>ruoyi-vue-plus</artifactId>
- <version>5.5.3</version>
- </parent>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-modules</artifactId>
- <version>5.5.3</version>
- <packaging>pom</packaging>
- <description>ruoyi-modules 涓氬姟妯″潡</description>
- <modules>
- <module>ruoyi-demo</module>
- <module>ruoyi-qa</module>
- <module>ruoyi-generator</module>
- <module>ruoyi-job</module>
- <module>ruoyi-system</module>
- <module>ruoyi-workflow</module>
- </modules>
-</project>
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-demo/.flattened-pom.xml b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-demo/.flattened-pom.xml
deleted file mode 100644
index b7b84bc..0000000
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-demo/.flattened-pom.xml
+++ /dev/null
@@ -1,84 +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>org.dromara</groupId>
- <artifactId>ruoyi-modules</artifactId>
- <version>5.5.3</version>
- </parent>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-demo</artifactId>
- <version>5.5.3</version>
- <description>demo妯″潡</description>
- <dependencies>
- <dependency>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-common-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-common-doc</artifactId>
- </dependency>
- <dependency>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-common-sms</artifactId>
- </dependency>
- <dependency>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-common-mail</artifactId>
- </dependency>
- <dependency>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-common-redis</artifactId>
- </dependency>
- <dependency>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-common-idempotent</artifactId>
- </dependency>
- <dependency>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-common-mybatis</artifactId>
- </dependency>
- <dependency>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-common-log</artifactId>
- </dependency>
- <dependency>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-common-excel</artifactId>
- </dependency>
- <dependency>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-common-security</artifactId>
- </dependency>
- <dependency>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-common-web</artifactId>
- </dependency>
- <dependency>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-common-ratelimiter</artifactId>
- </dependency>
- <dependency>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-common-translation</artifactId>
- </dependency>
- <dependency>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-common-sensitive</artifactId>
- </dependency>
- <dependency>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-common-encrypt</artifactId>
- </dependency>
- <dependency>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-common-tenant</artifactId>
- </dependency>
- <dependency>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-common-websocket</artifactId>
- </dependency>
- </dependencies>
-</project>
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-generator/.flattened-pom.xml b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-generator/.flattened-pom.xml
deleted file mode 100644
index c70c98d..0000000
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-generator/.flattened-pom.xml
+++ /dev/null
@@ -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>org.dromara</groupId>
- <artifactId>ruoyi-modules</artifactId>
- <version>5.5.3</version>
- </parent>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-generator</artifactId>
- <version>5.5.3</version>
- <description>generator 浠ｇ爜鐢熸垚</description>
- <dependencies>
- <dependency>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-common-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-common-doc</artifactId>
- </dependency>
- <dependency>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-common-mybatis</artifactId>
- </dependency>
- <dependency>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-common-web</artifactId>
- </dependency>
- <dependency>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-common-log</artifactId>
- </dependency>
- <dependency>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-common-idempotent</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.velocity</groupId>
- <artifactId>velocity-engine-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.anyline</groupId>
- <artifactId>anyline-environment-spring-data-jdbc</artifactId>
- <version>${anyline.version}</version>
- </dependency>
- <dependency>
- <groupId>org.anyline</groupId>
- <artifactId>anyline-data-jdbc-mysql</artifactId>
- <version>${anyline.version}</version>
- </dependency>
- <dependency>
- <groupId>org.anyline</groupId>
- <artifactId>anyline-data-jdbc-postgresql</artifactId>
- <version>${anyline.version}</version>
- </dependency>
- </dependencies>
-</project>
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-job/.flattened-pom.xml b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-job/.flattened-pom.xml
deleted file mode 100644
index 57883d4..0000000
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-job/.flattened-pom.xml
+++ /dev/null
@@ -1,24 +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>org.dromara</groupId>
- <artifactId>ruoyi-modules</artifactId>
- <version>5.5.3</version>
- </parent>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-job</artifactId>
- <version>5.5.3</version>
- <description>浠诲姟璋冨害</description>
- <dependencies>
- <dependency>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-common-json</artifactId>
- </dependency>
- <dependency>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-common-job</artifactId>
- </dependency>
- </dependencies>
-</project>
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/.flattened-pom.xml b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/.flattened-pom.xml
deleted file mode 100644
index 835bd27..0000000
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/.flattened-pom.xml
+++ /dev/null
@@ -1,84 +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>org.dromara</groupId>
- <artifactId>ruoyi-modules</artifactId>
- <version>5.5.3</version>
- </parent>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-qa</artifactId>
- <version>5.5.3</version>
- <description>璐ㄩ噺鍒嗘瀽妯″潡</description>
- <dependencies>
- <dependency>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-common-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-common-doc</artifactId>
- </dependency>
- <dependency>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-common-sms</artifactId>
- </dependency>
- <dependency>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-common-mail</artifactId>
- </dependency>
- <dependency>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-common-redis</artifactId>
- </dependency>
- <dependency>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-common-idempotent</artifactId>
- </dependency>
- <dependency>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-common-mybatis</artifactId>
- </dependency>
- <dependency>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-common-log</artifactId>
- </dependency>
- <dependency>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-common-excel</artifactId>
- </dependency>
- <dependency>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-common-security</artifactId>
- </dependency>
- <dependency>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-common-web</artifactId>
- </dependency>
- <dependency>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-common-ratelimiter</artifactId>
- </dependency>
- <dependency>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-common-translation</artifactId>
- </dependency>
- <dependency>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-common-sensitive</artifactId>
- </dependency>
- <dependency>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-common-encrypt</artifactId>
- </dependency>
- <dependency>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-common-tenant</artifactId>
- </dependency>
- <dependency>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-common-websocket</artifactId>
- </dependency>
- </dependencies>
-</project>
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/controller/HoisterTimeDataController.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/analy/controller/HoisterTimeDataController.java
similarity index 94%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/controller/HoisterTimeDataController.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/analy/controller/HoisterTimeDataController.java
index 2673697..38a1ec6 100755
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/controller/HoisterTimeDataController.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/analy/controller/HoisterTimeDataController.java
@@ -1,4 +1,4 @@
-package org.dromara.qa.controller;
+package org.dromara.analy.controller;
import java.util.Date;
import java.util.List;
@@ -18,9 +18,9 @@
import org.dromara.common.core.validate.EditGroup;
import org.dromara.common.log.enums.BusinessType;
import org.dromara.common.excel.utils.ExcelUtil;
-import org.dromara.qa.domain.vo.HoisterTimeDataVo;
-import org.dromara.qa.domain.bo.HoisterTimeDataBo;
-import org.dromara.qa.service.IHoisterTimeDataService;
+import org.dromara.analy.domain.vo.HoisterTimeDataVo;
+import org.dromara.analy.domain.bo.HoisterTimeDataBo;
+import org.dromara.analy.service.IHoisterTimeDataService;
import org.dromara.common.mybatis.core.page.TableDataInfo;
/**
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/controller/PackerTimeDataController.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/analy/controller/PackerTimeDataController.java
similarity index 94%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/controller/PackerTimeDataController.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/analy/controller/PackerTimeDataController.java
index 2cca532..889bcab 100755
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/controller/PackerTimeDataController.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/analy/controller/PackerTimeDataController.java
@@ -1,4 +1,4 @@
-package org.dromara.qa.controller;
+package org.dromara.analy.controller;
import java.util.Date;
import java.util.List;
@@ -18,9 +18,9 @@
import org.dromara.common.core.validate.EditGroup;
import org.dromara.common.log.enums.BusinessType;
import org.dromara.common.excel.utils.ExcelUtil;
-import org.dromara.qa.domain.vo.PackerTimeDataVo;
-import org.dromara.qa.domain.bo.PackerTimeDataBo;
-import org.dromara.qa.service.IPackerTimeDataService;
+import org.dromara.analy.domain.vo.PackerTimeDataVo;
+import org.dromara.analy.domain.bo.PackerTimeDataBo;
+import org.dromara.analy.service.IPackerTimeDataService;
import org.dromara.common.mybatis.core.page.TableDataInfo;
/**
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/controller/RollerTimeDataController.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/analy/controller/RollerTimeDataController.java
similarity index 94%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/controller/RollerTimeDataController.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/analy/controller/RollerTimeDataController.java
index f306d0e..1a0aeba 100755
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/controller/RollerTimeDataController.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/analy/controller/RollerTimeDataController.java
@@ -1,4 +1,4 @@
-package org.dromara.qa.controller;
+package org.dromara.analy.controller;
import java.util.Date;
import java.util.List;
@@ -18,9 +18,9 @@
import org.dromara.common.core.validate.EditGroup;
import org.dromara.common.log.enums.BusinessType;
import org.dromara.common.excel.utils.ExcelUtil;
-import org.dromara.qa.domain.vo.RollerTimeDataVo;
-import org.dromara.qa.domain.bo.RollerTimeDataBo;
-import org.dromara.qa.service.IRollerTimeDataService;
+import org.dromara.analy.domain.vo.RollerTimeDataVo;
+import org.dromara.analy.domain.bo.RollerTimeDataBo;
+import org.dromara.analy.service.IRollerTimeDataService;
import org.dromara.common.mybatis.core.page.TableDataInfo;
/**
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/domain/BoxTimeData.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/analy/domain/BoxTimeData.java
similarity index 96%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/domain/BoxTimeData.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/analy/domain/BoxTimeData.java
index 3513417..ce28789 100755
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/domain/BoxTimeData.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/analy/domain/BoxTimeData.java
@@ -1,4 +1,4 @@
-package org.dromara.qa.domain;
+package org.dromara.analy.domain;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import com.baomidou.mybatisplus.annotation.*;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/domain/FeedmatchTimeData.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/analy/domain/FeedmatchTimeData.java
similarity index 98%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/domain/FeedmatchTimeData.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/analy/domain/FeedmatchTimeData.java
index 1fe70b0..09ad4bd 100755
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/domain/FeedmatchTimeData.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/analy/domain/FeedmatchTimeData.java
@@ -1,4 +1,4 @@
-package org.dromara.qa.domain;
+package org.dromara.analy.domain;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import com.baomidou.mybatisplus.annotation.*;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/domain/HoisterTimeData.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/analy/domain/HoisterTimeData.java
similarity index 97%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/domain/HoisterTimeData.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/analy/domain/HoisterTimeData.java
index f1d3149..657af87 100755
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/domain/HoisterTimeData.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/analy/domain/HoisterTimeData.java
@@ -1,11 +1,10 @@
-package org.dromara.qa.domain;
+package org.dromara.analy.domain;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
import java.io.Serial;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/domain/MakeupTimeData.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/analy/domain/MakeupTimeData.java
similarity index 97%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/domain/MakeupTimeData.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/analy/domain/MakeupTimeData.java
index 93ba613..1d1ca3e 100755
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/domain/MakeupTimeData.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/analy/domain/MakeupTimeData.java
@@ -1,4 +1,4 @@
-package org.dromara.qa.domain;
+package org.dromara.analy.domain;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import com.baomidou.mybatisplus.annotation.*;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/domain/PackerTimeData.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/analy/domain/PackerTimeData.java
similarity index 96%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/domain/PackerTimeData.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/analy/domain/PackerTimeData.java
index 4639204..5c0fa40 100755
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/domain/PackerTimeData.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/analy/domain/PackerTimeData.java
@@ -1,11 +1,10 @@
-package org.dromara.qa.domain;
+package org.dromara.analy.domain;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
import java.io.Serial;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/domain/RollerTimeData.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/analy/domain/RollerTimeData.java
similarity index 95%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/domain/RollerTimeData.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/analy/domain/RollerTimeData.java
index 22d1740..3d32fa6 100755
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/domain/RollerTimeData.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/analy/domain/RollerTimeData.java
@@ -1,11 +1,10 @@
-package org.dromara.qa.domain;
+package org.dromara.analy.domain;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import com.baomidou.mybatisplus.annotation.*;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
import java.io.Serial;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/domain/TransTimeData.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/analy/domain/TransTimeData.java
similarity index 98%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/domain/TransTimeData.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/analy/domain/TransTimeData.java
index e80ba1e..71a79cd 100755
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/domain/TransTimeData.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/analy/domain/TransTimeData.java
@@ -1,4 +1,4 @@
-package org.dromara.qa.domain;
+package org.dromara.analy.domain;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import com.baomidou.mybatisplus.annotation.*;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/domain/bo/HoisterTimeDataBo.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/analy/domain/bo/HoisterTimeDataBo.java
similarity index 96%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/domain/bo/HoisterTimeDataBo.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/analy/domain/bo/HoisterTimeDataBo.java
index bdd6757..1dc38d7 100755
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/domain/bo/HoisterTimeDataBo.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/analy/domain/bo/HoisterTimeDataBo.java
@@ -1,6 +1,6 @@
-package org.dromara.qa.domain.bo;
+package org.dromara.analy.domain.bo;
-import org.dromara.qa.domain.HoisterTimeData;
+import org.dromara.analy.domain.HoisterTimeData;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
@@ -9,7 +9,7 @@
import lombok.EqualsAndHashCode;
import jakarta.validation.constraints.*;
import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
+
import com.fasterxml.jackson.annotation.JsonProperty;
/**
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/domain/bo/PackerTimeDataBo.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/analy/domain/bo/PackerTimeDataBo.java
similarity index 94%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/domain/bo/PackerTimeDataBo.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/analy/domain/bo/PackerTimeDataBo.java
index 96c7ecc..3a9bebe 100755
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/domain/bo/PackerTimeDataBo.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/analy/domain/bo/PackerTimeDataBo.java
@@ -1,6 +1,6 @@
-package org.dromara.qa.domain.bo;
+package org.dromara.analy.domain.bo;
-import org.dromara.qa.domain.PackerTimeData;
+import org.dromara.analy.domain.PackerTimeData;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
@@ -9,7 +9,6 @@
import lombok.EqualsAndHashCode;
import jakarta.validation.constraints.*;
import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
/**
* 鍖呰鏈哄垎鏋愪笟鍔″璞� packer_time_data
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/domain/bo/RollerTimeDataBo.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/analy/domain/bo/RollerTimeDataBo.java
similarity index 94%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/domain/bo/RollerTimeDataBo.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/analy/domain/bo/RollerTimeDataBo.java
index 5b942b7..96ee174 100755
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/domain/bo/RollerTimeDataBo.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/analy/domain/bo/RollerTimeDataBo.java
@@ -1,6 +1,6 @@
-package org.dromara.qa.domain.bo;
+package org.dromara.analy.domain.bo;
-import org.dromara.qa.domain.RollerTimeData;
+import org.dromara.analy.domain.RollerTimeData;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
@@ -9,7 +9,6 @@
import lombok.EqualsAndHashCode;
import jakarta.validation.constraints.*;
import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
/**
* 鍗锋帴鏈哄垎鏋愪笟鍔″璞� roller_time_data
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/domain/vo/HoisterTimeDataVo.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/analy/domain/vo/HoisterTimeDataVo.java
similarity index 95%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/domain/vo/HoisterTimeDataVo.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/analy/domain/vo/HoisterTimeDataVo.java
index 5a58179..5ba8112 100755
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/domain/vo/HoisterTimeDataVo.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/analy/domain/vo/HoisterTimeDataVo.java
@@ -1,20 +1,16 @@
-package org.dromara.qa.domain.vo;
+package org.dromara.analy.domain.vo;
import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
+
import com.fasterxml.jackson.annotation.JsonProperty;
-import org.dromara.qa.domain.HoisterTimeData;
+import org.dromara.analy.domain.HoisterTimeData;
import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
import cn.idev.excel.annotation.ExcelProperty;
-import org.dromara.common.excel.annotation.ExcelDictFormat;
-import org.dromara.common.excel.convert.ExcelDictConvert;
import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import java.io.Serial;
import java.io.Serializable;
-import java.util.Date;
-
/**
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/domain/vo/PackerTimeDataVo.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/analy/domain/vo/PackerTimeDataVo.java
similarity index 95%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/domain/vo/PackerTimeDataVo.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/analy/domain/vo/PackerTimeDataVo.java
index 636873b..641d26f 100755
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/domain/vo/PackerTimeDataVo.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/analy/domain/vo/PackerTimeDataVo.java
@@ -1,8 +1,8 @@
-package org.dromara.qa.domain.vo;
+package org.dromara.analy.domain.vo;
import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.dromara.qa.domain.PackerTimeData;
+
+import org.dromara.analy.domain.PackerTimeData;
import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
import cn.idev.excel.annotation.ExcelProperty;
import org.dromara.common.excel.annotation.ExcelDictFormat;
@@ -12,8 +12,6 @@
import java.io.Serial;
import java.io.Serializable;
-import java.util.Date;
-
/**
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/domain/vo/RollerTimeDataVo.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/analy/domain/vo/RollerTimeDataVo.java
similarity index 91%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/domain/vo/RollerTimeDataVo.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/analy/domain/vo/RollerTimeDataVo.java
index fdd4828..c5303dc 100755
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/domain/vo/RollerTimeDataVo.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/analy/domain/vo/RollerTimeDataVo.java
@@ -1,19 +1,15 @@
-package org.dromara.qa.domain.vo;
+package org.dromara.analy.domain.vo;
import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.dromara.qa.domain.RollerTimeData;
+
+import org.dromara.analy.domain.RollerTimeData;
import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
import cn.idev.excel.annotation.ExcelProperty;
-import org.dromara.common.excel.annotation.ExcelDictFormat;
-import org.dromara.common.excel.convert.ExcelDictConvert;
import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data;
import java.io.Serial;
import java.io.Serializable;
-import java.util.Date;
-
/**
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/mapper/HoisterTimeDataMapper.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/analy/mapper/HoisterTimeDataMapper.java
similarity index 64%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/mapper/HoisterTimeDataMapper.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/analy/mapper/HoisterTimeDataMapper.java
index 290843b..c4740eb 100755
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/mapper/HoisterTimeDataMapper.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/analy/mapper/HoisterTimeDataMapper.java
@@ -1,7 +1,7 @@
-package org.dromara.qa.mapper;
+package org.dromara.analy.mapper;
-import org.dromara.qa.domain.HoisterTimeData;
-import org.dromara.qa.domain.vo.HoisterTimeDataVo;
+import org.dromara.analy.domain.HoisterTimeData;
+import org.dromara.analy.domain.vo.HoisterTimeDataVo;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
/**
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/mapper/PackerTimeDataMapper.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/analy/mapper/PackerTimeDataMapper.java
similarity index 64%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/mapper/PackerTimeDataMapper.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/analy/mapper/PackerTimeDataMapper.java
index 2ef6d54..dbff000 100755
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/mapper/PackerTimeDataMapper.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/analy/mapper/PackerTimeDataMapper.java
@@ -1,7 +1,7 @@
-package org.dromara.qa.mapper;
+package org.dromara.analy.mapper;
-import org.dromara.qa.domain.PackerTimeData;
-import org.dromara.qa.domain.vo.PackerTimeDataVo;
+import org.dromara.analy.domain.PackerTimeData;
+import org.dromara.analy.domain.vo.PackerTimeDataVo;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
/**
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/mapper/RollerTimeDataMapper.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/analy/mapper/RollerTimeDataMapper.java
similarity index 73%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/mapper/RollerTimeDataMapper.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/analy/mapper/RollerTimeDataMapper.java
index e51f709..01c8e35 100755
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/mapper/RollerTimeDataMapper.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/analy/mapper/RollerTimeDataMapper.java
@@ -1,8 +1,8 @@
-package org.dromara.qa.mapper;
+package org.dromara.analy.mapper;
-import org.dromara.qa.domain.RollerTimeData;
-import org.dromara.qa.domain.bo.RollerTimeDataBo;
-import org.dromara.qa.domain.vo.RollerTimeDataVo;
+import org.dromara.analy.domain.RollerTimeData;
+import org.dromara.analy.domain.bo.RollerTimeDataBo;
+import org.dromara.analy.domain.vo.RollerTimeDataVo;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
import org.apache.ibatis.annotations.Param;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/service/IHoisterTimeDataService.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/analy/service/IHoisterTimeDataService.java
similarity index 91%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/service/IHoisterTimeDataService.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/analy/service/IHoisterTimeDataService.java
index 200369e..1481fe0 100755
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/service/IHoisterTimeDataService.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/analy/service/IHoisterTimeDataService.java
@@ -1,7 +1,7 @@
-package org.dromara.qa.service;
+package org.dromara.analy.service;
-import org.dromara.qa.domain.vo.HoisterTimeDataVo;
-import org.dromara.qa.domain.bo.HoisterTimeDataBo;
+import org.dromara.analy.domain.vo.HoisterTimeDataVo;
+import org.dromara.analy.domain.bo.HoisterTimeDataBo;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.mybatis.core.page.PageQuery;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/service/IPackerTimeDataService.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/analy/service/IPackerTimeDataService.java
similarity index 91%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/service/IPackerTimeDataService.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/analy/service/IPackerTimeDataService.java
index a20a5aa..022e20e 100755
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/service/IPackerTimeDataService.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/analy/service/IPackerTimeDataService.java
@@ -1,7 +1,7 @@
-package org.dromara.qa.service;
+package org.dromara.analy.service;
-import org.dromara.qa.domain.vo.PackerTimeDataVo;
-import org.dromara.qa.domain.bo.PackerTimeDataBo;
+import org.dromara.analy.domain.vo.PackerTimeDataVo;
+import org.dromara.analy.domain.bo.PackerTimeDataBo;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.mybatis.core.page.PageQuery;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/service/IRollerTimeDataService.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/analy/service/IRollerTimeDataService.java
similarity index 92%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/service/IRollerTimeDataService.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/analy/service/IRollerTimeDataService.java
index 8dabe96..b0900fa 100755
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/service/IRollerTimeDataService.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/analy/service/IRollerTimeDataService.java
@@ -1,7 +1,7 @@
-package org.dromara.qa.service;
+package org.dromara.analy.service;
-import org.dromara.qa.domain.vo.RollerTimeDataVo;
-import org.dromara.qa.domain.bo.RollerTimeDataBo;
+import org.dromara.analy.domain.vo.RollerTimeDataVo;
+import org.dromara.analy.domain.bo.RollerTimeDataBo;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.mybatis.core.page.PageQuery;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/service/impl/HoisterTimeDataServiceImpl.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/analy/service/impl/HoisterTimeDataServiceImpl.java
similarity index 93%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/service/impl/HoisterTimeDataServiceImpl.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/analy/service/impl/HoisterTimeDataServiceImpl.java
index 0a5fec8..67a4dc3 100755
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/service/impl/HoisterTimeDataServiceImpl.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/analy/service/impl/HoisterTimeDataServiceImpl.java
@@ -1,4 +1,4 @@
-package org.dromara.qa.service.impl;
+package org.dromara.analy.service.impl;
import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.core.utils.StringUtils;
@@ -10,11 +10,11 @@
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
-import org.dromara.qa.domain.bo.HoisterTimeDataBo;
-import org.dromara.qa.domain.vo.HoisterTimeDataVo;
-import org.dromara.qa.domain.HoisterTimeData;
-import org.dromara.qa.mapper.HoisterTimeDataMapper;
-import org.dromara.qa.service.IHoisterTimeDataService;
+import org.dromara.analy.domain.bo.HoisterTimeDataBo;
+import org.dromara.analy.domain.vo.HoisterTimeDataVo;
+import org.dromara.analy.domain.HoisterTimeData;
+import org.dromara.analy.mapper.HoisterTimeDataMapper;
+import org.dromara.analy.service.IHoisterTimeDataService;
import java.util.Date;
import java.util.List;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/service/impl/PackerTimeDataServiceImpl.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/analy/service/impl/PackerTimeDataServiceImpl.java
similarity index 94%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/service/impl/PackerTimeDataServiceImpl.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/analy/service/impl/PackerTimeDataServiceImpl.java
index 0e53c35..dc5b6cf 100755
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/service/impl/PackerTimeDataServiceImpl.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/analy/service/impl/PackerTimeDataServiceImpl.java
@@ -1,4 +1,4 @@
-package org.dromara.qa.service.impl;
+package org.dromara.analy.service.impl;
import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.core.utils.StringUtils;
@@ -10,11 +10,11 @@
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
-import org.dromara.qa.domain.bo.PackerTimeDataBo;
-import org.dromara.qa.domain.vo.PackerTimeDataVo;
-import org.dromara.qa.domain.PackerTimeData;
-import org.dromara.qa.mapper.PackerTimeDataMapper;
-import org.dromara.qa.service.IPackerTimeDataService;
+import org.dromara.analy.domain.bo.PackerTimeDataBo;
+import org.dromara.analy.domain.vo.PackerTimeDataVo;
+import org.dromara.analy.domain.PackerTimeData;
+import org.dromara.analy.mapper.PackerTimeDataMapper;
+import org.dromara.analy.service.IPackerTimeDataService;
import java.util.Date;
import java.util.List;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/service/impl/RollerTimeDataServiceImpl.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/analy/service/impl/RollerTimeDataServiceImpl.java
similarity index 94%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/service/impl/RollerTimeDataServiceImpl.java
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/analy/service/impl/RollerTimeDataServiceImpl.java
index fecb568..15af2f4 100755
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/service/impl/RollerTimeDataServiceImpl.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/analy/service/impl/RollerTimeDataServiceImpl.java
@@ -1,4 +1,4 @@
-package org.dromara.qa.service.impl;
+package org.dromara.analy.service.impl;
import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.core.utils.StringUtils;
@@ -10,11 +10,11 @@
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
-import org.dromara.qa.domain.bo.RollerTimeDataBo;
-import org.dromara.qa.domain.vo.RollerTimeDataVo;
-import org.dromara.qa.domain.RollerTimeData;
-import org.dromara.qa.mapper.RollerTimeDataMapper;
-import org.dromara.qa.service.IRollerTimeDataService;
+import org.dromara.analy.domain.bo.RollerTimeDataBo;
+import org.dromara.analy.domain.vo.RollerTimeDataVo;
+import org.dromara.analy.domain.RollerTimeData;
+import org.dromara.analy.mapper.RollerTimeDataMapper;
+import org.dromara.analy.service.IRollerTimeDataService;
import java.util.Date;
import java.util.List;
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/resources/mapper/qa/PackerTimeDataMapper.xml b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/resources/mapper/analy/PackerTimeDataMapper.xml
similarity index 72%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/resources/mapper/qa/PackerTimeDataMapper.xml
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/resources/mapper/analy/PackerTimeDataMapper.xml
index 0ce829b..df94b48 100755
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/resources/mapper/qa/PackerTimeDataMapper.xml
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/resources/mapper/analy/PackerTimeDataMapper.xml
@@ -2,5 +2,5 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.dromara.qa.mapper.PackerTimeDataMapper">
+<mapper namespace="org.dromara.analy.mapper.PackerTimeDataMapper">
</mapper>
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/resources/mapper/qa/RollerTimeDataMapper.xml b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/resources/mapper/analy/RollerTimeDataMapper.xml
similarity index 93%
rename from RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/resources/mapper/qa/RollerTimeDataMapper.xml
rename to RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/resources/mapper/analy/RollerTimeDataMapper.xml
index 3d2e86d..c4d1793 100755
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/resources/mapper/qa/RollerTimeDataMapper.xml
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/resources/mapper/analy/RollerTimeDataMapper.xml
@@ -2,9 +2,9 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.dromara.qa.mapper.RollerTimeDataMapper">
+<mapper namespace="org.dromara.analy.mapper.RollerTimeDataMapper">
- <select id="selectSampledList" resultType="org.dromara.qa.domain.vo.RollerTimeDataVo">
+ <select id="selectSampledList" resultType="org.dromara.analy.domain.vo.RollerTimeDataVo">
WITH roller_minute AS (
SELECT
*,
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/.flattened-pom.xml b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/.flattened-pom.xml
deleted file mode 100644
index 65ee993..0000000
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-system/.flattened-pom.xml
+++ /dev/null
@@ -1,80 +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>org.dromara</groupId>
- <artifactId>ruoyi-modules</artifactId>
- <version>5.5.3</version>
- </parent>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-system</artifactId>
- <version>5.5.3</version>
- <description>system绯荤粺妯″潡</description>
- <dependencies>
- <dependency>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-common-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-common-doc</artifactId>
- </dependency>
- <dependency>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-common-mybatis</artifactId>
- </dependency>
- <dependency>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-common-translation</artifactId>
- </dependency>
- <dependency>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-common-oss</artifactId>
- </dependency>
- <dependency>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-common-log</artifactId>
- </dependency>
- <dependency>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-common-excel</artifactId>
- </dependency>
- <dependency>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-common-sms</artifactId>
- </dependency>
- <dependency>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-common-tenant</artifactId>
- </dependency>
- <dependency>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-common-security</artifactId>
- </dependency>
- <dependency>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-common-web</artifactId>
- </dependency>
- <dependency>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-common-idempotent</artifactId>
- </dependency>
- <dependency>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-common-sensitive</artifactId>
- </dependency>
- <dependency>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-common-encrypt</artifactId>
- </dependency>
- <dependency>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-common-websocket</artifactId>
- </dependency>
- <dependency>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-common-sse</artifactId>
- </dependency>
- </dependencies>
-</project>
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-workflow/.flattened-pom.xml b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-workflow/.flattened-pom.xml
deleted file mode 100644
index e4d995a..0000000
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-workflow/.flattened-pom.xml
+++ /dev/null
@@ -1,72 +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>org.dromara</groupId>
- <artifactId>ruoyi-modules</artifactId>
- <version>5.5.3</version>
- </parent>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-workflow</artifactId>
- <version>5.5.3</version>
- <description>宸ヤ綔娴佹ā鍧�</description>
- <dependencies>
- <dependency>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-common-sse</artifactId>
- </dependency>
- <dependency>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-common-doc</artifactId>
- </dependency>
- <dependency>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-common-mail</artifactId>
- </dependency>
- <dependency>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-common-sms</artifactId>
- </dependency>
- <dependency>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-common-mybatis</artifactId>
- </dependency>
- <dependency>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-common-web</artifactId>
- </dependency>
- <dependency>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-common-log</artifactId>
- </dependency>
- <dependency>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-common-idempotent</artifactId>
- </dependency>
- <dependency>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-common-excel</artifactId>
- </dependency>
- <dependency>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-common-translation</artifactId>
- </dependency>
- <dependency>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-common-tenant</artifactId>
- </dependency>
- <dependency>
- <groupId>org.dromara</groupId>
- <artifactId>ruoyi-common-security</artifactId>
- </dependency>
- <dependency>
- <groupId>org.dromara.warm</groupId>
- <artifactId>warm-flow-mybatis-plus-sb3-starter</artifactId>
- </dependency>
- <dependency>
- <groupId>org.dromara.warm</groupId>
- <artifactId>warm-flow-plugin-ui-sb-web</artifactId>
- </dependency>
- </dependencies>
-</project>
diff --git "a/RuoYi-Vue-Plus/\345\274\200\345\217\221\346\227\245\345\277\227.md" "b/RuoYi-Vue-Plus/\345\274\200\345\217\221\346\227\245\345\277\227.md"
index 1de3019..3e10167 100644
--- "a/RuoYi-Vue-Plus/\345\274\200\345\217\221\346\227\245\345\277\227.md"
+++ "b/RuoYi-Vue-Plus/\345\274\200\345\217\221\346\227\245\345\277\227.md"
@@ -6,7 +6,7 @@
#### 20260226
- 1.鏂板鎴愬搧妫� 妫�楠屾壒娆� 绠＄悊椤甸潰
-- 2.寤鸿〃sql
+- 2.鏁版嵁搴撹〃锛� qm_batch
```
-- 鍒涘缓妫�楠屾壒娆¤〃
CREATE TABLE QM_BATCH (
diff --git a/ruoyi-plus-soybean/src/router/elegant/imports.ts b/ruoyi-plus-soybean/src/router/elegant/imports.ts
index 46ae9f6..c533376 100755
--- a/ruoyi-plus-soybean/src/router/elegant/imports.ts
+++ b/ruoyi-plus-soybean/src/router/elegant/imports.ts
@@ -34,6 +34,7 @@
monitor_logininfor: () => import("@/views/monitor/logininfor/index.vue"),
monitor_online: () => import("@/views/monitor/online/index.vue"),
monitor_operlog: () => import("@/views/monitor/operlog/index.vue"),
+ qm_batch: () => import("@/views/qm/batch/index.vue"),
system_client: () => import("@/views/system/client/index.vue"),
system_config: () => import("@/views/system/config/index.vue"),
system_dept: () => import("@/views/system/dept/index.vue"),
diff --git a/ruoyi-plus-soybean/src/router/elegant/routes.ts b/ruoyi-plus-soybean/src/router/elegant/routes.ts
index dcd996d..6a6900a 100755
--- a/ruoyi-plus-soybean/src/router/elegant/routes.ts
+++ b/ruoyi-plus-soybean/src/router/elegant/routes.ts
@@ -210,6 +210,26 @@
]
},
{
+ name: 'qm',
+ path: '/qm',
+ component: 'layout.base',
+ meta: {
+ title: 'qm',
+ i18nKey: 'route.qm'
+ },
+ children: [
+ {
+ name: 'qm_batch',
+ path: '/qm/batch',
+ component: 'view.qm_batch',
+ meta: {
+ title: 'qm_batch',
+ i18nKey: 'route.qm_batch'
+ }
+ }
+ ]
+ },
+ {
name: 'social-callback',
path: '/social-callback',
component: 'layout.blank$view.social-callback',
diff --git a/ruoyi-plus-soybean/src/router/elegant/transform.ts b/ruoyi-plus-soybean/src/router/elegant/transform.ts
index 3d3a7aa..8a15977 100755
--- a/ruoyi-plus-soybean/src/router/elegant/transform.ts
+++ b/ruoyi-plus-soybean/src/router/elegant/transform.ts
@@ -187,6 +187,8 @@
"monitor_logininfor": "/monitor/logininfor",
"monitor_online": "/monitor/online",
"monitor_operlog": "/monitor/operlog",
+ "qm": "/qm",
+ "qm_batch": "/qm/batch",
"social-callback": "/social-callback",
"system": "/system",
"system_client": "/system/client",
diff --git a/ruoyi-plus-soybean/src/typings/elegant-router.d.ts b/ruoyi-plus-soybean/src/typings/elegant-router.d.ts
index 8ee31f6..91d02d6 100755
--- a/ruoyi-plus-soybean/src/typings/elegant-router.d.ts
+++ b/ruoyi-plus-soybean/src/typings/elegant-router.d.ts
@@ -41,6 +41,8 @@
"monitor_logininfor": "/monitor/logininfor";
"monitor_online": "/monitor/online";
"monitor_operlog": "/monitor/operlog";
+ "qm": "/qm";
+ "qm_batch": "/qm/batch";
"social-callback": "/social-callback";
"system": "/system";
"system_client": "/system/client";
@@ -104,6 +106,7 @@
| "iframe-page"
| "login"
| "monitor"
+ | "qm"
| "social-callback"
| "system"
| "tool"
@@ -144,6 +147,7 @@
| "monitor_logininfor"
| "monitor_online"
| "monitor_operlog"
+ | "qm_batch"
| "system_client"
| "system_config"
| "system_dept"
--
Gitblit v1.9.3