From 74f8b8074a2fb391b5363b4dca5f99bf31993430 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期一, 11 八月 2025 22:22:07 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/QYTDriving

---
 user/guns-admin/src/main/resources/application.yml |  145 ------------------------------------------------
 1 files changed, 1 insertions(+), 144 deletions(-)

diff --git a/user/guns-admin/src/main/resources/application.yml b/user/guns-admin/src/main/resources/application.yml
index 3cc3a28..883c13d 100644
--- a/user/guns-admin/src/main/resources/application.yml
+++ b/user/guns-admin/src/main/resources/application.yml
@@ -1,146 +1,3 @@
-server:
-  port: 8016
-
-guns:
-  swagger-open: true              #是否开启swagger (true/false)
-  kaptcha-open: false             #是否开启登录时验证码 (true/false)
-#  file-upload-path: d:/tmp       #文件上传目录(不配置的话为java.io.tmpdir目录)
-  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: produce
-  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
-
-mybatis-plus:
-  typeAliasesPackage: com.supersavedriving.user.modular
-  global-config:
-    id-type: 0  #0:数据库ID自增   1:用户输入id  2:全局唯一id(IdWorker)  3:全局唯一ID(uuid)
-    db-column-underline: false
-  configuration:
-    configuration.map-underscore-to-camel-case: true #是否开启自动驼峰命名规则(camel case)映射
-    log-impl: org.apache.ibatis.logging.slf4j.Slf4jImpl #输出Sql,如需打印Sql注释该配置
-  mapper-locations: classpath*:com/supersavedriving/user/modular/system/dao/**/*.xml
-
-
-
-eureka:
-  client:
-    service-url: #注册中心地址
-      defaultZone: http://sinata:sinata@192.168.110.106:8000/eureka #启用身份验证的方式连接
-    register-with-eureka: true #在注册中心进行注册
-    fetch-registry: true #从Eureka中获取注册信息。
-
----
-
-
-spring:
-  datasource:
-    url: jdbc:mysql://192.168.110.80:3306/qyt_driving?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai
-    username: root
-    password: 123456
-    db-name: guns #用来搜集数据库的所有表
-    filters: wall,mergeStat
-
-
-
-
----
-
-wx:
-  grantType: authorization_code #填authorization_code
-  appid: wx1f52be0fdb1d2875 #应用唯一标识,在微信开放平台提交应用审核通过后获得
-  appSecret: 8210ae106f3a501d77b410070a0aa2c2 #应用密钥AppSecret,在微信开放平台提交应用审核通过后获得
-  appletsAppid: wx1f52be0fdb1d2875 #小程序APPid
-  appletsAppSecret: 8210ae106f3a501d77b410070a0aa2c2 #
-  officialAccountAppid: 11111
-  officialAccountAppSecret: 1111
-  webAppId: 111
-  webAppSecret: 11
-  mchId: 662454894 #微信支付分配的商户号
-  key: Eri2GR2SB3b6iIhaoD7k3KQ8X0wf1Ybh #key为商户平台设置的密钥key:
-  apiv3: AKJ51Z4nhSqYBxmOXgUyCKA1vLP0J5Aj #key为商户平台设置的密钥key:
-
----
-
-alipay:
-  appid: 111  #应用程序唯一标识
-  appPrivateKey: 111 #开发者应用私钥
-  alipayPublicKey: 111 #应用公钥
-  alipay_public_key: 111 #支付宝公钥
-
----
-
-juhe: #聚合数据
-  appKey: 0d3fd83eddaa33e5563f548257648577 #
-
-
----
-
-jiguang:
-  appKey-driver: 93204c35ded9ba377a14af19 #极光推送应用唯一标识
-  masterSecret-driver: e4f6f435faefad29db6ba9b2 #用于服务器端 API 调用时与 AppKey 配合使用达到鉴权的目的
-  appKey-dispatch: cc212ee6dcecb26625917f40 #极光推送应用唯一标识
-  masterSecret-dispatch: 0d163a25a20647665c28639e #用于服务器端 API 调用时与 AppKey 配合使用达到鉴权的目的
-
-
----
-
-filePath: /usr/local/server/app/orderPostionFile/ #存储订单轨迹文件路径
-#filePath: C:/orderPostionFile/  #存储订单轨迹文件路径
-
-
-
-#支付回调地址
-#正式环境
-#callbackPath: https://chaoshengdaijia.com:443/user
-#正式测试环境
-callbackPath: http://121.31.232.206:3002/user
-#callbackPath: http://221.182.45.100:3002/user
-
-
----
-
-spring:
-  data:
-    mongodb:
-      uri: mongodb://192.168.110.80:27017/test
-#      uri: mongodb://121.31.232.206:27017/test
-
-
-#  mallbook 调起接口参数配置
-mallbook:
-  # pay_url:mallbook接口地址    测试环境: https://uat.mallbook.cn/api   生产环境:https://cloudpay.mallbook.cn/api
-  pay_url: https://cloudpay.mallbook.cn/api
-  # merchant_no 业务系统商户平台编号,需替换为mallbook工作人员提供的商户编号
-  merchant_no: MBH23056
-  # version 接口版本号
-  version: 1.0.0
-  # channel_type 渠道类型 HF:汇付
-  channel_type: HF
-  # merchant_private_key 商户平台私钥,需要替换成商户平台自己生成的私钥
-  merchant_private_key: MIICdQIBADANBgkqhkiG9w0BAQEFAASCAl8wggJbAgEAAoGBALHmyTrxPYcAwABnX+3VW9vxUftm57zBpnbfOT4vizMnKdpfCkIgtdbfdnSCtt637yWM2fxnZfItnhTeQA2lL8f4SXgZt/bVXfmAWi4IxQ+HJy0Qs8nNy2nnjICPBPcpWzHwUxQ/THHqU0a7b9B91J5DFcbQb25BHeRpHwkBw6A/AgMBAAECgYAmcWq2s/7Jt53F+JDAQkTRaHqAyyH0phwkv+QMzhVUfngK2lLLK2pf/nYIg16lDjY9dQx+AJIFHVp1w/kveayzOz3BIqPoznyIVYPolRGZCWPo+2vdp0CIdBh7zahST5g5Gem4cU47wO5hPYs1kXKPG4mUPtaIAMHFxhyLvIagAQJBAOS63AIZrRrldeNCVVNXbpAT52JuWLCgravM9coOh6scmG6UQwxxcott8hneHr9fazk2LHbHMxlG8F+dQPA0+D8CQQDHHJN7Dnske8oJ+1sq4uhQP3HMsmNIgth+ZcaZpiPcxnNKYVGhzAwTVV2ruFJle5ajebo6zfWuqJhtZGRNh1gBAkA/lRoXk1+lfGfa9tOVSVa4wm+t0xLgdqoQefdRZdyc2mQdSSWiTd8Tl0qXmkFd3X6G9uJBWnp/6lJjoektXOwtAkBsZTQsw99qJzIAaSRinpDWTxPG2j6OlR0DAqkxsG7JnAfbsEteh9TzGYAbIgdJVBTX/kbSCJn9ca85rnOkeVABAkAUbDfU3Z702z20NtwAxc1IkrtQ1lKuqSpj9/LuR1/6KRkYQsUWnUiOO9hu5YDWIcflFrnCenF8j8OnvGghltxT
-  # mall_book_public_key mallbook测试环境公钥 不需要替换
-  mall_book_public_key: MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCq6OLZKgUHH5wOk9xSBgN7yC17r3PQwMlY9/IorqrOlaIqrU0eAVZ5+dWrJD/3bdu7Ctq8n8trTm/IUYs7wtMg5SKwyX4/N+KQc2N7LL4yCq4vNl41q9sYgrtA0QnZoucIZcq1mwyu7RTDC8Wp7LGddnlkJsmL8masgMxA6cc9NwIDAQAB
-
+    active: '@spring.active@'
\ No newline at end of file

--
Gitblit v1.7.1