From 39e85d5f8b72bb8cc75f55398ed51695e7c63230 Mon Sep 17 00:00:00 2001 From: JR <3573153686@qq.com> Date: Wed, 6 Aug 2025 15:26:45 +0800 Subject: [PATCH] =?UTF-8?q?refactor(project):=20=E9=87=8D=E6=9E=84?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=A8=A1=E5=9D=97=E5=B9=B6=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E4=BE=9D=E8=B5=96=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 新增 gear-oa 模块，用于处理 OA 功能 - 更新项目中所有模块的父项目版本为 0.8.3 - 修改 pom.xml 文件中的依赖版本引用 - 删除多个单元测试类，清理无用代码 --- build_log.txt | Bin 33202 -> 0 bytes gear-admin/pom.xml | 8 +- .../java/com/ruoyi/test/AssertUnitTest.java | 45 ----------- .../java/com/ruoyi/test/DemoUnitTest.java | 70 ----------------- .../java/com/ruoyi/test/ParamUnitTest.java | 72 ------------------ .../test/java/com/ruoyi/test/TagUnitTest.java | 54 ------------- gear-common/pom.xml | 2 +- gear-demo/pom.xml | 2 +- gear-extend/pom.xml | 2 +- gear-flowable/pom.xml | 2 +- gear-framework/pom.xml | 2 +- gear-generator/pom.xml | 2 +- gear-job/pom.xml | 2 +- gear-oa/pom.xml | 27 +++++++ gear-oa/src/main/java/占位 | 0 gear-oa/src/main/resources/占位 | 0 gear-oss/pom.xml | 2 +- gear-sms/pom.xml | 2 +- gear-system/pom.xml | 2 +- pom.xml | 32 +++++--- 20 files changed, 64 insertions(+), 264 deletions(-) delete mode 100644 build_log.txt delete mode 100644 gear-admin/src/test/java/com/ruoyi/test/AssertUnitTest.java delete mode 100644 gear-admin/src/test/java/com/ruoyi/test/DemoUnitTest.java delete mode 100644 gear-admin/src/test/java/com/ruoyi/test/ParamUnitTest.java delete mode 100644 gear-admin/src/test/java/com/ruoyi/test/TagUnitTest.java create mode 100644 gear-oa/pom.xml create mode 100644 gear-oa/src/main/java/占位 create mode 100644 gear-oa/src/main/resources/占位 diff --git a/build_log.txt b/build_log.txt deleted file mode 100644 index b3dfd4ea4c463232851b9f194bb48b1b5b5c2b98..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 33202 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 diff --git a/gear-admin/pom.xml b/gear-admin/pom.xml index da9b2f4..3b1050e 100644 --- a/gear-admin/pom.xml +++ b/gear-admin/pom.xml @@ -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"> - gear-oa + FURNITURE-OA com.gear 0.8.3 @@ -78,6 +78,12 @@ gear-demo + + + com.gear + gear-oa + + com.gear diff --git a/gear-admin/src/test/java/com/ruoyi/test/AssertUnitTest.java b/gear-admin/src/test/java/com/ruoyi/test/AssertUnitTest.java deleted file mode 100644 index b8a42e3..0000000 --- a/gear-admin/src/test/java/com/ruoyi/test/AssertUnitTest.java +++ /dev/null @@ -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); - } - -} diff --git a/gear-admin/src/test/java/com/ruoyi/test/DemoUnitTest.java b/gear-admin/src/test/java/com/ruoyi/test/DemoUnitTest.java deleted file mode 100644 index 4222014..0000000 --- a/gear-admin/src/test/java/com/ruoyi/test/DemoUnitTest.java +++ /dev/null @@ -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 =================="); - } - -} diff --git a/gear-admin/src/test/java/com/ruoyi/test/ParamUnitTest.java b/gear-admin/src/test/java/com/ruoyi/test/ParamUnitTest.java deleted file mode 100644 index a870f43..0000000 --- a/gear-admin/src/test/java/com/ruoyi/test/ParamUnitTest.java +++ /dev/null @@ -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 getParam() { - List 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 =================="); - } - - -} diff --git a/gear-admin/src/test/java/com/ruoyi/test/TagUnitTest.java b/gear-admin/src/test/java/com/ruoyi/test/TagUnitTest.java deleted file mode 100644 index 32bfbfc..0000000 --- a/gear-admin/src/test/java/com/ruoyi/test/TagUnitTest.java +++ /dev/null @@ -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 =================="); - } - - -} diff --git a/gear-common/pom.xml b/gear-common/pom.xml index b81191e..756e56c 100644 --- a/gear-common/pom.xml +++ b/gear-common/pom.xml @@ -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"> - gear-oa + FURNITURE-OA com.gear 0.8.3 diff --git a/gear-demo/pom.xml b/gear-demo/pom.xml index 4252b7b..4e87f95 100644 --- a/gear-demo/pom.xml +++ b/gear-demo/pom.xml @@ -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"> - gear-oa + FURNITURE-OA com.gear 0.8.3 diff --git a/gear-extend/pom.xml b/gear-extend/pom.xml index bab48f7..2b2de80 100644 --- a/gear-extend/pom.xml +++ b/gear-extend/pom.xml @@ -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"> - gear-oa + FURNITURE-OA com.gear 0.8.3 diff --git a/gear-flowable/pom.xml b/gear-flowable/pom.xml index 2304db5..3cf4b16 100644 --- a/gear-flowable/pom.xml +++ b/gear-flowable/pom.xml @@ -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"> - gear-oa + FURNITURE-OA com.gear 0.8.3 diff --git a/gear-framework/pom.xml b/gear-framework/pom.xml index 0be712b..15677f3 100644 --- a/gear-framework/pom.xml +++ b/gear-framework/pom.xml @@ -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"> - gear-oa + FURNITURE-OA com.gear 0.8.3 diff --git a/gear-generator/pom.xml b/gear-generator/pom.xml index a77cdf0..0ce9ab8 100644 --- a/gear-generator/pom.xml +++ b/gear-generator/pom.xml @@ -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"> - gear-oa + FURNITURE-OA com.gear 0.8.3 diff --git a/gear-job/pom.xml b/gear-job/pom.xml index abec603..befa8d3 100644 --- a/gear-job/pom.xml +++ b/gear-job/pom.xml @@ -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"> - gear-oa + FURNITURE-OA com.gear 0.8.3 diff --git a/gear-oa/pom.xml b/gear-oa/pom.xml new file mode 100644 index 0000000..a05a137 --- /dev/null +++ b/gear-oa/pom.xml @@ -0,0 +1,27 @@ + + + 4.0.0 + + com.gear + FURNITURE-OA + 0.8.3 + + + gear-oa + + + oa模块 + + + + + + com.gear + gear-common + + + + + diff --git a/gear-oa/src/main/java/占位 b/gear-oa/src/main/java/占位 new file mode 100644 index 0000000..e69de29 diff --git a/gear-oa/src/main/resources/占位 b/gear-oa/src/main/resources/占位 new file mode 100644 index 0000000..e69de29 diff --git a/gear-oss/pom.xml b/gear-oss/pom.xml index 77842cf..c03042a 100644 --- a/gear-oss/pom.xml +++ b/gear-oss/pom.xml @@ -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"> - gear-oa + FURNITURE-OA com.gear 0.8.3 diff --git a/gear-sms/pom.xml b/gear-sms/pom.xml index a8ecf7d..761862b 100644 --- a/gear-sms/pom.xml +++ b/gear-sms/pom.xml @@ -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"> - gear-oa + FURNITURE-OA com.gear 0.8.3 diff --git a/gear-system/pom.xml b/gear-system/pom.xml index 3766d1c..86f223e 100644 --- a/gear-system/pom.xml +++ b/gear-system/pom.xml @@ -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"> - gear-oa + FURNITURE-OA com.gear 0.8.3 diff --git a/pom.xml b/pom.xml index a31537d..061b2ef 100644 --- a/pom.xml +++ b/pom.xml @@ -5,15 +5,15 @@ 4.0.0 com.gear - gear-oa + FURNITURE-OA 0.8.3 - Gear-Flowable-Plus + FURNITURE-OA https://gitee.com/KonBAI-Q/ruoyi-flowable-plus Gear-Flowable-Plus后台管理系统 - 0.8.3 + 0.8.3 2.7.11 UTF-8 UTF-8 @@ -293,63 +293,70 @@ com.gear gear-job - ${gear-oa-flowable-plus.version} + ${gear.version} com.gear gear-generator - ${gear-oa-flowable-plus.version} + ${gear.version} com.gear gear-framework - ${gear-oa-flowable-plus.version} + ${gear.version} com.gear gear-system - ${gear-oa-flowable-plus.version} + ${gear.version} com.gear gear-common - ${gear-oa-flowable-plus.version} + ${gear.version} com.gear gear-flowable - ${gear-oa-flowable-plus.version} + ${gear.version} com.gear gear-oss - ${gear-oa-flowable-plus.version} + ${gear.version} com.gear gear-sms - ${gear-oa-flowable-plus.version} + ${gear.version} com.gear gear-demo - ${gear-oa-flowable-plus.version} + ${gear.version} + + + + + com.gear + gear-oa + ${gear.version} @@ -367,6 +374,7 @@ gear-oss gear-sms gear-system + gear-oa pom