对接腾讯云api

src/main/java/com/edgec/browserbackend/browser/service/Impl/ShopServiceImpl.java

@@ -523,10 +523,10 @@ public class ShopServiceImpl implements ShopService {
         start = System.currentTimeMillis();
         List<String> allIds = null;
         if (!"penghai".equals(tag)) {
-            if ("-1".equals(groupId)) {
+            if ("-1".equals(groupId) || "-2".equals(groupId) ) {
                 allIds = userShopRepository.findByUsername(username).stream().map(UserShop::getShopId).collect(Collectors.toList());
             }
-            if (!"-1".equals(groupId)) {
+            if (!"-1".equals(groupId) && !"-2".equals(groupId)) {
                 // 如果分组
                 allIds = userShopRepository.findByUsernameAndGroupId(username, groupId).stream().map(UserShop::getShopId).collect(Collectors.toList());
             }
@@ -632,6 +632,9 @@ public class ShopServiceImpl implements ShopService {
                                 // ipResourceRepository.save(ipResource);
                                 pageIpResourceListToSave.add(ipResource);
                             }
+                            if("-2".equals(groupId)){
+                                return;
+                            }
                         }
 
                         //ShopResultDto shopResultDto = getShopResultDto(username, x, ipResource, specialLine);
@@ -643,9 +646,9 @@ public class ShopServiceImpl implements ShopService {
             );
             ipResourceRepository.saveAll(pageIpResourceListToSave);
 
-            Page<ShopResultDto> shopDtoPage = new PageImpl<>(shopResultDtos, pageable, shopIds.size());
+            Page<ShopResultDto> shopDtoPage = new PageImpl<>(shopResultDtos, pageable, shopResultDtos.size());
             shopPageResultDto.setShopList(shopDtoPage.getContent());
-            PageInfo pageInfo = new PageInfo(shopDtoPage.getPageable().getPageNumber(), shopDtoPage.getTotalPages(), shopIds.size());
+            PageInfo pageInfo = new PageInfo(shopDtoPage.getPageable().getPageNumber(), shopDtoPage.getTotalPages(), shopResultDtos.size());
             shopPageResultDto.setShopPage(pageInfo);
         }
         logger.info("getshoplist step-6:{},{}", username, System.currentTimeMillis() - start);

src/main/java/com/edgec/browserbackend/common/client/TenCentEcsClient.java

@@ -26,12 +26,12 @@ public class TenCentEcsClient {
 
     //SecretId
     private static String getSecretId() {
-        return "";
+        return "AKIDwoaIn1KbnrlT4Vq6NbkmfMrYC0oRs7A1";
     }
 
     //SecretKey
     private static String getSecretKey() {
-        return "";
+        return "mLoCPQZinhmlZBboDXzKUTGtO3d2EJFI";
     }
 
     //脚本userData