From 2fd1a4ef34a1b1cc643b30ab20a071c93243e851 Mon Sep 17 00:00:00 2001
From: chenweijian <820961417@qq.com>
Date: Thu, 30 Mar 2023 10:47:31 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A7=E6=8E=A5=E5=8F=A3=E5=B1=8F=E8=94=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 route/group_power_r/group_power.go | 61 +++++++++++++++---------------
 1 file changed, 31 insertions(+), 30 deletions(-)

diff --git a/route/group_power_r/group_power.go b/route/group_power_r/group_power.go
index e0a9d1e..8210c14 100644
--- a/route/group_power_r/group_power.go
+++ b/route/group_power_r/group_power.go
@@ -53,37 +53,38 @@ import (
 // @Router /v1/groupPower/user [post]
 func GroupPowerJoin(c *gin.Context) (*mycontext.MyContext, error) {
 	myContext := mycontext.CreateMyContext(c.Keys)
+	return myContext, bizerr.UpgradeRequired
 	// 旧版本(3.5.0以下)，提示升级
-	_, major, minor, _, err := req.GetAppVersion(c)
-	if err != nil {
-		return myContext, err
-	}
-	if major <= 3 && minor < 5 {
-		return myContext, bizerr.UpgradeRequired
-	}
-
-	groupPowerId, err := strconv.ParseUint(c.PostForm("groupPowerId"), 10, 64)
-	if err != nil {
-		return myContext, err
-	}
-	//获取用户
-	userId, err := req.GetUserId(c)
-	if err != nil {
-		return myContext, err
-	}
-
-	// Aoxi要求不能让这些人加入家族
-	banUserMap := map[uint64]bool{251: true, 1384611: true, 4223511: true, 4338751: true, 4339471: true, 4339541: true,
-		4354581: true, 6541: true, 23971: true}
-	if _, ok := banUserMap[userId]; ok {
-		return myContext, bizerr.GroupPowerCannotJoin
-	}
-
-	if err := group_power_s.NewGroupPowerService(myContext).GroupPowerUserJoin(groupPowerId, userId); err != nil {
-		return myContext, err
-	}
-	resp.ResponseOk(c, nil)
-	return myContext, nil
+	//_, major, minor, _, err := req.GetAppVersion(c)
+	//if err != nil {
+	//	return myContext, err
+	//}
+	//if major <= 3 && minor < 5 {
+	//	return myContext, bizerr.UpgradeRequired
+	//}
+	//
+	//groupPowerId, err := strconv.ParseUint(c.PostForm("groupPowerId"), 10, 64)
+	//if err != nil {
+	//	return myContext, err
+	//}
+	////获取用户
+	//userId, err := req.GetUserId(c)
+	//if err != nil {
+	//	return myContext, err
+	//}
+	//
+	//// Aoxi要求不能让这些人加入家族
+	//banUserMap := map[uint64]bool{251: true, 1384611: true, 4223511: true, 4338751: true, 4339471: true, 4339541: true,
+	//	4354581: true, 6541: true, 23971: true}
+	//if _, ok := banUserMap[userId]; ok {
+	//	return myContext, bizerr.GroupPowerCannotJoin
+	//}
+	//
+	//if err := group_power_s.NewGroupPowerService(myContext).GroupPowerUserJoin(groupPowerId, userId); err != nil {
+	//	return myContext, err
+	//}
+	//resp.ResponseOk(c, nil)
+	//return myContext, nil
 }
 
 // @Tags 国家势力
-- 
2.22.0