Merge remote-tracking branch 'origin/master'

fs-service/src/main/java/com/fs/his/service/impl/FsStoreAfterSalesServiceImpl.java

@@ -762,7 +762,7 @@ public class FsStoreAfterSalesServiceImpl implements IFsStoreAfterSalesService {
         fsStoreAfterSalesLogsMapper.insertFsStoreAfterSalesLogs(logs);
         fsStoreOrderLogsService.create(order.getOrderId(), FsStoreOrderLogEnum.REFUND_ORDER_APPLY.getValue(),
                 FsStoreOrderLogEnum.REFUND_ORDER_APPLY.getDesc());
-        if (order.getExtendOrderId() != null) {
+        if (order.getExtendOrderId() != null && !"".equals(order.getExtendOrderId())) {
             ErpRefundUpdateRequest request = new ErpRefundUpdateRequest();
             request.setTid(order.getOrderCode());
             request.setOid(order.getOrderCode());

fs-service/src/main/java/com/fs/hisStore/service/impl/FsStoreOrderScrmServiceImpl.java

@@ -2239,11 +2239,19 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService {
         }
         erpOrder.setDetails(details);
         erpOrder.setReceiver_name(order.getRealName());
-        if (order.getUserPhone().length() > 11) {
-            erpOrder.setReceiver_phone(order.getUserPhone());
+        //2025.6.27 金牛要求erp推送电话可以设置默认 不影响其他推送
+        String phone = null;
+        if (CloudHostUtils.hasCloudHostName("康年堂") && StringUtils.isNotBlank(order.getErpPhone())) {
+            phone = order.getErpPhone();
         } else {
-            erpOrder.setReceiver_mobile(order.getUserPhone());
+            phone = order.getUserPhone();
         }
+        if (phone.length() > 11) {
+            erpOrder.setReceiver_phone(phone);
+        } else {
+            erpOrder.setReceiver_mobile(phone);
+        }
+
         String[] address = order.getUserAddress().split(" ");
         erpOrder.setReceiver_province(address[0]);
         erpOrder.setReceiver_city(address[1]);

fs-service/src/main/java/com/fs/wxcid/dto/admin/GenAuthKey3Request.java

@@ -5,9 +5,11 @@ import lombok.Data;
 
 @Data
 public class GenAuthKey3Request {
+    //要生成 AuthKey 的个数; Count小于1默认设置为1
     @JsonProperty("Count")
     private Integer Count;
 
+    //类型 1日 7 周 30月 90季 180 半年 365年 30000永久（数字为标识，非准确天数）
     @JsonProperty("Type")
     private Integer Type;
 }

fs-service/src/main/java/com/fs/wxcid/service/FriendService.java

@@ -10,7 +10,7 @@ import com.fs.wxcid.dto.friend.*;
  * <p>
  * 本接口封装了微信私有协议中 /friend 路径下的所有好友相关操作，
  * 包括：添加/同意好友、删除好友、查询联系人、搜索、上传通讯录等。
- * 所有方法均需传入账号唯一标识 key，并返回统一格式的 ApiResponse。
+ * 所有方法均需传入账号唯一标识 authKey，并返回统一格式的 ApiResponse。
  * </p>
  */
 public interface FriendService {
@@ -22,11 +22,11 @@ public interface FriendService {
      * 通常用于处理来自他人的加好友申请，需提供 V3/V4 等加密参数。
      * </p>
      *
-     * @param key    账号唯一标识（query 参数）
+     * @param authKey    账号唯一标识（query 参数）
      * @param request 同意请求参数（包含 V3、V4、Scene 等）
      * @return 统一响应结果
      */
-    ApiResponse agreeAdd(String key, AgreeAddRequest request);
+    ApiResponse agreeAdd(String authKey, AgreeAddRequest request);
 
     /**
      * 删除好友
@@ -35,11 +35,11 @@ public interface FriendService {
      * 从联系人列表中移除指定用户。
      * </p>
      *
-     * @param key    账号唯一标识
+     * @param authKey    账号唯一标识
      * @param request 删除请求参数（含 DelUserName）
      * @return 统一响应结果
      */
-    ApiResponse delContact(String key, DelContactRequest request);
+    ApiResponse delContact(String authKey, DelContactRequest request);
 
     /**
      * 批量获取联系人详细信息
@@ -48,11 +48,11 @@ public interface FriendService {
      * 可同时查询多个用户或群聊的详细资料。
      * </p>
      *
-     * @param key    账号唯一标识
+     * @param authKey    账号唯一标识
      * @param request 查询参数（支持 UserNames 和 RoomWxIDList）
      * @return 统一响应结果
      */
-    ApiResponse getContactDetailsList(String key, GetContactDetailsListRequest request);
+    ApiResponse getContactDetailsList(String authKey, GetContactDetailsListRequest request);
 
     /**
      * 分页获取全部联系人（包括好友和群聊）
@@ -61,11 +61,11 @@ public interface FriendService {
      * 通过序列号实现分页加载，避免一次性拉取过多数据。
      * </p>
      *
-     * @param key    账号唯一标识
+     * @param authKey    账号唯一标识
      * @param request 分页参数（CurrentWxcontactSeq / CurrentChatRoomContactSeq）
      * @return 统一响应结果
      */
-    ApiResponse getContactList(String key, GetContactListRequest request);
+    ApiResponse getContactList(String authKey, GetContactListRequest request);
 
     /**
      * 查询与指定用户的好友关系状态
@@ -74,11 +74,11 @@ public interface FriendService {
      * 可判断是否为单向/双向好友、是否被拉黑等。
      * </p>
      *
-     * @param key    账号唯一标识
+     * @param authKey    账号唯一标识
      * @param request 目标用户名（UserName）
      * @return 统一响应结果（含关系状态码）
      */
-    ApiResponse getFriendRelation(String key, GetFriendRelationRequest request);
+    ApiResponse getFriendRelation(String authKey, GetFriendRelationRequest request);
 
     /**
      * 获取已关注的公众号列表
@@ -87,10 +87,10 @@ public interface FriendService {
      * 返回当前账号关注的所有公众号信息。
      * </p>
      *
-     * @param key 账号唯一标识
+     * @param authKey 账号唯一标识
      * @return 统一响应结果
      */
-    ApiResponse getGHList(String key);
+    ApiResponse getGHList(String authKey);
 
     /**
      * 获取手机通讯录中匹配的微信好友
@@ -99,10 +99,10 @@ public interface FriendService {
      * 需提前上传通讯录（UploadMContact），否则可能返回空。
      * </p>
      *
-     * @param key 账号唯一标识
+     * @param authKey 账号唯一标识
      * @return 统一响应结果
      */
-    ApiResponse getMFriend(String key);
+    ApiResponse getMFriend(String authKey);
 
     /**
      * 获取已保存的群聊列表
@@ -111,10 +111,10 @@ public interface FriendService {
      * 返回当前账号参与并保存的所有群聊。
      * </p>
      *
-     * @param key 账号唯一标识
+     * @param authKey 账号唯一标识
      * @return 统一响应结果
      */
-    ApiResponse getGroupList(String key);
+    ApiResponse getGroupList(String authKey);
 
     /**
      * 搜索联系人
@@ -123,11 +123,11 @@ public interface FriendService {
      * 支持按昵称、微信号、手机号等模糊搜索。
      * </p>
      *
-     * @param key    账号唯一标识
+     * @param authKey    账号唯一标识
      * @param request 搜索参数（UserName + 场景配置）
      * @return 统一响应结果
      */
-    ApiResponse searchContact(String key, SearchContactRequest request);
+    ApiResponse searchContact(String authKey, SearchContactRequest request);
 
     /**
      * 上传手机通讯录用于匹配微信好友
@@ -136,11 +136,11 @@ public interface FriendService {
      * 上传后可调用 GetMFriend 获取匹配结果。
      * </p>
      *
-     * @param key    账号唯一标识
+     * @param authKey    账号唯一标识
      * @param request 通讯录号码列表（MobileList）
      * @return 统一响应结果
      */
-    ApiResponse uploadMContact(String key, UploadMContactRequest request);
+    ApiResponse uploadMContact(String authKey, UploadMContactRequest request);
 
     /**
      * 发起好友验证或添加请求
@@ -150,9 +150,9 @@ public interface FriendService {
      * 若无 V3/V4，部分场景可能无法添加。
      * </p>
      *
-     * @param key    账号唯一标识
+     * @param authKey    账号唯一标识
      * @param request 添加请求参数（含 V3、V4、Scene、验证语等）
      * @return 统一响应结果
      */
-    ApiResponse verifyUser(String key, VerifyUserRequest request);
+    ApiResponse verifyUser(String authKey, VerifyUserRequest request);
 }

fs-service/src/main/java/com/fs/wxcid/service/LoginService.java

@@ -12,28 +12,28 @@ import com.fs.wxcid.dto.login.VerifyCodeRequest;
 public interface LoginService {
 
     // —————— 账号密码 / 62 / A16 登录 ——————
-    ApiResponse a16Login(String key, LoginRequest request);
-    ApiResponse deviceLogin(String key, LoginRequest request);
+    ApiResponse a16Login(String authKey, LoginRequest request);
+    ApiResponse deviceLogin(String authKey, LoginRequest request);
 
     // —————— 二维码登录（iPad / Mac / 车载） ——————
-    ApiResponse getLoginQrCodeNew(String key, QrCodeRequest request);// iPad
-    ApiResponse getLoginQrCodeNewDirect(String key, QrCodeRequest request); // 直登
-    ApiResponse macLogin(String key, QrCodeRequest request);// Mac
-    ApiResponse carLogin(String key, QrCodeRequest request);// iPad
+    ApiResponse getLoginQrCodeNew(String authKey, QrCodeRequest request);// iPad
+    ApiResponse getLoginQrCodeNewDirect(String authKey, QrCodeRequest request); // 直登
+    ApiResponse macLogin(String authKey, QrCodeRequest request);// Mac
+    ApiResponse carLogin(String authKey, QrCodeRequest request);// iPad
 
     // ------------------ 状态检测 ------------------
-    ApiResponse checkCanSetAlias(String key);// 检测是否可设昵称（判断登录环境）
-    ApiResponse checkLoginStatus(String key);// 检测扫码是否完成
-    ApiResponse getLoginStatus(String key);// 获取当前在线状态
+    ApiResponse checkCanSetAlias(String authKey);// 检测是否可设昵称（判断登录环境）
+    ApiResponse checkLoginStatus(String authKey);// 检测扫码是否完成
+    ApiResponse getLoginStatus(String authKey);// 获取当前在线状态
 
     // —————— 数据管理 ——————
-    ApiResponse get62Data(String key);            // 提取 62 数据（用于免密登录）
+    ApiResponse get62Data(String authKey);            // 提取 62 数据（用于免密登录）
 
     // —————— 验证码与滑块 ——————
-    ApiResponse verifyCode(String key, VerifyCodeRequest request);
-    ApiResponse verifyCodeSlide(String key, SlideVerifyRequest request);
+    ApiResponse verifyCode(String authKey, VerifyCodeRequest request);
+    ApiResponse verifyCodeSlide(String authKey, SlideVerifyRequest request);
 
     // —————— 控制 ——————
-    ApiResponse wakeUpLogin(String key, QrCodeRequest request); // 唤醒扫码登录
-    ApiResponse logOut(String key);                // 退出登录
+    ApiResponse wakeUpLogin(String authKey, QrCodeRequest request); // 唤醒扫码登录
+    ApiResponse logOut(String authKey);                // 退出登录
 }

fs-service/src/main/java/com/fs/wxcid/service/MessageCallbackService.java

@@ -20,28 +20,28 @@ public interface MessageCallbackService {
      * 设置消息回调地址并启用/禁用推送
      * <p>对应接口：POST /message/SetCallback</p>
      *
-     * @param key     账号唯一标识
+     * @param authKey     账号唯一标识
      * @param config 回调配置（URL + 启用状态）
      * @return 统一响应结果
      */
-    ApiResponse setCallback(String key, CallbackConfigRequest config);
+    ApiResponse setCallback(String authKey, CallbackConfigRequest config);
 
     /**
      * 获取当前账号的消息回调配置
      * <p>对应接口：GET /message/GetCallback</p>
      *
-     * @param key 账号唯一标识
+     * @param authKey 账号唯一标识
      * @return 包含 CallbackURL 和 Enabled 状态的响应
      */
-    ApiResponse getCallback(String key);
+    ApiResponse getCallback(String authKey);
 
     /**
      * 删除（清空）消息回调配置
      * <p>执行后将不再推送任何消息到原回调地址</p>
      * <p>对应接口：GET /message/DeleteCallback</p>
      *
-     * @param key 账号唯一标识
+     * @param authKey 账号唯一标识
      * @return 操作结果
      */
-    ApiResponse deleteCallback(String key);
+    ApiResponse deleteCallback(String authKey);
 }

fs-service/src/main/java/com/fs/wxcid/service/MessageService.java

@@ -7,26 +7,26 @@ import com.fs.wxcid.dto.message.*;
 
 public interface MessageService {
 
-    ApiResponse addMessageMgr(String key, AddMessageMgrRequest request);
-    ApiResponse cdnUploadVideo(String key, CdnUploadVideoRequest request);
-    ApiResponse downloadEmojiGif(String key, DownloadEmojiGifRequest request);
-    ApiResponse forwardEmoji(String key, ForwardEmojiRequest request);
-    ApiResponse forwardImageMessage(String key, ForwardImageMessageRequest request);
-    ApiResponse forwardVideoMessage(String key, ForwardVideoMessageRequest request);
-    ApiResponse getMsgBigImg(String key, GetMsgBigImgRequest request);
-    ApiResponse getMsgVideo(String key, GetMsgVideoRequest request);
-    ApiResponse getMsgVoice(String key, GetMsgVoiceRequest request);
-    ApiResponse groupMassMsgImage(String key, GroupMassMsgImageRequest request);
-    ApiResponse groupMassMsgText(String key, GroupMassMsgTextRequest request);
-    ApiResponse httpSyncMsg(String key, HttpSyncMsgRequest request);
-    ApiResponse newSyncHistoryMessage(String key); // 无 body
-    ApiResponse revokeMsg(String key, RevokeMsgRequest request);
-    ApiResponse revokeMsgNew(String key, RevokeMsgNewRequest request);
-    ApiResponse sendAppMessage(String key, SendAppMessageRequest request);
-    ApiResponse sendEmojiMessage(String key, SendEmojiMessageRequest request);
-    ApiResponse sendImageMessage(String key, SendImageMessageRequest request);
-    ApiResponse sendImageNewMessage(String key, SendImageNewMessageRequest request);
-    ApiResponse sendTextMessage(String key, SendTextMessageRequest request);
-    ApiResponse sendVoice(String key, SendVoiceRequest request);
-    ApiResponse shareCardMessage(String key, ShareCardMessageRequest request);
+    ApiResponse addMessageMgr(String authKey, AddMessageMgrRequest request);
+    ApiResponse cdnUploadVideo(String authKey, CdnUploadVideoRequest request);
+    ApiResponse downloadEmojiGif(String authKey, DownloadEmojiGifRequest request);
+    ApiResponse forwardEmoji(String authKey, ForwardEmojiRequest request);
+    ApiResponse forwardImageMessage(String authKey, ForwardImageMessageRequest request);
+    ApiResponse forwardVideoMessage(String authKey, ForwardVideoMessageRequest request);
+    ApiResponse getMsgBigImg(String authKey, GetMsgBigImgRequest request);
+    ApiResponse getMsgVideo(String authKey, GetMsgVideoRequest request);
+    ApiResponse getMsgVoice(String authKey, GetMsgVoiceRequest request);
+    ApiResponse groupMassMsgImage(String authKey, GroupMassMsgImageRequest request);
+    ApiResponse groupMassMsgText(String authKey, GroupMassMsgTextRequest request);
+    ApiResponse httpSyncMsg(String authKey, HttpSyncMsgRequest request);
+    ApiResponse newSyncHistoryMessage(String authKey); // 无 body
+    ApiResponse revokeMsg(String authKey, RevokeMsgRequest request);
+    ApiResponse revokeMsgNew(String authKey, RevokeMsgNewRequest request);
+    ApiResponse sendAppMessage(String authKey, SendAppMessageRequest request);
+    ApiResponse sendEmojiMessage(String authKey, SendEmojiMessageRequest request);
+    ApiResponse sendImageMessage(String authKey, SendImageMessageRequest request);
+    ApiResponse sendImageNewMessage(String authKey, SendImageNewMessageRequest request);
+    ApiResponse sendTextMessage(String authKey, SendTextMessageRequest request);
+    ApiResponse sendVoice(String authKey, SendVoiceRequest request);
+    ApiResponse shareCardMessage(String authKey, ShareCardMessageRequest request);
 }

fs-service/src/main/java/com/fs/wxcid/service/impl/FriendServiceImpl.java

@@ -22,58 +22,58 @@ public class FriendServiceImpl implements FriendService {
 
 
     @Override
-    public ApiResponse agreeAdd(String key, AgreeAddRequest request) {
-        return post("/friend/AgreeAdd", key, request);
+    public ApiResponse agreeAdd(String authKey, AgreeAddRequest request) {
+        return post("/friend/AgreeAdd", authKey, request);
     }
 
     @Override
-    public ApiResponse delContact(String key, DelContactRequest request) {
-        return post("/friend/DelContact", key, request);
+    public ApiResponse delContact(String authKey, DelContactRequest request) {
+        return post("/friend/DelContact", authKey, request);
     }
 
     @Override
-    public ApiResponse getContactDetailsList(String key, GetContactDetailsListRequest request) {
-        return post("/friend/GetContactDetailsList", key, request);
+    public ApiResponse getContactDetailsList(String authKey, GetContactDetailsListRequest request) {
+        return post("/friend/GetContactDetailsList", authKey, request);
     }
 
     @Override
-    public ApiResponse getContactList(String key, GetContactListRequest request) {
-        return post("/friend/GetContactList", key, request);
+    public ApiResponse getContactList(String authKey, GetContactListRequest request) {
+        return post("/friend/GetContactList", authKey, request);
     }
 
     @Override
-    public ApiResponse getFriendRelation(String key, GetFriendRelationRequest request) {
-        return post("/friend/GetFriendRelation", key, request);
+    public ApiResponse getFriendRelation(String authKey, GetFriendRelationRequest request) {
+        return post("/friend/GetFriendRelation", authKey, request);
     }
 
     @Override
-    public ApiResponse getGHList(String key) {
-        return get("/friend/GetGHList", key);
+    public ApiResponse getGHList(String authKey) {
+        return get("/friend/GetGHList", authKey);
     }
 
     @Override
-    public ApiResponse getMFriend(String key) {
-        return get("/friend/GetMFriend", key);
+    public ApiResponse getMFriend(String authKey) {
+        return get("/friend/GetMFriend", authKey);
     }
 
     @Override
-    public ApiResponse getGroupList(String key) {
-        return get("/friend/GroupList", key);
+    public ApiResponse getGroupList(String authKey) {
+        return get("/friend/GroupList", authKey);
     }
 
     @Override
-    public ApiResponse searchContact(String key, SearchContactRequest request) {
-        return post("/friend/SearchContact", key, request);
+    public ApiResponse searchContact(String authKey, SearchContactRequest request) {
+        return post("/friend/SearchContact", authKey, request);
     }
 
     @Override
-    public ApiResponse uploadMContact(String key, UploadMContactRequest request) {
-        return post("/friend/UploadMContact", key, request);
+    public ApiResponse uploadMContact(String authKey, UploadMContactRequest request) {
+        return post("/friend/UploadMContact", authKey, request);
     }
 
     @Override
-    public ApiResponse verifyUser(String key, VerifyUserRequest request) {
-        return post("/friend/VerifyUser", key, request);
+    public ApiResponse verifyUser(String authKey, VerifyUserRequest request) {
+        return post("/friend/VerifyUser", authKey, request);
     }
 
     // ------------------ 工具方法 ------------------
@@ -81,12 +81,12 @@ public class FriendServiceImpl implements FriendService {
      * 通用 POST 请求方法
      *
      * @param path   接口路径，如 "/friend/AgreeAdd"
-     * @param key    账号唯一标识（query 参数）
+     * @param authKey    账号唯一标识（query 参数）
      * @param request 请求体对象
      * @return 统一响应结果
      */
-    private ApiResponse post(String path, String key, Object request) {
-        String url = BASE_URL + path + "?key=" + key;
+    private ApiResponse post(String path, String authKey, Object request) {
+        String url = BASE_URL + path + "?key=" + authKey;
         return WxWorkHttpUtil.postWithType(url, request, new TypeReference<ApiResponse>() {});
     }
 
@@ -94,13 +94,13 @@ public class FriendServiceImpl implements FriendService {
      * 通用 GET 请求方法（无请求体）
      *
      * @param path 接口路径
-     * @param key  账号唯一标识
+     * @param authKey  账号唯一标识
      * @return 统一响应结果
      */
-    private ApiResponse get(String path, String key) {
+    private ApiResponse get(String path, String authKey) {
         String url = BASE_URL + path;
         Map<String, Object> params = new HashMap<>();
-        params.put("key", key);
+        params.put("authKey", authKey);
         String resp = WxWorkHttpUtil.get(url, params);
         return com.alibaba.fastjson.JSON.parseObject(resp, ApiResponse.class);
     }

fs-service/src/main/java/com/fs/wxcid/service/impl/LoginServiceImpl.java

@@ -20,66 +20,66 @@ public class LoginServiceImpl implements LoginService {
 
     // ------------------ 账号密码登录 ------------------
 
-    public ApiResponse a16Login(String key, LoginRequest request) {
-        return post("/login/A16Login", key, request);
+    public ApiResponse a16Login(String authKey, LoginRequest request) {
+        return post("/login/A16Login", authKey, request);
     }
 
-    public ApiResponse deviceLogin(String key, LoginRequest request) {
-        return post("/login/DeviceLogin", key, request);
+    public ApiResponse deviceLogin(String authKey, LoginRequest request) {
+        return post("/login/DeviceLogin", authKey, request);
     }
 
     // ------------------ 二维码登录 ------------------
 
-    public ApiResponse getLoginQrCodeNew(String key, QrCodeRequest request) {
-        return post("/login/GetLoginQrCodeNew", key, request);
+    public ApiResponse getLoginQrCodeNew(String authKey, QrCodeRequest request) {
+        return post("/login/GetLoginQrCodeNew", authKey, request);
     }
 
-    public ApiResponse getLoginQrCodeNewDirect(String key, QrCodeRequest request) {
-        return post("/login/GetLoginQrCodeNewDirect", key, request);
+    public ApiResponse getLoginQrCodeNewDirect(String authKey, QrCodeRequest request) {
+        return post("/login/GetLoginQrCodeNewDirect", authKey, request);
     }
 
-    public ApiResponse macLogin(String key, QrCodeRequest request) {
-        return post("/login/MacLogin", key, request);
+    public ApiResponse macLogin(String authKey, QrCodeRequest request) {
+        return post("/login/MacLogin", authKey, request);
     }
 
-    public ApiResponse carLogin(String key, QrCodeRequest request) {
-        return post("/login/CarLogin", key, request);
+    public ApiResponse carLogin(String authKey, QrCodeRequest request) {
+        return post("/login/CarLogin", authKey, request);
     }
 
-    public ApiResponse wakeUpLogin(String key, QrCodeRequest request) {
-        return post("/login/WakeUpLogin", key, request);
+    public ApiResponse wakeUpLogin(String authKey, QrCodeRequest request) {
+        return post("/login/WakeUpLogin", authKey, request);
     }
 
     // ------------------ 状态检测 ------------------
 
-    public ApiResponse checkCanSetAlias(String key) {
-        return get("/login/CheckCanSetAlias", key);
+    public ApiResponse checkCanSetAlias(String authKey) {
+        return get("/login/CheckCanSetAlias", authKey);
     }
 
-    public ApiResponse checkLoginStatus(String key) {
-        return get("/login/CheckLoginStatus", key);
+    public ApiResponse checkLoginStatus(String authKey) {
+        return get("/login/CheckLoginStatus", authKey);
     }
 
-    public ApiResponse getLoginStatus(String key) {
-        return get("/login/GetLoginStatus", key);
+    public ApiResponse getLoginStatus(String authKey) {
+        return get("/login/GetLoginStatus", authKey);
     }
 
-    public ApiResponse get62Data(String key) {
-        return get("/login/Get62Data", key);
+    public ApiResponse get62Data(String authKey) {
+        return get("/login/Get62Data", authKey);
     }
 
-    public ApiResponse logOut(String key) {
-        return get("/login/LogOut", key);
+    public ApiResponse logOut(String authKey) {
+        return get("/login/LogOut", authKey);
     }
 
     // ------------------ 验证 ------------------
 
-    public ApiResponse verifyCode(String key, VerifyCodeRequest request) {
-        return post("/login/VerifyCode", key, request);
+    public ApiResponse verifyCode(String authKey, VerifyCodeRequest request) {
+        return post("/login/VerifyCode", authKey, request);
     }
 
-    public ApiResponse verifyCodeSlide(String key, SlideVerifyRequest request) {
-        return post("/login/VerifyCodeSlide", key, request);
+    public ApiResponse verifyCodeSlide(String authKey, SlideVerifyRequest request) {
+        return post("/login/VerifyCodeSlide", authKey, request);
     }
 
     // ------------------ 工具方法 ------------------
@@ -87,12 +87,12 @@ public class LoginServiceImpl implements LoginService {
      * 通用 POST 请求方法
      *
      * @param path   接口路径，如 "/friend/AgreeAdd"
-     * @param key    账号唯一标识（query 参数）
+     * @param authKey    账号唯一标识（query 参数）
      * @param request 请求体对象
      * @return 统一响应结果
      */
-    private ApiResponse post(String path, String key, Object request) {
-        String url = BASE_URL + path + "?key=" + key;
+    private ApiResponse post(String path, String authKey, Object request) {
+        String url = BASE_URL + path + "?key=" + authKey;
         return WxWorkHttpUtil.postWithType(url, request, new TypeReference<ApiResponse>() {});
     }
 
@@ -100,13 +100,13 @@ public class LoginServiceImpl implements LoginService {
      * 通用 GET 请求方法（无请求体）
      *
      * @param path 接口路径
-     * @param key  账号唯一标识
+     * @param authKey  账号唯一标识
      * @return 统一响应结果
      */
-    private ApiResponse get(String path, String key) {
+    private ApiResponse get(String path, String authKey) {
         String url = BASE_URL + path;
         Map<String, Object> params = new HashMap<>();
-        params.put("key", key);
+        params.put("authKey", authKey);
         String resp = WxWorkHttpUtil.get(url, params);
         return com.alibaba.fastjson.JSON.parseObject(resp, ApiResponse.class);
     }

fs-service/src/main/java/com/fs/wxcid/service/impl/MessageCallbackServiceImpl.java

@@ -20,8 +20,8 @@ public class MessageCallbackServiceImpl implements MessageCallbackService {
 
     @Override
     public ReturnMessage returnMessage(Map<String, Object> callback) {
-        // 安全地获取 key
-        String key = (String) callback.get("key");
+        // 安全地获取 authKey
+        String authKey = (String) callback.get("authKey");
 
         // 获取 message 子对象（也是一个 Map）
         Map<String, Object> message = (Map<String, Object>) callback.get("message");
@@ -45,22 +45,22 @@ public class MessageCallbackServiceImpl implements MessageCallbackService {
     /**
      * 设置消息回调
      */
-    public ApiResponse setCallback(String key, CallbackConfigRequest config) {
-        return post("/message/SetCallback", key, config);
+    public ApiResponse setCallback(String authKey, CallbackConfigRequest config) {
+        return post("/message/SetCallback", authKey, config);
     }
 
     /**
      * 获取消息回调配置
      */
-    public ApiResponse getCallback(String key) {
-        return get("/message/GetCallback", key);
+    public ApiResponse getCallback(String authKey) {
+        return get("/message/GetCallback", authKey);
     }
 
     /**
      * 删除消息回调配置
      */
-    public ApiResponse deleteCallback(String key) {
-        return get("/message/DeleteCallback", key);
+    public ApiResponse deleteCallback(String authKey) {
+        return get("/message/DeleteCallback", authKey);
     }
 
 
@@ -69,12 +69,12 @@ public class MessageCallbackServiceImpl implements MessageCallbackService {
      * 通用 POST 请求方法
      *
      * @param path   接口路径，如 "/friend/AgreeAdd"
-     * @param key    账号唯一标识（query 参数）
+     * @param authKey    账号唯一标识（query 参数）
      * @param request 请求体对象
      * @return 统一响应结果
      */
-    private ApiResponse post(String path, String key, Object request) {
-        String url = BASE_URL + path + "?key=" + key;
+    private ApiResponse post(String path, String authKey, Object request) {
+        String url = BASE_URL + path + "?key=" + authKey;
         return WxWorkHttpUtil.postWithType(url, request, new TypeReference<ApiResponse>() {});
     }
 
@@ -82,13 +82,13 @@ public class MessageCallbackServiceImpl implements MessageCallbackService {
      * 通用 GET 请求方法（无请求体）
      *
      * @param path 接口路径
-     * @param key  账号唯一标识
+     * @param authKey  账号唯一标识
      * @return 统一响应结果
      */
-    private ApiResponse get(String path, String key) {
+    private ApiResponse get(String path, String authKey) {
         String url = BASE_URL + path;
         Map<String, Object> params = new HashMap<>();
-        params.put("key", key);
+        params.put("authKey", authKey);
         String resp = WxWorkHttpUtil.get(url, params);
         return com.alibaba.fastjson.JSON.parseObject(resp, ApiResponse.class);
     }

fs-service/src/main/java/com/fs/wxcid/service/impl/MessageServiceImpl.java

@@ -18,113 +18,113 @@ public class MessageServiceImpl implements MessageService {
 
 
     @Override
-    public ApiResponse addMessageMgr(String key, AddMessageMgrRequest request) {
-        return post("/message/AddMessageMgr", key, request);
+    public ApiResponse addMessageMgr(String authKey, AddMessageMgrRequest request) {
+        return post("/message/AddMessageMgr", authKey, request);
     }
 
     @Override
-    public ApiResponse cdnUploadVideo(String key, CdnUploadVideoRequest request) {
-        return post("/message/CdnUploadVideo", key, request);
+    public ApiResponse cdnUploadVideo(String authKey, CdnUploadVideoRequest request) {
+        return post("/message/CdnUploadVideo", authKey, request);
     }
 
     @Override
-    public ApiResponse downloadEmojiGif(String key, DownloadEmojiGifRequest request) {
-        return post("/message/DownloadEmojiGif", key, request);
+    public ApiResponse downloadEmojiGif(String authKey, DownloadEmojiGifRequest request) {
+        return post("/message/DownloadEmojiGif", authKey, request);
     }
 
     @Override
-    public ApiResponse forwardEmoji(String key, ForwardEmojiRequest request) {
-        return post("/message/ForwardEmoji", key, request);
+    public ApiResponse forwardEmoji(String authKey, ForwardEmojiRequest request) {
+        return post("/message/ForwardEmoji", authKey, request);
     }
 
     @Override
-    public ApiResponse forwardImageMessage(String key, ForwardImageMessageRequest request) {
-        return post("/message/ForwardImageMessage", key, request);
+    public ApiResponse forwardImageMessage(String authKey, ForwardImageMessageRequest request) {
+        return post("/message/ForwardImageMessage", authKey, request);
     }
 
     @Override
-    public ApiResponse forwardVideoMessage(String key, ForwardVideoMessageRequest request) {
-        return post("/message/ForwardVideoMessage", key, request);
+    public ApiResponse forwardVideoMessage(String authKey, ForwardVideoMessageRequest request) {
+        return post("/message/ForwardVideoMessage", authKey, request);
     }
 
     @Override
-    public ApiResponse getMsgBigImg(String key, GetMsgBigImgRequest request) {
-        return post("/message/GetMsgBigImg", key, request);
+    public ApiResponse getMsgBigImg(String authKey, GetMsgBigImgRequest request) {
+        return post("/message/GetMsgBigImg", authKey, request);
     }
 
     @Override
-    public ApiResponse getMsgVideo(String key, GetMsgVideoRequest request) {
-        return post("/message/GetMsgVideo", key, request);
+    public ApiResponse getMsgVideo(String authKey, GetMsgVideoRequest request) {
+        return post("/message/GetMsgVideo", authKey, request);
     }
 
     @Override
-    public ApiResponse getMsgVoice(String key, GetMsgVoiceRequest request) {
-        return post("/message/GetMsgVoice", key, request);
+    public ApiResponse getMsgVoice(String authKey, GetMsgVoiceRequest request) {
+        return post("/message/GetMsgVoice", authKey, request);
     }
 
     @Override
-    public ApiResponse groupMassMsgImage(String key, GroupMassMsgImageRequest request) {
-        return post("/message/GroupMassMsgImage", key, request);
+    public ApiResponse groupMassMsgImage(String authKey, GroupMassMsgImageRequest request) {
+        return post("/message/GroupMassMsgImage", authKey, request);
     }
 
     @Override
-    public ApiResponse groupMassMsgText(String key, GroupMassMsgTextRequest request) {
-        return post("/message/GroupMassMsgText", key, request);
+    public ApiResponse groupMassMsgText(String authKey, GroupMassMsgTextRequest request) {
+        return post("/message/GroupMassMsgText", authKey, request);
     }
 
     @Override
-    public ApiResponse httpSyncMsg(String key, HttpSyncMsgRequest request) {
-        return post("/message/HttpSyncMsg", key, request);
+    public ApiResponse httpSyncMsg(String authKey, HttpSyncMsgRequest request) {
+        return post("/message/HttpSyncMsg", authKey, request);
     }
 
     @Override
-    public ApiResponse newSyncHistoryMessage(String key) {
-        return post("/message/NewSyncHistoryMessage", key, new Object()); // 无 body，传空对象或自定义
+    public ApiResponse newSyncHistoryMessage(String authKey) {
+        return post("/message/NewSyncHistoryMessage", authKey, new Object()); // 无 body，传空对象或自定义
     }
 
     @Override
-    public ApiResponse revokeMsg(String key, RevokeMsgRequest request) {
-        return post("/message/RevokeMsg", key, request);
+    public ApiResponse revokeMsg(String authKey, RevokeMsgRequest request) {
+        return post("/message/RevokeMsg", authKey, request);
     }
 
     @Override
-    public ApiResponse revokeMsgNew(String key, RevokeMsgNewRequest request) {
-        return post("/message/RevokeMsgNew", key, request);
+    public ApiResponse revokeMsgNew(String authKey, RevokeMsgNewRequest request) {
+        return post("/message/RevokeMsgNew", authKey, request);
     }
 
     @Override
-    public ApiResponse sendAppMessage(String key, SendAppMessageRequest request) {
-        return post("/message/SendAppMessage", key, request);
+    public ApiResponse sendAppMessage(String authKey, SendAppMessageRequest request) {
+        return post("/message/SendAppMessage", authKey, request);
     }
 
     @Override
-    public ApiResponse sendEmojiMessage(String key, SendEmojiMessageRequest request) {
-        return post("/message/SendEmojiMessage", key, request);
+    public ApiResponse sendEmojiMessage(String authKey, SendEmojiMessageRequest request) {
+        return post("/message/SendEmojiMessage", authKey, request);
     }
 
     @Override
-    public ApiResponse sendImageMessage(String key, SendImageMessageRequest request) {
-        return post("/message/SendImageMessage", key, request);
+    public ApiResponse sendImageMessage(String authKey, SendImageMessageRequest request) {
+        return post("/message/SendImageMessage", authKey, request);
     }
 
     @Override
-    public ApiResponse sendImageNewMessage(String key, SendImageNewMessageRequest request) {
-        return post("/message/SendImageNewMessage", key, request);
+    public ApiResponse sendImageNewMessage(String authKey, SendImageNewMessageRequest request) {
+        return post("/message/SendImageNewMessage", authKey, request);
     }
 
     @Override
-    public ApiResponse sendTextMessage(String key, SendTextMessageRequest request) {
-        return post("/message/SendTextMessage", key, request);
+    public ApiResponse sendTextMessage(String authKey, SendTextMessageRequest request) {
+        return post("/message/SendTextMessage", authKey, request);
     }
 
     @Override
-    public ApiResponse sendVoice(String key, SendVoiceRequest request) {
-        return post("/message/SendVoice", key, request);
+    public ApiResponse sendVoice(String authKey, SendVoiceRequest request) {
+        return post("/message/SendVoice", authKey, request);
     }
 
     @Override
-    public ApiResponse shareCardMessage(String key, ShareCardMessageRequest request) {
-        return post("/message/ShareCardMessage", key, request);
+    public ApiResponse shareCardMessage(String authKey, ShareCardMessageRequest request) {
+        return post("/message/ShareCardMessage", authKey, request);
     }
 
     // ------------------ 工具方法 ------------------
@@ -132,12 +132,12 @@ public class MessageServiceImpl implements MessageService {
      * 通用 POST 请求方法
      *
      * @param path   接口路径，如 "/friend/AgreeAdd"
-     * @param key    账号唯一标识（query 参数）
+     * @param authKey    账号唯一标识（query 参数）
      * @param request 请求体对象
      * @return 统一响应结果
      */
-    private ApiResponse post(String path, String key, Object request) {
-        String url = BASE_URL + path + "?key=" + key;
+    private ApiResponse post(String path, String authKey, Object request) {
+        String url = BASE_URL + path + "?key=" + authKey;
         return WxWorkHttpUtil.postWithType(url, request, new TypeReference<ApiResponse>() {});
     }
 
@@ -145,13 +145,13 @@ public class MessageServiceImpl implements MessageService {
      * 通用 GET 请求方法（无请求体）
      *
      * @param path 接口路径
-     * @param key  账号唯一标识
+     * @param authKey  账号唯一标识
      * @return 统一响应结果
      */
-    private ApiResponse get(String path, String key) {
+    private ApiResponse get(String path, String authKey) {
         String url = BASE_URL + path;
         Map<String, Object> params = new HashMap<>();
-        params.put("key", key);
+        params.put("authKey", authKey);
         String resp = WxWorkHttpUtil.get(url, params);
         return com.alibaba.fastjson.JSON.parseObject(resp, ApiResponse.class);
     }