Merge remote-tracking branch 'origin/master'

ms-biz/src/main/java/com/ms/api/spi/auth/CheckDsAppAuthExpireService.java

@@ -9,6 +9,7 @@ import com.ms.api.common.SPIBaseService;
 import com.ms.api.dto.auth.CheckDsAppAuthExpireRequestDTO;
 import com.ms.api.tool.DsFormRequestTemplate;
 import com.ms.api.common.UniqueKeyMultiValueMap;
+import com.ms.api.tool.SecurityTool;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.MultiValueMap;
@@ -33,7 +34,7 @@ public class CheckDsAppAuthExpireService extends SPIBaseService implements Exten
 
         // ----业务处理----
         MultiValueMap<String, String> params = new UniqueKeyMultiValueMap<>();
-//        params.add("userIds", SecurityTool.encodeByAES(fields.getUserId()));
+        params.add("userIds", SecurityTool.encodeByAES(String.valueOf(shopId)));
         params.add("memberId",fields.getMemberId());
         params.add("authCode",fields.getAuthCode());
         params.add("platform","ddMicroApp");

ms-biz/src/main/java/com/ms/api/spi/auth/GetPlatformAuthUrlService.java

@@ -36,6 +36,7 @@ public class GetPlatformAuthUrlService extends SPIBaseService implements Extensi
         // ----业务处理----
         // TODO 群里讨论过说，先判断下获取授权信息列表，如果授权过，就不用再获取这个链接
 
+
         HashMap<String, String> params = new HashMap<>();
         params.put("userId", SecurityTool.encodeByAES(String.valueOf(shopId)));
         params.put("platform","ddMicroApp");