From f35b0afc944d3eff591bbba1d80d4d927aae9296 Mon Sep 17 00:00:00 2001 From: 13693261870 <252740454@qq.com> Date: 星期一, 14 七月 2025 13:55:12 +0800 Subject: [PATCH] 修改docker配置 --- /dev/null | 59 -------------- se-system/src/main/resources/application-prod.yml | 135 +++++++++++++++++++++++++++++++++ docker/system/bootstrap.yml | 4 docker/gateway/bootstrap.yml | 15 --- 4 files changed, 137 insertions(+), 76 deletions(-) diff --git a/docker/gateway/bootstrap.yml b/docker/gateway/bootstrap.yml index cbe2e58..4a88b14 100644 --- a/docker/gateway/bootstrap.yml +++ b/docker/gateway/bootstrap.yml @@ -31,18 +31,3 @@ group: JHS_GROUP # 鍏佽鍒锋柊 refresh-enabled: true - sentinel: - # 鍙栨秷鎺у埗鍙版噿鍔犺浇 - eager: true - transport: - # 鎺у埗鍙板湴鍧� - dashboard: 127.0.0.1:8718 - # nacos閰嶇疆鎸佷箙鍖� - datasource: - ds1: - nacos: - server-addr: 127.0.0.1:8848 - dataId: sentinel-se-gateway - groupId: DEFAULT_GROUP - data-type: json - rule-type: gw-flow diff --git a/docker/spring.yml b/docker/spring.yml deleted file mode 100644 index 460c660..0000000 --- a/docker/spring.yml +++ /dev/null @@ -1,59 +0,0 @@ -version: "3.8" -services: - # zookeeper - zookeeper: - image: zookeeper:3.4 - ports: - - 2181:2181 - - 2888:2888 - - 3888:3888 - volumes: - - ./zookeeper_data:/data - environment: - ZOO_MY_ID: 1 - ZOO_SERVERS: server.1=0.0.0.0:2888:3888 - # ZOO_ENABLE_AUTH: yes - # ZOO_SERVER_USERS: admin - # ZOO_SERVER_PASSWORDS: kaFka_12#$56 - healthcheck: - test: ["CMD-SHELL", "zkServer.sh status"] - interval: 5s - timeout: 2s - retries: 3 - networks: - - network-jhs - # kafka - kafka: - image: bitnami/kafka:3.4 - environment: - KAFKA_BROKER_ID: 1 - # ALLOW_PLAINTEXT_LISTENER: yes - # KAFKA_CFG_LISTENERS: PLAINTEXT://:9092 - # KAFKA_CFG_ZOOKEEPER_CONNECT: zookeeper:2181 - # KAFKA_CFG_ADVERTISED_LISTENERS: PLAINTEXT://192.168.11.203:9092 - KAFKA_CFG_ZOOKEEPER_CONNECT: zookeeper:2181 - KAFKA_CFG_LISTENERS: SASL_PLAINTEXT://:9092 - KAFKA_CFG_ADVERTISED_LISTENERS: SASL_PLAINTEXT://192.168.11.203:9092 - KAFKA_CFG_LISTENER_SECURITY_PROTOCOL_MAP: PLAINTEXT:PLAINTEXT,SSL:SSL,SASL_PLAINTEXT:SASL_PLAINTEXT,SASL_SSL:SASL_SSL - KAFKA_CFG_INTER_BROKER_LISTENER_NAME: SASL_PLAINTEXT - KAFKA_CFG_SASL_ENABLED_MECHANISMS: PLAIN - KAFKA_CFG_SASL_MECHANISM_INTER_BROKER_PROTOCOL: PLAIN - KAFKA_CLIENT_USERS: admin - KAFKA_CLIENT_PASSWORDS: kaFka_12#$56 - # KAFKA_ZOOKEEPER_USER: admin - # KAFKA_ZOOKEEPER_PASSWORD: kaFka_12#$56 - volumes: - # chmod -R 777 kafka_data/ - - ./kafka_data:/bitnami/kafka - - /var/run/docker.sock:/var/run/docker.sock - ports: - - 9092:9092 - depends_on: - zookeeper: - condition: service_healthy - privileged: true - networks: - - network-jhs -networks: - network-jhs: - driver: bridge diff --git a/docker/system/bootstrap.yml b/docker/system/bootstrap.yml index 24730b9..1693fd6 100644 --- a/docker/system/bootstrap.yml +++ b/docker/system/bootstrap.yml @@ -16,11 +16,11 @@ password: nAcos_!9#_admIn discovery: # 鏈嶅姟娉ㄥ唽鍦板潃 - server-addr: 127.0.0.1:8848 + server-addr: nacos:8848 config: group: JHS_GROUP # 閰嶇疆涓績鍦板潃 - server-addr: 127.0.0.1:8848 + server-addr: nacos:8848 # 閰嶇疆鏂囦欢鏍煎紡 file-extension: yml # 鍏变韩閰嶇疆 diff --git a/se-system/src/main/resources/application-prod.yml b/se-system/src/main/resources/application-prod.yml new file mode 100644 index 0000000..eaa430f --- /dev/null +++ b/se-system/src/main/resources/application-prod.yml @@ -0,0 +1,135 @@ +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: 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: + # 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.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: + 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 -- Gitblit v1.9.3