From f10fb2f6d8688ff14a6d282444726fc9671a5220 Mon Sep 17 00:00:00 2001
From: Mrking <782276617@qq.com>
Date: Sun, 30 Jun 2024 17:55:00 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E6=8F=90=E4=BA=A4?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .flattened-pom.xml                            |  4 +--
 .idea/compiler.xml                            |  2 +-
 .idea/encodings.xml                           |  4 +++
 hangtag-module-oms/.flattened-pom.xml         | 18 ++++++++++
 .../hangtag-module-oms-biz/.flattened-pom.xml | 36 +++++++++++++++++++
 .../hangtag-module-oms-biz}/pom.xml           |  4 +--
 .../module/biz/framework/package-info.java    |  0
 .../web/config/ProductWebConfiguration.java   |  0
 .../biz/framework/web/package-info.java       |  0
 .../cn/hangtag/module/biz/package-info.java   |  0
 .../pom.xml                                   |  4 +--
 .../test/java/cn/hangtag/ProjectReactor.java  |  4 +--
 hangtag-ui/.env                               |  2 +-
 .../src/api/{business => oms}/order/index.ts  |  0
 .../src/api/{business => oms}/order/index.vue |  0
 .../views/{business => oms}/order/index.vue   |  0
 pom.xml                                       |  4 +--
 script/docker/docker-compose.yml              |  2 +-
 script/docker/docker.env                      |  2 +-
 19 files changed, 72 insertions(+), 14 deletions(-)
 create mode 100644 hangtag-module-oms/.flattened-pom.xml
 create mode 100644 hangtag-module-oms/hangtag-module-oms-biz/.flattened-pom.xml
 rename {hangtag-module-gkbiz/hangtag-module-gkbiz-biz => hangtag-module-oms/hangtag-module-oms-biz}/pom.xml (93%)
 rename {hangtag-module-gkbiz/hangtag-module-gkbiz-biz => hangtag-module-oms/hangtag-module-oms-biz}/src/main/java/cn/hangtag/module/biz/framework/package-info.java (100%)
 rename {hangtag-module-gkbiz/hangtag-module-gkbiz-biz => hangtag-module-oms/hangtag-module-oms-biz}/src/main/java/cn/hangtag/module/biz/framework/web/config/ProductWebConfiguration.java (100%)
 rename {hangtag-module-gkbiz/hangtag-module-gkbiz-biz => hangtag-module-oms/hangtag-module-oms-biz}/src/main/java/cn/hangtag/module/biz/framework/web/package-info.java (100%)
 rename {hangtag-module-gkbiz/hangtag-module-gkbiz-biz => hangtag-module-oms/hangtag-module-oms-biz}/src/main/java/cn/hangtag/module/biz/package-info.java (100%)
 rename {hangtag-module-gkbiz => hangtag-module-oms}/pom.xml (83%)
 rename hangtag-ui/src/api/{business => oms}/order/index.ts (100%)
 rename hangtag-ui/src/api/{business => oms}/order/index.vue (100%)
 rename hangtag-ui/src/views/{business => oms}/order/index.vue (100%)

diff --git a/.flattened-pom.xml b/.flattened-pom.xml
index ec7213c..6854656 100644
--- a/.flattened-pom.xml
+++ b/.flattened-pom.xml
@@ -7,14 +7,14 @@
   <version>2.1.0-jdk8-snapshot</version>
   <packaging>pom</packaging>
   <name>${project.artifactId}</name>
-  <description>芋道项目基础脚手架</description>
-  <url>https://github.com/YunaiV/ruoyi-vue-pro</url>
+  <description>OMS管理系统</description>
   <modules>
     <module>hangtag-dependencies</module>
     <module>hangtag-framework</module>
     <module>hangtag-server</module>
     <module>hangtag-module-system</module>
     <module>hangtag-module-infra</module>
+    <module>hangtag-module-oms</module>
   </modules>
   <properties>
     <lombok.version>1.18.30</lombok.version>
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 25984aa..d761f61 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -16,7 +16,6 @@
         <module name="hangtag-spring-boot-starter-job" />
         <module name="hangtag-spring-boot-starter-redis" />
         <module name="hangtag-spring-boot-starter-test" />
-        <module name="hangtag-module-gkbiz-biz" />
         <module name="hangtag-spring-boot-starter-biz-ip" />
         <module name="hangtag-spring-boot-starter-security" />
         <module name="hangtag-module-system-api" />
@@ -28,6 +27,7 @@
         <module name="hangtag-spring-boot-starter-biz-tenant" />
         <module name="hangtag-module-system-biz" />
         <module name="hangtag-common" />
+        <module name="hangtag-module-oms-biz" />
         <module name="hangtag-spring-boot-starter-mybatis" />
         <module name="hangtag-spring-boot-starter-mq" />
         <module name="hangtag-spring-boot-starter-excel" />
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
index e8d725d..af9b10c 100644
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -43,6 +43,10 @@
     <file url="file://$PROJECT_DIR$/hangtag-module-infra/hangtag-module-infra-biz/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/hangtag-module-infra/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/hangtag-module-infra/src/main/resources" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/hangtag-module-oms/hangtag-module-oms-biz/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/hangtag-module-oms/hangtag-module-oms-biz/src/main/resources" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/hangtag-module-oms/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/hangtag-module-oms/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/hangtag-module-system/hangtag-module-system-api/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/hangtag-module-system/hangtag-module-system-api/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/hangtag-module-system/hangtag-module-system-biz/src/main/java" charset="UTF-8" />
diff --git a/hangtag-module-oms/.flattened-pom.xml b/hangtag-module-oms/.flattened-pom.xml
new file mode 100644
index 0000000..26967ed
--- /dev/null
+++ b/hangtag-module-oms/.flattened-pom.xml
@@ -0,0 +1,18 @@
+<?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>cn.hangtag</groupId>
+    <artifactId>hangtag</artifactId>
+    <version>2.1.0-jdk8-snapshot</version>
+  </parent>
+  <groupId>cn.hangtag</groupId>
+  <artifactId>hangtag-module-oms</artifactId>
+  <version>2.1.0-jdk8-snapshot</version>
+  <packaging>pom</packaging>
+  <name>${project.artifactId}</name>
+  <modules>
+    <module>hangtag-module-oms-biz</module>
+  </modules>
+</project>
diff --git a/hangtag-module-oms/hangtag-module-oms-biz/.flattened-pom.xml b/hangtag-module-oms/hangtag-module-oms-biz/.flattened-pom.xml
new file mode 100644
index 0000000..4ca3710
--- /dev/null
+++ b/hangtag-module-oms/hangtag-module-oms-biz/.flattened-pom.xml
@@ -0,0 +1,36 @@
+<?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>cn.hangtag</groupId>
+    <artifactId>hangtag-module-oms</artifactId>
+    <version>2.1.0-jdk8-snapshot</version>
+  </parent>
+  <groupId>cn.hangtag</groupId>
+  <artifactId>hangtag-module-oms-biz</artifactId>
+  <version>2.1.0-jdk8-snapshot</version>
+  <name>${project.artifactId}</name>
+  <dependencies>
+    <dependency>
+      <groupId>cn.hangtag</groupId>
+      <artifactId>hangtag-spring-boot-starter-web</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>cn.hangtag</groupId>
+      <artifactId>hangtag-spring-boot-starter-security</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>cn.hangtag</groupId>
+      <artifactId>hangtag-spring-boot-starter-mybatis</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>cn.hangtag</groupId>
+      <artifactId>hangtag-spring-boot-starter-test</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>cn.hangtag</groupId>
+      <artifactId>hangtag-spring-boot-starter-excel</artifactId>
+    </dependency>
+  </dependencies>
+</project>
diff --git a/hangtag-module-gkbiz/hangtag-module-gkbiz-biz/pom.xml b/hangtag-module-oms/hangtag-module-oms-biz/pom.xml
similarity index 93%
rename from hangtag-module-gkbiz/hangtag-module-gkbiz-biz/pom.xml
rename to hangtag-module-oms/hangtag-module-oms-biz/pom.xml
index 0f49277..f45da67 100644
--- a/hangtag-module-gkbiz/hangtag-module-gkbiz-biz/pom.xml
+++ b/hangtag-module-oms/hangtag-module-oms-biz/pom.xml
@@ -4,11 +4,11 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <groupId>cn.hangtag</groupId>
-        <artifactId>hangtag-module-gkbiz</artifactId>
+        <artifactId>hangtag-module-oms</artifactId>
         <version>${revision}</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>hangtag-module-gkbiz-biz</artifactId>
+    <artifactId>hangtag-module-oms-biz</artifactId>
     <packaging>jar</packaging>
 
     <name>${project.artifactId}</name>
diff --git a/hangtag-module-gkbiz/hangtag-module-gkbiz-biz/src/main/java/cn/hangtag/module/biz/framework/package-info.java b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/biz/framework/package-info.java
similarity index 100%
rename from hangtag-module-gkbiz/hangtag-module-gkbiz-biz/src/main/java/cn/hangtag/module/biz/framework/package-info.java
rename to hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/biz/framework/package-info.java
diff --git a/hangtag-module-gkbiz/hangtag-module-gkbiz-biz/src/main/java/cn/hangtag/module/biz/framework/web/config/ProductWebConfiguration.java b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/biz/framework/web/config/ProductWebConfiguration.java
similarity index 100%
rename from hangtag-module-gkbiz/hangtag-module-gkbiz-biz/src/main/java/cn/hangtag/module/biz/framework/web/config/ProductWebConfiguration.java
rename to hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/biz/framework/web/config/ProductWebConfiguration.java
diff --git a/hangtag-module-gkbiz/hangtag-module-gkbiz-biz/src/main/java/cn/hangtag/module/biz/framework/web/package-info.java b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/biz/framework/web/package-info.java
similarity index 100%
rename from hangtag-module-gkbiz/hangtag-module-gkbiz-biz/src/main/java/cn/hangtag/module/biz/framework/web/package-info.java
rename to hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/biz/framework/web/package-info.java
diff --git a/hangtag-module-gkbiz/hangtag-module-gkbiz-biz/src/main/java/cn/hangtag/module/biz/package-info.java b/hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/biz/package-info.java
similarity index 100%
rename from hangtag-module-gkbiz/hangtag-module-gkbiz-biz/src/main/java/cn/hangtag/module/biz/package-info.java
rename to hangtag-module-oms/hangtag-module-oms-biz/src/main/java/cn/hangtag/module/biz/package-info.java
diff --git a/hangtag-module-gkbiz/pom.xml b/hangtag-module-oms/pom.xml
similarity index 83%
rename from hangtag-module-gkbiz/pom.xml
rename to hangtag-module-oms/pom.xml
index 5068843..7d61a2f 100644
--- a/hangtag-module-gkbiz/pom.xml
+++ b/hangtag-module-oms/pom.xml
@@ -10,9 +10,9 @@
     </parent>
     <packaging>pom</packaging>
     <name>${project.artifactId}</name>
-    <artifactId>hangtag-module-gkbiz</artifactId>
+    <artifactId>hangtag-module-oms</artifactId>
 
     <modules>
-        <module>hangtag-module-gkbiz-biz</module>
+        <module>hangtag-module-oms-biz</module>
     </modules>
 </project>
\ No newline at end of file
diff --git a/hangtag-server/src/test/java/cn/hangtag/ProjectReactor.java b/hangtag-server/src/test/java/cn/hangtag/ProjectReactor.java
index 2c7424f..0737ecc 100644
--- a/hangtag-server/src/test/java/cn/hangtag/ProjectReactor.java
+++ b/hangtag-server/src/test/java/cn/hangtag/ProjectReactor.java
@@ -28,7 +28,7 @@ public class ProjectReactor {
     private static final String GROUP_ID = "cn.hangtag";
     private static final String ARTIFACT_ID = "hangtag";
     private static final String PACKAGE_NAME = "cn.hangtag";
-    private static final String TITLE = "挂卡管理系统";
+    private static final String TITLE = "OMS管理系统";
 
     /**
      * 白名单文件，不进行重写，避免出问题
@@ -46,7 +46,7 @@ public class ProjectReactor {
         String groupIdNew = "cn.hangtag";
         String artifactIdNew = "hangtag";
         String packageNameNew = "cn.hangtag";
-        String titleNew = "挂卡管理系统";
+        String titleNew = "OMS管理系统";
         String projectBaseDirNew = projectBaseDir + "-new"; // 一键改名后，“新”项目所在的目录
         log.info("[main][检测新项目目录 ({})是否存在]", projectBaseDirNew);
         if (FileUtil.exist(projectBaseDirNew)) {
diff --git a/hangtag-ui/.env b/hangtag-ui/.env
index 76f2ac4..7c289d3 100644
--- a/hangtag-ui/.env
+++ b/hangtag-ui/.env
@@ -1,5 +1,5 @@
 # 标题
-VITE_APP_TITLE=挂卡管理系统
+VITE_APP_TITLE=OMS管理系统
 
 # 项目本地运行端口号
 VITE_PORT=80
diff --git a/hangtag-ui/src/api/business/order/index.ts b/hangtag-ui/src/api/oms/order/index.ts
similarity index 100%
rename from hangtag-ui/src/api/business/order/index.ts
rename to hangtag-ui/src/api/oms/order/index.ts
diff --git a/hangtag-ui/src/api/business/order/index.vue b/hangtag-ui/src/api/oms/order/index.vue
similarity index 100%
rename from hangtag-ui/src/api/business/order/index.vue
rename to hangtag-ui/src/api/oms/order/index.vue
diff --git a/hangtag-ui/src/views/business/order/index.vue b/hangtag-ui/src/views/oms/order/index.vue
similarity index 100%
rename from hangtag-ui/src/views/business/order/index.vue
rename to hangtag-ui/src/views/oms/order/index.vue
diff --git a/pom.xml b/pom.xml
index be751fb..b40db15 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,7 +15,7 @@
         <!-- 各种 module 拓展 -->
         <module>hangtag-module-system</module>
         <module>hangtag-module-infra</module>
-        <module>hangtag-module-gkbiz</module>
+        <module>hangtag-module-oms</module>
         <!--        <module>hangtag-module-member</module>-->
 <!--        <module>hangtag-module-bpm</module>-->
 <!--        <module>hangtag-module-report</module>-->
@@ -27,7 +27,7 @@
     </modules>
 
     <name>${project.artifactId}</name>
-    <description>挂卡管理系统</description>
+    <description>OMS管理系统</description>
 
     <properties>
         <revision>2.1.0-jdk8-snapshot</revision>
diff --git a/script/docker/docker-compose.yml b/script/docker/docker-compose.yml
index 9a28013..ff947f8 100644
--- a/script/docker/docker-compose.yml
+++ b/script/docker/docker-compose.yml
@@ -63,7 +63,7 @@ services:
         NODE_ENV:
           ENV=${NODE_ENV:-production}
           PUBLIC_PATH=${PUBLIC_PATH:-/}
-          VUE_APP_TITLE=${VUE_APP_TITLE:-挂卡管理系统}
+          VUE_APP_TITLE=${VUE_APP_TITLE:-OMS管理系统}
           VUE_APP_BASE_API=${VUE_APP_BASE_API:-/prod-api}
           VUE_APP_APP_NAME=${VUE_APP_APP_NAME:-/}
           VUE_APP_TENANT_ENABLE=${VUE_APP_TENANT_ENABLE:-true}
diff --git a/script/docker/docker.env b/script/docker/docker.env
index 2355c21..cf53fef 100644
--- a/script/docker/docker.env
+++ b/script/docker/docker.env
@@ -16,7 +16,7 @@ REDIS_HOST=hangtag-redis
 ## admin
 NODE_ENV=production
 PUBLIC_PATH=/
-VUE_APP_TITLE=挂卡管理系统
+VUE_APP_TITLE=OMS管理系统
 VUE_APP_BASE_API=/prod-api
 VUE_APP_APP_NAME=/
 VUE_APP_TENANT_ENABLE=true