diff --git a/dsBase/src/main/java/com/dsideal/base/BaseApplication.java b/dsBase/src/main/java/com/dsideal/base/BaseApplication.java index 18c5356f..7767703a 100644 --- a/dsBase/src/main/java/com/dsideal/base/BaseApplication.java +++ b/dsBase/src/main/java/com/dsideal/base/BaseApplication.java @@ -23,7 +23,6 @@ import com.dsideal.base.Util.PkUtil; import com.jfinal.config.*; import com.jfinal.kit.PathKit; import com.jfinal.kit.Prop; -import com.jfinal.kit.StrKit; import com.jfinal.plugin.activerecord.ActiveRecordPlugin; import com.jfinal.plugin.activerecord.dialect.MysqlDialect; import com.jfinal.plugin.hikaricp.HikariCpPlugin; @@ -34,7 +33,15 @@ import com.jfinal.template.Engine; import java.io.File; public class BaseApplication extends JFinalConfig { + /** + * 配置常量 + */ + public static Prop PropKit; + /** + * 获取当前环境 + * @return 当前环境 + */ public static String getEnvPrefix() { String myEnvVar = System.getenv("WORKING_ENV"); if (myEnvVar == null) { @@ -49,10 +56,6 @@ public class BaseApplication extends JFinalConfig { UndertowServer.create(BaseApplication.class, configFile).start(); } - /** - * 配置常量 - */ - public static Prop PropKit; @Override public void configConstant(Constants me) { @@ -61,7 +64,6 @@ public class BaseApplication extends JFinalConfig { //加载配置文件 String configFile = "application_{?}.yaml".replace("{?}", getEnvPrefix()); PropKit = new YamlProp(configFile); - // 设置静态根目录为上传根目录 me.setBaseUploadPath(PropKit.get("uploadTempPath")); } @@ -106,18 +108,6 @@ public class BaseApplication extends JFinalConfig { } - /** - * 配置插件 - */ - private String connectionTestQuery = "select 1"; - // 连接池中允许的最大连接数。缺省值:10;推荐的公式:((core_count * 2) + effective_spindle_count) - private int maxPoolSize = 10; - // 一个连接 idle 状态的最大时长(毫秒),超时则被释放(retired),缺省:10分钟 - private long idleTimeoutMs = 600000; - private long maxLifetimeMs = 1800000; - // 等待连接池分配连接的最大时长(毫秒),超过这个时长还没可用的连接则发生 SQLException, 缺省:30秒 - private long connectionTimeoutMs = 30000; - @Override public void configPlugin(Plugins me) { String jdbcUrl = PropKit.get("mysql.jdbcUrl"); @@ -125,10 +115,21 @@ public class BaseApplication extends JFinalConfig { String password = PropKit.get("mysql.password"); String driverClassName = PropKit.get("mysql.driverClassName"); HikariCpPlugin dsDbPlugin = new HikariCpPlugin(jdbcUrl, user, password, driverClassName); + /** + * 配置插件 + */ + String connectionTestQuery = "select 1"; dsDbPlugin.setConnectionTestQuery(connectionTestQuery); + // 等待连接池分配连接的最大时长(毫秒),超过这个时长还没可用的连接则发生 SQLException, 缺省:30秒 + long connectionTimeoutMs = 30000; dsDbPlugin.setConnectionTimeout(connectionTimeoutMs); + // 一个连接 idle 状态的最大时长(毫秒),超时则被释放(retired),缺省:10分钟 + long idleTimeoutMs = 600000; dsDbPlugin.setIdleTimeout(idleTimeoutMs); + long maxLifetimeMs = 1800000; dsDbPlugin.setMaxLifetime(maxLifetimeMs); + // 连接池中允许的最大连接数。缺省值:10;推荐的公式:((core_count * 2) + effective_spindle_count) + int maxPoolSize = 10; dsDbPlugin.setMaximumPoolSize(maxPoolSize); me.add(dsDbPlugin); diff --git a/dsBase/src/main/resources/application_ali.yaml b/dsBase/src/main/resources/application_ali.yaml deleted file mode 100644 index 97dbd6f5..00000000 --- a/dsBase/src/main/resources/application_ali.yaml +++ /dev/null @@ -1,31 +0,0 @@ -# 上传文件的临时路径 -uploadTempPath: /tmp -# JWT -SECRET: ZXZnZWVr5b+r5LmQ5L2g55qE5Ye66KGM -# 生成Token的密码 -CookieMd5SingPwd: DsideaL4r5t6y7u - -mysql: - # 数据库信息 - driverClassName: com.mysql.cj.jdbc.Driver - user: ylt - password: Ycharge666 - jdbcUrl : jdbc:mysql://rm-bp1ux6tuk49er80t9.mysql.rds.aliyuncs.com:3306/ds_db?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&failOverReadOnly=false - - -redis: - ip: r-bp14c1p5j5lkpw1jc2.redis.rds.aliyuncs.com - port: 6379 - password: Ycharge666 - -# ============================================================== -jwt: - # 生成Token的密码 - CookieMd5SingPwd: DsideaL4r5t6y7u - -excel: - # 导出excel 的模板配置路径 - excelExportTemplatePathSuffix: /ExcelExportTemplate/ - # 导入excel 的模板配置路径 - ExcelImportTemplatePathSuffix: /ExcelImportTemplate/ - diff --git a/dsBase/src/main/resources/application_dataease.yaml b/dsBase/src/main/resources/application_dataease.yaml deleted file mode 100644 index 37ed4cfa..00000000 --- a/dsBase/src/main/resources/application_dataease.yaml +++ /dev/null @@ -1,8 +0,0 @@ -mysql: - # 数据库信息 - driverClassName: com.mysql.cj.jdbc.Driver - user: root - password: Password123@mysql - jdbcUrl : jdbc:mysql://10.10.14.203:3306/dataease?rewriteBatchedStatements=true&useUnicode=true&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai - - diff --git a/dsBuild/dsUtils.iml b/dsBuild/dsUtils.iml deleted file mode 100644 index 9d25deee..00000000 --- a/dsBuild/dsUtils.iml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file