From d32876a3e2be5277d5497d2447566ba92f9c8dea Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期一, 03 七月 2023 15:14:36 +0800
Subject: [PATCH] 1

---
 src/main/java/com/moon/server/entity/all/StaticData.java |    2 +-
 src/main/java/com/moon/server/config/InitConfig.java     |    2 ++
 src/main/resources/application.yml                       |   14 +++++++-------
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/moon/server/config/InitConfig.java b/src/main/java/com/moon/server/config/InitConfig.java
index 47224f6..a7d5484 100644
--- a/src/main/java/com/moon/server/config/InitConfig.java
+++ b/src/main/java/com/moon/server/config/InitConfig.java
@@ -1,5 +1,6 @@
 package com.moon.server.config;
 
+import com.moon.server.entity.all.StaticData;
 import com.moon.server.service.all.UploadAttachService;
 import com.moon.server.service.sys.ArgsService;
 import com.moon.server.helper.GdalHelper;
@@ -41,6 +42,7 @@
 
             //testService.testRegister();
             pathHelper.init();
+            StaticData.ADMIN = env.getProperty("sys.admin");
             argsService.initSettingData();
 
             log.info("***************** 绯荤粺鍚姩瀹屾瘯 *****************" + "\n");
diff --git a/src/main/java/com/moon/server/entity/all/StaticData.java b/src/main/java/com/moon/server/entity/all/StaticData.java
index 4f1d7c3..d83ad9b 100644
--- a/src/main/java/com/moon/server/entity/all/StaticData.java
+++ b/src/main/java/com/moon/server/entity/all/StaticData.java
@@ -118,7 +118,7 @@
 
     public final static String TIFF = ".tiff";
 
-    public final static String ADMIN = "admin";
+    public static String ADMIN = "admin";
 
     public final static String SYS_META = "sysmeta";
 
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index f1ddbd8..a52ff68 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -15,7 +15,7 @@
     host: 192.168.20.83
     port: 6369
     password: rediS_5L#F4_Server
-    timeout: 90000  # 杩炴帴瓒呮椂鏃堕暱锛堟绉掞級
+    timeout: 10000  # 杩炴帴瓒呮椂鏃堕暱锛堟绉掞級
     lettuce:
       pool:
         max-active: 1000  # 杩炴帴姹犳渶澶ц繛鎺ユ暟锛堜娇鐢ㄨ礋鍊艰〃绀烘病鏈夐檺鍒讹級
@@ -43,10 +43,8 @@
     name: prod
     # JDBC 鍩烘湰閰嶇疆 &currentSchema=public
     url: jdbc:postgresql://192.168.20.83:5433/moon?useAffectedRows=true
-    #url: jdbc:postgresql://127.0.0.1:5433/langfang?useAffectedRows=true
     username : postgres
-    #password: Postgres!_14_Lf
-    password: postgres
+    password: Postgres!_14_moon
     driver-class-name: org.postgresql.Driver
     platform: POSTGRESQL
     type: com.alibaba.druid.pool.DruidDataSource
@@ -66,8 +64,8 @@
       initial-size: 5
       min-idle: 5
       max-active: 100
-      ## 閰嶇疆鑾峰彇杩炴帴绛夊緟瓒呮椂鐨勬椂闂�
-      max-wait: 6000
+      ## 閰嶇疆鑾峰彇杩炴帴绛夊緟瓒呮椂鐨勬椂闂达紝ms
+      max-wait: 60000
       # 閰嶇疆闂撮殧澶氫箙鎵嶈繘琛屼竴娆℃娴嬶紝妫�娴嬮渶瑕佸叧闂殑绌洪棽杩炴帴锛屽崟浣嶆槸姣
       time-between-eviction-runs-millis: 60000
       # 閰嶇疆涓�涓繛鎺ュ湪姹犱腑鏈�灏忕敓瀛樼殑鏃堕棿锛屽崟浣嶆槸姣
@@ -122,6 +120,8 @@
 
 # 绯荤粺閰嶇疆
 sys:
+  # 绠＄悊鍛業D
+  admin: admin
   # IIS鐨勪富鏈哄湴鍧�
   iisHost: 127.0.0.1
   # FME鏈嶅姟鍦板潃
@@ -141,4 +141,4 @@
     # 涓存椂鐩綍
     temp: D:\Moon\temp
   # 涓婁紶闄勪欢琛�
-  attachTabs: bd.b_pac_hydrogeology,bs.u_sectionline
\ No newline at end of file
+  attachTabs: 
\ No newline at end of file

--
Gitblit v1.9.3