同步接口修改

sso-server/src/main/java/com/uas/sso/controller/PartnershipManagerController.java

@@ -175,7 +175,7 @@ public class PartnershipManagerController extends BaseController {
 
 	@RequestMapping("/addAll")
     public ModelMap addPartnership() {
-        String url = "http://192.168.253.66:8080/api/partners";
+        String url = "http://10.1.51.50:8080/api/partners";
         int pageNumber = 1;
         int pageSize = 1;
         com.uas.account.support.Page<PartnershipRecord> page = null;

sso-server/src/main/java/com/uas/sso/controller/UserManagerController.java

@@ -440,7 +440,7 @@ public class UserManagerController extends BaseController {
     }
 
     private Long getUserUUFromB2B(String keyword) {
-        String url = "http://192.168.253.66:8090/platform-b2b";
+        String url = "http://10.1.51.50:8090/platform-b2b";
         url = url + "/searchUser";
         Long userUU = null;
         try {

sso-server/src/main/java/com/uas/sso/controller/UserspaceManagerController.java

@@ -383,7 +383,7 @@ public class UserspaceManagerController extends BaseController {
         userspace.setRegisterDate(detail.getRegisterDate() == null ? null : new Timestamp(detail.getRegisterDate()));
         userspace.setSpaceName(detail.getName());
         // 设置企业uu号
-        userspace.setSpaceUU(getSpaceUU(detail.getBusinessCode()));
+        userspace.setSpaceUU(getSpaceUU(detail.getBusinessCode(), detail.getName()));
         userspace.setTags(detail.getTags());
         userspace.setTelephone(detail.getTel());
         userspace.setValidCode((short) Status.AUTHENTICATED.getCode());
@@ -405,7 +405,7 @@ public class UserspaceManagerController extends BaseController {
         if (userspace.getApps() == null) {
             userspace.setApps(new ArrayList<App>());
         }
-        String url = "http://192.168.253.66:8080/api/userspace";
+        String url = "http://10.1.51.50:8080/api/userspace";
         url = url + "/" + userspace.getBusinessCode();
         HttpUtil.ResponseWrap res = HttpUtil.doGet(url);
         if (!res.isSuccess()) {
@@ -437,7 +437,7 @@ public class UserspaceManagerController extends BaseController {
         int pageNumber = 1;
         int pageSize = 20;
         Page<com.uas.account.entity.User> page;
-        String url = "http://192.168.253.66:8080/api/user";
+        String url = "http://10.1.51.50:8080/api/user";
         url = url + "/findByBusinessCode";
         do {
             ModelMap data = new ModelMap();
@@ -461,13 +461,13 @@ public class UserspaceManagerController extends BaseController {
         } while (page == null || !page.isLast());
     }
 
-    private Long getSpaceUU(String businessCode) throws Exception {
+    private Long getSpaceUU(String businessCode, String name) throws Exception {
         if (StringUtils.isEmpty(businessCode)) {
             return null;
         }
 
-        String url = "http://192.168.253.66:8080/api/userspace/info";
-        url = url + "/" + businessCode;
+        String url = "http://10.1.51.50:8080/api/userspace/info";
+        url = url + "/" + businessCode + "/" + name;
         HttpUtil.ResponseWrap res = null;
         res = HttpUtil.doGet(url);
         if(res.isSuccess() && !StringUtils.isEmpty(res.getContent())) {
@@ -481,7 +481,7 @@ public class UserspaceManagerController extends BaseController {
 
     public Page<UserSpaceDetail> getUserSpace(@RequestParam(defaultValue = "1") int pageNumber, @RequestParam(defaultValue = "20") int pageSize) {
         Page<UserSpaceDetail> page = null;
-        String url = "http://192.168.253.66:8080/api/partners";
+        String url = "http://10.1.51.50:8080/api/partners";
         if(!StringUtils.isEmpty(url)) {
             HttpUtil.ResponseWrap res = null;
             try {
@@ -517,7 +517,7 @@ public class UserspaceManagerController extends BaseController {
      * @return
      */
     public String getAccessSecret(String businessCode) {
-        String url = "http://192.168.253.66:8090/platform-b2b";
+        String url = "http://10.1.51.50:8090/platform-b2b";
         url = url + "/account/enterprise/info/" + businessCode;
         String accessSecret = null;
         try {
@@ -599,33 +599,35 @@ public class UserspaceManagerController extends BaseController {
 
     @RequestMapping("/getWebsite")
     public String getWebsite() {
-        String url = "http://192.16.253.66:8080/api/userspace/getWebsite";
+        String url = "http://10.1.51.50:8080/api/userspace/getWebsite";
         int pageNumber = 1;
         int pageSize = 20;
         com.uas.account.support.Page<MasterInfo> page = null;
-        try {
-            ModelMap data = new ModelMap();
-            data.put("pageNumber", pageNumber++);
-            data.put("pageSize", pageSize);
-            HttpUtil.ResponseWrap responseWrap = HttpUtil.doGet(url, data);
-            if (responseWrap.isSuccess()) {
-                try {
-                    page = JSON.parseObject(responseWrap.getContent(), new TypeReference<com.uas.account.support.Page<MasterInfo>>() {
-                    });
-                    for (MasterInfo masterInfo : page.getContent()) {
-                        Userspace userspace = userspaceService.findByBusinessCode(masterInfo.getBusinessCode());
-                        if (userspace != null && masterInfo.getWebsite() != null) {
-                            userspace.setWebsite(masterInfo.getWebsite());
-                            userspaceService.save(userspace);
+        do {
+            try {
+                ModelMap data = new ModelMap();
+                data.put("pageNumber", pageNumber++);
+                data.put("pageSize", pageSize);
+                HttpUtil.ResponseWrap responseWrap = HttpUtil.doGet(url, data);
+                if (responseWrap.isSuccess()) {
+                    try {
+                        page = JSON.parseObject(responseWrap.getContent(), new TypeReference<com.uas.account.support.Page<MasterInfo>>() {
+                        });
+                        for (MasterInfo masterInfo : page.getContent()) {
+                            Userspace userspace = userspaceService.findByBusinessCode(masterInfo.getBusinessCode());
+                            if (userspace != null && masterInfo.getWebsite() != null) {
+                                userspace.setWebsite(masterInfo.getWebsite());
+                                userspaceService.save(userspace);
+                            }
                         }
+                    } catch (Exception e) {
+                        e.printStackTrace();
                     }
-                } catch (Exception e) {
-                    e.printStackTrace();
                 }
+            } catch (Exception e) {
+                e.printStackTrace();
             }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
+        } while (page == null || !page.isLast());
         return null;
     }
 }