From b77444d17b5fcc41ebcdc08588b8b035b428b16b Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 16 七月 2025 10:01:33 +0800
Subject: [PATCH] 修改mybatis.xml

---
 /dev/null                                          |  158 -------------------------------
 se-discover/src/main/resources/mybatis.xml         |    7 +
 se-system/src/main/resources/mybatis.xml           |    7 +
 se-collect/src/main/resources/application-prod.yml |   81 ++++++++++++++++
 se-system/src/main/resources/application-prod.yml  |   14 +-
 se-publish/src/main/resources/mybatis.xml          |    7 +
 se-collect/src/main/resources/mybatis.xml          |    5 +
 sm.txt                                             |    9 +
 8 files changed, 118 insertions(+), 170 deletions(-)

diff --git a/se-collect/src/main/resources/application-prod.yml b/se-collect/src/main/resources/application-prod.yml
new file mode 100644
index 0000000..883aa90
--- /dev/null
+++ b/se-collect/src/main/resources/application-prod.yml
@@ -0,0 +1,81 @@
+server:
+  tomcat:
+    uri-encoding: UTF-8
+    max-connections: 5000
+    max-http-form-post-size: 100MB
+    threads:
+      max: 2000
+  servlet:
+    context-path: /
+
+spring:
+  # redis
+  redis:
+    database: 0
+    host: 192.168.11.203
+    port: 6379
+    password: rediS_5L#F4_Server
+    timeout: 10000
+    lettuce:
+      pool:
+        max-active: 1000
+        max-wait: -1
+        max-idle: 10
+        min-idle: 5
+  # session
+  session:
+    timeout: PT20M
+  # servlet
+  servlet:
+    multipart:
+      enabled: true
+      max-file-size: 204800MB
+      max-request-size: 1048576MB
+  # jackson
+  jackson:
+    time-zone: GMT+8
+    date-format: yyyy-MM-dd HH:mm:ss
+    locale: zh_CN
+  # datasource
+  datasource:
+    type: com.alibaba.druid.pool.DruidDataSource
+    url: jdbc:postgresql://192.168.11.203:5432/jhs?useAffectedRows=true
+    username: postgres
+    password: Postgres!_17_jHs
+    driver-class-name: org.postgresql.Driver
+    platform: POSTGRESQL
+    filters: stat,wall,log4j
+    connectionProperties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
+    logAbandoned: true
+    # druid
+    druid:
+      initial-size: 5
+      min-idle: 5
+      max-active: 100
+      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
+      validation-query: SELECT 1
+      test-while-idle: true
+      test-on-borrow: false
+      test-on-return: false
+      filters: stat,wall
+      stat-view-servlet:
+        enabled: false
+
+mybatis-plus:
+  config-location: classpath:mybatis.xml
+
+logging:
+  config: classpath:logback.xml
+
+remote:
+  maxTotalConnect: 0
+  maxConnectPerRoute: 1000
+  connectTimeout: 30000
+  readTimeout: -1
+
+sys:
+  swaggerEnable: true
diff --git a/se-collect/src/main/resources/mybatis.xml b/se-collect/src/main/resources/mybatis.xml
index df5e6f4..86d68f2 100644
--- a/se-collect/src/main/resources/mybatis.xml
+++ b/se-collect/src/main/resources/mybatis.xml
@@ -32,6 +32,11 @@
         <setting name="logImpl" value="NO_LOGGING" />
     </settings>
     <typeAliases>
+        <!--鈥岀被鍨嬪埆鍚嶉厤缃�-->
         <package name="com.terra.collect.entity"/>
     </typeAliases>
+    <mappers>
+        <!--Mapper鏂囦欢浣嶇疆閰嶇疆-->
+        <mapper resource="mapper/**/*.xml" />
+    </mappers>
 </configuration>
\ No newline at end of file
diff --git a/se-discover/src/main/resources/mybatis.xml b/se-discover/src/main/resources/mybatis.xml
index 3526522..86d68f2 100644
--- a/se-discover/src/main/resources/mybatis.xml
+++ b/se-discover/src/main/resources/mybatis.xml
@@ -32,6 +32,11 @@
         <setting name="logImpl" value="NO_LOGGING" />
     </settings>
     <typeAliases>
-        <package name="com.terra.discover.entity"/>
+        <!--鈥岀被鍨嬪埆鍚嶉厤缃�-->
+        <package name="com.terra.collect.entity"/>
     </typeAliases>
+    <mappers>
+        <!--Mapper鏂囦欢浣嶇疆閰嶇疆-->
+        <mapper resource="mapper/**/*.xml" />
+    </mappers>
 </configuration>
\ No newline at end of file
diff --git a/se-publish/src/main/resources/mybatis.xml b/se-publish/src/main/resources/mybatis.xml
index cbb7a27..86d68f2 100644
--- a/se-publish/src/main/resources/mybatis.xml
+++ b/se-publish/src/main/resources/mybatis.xml
@@ -32,6 +32,11 @@
         <setting name="logImpl" value="NO_LOGGING" />
     </settings>
     <typeAliases>
-        <package name="com.terra.publish.entity"/>
+        <!--鈥岀被鍨嬪埆鍚嶉厤缃�-->
+        <package name="com.terra.collect.entity"/>
     </typeAliases>
+    <mappers>
+        <!--Mapper鏂囦欢浣嶇疆閰嶇疆-->
+        <mapper resource="mapper/**/*.xml" />
+    </mappers>
 </configuration>
\ No newline at end of file
diff --git a/se-system/src/main/resources/application-dev.yml b/se-system/src/main/resources/application-dev.yml
deleted file mode 100644
index 8c8543d..0000000
--- a/se-system/src/main/resources/application-dev.yml
+++ /dev/null
@@ -1,137 +0,0 @@
-server:
-  tomcat:
-    uri-encoding: UTF-8
-    max-connections: 5000
-    max-http-form-post-size: 100MB
-    threads:
-      max: 2000
-  servlet:
-    context-path: /
-
-spring:
-  application:
-    name: se-system
-  mvc:
-    static-path-pattern: /static/**
-  # redis
-  redis:
-    database: 0
-    host: 127.0.0.1
-    port: 6369
-    password: rediS_5L#F4_Server
-    # 杩炴帴瓒呮椂鏃堕暱锛堟绉掞級
-    timeout: 10000
-    lettuce:
-      pool:
-        # 杩炴帴姹犳渶澶ц繛鎺ユ暟锛堜娇鐢ㄨ礋鍊艰〃绀烘病鏈夐檺鍒讹級
-        max-active: 1000
-        # 杩炴帴姹犳渶澶ч樆濉炵瓑寰呮椂闂达紙浣跨敤璐熷�艰〃绀烘病鏈夐檺鍒讹級
-        max-wait: -1
-        # 杩炴帴姹犱腑鐨勬渶澶х┖闂茶繛鎺�
-        max-idle: 10
-        # 杩炴帴姹犱腑鐨勬渶灏忕┖闂茶繛鎺�
-        min-idle: 5
-  # session
-  session:
-    # 20鍒嗛挓
-    timeout: PT20M
-  # 璁剧疆涓婁紶鏂囦欢澶у皬
-  servlet:
-    multipart:
-      enabled: true
-      max-file-size: 204800MB
-      max-request-size: 1048576MB
-  # jackson
-  jackson:
-    time-zone: GMT+8
-    date-format: yyyy-MM-dd HH:mm:ss
-    locale: zh_CN
-  thymeleaf:
-    cache: false
-  # datasource
-  datasource:
-    type: com.alibaba.druid.pool.DruidDataSource
-    #url: jdbc:postgresql://192.168.11.205:5433/jhs?useAffectedRows=true
-    url: jdbc:postgresql://127.0.0.1:5433/jhs?useAffectedRows=true
-    username: postgres
-    #password: Postgres!_14_Lf
-    password: postgres
-    driver-class-name: org.postgresql.Driver
-    platform: POSTGRESQL
-    filters: stat,wall,log4j
-    connectionProperties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
-    logAbandoned: true
-    # 閰嶇疆杩炴帴姹犱俊鎭�
-    druid:
-      initial-size: 5
-      min-idle: 5
-      max-active: 100
-      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
-      validation-query: SELECT 1
-      test-while-idle: true
-      test-on-borrow: false
-      test-on-return: false
-      filters: stat,wall
-      web-stat-filter:
-        enabled: true
-      stat-view-servlet:
-        enabled: true
-        url-pattern: /druid/*
-        reset-enable: false
-        login-username: admin
-        login-password: ad_!Druid!_min
-
-mybatis-plus:
-  type-aliases-package: com.terra.system.entity
-  config-location: classpath:mybatis.xml
-  mapper-locations: classpath:mapper/**/*.xml
-
-# logging
-logging:
-  config: classpath:logback.xml
-
-# RestTemplate config
-remote:
-  maxTotalConnect: 0
-  maxConnectPerRoute: 1000
-  connectTimeout: 30000
-  readTimeout: -1
-
-# 绯荤粺閰嶇疆
-sys:
-  # 鍚敤swagger
-  swaggerEnable: true
-  # 鑷姩鏌ヨ
-  autoQuery: 0
-  # 绠$悊鍛業D
-  admin: ad_Lf1122_min
-  # IIS鐨勪富鏈哄湴鍧�
-  iisHost: 127.0.0.1
-  # FME鏈嶅姟鍦板潃
-  fmeUrl: http://192.168.11.205:88/
-  # FME浠ょ墝
-  fmeToken: c36e4f94-dfde-401e-9967-2c4a449f1300
-  # 鍑哄浘鏈嶅姟
-  exportServer: http://127.0.0.1/ExportMap
-  # Turf鏈嶅姟
-  turfServer: http://127.0.0.1/Turf
-  # Gdal椹卞姩鐩綍
-  gdal_path: E:\terrait\TianJin\Zip\release-1928-x64-dev\release-1928-x64\bin
-  # 鐡︾墖鍦板潃
-  tile_path: E:\data\2d\tiles
-  path:
-    # 涓嬭浇鐩綍
-    download: D:\JHS\data\download
-    # 涓婁紶鐩綍
-    upload: D:\JHS\data\upload
-    # 涓存椂鐩綍
-    temp: D:\JHS\data\temp
-  cad:
-    exePath: C:/360/MxDrawCloudServer1.0TryVersion/MxDrawCloudServer/Bin/MxCAD/Release/mxcadassembly.exe
-    targetPath: C:/360/MxDrawCloudServer1.0TryVersion/MxDrawCloudServer/SRC/TsWeb/public/data
-  # 涓婁紶闄勪欢琛�
-  attachTabs: bd.b_pac_hydrogeology,bd.b_pac_frozensoil
diff --git a/se-system/src/main/resources/application-prod.yml b/se-system/src/main/resources/application-prod.yml
index eaa430f..22516ae 100644
--- a/se-system/src/main/resources/application-prod.yml
+++ b/se-system/src/main/resources/application-prod.yml
@@ -9,15 +9,13 @@
     context-path: /
 
 spring:
-  application:
-    name: se-system
   mvc:
     static-path-pattern: /static/**
   # redis
   redis:
     database: 0
-    host: 192.168.11.203
-    port: 6379
+    host: 127.0.0.1
+    port: 6369
     password: rediS_5L#F4_Server
     # 杩炴帴瓒呮椂鏃堕暱锛堟绉掞級
     timeout: 10000
@@ -51,9 +49,11 @@
   # datasource
   datasource:
     type: com.alibaba.druid.pool.DruidDataSource
-    url: jdbc:postgresql://192.168.11.203:5432/jhs?useAffectedRows=true
+    #url: jdbc:postgresql://192.168.11.205:5433/jhs?useAffectedRows=true
+    url: jdbc:postgresql://127.0.0.1:5433/jhs?useAffectedRows=true
     username: postgres
-    password: Postgres!_17_jHs
+    #password: Postgres!_14_Lf
+    password: postgres
     driver-class-name: org.postgresql.Driver
     platform: POSTGRESQL
     filters: stat,wall,log4j
@@ -85,8 +85,6 @@
 
 mybatis-plus:
   type-aliases-package: com.terra.system.entity
-  config-location: classpath:mybatis.xml
-  mapper-locations: classpath:mapper/**/*.xml
 
 # logging
 logging:
diff --git a/se-system/src/main/resources/application-test.yml b/se-system/src/main/resources/application-test.yml
deleted file mode 100644
index 1263d4e..0000000
--- a/se-system/src/main/resources/application-test.yml
+++ /dev/null
@@ -1,158 +0,0 @@
-server:
-  tomcat:
-    uri-encoding: UTF-8
-    max-connections: 5000
-    max-http-form-post-size: 100MB
-    threads:
-      max: 2000
-  servlet:
-    context-path: /
-
-spring:
-  application:
-    name: se-system
-  # redis
-  redis:
-    database: 0
-    host: 127.0.0.1
-    port: 6369
-    password: rediS_5L#F4_Server
-    # 杩炴帴瓒呮椂鏃堕暱锛堟绉掞級
-    timeout: 10000
-    lettuce:
-      pool:
-        # 杩炴帴姹犳渶澶ц繛鎺ユ暟锛堜娇鐢ㄨ礋鍊艰〃绀烘病鏈夐檺鍒讹級
-        max-active: 1000
-        # 杩炴帴姹犳渶澶ч樆濉炵瓑寰呮椂闂达紙浣跨敤璐熷�艰〃绀烘病鏈夐檺鍒讹級
-        max-wait: -1
-        # 杩炴帴姹犱腑鐨勬渶澶х┖闂茶繛鎺�
-        max-idle: 10
-        # 杩炴帴姹犱腑鐨勬渶灏忕┖闂茶繛鎺�
-        min-idle: 5
-  # session
-  session:
-    # 20鍒嗛挓
-    timeout: PT20M
-  # 璁剧疆涓婁紶鏂囦欢澶у皬
-  servlet:
-    multipart:
-      enabled: true
-      max-file-size: 204800MB
-      max-request-size: 1048576MB
-  # jackson
-  jackson:
-    time-zone: GMT+8
-    date-format: yyyy-MM-dd HH:mm:ss
-    locale: zh_CN
-  thymeleaf:
-    cache: false
-  # datasource锛宧ttps://blog.csdn.net/weixin_43724911/article/details/147566522
-  datasource:
-    name: prod
-    # JDBC 鍩烘湰閰嶇疆 &currentSchema=public
-    #url: jdbc:postgresql://192.168.11.205:5433/jhs?useAffectedRows=true
-    url: jdbc:postgresql://127.0.0.1:5433/jhs?useAffectedRows=true
-    username: postgres
-    #password: Postgres!_14_Lf
-    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:
-  type-aliases-package: com.terra.system.entity
-  config-location: classpath:mybatis.xml
-  mapper-locations: classpath:mapper/**/*.xml
-
-# logging
-logging:
-  config: classpath:logback.xml
-
-# RestTemplate config
-remote:
-  maxTotalConnect: 0
-  maxConnectPerRoute: 1000
-  connectTimeout: 30000
-  readTimeout: -1
-
-# 绯荤粺閰嶇疆
-sys:
-  # 鍚敤swagger
-  swaggerEnable: true
-  # 鑷姩鏌ヨ
-  autoQuery: 0
-  # 绠$悊鍛業D
-  admin: ad_Lf1122_min
-  # IIS鐨勪富鏈哄湴鍧�
-  iisHost: 127.0.0.1
-  # FME鏈嶅姟鍦板潃
-  fmeUrl: http://192.168.11.205:88/
-  # FME浠ょ墝
-  fmeToken: c36e4f94-dfde-401e-9967-2c4a449f1300
-  # 鍑哄浘鏈嶅姟
-  exportServer: http://127.0.0.1/ExportMap
-  # Turf鏈嶅姟
-  turfServer: http://127.0.0.1/Turf
-  # Gdal椹卞姩鐩綍
-  gdal_path: E:\terrait\TianJin\Zip\release-1928-x64-dev\release-1928-x64\bin
-  # 鐡︾墖鍦板潃
-  tile_path: E:\data\2d\tiles
-  path:
-    # 涓嬭浇鐩綍
-    download: D:\JHS\data\download
-    # 涓婁紶鐩綍
-    upload: D:\JHS\data\upload
-    # 涓存椂鐩綍
-    temp: D:\JHS\data\temp
-  cad:
-    exePath: C:/360/MxDrawCloudServer1.0TryVersion/MxDrawCloudServer/Bin/MxCAD/Release/mxcadassembly.exe
-    targetPath: C:/360/MxDrawCloudServer1.0TryVersion/MxDrawCloudServer/SRC/TsWeb/public/data
-  # 涓婁紶闄勪欢琛�
-  attachTabs: bd.b_pac_hydrogeology,bd.b_pac_frozensoil
diff --git a/se-system/src/main/resources/mybatis.xml b/se-system/src/main/resources/mybatis.xml
index 40627c3..86d68f2 100644
--- a/se-system/src/main/resources/mybatis.xml
+++ b/se-system/src/main/resources/mybatis.xml
@@ -32,6 +32,11 @@
         <setting name="logImpl" value="NO_LOGGING" />
     </settings>
     <typeAliases>
-        <package name="com.terra.system.entity"/>
+        <!--鈥岀被鍨嬪埆鍚嶉厤缃�-->
+        <package name="com.terra.collect.entity"/>
     </typeAliases>
+    <mappers>
+        <!--Mapper鏂囦欢浣嶇疆閰嶇疆-->
+        <mapper resource="mapper/**/*.xml" />
+    </mappers>
 </configuration>
\ No newline at end of file
diff --git a/sm.txt b/sm.txt
index 9d13e10..9dad3ee 100644
--- a/sm.txt
+++ b/sm.txt
@@ -1,6 +1,13 @@
 -------------------------------------------------------------------
 
 
+
+
+
+
+
+
+
 ------------------------------------------------------------------- 鍔熻兘妯″潡锛屾敮鎸佺嫭绔嬮儴缃�
   se-common锛�      閫氱敤妯″潡
  se-gateway锛�8001锛岀郴缁熺綉鍏�
@@ -9,7 +16,7 @@
 se-discover锛�8004锛岀煡璇嗗彂鐜�
  se-publish锛�8005锛屾暟鎹彂甯�
 ------------------------------------------------------------------- URL
-admin:Admin@1234_lf
+admin锛欰dmin@1234_lf
 nacos锛歯Acos_!9#_admIn
 
 http://localhost:8848/nacos

--
Gitblit v1.9.3