From a076f17e79985b5c8fdc5d97d71be73d2524a3ac Mon Sep 17 00:00:00 2001
From: liuchen864 <23082234@qq.com>
Date: Wed, 27 Dec 2023 17:43:37 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4scp=E6=A8=A1=E5=9D=97?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                       |   2 -
 win-module-scp/pom.xml                        |  23 ----
 win-module-scp/win-module-scp-api/pom.xml     |  34 -----
 .../com/win/module/scp/api/package-info.java  |   4 -
 win-module-scp/win-module-scp-biz/pom.xml     | 120 ------------------
 .../com/win/module/scp/api/package-info.java  |   4 -
 .../module/scp/controller/package-info.java   |   4 -
 .../src/main/resources/i18n/scp.properties    |   1 -
 .../main/resources/i18n/scp_en_US.properties  |   0
 .../main/resources/i18n/scp_zh_CN.properties  |   0
 win-server/pom.xml                            |   9 +-
 11 files changed, 6 insertions(+), 195 deletions(-)
 delete mode 100644 win-module-scp/pom.xml
 delete mode 100644 win-module-scp/win-module-scp-api/pom.xml
 delete mode 100644 win-module-scp/win-module-scp-api/src/main/java/com/win/module/scp/api/package-info.java
 delete mode 100644 win-module-scp/win-module-scp-biz/pom.xml
 delete mode 100644 win-module-scp/win-module-scp-biz/src/main/java/com/win/module/scp/api/package-info.java
 delete mode 100644 win-module-scp/win-module-scp-biz/src/main/java/com/win/module/scp/controller/package-info.java
 delete mode 100644 win-module-scp/win-module-scp-biz/src/main/resources/i18n/scp.properties
 delete mode 100644 win-module-scp/win-module-scp-biz/src/main/resources/i18n/scp_en_US.properties
 delete mode 100644 win-module-scp/win-module-scp-biz/src/main/resources/i18n/scp_zh_CN.properties

diff --git a/pom.xml b/pom.xml
index e691dc1d..cb0fc352 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,8 +21,6 @@
         <module>win-module-wms</module>
         <!-- mes -->
         <module>win-module-mes</module>
-        <!-- scp -->
-        <module>win-module-scp</module>
     </modules>
 
     <name>${project.artifactId}</name>
diff --git a/win-module-scp/pom.xml b/win-module-scp/pom.xml
deleted file mode 100644
index ed8142e5..00000000
--- a/win-module-scp/pom.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?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">
-    <parent>
-        <groupId>com.win</groupId>
-        <artifactId>win</artifactId>
-        <version>${revision}</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-    <modules>
-        <module>win-module-scp-api</module>
-        <module>win-module-scp-biz</module>
-    </modules>
-    <artifactId>win-module-scp</artifactId>
-    <packaging>pom</packaging>
-
-    <name>${project.artifactId}</name>
-    <description>
-        scp 模块下，我们放通用业务，支撑上层的核心业务。
-    </description>
-
-</project>
diff --git a/win-module-scp/win-module-scp-api/pom.xml b/win-module-scp/win-module-scp-api/pom.xml
deleted file mode 100644
index a456bd9e..00000000
--- a/win-module-scp/win-module-scp-api/pom.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?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">
-    <parent>
-        <groupId>com.win</groupId>
-        <artifactId>win-module-scp</artifactId>
-        <version>${revision}</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>win-module-scp-api</artifactId>
-    <packaging>jar</packaging>
-
-    <name>${project.artifactId}</name>
-    <description>
-        scp 模块 API，暴露给其它模块调用
-    </description>
-
-    <dependencies>
-        <dependency>
-            <groupId>com.win</groupId>
-            <artifactId>win-common</artifactId>
-        </dependency>
-
-        <!-- 参数校验 -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-validation</artifactId>
-            <optional>true</optional>
-        </dependency>
-
-    </dependencies>
-
-</project>
diff --git a/win-module-scp/win-module-scp-api/src/main/java/com/win/module/scp/api/package-info.java b/win-module-scp/win-module-scp-api/src/main/java/com/win/module/scp/api/package-info.java
deleted file mode 100644
index a21bbbea..00000000
--- a/win-module-scp/win-module-scp-api/src/main/java/com/win/module/scp/api/package-info.java
+++ /dev/null
@@ -1,4 +0,0 @@
-/**
- * System API 包，定义暴露给其它模块的 API
- */
-package com.win.module.scp.api;
diff --git a/win-module-scp/win-module-scp-biz/pom.xml b/win-module-scp/win-module-scp-biz/pom.xml
deleted file mode 100644
index c9f681de..00000000
--- a/win-module-scp/win-module-scp-biz/pom.xml
+++ /dev/null
@@ -1,120 +0,0 @@
-<?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">
-    <parent>
-        <groupId>com.win</groupId>
-        <artifactId>win-module-scp</artifactId>
-        <version>${revision}</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>win-module-scp-biz</artifactId>
-    <packaging>jar</packaging>
-
-    <name>${project.artifactId}</name>
-    <description>
-        scp 模块下，我们放通用业务，支撑上层的核心业务。
-    </description>
-
-    <dependencies>
-        <dependency>
-            <groupId>com.win</groupId>
-            <artifactId>win-module-system-api</artifactId>
-            <version>${revision}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.win</groupId>
-            <artifactId>win-module-infra-api</artifactId>
-            <version>${revision}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.win</groupId>
-            <artifactId>win-module-scp-api</artifactId>
-            <version>${revision}</version>
-        </dependency>
-
-        <!-- 业务组件 -->
-        <dependency>
-            <groupId>com.win</groupId>
-            <artifactId>win-spring-boot-starter-biz-operatelog</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.win</groupId>
-            <artifactId>win-spring-boot-starter-biz-sms</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.win</groupId>
-            <artifactId>win-spring-boot-starter-biz-dict</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.win</groupId>
-            <artifactId>win-spring-boot-starter-biz-data-permission</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.win</groupId>
-            <artifactId>win-spring-boot-starter-biz-tenant</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.win</groupId>
-            <artifactId>win-spring-boot-starter-biz-ip</artifactId>
-        </dependency>
-
-        <!-- Web 相关 -->
-        <dependency>
-            <groupId>com.win</groupId>
-            <artifactId>win-spring-boot-starter-security</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-validation</artifactId>
-        </dependency>
-
-        <!-- DB 相关 -->
-        <dependency>
-            <groupId>com.win</groupId>
-            <artifactId>win-spring-boot-starter-mybatis</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.win</groupId>
-            <artifactId>win-spring-boot-starter-redis</artifactId>
-        </dependency>
-
-        <!-- Job 定时任务相关 -->
-        <dependency>
-            <groupId>com.win</groupId>
-            <artifactId>win-spring-boot-starter-job</artifactId>
-        </dependency>
-
-        <!-- 消息队列相关 -->
-        <dependency>
-            <groupId>com.win</groupId>
-            <artifactId>win-spring-boot-starter-mq</artifactId>
-        </dependency>
-
-        <!-- Test 测试相关 -->
-        <dependency>
-            <groupId>com.win</groupId>
-            <artifactId>win-spring-boot-starter-test</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-        <!-- 工具类相关 -->
-        <dependency>
-            <groupId>com.win</groupId>
-            <artifactId>win-spring-boot-starter-excel</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.win</groupId>
-            <artifactId>win-spring-boot-starter-captcha</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-mail</artifactId>
-        </dependency>
-    </dependencies>
-
-</project>
diff --git a/win-module-scp/win-module-scp-biz/src/main/java/com/win/module/scp/api/package-info.java b/win-module-scp/win-module-scp-biz/src/main/java/com/win/module/scp/api/package-info.java
deleted file mode 100644
index a21bbbea..00000000
--- a/win-module-scp/win-module-scp-biz/src/main/java/com/win/module/scp/api/package-info.java
+++ /dev/null
@@ -1,4 +0,0 @@
-/**
- * System API 包，定义暴露给其它模块的 API
- */
-package com.win.module.scp.api;
diff --git a/win-module-scp/win-module-scp-biz/src/main/java/com/win/module/scp/controller/package-info.java b/win-module-scp/win-module-scp-biz/src/main/java/com/win/module/scp/controller/package-info.java
deleted file mode 100644
index 11212f58..00000000
--- a/win-module-scp/win-module-scp-biz/src/main/java/com/win/module/scp/controller/package-info.java
+++ /dev/null
@@ -1,4 +0,0 @@
-/**
- * System API 包，定义暴露给其它模块的 API
- */
-package com.win.module.scp.controller;
diff --git a/win-module-scp/win-module-scp-biz/src/main/resources/i18n/scp.properties b/win-module-scp/win-module-scp-biz/src/main/resources/i18n/scp.properties
deleted file mode 100644
index 6882c293..00000000
--- a/win-module-scp/win-module-scp-biz/src/main/resources/i18n/scp.properties
+++ /dev/null
@@ -1 +0,0 @@
-#\u6B64\u6587\u4EF6\u4E0D\u9700\u8981\u586B\u5199
\ No newline at end of file
diff --git a/win-module-scp/win-module-scp-biz/src/main/resources/i18n/scp_en_US.properties b/win-module-scp/win-module-scp-biz/src/main/resources/i18n/scp_en_US.properties
deleted file mode 100644
index e69de29b..00000000
diff --git a/win-module-scp/win-module-scp-biz/src/main/resources/i18n/scp_zh_CN.properties b/win-module-scp/win-module-scp-biz/src/main/resources/i18n/scp_zh_CN.properties
deleted file mode 100644
index e69de29b..00000000
diff --git a/win-server/pom.xml b/win-server/pom.xml
index 8883d200..ad9245ee 100644
--- a/win-server/pom.xml
+++ b/win-server/pom.xml
@@ -8,10 +8,8 @@
         <version>${revision}</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-
     <artifactId>win-server</artifactId>
     <packaging>jar</packaging>
-
     <name>${project.artifactId}</name>
     <description>
         后端 Server 的主项目，通过引入需要 win-module-xxx 的依赖，
@@ -19,7 +17,6 @@
         本质上来说，它就是个空壳（容器）！
     </description>
     <url>https://github.com/YunaiV/ruoyi-vue-pro</url>
-
     <dependencies>
 
         <dependency>
@@ -27,6 +24,12 @@
             <artifactId>magic-api-spring-boot-starter</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>com.win</groupId>
+            <artifactId>win-module-mes-biz</artifactId>
+            <version>${revision}</version>
+        </dependency>
+
         <dependency>
             <groupId>com.win</groupId>
             <artifactId>win-module-wms-biz</artifactId>