From f222738f9da2bbb1c3cc7deb2452a627be3ab490 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com>
Date: Mon, 23 Sep 2024 15:58:56 +0800
Subject: [PATCH] 'commit'

---
 .idea/compiler.xml  |  2 ++
 .idea/encodings.xml |  4 ++++
 .idea/misc.xml      |  2 ++
 dsGw/pom.xml        |  2 +-
 dsProject.iml       | 11 +++++++++++
 dsRes/pom.xml       | 11 +++++++++++
 pom.xml             |  1 +
 7 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 dsProject.iml
 create mode 100644 dsRes/pom.xml

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 3af024ac..f4de945c 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -14,6 +14,7 @@
         <module name="ms-openapi" />
         <module name="ms-protocol-kstar" />
         <module name="ms-user" />
+        <module name="dsRes" />
         <module name="ms-protocol-common" />
         <module name="gw-saas-mgr" />
         <module name="ds-exam" />
@@ -52,6 +53,7 @@
       <module name="dsCommon" options="" />
       <module name="dsGw" options="" />
       <module name="dsProject" options="" />
+      <module name="dsRes" options="" />
     </option>
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
index 5c2c4568..7de6a403 100644
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -13,6 +13,10 @@
     <file url="file://$PROJECT_DIR$/dsCommon/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/dsGw/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/dsGw/src/main/resources" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/dsRes/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/dsRes/src/main/resources" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/dsResource/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/dsResource/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/.idea/misc.xml b/.idea/misc.xml
index e71b4fc1..6a1411f7 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -14,6 +14,8 @@
         <option value="$PROJECT_DIR$/ds-build/pom.xml" />
         <option value="$PROJECT_DIR$/rough-dependencies/pom.xml" />
         <option value="$PROJECT_DIR$/dsCommon/pom.xml" />
+        <option value="$PROJECT_DIR$/dsResource/pom.xml" />
+        <option value="$PROJECT_DIR$/dsRes/pom.xml" />
       </list>
     </option>
     <option name="ignoredFiles">
diff --git a/dsGw/pom.xml b/dsGw/pom.xml
index 7ceef267..bb10d179 100644
--- a/dsGw/pom.xml
+++ b/dsGw/pom.xml
@@ -7,7 +7,7 @@
         <version>1.0</version>
     </parent>
     <artifactId>dsGw</artifactId>
-    <name>ds-gw</name>
+    <name>dsGw</name>
 
     <dependencies>
         <!--jfinal主框架-->
diff --git a/dsProject.iml b/dsProject.iml
new file mode 100644
index 00000000..f64d058c
--- /dev/null
+++ b/dsProject.iml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module version="4">
+  <component name="AdditionalModuleElements">
+    <content url="file://$MODULE_DIR$" dumb="true">
+      <sourceFolder url="file://$MODULE_DIR$/dsResource/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/dsResource/src/main/resource" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/dsRes/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/dsRes/src/main/resource" type="java-resource" />
+    </content>
+  </component>
+</module>
\ No newline at end of file
diff --git a/dsRes/pom.xml b/dsRes/pom.xml
new file mode 100644
index 00000000..6856b4c0
--- /dev/null
+++ b/dsRes/pom.xml
@@ -0,0 +1,11 @@
+<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>dsRes</artifactId>
+    <name>dsRes</name>
+</project>
diff --git a/pom.xml b/pom.xml
index e1e48616..f567cb04 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,6 +11,7 @@
         <module>dsGw</module>
         <module>dsBase</module>
         <module>dsBuild</module>
+        <module>dsRes</module>
     </modules>
     <!--使用jdk21进行编译-->
     <properties>