|
|
@@ -12,8 +12,8 @@ import com.dragoninfo.dcuc.app.enumresources.ResourceTypeEnum;
|
|
|
import com.dragoninfo.dcuc.app.service.IResourceService;
|
|
|
import com.dragoninfo.dcuc.app.service.IResourceSyncService;
|
|
|
import com.dragoninfo.dcuc.auth.auth.enumresources.YesNotEnum;
|
|
|
-import com.dragoninfo.duceap.core.response.Result;
|
|
|
import com.dragoninfo.dcuc.common.http.HttpUtil;
|
|
|
+import com.dragoninfo.duceap.core.response.Result;
|
|
|
import com.dragonsoft.duceap.base.entity.http.ResponseStatus;
|
|
|
import com.dragonsoft.duceap.base.enums.BooleanEnum;
|
|
|
import com.dragonsoft.duceap.commons.util.collections.CollectionUtils;
|
|
|
@@ -25,12 +25,15 @@ import org.apache.http.util.EntityUtils;
|
|
|
import org.slf4j.Logger;
|
|
|
import org.slf4j.LoggerFactory;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
-import org.springframework.http.server.PathContainer;
|
|
|
import org.springframework.stereotype.Component;
|
|
|
+
|
|
|
import java.io.IOException;
|
|
|
import java.text.SimpleDateFormat;
|
|
|
import java.util.*;
|
|
|
-import java.util.concurrent.*;
|
|
|
+import java.util.concurrent.ExecutorService;
|
|
|
+import java.util.concurrent.LinkedBlockingQueue;
|
|
|
+import java.util.concurrent.ThreadPoolExecutor;
|
|
|
+import java.util.concurrent.TimeUnit;
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
/**
|
|
|
@@ -402,7 +405,7 @@ public class ResourceBusiness implements IResourceBusiness {
|
|
|
private HttpResult getServiceResource(Integer pageNo, Integer pageSize,String url) {
|
|
|
HttpResult httpResult = new HttpResult();
|
|
|
Map<String, Object> map = new HashMap<>();
|
|
|
- map.put("page",String.valueOf(pageNo));
|
|
|
+ map.put("page", String.valueOf(pageNo - 1));
|
|
|
String param = JSON.toJSONString(map);
|
|
|
//获取服务资源
|
|
|
//服务资源提供方一次查询所有服务资源,未采用分页获取方式
|
mazq