diff --git a/dsBase/ExtendJar/Spire.Presentation.jar b/dsBase/ExtendJar/Spire.Presentation.jar
deleted file mode 100644
index bd09899a..00000000
Binary files a/dsBase/ExtendJar/Spire.Presentation.jar and /dev/null differ
diff --git a/dsBase/ExtendJar/aspose-cells-20.7-crack.jar b/dsBase/ExtendJar/aspose-cells-20.7-crack.jar
deleted file mode 100644
index 9676f04c..00000000
Binary files a/dsBase/ExtendJar/aspose-cells-20.7-crack.jar and /dev/null differ
diff --git a/dsBase/ExtendJar/aspose-cells-23.4.jar b/dsBase/ExtendJar/aspose-cells-23.4.jar
deleted file mode 100644
index b51ea697..00000000
Binary files a/dsBase/ExtendJar/aspose-cells-23.4.jar and /dev/null differ
diff --git a/dsBase/ExtendJar/aspose-pdf-22.7.1.cracked.jar b/dsBase/ExtendJar/aspose-pdf-22.7.1.cracked.jar
deleted file mode 100644
index 4c3cfe4b..00000000
Binary files a/dsBase/ExtendJar/aspose-pdf-22.7.1.cracked.jar and /dev/null differ
diff --git a/dsBase/ExtendJar/aspose-words-21.6.0-jdk17.jar b/dsBase/ExtendJar/aspose-words-21.6.0-jdk17.jar
deleted file mode 100644
index 4f9163ba..00000000
Binary files a/dsBase/ExtendJar/aspose-words-21.6.0-jdk17.jar and /dev/null differ
diff --git a/dsBase/ExtendJar/aspose.slides-19.3.jar b/dsBase/ExtendJar/aspose.slides-19.3.jar
deleted file mode 100644
index 04ac358d..00000000
Binary files a/dsBase/ExtendJar/aspose.slides-19.3.jar and /dev/null differ
diff --git a/dsBase/ExtendJar/license.xml b/dsBase/ExtendJar/license.xml
deleted file mode 100644
index 20b1b90e..00000000
--- a/dsBase/ExtendJar/license.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
- Aspose.Total for Java
-
- Enterprise
- 20991231
- 20991231
- 8bfe198c-7f0c-4ef8-8ff0-acc3237bf0d7
-
- sNLLKGMUdF0r8O1kKilWAGdgfs2BvJb/2Xp8p5iuDVfZXmhppo+d0Ran1P9TKdjV4ABwAgKXxJ3jcQTqE/2IRfqwnPf8itN8aFZlV3TJPYeD3yWE7IT55Gz6EijUpC7aKeoohTb4w2fpox58wWoF3SNp6sK6jDfiAUGEHYJ9pjU=
-
\ No newline at end of file
diff --git a/dsBase/ExtendJar/引用外置jar包.md b/dsBase/ExtendJar/引用外置jar包.md
deleted file mode 100644
index c876affa..00000000
--- a/dsBase/ExtendJar/引用外置jar包.md
+++ /dev/null
@@ -1,33 +0,0 @@
-```shell
-将第三方包打进本地仓库,然后依赖本地仓库
- mvn install:install-file -Dfile=D:/dsWork/dsProject/dsBase/ExtendJar/aspose-words-21.6.0-jdk17.jar -DgroupId=com.aspose -DartifactId=aspose-words -Dversion=21.6.0 -Dpackaging=jar
-
- mvn install:install-file -Dfile=D:/dsWork/dsProject/dsBase/ExtendJar/aspose-cells-23.4.jar -DgroupId=com.aspose -DartifactId=aspose-cells -Dversion=23.4 -Dpackaging=jar
- mvn install:install-file -Dfile=D:/dsWork/dsProject/dsBase/ExtendJar/aspose.slides-19.3.jar -DgroupId=com.aspose -DartifactId=aspose-slides -Dversion=19.3 -Dpackaging=jar
- mvn install:install-file -Dfile=D:/dsWork/dsProject/dsBase/ExtendJar/aspose-pdf-22.7.1.cracked.jar -DgroupId=com.aspose -DartifactId=aspose-pdf -Dversion=22.7.1 -Dpackaging=jar
-```
-
-```xml
-
-
- com.aspose
- aspose-words
- ${aspose-words.version}
-
-
- com.aspose
- aspose-cells
- ${aspose-cells.version}
-
-
- com.aspose
- aspose.slides
- ${aspose-slides.version}
-
-
- com.aspose
- aspose-pdf
- ${aspose-pdf.version}
-
-
-```
diff --git a/dsBase/src/main/java/com/dsideal/base/BaseApplication.java b/dsBase/src/main/java/com/dsideal/base/BaseApplication.java
index cb8e05f8..18c5356f 100644
--- a/dsBase/src/main/java/com/dsideal/base/BaseApplication.java
+++ b/dsBase/src/main/java/com/dsideal/base/BaseApplication.java
@@ -131,16 +131,11 @@ public class BaseApplication extends JFinalConfig {
dsDbPlugin.setMaxLifetime(maxLifetimeMs);
dsDbPlugin.setMaximumPoolSize(maxPoolSize);
me.add(dsDbPlugin);
- HikariCpPlugin yltPlugin = new HikariCpPlugin(jdbcUrl.replace("/ds_db?", "/yltcharge?"), user, password, driverClassName);
- me.add(yltPlugin);
// 配置ActiveRecord插件
ActiveRecordPlugin arp = new ActiveRecordPlugin(dsDbPlugin);
arp.setDialect(new MysqlDialect());
- ActiveRecordPlugin yltArp = new ActiveRecordPlugin("ylt", yltPlugin);
- yltArp.setDialect(new MysqlDialect());
-
//遍历sql目录下所有的sql文件
File sqlDir;
String basePath = PathKit.getRootClassPath();
@@ -150,12 +145,10 @@ public class BaseApplication extends JFinalConfig {
//只加载.sql文件
if (sqlFile.getName().indexOf(".sql") > 0) {
arp.addSqlTemplate("/Sql/" + sqlFile.getName());
- yltArp.addSqlTemplate("/Sql/" + sqlFile.getName());
}
}
//加载
me.add(arp);
- me.add(yltArp);
// 用于缓存模块的redis服务
RedisPlugin redis = new RedisPlugin("Redis", PropKit.get("redis.ip"), PropKit.getInt("redis.port"), 10 * 1000, PropKit.get("redis.password"));
//启动redis组件
diff --git a/dsBase/src/main/java/com/dsideal/base/DataAuthority/Model/DataAuthorityModel.java b/dsBase/src/main/java/com/dsideal/base/DataAuthority/Model/DataAuthorityModel.java
index cbefcb48..cb9e1449 100644
--- a/dsBase/src/main/java/com/dsideal/base/DataAuthority/Model/DataAuthorityModel.java
+++ b/dsBase/src/main/java/com/dsideal/base/DataAuthority/Model/DataAuthorityModel.java
@@ -34,9 +34,9 @@ public class DataAuthorityModel {
* @param resource_type_code
*/
public List getResourceListByTypeCode(String resource_type_code) {
- String sql = "select sync_sql from ds_db.t_sys_resource_type where resource_type_code=?";
+ String sql = "select sync_sql from t_sys_resource_type where resource_type_code=?";
String sync_sql = Db.queryStr(sql, resource_type_code);
- return Db.use("ylt").find(sync_sql);
+ return Db.find(sync_sql);
}
/**
@@ -73,7 +73,7 @@ public class DataAuthorityModel {
public Record getSysResource(int resource_id, String resource_type_code) {
String sql = "select sync_sql from ds_db.t_sys_resource_type where resource_type_code=?";
String sync_sql = Db.queryStr(sql, resource_type_code);
- List list = Db.use("ylt").find(sync_sql);
+ List list = Db.find(sync_sql);
for (Record record : list) {
int id = record.getInt("resource_id");
if (id == resource_id) {
diff --git a/pom.xml b/pom.xml
index ec5aed77..143ac977 100644
--- a/pom.xml
+++ b/pom.xml
@@ -53,11 +53,6 @@
5.1.0
-
- 20.12
- 23.4
- 19.3
- 22.7.1
5.2.5