Merge remote-tracking branch 'origin/master'

fs-admin/src/main/java/com/fs/course/controller/FsCourseAnswerLogsController.java

@@ -3,6 +3,7 @@ package com.fs.course.controller;
 import com.fs.common.annotation.Log;
 import com.fs.common.core.controller.BaseController;
 import com.fs.common.core.domain.AjaxResult;
+import com.fs.common.core.domain.R;
 import com.fs.common.core.page.TableDataInfo;
 import com.fs.common.enums.BusinessType;
 import com.fs.common.utils.poi.ExcelUtil;
@@ -10,6 +11,8 @@ import com.fs.course.domain.FsCourseAnswerLogs;
 import com.fs.course.param.FsCourseAnswerLogsParam;
 import com.fs.course.service.IFsCourseAnswerLogsService;
 import com.fs.course.vo.FsCourseAnswerLogsListVO;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
@@ -35,17 +38,26 @@ public class FsCourseAnswerLogsController extends BaseController
      * 查询答题日志列表
      */
     @PreAuthorize("@ss.hasPermi('course:courseAnswerLog:list')")
-    @GetMapping("/list")
-    public TableDataInfo list(FsCourseAnswerLogsParam param)
+    @PostMapping("/list")
+    public R list(@RequestBody  FsCourseAnswerLogsParam param)
     {
-        startPage();
+        if(param.getPageNum() == null) {
+            param.setPageNum(1);
+        }
+        if(param.getPageSize() == null) {
+            param.setPageSize(10);
+        }
 
         if (param.getPhoneMk() != null && param.getPhoneMk() != "") {
             param.setPhone(encryptPhone(param.getPhoneMk()));
         }
 
+
+        PageHelper.startPage(param.getPageNum(), param.getPageSize());
+
         List<FsCourseAnswerLogsListVO> list = fsCourseAnswerLogsService.selectFsCourseAnswerLogsListVO(param);
-        return getDataTable(list);
+
+        return R.ok().put("data",new PageInfo<>(list));
     }
 
     /**
@@ -53,8 +65,8 @@ public class FsCourseAnswerLogsController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('course:courseAnswerLog:export')")
     @Log(title = "答题日志", businessType = BusinessType.EXPORT)
-    @GetMapping("/export")
-    public AjaxResult export(FsCourseAnswerLogsParam param)
+    @PostMapping("/export")
+    public AjaxResult export(@RequestBody FsCourseAnswerLogsParam param)
     {
         if (param.getPhoneMk() != null && param.getPhoneMk() != "") {
             param.setPhone(encryptPhone(param.getPhoneMk()));

fs-admin/src/main/java/com/fs/course/controller/FsCourseRedPacketLogController.java

@@ -17,6 +17,8 @@ import com.fs.framework.web.service.TokenService;
 import com.fs.his.utils.PhoneUtil;
 import com.fs.his.vo.OptionsVO;
 import com.fs.system.service.ISysConfigService;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -62,21 +64,28 @@ public class FsCourseRedPacketLogController extends BaseController
      * 查询短链课程看课记录列表
      */
     @PreAuthorize("@ss.hasPermi('course:courseRedPacketLog:list')")
-    @GetMapping("/list")
-    public TableDataInfo list(FsCourseRedPacketLogParam fsCourseRedPacketLog)
+    @PostMapping("/list")
+    public R list(@RequestBody FsCourseRedPacketLogParam fsCourseRedPacketLog)
     {
-        startPage();
+        if(fsCourseRedPacketLog.getPageNum() == null) {
+            fsCourseRedPacketLog.setPageNum(1);
+        }
+        if(fsCourseRedPacketLog.getPageSize() == null) {
+            fsCourseRedPacketLog.setPageSize(10);
+        }
+
 
         if (fsCourseRedPacketLog.getPhoneMk() != null && fsCourseRedPacketLog.getPhoneMk() != "") {
             fsCourseRedPacketLog.setPhone(encryptPhone(fsCourseRedPacketLog.getPhoneMk()));
         }
+        PageHelper.startPage(fsCourseRedPacketLog.getPageNum(), fsCourseRedPacketLog.getPageSize());
 
         List<FsCourseRedPacketLogListPVO> list = fsCourseRedPacketLogService.selectFsCourseRedPacketLogListVO(fsCourseRedPacketLog);
         for (FsCourseRedPacketLogListPVO fsCourseRedPacketLogListPVO : list) {
 
             fsCourseRedPacketLogListPVO.setPhone(PhoneUtil.decryptAutoPhoneMk(fsCourseRedPacketLogListPVO.getPhone()));
         }
-        return getDataTable(list);
+        return R.ok().put("data",new PageInfo<>(list));
     }
 
     /**
@@ -84,8 +93,8 @@ public class FsCourseRedPacketLogController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('course:courseRedPacketLog:export')")
     @Log(title = "短链课程看课记录", businessType = BusinessType.EXPORT)
-    @GetMapping("/export")
-    public AjaxResult export(FsCourseRedPacketLogParam fsCourseRedPacketLog)
+    @PostMapping("/export")
+    public AjaxResult export(@RequestBody FsCourseRedPacketLogParam fsCourseRedPacketLog)
     {
         if (fsCourseRedPacketLog.getPhoneMk()!=null&&fsCourseRedPacketLog.getPhoneMk()!=""){
             fsCourseRedPacketLog.setPhone(encryptPhone(fsCourseRedPacketLog.getPhoneMk()));

fs-admin/src/main/java/com/fs/course/controller/FsCourseWatchLogController.java

@@ -4,6 +4,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import com.fs.common.constant.HttpStatus;
+import com.fs.common.core.domain.R;
 import com.fs.common.exception.CustomException;
 import com.fs.common.utils.ServletUtils;
 import com.fs.course.param.FsCourseOverParam;
@@ -14,6 +15,8 @@ import com.fs.course.vo.FsCourseWatchLogListVO;
 import com.fs.course.vo.FsCourseWatchLogStatisticsListVO;
 import com.fs.qw.param.QwWatchLogStatisticsListParam;
 import com.fs.qw.service.IQwWatchLogService;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -52,12 +55,20 @@ public class FsCourseWatchLogController extends BaseController
      * 查询短链课程看课记录列表
      */
     @PreAuthorize("@ss.hasPermi('course:courseWatchLog:list')")
-    @GetMapping("/list")
-    public TableDataInfo list(FsCourseWatchLogListParam param)
+    @PostMapping("/list")
+    public R list(@RequestBody FsCourseWatchLogListParam param)
     {
-        startPage();
+        if(param.getPageNum() == null) {
+            param.setPageNum(1);
+        }
+        if(param.getPageSize() == null) {
+            param.setPageSize(10);
+        }
+        PageHelper.startPage(param.getPageNum(), param.getPageSize());
+
         List<FsCourseWatchLogListVO> list = fsCourseWatchLogService.selectFsCourseWatchLogListVO(param);
-        return getDataTable(list);
+
+        return R.ok().put("data",new PageInfo<>(list));
     }
 
     @GetMapping("/qwWatchLogAllStatisticsList")
@@ -114,8 +125,8 @@ public class FsCourseWatchLogController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('course:courseWatchLog:export')")
     @Log(title = "短链课程看课记录", businessType = BusinessType.EXPORT)
-    @GetMapping("/export")
-    public AjaxResult export(FsCourseWatchLogListParam param)
+    @PostMapping("/export")
+    public AjaxResult export(@RequestBody FsCourseWatchLogListParam param)
     {
         List<FsCourseWatchLogListVO> list = fsCourseWatchLogService.selectFsCourseWatchLogListVO(param);
         ExcelUtil<FsCourseWatchLogListVO> util = new ExcelUtil<FsCourseWatchLogListVO>(FsCourseWatchLogListVO.class);

fs-admin/src/main/java/com/fs/live/controller/LiveAfterSalesController.java

@@ -193,6 +193,7 @@ public class LiveAfterSalesController extends BaseController
         logs.setOperator(loginUser.getUser().getNickName());
         logs.setStoreAfterSalesId(liveAfterSales.getId());
         logs.setChangeMessage(FsStoreAfterSalesStatusEnum.STATUS_2.getDesc());
+        liveAfterSales.setStatus(FsStoreAfterSalesStatusEnum.STATUS_2.getValue());
         liveAfterSalesLogsService.insertLiveAfterSalesLogs(logs);
         return toAjax(liveAfterSalesService.updateLiveAfterSales(liveAfterSales));
     }

fs-admin/src/main/java/com/fs/qw/controller/QwSopController.java

@@ -21,6 +21,8 @@ import com.fs.sop.params.QwSopAutoTime;
 import com.fs.sop.params.QwSopEditQwUserParam;
 import com.fs.sop.service.IQwSopService;
 import com.fs.sop.vo.SopVoiceListVo;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
@@ -59,8 +61,8 @@ public class QwSopController extends BaseController
      * 查询企微sop列表
      */
     @PreAuthorize("@ss.hasPermi('qw:sop:list')")
-    @GetMapping("/list")
-    public TableDataInfo list(QwSop qwSop)
+    @PostMapping("/list")
+    public R list(@RequestBody  QwSop qwSop)
     {
         List<String> userIds = qwSop.getUserIds();
         if (userIds != null && !userIds.isEmpty()) {
@@ -68,14 +70,23 @@ public class QwSopController extends BaseController
             if (longs != null && !longs.isEmpty()) {
                 qwSop.getQwUserIdList().addAll(longs);
             }else {
-                return getDataTable(new ArrayList<>());
+                return R.ok().put("data",new ArrayList<>());
             }
         }
 
 
-        startPage();
+        if(qwSop.getPageNum() == null) {
+            qwSop.setPageNum(1);
+        }
+        if(qwSop.getPageSize() == null) {
+            qwSop.setPageSize(10);
+        }
+
+        PageHelper.startPage(qwSop.getPageNum(), qwSop.getPageSize());
+
         List<QwSop> list = qwSopService.selectQwSopList(qwSop);
-        return getDataTable(list);
+
+        return R.ok().put("data",new PageInfo<>(list));
     }
 
     /**
@@ -117,8 +128,8 @@ public class QwSopController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('qw:sop:export')")
     @Log(title = "企微sop", businessType = BusinessType.EXPORT)
-    @GetMapping("/export")
-    public AjaxResult export(QwSop qwSop)
+    @PostMapping("/export")
+    public AjaxResult export(@RequestBody QwSop qwSop)
     {
         List<QwSop> list = qwSopService.selectQwSopList(qwSop);
         ExcelUtil<QwSop> util = new ExcelUtil<QwSop>(QwSop.class);

fs-admin/src/main/java/com/fs/qw/controller/QwSopTempController.java

@@ -22,6 +22,8 @@ import com.fs.sop.params.QwSopShareTempParam;
 import com.fs.sop.service.IQwSopTempService;
 import com.fs.sop.vo.UpdateRedVo;
 import com.fs.voice.utils.StringUtil;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
@@ -51,10 +53,10 @@ public class QwSopTempController extends BaseController
      * 查询sop模板列表
      */
     @PreAuthorize("@ss.hasPermi('qw:sopTemp:list')")
-    @GetMapping("/list")
-    public TableDataInfo list(QwSopTemp qwSopTemp)
+    @PostMapping("/list")
+    public R list(@RequestBody QwSopTemp qwSopTemp)
     {
-        startPage();
+
 //        List<QwSopTemp> list = qwSopTempService.selectQwSopTempList(qwSopTemp);
         List<QwSopTemp> list = qwSopTempService.selectQwSopTempListNew(qwSopTemp);
         // 收集所有需要查询的用户ID
@@ -85,7 +87,16 @@ public class QwSopTempController extends BaseController
             });
         }
 
-        return getDataTable(list);
+        if(qwSopTemp.getPageNum() == null) {
+            qwSopTemp.setPageNum(1);
+        }
+        if(qwSopTemp.getPageSize() == null) {
+            qwSopTemp.setPageSize(10);
+        }
+
+        PageHelper.startPage(qwSopTemp.getPageNum(), qwSopTemp.getPageSize());
+
+        return R.ok().put("data",new PageInfo<>(list));
     }
 
     /**
@@ -93,8 +104,8 @@ public class QwSopTempController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('qw:sopTemp:export')")
     @Log(title = "sop模板", businessType = BusinessType.EXPORT)
-    @GetMapping("/export")
-    public AjaxResult export(QwSopTemp qwSopTemp)
+    @PostMapping("/export")
+    public AjaxResult export(@RequestBody QwSopTemp qwSopTemp)
     {
         List<QwSopTemp> list = qwSopTempService.selectQwSopTempList(qwSopTemp);
         ExcelUtil<QwSopTemp> util = new ExcelUtil<QwSopTemp>(QwSopTemp.class);

fs-admin/src/main/java/com/fs/web/controller/common/CommonController.java

@@ -12,12 +12,12 @@ import com.fs.framework.config.ServerConfig;
 import com.fs.his.domain.FsExportTask;
 import com.fs.his.service.IFsExportTaskService;
 import com.fs.im.service.OpenIMService;
+import com.fs.qw.service.IQwUserService;
 import com.fs.system.oss.CloudStorageService;
 import com.fs.system.oss.OSSFactory;
 
 import com.fs.web.vo.WangUploadVO;
 
-import com.huaweicloud.sdk.vod.v1.model.BaseInfo;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -72,6 +72,9 @@ public class CommonController
     public RedisTemplate redisTemplate;
 
     org.slf4j.Logger logger= LoggerFactory.getLogger(getClass());
+    @Autowired
+    private IQwUserService qwUserService;
+
     @GetMapping(value = "common/getTask/{taskId}")
     public R getTask(@PathVariable("taskId") Long taskId)
     {
@@ -305,4 +308,8 @@ public class CommonController
 
     }
 
+    @PostMapping("/common/unbindQwUserByServerIds")
+    public R unbindQwUserByServerIds(@RequestBody List<String> serverIds){
+        return qwUserService.unbindQwUserByServerIds(serverIds);
+    }
 }

fs-company/src/main/java/com/fs/company/controller/live/LiveDataController.java

@@ -135,7 +135,7 @@ public class LiveDataController extends BaseController
     @PostMapping("/listLiveData")
     public R listLiveData(@RequestBody LiveDataParam param, HttpServletRequest request)
     {
-        param.setCompanyId(tokenService.getLoginUser(request).getUser().getCompanyId());
+//        param.setCompanyId(tokenService.getLoginUser(request).getUser().getCompanyId());
         PageHelper.startPage(param.getPageNum(), param.getPageSize());
         return liveDataService.listLiveData(param);
     }

fs-company/src/main/java/com/fs/company/controller/qw/QwExternalContactController.java

@@ -7,6 +7,7 @@ import com.fs.common.core.domain.AjaxResult;
 import com.fs.common.core.domain.R;
 import com.fs.common.core.page.TableDataInfo;
 import com.fs.common.enums.BusinessType;
+import com.fs.common.utils.DictUtils;
 import com.fs.common.utils.PubFun;
 import com.fs.common.utils.ServletUtils;
 import com.fs.common.utils.StringUtils;
@@ -370,6 +371,10 @@ public class QwExternalContactController extends BaseController
 
             if (!StringUtil.strIsNullOrEmpty(item.getState()) && !wayList.isEmpty()) {
                 item.setState(item.getState()+"-"+getContactWayNameStream(item.getState(), wayList));
+
+            }
+            if (item.getStatus()!=null){
+                item.setStatusName(DictUtils.getDictLabel("sys_qw_external_contact_status", String.valueOf(item.getStatus())));
             }
         });
         ExcelUtil<QwExternalContactVO> util = new ExcelUtil<QwExternalContactVO>(QwExternalContactVO.class);

fs-framework/src/main/java/com/fs/framework/config/SecurityConfig.java

@@ -137,6 +137,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
                 .antMatchers("/common/uploadWang**").anonymous()
                 .antMatchers("/common/download**").anonymous()
                 .antMatchers("/common/download/resource**").anonymous()
+                .antMatchers("/common/unbindQwUserByServerIds").anonymous()
                 .antMatchers("/swagger-ui.html").anonymous()
                 .antMatchers("/swagger-resources/**").anonymous()
                 .antMatchers("/webjars/**").anonymous()

fs-live-app/src/main/java/com/fs/live/controller/LiveController.java

@@ -120,12 +120,13 @@ public class LiveController {
 
 	@PostMapping("/videoUpload")
 	public R videoUpload(HttpServletRequest request, @RequestBody  Map<String, Object> params) {
+		String videoUrl = "https://bjzmkytcpv.ylrzcloud.com/";
 		log.info("请求参数：{}", params);
 		if(!params.containsKey("WorkflowExecution")) return R.error("参数错误");
 
 		LinkedHashMap<String,Object> result = (LinkedHashMap<String,Object>) params.get("WorkflowExecution");
 		String string = result.get("Object").toString();
-		videoService.updateFinishStatus("https://bjzmky-1323137866.cos.ap-chongqing.myqcloud.com/" + string.replace(".mp4", ".m3u8"));
+		videoService.updateFinishStatus(videoUrl + string.replace(".mp4", "-1080.m3u8"));
 
 		return R.ok();
 //		{app=200149.push.tlivecloud.com, appid=1319721001, appname=live, channel_id=673,

fs-service/src/main/java/com/fs/course/param/FsCourseAnswerLogsParam.java

@@ -36,8 +36,8 @@ public class FsCourseAnswerLogsParam  extends BaseEntity  {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date sTime;
 
-    private Long pageNum;
-    private Long pageSize;
+    private Integer pageNum;
+    private Integer pageSize;
 
     /**
      * 用户（昵称_id组合）

fs-service/src/main/java/com/fs/course/param/FsCourseRedPacketLogParam.java

@@ -41,6 +41,8 @@ public class FsCourseRedPacketLogParam {
     @TableField(exist = false)
     private List<String> companyUserIds=new ArrayList<>();
 
+    private Integer pageNum;
+    private Integer pageSize;
 
     public List<String> getCompanyUserIds() {
         if (companyUserIds == null || companyUserIds.isEmpty()) {

fs-service/src/main/java/com/fs/course/param/FsCourseWatchLogListParam.java

@@ -110,6 +110,10 @@ public class FsCourseWatchLogListParam implements Serializable {
     private List<Long> deptIds;
     private String ids;
 
+
+    private Integer pageNum;
+    private Integer pageSize;
+
     @TableField(exist = false)
     private List<String> userIds = new ArrayList<>();
 

fs-service/src/main/java/com/fs/his/mapper/FsUserWxMapper.java

@@ -2,6 +2,7 @@ package com.fs.his.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.fs.his.domain.FsUserWx;
+import org.apache.ibatis.annotations.Param;
 
 public interface FsUserWxMapper extends BaseMapper<FsUserWx> {
 
@@ -10,4 +11,6 @@ public interface FsUserWxMapper extends BaseMapper<FsUserWx> {
      * @param wx    配置信息
      */
     void insertOrUpdateByUniqueKey(FsUserWx wx);
+
+    FsUserWx getFsUserWcByUserIdAndAppId(@Param("fsUserId") Long userId,@Param("appId") String appId );
 }

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/live/service/impl/LiveAfterSalesServiceImpl.java

@@ -580,9 +580,6 @@ public class LiveAfterSalesServiceImpl implements ILiveAfterSalesService {
     @Override
     public int updateLiveAfterSales(LiveAfterSales liveAfterSales)
     {
-        if (StringUtils.isNotEmpty(liveAfterSales.getDeliveryName()) && StringUtils.isNotEmpty(liveAfterSales.getDeliverySn()) && StringUtils.isNotEmpty(liveAfterSales.getDeliveryCode())) {
-            liveAfterSales.setStatus(2);
-        }
 
         return baseMapper.updateLiveAfterSales(liveAfterSales);
     }

fs-service/src/main/java/com/fs/live/service/impl/LiveOrderServiceImpl.java

@@ -1675,7 +1675,7 @@ public class LiveOrderServiceImpl implements ILiveOrderService {
         }
         erpOrder.setPlatform_code(order.getOrderCode());
         erpOrder.setWarehouse_code(erpConfig.getErpWarehouseCode());
-        erpOrder.setShop_code(erpConfig.getErpShopCode());
+        erpOrder.setShop_code(erpConfig.getErpJstShopCode());
         erpOrder.setBuyer_account(order.getUserName());
 
 //      erpOrder.setPost_fee(order.getTotalPostage().doubleValue());
@@ -1709,13 +1709,13 @@ public class LiveOrderServiceImpl implements ILiveOrderService {
             order.setDeliverySn(express.getCode());
         }
         erpOrder.setPayments(payments);
-        if (order.getCompanyId() != null) {
+        if (order.getCompanyId() != null && order.getCompanyId() > 0L) {
             Company company = companyService.selectCompanyById(order.getCompanyId());
             if (company != null) {
                 erpOrder.setSeller_memo(company.getCompanyName());
             }
         }
-        if (order.getCompanyUserId() != null) {
+        if (order.getCompanyUserId() != null && order.getCompanyUserId() > 0L) {
             CompanyUser companyUser = companyUserService.selectCompanyUserById(order.getCompanyUserId());
             if (companyUser != null) {
                 CompanyDept dept = companyDeptService.selectCompanyDeptById(companyUser.getDeptId());
@@ -2467,6 +2467,9 @@ public class LiveOrderServiceImpl implements ILiveOrderService {
 
     private BigDecimal handleDeliveryMoney(Long cityId, FsStoreProductScrm fsStoreProduct, String totalNumSize) {
         BigDecimal storePostage = BigDecimal.ZERO;
+        if (ObjectUtil.isNull(fsStoreProduct.getTempId())) {
+            return storePostage;
+        }
         List<Long> citys = new ArrayList<>();
         citys.add(cityId);
         citys.add(0l);
@@ -3487,6 +3490,7 @@ public class LiveOrderServiceImpl implements ILiveOrderService {
         if (attrValue != null) {
             attrValue.setStock(attrValue.getStock() - Integer.parseInt(liveOrder.getTotalNum()));
             attrValue.setSales(attrValue.getSales() + Integer.parseInt(liveOrder.getTotalNum()));
+            fsStoreProductAttrValueMapper.updateFsStoreProductAttrValue(attrValue);
         } else {
             // 更改店铺库存
             fsStoreProduct.setStock(fsStoreProduct.getStock()-Integer.parseInt(liveOrder.getTotalNum()));
@@ -3513,6 +3517,7 @@ public class LiveOrderServiceImpl implements ILiveOrderService {
         liveOrder.setCompanyUserId(liveUserFirstEntry.getCompanyUserId());
         liveOrder.setTuiUserId(liveUserFirstEntry.getCompanyUserId());
         String orderSn = OrderCodeUtils.getOrderSn();
+//        String orderSn = "123"; // todo yhq
         log.info("订单生成："+orderSn);
         liveOrder.setOrderCode(orderSn);
         BigDecimal payPrice = fsStoreProduct.getPrice().multiply(new BigDecimal(liveOrder.getTotalNum()));
@@ -3561,7 +3566,7 @@ public class LiveOrderServiceImpl implements ILiveOrderService {
         liveOrder.setPayType("1");
         liveOrder.setTotalPrice(payPrice);
         liveOrder.setPayMoney(BigDecimal.ZERO);
-        liveOrder.setPayPrice(payPrice);
+        liveOrder.setPayPrice(payPrice.subtract(liveOrder.getDiscountMoney()));
         try {
             if (baseMapper.insertLiveOrder(liveOrder) > 0) {
                 LiveOrderItemDTO dto=new LiveOrderItemDTO();

fs-service/src/main/java/com/fs/qw/mapper/QwIpadServerUserMapper.java

@@ -5,6 +5,7 @@ import com.fs.qw.domain.QwIpadServerUser;
 import com.fs.qw.param.IPadServerUserParam;
 import com.fs.qw.vo.QwIPadServerUserVO;
 import org.apache.ibatis.annotations.Delete;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -73,4 +74,5 @@ public interface QwIpadServerUserMapper extends BaseMapper<QwIpadServerUser>{
     @Delete("DELETE FROM qw_ipad_server_user WHERE qw_user_id = #{id}")
     void deleteQwIpadServerUserByQwUserId(Long id);
 
+    void deleteQwIpadServerUserByQwUserIds(@Param("ids") List<Long> ids);
 }

fs-service/src/main/java/com/fs/qw/mapper/QwUserMapper.java

@@ -499,4 +499,8 @@ public interface QwUserMapper extends BaseMapper<QwUser>
             "            </if>" +
             "</script>")
     List<Long> selectQwUserListByCompanyUserIdS(@Param("userIds") List<String> userIds);
+
+    List<QwUser> selectQwUserByServerIds(@Param("serverIds")List<String> serverIds);
+
+    int batchUpdateUnbind(@Param("ids")List<Long> ids);
 }

fs-service/src/main/java/com/fs/qw/service/IQwIpadServerUserService.java

@@ -71,4 +71,6 @@ public interface IQwIpadServerUserService extends IService<QwIpadServerUser>{
     int deleteQwIpadServerUserById(Long id);
 
     void deleteQwIpadServerUserByQwUserId(Long id);
+
+    void deleteQwIpadServerUserByQwUserIds(List<Long> ids);
 }

fs-service/src/main/java/com/fs/qw/service/IQwUserService.java

@@ -205,4 +205,7 @@ public interface IQwUserService
 
     List<QwUser> selectQwUserByIds(List<Long> qwUserIdList);
     List<Long> selectQwUserListByCompanyUserIdS(List<String> userIds);
+
+    R unbindQwUserByServerIds(List<String> serverIds);
+
 }

fs-service/src/main/java/com/fs/qw/service/impl/QwIpadServerUserServiceImpl.java

@@ -106,4 +106,9 @@ public class QwIpadServerUserServiceImpl extends ServiceImpl<QwIpadServerUserMap
     public void deleteQwIpadServerUserByQwUserId(Long id) {
         qwIpadServerUserMapper.deleteQwIpadServerUserByQwUserId(id);
     }
+
+    @Override
+    public void deleteQwIpadServerUserByQwUserIds(List<Long> ids) {
+        qwIpadServerUserMapper.deleteQwIpadServerUserByQwUserIds(ids);
+    }
 }

fs-service/src/main/java/com/fs/qw/service/impl/QwUserServiceImpl.java

@@ -58,6 +58,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.io.*;
 import java.net.URL;
@@ -1569,6 +1570,57 @@ public class QwUserServiceImpl implements IQwUserService
         return qwUserMapper.selectQwUserListByCompanyUserIdS(userIds);
     }
 
+    @Override
+    @Transactional
+    public R unbindQwUserByServerIds(List<String> serverIds) {
+        if (serverIds!= null && !serverIds.isEmpty()) {
+            serverIds = serverIds.stream().distinct().collect(Collectors.toList()); //去重
+            //查询所有状态为 绑定了AI主机的
+            List<QwUser> list = qwUserMapper.selectQwUserByServerIds(serverIds);
+            if (list != null && !list.isEmpty()) {
+                for (QwUser qwUser : list) {
+
+                    try {
+                        QwIpadServerLog qwIpadServerLog = new QwIpadServerLog();
+                        qwIpadServerLog.setType(2);
+                        qwIpadServerLog.setTilie("退订解绑");
+                        qwIpadServerLog.setServerId(qwUser.getServerId());
+                        qwIpadServerLog.setQwUserId(qwUser.getId());
+                        qwIpadServerLog.setCompanyUserId(qwUser.getCompanyUserId());
+                        qwIpadServerLog.setCompanyId(qwUser.getCompanyId());
+                        qwIpadServerLog.setCreateTime(new Date());
+                        qwIpadServerLogService.insertQwIpadServerLog(qwIpadServerLog);
+//                        WxWorkGetQrCodeDTO wxWorkGetQrCodeDTO = new WxWorkGetQrCodeDTO();
+//                        wxWorkGetQrCodeDTO.setUuid(qwUser.getUid());
+//                        wxWorkService.LoginOut(wxWorkGetQrCodeDTO,qwUser.getServerId());
+                    } catch (Exception e) {
+                        log.error("企微用户：{}，解绑ipad报错:{}", JSON.toJSONString(qwUser), e);
+                    }
+                }
+                List<Long> ids = list.stream().map(QwUser::getId).collect(Collectors.toList());
+                qwUserMapper.batchUpdateUnbind(ids); //修改qwUser的serverId和绑定状态
+//                ipadServerService.addServers(serverIds); // ipad数量退订归100
+                qwIpadServerUserService.deleteQwIpadServerUserByQwUserIds(ids); //删除 qwIpadServerUser
+                Long[] array = serverIds.stream()
+                        .map(str -> {
+                            if (str != null && !str.trim().isEmpty()) {
+                                try {
+                                    return Long.valueOf(str.trim());
+                                } catch (NumberFormatException e) {
+                                    return null; // 或抛出异常
+                                }
+                            }
+                            return null;
+                        })
+                        .toArray(Long[]::new);
+                ipadServerService.deleteQwIpadServerByIds(array); // 删除ipad
+            }
+
+
+        }
+        return R.ok();
+    }
+
     /**
      * 根据销售公司和企微ID查询企微用户
      */

fs-service/src/main/java/com/fs/qw/vo/QwExternalContactVO.java

@@ -95,12 +95,16 @@ public class QwExternalContactVO {
     private Long companyId;
 
     private Integer transferStatus;
+    /*状态名称 用于excel导出*/
+    @Excel(name = "状态")
+    private String statusName;
     private Integer status;
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Excel(name = "添加时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date createTime;
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "流失时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date lossTime;
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date delTime;

fs-service/src/main/java/com/fs/sop/domain/QwSop.java

@@ -161,6 +161,10 @@ public class QwSop implements Serializable
     @TableField(exist = false)
     private List<String> userIds = new ArrayList<>();
 
+
+    private Integer pageNum;
+    private Integer pageSize;
+
     public List<String> getUserIds() {
         if (userIds == null || userIds.isEmpty()) {
             return userIds;

fs-service/src/main/java/com/fs/sop/domain/QwSopTemp.java

@@ -114,6 +114,8 @@ public class QwSopTemp implements Serializable
     @TableField(exist = false)
     private List<String> companyUserIds=new ArrayList<>();
 
+    private Integer pageNum;
+    private Integer pageSize;
 
     public List<String> getCompanyUserIds() {
         if (companyUserIds == null || companyUserIds.isEmpty()) {

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

@@ -0,0 +1,9 @@
+package com.fs.wxcid.dto.admin;
+
+import lombok.Data;
+
+@Data
+public class GenAuthKey1Request {
+    private Integer Count = 1;
+    private Integer Days = 30;
+}

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

@@ -0,0 +1,15 @@
+package com.fs.wxcid.dto.admin;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+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/dto/callback/CallbackConfigRequest.java

@@ -0,0 +1,21 @@
+package com.fs.wxcid.dto.callback;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+
+/**
+ * 设置消息回调地址的请求参数
+ * <p>对应接口：POST /message/SetCallback</p>
+ */
+@Data
+public class CallbackConfigRequest {
+    /** 回调服务器的 URL 地址，例如：https://yourdomain.com/wechat/callback
+     *  微信客户端收到消息后，会将消息以 JSON 形式 POST 到该地址 */
+    @JsonProperty("CallbackURL")
+    private String CallbackURL;
+
+    /** 是否启用消息回调功能：
+     *  true：启用，消息将实时推送到 CallbackURL
+     *  false：禁用，不推送 */
+    @JsonProperty("Enabled")
+    private Boolean Enabled;
+}

fs-service/src/main/java/com/fs/wxcid/dto/callback/CallbackMessage.java

@@ -0,0 +1,66 @@
+package com.fs.wxcid.dto.callback;
+
+import lombok.Data;
+
+/**
+ * 回调中的具体消息内容
+ */
+@Data
+public class CallbackMessage {
+
+    /** 消息 ID（整型） */
+    private Long msg_id;
+
+    /** 发送者 wxid（嵌套结构） */
+    private StringWrapper from_user_name;
+
+    /** 接收者 wxid（通常是当前账号） */
+    private StringWrapper to_user_name;
+
+    /** 消息类型：
+     *  1 = 文本，
+     *  3 = 图片，
+     *  34 = 语音，
+     *  43 = 视频，
+     *  47 = 表情/动画，
+     *  49 = App消息（链接、文件等），
+     *  51 = 系统通知（如 lastMessage）等 */
+    private Integer msg_type;
+
+    /** 消息内容（文本或 XML） */
+    private StringWrapper content;
+
+    /** 消息状态（通常为 3） */
+    private Integer status;
+
+    /** 图片状态（通常为 1） */
+    private Integer img_status;
+
+    /** 图片缓冲区（长度为 0 表示无图） */
+    private ImgBuf img_buf;
+
+    /** 消息创建时间戳（秒） */
+    private Long create_time;
+
+    /** 消息来源 XML（包含签名、扩展信息等） */
+    private String msg_source;
+
+    /** 推送通知内容（如 "昵称 : 消息文本"） */
+    private String push_content;
+
+    /** 新版消息 ID（64位整数字符串） */
+    private String new_msg_id;
+
+
+    public String getFromWxId() {
+        return from_user_name != null ? from_user_name.getStr() : null;
+    }
+
+    public String getToWxId() {
+        return to_user_name != null ? to_user_name.getStr() : null;
+    }
+
+    public String getContentText() {
+        return content != null ? content.getStr() : null;
+    }
+}

fs-service/src/main/java/com/fs/wxcid/dto/callback/ImgBuf.java

@@ -0,0 +1,11 @@
+package com.fs.wxcid.dto.callback;
+
+import lombok.Data;
+
+/**
+ * 图片缓冲区信息
+ */
+@Data
+public class ImgBuf {
+    private Integer len; // 长度，通常为 0
+}

fs-service/src/main/java/com/fs/wxcid/dto/callback/MessageCallbackRequest.java

@@ -0,0 +1,19 @@
+package com.fs.wxcid.dto.callback;
+
+import lombok.Data;
+
+/**
+ * 微信消息回调顶层请求对象
+ */
+@Data
+public class MessageCallbackRequest {
+
+    /** 账号唯一标识（与发送时的 key 一致） */
+    private String key;
+
+    /** 回调类型，目前为 "message" */
+    private String type;
+
+    /** 具体消息内容 */
+    private CallbackMessage message;
+}

fs-service/src/main/java/com/fs/wxcid/dto/callback/ReturnMessage.java

@@ -0,0 +1,11 @@
+package com.fs.wxcid.dto.callback;
+
+import lombok.Data;
+
+@Data
+public class ReturnMessage {
+    //消息来源Id
+    private String fromWxId;
+    //消息内容
+    private String text;
+}

fs-service/src/main/java/com/fs/wxcid/dto/callback/StringWrapper.java

@@ -0,0 +1,17 @@
+package com.fs.wxcid.dto.callback;
+
+import lombok.Data;
+
+/**
+ * 包装字符串的结构，用于 from_user_name / content 等字段
+ * 对应 JSON: { "str": "实际值" }
+ */
+@Data
+public class StringWrapper {
+    private String str;
+
+    @Override
+    public String toString() {
+        return str != null ? str : "";
+    }
+}

fs-service/src/main/java/com/fs/wxcid/dto/common/ApiResponse.java

@@ -0,0 +1,37 @@
+package com.fs.wxcid.dto.common;
+import com.alibaba.fastjson.annotation.JSONField;
+import lombok.Data;
+
+/**
+ *
+ * 通用响应结构
+ */
+@Data
+public class ApiResponse {
+    @JSONField(name = "Code")
+    private int code;
+
+    @JSONField(name = "Data")
+    private Object data;
+
+    @JSONField(name = "Text")
+    private String text;
+
+    @JSONField(name = "Success")
+    private boolean success;
+
+    @JSONField(name = "Data62")
+    private String data62;
+
+    @JSONField(name = "Ticket")
+    private String ticket;
+
+    @Override
+    public String toString() {
+        return "ApiResponse{" +
+                "code=" + code +
+                ", text='" + text + '\'' +
+                ", success=" + success +
+                '}';
+    }
+}

fs-service/src/main/java/com/fs/wxcid/dto/friend/AgreeAddRequest.java

@@ -0,0 +1,35 @@
+package com.fs.wxcid.dto.friend;
+
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * 同意好友请求 或 验证添加好友 的请求参数
+ * 对应接口：/friend/AgreeAdd 和 /friend/VerifyUser
+ */
+@Data
+public class AgreeAddRequest {
+    /** 群聊用户名（当通过群聊添加时使用） */
+    @JsonProperty("ChatRoomUserName")
+    private String ChatRoomUserName;
+
+    /** 操作码，通常为 2 表示同意 */
+    @JsonProperty("OpCode")
+    private Integer OpCode;
+
+    /** 添加场景，例如 3 表示通过二维码 */
+    @JsonProperty("Scene")
+    private Integer Scene;
+
+    /** 微信内部加密参数 V3（来自好友请求） */
+    @JsonProperty("V3")
+    private String V3;
+
+    /** 微信内部加密参数 V4（来自好友请求） */
+    @JsonProperty("V4")
+    private String V4;
+
+    /** 验证附言（可选） */
+    @JsonProperty("VerifyContent")
+    private String VerifyContent;
+}

fs-service/src/main/java/com/fs/wxcid/dto/friend/DelContactRequest.java

@@ -0,0 +1,15 @@
+package com.fs.wxcid.dto.friend;
+
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * 删除好友请求参数
+ * 对应接口：/friend/DelContact
+ */
+@Data
+public class DelContactRequest {
+    /** 要删除的好友用户名（wxid 或其他唯一标识） */
+    @JsonProperty("DelUserName")
+    private String DelUserName;
+}

fs-service/src/main/java/com/fs/wxcid/dto/friend/GetContactDetailsListRequest.java

@@ -0,0 +1,21 @@
+package com.fs.wxcid.dto.friend;
+
+import lombok.Data;
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * 获取联系人详情列表的请求参数
+ * 支持同时查询多个用户和群聊
+ * 对应接口：/friend/GetContactDetailsList
+ */
+@Data
+public class GetContactDetailsListRequest {
+    /** 要查询的群聊 wxid 列表 */
+    @JsonProperty("RoomWxIDList")
+    private List<String> RoomWxIDList;
+
+    /** 要查询的用户 wxid 列表 */
+    @JsonProperty("UserNames")
+    private List<String> UserNames;
+}

fs-service/src/main/java/com/fs/wxcid/dto/friend/GetContactListRequest.java

@@ -0,0 +1,19 @@
+package com.fs.wxcid.dto.friend;
+
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * 分页获取全部联系人（含群聊）的请求参数
+ * 对应接口：/friend/GetContactList
+ */
+@Data
+public class GetContactListRequest {
+    /** 当前群聊联系人的序列号（用于分页） */
+    @JsonProperty("CurrentChatRoomContactSeq")
+    private Long CurrentChatRoomContactSeq;
+
+    /** 当前普通联系人的序列号（用于分页） */
+    @JsonProperty("CurrentWxcontactSeq")
+    private Long CurrentWxcontactSeq;
+}

fs-service/src/main/java/com/fs/wxcid/dto/friend/GetFriendRelationRequest.java

@@ -0,0 +1,15 @@
+package com.fs.wxcid.dto.friend;
+
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * 查询与指定用户的好友关系状态
+ * 对应接口：/friend/GetFriendRelation
+ */
+@Data
+public class GetFriendRelationRequest {
+    /** 目标用户的用户名（wxid） */
+    @JsonProperty("UserName")
+    private String UserName;
+}

fs-service/src/main/java/com/fs/wxcid/dto/friend/SearchContactRequest.java

@@ -0,0 +1,27 @@
+package com.fs.wxcid.dto.friend;
+
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * 搜索联系人请求参数
+ * 对应接口：/friend/SearchContact
+ */
+@Data
+public class SearchContactRequest {
+    /** 来源场景（如 0 表示通用搜索） */
+    @JsonProperty("FromScene")
+    private Integer FromScene;
+
+    /** 操作码（通常为 0） */
+    @JsonProperty("OpCode")
+    private Integer OpCode;
+
+    /** 搜索场景（如 0 表示按昵称/微信号搜索） */
+    @JsonProperty("SearchScene")
+    private Integer SearchScene;
+
+    /** 要搜索的用户名、昵称或微信号 */
+    @JsonProperty("UserName")
+    private String UserName;
+}

fs-service/src/main/java/com/fs/wxcid/dto/friend/UploadMContactRequest.java

@@ -0,0 +1,24 @@
+package com.fs.wxcid.dto.friend;
+
+import lombok.Data;
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * 上传手机通讯录以匹配微信好友
+ * 对应接口：/friend/UploadMContact
+ */
+@Data
+public class UploadMContactRequest {
+    /** 当前手机号（可选） */
+    @JsonProperty("Mobile")
+    private String Mobile;
+
+    /** 手机通讯录中的号码列表 */
+    @JsonProperty("MobileList")
+    private List<String> MobileList;
+
+    /** 操作码（通常为 0） */
+    @JsonProperty("Opcode") // 注意：此处是 Opcode（大写 O），非 OpCode
+    private Integer Opcode;
+}

fs-service/src/main/java/com/fs/wxcid/dto/friend/VerifyUserRequest.java

@@ -0,0 +1,7 @@
+package com.fs.wxcid.dto.friend;
+
+/**
+ * 验证/添加好友请求，结构与 AgreeAddRequest 完全一致
+ * 可复用或单独定义以增强语义
+ */
+public class VerifyUserRequest extends AgreeAddRequest {}

fs-service/src/main/java/com/fs/wxcid/dto/login/DeviceInfo.java

@@ -0,0 +1,21 @@
+package com.fs.wxcid.dto.login;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * 设备信息，用于模拟 Android 设备登录
+ */
+@Data
+public class DeviceInfo {
+    @JsonProperty("AndroidId")
+    private String androidId;         // Android 设备 ID
+
+    @JsonProperty("ImeI")
+    private String imei;              // IMEI 号（可伪造）
+
+    @JsonProperty("Manufacturer")
+    private String manufacturer;      // 厂商，如 "HUAWEI"
+
+    @JsonProperty("Model")
+    private String model;             // 型号，如 "P40"
+}

fs-service/src/main/java/com/fs/wxcid/dto/login/LoginRequest.java

@@ -0,0 +1,32 @@
+package com.fs.wxcid.dto.login;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+
+/**
+ * A16 数据登录 或 62账号密码登录 的通用请求参数
+ * <p>两者结构完全一致，可复用</p>
+ */
+@Data
+public class LoginRequest {
+
+    @JsonProperty("DeviceInfo")
+    private DeviceInfo deviceInfo;    // 模拟设备信息
+
+    @JsonProperty("LoginData")
+    private String loginData;         // 62数据 或 A16数据（Base64 编码）
+
+    @JsonProperty("Password")
+    private String password;          // 微信密码（部分登录方式需要）
+
+    @JsonProperty("Proxy")
+    private String proxy;             // 代理地址，格式：socks5://user:pass@ip:port
+
+    @JsonProperty("Ticket")
+    private String ticket;            // 登录票据（如扫码后的 ticket）
+
+    @JsonProperty("Type")
+    private Integer type;             // 登录类型，0 表示普通登录
+
+    @JsonProperty("UserName")
+    private String userName;          // 微信号 或 手机号
+}

fs-service/src/main/java/com/fs/wxcid/dto/login/QrCodeRequest.java

@@ -0,0 +1,19 @@
+package com.fs.wxcid.dto.login;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+
+/**
+ * 获取二维码请求（Car / Mac / iPad / Direct）
+ * */
+@Data
+public class QrCodeRequest {
+
+    @JsonProperty("Check")
+    private Boolean check;            // 是否检查环境（通常 false）
+
+    @JsonProperty("IpadOrmac")
+    private String ipadOrmac;         // 设备标识，如 "iPad" 或 "Mac"
+
+    @JsonProperty("Proxy")//"socks5://username:password@ipv4:port";
+    private String proxy="socks5://t16517392102382:1dhye1x5@d247.kdltpspro.com:15818";             // 代理地址（异地 IP 必填）
+}

fs-service/src/main/java/com/fs/wxcid/dto/login/SlideVerifyRequest.java

@@ -0,0 +1,21 @@
+package com.fs.wxcid.dto.login;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+
+/**
+ * 滑块验证
+ * */
+@Data
+public class SlideVerifyRequest {
+    @JsonProperty("data62")
+    private String data62;            // 62 数据
+
+    @JsonProperty("randstr")
+    private String randstr;           // 随机字符串（来自滑块验证）
+
+    @JsonProperty("slideticket")
+    private String slideTicket;       // 滑块验证票据
+
+    @JsonProperty("ticket")
+    private String ticket;            // 主登录票据
+}

fs-service/src/main/java/com/fs/wxcid/dto/login/VerifyCodeRequest.java

@@ -0,0 +1,20 @@
+package com.fs.wxcid.dto.login;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+
+/**
+ * iPad 登录时输入验证码的请求
+ */
+@Data
+public class VerifyCodeRequest {
+
+    @JsonProperty("code")
+    private String code;              // 用户输入的 6 位数字验证码
+
+    @JsonProperty("data62")
+    private String data62;            // 62 数据（用于恢复会话）
+
+    @JsonProperty("ticket")
+    private String ticket;            // 登录票据
+}

fs-service/src/main/java/com/fs/wxcid/dto/message/AddMessageMgrRequest.java

@@ -0,0 +1,16 @@
+package com.fs.wxcid.dto.message;
+
+import lombok.Data;
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * 添加消息到发送管理器（用于批量或延迟发送）
+ */
+@Data
+public class AddMessageMgrRequest {
+
+    /** 消息项列表 */
+    @JsonProperty("MsgItem")
+    private List<MsgItem> msgItemList;
+}

fs-service/src/main/java/com/fs/wxcid/dto/message/AppMessageItem.java

@@ -0,0 +1,16 @@
+package com.fs.wxcid.dto.message;
+
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+@Data
+public class AppMessageItem {
+    @JsonProperty("ContentType")
+    private Integer ContentType;
+
+    @JsonProperty("ContentXML")
+    private String ContentXML;
+
+    @JsonProperty("ToUserName")
+    private String ToUserName;
+}

fs-service/src/main/java/com/fs/wxcid/dto/message/CdnUploadVideoRequest.java

@@ -0,0 +1,17 @@
+package com.fs.wxcid.dto.message;
+
+import lombok.Data;
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+@Data
+public class CdnUploadVideoRequest {
+    @JsonProperty("ThumbData")
+    private List<Integer> ThumbData; // 实际应为 byte[]，但 Swagger 写 [0]，先用 List<Integer>
+
+    @JsonProperty("ToUserName")
+    private String ToUserName;
+
+    @JsonProperty("VideoData")
+    private List<Integer> VideoData;
+}

fs-service/src/main/java/com/fs/wxcid/dto/message/DownloadEmojiGifRequest.java

@@ -0,0 +1,16 @@
+package com.fs.wxcid.dto.message;
+
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * 下载表情 GIF 动图
+ * <p>需提供表情的 XML 描述内容</p>
+ */
+@Data
+public class DownloadEmojiGifRequest {
+
+    /** 表情的 XML 内容（来自消息体） */
+    @JsonProperty("xml_content")
+    private String xmlContent;
+}

fs-service/src/main/java/com/fs/wxcid/dto/message/EmojiItem.java

@@ -0,0 +1,23 @@
+package com.fs.wxcid.dto.message;
+
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * 表情信息项（用于发送或转发）
+ */
+@Data
+public class EmojiItem {
+
+    /** 表情 MD5 值（唯一标识） */
+    @JsonProperty("EmojiMd5")
+    private String emojiMd5;
+
+    /** 表情文件大小（字节） */
+    @JsonProperty("EmojiSize")
+    private Long emojiSize;
+
+    /** 接收者 wxid */
+    @JsonProperty("ToUserName")
+    private String toUserName;
+}

fs-service/src/main/java/com/fs/wxcid/dto/message/ForwardEmojiRequest.java

@@ -0,0 +1,15 @@
+package com.fs.wxcid.dto.message;
+
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * 转发表情（支持动图）
+ */
+@Data
+public class ForwardEmojiRequest {
+
+    /** 表情列表 */
+    @JsonProperty("EmojiList")
+    private java.util.List<EmojiItem> emojiList;
+}

fs-service/src/main/java/com/fs/wxcid/dto/message/ForwardImageItem.java

@@ -0,0 +1,25 @@
+package com.fs.wxcid.dto.message;
+
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * 转发图片项
+ */
+@Data
+public class ForwardImageItem {
+    @JsonProperty("AesKey")
+    private String aesKey;
+
+    @JsonProperty("CdnMidImgSize")
+    private Long cdnMidImgSize;
+
+    @JsonProperty("CdnMidImgUrl")
+    private String cdnMidImgUrl;
+
+    @JsonProperty("CdnThumbImgSize")
+    private Long cdnThumbImgSize;
+
+    @JsonProperty("ToUserName")
+    private String toUserName;
+}

fs-service/src/main/java/com/fs/wxcid/dto/message/ForwardImageMessageRequest.java

@@ -0,0 +1,16 @@
+package com.fs.wxcid.dto.message;
+
+import lombok.Data;
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+/**
+ * 转发图片消息请求（结构与视频转发相同）
+ */
+@Data
+public class ForwardImageMessageRequest {
+    @JsonProperty("ForwardImageList")
+    private List<ForwardImageItem> ForwardImageList;
+
+    @JsonProperty("ForwardVideoList")
+    private List<ForwardVideoItem> ForwardVideoList;
+}

fs-service/src/main/java/com/fs/wxcid/dto/message/ForwardVideoItem.java

@@ -0,0 +1,27 @@
+package com.fs.wxcid.dto.message;
+
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonProperty;
+/**
+ * 转发视频项
+ */
+@Data
+public class ForwardVideoItem {
+    @JsonProperty("AesKey")
+    private String AesKey;
+
+    @JsonProperty("CdnThumbLength")
+    private Integer CdnThumbLength;
+
+    @JsonProperty("CdnVideoUrl")
+    private String CdnVideoUrl;
+
+    @JsonProperty("Length")
+    private Integer Length;
+
+    @JsonProperty("PlayLength")
+    private Integer PlayLength;
+
+    @JsonProperty("ToUserName")
+    private String ToUserName;
+}

fs-service/src/main/java/com/fs/wxcid/dto/message/ForwardVideoMessageRequest.java

@@ -0,0 +1,5 @@
+package com.fs.wxcid.dto.message;
+/**
+ * 转发视频消息请求（结构与视频转发相同）
+ */
+public class ForwardVideoMessageRequest extends ForwardImageMessageRequest {}

fs-service/src/main/java/com/fs/wxcid/dto/message/GetMsgBigImgRequest.java

@@ -0,0 +1,34 @@
+package com.fs.wxcid.dto.message;
+
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * 获取高清图片（分片下载）
+ */
+@Data
+public class GetMsgBigImgRequest {
+    // 压缩类型，通常
+    @JsonProperty("CompressType")
+    private Integer compressType;
+
+    // 消息发送者
+    @JsonProperty("FromUserName")
+    private String fromUserName;
+
+    // 消息 ID
+    @JsonProperty("MsgId")
+    private Long msgId;
+
+    // 分片信息
+    @JsonProperty("Section")
+    private Section section;
+
+    // 当前账号 wxid
+    @JsonProperty("ToUserName")
+    private String toUserName;
+
+    // 文件总长度
+    @JsonProperty("TotalLen")
+    private Long totalLen;
+}

fs-service/src/main/java/com/fs/wxcid/dto/message/GetMsgVideoRequest.java

@@ -0,0 +1,3 @@
+package com.fs.wxcid.dto.message;
+
+public class GetMsgVideoRequest extends GetMsgBigImgRequest {}

fs-service/src/main/java/com/fs/wxcid/dto/message/GetMsgVoiceRequest.java

@@ -0,0 +1,19 @@
+package com.fs.wxcid.dto.message;
+
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+@Data
+public class GetMsgVoiceRequest {
+    @JsonProperty("Bufid")
+    private String Bufid;
+
+    @JsonProperty("Length")
+    private Integer Length;
+
+    @JsonProperty("NewMsgId")
+    private String NewMsgId;
+
+    @JsonProperty("ToUserName")
+    private String ToUserName;
+}

fs-service/src/main/java/com/fs/wxcid/dto/message/GroupMassMsgImageRequest.java

@@ -0,0 +1,14 @@
+package com.fs.wxcid.dto.message;
+
+import lombok.Data;
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+@Data
+public class GroupMassMsgImageRequest {
+    @JsonProperty("ImageBase64")
+    private String ImageBase64;
+
+    @JsonProperty("ToUserName")
+    private List<String> ToUserName;
+}

fs-service/src/main/java/com/fs/wxcid/dto/message/GroupMassMsgTextRequest.java

@@ -0,0 +1,14 @@
+package com.fs.wxcid.dto.message;
+
+import lombok.Data;
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+@Data
+public class GroupMassMsgTextRequest {
+    @JsonProperty("Content")
+    private String Content;
+
+    @JsonProperty("ToUserName")
+    private List<String> ToUserName;
+}

fs-service/src/main/java/com/fs/wxcid/dto/message/HttpSyncMsgRequest.java

@@ -0,0 +1,10 @@
+package com.fs.wxcid.dto.message;
+
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+@Data
+public class HttpSyncMsgRequest {
+    @JsonProperty("Count")
+    private Integer Count;
+}

fs-service/src/main/java/com/fs/wxcid/dto/message/MsgItem.java

@@ -0,0 +1,37 @@
+package com.fs.wxcid.dto.message;
+
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import java.util.List;
+
+/**
+ * 通用消息项，用于发送文本、图片等
+ * <p>注意：不同接口中字段含义可能略有差异</p>
+ */
+@Data
+public class MsgItem {
+
+    /** 要 @ 的用户 wxid 列表（仅群聊有效） */
+    @JsonProperty("AtWxIDList")
+    private List<String> AtWxIDList;
+
+    /** 图片内容（Base64 编码），用于 SendImageMessage 等 */
+    @JsonProperty("ImageContent")
+    private String ImageContent;
+
+    /** 消息类型：
+     *  1 = 文本，
+     *  2 = 图片
+     *  其他值请参考协议文档 */
+    @JsonProperty("MsgType")
+    private Integer MsgType;
+
+    /** 文本消息内容 */
+    @JsonProperty("TextContent")
+    private String TextContent;
+
+    /** 接收者 wxid（好友或群） */
+    @JsonProperty("ToUserName")
+    private String ToUserName;
+}

fs-service/src/main/java/com/fs/wxcid/dto/message/RevokeMsgNewRequest.java

@@ -0,0 +1,3 @@
+package com.fs.wxcid.dto.message;
+
+public class RevokeMsgNewRequest extends RevokeMsgRequest {}

fs-service/src/main/java/com/fs/wxcid/dto/message/RevokeMsgRequest.java

@@ -0,0 +1,25 @@
+package com.fs.wxcid.dto.message;
+
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+@Data
+public class RevokeMsgRequest {
+    @JsonProperty("ClientImgIdStr")
+    private String ClientImgIdStr;
+
+    @JsonProperty("ClientMsgId")
+    private Long ClientMsgId;
+
+    @JsonProperty("CreateTime")
+    private Long CreateTime;
+
+    @JsonProperty("IsImage")
+    private Boolean IsImage;
+
+    @JsonProperty("NewMsgId")
+    private String NewMsgId;
+
+    @JsonProperty("ToUserName")
+    private String ToUserName;
+}

fs-service/src/main/java/com/fs/wxcid/dto/message/Section.java

@@ -0,0 +1,18 @@
+package com.fs.wxcid.dto.message;
+
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * 文件分片信息（用于高清图/视频下载）
+ */
+@Data
+public class Section {
+    // 本次请求的数据长度
+    @JsonProperty("DataLen")
+    private Long dataLen;
+
+    // 起始偏移位置
+    @JsonProperty("StartPos")
+    private Long startPos;
+}

fs-service/src/main/java/com/fs/wxcid/dto/message/SendAppMessageRequest.java

@@ -0,0 +1,11 @@
+package com.fs.wxcid.dto.message;
+
+import lombok.Data;
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+@Data
+public class SendAppMessageRequest {
+    @JsonProperty("AppList")
+    private List<AppMessageItem> AppList;
+}

fs-service/src/main/java/com/fs/wxcid/dto/message/SendEmojiMessageRequest.java

@@ -0,0 +1,11 @@
+package com.fs.wxcid.dto.message;
+
+import lombok.Data;
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+@Data
+public class SendEmojiMessageRequest {
+    @JsonProperty("EmojiList")
+    private List<EmojiItem> EmojiList;
+}

fs-service/src/main/java/com/fs/wxcid/dto/message/SendImageMessageRequest.java

@@ -0,0 +1,3 @@
+package com.fs.wxcid.dto.message;
+
+public class SendImageMessageRequest extends SendTextMessageRequest {}

fs-service/src/main/java/com/fs/wxcid/dto/message/SendImageNewMessageRequest.java

@@ -0,0 +1,3 @@
+package com.fs.wxcid.dto.message;
+
+public class SendImageNewMessageRequest extends SendTextMessageRequest {}

fs-service/src/main/java/com/fs/wxcid/dto/message/SendTextMessageRequest.java

@@ -0,0 +1,11 @@
+package com.fs.wxcid.dto.message;
+
+import lombok.Data;
+import java.util.List;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+@Data
+public class SendTextMessageRequest {
+    @JsonProperty("MsgItem")
+    private List<MsgItem> MsgItem;
+}

fs-service/src/main/java/com/fs/wxcid/dto/message/SendVoiceRequest.java

@@ -0,0 +1,19 @@
+package com.fs.wxcid.dto.message;
+
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+@Data
+public class SendVoiceRequest {
+    @JsonProperty("ToUserName")
+    private String ToUserName;
+
+    @JsonProperty("VoiceData")
+    private String VoiceData; // Base64 or binary string
+
+    @JsonProperty("VoiceFormat")
+    private Integer VoiceFormat;
+
+    @JsonProperty("VoiceSecond,") // 注意：Swagger 有逗号 typo！
+    private Integer VoiceSecond;
+}

fs-service/src/main/java/com/fs/wxcid/dto/message/ShareCardMessageRequest.java

@@ -0,0 +1,22 @@
+package com.fs.wxcid.dto.message;
+
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+@Data
+public class ShareCardMessageRequest {
+    @JsonProperty("CardAlias")
+    private String CardAlias;
+
+    @JsonProperty("CardFlag")
+    private Integer CardFlag;
+
+    @JsonProperty("CardNickName")
+    private String CardNickName;
+
+    @JsonProperty("CardWxId")
+    private String CardWxId;
+
+    @JsonProperty("ToUserName")
+    private String ToUserName;
+}

fs-service/src/main/java/com/fs/wxcid/dto/user/DelayAuthKeyRequest.java

@@ -0,0 +1,10 @@
+package com.fs.wxcid.dto.user;
+
+import lombok.Data;
+
+@Data
+public class DelayAuthKeyRequest {
+    private Integer Days;
+    private String ExpiryDate; // 可为空
+    private String Key;
+}

fs-service/src/main/java/com/fs/wxcid/dto/user/DeleteAuthKeyRequest.java

@@ -0,0 +1,9 @@
+package com.fs.wxcid.dto.user;
+
+import lombok.Data;
+
+@Data
+public class DeleteAuthKeyRequest {
+    private String Key;
+    private Integer Opt; // 0 或其他
+}

fs-service/src/main/java/com/fs/wxcid/dto/user/DisableAuthKeyRequest.java

@@ -0,0 +1,9 @@
+package com.fs.wxcid.dto.user;
+
+import lombok.Data;
+
+@Data
+public class DisableAuthKeyRequest {
+    private Integer IsBanned; // 0=不禁用, 1=禁用？
+    private String Key;
+}

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

@@ -0,0 +1,39 @@
+package com.fs.wxcid.service;
+
+
+import com.fs.wxcid.dto.common.ApiResponse;
+import com.fs.wxcid.dto.admin.GenAuthKey1Request;
+import com.fs.wxcid.dto.admin.GenAuthKey3Request;
+import com.fs.wxcid.dto.user.DelayAuthKeyRequest;
+import com.fs.wxcid.dto.user.DeleteAuthKeyRequest;
+import com.fs.wxcid.dto.user.DisableAuthKeyRequest;
+
+public interface AdminLicenseService {
+
+    // 授权码延期
+    ApiResponse delayAuthKey(String key, DelayAuthKeyRequest request);
+
+    // 删除授权码
+    ApiResponse deleteAuthKey(String key, DeleteAuthKeyRequest request);
+
+    // 禁用授权码
+    ApiResponse disableAuthKey(String key, DisableAuthKeyRequest request);
+
+    // 生成授权码（新设备）- POST 版本
+    ApiResponse genAuthKey1(String key, GenAuthKey1Request request);
+
+    // 生成授权码（新设备）- GET 版本（无参）
+    ApiResponse genAuthKey2(String key);
+
+    // 生成授权码（按类型：日/周/月...）
+    ApiResponse genAuthKey3(String key, GenAuthKey3Request request);
+
+    // 查询所有激活状态的卡密
+    ApiResponse getActiveLicenseKeys(String key);
+
+    // 获取代理映射列表
+    ApiResponse getProxyMappingList(String key);
+
+    // 同步卡密激活状态（HTTP 轮询）
+    ApiResponse httpSyncLicenseKey(String key);
+}

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

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

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

@@ -0,0 +1,39 @@
+package com.fs.wxcid.service;
+
+import com.fs.wxcid.dto.common.ApiResponse;
+import com.fs.wxcid.dto.login.LoginRequest;
+import com.fs.wxcid.dto.login.QrCodeRequest;
+import com.fs.wxcid.dto.login.SlideVerifyRequest;
+import com.fs.wxcid.dto.login.VerifyCodeRequest;
+/**
+ * 微信登录服务接口
+ * <p>封装所有 /login/* 接口，支持多种登录方式</p>
+ */
+public interface LoginService {
+
+    // —————— 账号密码 / 62 / A16 登录 ——————
+    ApiResponse a16Login(String authKey, LoginRequest request);
+    ApiResponse deviceLogin(String authKey, LoginRequest request);
+
+    // —————— 二维码登录（iPad / Mac / 车载） ——————
+    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 authKey);// 检测是否可设昵称（判断登录环境）
+    ApiResponse checkLoginStatus(String authKey);// 检测扫码是否完成
+    ApiResponse getLoginStatus(String authKey);// 获取当前在线状态
+
+    // —————— 数据管理 ——————
+    ApiResponse get62Data(String authKey);            // 提取 62 数据（用于免密登录）
+
+    // —————— 验证码与滑块 ——————
+    ApiResponse verifyCode(String authKey, VerifyCodeRequest request);
+    ApiResponse verifyCodeSlide(String authKey, SlideVerifyRequest request);
+
+    // —————— 控制 ——————
+    ApiResponse wakeUpLogin(String authKey, QrCodeRequest request); // 唤醒扫码登录
+    ApiResponse logOut(String authKey);                // 退出登录
+}

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

@@ -0,0 +1,47 @@
+package com.fs.wxcid.service;
+
+import com.fs.wxcid.dto.callback.ReturnMessage;
+import com.fs.wxcid.dto.common.ApiResponse;
+import com.fs.wxcid.dto.callback.CallbackConfigRequest;
+
+import java.util.Map;
+
+public interface MessageCallbackService {
+
+    /**
+     * 接收消息回调内容
+     * <p>对应接口：POST /message/Callback</p>
+     *
+     * @param callback 回调内容
+     * @return 统一响应结果
+     */
+    ReturnMessage returnMessage(Map<String, Object> callback);
+    /**
+     * 设置消息回调地址并启用/禁用推送
+     * <p>对应接口：POST /message/SetCallback</p>
+     *
+     * @param authKey     账号唯一标识
+     * @param config 回调配置（URL + 启用状态）
+     * @return 统一响应结果
+     */
+    ApiResponse setCallback(String authKey, CallbackConfigRequest config);
+
+    /**
+     * 获取当前账号的消息回调配置
+     * <p>对应接口：GET /message/GetCallback</p>
+     *
+     * @param authKey 账号唯一标识
+     * @return 包含 CallbackURL 和 Enabled 状态的响应
+     */
+    ApiResponse getCallback(String authKey);
+
+    /**
+     * 删除（清空）消息回调配置
+     * <p>执行后将不再推送任何消息到原回调地址</p>
+     * <p>对应接口：GET /message/DeleteCallback</p>
+     *
+     * @param authKey 账号唯一标识
+     * @return 操作结果
+     */
+    ApiResponse deleteCallback(String authKey);
+}

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

@@ -0,0 +1,32 @@
+package com.fs.wxcid.service;
+
+
+import com.fs.wxcid.dto.common.ApiResponse;
+import com.fs.wxcid.dto.message.GetMsgBigImgRequest;
+import com.fs.wxcid.dto.message.*;
+
+public interface MessageService {
+
+    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/AdminLicenseServiceImpl.java

@@ -0,0 +1,96 @@
+package com.fs.wxcid.service.impl;
+
+import com.fs.wxcid.dto.common.ApiResponse;
+import com.fs.wxcid.dto.admin.GenAuthKey1Request;
+import com.fs.wxcid.dto.admin.GenAuthKey3Request;
+import com.fs.wxcid.dto.user.DelayAuthKeyRequest;
+import com.fs.wxcid.dto.user.DeleteAuthKeyRequest;
+import com.fs.wxcid.dto.user.DisableAuthKeyRequest;
+import com.fs.wxcid.service.AdminLicenseService;
+import com.fs.wxwork.utils.WxWorkHttpUtil;
+import com.alibaba.fastjson.TypeReference;
+import org.springframework.stereotype.Service;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@Service
+public class AdminLicenseServiceImpl implements AdminLicenseService {
+
+    private static final String BASE_URL = "http://114.117.215.244:7006";
+
+
+    @Override
+    public ApiResponse delayAuthKey(String key, DelayAuthKeyRequest request) {
+        return post("/admin/DelayAuthKey", key, request);
+    }
+
+    @Override
+    public ApiResponse deleteAuthKey(String key, DeleteAuthKeyRequest request) {
+        return post("/admin/DeleteAuthKey", key, request);
+    }
+
+    @Override
+    public ApiResponse disableAuthKey(String key, DisableAuthKeyRequest request) {
+        return post("/admin/DisableAuthKey", key, request);
+    }
+
+    @Override
+    public ApiResponse genAuthKey1(String key, GenAuthKey1Request request) {
+        return get("/admin/GenAuthKey1", key);
+    }
+
+    @Override
+    public ApiResponse genAuthKey2(String key) {
+        return get("/admin/GenAuthKey2", key);
+    }
+
+    @Override
+    public ApiResponse genAuthKey3(String key, GenAuthKey3Request request) {
+        return post("/admin/GenAuthKey3", key, request);
+    }
+
+    @Override
+    public ApiResponse getActiveLicenseKeys(String key) {
+        return get("/admin/GetActiveLicenseKeys", key);
+    }
+
+    @Override
+    public ApiResponse getProxyMappingList(String key) {
+        return get("/admin/GetProxyMappingList", key);
+    }
+
+    @Override
+    public ApiResponse httpSyncLicenseKey(String key) {
+        return get("/admin/HttpSyncLicenseKey", key);
+    }
+
+    // ------------------ 工具方法 ------------------
+    /**
+     * 通用 POST 请求方法
+     *
+     * @param path   接口路径，如 "/friend/AgreeAdd"
+     * @param key    账号唯一标识（query 参数）
+     * @param request 请求体对象
+     * @return 统一响应结果
+     */
+    private ApiResponse post(String path, String key, Object request) {
+        String url = BASE_URL + path + "?key=" + key;
+        return WxWorkHttpUtil.postWithType(url, request, new TypeReference<ApiResponse>() {});
+    }
+
+    /**
+     * 通用 GET 请求方法（无请求体）
+     *
+     * @param path 接口路径
+     * @param key  账号唯一标识
+     * @return 统一响应结果
+     */
+    private ApiResponse get(String path, String key) {
+        String url = BASE_URL + path;
+        Map<String, Object> params = new HashMap<>();
+        params.put("key", key);
+        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/FriendServiceImpl.java

@@ -0,0 +1,107 @@
+package com.fs.wxcid.service.impl;
+
+import com.fs.wxcid.dto.common.ApiResponse;
+import com.fs.wxcid.dto.friend.*;
+import com.fs.wxcid.service.FriendService;
+import com.fs.wxwork.utils.WxWorkHttpUtil;
+import com.alibaba.fastjson.TypeReference;
+import org.springframework.stereotype.Service;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 好友管理服务实现类
+ * 调用微信私有 API 的 /friend 模块
+ */
+@Service
+public class FriendServiceImpl implements FriendService {
+
+    /** 微信接口基础 URL */
+    private static final String BASE_URL = "http://114.117.215.244:7006";
+
+
+    @Override
+    public ApiResponse agreeAdd(String authKey, AgreeAddRequest request) {
+        return post("/friend/AgreeAdd", authKey, request);
+    }
+
+    @Override
+    public ApiResponse delContact(String authKey, DelContactRequest request) {
+        return post("/friend/DelContact", authKey, request);
+    }
+
+    @Override
+    public ApiResponse getContactDetailsList(String authKey, GetContactDetailsListRequest request) {
+        return post("/friend/GetContactDetailsList", authKey, request);
+    }
+
+    @Override
+    public ApiResponse getContactList(String authKey, GetContactListRequest request) {
+        return post("/friend/GetContactList", authKey, request);
+    }
+
+    @Override
+    public ApiResponse getFriendRelation(String authKey, GetFriendRelationRequest request) {
+        return post("/friend/GetFriendRelation", authKey, request);
+    }
+
+    @Override
+    public ApiResponse getGHList(String authKey) {
+        return get("/friend/GetGHList", authKey);
+    }
+
+    @Override
+    public ApiResponse getMFriend(String authKey) {
+        return get("/friend/GetMFriend", authKey);
+    }
+
+    @Override
+    public ApiResponse getGroupList(String authKey) {
+        return get("/friend/GroupList", authKey);
+    }
+
+    @Override
+    public ApiResponse searchContact(String authKey, SearchContactRequest request) {
+        return post("/friend/SearchContact", authKey, request);
+    }
+
+    @Override
+    public ApiResponse uploadMContact(String authKey, UploadMContactRequest request) {
+        return post("/friend/UploadMContact", authKey, request);
+    }
+
+    @Override
+    public ApiResponse verifyUser(String authKey, VerifyUserRequest request) {
+        return post("/friend/VerifyUser", authKey, request);
+    }
+
+    // ------------------ 工具方法 ------------------
+    /**
+     * 通用 POST 请求方法
+     *
+     * @param path   接口路径，如 "/friend/AgreeAdd"
+     * @param authKey    账号唯一标识（query 参数）
+     * @param request 请求体对象
+     * @return 统一响应结果
+     */
+    private ApiResponse post(String path, String authKey, Object request) {
+        String url = BASE_URL + path + "?key=" + authKey;
+        return WxWorkHttpUtil.postWithType(url, request, new TypeReference<ApiResponse>() {});
+    }
+
+    /**
+     * 通用 GET 请求方法（无请求体）
+     *
+     * @param path 接口路径
+     * @param authKey  账号唯一标识
+     * @return 统一响应结果
+     */
+    private ApiResponse get(String path, String authKey) {
+        String url = BASE_URL + path;
+        Map<String, Object> params = new HashMap<>();
+        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

@@ -0,0 +1,113 @@
+package com.fs.wxcid.service.impl;
+
+import com.fs.wxcid.dto.common.ApiResponse;
+import com.fs.wxcid.dto.login.LoginRequest;
+import com.fs.wxcid.dto.login.QrCodeRequest;
+import com.fs.wxcid.dto.login.SlideVerifyRequest;
+import com.fs.wxcid.dto.login.VerifyCodeRequest;
+import com.fs.wxcid.service.LoginService;
+import com.fs.wxwork.utils.WxWorkHttpUtil;
+import com.alibaba.fastjson.TypeReference;
+import org.springframework.stereotype.Service;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@Service
+public class LoginServiceImpl implements LoginService {
+
+    private static final String BASE_URL = "http://114.117.215.244:7006";
+
+    // ------------------ 账号密码登录 ------------------
+
+    public ApiResponse a16Login(String authKey, LoginRequest request) {
+        return post("/login/A16Login", authKey, request);
+    }
+
+    public ApiResponse deviceLogin(String authKey, LoginRequest request) {
+        return post("/login/DeviceLogin", authKey, request);
+    }
+
+    // ------------------ 二维码登录 ------------------
+
+    public ApiResponse getLoginQrCodeNew(String authKey, QrCodeRequest request) {
+        return post("/login/GetLoginQrCodeNew", authKey, request);
+    }
+
+    public ApiResponse getLoginQrCodeNewDirect(String authKey, QrCodeRequest request) {
+        return post("/login/GetLoginQrCodeNewDirect", authKey, request);
+    }
+
+    public ApiResponse macLogin(String authKey, QrCodeRequest request) {
+        return post("/login/MacLogin", authKey, request);
+    }
+
+    public ApiResponse carLogin(String authKey, QrCodeRequest request) {
+        return post("/login/CarLogin", authKey, request);
+    }
+
+    public ApiResponse wakeUpLogin(String authKey, QrCodeRequest request) {
+        return post("/login/WakeUpLogin", authKey, request);
+    }
+
+    // ------------------ 状态检测 ------------------
+
+    public ApiResponse checkCanSetAlias(String authKey) {
+        return get("/login/CheckCanSetAlias", authKey);
+    }
+
+    public ApiResponse checkLoginStatus(String authKey) {
+        return get("/login/CheckLoginStatus", authKey);
+    }
+
+    public ApiResponse getLoginStatus(String authKey) {
+        return get("/login/GetLoginStatus", authKey);
+    }
+
+    public ApiResponse get62Data(String authKey) {
+        return get("/login/Get62Data", authKey);
+    }
+
+    public ApiResponse logOut(String authKey) {
+        return get("/login/LogOut", authKey);
+    }
+
+    // ------------------ 验证 ------------------
+
+    public ApiResponse verifyCode(String authKey, VerifyCodeRequest request) {
+        return post("/login/VerifyCode", authKey, request);
+    }
+
+    public ApiResponse verifyCodeSlide(String authKey, SlideVerifyRequest request) {
+        return post("/login/VerifyCodeSlide", authKey, request);
+    }
+
+    // ------------------ 工具方法 ------------------
+    /**
+     * 通用 POST 请求方法
+     *
+     * @param path   接口路径，如 "/friend/AgreeAdd"
+     * @param authKey    账号唯一标识（query 参数）
+     * @param request 请求体对象
+     * @return 统一响应结果
+     */
+    private ApiResponse post(String path, String authKey, Object request) {
+        String url = BASE_URL + path + "?key=" + authKey;
+        return WxWorkHttpUtil.postWithType(url, request, new TypeReference<ApiResponse>() {});
+    }
+
+    /**
+     * 通用 GET 请求方法（无请求体）
+     *
+     * @param path 接口路径
+     * @param authKey  账号唯一标识
+     * @return 统一响应结果
+     */
+    private ApiResponse get(String path, String authKey) {
+        String url = BASE_URL + path;
+        Map<String, Object> params = new HashMap<>();
+        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

@@ -0,0 +1,95 @@
+package com.fs.wxcid.service.impl;
+
+
+import com.fs.wxcid.dto.callback.ReturnMessage;
+import com.fs.wxcid.dto.common.ApiResponse;
+import com.fs.wxcid.dto.callback.CallbackConfigRequest;
+import com.fs.wxcid.service.MessageCallbackService;
+import com.fs.wxwork.utils.WxWorkHttpUtil;
+import com.alibaba.fastjson.TypeReference;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import java.util.HashMap;
+import java.util.Map;
+@Slf4j
+@Service
+public class MessageCallbackServiceImpl implements MessageCallbackService {
+
+    private static final String BASE_URL = "http://114.117.215.244:7006";
+
+    @Override
+    public ReturnMessage returnMessage(Map<String, Object> callback) {
+        // 安全地获取 authKey
+        String authKey = (String) callback.get("authKey");
+
+        // 获取 message 子对象（也是一个 Map）
+        Map<String, Object> message = (Map<String, Object>) callback.get("message");
+        ReturnMessage returnMessage=new ReturnMessage();
+        if (message != null) {
+            // 获取嵌套的 from_user_name -> str
+            Map<String, String> fromUser = (Map<String, String>) message.get("from_user_name");
+            String fromWxId = fromUser != null ? fromUser.get("str") : null;
+
+            // 获取 content
+            Map<String, String> contentWrapper = (Map<String, String>) message.get("content");
+            String text = contentWrapper != null ? contentWrapper.get("str") : null;
+
+            returnMessage.setFromWxId(fromWxId);
+            returnMessage.setText(text);
+        }
+        log.info("接收到回调消息,发送者id:{},发送内容:{}", returnMessage.getFromWxId(),returnMessage.getText());
+        return returnMessage;
+    }
+
+    /**
+     * 设置消息回调
+     */
+    public ApiResponse setCallback(String authKey, CallbackConfigRequest config) {
+        return post("/message/SetCallback", authKey, config);
+    }
+
+    /**
+     * 获取消息回调配置
+     */
+    public ApiResponse getCallback(String authKey) {
+        return get("/message/GetCallback", authKey);
+    }
+
+    /**
+     * 删除消息回调配置
+     */
+    public ApiResponse deleteCallback(String authKey) {
+        return get("/message/DeleteCallback", authKey);
+    }
+
+
+    // ------------------ 工具方法 ------------------
+    /**
+     * 通用 POST 请求方法
+     *
+     * @param path   接口路径，如 "/friend/AgreeAdd"
+     * @param authKey    账号唯一标识（query 参数）
+     * @param request 请求体对象
+     * @return 统一响应结果
+     */
+    private ApiResponse post(String path, String authKey, Object request) {
+        String url = BASE_URL + path + "?key=" + authKey;
+        return WxWorkHttpUtil.postWithType(url, request, new TypeReference<ApiResponse>() {});
+    }
+
+    /**
+     * 通用 GET 请求方法（无请求体）
+     *
+     * @param path 接口路径
+     * @param authKey  账号唯一标识
+     * @return 统一响应结果
+     */
+    private ApiResponse get(String path, String authKey) {
+        String url = BASE_URL + path;
+        Map<String, Object> params = new HashMap<>();
+        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

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

fs-service/src/main/resources/application-config-druid-bjzm-test.yml

@@ -71,7 +71,7 @@ nuonuo:
 tencent_cloud_config:
   secret_id: AKIDiMq9lDf2EOM9lIfqqfKo7FNgM5meD0sT
   secret_key: u5SuS80342xzx8FRBukza9lVNHKNMSaB
-  bucket: bjzm-1323137866
+  bucket: bjzmky-1323137866
   app_id: 1323137866
   region: ap-chongqing
   proxy: bjzm

fs-service/src/main/resources/application-config-druid-cfryt.yml

@@ -60,8 +60,14 @@ watch:
   password3: v9xsKuqn_$d2y
 
 fs :
-  commonApi: http://159.75.111.224:8010
-  h5CommonApi: http://159.75.111.224:8010
+  commonApi: http://172.26.180.67:7771
+  h5CommonApi: http://172.26.180.67:7771
+  jwt:
+    # 加密秘钥
+    secret: f4e2e52034348f86b6d81e581c19jeb4
+    # token有效时长，7天，单位秒
+    expire: 31536000
+    header: AppToken
 nuonuo:
   key: 10924508
   secret: A2EB20764D304D16

fs-service/src/main/resources/application-config-druid-gzzdy.yml

@@ -87,7 +87,7 @@ cloud_host:
 headerImg:
   imgUrl:
 ipad:
-  ipadUrl: http://ipad.dingdangtcm.cn
+  ipadUrl: http://175.178.218.55:8667
   aiApi: http://
   voiceApi: http://123.207.48.104:8009
   commonApi: http://123.207.48.104:7771

fs-service/src/main/resources/mapper/course/FsCourseTrafficLogMapper.xml

@@ -253,7 +253,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="startDate != null and endDate != null">
                 and DATE_FORMAT(create_time, '%Y-%m-%d') between #{startDate} AND #{endDate}
             </if>
-            <if test='companyId !=null'>
+            <if test="companyId !=null">
                 and company_id = #{companyId}
             </if>
             <if test="courseId != null">

fs-service/src/main/resources/mapper/his/FsUserWxMapper.xml

@@ -16,4 +16,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             open_id     = VALUES(open_id),
             update_time = VALUES(update_time)
     </insert>
+
+    <select id="getFsUserWcByUserIdAndAppId" resultType="com.fs.his.domain.FsUserWx">
+        select * from fs_user_wx where fs_user_id = #{fsUserId} and app_id = #{appId} limit 1
+    </select>
 </mapper>

fs-service/src/main/resources/mapper/qw/QwIpadServerUserMapper.xml

@@ -88,4 +88,10 @@
             #{id}
         </foreach>
     </delete>
+    <delete id="deleteQwIpadServerUserByQwUserIds">
+        delete from qw_ipad_server_user where qw_user_id in
+        <foreach item="id" collection="ids" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
 </mapper>

fs-service/src/main/resources/mapper/qw/QwUserMapper.xml

@@ -257,6 +257,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <update id="updateSendType">
         update qw_user set send_msg_type = #{type} where id in <foreach collection="ids" open="(" close=")" separator="," item="item">#{item}</foreach>
     </update>
+    <update id="batchUpdateUnbind">
+        update qw_user set server_id = null , server_status = 0 , ipad_status = 0 where id in
+        <foreach collection="ids" open="(" close=")" separator="," item="id">
+            #{id}
+        </foreach>
+    </update>
 
     <select id="selectOfflineUser" resultType="com.fs.qw.domain.QwUser">
         select * from qw_user where send_msg_type = 2 and server_id is not null and server_status = 1 and ipad_status = 1 limit 1
@@ -309,5 +315,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectQwUserVo"/>
         where  server_status = 1
     </select>
+    <select id="selectQwUserByServerIds" resultType="com.fs.qw.domain.QwUser">
+        <include refid="selectQwUserVo"/>
+        where  server_id in
+         <foreach collection="serverIds" item="serverId" open="(" close=")" separator=",">
+             #{serverId}
+         </foreach>
+    </select>
 
 </mapper>

fs-user-app/src/main/java/com/fs/app/controller/course/CourseQwLoginController.java

@@ -119,6 +119,7 @@ public class CourseQwLoginController extends AppBaseController {
             if(user != null){
                 FsUser userMap = new FsUser();
                 userMap.setUserId(user.getUserId());
+                userMap.setMaOpenId(session.getOpenid());
 //                userMap.setCourseMaOpenId(session.getOpenid());
                 userMap.setUpdateTime(new DateTime());
                 userService.updateFsUser(userMap);
@@ -129,6 +130,7 @@ public class CourseQwLoginController extends AppBaseController {
                 user.setNickName("微信用户");
                 user.setAvatar("https://hos-1309931967.cos.ap-chongqing.myqcloud.com/fs/20230725/a848605591384ec29d49773dd58d9345.jpg");
                 user.setStatus(1);
+                user.setMaOpenId(session.getOpenid());
 //                user.setCourseMaOpenId(session.getOpenid());
                 user.setUnionId(session.getUnionid());
                 user.setCreateTime(new Date());

fs-user-app/src/main/java/com/fs/app/controller/store/UserScrmController.java

@@ -19,10 +19,14 @@ import com.fs.common.param.BaseQueryParam;
 import com.fs.core.config.WxMaConfiguration;
 import com.fs.course.param.newfs.FsUserCourseBeMemberParam;
 import com.fs.course.service.IFsUserCourseVideoService;
+import com.fs.his.domain.FsUserWx;
+import com.fs.his.mapper.FsUserWxMapper;
+import com.fs.his.utils.ConfigUtil;
 import com.fs.hisStore.domain.FsStoreOrderScrm;
 import com.fs.hisStore.domain.FsUserBillScrm;
 import com.fs.hisStore.domain.FsUserPromoterApplyScrm;
 import com.fs.hisStore.domain.FsUserScrm;
+import com.fs.hisStore.enums.SysConfigEnum;
 import com.fs.hisStore.param.*;
 import com.fs.hisStore.service.*;
 import com.fs.hisStore.vo.*;
@@ -95,6 +99,11 @@ public class UserScrmController extends AppBaseController {
     @Autowired
     private ILiveOrderService liveOrderService;
 
+    @Autowired
+    private ConfigUtil configUtil;
+
+    @Autowired
+    FsUserWxMapper fsUserWxMapper;
     /**
      * 获取用户信息
      * @param request
@@ -103,6 +112,15 @@ public class UserScrmController extends AppBaseController {
     @ApiOperation("获取用户信息")
     @GetMapping("/getUserInfo")
     public R getUserInfo(HttpServletRequest request){
+
+        String queryAppId = null;
+        // 获取请求头中的 appid
+        String appid = request.getHeader("appid");
+        if(StringUtils.isNotEmpty(appid)){
+                queryAppId =  appid;
+        }else{
+            queryAppId = configUtil.generateConfigByKey(SysConfigEnum.COURSE_MA_CONFIG.getKey()).getString("appid");
+        }
         try {
             FsUserScrm user=userService.selectFsUserById(Long.parseLong(getUserId()));
             if (user.getIsShow() !=null && user.getIsShow() == 0){
@@ -115,8 +133,16 @@ public class UserScrmController extends AppBaseController {
                         user.setIsShow(1);
                     }
                 }
-
             }
+            if( null != user && StringUtils.isBlank(user.getMaOpenId()) && null != user.getUserId() && null != queryAppId){
+                 log.info("用户没有maOpenId:{}",user);
+                 //从fsUserWx里面去进行查询数据
+                FsUserWx fsUserWx = fsUserWxMapper.getFsUserWcByUserIdAndAppId(user.getUserId(), queryAppId);
+                if(null != fsUserWx){
+                    user.setMaOpenId(fsUserWx.getOpenId());
+                }
+            }
+
             return R.ok().put("user",user);
         } catch (Exception e){
             log.error("【获取用户信息】：{}",e);

fs-user-app/src/main/java/com/fs/app/controller/store/WxUserScrmController.java

@@ -280,6 +280,7 @@ public class WxUserScrmController extends AppBaseController {
         final WxMaService wxService = WxMaConfiguration.getMaService(courseMa_appId);
         try {
             WxMaJscode2SessionResult session = wxService.getUserService().getSessionInfo(param.getCode());
+            logger.info("session 得到：{}" , session);
             // 解密
             WxMaPhoneNumberInfo phoneNoInfo = wxService.getUserService().getPhoneNoInfo(session.getSessionKey(), param.getEncryptedData(), param.getIv());
             FsUserScrm user=new FsUserScrm();
@@ -320,6 +321,7 @@ public class WxUserScrmController extends AppBaseController {
                     if (!updatedAppId.equals(checkPhone.getAppId())) {
                         userMap.setAppId(updatedAppId);
                     }
+                    logger.info("=====用户======:{}",updatedAppId);
                     userService.updateFsUser(userMap);
                 }
                 else{