From a501b77ada79a4ffdc3210771ce3f24372a3ddeb Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 26 六月 2025 14:26:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/src/main/resources/application-pro.yml | 40 +++++++++++++++++++++++++++++-----------
1 files changed, 29 insertions(+), 11 deletions(-)
diff --git a/server/src/main/resources/application-pro.yml b/server/src/main/resources/application-pro.yml
index b48a872..c8b123b 100644
--- a/server/src/main/resources/application-pro.yml
+++ b/server/src/main/resources/application-pro.yml
@@ -1,9 +1,19 @@
+project:
+ # 鐜锛岀敓浜х幆澧僷roduction锛屽紑鍙戠幆澧僤evelopment
+ env: production
+ # 妯″紡锛宼esting娴嬭瘯妯″紡
+ mode: production
+
+# WEB鏈嶅姟鍣ㄩ厤缃�
+server:
+ port: 10010
+
spring:
# 鏁版嵁婧愰厤缃�
datasource:
- url: jdbc:mysql://sh-cdb-aiskr3vy.sql.tencentcdb.com:62443/lianhelihua_sh?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai
- username: doumee
- password: rtjgfEr@&0c0m
+ url: jdbc:mysql://solution-cnn3-d-shereport-db-mysql01.mysql.database.chinacloudapi.cn:3306/lianhelihua?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai
+ username: service_account
+ password: yP5@jJzqME63
driver-class-name: com.mysql.cj.jdbc.Driver
type: com.alibaba.druid.pool.DruidDataSource
redis:
@@ -16,17 +26,19 @@
time-zone: GMT+8
date-format: yyyy-MM-dd HH:mm:ss
mail:
- host: smtp.exmail.qq.com
- username: jp@doumee.com
- password: 2Jz9HFW2U7vRnCRu
- default-encoding: UTF-8
+ host: smtp.aliyun.com
+ port: 465
+ username: your_email@aliyun.com
+ password: your_password
properties:
mail:
smtp:
auth: true
- starttls:
- enable: true
- required: true
+ starttls:
+ enable: true
+ required: true
+ ssl:
+ enable: true
debug_model: true
@@ -47,4 +59,10 @@
basic:
enable: true
username: admin
- password: 111111
\ No newline at end of file
+ password:
+
+upload:
+ type: blob
+
+qiwei:
+ serviceurl: https://wecom-qyapi.unilever-china.com/
\ No newline at end of file
--
Gitblit v1.9.3