From 8063ee7eee51bfe25a09428e6efc60f828b270c6 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期四, 19 六月 2025 20:00:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
config/application.yml | 40 ++++++++++++++++++++++++++++++++++++++--
1 files changed, 38 insertions(+), 2 deletions(-)
diff --git a/config/application.yml b/config/application.yml
index 80ffe59..0902162 100644
--- a/config/application.yml
+++ b/config/application.yml
@@ -62,8 +62,10 @@
type: com.alibaba.druid.pool.DruidDataSource
driverClassName: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://42.193.1.25:3306/lilishop?useUnicode=true&characterEncoding=utf-8&useSSL=false&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
+# url: jdbc:mysql://127.0.0.1:3306/lilishop?useUnicode=true&characterEncoding=utf-8&useSSL=false&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
username: root
password: 321$YcYl@1970!
+# password: 123456
maxActive: 50
initialSize: 20
maxWait: 60000
@@ -306,11 +308,45 @@
xxl:
job:
admin:
- addresses: http://127.0.0.1:30001/xxl-job-admin
+ addresses: http://127.0.0.1:9001/xxl-job-admin
executor:
appname: xxl-job-executor-lilishop
address:
ip:
- port: 8891
+ port: 8848
logpath: ./xxl-job/executor
logretentiondays: 7
+
+# 鑵捐cos-sts閰嶇疆
+cos:
+ secretId: AKID6zd07yZtwjFVVGkxvc2C5h26uTmpc9QQ # 鑵捐ARM鐢ㄦ埛鐨剆ecretId
+ secretKey: lFTcV6RVIo43lCMFsEKAk36tRjlVzC8n # 鑵捐ARM鐢ㄦ埛鐨剆ecretKey
+ durationSeconds: 1800 # STS涓存椂璁块棶鍑瘉鏈夋晥鏈燂紝鍗曚綅绉掞紝榛樿1800s锛屼富璐﹀彿鏈�闀�2灏忔椂锛屽瓙璐﹀彿(ARM鐢ㄦ埛)36灏忔椂
+ bucket: lmk-1356772813
+ region: ap-chengdu
+ endpoint: https://lmk-1356772813.cos.ap-chengdu.myqcloud.com # 璁块棶鍩熷悕
+ urlExpireMinute: 360 # 棰勭鍚島rl鏈夋晥鏃堕棿(鍒嗛挓)
+ actions: # sts鐨勬潈闄�
+ - cos:GetBucketACL
+ - cos:GetObject
+ - cos:GetObjectACL
+ - cos:GetObjectTagging
+ - cos:HeadObject
+ - cos:ListMultipartUploads
+ - cos:ListParts
+ - cos:AbortMultipartUpload
+ - cos:AppendObject
+ - cos:CompleteMultipartUpload
+ - cos:DeleteMultipleObjects
+ - cos:DeleteObject
+ - cos:InitiateMultipartUpload
+ - cos:PostObject
+ - cos:PutObject
+ - cos:PutObjectACL
+ - cos:PutObjectCopy
+ - cos:PutObjectTagging
+ - cos:RenameObject
+ - cos:UploadPart
+ - cos:UploadPartCopy
+ resources: # 鑳芥搷浣滃摢浜涜祫婧�
+ - qcs::cos::uid/1356772813:lmk-1356772813/*
--
Gitblit v1.8.0