Merge branch 'dev' of ssh://10.10.101.21/source/sso-parent into dev3

sso-common/src/main/java/com/uas/sso/entity/UserSpaceView.java

@@ -106,6 +106,11 @@ public class UserSpaceView implements Serializable {
      */
     private String accessSecret;
 
+    /**
+     * erp地址
+     */
+    private String website;
+
     /**
      * 邀请时间
      */
@@ -259,6 +264,14 @@ public class UserSpaceView implements Serializable {
         this.accessSecret = accessSecret;
     }
 
+    public String getWebsite() {
+        return website;
+    }
+
+    public void setWebsite(String website) {
+        this.website = website;
+    }
+
     public String getSource() {
         return source;
     }

sso-server/src/main/java/com/uas/sso/service/impl/UserspaceServiceImpl.java

@@ -135,12 +135,12 @@ public class UserspaceServiceImpl implements UserspaceService {
                     try {
                         res = HttpUtil.doPost(url, formData, 10000);
                         if (!res.isSuccess()) {
-                            syncLog.error(appId, msg + ",同步企业信息失败", JSON.toJSONString(userSpaceView), res.getContent());
+                            syncLog.error(appId, msg + ",同步企业信息失败", JSON.toJSONString(formData), res.getContent());
                         } else {
-                            syncLog.info(appId, msg + ",同步企业信息成功", JSON.toJSONString(userSpaceView));
+                            syncLog.info(appId, msg + ",同步企业信息成功", JSON.toJSONString(formData));
                         }
                     } catch (Exception e) {
-                        syncLog.error(appId, msg + ",同步企业信息失败", JSON.toJSONString(userSpaceView), e.getMessage());
+                        syncLog.error(appId, msg + ",同步企业信息失败", JSON.toJSONString(formData), e.getMessage());
                     }
                 }
                 return null;