From 35ec6d7485e1d7f871c471dae4ebec7876d9e8e6 Mon Sep 17 00:00:00 2001
From: yang <2119157836@qq.com>
Date: Fri, 14 Mar 2025 15:23:48 +0800
Subject: [PATCH] =?UTF-8?q?refactor(mcwl-admin):=20=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mcwl-admin/src/main/resources/application-dev.yml   | 13 +++++++------
 mcwl-admin/src/main/resources/application-druid.yml |  7 +++++++
 .../service/impl/MemberServiceImpl.java             |  2 +-
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/mcwl-admin/src/main/resources/application-dev.yml b/mcwl-admin/src/main/resources/application-dev.yml
index 74f414c..951b981 100644
--- a/mcwl-admin/src/main/resources/application-dev.yml
+++ b/mcwl-admin/src/main/resources/application-dev.yml
@@ -78,10 +78,11 @@ spring:
             multi-statement-allow: true
   # redis 配置
   redis:
-    # 地址
-    host: 1.13.246.108
+    # 地址 旧测试环境
+#    host: 113.45.9.111
+    host: 113.45.190.154
     # 端口，默认为6379
-    port: 6370
+    port: 6379
     # 数据库索引
     database: 0
     # 密码
@@ -144,11 +145,11 @@ mall:
       # 沙箱应用私钥
       privateKey: MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCQxmQGcaiKjOhayWi+zNTvpp8B5YT8jFFkjLzrD+W+T2Dwf2GfFR4p95zsCJxYeoLWdghMPA6/GMFrLbuVFpaEjuTm4icqA9N8n5d3W0j7gh+wMjZoqyJclAIeb09ut7rY6mWzilA9kWmZnUG7MOWIU70RVRYrfJectCFw/odM9lG4XIVe13X2h+1ecTQyQzLWmnvKFCfo7dQjE7fIYiWfud1ZGUneNs3u73pNWMB6ThGTTCbs0atcgM3fYOg3q7fTxIu9VcaUCJiJ/kNbL9sVEyOrSyx2f2o6w06zdEaOiQFsuDeS8QPYGMg7pf42wAfqCO6hqxQiQT5vp1hvB0o1AgMBAAECggEAIhaEYLwMSispXo8D2cES9iaOU/z91hUX6Qv2Q4anuqqoEZh8nN91Db6etTjFz1NxURvTklelxTsH97t56n26DRY0MWTYgd0Kw9Iz8MeOpKGb4nnAM97vpUq4QQBGfLRIC2ENdzu+7vA5JBFR88hsky/cWaNmJ/EbJauIIDneE7GigMR2HF7kfzdZzOBN4ZEh/ef5NKeCnEieRJJhWRgrgNXVZ44Tqi67AM7ey9pyUtBe7fgzxXtrWXBN9yKaVxxSXm3KJXFQqA6mcilFVZaxMNlAySc4MPTW8lq0ozOCOCunoeIphNz/OVIxGu3/voXFXlBfOKqOkYMVZxMY6OrvtQKBgQD0nIlXK4VW72VaGpz9kxQkRNzJV/yqaqet1GOSlPM2l0RCRFOVVdnvbQdHGPe6+HxHL1dh5MP8T/aHoP+4UXkkQCc8moS2FZxJvFH2QTSZBcSSdGL7GMpROqs38J+XlJzrhNcB20lrW6D7yMeQa4YEcXwdbD8Er/YaIqODBWYYewKBgQCXg+16RLDArciwwhf0TBWZPor2iYFDdwU5UPu7CKOhU1MLfQhG85gGpXHjB6G8cMUi/ezxh/FEl+sWOZegpkPwL5/BQS9tNYWIaC4kipPF/a5Up4DMYUHVAuuPwNqqXpvgU+rGjCns0wtPRnjrkghLkc3oTSID7o7pzUwIk2whDwKBgAys3+EIfExY82OL5X6uVGjcuKQmTw11oWK8krxRw5iclgjpCXu/ix+BAtOIU634mlgF9/02oYE9k4TLrvSaJDDgsifNyfq1e/fGLmkYT+VuCxWbulVQn4s+AwlPCrYMGWWK6KlL9638fYcOjGjLaZJpXwkXRtyzUYlhKh/r87JpAoGBAIavRp2mi/xrPvgpQQPv0k9L8llfOCHRnjoqC+thrZsNp8eRmJcBmMVnskofEZ2iHQuS71pw/n58EQTLo0ayJbhPjVJL8K3CovXzrfjbmqqoa5xi3bJQTiXdF6rMw1QpD6Uk05E1LVuQ6v/IZFr7kBYlAQWb8z3NhQq+bPU+nyLvAoGAGpBbSM8gPzdWQqkHoos0icu3cj0GhN3MU7+1Eb/rsXyh/lk5wtZTEnHjwhdUOUtwVNjvrv7CzA7unhOoaM6YcE/Zpd4zt8pjqH1Mhds7UHf4Xg+A+J4G6meYnhSwfBpOub02ncsqfBlXE0qhFv6AvcMewWndyLb8EYaUUXTYkG0=
       # 沙箱应用公钥证书
-      appCertPath: /opt/cert/dev/appPublicCert.crt
+      appCertPath: D:\dhy\mcwl-ai\mcwl-admin\src\main\resources\cert\dev\appPublicCert.crt
       # 沙箱支付宝公钥证书路径
-      alipayCertPath: /opt/cert/dev/alipayPublicCert.crt
+      alipayCertPath: D:\dhy\mcwl-ai\mcwl-admin\src\main\resources\cert\dev\alipayPublicCert.crt
       # 沙箱支付宝根证书路径
-      alipayRootCertPath: /opt/cert/dev/alipayRootCert.crt
+      alipayRootCertPath: D:\dhy\mcwl-ai\mcwl-admin\src\main\resources\cert\dev\alipayRootCert.crt
 #      # 沙箱应用公钥证书
 #      appCertPath: D:\workspace\mochuang\mcwl-ai\mcwl-admin\src\main\resources\cert\dev\alipayPublicCert.crt
 #      # 沙箱支付宝公钥证书路径
diff --git a/mcwl-admin/src/main/resources/application-druid.yml b/mcwl-admin/src/main/resources/application-druid.yml
index 2aa1bc4..e3714bf 100644
--- a/mcwl-admin/src/main/resources/application-druid.yml
+++ b/mcwl-admin/src/main/resources/application-druid.yml
@@ -157,4 +157,11 @@ huawei:
     upload:
       endPoint: obs.cn-south-1.myhuaweicloud.com
 
+mqtt:
+  broker-url: tcp://192.168.136.128:1883
+  client-id-prefix: emqx-client
+  connection-timeout: 30
+  keep-alive-interval: 60
+  max-reconnect-attempts: 5
+  clean-session: true
 
diff --git a/mcwl-memberCenter/src/main/java/com/mcwl/memberCenter/service/impl/MemberServiceImpl.java b/mcwl-memberCenter/src/main/java/com/mcwl/memberCenter/service/impl/MemberServiceImpl.java
index 44b35e9..dfe1121 100644
--- a/mcwl-memberCenter/src/main/java/com/mcwl/memberCenter/service/impl/MemberServiceImpl.java
+++ b/mcwl-memberCenter/src/main/java/com/mcwl/memberCenter/service/impl/MemberServiceImpl.java
@@ -94,7 +94,7 @@ public class MemberServiceImpl extends ServiceImpl<MemberMapper, Member> impleme
             // 设置会员开始时间和结束时间
             Calendar calendar = Calendar.getInstance();
             calendar.setTime(endDate);
-            calendar.add(Calendar.DAY_OF_MONTH, 1);
+//            calendar.add(Calendar.DAY_OF_MONTH, 1);
             member.setStartDate(calendar.getTime());
             member.setEndDate(this.getEndDate(memberLevel.getSubscriptionPeriod(), calendar));
         } else {