DeXun/GEAR-OA
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(project): 重构项目模块并更新依赖版本

Browse Source 
- 新增 gear-oa 模块，用于处理 OA 功能
- 更新项目中所有模块的父项目版本为 0.8.3
- 修改 pom.xml 文件中的依赖版本引用
- 删除多个单元测试类，清理无用代码
This commit is contained in:
JR
2025-08-06 15:26:45 +08:00
parent b8761ef6bc
commit 39e85d5f8b
20 changed files with 64 additions and 264 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
build_log.txt
View File

Binary file not shown.

8
gear-admin/pom.xml
View File

@@ -3,7 +3,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>gear-oa</artifactId>
<artifactId>FURNITURE-OA</artifactId>
<groupId>com.gear</groupId>
<version>0.8.3</version>
</parent>
@@ -78,6 +78,12 @@
<artifactId>gear-demo</artifactId>
</dependency>
<!-- oa模块 -->
<dependency>
<groupId>com.gear</groupId>
<artifactId>gear-oa</artifactId>
</dependency>
<!-- flowable模块-->
<dependency>
<groupId>com.gear</groupId>

45
gear-admin/src/test/java/com/ruoyi/test/AssertUnitTest.java
View File

@@ -1,45 +0,0 @@
package com.gear.test;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
/**
* 断言单元测试案例
*
* @author Lion Li
*/
@DisplayName("断言单元测试案例")
public class AssertUnitTest {
@DisplayName("测试 assertEquals 方法")
@Test
public void testAssertEquals() {
Assertions.assertEquals("666", new String("666"));
Assertions.assertNotEquals("666", new String("666"));
}
@DisplayName("测试 assertSame 方法")
@Test
public void testAssertSame() {
Object obj = new Object();
Object obj1 = obj;
Assertions.assertSame(obj, obj1);
Assertions.assertNotSame(obj, obj1);
}
@DisplayName("测试 assertTrue 方法")
@Test
public void testAssertTrue() {
Assertions.assertTrue(true);
Assertions.assertFalse(true);
}
@DisplayName("测试 assertNull 方法")
@Test
public void testAssertNull() {
Assertions.assertNull(null);
Assertions.assertNotNull(null);
}
}

70
gear-admin/src/test/java/com/ruoyi/test/DemoUnitTest.java
View File

@@ -1,70 +0,0 @@
package com.gear.test;
import com.gear.common.config.RuoYiConfig;
import org.junit.jupiter.api.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import java.util.concurrent.TimeUnit;
/**
* 单元测试案例
*
* @author Lion Li
*/
@SpringBootTest // 此注解只能在 springboot 主包下使用 需包含 main 方法与 yml 配置文件
@DisplayName("单元测试案例")
public class DemoUnitTest {
@Autowired
private RuoYiConfig ruoYiConfig;
@DisplayName("测试 @SpringBootTest @Test @DisplayName 注解")
@Test
public void testTest() {
System.out.println(ruoYiConfig);
}
@Disabled
@DisplayName("测试 @Disabled 注解")
@Test
public void testDisabled() {
System.out.println(ruoYiConfig);
}
@Timeout(value = 2L, unit = TimeUnit.SECONDS)
@DisplayName("测试 @Timeout 注解")
@Test
public void testTimeout() throws InterruptedException {
Thread.sleep(3000);
System.out.println(ruoYiConfig);
}
@DisplayName("测试 @RepeatedTest 注解")
@RepeatedTest(3)
public void testRepeatedTest() {
System.out.println(666);
}
@BeforeAll
public static void testBeforeAll() {
System.out.println("@BeforeAll ==================");
}
@BeforeEach
public void testBeforeEach() {
System.out.println("@BeforeEach ==================");
}
@AfterEach
public void testAfterEach() {
System.out.println("@AfterEach ==================");
}
@AfterAll
public static void testAfterAll() {
System.out.println("@AfterAll ==================");
}
}

72
gear-admin/src/test/java/com/ruoyi/test/ParamUnitTest.java
View File

@@ -1,72 +0,0 @@
package com.gear.test;
import com.gear.common.enums.UserType;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.EnumSource;
import org.junit.jupiter.params.provider.MethodSource;
import org.junit.jupiter.params.provider.NullSource;
import org.junit.jupiter.params.provider.ValueSource;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Stream;
/**
* 带参数单元测试案例
*
* @author Lion Li
*/
@DisplayName("带参数单元测试案例")
public class ParamUnitTest {
@DisplayName("测试 @ValueSource 注解")
@ParameterizedTest
@ValueSource(strings = {"t1", "t2", "t3"})
public void testValueSource(String str) {
System.out.println(str);
}
@DisplayName("测试 @NullSource 注解")
@ParameterizedTest
@NullSource
public void testNullSource(String str) {
System.out.println(str);
}
@DisplayName("测试 @EnumSource 注解")
@ParameterizedTest
@EnumSource(UserType.class)
public void testEnumSource(UserType type) {
System.out.println(type.getUserType());
}
@DisplayName("测试 @MethodSource 注解")
@ParameterizedTest
@MethodSource("getParam")
public void testMethodSource(String str) {
System.out.println(str);
}
public static Stream<String> getParam() {
List<String> list = new ArrayList<>();
list.add("t1");
list.add("t2");
list.add("t3");
return list.stream();
}
@BeforeEach
public void testBeforeEach() {
System.out.println("@BeforeEach ==================");
}
@AfterEach
public void testAfterEach() {
System.out.println("@AfterEach ==================");
}
}

54
gear-admin/src/test/java/com/ruoyi/test/TagUnitTest.java
View File

@@ -1,54 +0,0 @@
package com.gear.test;
import org.junit.jupiter.api.*;
import org.springframework.boot.test.context.SpringBootTest;
/**
* 标签单元测试案例
*
* @author Lion Li
*/
@SpringBootTest
@DisplayName("标签单元测试案例")
public class TagUnitTest {
@Tag("dev")
@DisplayName("测试 @Tag dev")
@Test
public void testTagDev() {
System.out.println("dev");
}
@Tag("prod")
@DisplayName("测试 @Tag prod")
@Test
public void testTagProd() {
System.out.println("prod");
}
@Tag("local")
@DisplayName("测试 @Tag local")
@Test
public void testTagLocal() {
System.out.println("local");
}
@Tag("exclude")
@DisplayName("测试 @Tag exclude")
@Test
public void testTagExclude() {
System.out.println("exclude");
}
@BeforeEach
public void testBeforeEach() {
System.out.println("@BeforeEach ==================");
}
@AfterEach
public void testAfterEach() {
System.out.println("@AfterEach ==================");
}
}

2
gear-common/pom.xml
View File

@@ -3,7 +3,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>gear-oa</artifactId>
<artifactId>FURNITURE-OA</artifactId>
<groupId>com.gear</groupId>
<version>0.8.3</version>
</parent>

2
gear-demo/pom.xml
View File

@@ -3,7 +3,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>gear-oa</artifactId>
<artifactId>FURNITURE-OA</artifactId>
<groupId>com.gear</groupId>
<version>0.8.3</version>
</parent>

2
gear-extend/pom.xml
View File

@@ -3,7 +3,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>gear-oa</artifactId>
<artifactId>FURNITURE-OA</artifactId>
<groupId>com.gear</groupId>
<version>0.8.3</version>
</parent>

2
gear-flowable/pom.xml
View File

@@ -3,7 +3,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>gear-oa</artifactId>
<artifactId>FURNITURE-OA</artifactId>
<groupId>com.gear</groupId>
<version>0.8.3</version>
</parent>

2
gear-framework/pom.xml
View File

@@ -3,7 +3,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>gear-oa</artifactId>
<artifactId>FURNITURE-OA</artifactId>
<groupId>com.gear</groupId>
<version>0.8.3</version>
</parent>

2
gear-generator/pom.xml
View File

@@ -3,7 +3,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>gear-oa</artifactId>
<artifactId>FURNITURE-OA</artifactId>
<groupId>com.gear</groupId>
<version>0.8.3</version>
</parent>

2
gear-job/pom.xml
View File

@@ -3,7 +3,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>gear-oa</artifactId>
<artifactId>FURNITURE-OA</artifactId>
<groupId>com.gear</groupId>
<version>0.8.3</version>
</parent>

27
gear-oa/pom.xml Normal file
View File

@@ -0,0 +1,27 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.gear</groupId>
<artifactId>FURNITURE-OA</artifactId>
<version>0.8.3</version>
</parent>
<artifactId>gear-oa</artifactId>
<description>
oa模块
</description>
<dependencies>
<!-- 通用工具-->
<dependency>
<groupId>com.gear</groupId>
<artifactId>gear-common</artifactId>
</dependency>
</dependencies>
</project>

0
gear-oa/src/main/java/占位 Normal file
View File

0
gear-oa/src/main/resources/占位 Normal file
View File

2
gear-oss/pom.xml
View File

@@ -3,7 +3,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>gear-oa</artifactId>
<artifactId>FURNITURE-OA</artifactId>
<groupId>com.gear</groupId>
<version>0.8.3</version>
</parent>

2
gear-sms/pom.xml
View File

@@ -3,7 +3,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>gear-oa</artifactId>
<artifactId>FURNITURE-OA</artifactId>
<groupId>com.gear</groupId>
<version>0.8.3</version>
</parent>

2
gear-system/pom.xml
View File

@@ -3,7 +3,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>gear-oa</artifactId>
<artifactId>FURNITURE-OA</artifactId>
<groupId>com.gear</groupId>
<version>0.8.3</version>
</parent>

32
pom.xml
View File

@@ -5,15 +5,15 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.gear</groupId>
<artifactId>gear-oa</artifactId>
<artifactId>FURNITURE-OA</artifactId>
<version>0.8.3</version>
<name>Gear-Flowable-Plus</name>
<name>FURNITURE-OA</name>
<url>https://gitee.com/KonBAI-Q/ruoyi-flowable-plus</url>
<description>Gear-Flowable-Plus后台管理系统</description>
<properties>
<gear-oa-flowable-plus.version>0.8.3</gear-oa-flowable-plus.version>
<gear.version>0.8.3</gear.version>
<spring-boot.version>2.7.11</spring-boot.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
@@ -293,63 +293,70 @@
<dependency>
<groupId>com.gear</groupId>
<artifactId>gear-job</artifactId>
<version>${gear-oa-flowable-plus.version}</version>
<version>${gear.version}</version>
</dependency>
<!-- 代码生成-->
<dependency>
<groupId>com.gear</groupId>
<artifactId>gear-generator</artifactId>
<version>${gear-oa-flowable-plus.version}</version>
<version>${gear.version}</version>
</dependency>
<!-- 核心模块-->
<dependency>
<groupId>com.gear</groupId>
<artifactId>gear-framework</artifactId>
<version>${gear-oa-flowable-plus.version}</version>
<version>${gear.version}</version>
</dependency>
<!-- 系统模块-->
<dependency>
<groupId>com.gear</groupId>
<artifactId>gear-system</artifactId>
<version>${gear-oa-flowable-plus.version}</version>
<version>${gear.version}</version>
</dependency>
<!-- 通用工具-->
<dependency>
<groupId>com.gear</groupId>
<artifactId>gear-common</artifactId>
<version>${gear-oa-flowable-plus.version}</version>
<version>${gear.version}</version>
</dependency>
<!-- 工作流模块 -->
<dependency>
<groupId>com.gear</groupId>
<artifactId>gear-flowable</artifactId>
<version>${gear-oa-flowable-plus.version}</version>
<version>${gear.version}</version>
</dependency>
<!-- OSS对象存储模块 -->
<dependency>
<groupId>com.gear</groupId>
<artifactId>gear-oss</artifactId>
<version>${gear-oa-flowable-plus.version}</version>
<version>${gear.version}</version>
</dependency>
<!-- SMS短信模块 -->
<dependency>
<groupId>com.gear</groupId>
<artifactId>gear-sms</artifactId>
<version>${gear-oa-flowable-plus.version}</version>
<version>${gear.version}</version>
</dependency>
<!-- demo模块 -->
<dependency>
<groupId>com.gear</groupId>
<artifactId>gear-demo</artifactId>
<version>${gear-oa-flowable-plus.version}</version>
<version>${gear.version}</version>
</dependency>
<!-- oa模块 -->
<dependency>
<groupId>com.gear</groupId>
<artifactId>gear-oa</artifactId>
<version>${gear.version}</version>
</dependency>
</dependencies>
@@ -367,6 +374,7 @@
<module>gear-oss</module>
<module>gear-sms</module>
<module>gear-system</module>
<module>gear-oa</module>
</modules>
<packaging>pom</packaging>