Merge remote-tracking branch 'origin/dev' into dev

sso-manage-console/src/main/java/com/uas/sso/sso/backend/config/SyncThreadPool.java

@@ -58,6 +58,11 @@ public class SyncThreadPool {
             urls = getBackUrl(appList, BACK_USER_URL);
         }
 
+        if (BackInfoType.BACK_RELATION_INFO.equals(type)) {
+            isBackUser = true;
+            urls = getBackUrl(appList, BACK_RELATION_INFO);
+        }
+
         if (BackInfoType.BACK_SPACE_INFO.equals(type)) {
             urls = getBackUrl(appList, BACK_SPACE_URL);
 
@@ -170,7 +175,12 @@ public class SyncThreadPool {
         /**
          * 同步企业信息
          */
-        BACK_SPACE_INFO
+        BACK_SPACE_INFO,
+
+        /**
+         * 同步用户企业关联信息
+         */
+        BACK_RELATION_INFO
     }
 
     private final BackAppUrl BACK_USER_URL = new BackAppUrl() {
@@ -187,6 +197,13 @@ public class SyncThreadPool {
         }
     };
 
+    private final BackAppUrl BACK_RELATION_INFO = new BackAppUrl() {
+        @Override
+        public String getUrl(App app) {
+            return app.getBackRelationUrl();
+        }
+    };
+
     private void logError(String appId, String message, String data, String errorMessage) {
         SyncLog log = new SyncLog(appId, message, data, "ERROR", errorMessage);
         syncLogDao.save(log);

sso-manage-console/src/main/java/com/uas/sso/sso/backend/service/impl/UserSpaceServiceImpl.java

@@ -158,8 +158,10 @@ public class UserSpaceServiceImpl implements UserSpaceService {
         }
         userspaceDao.save(space);
 
-        JSONObject data = JacksonUtils.fromJson(JacksonUtils.toJson(space.toView()), JSONObject.class);
-        syncThreadPool.transferDataToOtherPlatforms(BackInfoType.BACK_SPACE_INFO, space.getApps(), data, "[后台]企业解绑用户");
+        JSONObject data = JacksonUtils.fromJson(JacksonUtils.toJson(user.toView()), JSONObject.class);
+        data.put("spaceUU", spaceUu);
+        data.put("type", "unbind");
+        syncThreadPool.transferDataToOtherPlatforms(BackInfoType.BACK_RELATION_INFO, space.getApps(), data, "[后台]企业解绑用户");
 
         return space;
     }
@@ -282,8 +284,10 @@ public class UserSpaceServiceImpl implements UserSpaceService {
 
             userspaceDao.save(space);
 
-            JSONObject data = JacksonUtils.fromJson(JacksonUtils.toJson(space.toView()), JSONObject.class);
-            syncThreadPool.transferDataToOtherPlatforms(BackInfoType.BACK_SPACE_INFO, space.getApps(), data, "[后台]绑定用户到企业");
+            JSONObject data = JacksonUtils.fromJson(JacksonUtils.toJson(user.toView()), JSONObject.class);
+            data.put("spaceUU", spaceUu);
+            data.put("type", "bind");
+            syncThreadPool.transferDataToOtherPlatforms(BackInfoType.BACK_RELATION_INFO, space.getApps(), data, "[后台]绑定用户到企业");
         }
     }