diff --git a/dsBaseWeb/ds-base/html/pages/test/index.scss b/dsBaseWeb/ds-base/html/pages/test/index.scss new file mode 100644 index 00000000..e69de29b diff --git a/dsBaseWeb/ds-base/html/pages/test/test1.html b/dsBaseWeb/ds-base/html/pages/test/test1.html new file mode 100644 index 00000000..0dbaca1b --- /dev/null +++ b/dsBaseWeb/ds-base/html/pages/test/test1.html @@ -0,0 +1,77 @@ + + + + + + + + + + + + Element Plus demo + + + + +
+
+
+ + {{item}} +
+
+
+ + + + + + + + \ No newline at end of file diff --git a/dsBaseWeb/ds-base/html/pages/test/test2.html b/dsBaseWeb/ds-base/html/pages/test/test2.html new file mode 100644 index 00000000..c7faafdc --- /dev/null +++ b/dsBaseWeb/ds-base/html/pages/test/test2.html @@ -0,0 +1,38 @@ + + + + + + + + + + + Element Plus demo + + + +
+ {{ message }} +
+ + + + \ No newline at end of file diff --git a/dsRes/src/main/java/com/dsideal/resource/ResApplication.java b/dsRes/src/main/java/com/dsideal/resource/ResApplication.java index e35649a8..a282e208 100644 --- a/dsRes/src/main/java/com/dsideal/resource/ResApplication.java +++ b/dsRes/src/main/java/com/dsideal/resource/ResApplication.java @@ -21,7 +21,10 @@ public class ResApplication extends JFinalConfig { public static String getEnvPrefix() { String myEnvVar = System.getenv("WORKING_ENV"); - return myEnvVar == null ? "dev" : "pro"; + if (myEnvVar == null) { + myEnvVar = "dev"; + } + return myEnvVar; } public static void main(String[] args) { diff --git a/dsRes/src/main/resource/application_ali.yaml b/dsRes/src/main/resource/application_ali.yaml new file mode 100644 index 00000000..0af87d49 --- /dev/null +++ b/dsRes/src/main/resource/application_ali.yaml @@ -0,0 +1,31 @@ +# 上传文件的临时路径 +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 + + +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/dsRes/src/main/resource/application_pro.yaml b/dsRes/src/main/resource/application_pro.yaml index 0af87d49..c7378e3a 100644 --- a/dsRes/src/main/resource/application_pro.yaml +++ b/dsRes/src/main/resource/application_pro.yaml @@ -8,20 +8,17 @@ 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 + user: root + password: DsideaL147258369 + jdbcUrl : jdbc:mysql://10.10.14.210:22066/ds_db?rewriteBatchedStatements=true&useUnicode=true&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai redis: - ip: r-bp14c1p5j5lkpw1jc2.redis.rds.aliyuncs.com - port: 6379 - password: Ycharge666 + ip: 10.10.14.210 + port: 18890 + password: # ============================================================== -jwt: - # 生成Token的密码 - CookieMd5SingPwd: DsideaL4r5t6y7u excel: # 导出excel 的模板配置路径