Merge pull request '🐛 Fix a bug.' (#66) from hotfix into main

Reviewed-on: https://gitee.ltd/lxh/go-wxhelper/pulls/66

app/friend.go

@@ -19,8 +19,8 @@ type changeStatusParam struct {
 // changeUseAiModelParam
 // @description: 修改使用的AI模型用的参数集
 type changeUseAiModelParam struct {
-	WxId  string `json:"wxid" binding:"required"`  // 群Id或微信Id
-	Model string `json:"model" binding:"required"` // 模型代码
+	WxId  string `json:"wxid" binding:"required"` // 群Id或微信Id
+	Model string `json:"model"`                   // 模型代码
 }
 
 // autoClearMembers

config.yaml

@@ -1,4 +1,7 @@
 system:
+  # 每日新闻接口 Token
+  # 获取地址: https://admin.alapi.cn/api_manager/token_manager
+  alApiToken: xxx
   # 添加新好友或群之后通知给指定的人
   newFriendNotify:
     enable: true

config/system.go

@@ -2,6 +2,7 @@ package config
 
 // 系统配置
 type system struct {
+	AlApiToken      string          `json:"alApiToken" yaml:"alApiToken"`           // AL API Token
 	NewFriendNotify newFriendNotify `json:"newFriendNotify" yaml:"newFriendNotify"` // 新好友通知
 	DefaultRule     defaultRule     `json:"defaultRule" yaml:"defaultRule"`         // 默认规则
 }

tasks/cleargroupuser/cleargroupuser.go

@@ -38,7 +38,7 @@ func ClearGroupUser() {
 			memberMap[member.Nickname] = member.LastActive.Format("2006-01-02 15:04:05")
 		}
 		// 调用接口
-		utils.DeleteGroupMember(group.Wxid, strings.Join(deleteIds, ","), 0)
+		utils.DeleteGroupMember(group.Wxid, strings.Join(deleteIds, ","), 0, false)
 		// 发送通知到群里
 		ms := make([]string, 0)
 		for k, v := range memberMap {

utils/news.go

@@ -2,6 +2,7 @@ package utils
 
 import (
 	"github.com/go-resty/resty/v2"
+	"go-wechat/config"
 	"go-wechat/model"
 	"log"
 )
@@ -33,7 +34,7 @@ func (news) MorningPost() (records []string) {
 	res := resty.New()
 	resp, err := res.R().
 		SetHeader("Content-Type", "application/json;chartset=utf-8").
-		SetQueryParam("token", "cFoMZNNBxT4jQovS").
+		SetQueryParam("token", config.Conf.System.AlApiToken).
 		SetResult(&newsResp).
 		Post("https://v2.alapi.cn/api/zaobao")
 	if err != nil {

utils/send.go

@@ -126,7 +126,9 @@ func SendEmotion(toId, emotionHash string, retryCount int) {
 // @description: 删除群成员
 // @param chatRoomId 群Id
 // @param memberIds 成员id,用','分隔
-func DeleteGroupMember(chatRoomId, memberIds string, retryCount int) {
+// @param retryCount 重试次数
+// @param isSure 是否确认删除
+func DeleteGroupMember(chatRoomId, memberIds string, retryCount int, isSure bool) {
 	if retryCount > 5 {
 		log.Printf("重试五次失败，停止发送")
 		return
@@ -148,9 +150,11 @@ func DeleteGroupMember(chatRoomId, memberIds string, retryCount int) {
 		log.Printf("删除群成员失败: %s", err.Error())
 		// 休眠五秒后重新发送
 		time.Sleep(5 * time.Second)
-		DeleteGroupMember(chatRoomId, memberIds, retryCount+1)
+		DeleteGroupMember(chatRoomId, memberIds, retryCount+1, isSure)
 	}
-	log.Printf("删除群成员结果: %s", resp.String())
+	log.Printf("[%s]删除群成员结果: %s", chatRoomId, resp.String())
 	// 这个逼接口要调用两次，第一次调用成功，第二次调用才会真正删除
-	DeleteGroupMember(chatRoomId, memberIds, 5)
+	if !isSure {
+		DeleteGroupMember(chatRoomId, memberIds, 5, true)
+	}
 }

views/group.html

@@ -119,7 +119,7 @@
               </div>
               <!-- 指令 -->
               <div class="flex justify-between gap-x-4 py-3 items-center">
-                <dt class="text-gray-500">迎新</dt>
+                <dt class="text-gray-500">指令</dt>
                 <dd class="flex items-start gap-x-2">
                   {{ template "command" . }}
                 </dd>
@@ -128,7 +128,7 @@
               <div class="flex justify-between gap-x-4 py-3 items-center">
                 <dt class="text-gray-500">末位淘汰</dt>
                 <dd class="flex items-start gap-x-2 items-center">
-                  <div class="relative rounded-md shadow-sm">
+                  <div class="relative rounded-md">
                     <label>
                       <input type="number" id="auto-cm-{{ .Wxid }}" min="0" class="block w-1/2 float-end rounded-md border-0 py-1.5 text-gray-900 shadow-sm ring-1 ring-inset ring-gray-300 placeholder:text-gray-400 focus:ring-2 focus:ring-inset focus:ring-indigo-600 sm:text-sm sm:leading-6" placeholder="N天不活跃自动移除"
                              value="{{.ClearMember}}"