From 40d3bb9fe638a0bd79e829e7fd5114871101390b Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期四, 20 十一月 2025 10:52:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/user_action' into user_action
---
config/application.yml | 61 ++++++++++++++++++++----------
1 files changed, 41 insertions(+), 20 deletions(-)
diff --git a/config/application.yml b/config/application.yml
index 70c7d2a..f4abaa8 100644
--- a/config/application.yml
+++ b/config/application.yml
@@ -29,9 +29,10 @@
type: redis
# Redis
redis:
- host: 42.193.1.25
+ host: 127.0.0.1
+# host: 42.193.1.25
port: 6379
- password: ycl2018
+# password: ycl2018
database: 12
lettuce:
pool:
@@ -61,11 +62,13 @@
default-datasource:
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
+# 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
+# url: jdbc:mysql://1.95.67.54:6033/lilishop?useUnicode=true&characterEncoding=utf-8&useSSL=false&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
username: root
- password: 321$YcYl@1970!
-# password: 123456
+# password: 321$YcYl@1970!
+# password: 6c701c021355fc70fc156824e81fbead
+ password: 123456
maxActive: 50
initialSize: 20
maxWait: 60000
@@ -177,7 +180,7 @@
#缂撳瓨寮�鍚�
cache-enabled: true
#鏃ュ織
-# log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+ # log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
global-config:
db-config:
#閫昏緫鍒犻櫎閰嶇疆瀛楁
@@ -222,10 +225,10 @@
faultTolerant: 3
system:
isDemoSite: false
- # 鑴辨晱绾у埆锛�
- # 0锛氫笉鍋氳劚鏁忓鐞�
- # 1锛氱鐞嗙鐢ㄦ埛鎵嬫満鍙风瓑淇℃伅鑴辨晱
- # 2锛氬晢瀹剁淇℃伅鑴辨晱锛堜负2鏃讹紝琛ㄧず绠＄悊绔紝鍟嗗绔悓鏃惰劚鏁忥級
+ # 鑴辨晱绾у埆锛�
+ # 0锛氫笉鍋氳劚鏁忓鐞�
+ # 1锛氱鐞嗙鐢ㄦ埛鎵嬫満鍙风瓑淇℃伅鑴辨晱
+ # 2锛氬晢瀹剁淇℃伅鑴辨晱锛堜负2鏃讹紝琛ㄧず绠＄悊绔紝鍟嗗绔悓鏃惰劚鏁忥級
sensitiveLevel: 1
statistics:
@@ -282,6 +285,12 @@
rocketmq:
promotion-topic: shop_lili_promotion_topic
promotion-group: shop_lili_promotion_group
+ comment-topic: lmk_comment_topic # 璇勮
+ comment-group: lmk_comment_group
+ video-topic: lmk_video_topic # 瑙嗛
+ video-group: lmk_video_group
+ prize-topic: lmk_prize_topic # 鎶藉
+ prize-group: lmk_prize_group
msg-ext-topic: shop_lili_msg_topic
msg-ext-group: shop_lili_msg_group
goods-topic: shop_lili_goods_topic
@@ -319,28 +328,40 @@
# 鑵捐cos-sts閰嶇疆
cos:
- secretId: AKIDYyBCzb1FOPGx0fCXfdOwJVWM1TjqmW3N # 鑵捐ARM鐢ㄦ埛鐨剆ecretId
- secretKey: DD1b1LWVIvPlusAOYjnfKm150jO0NYWH # 鑵捐ARM鐢ㄦ埛鐨剆ecretKey
+ secretId: AKID6zd07yZtwjFVVGkxvc2C5h26uTmpc9QQ # 鑵捐ARM鐢ㄦ埛鐨剆ecretId
+ secretKey: lFTcV6RVIo43lCMFsEKAk36tRjlVzC8n # 鑵捐ARM鐢ㄦ埛鐨剆ecretKey
durationSeconds: 1800 # STS涓存椂璁块棶鍑瘉鏈夋晥鏈燂紝鍗曚綅绉掞紝榛樿1800s锛屼富璐﹀彿鏈�闀�2灏忔椂锛屽瓙璐﹀彿(ARM鐢ㄦ埛)36灏忔椂
- bucket: lmk-1308069279
+ bucket: lmk-1356772813
region: ap-chengdu
+# endpoint: https://lmk-1356772813.cos.ap-chengdu.myqcloud.com # 璁块棶鍩熷悕
+ endpoint: https://media.meiyikuang.com # cdn璁块棶鍩熷悕
urlExpireMinute: 360 # 棰勭鍚島rl鏈夋晥鏃堕棿(鍒嗛挓)
actions: # sts鐨勬潈闄�
- - cos:ListMultipartUploads
- - cos:GetBucket
+ - cos:GetBucketACL
- cos:GetObject
+ - cos:GetObjectACL
- cos:GetObjectTagging
- - cos:GetSymlink
- cos:HeadObject
+ - cos:ListMultipartUploads
- cos:ListParts
- cos:AbortMultipartUpload
- cos:AppendObject
- cos:CompleteMultipartUpload
+ - cos:DeleteMultipleObjects
+ - cos:DeleteObject
- cos:InitiateMultipartUpload
- cos:PostObject
- cos:PutObject
- - cos:UploadPart
- - cos:DeleteObject
+ - cos:PutObjectACL
+ - cos:PutObjectCopy
- cos:PutObjectTagging
+ - cos:RenameObject
+ - cos:UploadPart
+ - cos:UploadPartCopy
resources: # 鑳芥搷浣滃摢浜涜祫婧�
- - qcs::cos:ap-chengdu:uid/1308069279:lmk-1308069279/*
+ - qcs::cos::uid/1356772813:lmk-1356772813/*
+
+cdn:
+ secretId: AKIDhIqIbhrwsfJm397vhLp570iEZheQ0OYX
+ secretKey: pQnyzmS4aCi9Skz2tWyFLG0Xu64saBcs
+ cdnDomain: https://media.meiyikuang.com
\ No newline at end of file
--
Gitblit v1.8.0