Merge remote-tracking branch 'origin/master'

ms-biz/src/main/java/com/ms/api/spi/callback/MemberAuthCallback.java

@@ -44,8 +44,7 @@ public class MemberAuthCallback extends SPIBaseService implements ExtensionServi
         // ----参数校验----
         MemberAuthCallBackRequestDTO fields =  req.getData();
         log.info("receive callback: " + JSON.toJSONString(fields));
-//        String body = fields.getBody();
-        String body = "userId=gfZbbg6BSAlPMmw75xlCzQ%3D%3D&cnaliMemberId=b2b-221123084407697b20&authCode=NGNiYzEyODUtNzFhOS01ZmIwLWE5MDEtYzI3ZTAyYWFjOTA2&gmtMemberExpireTime=2023-11-13+23%3A59%3A59&type=auth";
+        String body = fields.getBody();
         Map<String, String> map = new HashMap<String, String>();
         // ----逻辑校验----
 
@@ -64,7 +63,6 @@ public class MemberAuthCallback extends SPIBaseService implements ExtensionServi
             String gmtMemberExpireTime = map.get("gmtMemberExpireTime");
             String userId = map.get("userId");
             this.authCode = fields.getAuthCode();
-            log.info(map.toString());
 
             Shop1688DsAuth shop1688DsAuth = shop1688DsAuthService.getDetailByShopId(Long.valueOf(SecurityTool.decodeByAES(userId)));
             if (Objects.isNull(shop1688DsAuth)) {
@@ -73,6 +71,7 @@ public class MemberAuthCallback extends SPIBaseService implements ExtensionServi
             }
             shop1688DsAuth.setAuthCode(authCode);
             shop1688DsAuth.setShopId(Long.valueOf(SecurityTool.decodeByAES(userId)));
+            log.info("receive callback: " + shop1688DsAuth);
             shop1688DsAuthService.updateByPrimaryKey(shop1688DsAuth);
 
             ShopTo1688DsMember shopTo1688DsMember = shopTo1688DsMemberService.getDetailByShopId(Long.valueOf(SecurityTool.decodeByAES(userId)));

ms-biz/src/main/java/com/ms/api/spi/move/CancelCollectTaskService.java

@@ -31,10 +31,6 @@ public class CancelCollectTaskService extends SPIBaseService implements Extensio
         // ----逻辑校验----
 
         // ----业务处理----
-//        if (!$this->webShop->validateCsrfToken()) {
-//            return $this->renderJSON(CommonTool::failResult('CSRF校验不通过'));
-//        }
-//
 //        list($successCancelDetailIds, $skipCancelDetailIds) = $this->moveUtil->cancelCollectTask();
 //        $html = '';
 //        if ($skipCancelDetailIds) {