From 97a9c821063acb96f230209f121ec9e3a4f4e99a Mon Sep 17 00:00:00 2001
From: 张洋洋 <10611411+yang-yang-z@user.noreply.gitee.com>
Date: 星期五, 06 十二月 2024 10:08:24 +0800
Subject: [PATCH] [add]配置文件区别

---
 src/main/resources/application-zyy.yml  |  139 +++++++++++++++++
 src/main/resources/application-prod.yml |  139 +++++++++++++++++
 pom.xml                                 |    6 
 src/main/resources/application.yml      |  140 -----------------
 4 files changed, 286 insertions(+), 138 deletions(-)

diff --git a/pom.xml b/pom.xml
index ffe7fb2..a397813 100644
--- a/pom.xml
+++ b/pom.xml
@@ -160,6 +160,12 @@
             <scope>system</scope>
             <systemPath>${project.basedir}/libs/jarhdf5-3.3.2.jar</systemPath>
         </dependency><!---->
+        <dependency>
+            <groupId>org.yaml</groupId>
+            <artifactId>snakeyaml</artifactId>
+            <version>1.33</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml
new file mode 100644
index 0000000..4e2a0ea
--- /dev/null
+++ b/src/main/resources/application-prod.yml
@@ -0,0 +1,139 @@
+server:
+  port: 8079
+  servlet:
+    context-path: /
+
+spring:
+  mvc:
+    pathmatch:
+      matching-strategy: ant_path_matcher
+  application:
+    name: SimuServer
+  datasource:
+    name: prod
+    # JDBC 鍩烘湰閰嶇疆 &currentSchema=public
+    url: jdbc:postgresql://127.0.0.1:5433/ai?useAffectedRows=true
+    username: postgres
+    password: postgres
+    driver-class-name: org.postgresql.Driver
+    platform: POSTGRESQL
+    type: com.alibaba.druid.pool.DruidDataSource
+    # 閰嶇疆鐩戞帶缁熻鎷︽埅鐨刦ilters锛宻tat:鐩戞帶缁熻銆乴og4j锛氭棩蹇楄褰曘�亀all锛氶槻寰ql娉ㄥ叆
+    filters: stat,wall,log4j
+    # 閫氳繃connectProperties灞炴�ф潵鎵撳紑mergeSql鍔熻兘锛涙參SQL璁板綍
+    connectionProperties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
+    # 瓒呰繃鏃堕棿闄愬埗鏄惁鍥炴敹
+    removeAbandoned: true
+    # 瓒呮椂鏃堕棿锛涘崟浣嶄负绉掋��180绉�=3鍒嗛挓
+    removeAbandonedTimeout: 180
+    # 鍏抽棴 abanded 杩炴帴鏃惰緭鍑洪敊璇棩蹇�
+    logAbandoned: true
+    # 閰嶇疆杩炴帴姹犱俊鎭�
+    druid:
+      ## 鍒濆鍖栧ぇ灏忥紝鏈�灏忥紝鏈�澶�
+      initial-size: 5
+      min-idle: 5
+      max-active: 100
+      ## 閰嶇疆鑾峰彇杩炴帴绛夊緟瓒呮椂鐨勬椂闂达紝ms
+      max-wait: 60000
+      # 閰嶇疆闂撮殧澶氫箙鎵嶈繘琛屼竴娆℃娴嬶紝妫�娴嬮渶瑕佸叧闂殑绌洪棽杩炴帴锛屽崟浣嶆槸姣
+      time-between-eviction-runs-millis: 60000
+      # 閰嶇疆涓�涓繛鎺ュ湪姹犱腑鏈�灏忕敓瀛樼殑鏃堕棿锛屽崟浣嶆槸姣
+      min-evictable-idle-time-millis: 300000
+      max-pool-prepared-statement-per-connection-size: 50
+      pool-prepared-statements: true
+      # 鐢ㄦ潵娴嬭瘯杩炴帴鏄惁鍙敤鐨凷QL璇彞
+      validation-query: SELECT 1
+      # 搴旂敤鍚戣繛鎺ユ睜鐢宠杩炴帴锛屽苟涓攖estOnBorrow涓篺alse鏃讹紝杩炴帴姹犲皢浼氬垽鏂繛鎺ユ槸鍚﹀浜庣┖闂茬姸鎬侊紝濡傛灉鏄紝鍒欓獙璇佽繖鏉¤繛鎺ユ槸鍚﹀彲鐢�
+      test-while-idle: true
+      # 濡傛灉涓簍rue锛岄粯璁ゆ槸false锛屽簲鐢ㄥ悜杩炴帴姹犵敵璇疯繛鎺ユ椂锛岃繛鎺ユ睜浼氬垽鏂繖鏉¤繛鎺ユ槸鍚︽槸鍙敤鐨�
+      test-on-borrow: false
+      # 濡傛灉涓簍rue锛堥粯璁alse锛夛紝褰撳簲鐢ㄤ娇鐢ㄥ畬杩炴帴锛岃繛鎺ユ睜鍥炴敹杩炴帴鐨勬椂鍊欎細鍒ゆ柇璇ヨ繛鎺ユ槸鍚﹁繕鍙敤
+      test-on-return: false
+      # servlet閰嶇疆
+      stat-view-servlet:
+        # sql鐩戞帶寮�鍏�
+        enabled: true
+        # 璁块棶鍐呯疆鐩戞帶椤甸潰鐨勮矾寰勶紝鍐呯疆鐩戞帶椤甸潰鐨勯椤垫槸/druid/index.html
+        url-pattern: /druid/*
+        # 鏄惁鍏佽娓呯┖缁熻鏁版嵁锛岄噸鏂拌绠�  true:鍏佽  false:涓嶅厑璁�
+        reset-enable: false
+        # 閰嶇疆鐩戞帶椤甸潰璁块棶璐﹀彿瀵嗙爜
+        login-username: admin
+        login-password: ad_!Druid!_min
+        # 鍏佽璁块棶鐨勫湴鍧�锛屽鏋渁llow娌℃湁閰嶇疆鎴栬�呬负绌猴紝鍒欏厑璁告墍鏈夎闂�
+        allow:
+        # 鎷掔粷璁块棶鐨勫湴鍧�锛宒eny浼樺厛浜巃llow
+        deny:
+
+mybatis-plus:
+  config-location: classpath:mybatis.xml
+  mapper-locations: classpath:mapper/**/*.xml
+
+knife4j:
+  # 鏄惁寮�鍚�
+  enabled: true
+  # 璇锋眰鍓嶇紑
+  pathMapping:
+  # 鏄惁寮�鍚寮烘ā寮�
+  enable: true
+
+pagehelper:
+  autoDialect: true
+  autoRuntimeDialect: true
+  reasonable: true
+  supportMethodsArguments: true
+  params: count=countSql
+
+remote:
+  maxTotalConnect: 0
+  maxConnectPerRoute: 1000
+  connectTimeout: -1
+  readTimeout: -1
+
+config:
+  ver: 0.2
+  cacheTime: 60
+  # Gdal椹卞姩鐩綍
+  gdalPath: E:/terrait/TianJin/Zip/release-1928-x64-dev/release-1928-x64/bin
+  #inPath: D:\simu\in
+  inPath: D:\simu\uwsolver
+  outPath: D:\simu\out
+  #
+  host: http://106.120.22.26:8024/
+  user: admin
+  pwd: admin
+  #  host: http://106.120.22.26:8013/
+  #  user: WUWEIWEI
+  #  pwd: WUWEIWEI
+  dbName: 閫氬窞姘村埄
+  pageSize: 2000
+  layerNames: 绠$偣,绠$嚎,寤虹瓚鐗�
+  shpNames:
+    - pipeline-point.shp
+    - pipeline-conduit.shp
+    - buildings_inside.shp
+  junctionName: pipeline-point-junctions.shp
+  junctionFilter: ysjjd=1
+  demName: DEM
+  demType: .tif
+  demFile: DEM.tif
+  zoneName: studyzone.shp
+  barrierName: barrier.shp
+  sysFields: _ext_attr,_meta_id,_attach_files,_x,_y,_z,_is_latest,_data_type,operatetime,operator,shape_length,shape_area
+  raingage: RainGage.dat
+  rainStation: Tongzhou
+  rainPeriod: 10
+  # 娴侀噺鍗曚綅锛孡PS锛堝崌/绉掞級銆丆MS锛堢珛鏂圭背/绉�)銆丆FS(绔嬫柟鑻卞昂/绉�)
+  flowUnits: CMS
+  solverBat: D:\simu\uwsolver\run_solver.bat
+  sww2tifBat: D:\simu\uwsolver\sww2tif.bat
+  sizes: 64,128,256,512,1024,2048
+  # 杈撳嚭鏂囦欢
+  terrainFile: DEM.tif
+  buildingFile: buildings_inside.shp
+  buildingKey: seid
+  # buildingKey: KJSFBM
+  waterPath: depth
+  flowPath: velocity
+  copyTif: false
diff --git a/src/main/resources/application-zyy.yml b/src/main/resources/application-zyy.yml
new file mode 100644
index 0000000..18adee8
--- /dev/null
+++ b/src/main/resources/application-zyy.yml
@@ -0,0 +1,139 @@
+server:
+  port: 8079
+  servlet:
+    context-path: /
+
+spring:
+  mvc:
+    pathmatch:
+      matching-strategy: ant_path_matcher
+  application:
+    name: SimuServer
+  datasource:
+    name: prod
+    # JDBC 鍩烘湰閰嶇疆 &currentSchema=public
+    url: jdbc:postgresql://127.0.0.1:5432/ai?useAffectedRows=true
+    username: postgres
+    password: postgres
+    driver-class-name: org.postgresql.Driver
+    platform: POSTGRESQL
+    type: com.alibaba.druid.pool.DruidDataSource
+    # 閰嶇疆鐩戞帶缁熻鎷︽埅鐨刦ilters锛宻tat:鐩戞帶缁熻銆乴og4j锛氭棩蹇楄褰曘�亀all锛氶槻寰ql娉ㄥ叆
+    filters: stat,wall,log4j
+    # 閫氳繃connectProperties灞炴�ф潵鎵撳紑mergeSql鍔熻兘锛涙參SQL璁板綍
+    connectionProperties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
+    # 瓒呰繃鏃堕棿闄愬埗鏄惁鍥炴敹
+    removeAbandoned: true
+    # 瓒呮椂鏃堕棿锛涘崟浣嶄负绉掋��180绉�=3鍒嗛挓
+    removeAbandonedTimeout: 180
+    # 鍏抽棴 abanded 杩炴帴鏃惰緭鍑洪敊璇棩蹇�
+    logAbandoned: true
+    # 閰嶇疆杩炴帴姹犱俊鎭�
+    druid:
+      ## 鍒濆鍖栧ぇ灏忥紝鏈�灏忥紝鏈�澶�
+      initial-size: 5
+      min-idle: 5
+      max-active: 100
+      ## 閰嶇疆鑾峰彇杩炴帴绛夊緟瓒呮椂鐨勬椂闂达紝ms
+      max-wait: 60000
+      # 閰嶇疆闂撮殧澶氫箙鎵嶈繘琛屼竴娆℃娴嬶紝妫�娴嬮渶瑕佸叧闂殑绌洪棽杩炴帴锛屽崟浣嶆槸姣
+      time-between-eviction-runs-millis: 60000
+      # 閰嶇疆涓�涓繛鎺ュ湪姹犱腑鏈�灏忕敓瀛樼殑鏃堕棿锛屽崟浣嶆槸姣
+      min-evictable-idle-time-millis: 300000
+      max-pool-prepared-statement-per-connection-size: 50
+      pool-prepared-statements: true
+      # 鐢ㄦ潵娴嬭瘯杩炴帴鏄惁鍙敤鐨凷QL璇彞
+      validation-query: SELECT 1
+      # 搴旂敤鍚戣繛鎺ユ睜鐢宠杩炴帴锛屽苟涓攖estOnBorrow涓篺alse鏃讹紝杩炴帴姹犲皢浼氬垽鏂繛鎺ユ槸鍚﹀浜庣┖闂茬姸鎬侊紝濡傛灉鏄紝鍒欓獙璇佽繖鏉¤繛鎺ユ槸鍚﹀彲鐢�
+      test-while-idle: true
+      # 濡傛灉涓簍rue锛岄粯璁ゆ槸false锛屽簲鐢ㄥ悜杩炴帴姹犵敵璇疯繛鎺ユ椂锛岃繛鎺ユ睜浼氬垽鏂繖鏉¤繛鎺ユ槸鍚︽槸鍙敤鐨�
+      test-on-borrow: false
+      # 濡傛灉涓簍rue锛堥粯璁alse锛夛紝褰撳簲鐢ㄤ娇鐢ㄥ畬杩炴帴锛岃繛鎺ユ睜鍥炴敹杩炴帴鐨勬椂鍊欎細鍒ゆ柇璇ヨ繛鎺ユ槸鍚﹁繕鍙敤
+      test-on-return: false
+      # servlet閰嶇疆
+      stat-view-servlet:
+        # sql鐩戞帶寮�鍏�
+        enabled: true
+        # 璁块棶鍐呯疆鐩戞帶椤甸潰鐨勮矾寰勶紝鍐呯疆鐩戞帶椤甸潰鐨勯椤垫槸/druid/index.html
+        url-pattern: /druid/*
+        # 鏄惁鍏佽娓呯┖缁熻鏁版嵁锛岄噸鏂拌绠�  true:鍏佽  false:涓嶅厑璁�
+        reset-enable: false
+        # 閰嶇疆鐩戞帶椤甸潰璁块棶璐﹀彿瀵嗙爜
+        login-username: admin
+        login-password: ad_!Druid!_min
+        # 鍏佽璁块棶鐨勫湴鍧�锛屽鏋渁llow娌℃湁閰嶇疆鎴栬�呬负绌猴紝鍒欏厑璁告墍鏈夎闂�
+        allow:
+        # 鎷掔粷璁块棶鐨勫湴鍧�锛宒eny浼樺厛浜巃llow
+        deny:
+
+mybatis-plus:
+  config-location: classpath:mybatis.xml
+  mapper-locations: classpath:mapper/**/*.xml
+
+knife4j:
+  # 鏄惁寮�鍚�
+  enabled: true
+  # 璇锋眰鍓嶇紑
+  pathMapping:
+  # 鏄惁寮�鍚寮烘ā寮�
+  enable: true
+
+pagehelper:
+  autoDialect: true
+  autoRuntimeDialect: true
+  reasonable: true
+  supportMethodsArguments: true
+  params: count=countSql
+
+remote:
+  maxTotalConnect: 0
+  maxConnectPerRoute: 1000
+  connectTimeout: -1
+  readTimeout: -1
+
+config:
+  ver: 0.2
+  cacheTime: 60
+  # Gdal椹卞姩鐩綍
+  gdalPath: D:\gdal\release-1928-x64-dev\release-1928-x64\bin
+  #inPath: D:\simu\in
+  inPath: D:\uwsolver
+  outPath: D:\out
+  #
+  host: http://106.120.22.26:8024/
+  user: admin
+  pwd: admin
+  #  host: http://106.120.22.26:8013/
+  #  user: WUWEIWEI
+  #  pwd: WUWEIWEI
+  dbName: 閫氬窞姘村埄
+  pageSize: 2000
+  layerNames: 绠$偣,绠$嚎,寤虹瓚鐗�
+  shpNames:
+    - pipeline-point.shp
+    - pipeline-conduit.shp
+    - buildings_inside.shp
+  junctionName: pipeline-point-junctions.shp
+  junctionFilter: ysjjd=1
+  demName: DEM
+  demType: .tif
+  demFile: DEM.tif
+  zoneName: studyzone.shp
+  barrierName: barrier.shp
+  sysFields: _ext_attr,_meta_id,_attach_files,_x,_y,_z,_is_latest,_data_type,operatetime,operator,shape_length,shape_area
+  raingage: RainGage.dat
+  rainStation: Tongzhou
+  rainPeriod: 10
+  # 娴侀噺鍗曚綅锛孡PS锛堝崌/绉掞級銆丆MS锛堢珛鏂圭背/绉�)銆丆FS(绔嬫柟鑻卞昂/绉�)
+  flowUnits: CMS
+  solverBat: D:\uwsolver\run_solver.bat
+  sww2tifBat: D:\uwsolver\sww2tif.bat
+  sizes: 64,128,256,512,1024,2048
+  # 杈撳嚭鏂囦欢
+  terrainFile: DEM.tif
+  buildingFile: buildings_inside.shp
+  # buildingKey: seid
+  buildingKey: KJSFBM
+  waterPath: depth
+  flowPath: velocity
+  copyTif: false
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 742023e..e83f7dd 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,139 +1,3 @@
-server:
-  port: 8079
-  servlet:
-    context-path: /
-
 spring:
-  mvc:
-    pathmatch:
-      matching-strategy: ant_path_matcher
-  application:
-    name: SimuServer
-  datasource:
-    name: prod
-    # JDBC 鍩烘湰閰嶇疆 &currentSchema=public
-    url: jdbc:postgresql://127.0.0.1:5433/ai?useAffectedRows=true
-    username: postgres
-    password: postgres
-    driver-class-name: org.postgresql.Driver
-    platform: POSTGRESQL
-    type: com.alibaba.druid.pool.DruidDataSource
-    # 閰嶇疆鐩戞帶缁熻鎷︽埅鐨刦ilters锛宻tat:鐩戞帶缁熻銆乴og4j锛氭棩蹇楄褰曘�亀all锛氶槻寰ql娉ㄥ叆
-    filters: stat,wall,log4j
-    # 閫氳繃connectProperties灞炴�ф潵鎵撳紑mergeSql鍔熻兘锛涙參SQL璁板綍
-    connectionProperties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
-    # 瓒呰繃鏃堕棿闄愬埗鏄惁鍥炴敹
-    removeAbandoned: true
-    # 瓒呮椂鏃堕棿锛涘崟浣嶄负绉掋��180绉�=3鍒嗛挓
-    removeAbandonedTimeout: 180
-    # 鍏抽棴 abanded 杩炴帴鏃惰緭鍑洪敊璇棩蹇�
-    logAbandoned: true
-    # 閰嶇疆杩炴帴姹犱俊鎭�
-    druid:
-      ## 鍒濆鍖栧ぇ灏忥紝鏈�灏忥紝鏈�澶�
-      initial-size: 5
-      min-idle: 5
-      max-active: 100
-      ## 閰嶇疆鑾峰彇杩炴帴绛夊緟瓒呮椂鐨勬椂闂达紝ms
-      max-wait: 60000
-      # 閰嶇疆闂撮殧澶氫箙鎵嶈繘琛屼竴娆℃娴嬶紝妫�娴嬮渶瑕佸叧闂殑绌洪棽杩炴帴锛屽崟浣嶆槸姣
-      time-between-eviction-runs-millis: 60000
-      # 閰嶇疆涓�涓繛鎺ュ湪姹犱腑鏈�灏忕敓瀛樼殑鏃堕棿锛屽崟浣嶆槸姣
-      min-evictable-idle-time-millis: 300000
-      max-pool-prepared-statement-per-connection-size: 50
-      pool-prepared-statements: true
-      # 鐢ㄦ潵娴嬭瘯杩炴帴鏄惁鍙敤鐨凷QL璇彞
-      validation-query: SELECT 1
-      # 搴旂敤鍚戣繛鎺ユ睜鐢宠杩炴帴锛屽苟涓攖estOnBorrow涓篺alse鏃讹紝杩炴帴姹犲皢浼氬垽鏂繛鎺ユ槸鍚﹀浜庣┖闂茬姸鎬侊紝濡傛灉鏄紝鍒欓獙璇佽繖鏉¤繛鎺ユ槸鍚﹀彲鐢�
-      test-while-idle: true
-      # 濡傛灉涓簍rue锛岄粯璁ゆ槸false锛屽簲鐢ㄥ悜杩炴帴姹犵敵璇疯繛鎺ユ椂锛岃繛鎺ユ睜浼氬垽鏂繖鏉¤繛鎺ユ槸鍚︽槸鍙敤鐨�
-      test-on-borrow: false
-      # 濡傛灉涓簍rue锛堥粯璁alse锛夛紝褰撳簲鐢ㄤ娇鐢ㄥ畬杩炴帴锛岃繛鎺ユ睜鍥炴敹杩炴帴鐨勬椂鍊欎細鍒ゆ柇璇ヨ繛鎺ユ槸鍚﹁繕鍙敤
-      test-on-return: false
-      # servlet閰嶇疆
-      stat-view-servlet:
-        # sql鐩戞帶寮�鍏�
-        enabled: true
-        # 璁块棶鍐呯疆鐩戞帶椤甸潰鐨勮矾寰勶紝鍐呯疆鐩戞帶椤甸潰鐨勯椤垫槸/druid/index.html
-        url-pattern: /druid/*
-        # 鏄惁鍏佽娓呯┖缁熻鏁版嵁锛岄噸鏂拌绠�  true:鍏佽  false:涓嶅厑璁�
-        reset-enable: false
-        # 閰嶇疆鐩戞帶椤甸潰璁块棶璐﹀彿瀵嗙爜
-        login-username: admin
-        login-password: ad_!Druid!_min
-        # 鍏佽璁块棶鐨勫湴鍧�锛屽鏋渁llow娌℃湁閰嶇疆鎴栬�呬负绌猴紝鍒欏厑璁告墍鏈夎闂�
-        allow:
-        # 鎷掔粷璁块棶鐨勫湴鍧�锛宒eny浼樺厛浜巃llow
-        deny:
-
-mybatis-plus:
-  config-location: classpath:mybatis.xml
-  mapper-locations: classpath:mapper/**/*.xml
-
-knife4j:
-  # 鏄惁寮�鍚�
-  enabled: true
-  # 璇锋眰鍓嶇紑
-  pathMapping:
-  # 鏄惁寮�鍚寮烘ā寮�
-  enable: true
-
-pagehelper:
-  autoDialect: true
-  autoRuntimeDialect: true
-  reasonable: true
-  supportMethodsArguments: true
-  params: count=countSql
-
-remote:
-  maxTotalConnect: 0
-  maxConnectPerRoute: 1000
-  connectTimeout: -1
-  readTimeout: -1
-
-config:
-  ver: 0.2
-  cacheTime: 60
-  # Gdal椹卞姩鐩綍
-  gdalPath: E:/terrait/TianJin/Zip/release-1928-x64-dev/release-1928-x64/bin
-  #inPath: D:\simu\in
-  inPath: D:\simu\uwsolver
-  outPath: D:\simu\out
-  #
-  host: http://106.120.22.26:8024/
-  user: admin
-  pwd: admin
-#  host: http://106.120.22.26:8013/
-#  user: WUWEIWEI
-#  pwd: WUWEIWEI
-  dbName: 閫氬窞姘村埄
-  pageSize: 2000
-  layerNames: 绠$偣,绠$嚎,寤虹瓚鐗�
-  shpNames:
-    - pipeline-point.shp
-    - pipeline-conduit.shp
-    - buildings_inside.shp
-  junctionName: pipeline-point-junctions.shp
-  junctionFilter: ysjjd=1
-  demName: DEM
-  demType: .tif
-  demFile: DEM.tif
-  zoneName: studyzone.shp
-  barrierName: barrier.shp
-  sysFields: _ext_attr,_meta_id,_attach_files,_x,_y,_z,_is_latest,_data_type,operatetime,operator,shape_length,shape_area
-  raingage: RainGage.dat
-  rainStation: Tongzhou
-  rainPeriod: 10
-  # 娴侀噺鍗曚綅锛孡PS锛堝崌/绉掞級銆丆MS锛堢珛鏂圭背/绉�)銆丆FS(绔嬫柟鑻卞昂/绉�)
-  flowUnits: CMS
-  solverBat: D:\simu\uwsolver\run_solver.bat
-  sww2tifBat: D:\simu\uwsolver\sww2tif.bat
-  sizes: 64,128,256,512,1024,2048
-  # 杈撳嚭鏂囦欢
-  terrainFile: DEM.tif
-  buildingFile: buildings_inside.shp
-  buildingKey: seid
-  # buildingKey: KJSFBM
-  waterPath: depth
-  flowPath: velocity
-  copyTif: false
+  profiles:
+    active: zyy
\ No newline at end of file

--
Gitblit v1.9.3