Merge branch 'refs/heads/zzw' into wzy

# Conflicts: # src/main/java/com/gis/xian/enums/DisasterTypeEnum.java # src/main/java/com/gis/xian/task/InitializeData.java
2026-06-22 14:03:00 +08:00
parent d4f892fad6 c04b985ce6
commit 8d9cbc3912
19 changed files with 1029 additions and 24 deletions
@@ -5,7 +5,11 @@ server:
 # 开发环境配置
 spring:
  config:
-    import: classpath:config/database/application-database-dev.yml
+    import:
+      - classpath:config/database/application-database-dev.yml
+      - classpath:config/qgis/application-qgis-dev.yml
+      - classpath:config/customize/application-customize-dev.yml
+

  # redis
  data:
@@ -15,7 +19,6 @@ spring:
      password: zhangsan
      database: 0
      connect-timeout: 3000ms
-
 # 日志配置
 logging:
  level:
@@ -43,15 +46,17 @@ safety:
      - /druid
      - /websocket/info
      - /websocket/**
+      - /open/**
    # 请求无需解密的路径
    no-decrypt-paths:
      - /crypto/sm2/public-key
      - /druid
      - /websocket/info
      - /websocket/**
+      - /open/**

 # 算法服务器配置
 algorithm:
  server:
    # 开发环境算法服务器地址
-    url: http://localhost:8082
+    url: http://localhost:8082
@@ -5,7 +5,10 @@ server:
 # 生产环境配置
 spring:
  config:
-    import: classpath:config/database/application-database-prod.yml
+    import:
+      - classpath:config/database/application-database-prod.yml
+      - classpath:config/qgis/application-qgis-prod.yml
+      - classpath:config/customize/application-customize-prod.yml

  # redis
  data:
@@ -51,4 +54,4 @@ safety:
 algorithm:
  server:
    # 生产环境算法服务器地址
-    url: http://localhost:8081
+    url: http://localhost:8081
@@ -5,9 +5,11 @@ spring:
  config:
    import: classpath:config/redis/redis-key.yml

-# MyBatis 配置
-mybatis:
+# MyBatis-plus 配置
+mybatis-plus:
  mapper-locations: classpath:com/gis/xian/mapper/*.xml
  type-aliases-package: com.gis.xian.entity
  configuration:
-    map-underscore-to-camel-case: true
+    map-underscore-to-camel-case: true
+  # 添加 TypeHandler 扫描包路径
+  type-handlers-package: com.gis.xian.handler
@@ -0,0 +1,8 @@
+# qgis配置
+qgis:
+  # 地震专题图模板路径
+  eq-maps-template-path: D:/代码/xian_api_new/src/main/resources/template/qgis-template/eq/
+  # 暴雨专题图模板路径
+  rain-maps-template-path: D:/代码/xian_api_new/src/main/resources/template/qgis-template/rain/
+  # QGIS基础路径
+  base-path: F:/files/xian/maps/
@@ -0,0 +1,8 @@
+# qgis配置
+qgis:
+  # 地震专题图模板路径
+  eq-maps-template-path: D:/代码/xian_api_new/src/main/resources/template/qgis-template/eq/
+  # 暴雨专题图模板路径
+  rain-maps-template-path: D:/代码/xian_api_new/src/main/resources/template/qgis-template/rain/
+  # QGIS基础路径
+  base-path: F:/files/xian/maps/
@@ -35,4 +35,10 @@ spring:
      url: jdbc:postgresql://47.92.216.173:7654/assess_disaster?characterEncoding=utf8&TimeZone=Asia/Shanghai
      username: postgres
      password: zhangsan
-      driver-class-name: org.postgresql.Driver
+      driver-class-name: org.postgresql.Driver
+
+    slave1:
+      url: jdbc:postgresql://47.92.216.173:7654/yjzyk_xian?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&postgis=true
+      username: postgres
+      password: zhangsan
+      driver-class-name: org.postgresql.Driver
@@ -32,4 +32,10 @@ spring:
      url: jdbc:postgresql://10.22.245.138:54321/xianDCAccess?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&serverTimezone=Asia/Shanghai
      username: zaihailian
      password: XAYJ@gis2603
-      driver-class-name: org.postgresql.Driver
+      driver-class-name: org.postgresql.Driver
+
+    slave1:
+      url: jdbc:postgresql://47.92.216.173:7654/yjzyk_xian?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true&serverTimezone=Asia/Shanghai&postgis=true
+      username: postgres
+      password: zhangsan
+      driver-class-name: org.postgresql.Driver
@@ -0,0 +1,3 @@
+# qgis配置
+qgis:
+  url: http://localhost:18998/qgis/make/map
@@ -0,0 +1,3 @@
+# qgis配置
+qgis:
+  url: http://localhost:18998/qgis/make/map