From a60e866f9d30de8ed50d3cd01c3979dfccb6d94b Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期五, 17 十月 2025 09:23:43 +0800
Subject: [PATCH] Merge branch 'dev' into user_action
---
consumer/src/main/resources/application.yml | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/consumer/src/main/resources/application.yml b/consumer/src/main/resources/application.yml
index 4c7d0b5..67f0a82 100644
--- a/consumer/src/main/resources/application.yml
+++ b/consumer/src/main/resources/application.yml
@@ -38,7 +38,7 @@
redis:
host: 127.0.0.1
port: 6379
-# password: lilishop
+ # password: lilishop
lettuce:
pool:
# 杩炴帴姹犳渶澶ц繛鎺ユ暟锛堜娇鐢ㄨ礋鍊艰〃绀烘病鏈夐檺鍒讹級 榛樿 8
@@ -67,9 +67,9 @@
default-datasource:
type: com.alibaba.druid.pool.DruidDataSource
driverClassName: com.mysql.cj.jdbc.Driver
- 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&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
username: root
- password: 123456
+ password: 6c701c021355fc70fc156824e81fbead
maxActive: 20
initialSize: 5
maxWait: 60000
@@ -247,8 +247,8 @@
# account:
# username: elastic
# password: LiLiShopES
-# logstash:
-# server: 127.0.0.1:4560
+ # logstash:
+ # server: 127.0.0.1:4560
rocketmq:
promotion-topic: lili_promotion_topic
promotion-group: lili_promotion_group
@@ -284,6 +284,6 @@
appname: xxl-job-executor-lilishop
address:
ip:
- port: 8891
+ port: 8848
logpath: ./xxl-job/executor
logretentiondays: 7
--
Gitblit v1.8.0