From 066446200fd46a64cd5a222200fc43793e42fe03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com>
Date: Fri, 20 Sep 2024 07:51:33 +0800
Subject: [PATCH] 'commit'

---
 .idea/compiler.xml                            |  6 ++-
 .idea/encodings.xml                           |  2 +
 ds-gw/pom.xml                                 | 12 ++++++
 .../resources/META-INF/maven/archetype.xml    |  9 +++++
 .../resources/archetype-resources/pom.xml     | 15 ++++++++
 .../src/main/java/App.java                    | 13 +++++++
 .../src/test/java/AppTest.java                | 38 +++++++++++++++++++
 {ds-gw => ds-nginx}/Dockerfile                |  0
 {ds-gw => ds-nginx}/nginx.conf                |  0
 {ds-gw => ds-nginx}/static/index.html         |  0
 {ds-gw => ds-nginx}/文档.md                 |  0
 pom.xml                                       |  6 +++
 12 files changed, 100 insertions(+), 1 deletion(-)
 create mode 100644 ds-gw/pom.xml
 create mode 100644 ds-gw/src/main/resources/META-INF/maven/archetype.xml
 create mode 100644 ds-gw/src/main/resources/archetype-resources/pom.xml
 create mode 100644 ds-gw/src/main/resources/archetype-resources/src/main/java/App.java
 create mode 100644 ds-gw/src/main/resources/archetype-resources/src/test/java/AppTest.java
 rename {ds-gw => ds-nginx}/Dockerfile (100%)
 rename {ds-gw => ds-nginx}/nginx.conf (100%)
 rename {ds-gw => ds-nginx}/static/index.html (100%)
 rename {ds-gw => ds-nginx}/文档.md (100%)

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 228b7e4f..bec628ed 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -2,13 +2,15 @@
 <project version="4">
   <component name="CompilerConfiguration">
     <option name="BUILD_PROCESS_ADDITIONAL_VM_OPTIONS" value="-Djps.track.ap.dependencies=false" />
+    <excludeFromCompile>
+      <directory url="file://$PROJECT_DIR$/ds-gw/src/main/resources/archetype-resources" includeSubdirectories="true" />
+    </excludeFromCompile>
     <annotationProcessing>
       <profile name="Maven default annotation processors profile" enabled="true">
         <sourceOutputDir name="target/generated-sources/annotations" />
         <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
         <outputRelativeToContentRoot value="true" />
         <module name="ms-protocol-xingxing" />
-        <module name="dsProject" />
         <module name="ms-openapi" />
         <module name="ms-protocol-kstar" />
         <module name="ms-user" />
@@ -27,6 +29,7 @@
         <module name="gw-openapi" />
         <module name="ms-websocket-ocpp" />
         <module name="ds-build" />
+        <module name="ds-gw" />
         <module name="ds-base" />
         <module name="ms-wallet" />
       </profile>
@@ -43,6 +46,7 @@
       <module name="ds-base" options="-parameters" />
       <module name="ds-build" options="-parameters" />
       <module name="ds-exam" options="" />
+      <module name="ds-gw" options="" />
       <module name="dsProject" options="" />
     </option>
   </component>
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
index c1b1ab81..371914c5 100644
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -9,6 +9,8 @@
     <file url="file://$PROJECT_DIR$/ds-build/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/ds-gw/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/ds-gw/src/main/resources" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/ds-nginx/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/ds-nginx/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/gw-openapi/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/gw-openapi/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/gw-saas-mgr/src/main/java" charset="UTF-8" />
diff --git a/ds-gw/pom.xml b/ds-gw/pom.xml
new file mode 100644
index 00000000..3c470dad
--- /dev/null
+++ b/ds-gw/pom.xml
@@ -0,0 +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/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>dsideal</groupId>
+        <artifactId>dsProject</artifactId>
+        <version>1.0</version>
+    </parent>
+    <artifactId>ds-gw</artifactId>
+    <name>ds-gw</name>
+    <url>http://maven.apache.org</url>
+</project>
diff --git a/ds-gw/src/main/resources/META-INF/maven/archetype.xml b/ds-gw/src/main/resources/META-INF/maven/archetype.xml
new file mode 100644
index 00000000..26e78195
--- /dev/null
+++ b/ds-gw/src/main/resources/META-INF/maven/archetype.xml
@@ -0,0 +1,9 @@
+<archetype>
+  <id>ds-gw</id>
+  <sources>
+    <source>src/main/java/App.java</source>
+  </sources>
+  <testSources>
+    <source>src/test/java/AppTest.java</source>
+  </testSources>
+</archetype>
diff --git a/ds-gw/src/main/resources/archetype-resources/pom.xml b/ds-gw/src/main/resources/archetype-resources/pom.xml
new file mode 100644
index 00000000..5e486025
--- /dev/null
+++ b/ds-gw/src/main/resources/archetype-resources/pom.xml
@@ -0,0 +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/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>$dsideal</groupId>
+  <artifactId>$ds-gw</artifactId>
+  <version>$1.0</version>
+  <dependencies>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>3.8.1</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+</project>
diff --git a/ds-gw/src/main/resources/archetype-resources/src/main/java/App.java b/ds-gw/src/main/resources/archetype-resources/src/main/java/App.java
new file mode 100644
index 00000000..b26935e1
--- /dev/null
+++ b/ds-gw/src/main/resources/archetype-resources/src/main/java/App.java
@@ -0,0 +1,13 @@
+package $dsideal;
+
+/**
+ * Hello world!
+ *
+ */
+public class App 
+{
+    public static void main( String[] args )
+    {
+        System.out.println( "Hello World!" );
+    }
+}
diff --git a/ds-gw/src/main/resources/archetype-resources/src/test/java/AppTest.java b/ds-gw/src/main/resources/archetype-resources/src/test/java/AppTest.java
new file mode 100644
index 00000000..864bbc32
--- /dev/null
+++ b/ds-gw/src/main/resources/archetype-resources/src/test/java/AppTest.java
@@ -0,0 +1,38 @@
+package $dsideal;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+/**
+ * Unit test for simple App.
+ */
+public class AppTest 
+    extends TestCase
+{
+    /**
+     * Create the test case
+     *
+     * @param testName name of the test case
+     */
+    public AppTest( String testName )
+    {
+        super( testName );
+    }
+
+    /**
+     * @return the suite of tests being tested
+     */
+    public static Test suite()
+    {
+        return new TestSuite( AppTest.class );
+    }
+
+    /**
+     * Rigourous Test :-)
+     */
+    public void testApp()
+    {
+        assertTrue( true );
+    }
+}
diff --git a/ds-gw/Dockerfile b/ds-nginx/Dockerfile
similarity index 100%
rename from ds-gw/Dockerfile
rename to ds-nginx/Dockerfile
diff --git a/ds-gw/nginx.conf b/ds-nginx/nginx.conf
similarity index 100%
rename from ds-gw/nginx.conf
rename to ds-nginx/nginx.conf
diff --git a/ds-gw/static/index.html b/ds-nginx/static/index.html
similarity index 100%
rename from ds-gw/static/index.html
rename to ds-nginx/static/index.html
diff --git a/ds-gw/文档.md b/ds-nginx/文档.md
similarity index 100%
rename from ds-gw/文档.md
rename to ds-nginx/文档.md
diff --git a/pom.xml b/pom.xml
index 700147b5..2a234e94 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,6 +6,12 @@
     <groupId>dsideal</groupId>
     <artifactId>dsProject</artifactId>
     <version>1.0</version>
+    <packaging>pom</packaging>
+    <modules>
+        <module>ds-gw</module>
+        <module>ds-base</module>
+        <module>ds-build</module>
+    </modules>
     <!--使用jdk21进行编译-->
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>