'commit'

dsBase/ExtendJar/license.xml

@@ -1,12 +0,0 @@
-<License>
-  <Data>
-    <Products>
-      <Product>Aspose.Total for Java</Product>      
-    </Products>
-    <EditionType>Enterprise</EditionType>
-    <SubscriptionExpiry>20991231</SubscriptionExpiry>
-    <LicenseExpiry>20991231</LicenseExpiry>
-    <SerialNumber>8bfe198c-7f0c-4ef8-8ff0-acc3237bf0d7</SerialNumber>
-  </Data>
-  <Signature>sNLLKGMUdF0r8O1kKilWAGdgfs2BvJb/2Xp8p5iuDVfZXmhppo+d0Ran1P9TKdjV4ABwAgKXxJ3jcQTqE/2IRfqwnPf8itN8aFZlV3TJPYeD3yWE7IT55Gz6EijUpC7aKeoohTb4w2fpox58wWoF3SNp6sK6jDfiAUGEHYJ9pjU=</Signature>
-</License>

dsBase/ExtendJar/引用外置jar包.md

@@ -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
-<dependencys>
-    <dependency>
-        <groupId>com.aspose</groupId>
-        <artifactId>aspose-words</artifactId>
-        <version>${aspose-words.version}</version>
-    </dependency>
-    <dependency>
-        <groupId>com.aspose</groupId>
-        <artifactId>aspose-cells</artifactId>
-        <version>${aspose-cells.version}</version>
-    </dependency>
-    <dependency>
-        <groupId>com.aspose</groupId>
-        <artifactId>aspose.slides</artifactId>
-        <version>${aspose-slides.version}</version>
-    </dependency>
-    <dependency>
-        <groupId>com.aspose</groupId>
-        <artifactId>aspose-pdf</artifactId>
-        <version>${aspose-pdf.version}</version>
-    </dependency>
-</dependencys>
-```

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组件

dsBase/src/main/java/com/dsideal/base/DataAuthority/Model/DataAuthorityModel.java

@@ -34,9 +34,9 @@ public class DataAuthorityModel {
      * @param resource_type_code
      */
     public List<Record> 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<Record> list = Db.use("ylt").find(sync_sql);
+        List<Record> list = Db.find(sync_sql);
         for (Record record : list) {
             int id = record.getInt("resource_id");
             if (id == resource_id) {

pom.xml

@@ -53,11 +53,6 @@
         <!--jedis版本号-->
         <jedis.version>5.1.0</jedis.version>
 
-        <!--aspose全家桶-->
-        <aspose-words.version>20.12</aspose-words.version>
-        <aspose-cells.version>23.4</aspose-cells.version>
-        <aspose-slides.version>19.3</aspose-slides.version>
-        <aspose-pdf.version>22.7.1</aspose-pdf.version>
         <!--POI版本-->
         <poi.version>5.2.5</poi.version>
         <!--yaml文件读取-->