From a9ee34c4fb62eaaa6331d06a58b6426be7654902 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com>
Date: Sat, 7 Sep 2024 20:39:30 +0800
Subject: [PATCH] 'commit'

---
 .idea/compiler.xml         |  6 +++++-
 .idea/misc.xml             |  2 +-
 ds-base/.idea/.gitignore   |  8 ++++++++
 ds-base/.idea/compiler.xml |  6 ++++++
 ds-base/.idea/misc.xml     | 12 ++++++++++++
 ds-base/.idea/modules.xml  |  8 ++++++++
 ds-base/.idea/vcs.xml      |  6 ++++++
 ds-base/pom.xml            | 12 +++++++++---
 8 files changed, 55 insertions(+), 5 deletions(-)
 create mode 100644 ds-base/.idea/.gitignore
 create mode 100644 ds-base/.idea/compiler.xml
 create mode 100644 ds-base/.idea/misc.xml
 create mode 100644 ds-base/.idea/modules.xml
 create mode 100644 ds-base/.idea/vcs.xml

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 48a6b4d7..8cd1f54f 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -30,8 +30,12 @@
       </profile>
     </annotationProcessing>
   </component>
+  <component name="EclipseCompilerSettings">
+    <option name="ADDITIONAL_OPTIONS_OVERRIDE">
+      <module name="ds-base" options="" />
+    </option>
+  </component>
   <component name="JavacSettings">
-    <option name="ADDITIONAL_OPTIONS_STRING" value="-parameters" />
     <option name="ADDITIONAL_OPTIONS_OVERRIDE">
       <module name="ds-base" options="-parameters" />
       <module name="ds-build" options="" />
diff --git a/.idea/misc.xml b/.idea/misc.xml
index de490c1e..849dd282 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -20,5 +20,5 @@
       </set>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK" />
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_21" default="true" project-jdk-name="21" project-jdk-type="JavaSDK" />
 </project>
\ No newline at end of file
diff --git a/ds-base/.idea/.gitignore b/ds-base/.idea/.gitignore
new file mode 100644
index 00000000..a7cdac76
--- /dev/null
+++ b/ds-base/.idea/.gitignore
@@ -0,0 +1,8 @@
+# 默认忽略的文件
+/shelf/
+/workspace.xml
+# 基于编辑器的 HTTP 客户端请求
+/httpRequests/
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml
diff --git a/ds-base/.idea/compiler.xml b/ds-base/.idea/compiler.xml
new file mode 100644
index 00000000..691760b3
--- /dev/null
+++ b/ds-base/.idea/compiler.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="JavacSettings">
+    <option name="ADDITIONAL_OPTIONS_STRING" value="-parameters" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/ds-base/.idea/misc.xml b/ds-base/.idea/misc.xml
new file mode 100644
index 00000000..60add33c
--- /dev/null
+++ b/ds-base/.idea/misc.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ExternalStorageConfigurationManager" enabled="true" />
+  <component name="MavenProjectsManager">
+    <option name="originalFiles">
+      <list>
+        <option value="$PROJECT_DIR$/pom.xml" />
+      </list>
+    </option>
+  </component>
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_22" default="true" project-jdk-name="22" project-jdk-type="JavaSDK" />
+</project>
\ No newline at end of file
diff --git a/ds-base/.idea/modules.xml b/ds-base/.idea/modules.xml
new file mode 100644
index 00000000..923885af
--- /dev/null
+++ b/ds-base/.idea/modules.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/ds-base.iml" filepath="$PROJECT_DIR$/ds-base.iml" />
+    </modules>
+  </component>
+</project>
\ No newline at end of file
diff --git a/ds-base/.idea/vcs.xml b/ds-base/.idea/vcs.xml
new file mode 100644
index 00000000..2e3f6920
--- /dev/null
+++ b/ds-base/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$/.." vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/ds-base/pom.xml b/ds-base/pom.xml
index 13af57aa..9b50d0fa 100644
--- a/ds-base/pom.xml
+++ b/ds-base/pom.xml
@@ -14,6 +14,12 @@
     <artifactId>ds-base</artifactId>
     <version>1.0.0</version>
     <name>ds-base</name>
+    <!--使用jdk21进行编译-->
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.compiler.source>21</maven.compiler.source>
+        <maven.compiler.target>21</maven.compiler.target>
+    </properties>
     <!--依赖包-->
     <dependencies>
         <!--jfinal主框架-->
@@ -126,10 +132,10 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.6.1</version>
                 <configuration>
-                    <source>8</source>
-                    <target>8</target>
+                    <source>21</source>
+                    <target>21</target>
                     <encoding>UTF-8</encoding>
-                    <!-- java8 保留参数名编译参数 -->
+                    <!-- java21 保留参数名编译参数 -->
                     <compilerArgument>-parameters</compilerArgument>
                 </configuration>
             </plugin>