From 0178e6cd1335ec3cb0445adf48954b4aba4ea903 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期二, 12 八月 2025 11:49:02 +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 |  147 ------------------------------------------------
 1 files changed, 1 insertions(+), 146 deletions(-)

diff --git a/UserQYTTravel/guns-admin/src/main/resources/application.yml b/UserQYTTravel/guns-admin/src/main/resources/application.yml
index d16acea..883c13d 100644
--- a/UserQYTTravel/guns-admin/src/main/resources/application.yml
+++ b/UserQYTTravel/guns-admin/src/main/resources/application.yml
@@ -1,148 +1,3 @@
-server:
-  port: 8006
-
-guns:
-  swagger-open: true              #是否开启swagger (true/false)
-  kaptcha-open: false             #是否开启登录时验证码 (true/false)
-  file-upload-path: d:/tmp       #文件上传目录(不配置的话为java.io.tmpdir目录)
-  picture-server-address: http://192.168.0.43/resources/  #图片服务器地址
-  spring-session-open: false      #是否开启spring session,如果是多机环境需要开启(true/false)
-  session-invalidate-time: 1800     #session失效时间(只在单机环境下生效,多机环境在SpringSessionConfig类中配置) 单位:秒
-  session-validation-interval: 900  #多久检测一次失效的session(只在单机环境下生效) 单位:秒
-
 spring:
-  application:
-    name: user-server
   profiles:
-    active: dev
-  #    active: prod
-  mvc:
-    static-path-pattern: /static/**
-    view:
-      prefix: /WEB-INF/view
-  devtools:
-    restart:
-      enabled: false
-      additional-paths: src/main/java
-      exclude: static/**,WEB-INF/view/**
-  servlet:
-    multipart:
-      max-request-size: 100MB
-      max-file-size: 100MB
-  redis:
-    host: 192.168.110.80
-    port: 6379
-    password: 123456
-    database: 0
-  #  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
-  configuration:
-    log-impl: org.apache.ibatis.logging.slf4j.Slf4jImpl
-
-
-
-eureka:
-  client:
-    service-url: #注册中心地址
-      defaultZone: http://sinata:sinata@192.168.110.85:8000/eureka #启用身份验证的方式连接
-    register-with-eureka: true #在注册中心进行注册
-    fetch-registry: true #从Eureka中获取注册信息。
-
----
-
-
-#配置Swagger接口扫描范围
-swagger:
-  base-package: com.stylefeng.guns.modular
-
-spring:
-  datasource:
-    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://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
-
-
----
-
-
-
-wx:
-  grantType: authorization_code #填authorization_code
-  appid: 111 #应用唯一标识,在微信开放平台提交应用审核通过后获得
-  appSecret: 111 #应用密钥AppSecret,在微信开放平台提交应用审核通过后获得
-  appletsAppid: wxcc3c9058e2b294db #小程序APPid
-  appletsAppSecret: 5610fc6126255ca5f7bd9fa4330338b6 #
-  mchId: 111 #微信支付分配的商户号
-  key: 111 #key为商户平台设置的密钥key:
-
----
-
-alipay:
-  appid: 111  #应用程序唯一标识
-  appPrivateKey: 111 #开发者应用私钥
-  alipayPublicKey: ; #应用公钥
-  alipay_public_key: 111 #支付宝公钥
-
----
-
-juhe: #聚合数据
-  appKey: 111 #
-
-
----
-
-#支付回调地址
-#正式环境
-callbackPath: https://traffic.qytzt.cn/user
-
-
----
-
-#交通部推送数据功能开关
-pushMinistryOfTransport: false
-
-#邮件配置
-spring:
-  mail:
-    host: smtp.qq.com
-    port: 465
-    username: 1721849008@qq.com
-    password: nhnbmjfdywilcbdj  # 这里是授权码,不是邮箱登录密码
-    properties:
-      mail:
-        smtp:
-          ssl:
-            enable: true  # 启用 SSL 加密(根据端口是否为 465 决定,通常需要开启)
-          auth: true      # 启用身份验证(必须为 true)
-# pdf生成位置
-trip:
-  sheet:
-    filePath: D:/qytPdf/
\ No newline at end of file
+    active: '@spring.active@'
\ No newline at end of file

--
Gitblit v1.7.1