From 1df0b08879c220dbc7c7a4e2654030a08ef5adee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=AF=E8=88=AA?= <280645618@qq.com>
Date: Fri, 16 Jan 2026 12:54:50 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B4=E7=90=86=E9=A1=B9=E7=9B=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                                     | 15 ++--
 api/oms-api/pom.xml                           | 25 ++-----
 .../src/main/resources/application.yml        |  2 +-
 api/pom.xml                                   |  3 +-
 api/sys-api/pom.xml                           | 48 +++++--------
 core/common/pom.xml                           | 13 ++--
 .../src/main/java/com/qihang/common/App.java  | 13 ----
 core/pom.xml                                  | 36 ++++++++--
 core/security/pom.xml                         | 11 +--
 eureka-server/pom.xml                         | 27 ++++----
 gateway/pom.xml                               | 69 ++++++++++---------
 pom.xml                                       |  8 +--
 12 files changed, 125 insertions(+), 145 deletions(-)
 delete mode 100644 core/common/src/main/java/com/qihang/common/App.java

diff --git a/README.md b/README.md
index 3fbcf01..3d2823f 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# 启航电商ERP系统-跨境版
+# 启航跨境电商ERP系统
 
 ## 一、项目概述
 
@@ -27,11 +27,11 @@
 + `MySQL`:数据库,版本8.x。
 + `minio文`:文件存储,用于图片存储。
 + `Redis`:在线用户信息、缓存。
-+ `Nacos`:版本2.3.2以上，注册中心。
++ `Eureka`:注册中心。
 
 ### 2.3 项目结构
 #### 2.3.1 gateway
-**网关Gateway，使用8088端口**
+**网关Gateway，使用8080端口**
 
 #### 2.3.2 oms-api
 **系统主体OMS功能模块，对接各大平台接口**
@@ -52,12 +52,6 @@
 + MySQL数据库创建
   + 运行MySQL脚本`docs\sql\qihangerp-cbe.sql`导入数据到主库`qihangerp-cbe`
 
-+ 启动nacos
-  + 启动
-  
-    **一般情况下：下载nacos2.3.2解压之后直接运行：**
-  
-    `startup.cmd -m standalone`
 
 + 启动Redis
 
@@ -68,7 +62,8 @@
   
 ### 3.2、启动后端
 
-+ 启动`api`下面的所有微服务
++ 启动`eureka-server`注册中心
++ 启动`gateway`gateway
 + 启动`oms-api`项目
 + 启动`sys-api`项目
 
diff --git a/api/oms-api/pom.xml b/api/oms-api/pom.xml
index 4795b41..d89bb9b 100644
--- a/api/oms-api/pom.xml
+++ b/api/oms-api/pom.xml
@@ -1,19 +1,15 @@
 <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.qihang</groupId>-->
-<!--        <artifactId>qihangerp-cbce</artifactId>-->
-<!--        <version>0.9.7</version>-->
-<!--    </parent>-->
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
         <version>3.0.2</version>
         <relativePath/>
     </parent>
-    <groupId>com.qihang.oms</groupId>
+    <groupId>cn.qihangerp.cb</groupId>
     <artifactId>oms-api</artifactId>
+    <version>3.9.19</version>
     <packaging>jar</packaging>
 
     <name>oms-api</name>
@@ -21,6 +17,8 @@
 
     <properties>
         <java.version>17</java.version>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <spring-boot.version>3.0.2</spring-boot.version>
@@ -38,21 +36,12 @@
         <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.cloud</groupId>
             <artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
-            <version>4.0.0</version>
+            <version>4.0.3</version>
         </dependency>
 <!--        <dependency>-->
 <!--            <groupId>org.springframework.kafka</groupId>-->
@@ -69,7 +58,7 @@
 <!--            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>-->
 <!--        </dependency>-->
         <dependency>
-            <groupId>com.qihang</groupId>
+            <groupId>cn.qihangerp.cb</groupId>
             <artifactId>security</artifactId>
             <version>1.0</version>
         </dependency>
diff --git a/api/oms-api/src/main/resources/application.yml b/api/oms-api/src/main/resources/application.yml
index 5b71389..d695e8a 100644
--- a/api/oms-api/src/main/resources/application.yml
+++ b/api/oms-api/src/main/resources/application.yml
@@ -46,7 +46,7 @@ spring:
 #          timeout:
 #            ms: 18000 # 消费请求的超时时间
   application:
-    name: scm-api
+    name: oms-api
   data:
     # redis 配置
     redis:
diff --git a/api/pom.xml b/api/pom.xml
index c18530b..7c5391d 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -12,9 +12,10 @@
 <!--        <artifactId>qihangerp-cbce</artifactId>-->
 <!--        <version>0.9.7</version>-->
 <!--    </parent>-->
+    <groupId>cn.qihangerp.cb</groupId>
     <artifactId>api</artifactId>
     <packaging>pom</packaging>
-    <version>0.9.7</version>
+    <version>1.0</version>
     <name>api</name>
     <url>http://maven.apache.org</url>
     <modules>
diff --git a/api/sys-api/pom.xml b/api/sys-api/pom.xml
index c1b1cb7..00a987e 100644
--- a/api/sys-api/pom.xml
+++ b/api/sys-api/pom.xml
@@ -12,19 +12,22 @@
         <version>3.0.2</version>
         <relativePath/>
     </parent>
+    <groupId>cn.qihangerp.cb</groupId>
     <artifactId>sys-api</artifactId>
-    <version>1.0</version>
+    <version>1.8.0</version>
     <packaging>jar</packaging>
 
-    <name>auth-api</name>
+    <name>sys-api</name>
     <url>http://maven.apache.org</url>
 
     <properties>
-<!--        <java.version>17</java.version>-->
-<!--        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>-->
-<!--        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>-->
-<!--        <spring-boot.version>3.0.2</spring-boot.version>-->
-<!--        <spring-cloud-alibaba.version>2022.0.0.0</spring-cloud-alibaba.version>-->
+        <java.version>17</java.version>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <spring-boot.version>3.0.2</spring-boot.version>
+        <spring-cloud-alibaba.version>2022.0.0.0</spring-cloud-alibaba.version>
         <jwt.version>0.11.5</jwt.version>
     </properties>
 
@@ -37,17 +40,8 @@
         <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>
@@ -165,11 +159,7 @@
             <artifactId>spring-security-config</artifactId>
             <version>6.0.1</version>
         </dependency>
-        <!--        <dependency>-->
-<!--            <groupId>com.qihang</groupId>-->
-<!--            <artifactId>oms-core</artifactId>-->
-<!--            <version>1.0</version>-->
-<!--        </dependency>-->
+
         <!-- io常用工具类 -->
 <!--        <dependency>-->
 <!--            <groupId>commons-io</groupId>-->
@@ -189,16 +179,16 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>com.qihang</groupId>
+            <groupId>cn.qihangerp.cb</groupId>
             <artifactId>security</artifactId>
             <version>1.0</version>
         </dependency>
-<!--        <dependency>-->
-<!--            <groupId>org.projectlombok</groupId>-->
-<!--            <artifactId>lombok</artifactId>-->
-<!--            <version>1.18.30</version>-->
-<!--            <scope>provided</scope>-->
-<!--        </dependency>-->
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>1.18.30</version>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
 <!--    <dependencyManagement>-->
 <!--        <dependencies>-->
diff --git a/core/common/pom.xml b/core/common/pom.xml
index ec58fe7..f1e0fdf 100644
--- a/core/common/pom.xml
+++ b/core/common/pom.xml
@@ -1,17 +1,12 @@
 <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.qihang</groupId>-->
-<!--        <artifactId>qihangerp-cloud</artifactId>-->
-<!--        <version>2.8.4</version>-->
-<!--    </parent>-->
     <parent>
-        <groupId>com.qihang</groupId>
+        <groupId>cn.qihangerp.cb</groupId>
         <artifactId>core</artifactId>
-        <version>0.9.7</version>
+        <version>1.0</version>
     </parent>
-    <groupId>com.qihang</groupId>
+    <groupId>cn.qihangerp.cb</groupId>
     <artifactId>common</artifactId>
     <version>1.0</version>
     <packaging>jar</packaging>
@@ -21,7 +16,7 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <spring-boot.version>3.0.2</spring-boot.version>
+
     </properties>
 
 <dependencies>
diff --git a/core/common/src/main/java/com/qihang/common/App.java b/core/common/src/main/java/com/qihang/common/App.java
deleted file mode 100644
index 7db512e..0000000
--- a/core/common/src/main/java/com/qihang/common/App.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.qihang.common;
-
-/**
- * Hello world!
- *
- */
-public class App 
-{
-    public static void main( String[] args )
-    {
-        System.out.println( "Hello World!" );
-    }
-}
diff --git a/core/pom.xml b/core/pom.xml
index 35436c0..ef90fc9 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -1,13 +1,14 @@
 <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.qihang</groupId>
-        <artifactId>qihangerp-scm</artifactId>
-        <version>0.9.7</version>
-    </parent>
-
+<!--    <parent>-->
+<!--        <groupId>com.qihang</groupId>-->
+<!--        <artifactId>qihangerp-scm</artifactId>-->
+<!--        <version>0.9.7</version>-->
+<!--    </parent>-->
+    <groupId>cn.qihangerp.cb</groupId>
     <artifactId>core</artifactId>
+    <version>1.0</version>
     <packaging>pom</packaging>
 
     <name>core</name>
@@ -17,10 +18,31 @@
         <module>security</module>
     </modules>
     <properties>
+        <java.version>17</java.version>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <jwt.version>0.11.5</jwt.version>
+        <spring-boot.version>3.0.2</spring-boot.version>
+        <spring-cloud.version>2022.0.2</spring-cloud.version>
     </properties>
 
     <dependencies>
-
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>3.12.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.alibaba.fastjson2</groupId>
+            <artifactId>fastjson2</artifactId>
+            <version>2.0.43</version>
+        </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>1.18.30</version>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
 </project>
diff --git a/core/security/pom.xml b/core/security/pom.xml
index 97d9b60..4b78609 100644
--- a/core/security/pom.xml
+++ b/core/security/pom.xml
@@ -7,11 +7,11 @@
 <!--        <version>2.8.4</version>-->
 <!--    </parent>-->
     <parent>
-        <groupId>com.qihang</groupId>
+        <groupId>cn.qihangerp.cb</groupId>
         <artifactId>core</artifactId>
-        <version>0.9.7</version>
+        <version>1.0</version>
     </parent>
-    <groupId>com.qihang</groupId>
+    <groupId>cn.qihangerp.cb</groupId>
     <artifactId>security</artifactId>
     <version>1.0</version>
     <packaging>jar</packaging>
@@ -22,7 +22,8 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <spring-boot.version>3.0.2</spring-boot.version>
-        <jwt.version>0.11.5</jwt.version>
+        <spring-boot.version>3.0.2</spring-boot.version>
+        <spring-cloud-alibaba.version>2022.0.0.0</spring-cloud-alibaba.version>
     </properties>
 
     <dependencies>
@@ -75,7 +76,7 @@
         </dependency>
 
         <dependency>
-            <groupId>com.qihang</groupId>
+            <groupId>cn.qihangerp.cb</groupId>
             <artifactId>common</artifactId>
             <version>1.0</version>
         </dependency>
diff --git a/eureka-server/pom.xml b/eureka-server/pom.xml
index ff6316a..165ee65 100644
--- a/eureka-server/pom.xml
+++ b/eureka-server/pom.xml
@@ -2,12 +2,13 @@
          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.qihang</groupId>
-        <artifactId>qihangerp-scm</artifactId>
-        <version>0.9.7</version>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-starter-parent</artifactId>
+        <version>3.0.2</version>
+        <relativePath/>
     </parent>
 
-    <groupId>com.qihang.eureka</groupId>
+    <groupId>cn.qihangerp.api</groupId>
     <artifactId>eureka-server</artifactId>
     <version>1.0</version>
     <packaging>jar</packaging>
@@ -16,7 +17,12 @@
     <url>http://maven.apache.org</url>
 
     <properties>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <spring-boot.version>3.0.2</spring-boot.version>
+        <spring-cloud.version>2022.0.2</spring-cloud.version>
+        <spring-cloud-alibaba.version>2022.0.0.0</spring-cloud-alibaba.version>
     </properties>
 
     <dependencies>
@@ -33,22 +39,13 @@
         <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>
-            <version>3.0.2</version>
         </dependency>
+
         <!-- Eureka Server dependency -->
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-netflix-eureka-server</artifactId>
+            <version>4.0.0</version>
         </dependency>
         <dependency>
             <groupId>com.google.code.gson</groupId>
diff --git a/gateway/pom.xml b/gateway/pom.xml
index 71cfd4b..06f9807 100644
--- a/gateway/pom.xml
+++ b/gateway/pom.xml
@@ -2,14 +2,14 @@
          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.qihang</groupId>
-        <artifactId>qihangerp-scm</artifactId>
-        <version>0.9.7</version>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-starter-parent</artifactId>
+        <version>3.0.2</version>
+        <relativePath/>
     </parent>
-
-    <groupId>com.qihang.gateway</groupId>
+    <groupId>cn.qihangerp.cb.api</groupId>
     <artifactId>gateway</artifactId>
-    <version>1.0</version>
+    <version>1.0.0</version>
     <packaging>jar</packaging>
 
     <name>gateway</name>
@@ -17,8 +17,11 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-                <maven.compiler.source>17</maven.compiler.source>
-                <maven.compiler.target>17</maven.compiler.target>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
+        <spring-boot.version>3.0.2</spring-boot.version>
+        <spring-cloud.version>2022.0.2</spring-cloud.version>
+        <spring-cloud-alibaba.version>2022.0.0.0</spring-cloud-alibaba.version>
     </properties>
 
     <dependencies>
@@ -46,33 +49,33 @@
         </dependency>
 
     </dependencies>
-<!--    <dependencyManagement>-->
+    <dependencyManagement>
 
-<!--        <dependencies>-->
-<!--            <dependency>-->
-<!--                <groupId>org.springframework.cloud</groupId>-->
-<!--                <artifactId>spring-cloud-dependencies</artifactId>-->
-<!--                <version>${spring-cloud.version}</version> &lt;!&ndash; 对应你使用的Spring Cloud版本 &ndash;&gt;-->
-<!--                <type>pom</type>-->
-<!--                <scope>import</scope>-->
-<!--            </dependency>-->
+        <dependencies>
+            <dependency>
+                <groupId>org.springframework.cloud</groupId>
+                <artifactId>spring-cloud-dependencies</artifactId>
+                <version>${spring-cloud.version}</version> <!-- 对应你使用的Spring Cloud版本 -->
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
 
-<!--            <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>com.alibaba.cloud</groupId>-->
-<!--                <artifactId>spring-cloud-alibaba-dependencies</artifactId>-->
-<!--                <version>${spring-cloud-alibaba.version}</version>-->
-<!--                <type>pom</type>-->
-<!--                <scope>import</scope>-->
-<!--            </dependency>-->
-<!--        </dependencies>-->
-<!--    </dependencyManagement>-->
+            <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>com.alibaba.cloud</groupId>
+                <artifactId>spring-cloud-alibaba-dependencies</artifactId>
+                <version>${spring-cloud-alibaba.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
     <build>
         <plugins>
             <plugin>
diff --git a/pom.xml b/pom.xml
index e79713d..c0f81c5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,12 +8,12 @@
         <relativePath/>
       </parent>
 
-    <groupId>com.qihang</groupId>
-    <artifactId>qihangerp-cbe</artifactId>
+    <groupId>cn.qihangerp.erp</groupId>
+    <artifactId>qihang-cb-erp</artifactId>
     <version>0.9.7</version>
     <packaging>pom</packaging>
 
-    <name>qihangerp-cbe</name>
+    <name>qihang-cb-erp</name>
     <url>http://maven.apache.org</url>
     <modules>
         <module>api</module>
@@ -26,7 +26,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <spring-boot.version>3.0.2</spring-boot.version>
-        <spring-cloud.version>2022.0.0</spring-cloud.version>
+        <spring-cloud.version>2022.0.2</spring-cloud.version>
         <spring-cloud-alibaba.version>2022.0.0.0</spring-cloud-alibaba.version>
         <jwt.version>0.11.5</jwt.version>
 <!--        <maven.compiler.source>17</maven.compiler.source>-->