From 729a5a0592cac7750e8b476c5fcb25bfc3ff8d25 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期日, 27 七月 2025 09:06:31 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/QianYunTong
---
UserQYTTravel/guns-admin/src/main/resources/application.yml | 43 ++++++++++++++++++++++++++++---------------
1 files changed, 28 insertions(+), 15 deletions(-)
diff --git a/UserQYTTravel/guns-admin/src/main/resources/application.yml b/UserQYTTravel/guns-admin/src/main/resources/application.yml
index 1f46a52..3d56997 100644
--- a/UserQYTTravel/guns-admin/src/main/resources/application.yml
+++ b/UserQYTTravel/guns-admin/src/main/resources/application.yml
@@ -14,8 +14,8 @@
application:
name: user-server
profiles:
-# active: dev
- active: prod
+ active: dev
+ # active: prod
mvc:
static-path-pattern: /static/**
view:
@@ -30,13 +30,17 @@
max-request-size: 100MB
max-file-size: 100MB
redis:
- host: 172.21.35.151
- port: 6512
- password: SC_cache@20#25
- database: 0
- timeout: 1000
- cluster:
- nodes: 172.21.35.151:6512,172.21.35.152:6512,172.21.35.153:6512,172.21.35.151:6513,172.21.35.152:6513,172.21.35.153:6513
+ host: 192.168.110.80
+ port: 6379
+ password: 123456
+# redis:
+# host: 172.21.35.151
+# port: 6512
+# password: SC_cache@20#25
+# database: 0
+# timeout: 1000
+# cluster:
+# nodes: 172.21.35.151:6512,172.21.35.152:6512,172.21.35.153:6512,172.21.35.151:6513,172.21.35.152:6513,172.21.35.153:6513
mybatis-plus:
typeAliasesPackage: com.stylefeng.guns.modular
@@ -59,21 +63,30 @@
swagger:
base-package: com.stylefeng.guns.modular
-
spring:
datasource:
- url: jdbc:mysql://172.21.35.140:8066/traffic_scdb?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai
- username: traffic_scusr
- password: QYT_sc@20#25
- db-name: traffic_scdb #用来搜集数据库的所有表
+ url: jdbc:mysql://192.168.110.80:3306/qyttravel?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai
+ username: root
+ password: 123456
+ db-name: qyttravel #用来搜集数据库的所有表
filters: wall,mergeStat
+
+
+#spring:
+# datasource:
+# url: jdbc:mysql://172.21.35.140:8066/traffic_scdb?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai
+# username: traffic_scusr
+# password: QYT_sc@20#25
+# db-name: traffic_scdb #用来搜集数据库的所有表
+# filters: wall,mergeStat
---
spring:
data:
mongodb:
- uri: mongodb://qyt_jtcx:qyt_jtcx2025@172.21.35.195:27017,172.21.35.196:27017/traveling_track
+ uri: mongodb://192.168.110.80:27017/traveling_track
+# uri: mongodb://qyt_jtcx:qyt_jtcx2025@172.21.35.195:27017,172.21.35.196:27017/traveling_track
---
--
Gitblit v1.7.1