From 145dfee8314afe5ff4ac47206e3b50b35f515229 Mon Sep 17 00:00:00 2001
From: HuangHai <10402852@qq.com>
Date: Tue, 29 Apr 2025 13:26:30 +0800
Subject: [PATCH] 'commit'

---
 dsBase/.idea/.gitignore          |  8 ----
 dsBase/.idea/compiler.xml        | 22 ---------
 dsBase/.idea/encodings.xml       |  7 ---
 dsBase/.idea/jarRepositories.xml | 80 --------------------------------
 dsBase/.idea/misc.xml            | 18 -------
 dsBase/.idea/vcs.xml             |  7 ---
 dsBase/pom.xml                   |  2 +-
 dsRes/pom.xml                    |  8 ++--
 dsUtils/pom.xml                  |  8 ++--
 pom.xml                          |  5 +-
 10 files changed, 11 insertions(+), 154 deletions(-)
 delete mode 100644 dsBase/.idea/.gitignore
 delete mode 100644 dsBase/.idea/compiler.xml
 delete mode 100644 dsBase/.idea/encodings.xml
 delete mode 100644 dsBase/.idea/jarRepositories.xml
 delete mode 100644 dsBase/.idea/misc.xml
 delete mode 100644 dsBase/.idea/vcs.xml

diff --git a/dsBase/.idea/.gitignore b/dsBase/.idea/.gitignore
deleted file mode 100644
index a7cdac76..00000000
--- a/dsBase/.idea/.gitignore
+++ /dev/null
@@ -1,8 +0,0 @@
-# 默认忽略的文件
-/shelf/
-/workspace.xml
-# 基于编辑器的 HTTP 客户端请求
-/httpRequests/
-# Datasource local storage ignored files
-/dataSources/
-/dataSources.local.xml
diff --git a/dsBase/.idea/compiler.xml b/dsBase/.idea/compiler.xml
deleted file mode 100644
index 6e7e85f6..00000000
--- a/dsBase/.idea/compiler.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <annotationProcessing>
-      <profile default="true" name="Default" enabled="true" />
-      <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="aiBase" />
-        <module name="dsBase" />
-      </profile>
-    </annotationProcessing>
-    <bytecodeTargetLevel target="21" />
-  </component>
-  <component name="JavacSettings">
-    <option name="ADDITIONAL_OPTIONS_OVERRIDE">
-      <module name="aiBase" options="-parameters" />
-      <module name="dsBase" options="-parameters" />
-    </option>
-  </component>
-</project>
\ No newline at end of file
diff --git a/dsBase/.idea/encodings.xml b/dsBase/.idea/encodings.xml
deleted file mode 100644
index f55414e0..00000000
--- a/dsBase/.idea/encodings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Encoding" defaultCharsetForPropertiesFiles="UTF-8">
-    <file url="file://$PROJECT_DIR$/Doc/方法与技巧/PostgreSQL16安装.txt" charset="UTF-8" />
-    <file url="PROJECT" charset="UTF-8" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/dsBase/.idea/jarRepositories.xml b/dsBase/.idea/jarRepositories.xml
deleted file mode 100644
index 5a0eedc0..00000000
--- a/dsBase/.idea/jarRepositories.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="RemoteRepositoriesConfiguration">
-    <remote-repository>
-      <option name="id" value="ali-maven" />
-      <option name="name" value="ali-maven" />
-      <option name="url" value="https://mirrors.cloud.tencent.com/repository/maven/" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="central" />
-      <option name="name" value="Central Repository" />
-      <option name="url" value="https://repo.maven.apache.org/maven2" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="central" />
-      <option name="name" value="Central Repository" />
-      <option name="url" value="http://maven.aliyun.com/nexus/content/repositories/central/" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="central" />
-      <option name="name" value="Maven Central repository" />
-      <option name="url" value="https://repo1.maven.org/maven2" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="alimaven" />
-      <option name="name" value="alimaven" />
-      <option name="url" value="https://maven.aliyun.com/repository/public" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="central" />
-      <option name="name" value="Central Repository" />
-      <option name="url" value="https://maven.aliyun.com/repository/public" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="163" />
-      <option name="name" value="163" />
-      <option name="url" value="https://maven.aliyun.com/repository/public" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="central" />
-      <option name="name" value="Central Repository" />
-      <option name="url" value="https://repo1.maven.org/maven2/" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="huaweicloud" />
-      <option name="name" value="huaweicloud" />
-      <option name="url" value="https://maven.aliyun.com/repository/public" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="ali-maven" />
-      <option name="name" value="ali-maven" />
-      <option name="url" value="http://maven.aliyun.com/nexus/content/groups/public" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="ali-maven" />
-      <option name="name" value="ali-maven" />
-      <option name="url" value="https://maven.aliyun.com/repository/public" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="central" />
-      <option name="name" value="Central Repository" />
-      <option name="url" value="http://mirrors.cloud.tencent.com/nexus/repository/maven-public/" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="tencent" />
-      <option name="name" value="tencent" />
-      <option name="url" value="https://maven.aliyun.com/repository/public" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="jboss.community" />
-      <option name="name" value="JBoss Community repository" />
-      <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="central" />
-      <option name="name" value="Central Repository" />
-      <option name="url" value="https://maven.aliyun.com/repository/central" />
-    </remote-repository>
-  </component>
-</project>
\ No newline at end of file
diff --git a/dsBase/.idea/misc.xml b/dsBase/.idea/misc.xml
deleted file mode 100644
index 6396f77c..00000000
--- a/dsBase/.idea/misc.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="EntryPointsManager">
-    <list size="1">
-      <item index="0" class="java.lang.String" itemvalue="com.jfinal.aop.Before" />
-    </list>
-  </component>
-  <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="MavenProjectsManager">
-    <option name="originalFiles">
-      <list>
-        <option value="$PROJECT_DIR$/pom.xml" />
-      </list>
-    </option>
-    <option name="workspaceImportForciblyTurnedOn" value="true" />
-  </component>
-  <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/dsBase/.idea/vcs.xml b/dsBase/.idea/vcs.xml
deleted file mode 100644
index 188eaef5..00000000
--- a/dsBase/.idea/vcs.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="Git" />
-    <mapping directory="$PROJECT_DIR$/.." vcs="Git" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/dsBase/pom.xml b/dsBase/pom.xml
index f1a737d5..93bc0a5f 100644
--- a/dsBase/pom.xml
+++ b/dsBase/pom.xml
@@ -97,7 +97,7 @@
         <dependency>
             <groupId>org.postgresql</groupId>
             <artifactId>postgresql</artifactId>
-            <version>42.7.5</version>
+            <version>${postgresql.version}</version>
         </dependency>
         <!--图片缩放-->
         <dependency>
diff --git a/dsRes/pom.xml b/dsRes/pom.xml
index e7469166..2b7933c8 100644
--- a/dsRes/pom.xml
+++ b/dsRes/pom.xml
@@ -40,11 +40,11 @@
             <artifactId>screw-core</artifactId>
             <version>1.0.5</version>
         </dependency>
-        <!-- https://mvnrepository.com/artifact/mysql/mysql-connector-java -->
+        <!-- https://mvnrepository.com/artifact/org.postgresql/postgresql -->
         <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-            <version>${mysql.version}</version>
+            <groupId>org.postgresql</groupId>
+            <artifactId>postgresql</artifactId>
+            <version>${postgresql.version}</version>
         </dependency>
 
         <!-- https://mvnrepository.com/artifact/io.minio/minio -->
diff --git a/dsUtils/pom.xml b/dsUtils/pom.xml
index a0444b9e..77a8eac9 100644
--- a/dsUtils/pom.xml
+++ b/dsUtils/pom.xml
@@ -42,11 +42,11 @@
             <artifactId>screw-core</artifactId>
             <version>1.0.5</version>
         </dependency>
-        <!-- https://mvnrepository.com/artifact/mysql/mysql-connector-java -->
+        <!-- https://mvnrepository.com/artifact/org.postgresql/postgresql -->
         <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-            <version>${mysql.version}</version>
+            <groupId>org.postgresql</groupId>
+            <artifactId>postgresql</artifactId>
+            <version>${postgresql.version}</version>
         </dependency>
 
         <!--安装hutool-->
diff --git a/pom.xml b/pom.xml
index 5b045ec5..c3a6d9d6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -41,8 +41,6 @@
         <jfinal-cos.version>2022.2</jfinal-cos.version>
         <!--HikariCP版本号-->
         <HikariCP.version>6.3.0</HikariCP.version>
-        <!--Mysql驱动版本号-->
-        <mysql.version>8.0.33</mysql.version>
         <!--fastjson版本号-->
         <fastjson.version>2.0.57</fastjson.version>
         <!--Hutool工具包-->
@@ -51,7 +49,8 @@
         <minio.version>8.5.17</minio.version>
         <!--jedis版本号-->
         <jedis.version>5.1.5</jedis.version>
-
+        <!--Postgresql 版本号-->
+        <postgresql.version>42.7.5</postgresql.version>
         <!--POI版本-->
         <poi.version>5.2.5</poi.version>
         <!--yaml文件读取-->