From e4696e81051eb4b3e0800b9bc98cc09c42b0dc61 Mon Sep 17 00:00:00 2001
From: yeungchihang <842328916@qq.com>
Date: Wed, 9 Nov 2022 00:42:11 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=AC=E4=BC=9A=E4=BC=98=E5=8C=96-=E5=8A=A0?=
 =?UTF-8?q?=E5=85=A5=E5=AE=B6=E6=97=8F-=E5=8F=91=E9=80=81=E5=85=AC?=
 =?UTF-8?q?=E4=BC=9A=E6=B6=88=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../business/service/clan/ClanManageService.java         | 8 +++-----
 .../business/controller/clan/ClanManageController.java   | 2 +-
 .../src/main/resources/application-native.yml            | 9 +++++++--
 pom.xml                                                  | 6 +++---
 4 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/clan/ClanManageService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/clan/ClanManageService.java
index 50d078993..41177055d 100644
--- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/clan/ClanManageService.java
+++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/clan/ClanManageService.java
@@ -144,9 +144,9 @@ public class ClanManageService extends BaseService {
             if (record.getId() != null) {
                 applyBucket.set(link, 3L, TimeUnit.DAYS);
 
-                sendApplySysMsgToClanOwner(record.getId(), clan.getClanElderUid(), hallId);
+                sendApplySysMsgToClanOwner(record.getId(), clan.getClanElderUid(), uid);
             }
-        } catch (Exception e) {
+        } catch (InterruptedException e) {
             logger.error("apply clan join failed,uid={},clanId={},e={}", uid, clanId, e);
             throw new ServiceException(BusiStatus.SERVER_BUSY.getReasonPhrase(), e);
         } finally {
@@ -156,7 +156,6 @@ public class ClanManageService extends BaseService {
         }
     }
 
-    @Async
     public void sendApplySysMsgToClanOwner(Long recordId, Long clanOwnerId, Long hallOwnerId) {
         // 发送申请消息
         String url = Constant.ClanMessageUrl.DEAL_APPLY + recordId;
@@ -186,7 +185,6 @@ public class ClanManageService extends BaseService {
         sendSysMsgService.sendMsg(params);
     }
 
-    @Async
     public void sendApprovalSysMsgToHallOwner(Long hallOwnerId, Byte type, String clanName) {
         // 发送申请消息
         NeteaseSendMsgParam params = new NeteaseSendMsgParam();
@@ -294,7 +292,7 @@ public class ClanManageService extends BaseService {
                 //修改操作记录
                 this.updateOperateRecord(record, Constant.HallOperateStatus.AGREE);
                 //给申请者发送消息
-                sendApprovalSysMsgToHallOwner(hallOwner.getUid(), Constant.HallOperateStatus.REJECT, clan.getName());
+                sendApprovalSysMsgToHallOwner(hallOwner.getUid(), Constant.HallOperateStatus.AGREE, clan.getName());
 
             } else if (type.equals(Constant.ClanApproveType.REJECT)) {//拒绝
                 if (record.getType().equals(Constant.ClanOperateType.APPLY_CLAN)) {//拒绝申请加入模厅
diff --git a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/clan/ClanManageController.java b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/clan/ClanManageController.java
index c72bdd180..1e4ab2026 100644
--- a/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/clan/ClanManageController.java
+++ b/accompany-business/accompany-business-web/src/main/java/com/accompany/business/controller/clan/ClanManageController.java
@@ -39,7 +39,7 @@ public class ClanManageController extends BaseController {
      * 申请加入家族
      */
     @PostMapping("/apply")
-    @Authorization
+    //@Authorization
     public BusiResult<Void> applyClan(Long uid, Long clanId) {
         log.info("applyClan, uid={}, clanId={}", uid, clanId);
         if (uid == null || clanId == null) {
diff --git a/accompany-business/accompany-business-web/src/main/resources/application-native.yml b/accompany-business/accompany-business-web/src/main/resources/application-native.yml
index 041272834..e71bc2c85 100644
--- a/accompany-business/accompany-business-web/src/main/resources/application-native.yml
+++ b/accompany-business/accompany-business-web/src/main/resources/application-native.yml
@@ -50,9 +50,11 @@ spring:
         singleServerConfig:
           address: redis://118.194.255.128:6200
           password: anan@dev@redis@#!
+          connectionMinimumIdleSize: 16
+          timeout: 10000
         threads: 16
         nettyThreads: 32
-        codec: !<org.redisson.codec.MarshallingCodec> {}
+        codec: !<org.redisson.codec.JsonJacksonCodec> {}
         transportMode: "NIO"
 
 ##activemq 配置
@@ -71,4 +73,7 @@ elasticsearch:
   username: elastic
   password: xuanyin@es123
   roomIndex: yinyou_dev_room
-  userIndex: yinyou_dev_users_202204121516
\ No newline at end of file
+  userIndex: yinyou_dev_users_202204121516
+
+server:
+  port: 8081
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index cf180545b..076c8dbc6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -109,7 +109,7 @@
         <jackson-module-kotlin.version>2.9.7</jackson-module-kotlin.version>
         <jackson-mapper-asl.version>1.9.13</jackson-mapper-asl.version>
         <sud-mgp-auth-java.version>1.0.2</sud-mgp-auth-java.version>
-        <redisson.version>3.16.3</redisson.version>
+        <redisson.version>3.16.8</redisson.version>
         <kotlin.compiler.incremental>true</kotlin.compiler.incremental>
         <esayexcel.version>3.1.1</esayexcel.version>
     </properties>
@@ -1012,11 +1012,11 @@
             <artifactId>spring-boot-starter-data-redis</artifactId>
         </dependency>
 
-        <dependency>
+        <!--<dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-devtools</artifactId>
             <scope>runtime</scope>
-        </dependency>
+        </dependency>-->
 
         <dependency>
             <groupId>io.springfox</groupId>