From b4d8cb69ff3a3d35a10a7e5c487ff683b31cc9f1 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 24 二月 2023 10:06:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
management/guns-admin/src/main/resources/application.yml | 24 ++++++++++++++++--------
1 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/management/guns-admin/src/main/resources/application.yml b/management/guns-admin/src/main/resources/application.yml
index f4ab612..abbfe9c 100644
--- a/management/guns-admin/src/main/resources/application.yml
+++ b/management/guns-admin/src/main/resources/application.yml
@@ -16,12 +16,12 @@
spring:
profiles:
active: local
- datasource:
- url: jdbc:mysql://192.168.0.80:3306/super_save_driving?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B8
- username: root
- password: 123456
- db-name: super_save_driving #用来搜集数据库的所有表
- filters: wall,mergeStat
+# datasource:
+# url: jdbc:mysql://192.168.0.80:3306/super_save_driving?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B8
+# username: root
+# password: 123456
+# db-name: super_save_driving #用来搜集数据库的所有表
+# filters: wall,mergeStat
mvc:
static-path-pattern: /static/**
view:
@@ -35,6 +35,12 @@
multipart:
max-request-size: 100MB
max-file-size: 100MB
+ redis:
+ #测试环境
+ host: 127.0.0.1
+ port: 6379
+ timeout: 5000
+ database: 10
mybatis-plus:
type-aliases-package: com.stylefeng.guns.modular.system.model
@@ -44,8 +50,10 @@
configuration:
configuration.map-underscore-to-camel-case: true #是否开启自动驼峰命名规则（camel case）映射
log-impl: org.apache.ibatis.logging.slf4j.Slf4jImpl #输出Sql，如需打印Sql注释该配置
-
-
+wx:
+ conf:
+ appId: wx3613e8d4c8624ea1
+ secret: 25782eabe39e796a92d2fcb38947e7dc
#eureka:
# client:
--
Gitblit v1.7.1