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

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

@@ -89,7 +89,7 @@ public class AppealServiceImpl implements AppealService {
             throw new VisibleError("用户未登录");
         }
         appeal.setSubmitDate(new Timestamp(System.currentTimeMillis()));
-        User user = userService.findOne(appeal.getSubmitterUU());
+        User user = userService.findOne(SystemSession.getUserAccount().getUserUU());
         ModelMap data = new ModelMap();
         data.put("password", password);
         data.put("oldMobile", user.getMobile());

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

@@ -413,7 +413,7 @@ public class UserServiceImpl implements UserService {
                     formData.put("type", type);
                     HttpUtil.ResponseWrap res = null;
                     try {
-                        res = HttpUtil.doPost(url, formData, 30000);
+                        res = HttpUtil.doPost(url, formData, 10000);
                         if (!res.isSuccess()) {
                             syncLog.error(appId, "同步绑定信息失败", JSON.toJSONString(formData), res.getContent());
                         } else {
@@ -574,7 +574,7 @@ public class UserServiceImpl implements UserService {
                     formData.put("hasQuestion", hasQuestion);
                     HttpUtil.ResponseWrap res = null;
                     try {
-                        res = HttpUtil.doPost(url, formData, 30000);
+                        res = HttpUtil.doPost(url, formData, 10000);
                         if (!res.isSuccess()) {
                             syncLog.error(appId, msg + ",同步用户信息失败", JSON.toJSONString(finalUser), res.getContent());
                         } else {
@@ -604,7 +604,7 @@ public class UserServiceImpl implements UserService {
             formData.put("mobile", user.getMobile());
             formData.put("password", noEncryPwd);
             formData.put("dialectUID", user.getImId());
-            res = HttpUtil.doPost(url, formData, 30000);
+            res = HttpUtil.doPost(url, formData, 10000);
             if (!res.isSuccess()) {
                throw new Exception(res.getContent());
             } else {

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

@@ -131,7 +131,7 @@ public class UserspaceServiceImpl implements UserspaceService {
                     formData.putAll(JSON.parseObject(JSON.toJSONString(admin)));
                     HttpUtil.ResponseWrap res = null;
                     try {
-                        res = HttpUtil.doPost(url, formData, 30000);
+                        res = HttpUtil.doPost(url, formData, 10000);
                         if (!res.isSuccess()) {
                             syncLog.error(appId, msg + ",同步企业信息失败", JSON.toJSONString(userSpaceView), res.getContent());
                         } else {

sso-server/src/main/java/com/uas/sso/util/InfoAsyncUtils.java

@@ -100,7 +100,7 @@ public class InfoAsyncUtils {
                     url = split[1];
                     JSONObject formData = JSON.parseObject(JSON.toJSONString(userView));
 
-                    HttpUtil.ResponseWrap res = HttpUtil.doPost(url, formData, 30000);
+                    HttpUtil.ResponseWrap res = HttpUtil.doPost(url, formData, 10000);
                     if (!res.isSuccess()) {
                         logger.error(String.format("%s:同步用户信息失败, %s, %s, %s", msg, appId,
                                 JSON.toJSONString(userView), res.getContent()));