From 83d3dbeb477e1bae7b9f80cbe46c4e4c619175b5 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Mon, 30 Sep 2024 16:33:41 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.122:9527/r/cms into xincheng
---
src/main/resources/application.yml | 27 ++++++++++++++++++---------
1 files changed, 18 insertions(+), 9 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index c39852e..eacb7ee 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -6,15 +6,24 @@
timeout: 1
spring:
+ profiles:
+ active: dev
mvc:
async:
request-timeout: 20s
datasource:
- url: jdbc:mysql://120.27.238.55:3306/farmer_cms?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2b8
- username: ct_test
- password: 123456
- driver-class-name: com.mysql.jdbc.Driver
- type: com.alibaba.druid.pool.DruidDataSource
+ dynamic:
+ # 是否开启 SQL日志输出，生产环境建议关闭，有性能损耗
+ p6spy: true
+ # 配置默认数据源
+ primary: base
+ datasource:
+ base:
+ url: jdbc:mysql://120.27.238.55:3306/farmer_cms?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2b8
+ username: ct_test
+ password: 123456
+ driver-class-name: com.mysql.jdbc.Driver
+ type: com.alibaba.druid.pool.DruidDataSource
druid:
initial-size: ${spring_datasource_druid_initial_size:10}
max-active: ${spring_datasource_druid_max_active:20}
@@ -57,7 +66,7 @@
# Redis服务器连接端口
port: 6379
# Redis 密码
- password: xcong123
+ password: d3y6dsdl;f.327
jedis:
pool:
## 连接池最大连接数（使用负值表示没有限制）
@@ -104,7 +113,7 @@
cms:
api-url: http://120.27.238.55:8878
static-url: http://120.27.238.55:8000/cms/static/
- template-path: /Users/helius/Desktop/template-online/template
- static-path: /Users/helius/Desktop/template-online/static
- output-path: /Users/helius/Desktop/template-online/output
+ template-path: C:\Users\wzy19\Desktop\template
+ static-path: C:\Users\wzy19\Desktop\template
+ output-path: C:\Users\wzy19\Desktop\output
--
Gitblit v1.9.1