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 @@ - - - - - - - - - - - - - - - - - - - \ 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 @@ - - - - - - - \ 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 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ 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 @@ - - - - - - - - - - - - - \ 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 @@ - - - - - - - \ 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 @@ org.postgresql postgresql - 42.7.5 + ${postgresql.version} 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 @@ screw-core 1.0.5 - + - mysql - mysql-connector-java - ${mysql.version} + org.postgresql + postgresql + ${postgresql.version} 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 @@ screw-core 1.0.5 - + - mysql - mysql-connector-java - ${mysql.version} + org.postgresql + postgresql + ${postgresql.version} diff --git a/pom.xml b/pom.xml index 5b045ec5..c3a6d9d6 100644 --- a/pom.xml +++ b/pom.xml @@ -41,8 +41,6 @@ 2022.2 6.3.0 - - 8.0.33 2.0.57 @@ -51,7 +49,8 @@ 8.5.17 5.1.5 - + + 42.7.5 5.2.5