diff --git a/build_log.txt b/build_log.txt
deleted file mode 100644
index b3dfd4e..0000000
Binary files a/build_log.txt and /dev/null differ
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