天启同步的代码改为异步执行

src/main/java/platform/modules/api/service/SkyImageApiService.java

@@ -58,7 +58,7 @@ public class SkyImageApiService {
 
     public String accessToken() {
         //请求头
-        /*Map<String, String> header = new HashMap<>();
+        Map<String, String> header = new HashMap<>();
         header.put("Content-Type", "application/json");
         Map<String, String> param = new HashMap<>();
         param.put("appKey", appKey);
@@ -71,13 +71,13 @@ public class SkyImageApiService {
             return result;
         } catch (Exception e) {
             e.printStackTrace();
-        }*/
+        }
         return "";
     }
 
     public void syncUserInfo(SyncUserDto syncUser) {
         //请求头
-        /*Map<String, String> header = new HashMap<>();
+        Map<String, String> header = new HashMap<>();
         header.put("Content-Type", "application/json");
 
         //请求实体（json/xml适用）-
@@ -99,7 +99,7 @@ public class SkyImageApiService {
             System.out.println(result);
         } catch (Exception e) {
             e.printStackTrace();
-        }*/
+        }
     }
 
     /**

src/main/java/platform/modules/home/HomeController.java

@@ -1315,20 +1315,22 @@ public class HomeController extends BaseController {
             information.setCreate_name(user.getUser_name());
             companyService.updateSelective(information);
 
-            //同步信息天启
-            SyncUserDto dto = new SyncUserDto();
-            dto.setAction(Constant.METHOD_STATUS.INSERT);
-            dto.setOldUserName("");
-            dto.setUserName(user.getUser_name());
-            dto.setUserLoginName(user.getNick_name());
-            dto.setPassword(information.getPassword().trim());
-            dto.setCompanyName(information.getCompany_name());
-            if (null != information.getStreet_id()) {
-                Street street = streetService.findById(information.getStreet_id());
-                dto.setStreetName(street.getName());
-            }
-            dto.setToken(skyImageApiService.accessToken());
-            skyImageApiService.syncUserInfo(dto);
+            new Thread(() -> {
+                //同步信息天启
+                SyncUserDto dto = new SyncUserDto();
+                dto.setAction(Constant.METHOD_STATUS.INSERT);
+                dto.setOldUserName("");
+                dto.setUserName(user.getUser_name());
+                dto.setUserLoginName(user.getNick_name());
+                dto.setPassword(information.getPassword().trim());
+                dto.setCompanyName(information.getCompany_name());
+                if (null != information.getStreet_id()) {
+                    Street street = streetService.findById(information.getStreet_id());
+                    dto.setStreetName(street.getName());
+                }
+                dto.setToken(skyImageApiService.accessToken());
+                skyImageApiService.syncUserInfo(dto);
+            }, "syncUserInfo").start();
 
             //新增街道待办
             addWaitToDo(information);
@@ -1394,15 +1396,17 @@ public class HomeController extends BaseController {
             user.setPassword(SecureUtil.md5().digestHex(information.getPassword()));
             userService.updateSelective(user);
 
-            // 同步密码到天启
-            SyncUserDto dto = new SyncUserDto();
-            dto.setAction(Constant.METHOD_STATUS.UPDATE);
-            dto.setOldUserName(user.getNick_name());
-            dto.setUserName(user.getUser_name());
-            dto.setUserLoginName(user.getNick_name());
-            dto.setPassword(information.getPassword());
-            dto.setToken(skyImageApiService.accessToken());
-            skyImageApiService.syncUserInfo(dto);
+            new Thread(() -> {
+                // 同步密码到天启
+                SyncUserDto dto = new SyncUserDto();
+                dto.setAction(Constant.METHOD_STATUS.UPDATE);
+                dto.setOldUserName(user.getNick_name());
+                dto.setUserName(user.getUser_name());
+                dto.setUserLoginName(user.getNick_name());
+                dto.setPassword(information.getPassword());
+                dto.setToken(skyImageApiService.accessToken());
+                skyImageApiService.syncUserInfo(dto);
+            }, "syncUserInfo").start();
 
         } catch (Exception e) {
             e.printStackTrace();

src/main/java/platform/modules/home/web/HomeRefactorController.java

@@ -513,19 +513,22 @@ public class HomeRefactorController extends BaseController {
             information.setCreate_name(user.getUser_name());
             companyService.updateSelective(information);
 
-            //同步信息天启
-            SyncUserDto dto = new SyncUserDto();
-            dto.setAction(Constant.METHOD_STATUS.INSERT);
-            dto.setOldUserName("");
-            dto.setUserName(user.getUser_name());
-            dto.setUserLoginName(user.getNick_name());
-            dto.setPassword(information.getPassword().trim());
-            dto.setCompanyName(information.getCompany_name());
-            if (null != information.getStreet_id()) {
-                dto.setStreetName(street.getName());
-            }
-            dto.setToken(skyImageApiService.accessToken());
-            skyImageApiService.syncUserInfo(dto);
+            Street finalStreet = street;
+            new Thread(() -> {
+                //同步信息天启
+                SyncUserDto dto = new SyncUserDto();
+                dto.setAction(Constant.METHOD_STATUS.INSERT);
+                dto.setOldUserName("");
+                dto.setUserName(user.getUser_name());
+                dto.setUserLoginName(user.getNick_name());
+                dto.setPassword(information.getPassword().trim());
+                dto.setCompanyName(information.getCompany_name());
+                if (null != information.getStreet_id()) {
+                    dto.setStreetName(finalStreet.getName());
+                }
+                dto.setToken(skyImageApiService.accessToken());
+                skyImageApiService.syncUserInfo(dto);
+            }, "syncUserInfo").start();
 
             //发送短信
             Map<String, String> params = new HashMap<>();
@@ -563,15 +566,17 @@ public class HomeRefactorController extends BaseController {
             user.setPassword(SecureUtil.md5().digestHex(information.getPassword()));
             userService.updateSelective(user);
 
-            // 同步密码到天启
-            SyncUserDto dto = new SyncUserDto();
-            dto.setAction(Constant.METHOD_STATUS.UPDATE);
-            dto.setOldUserName(user.getNick_name());
-            dto.setUserName(user.getUser_name());
-            dto.setUserLoginName(user.getNick_name());
-            dto.setPassword(information.getPassword());
-            dto.setToken(skyImageApiService.accessToken());
-            skyImageApiService.syncUserInfo(dto);
+            new Thread(() -> {
+                // 同步密码到天启
+                SyncUserDto dto = new SyncUserDto();
+                dto.setAction(Constant.METHOD_STATUS.UPDATE);
+                dto.setOldUserName(user.getNick_name());
+                dto.setUserName(user.getUser_name());
+                dto.setUserLoginName(user.getNick_name());
+                dto.setPassword(information.getPassword());
+                dto.setToken(skyImageApiService.accessToken());
+                skyImageApiService.syncUserInfo(dto);
+            }, "syncUserInfo").start();
 
         } catch (Exception e) {
             e.printStackTrace();

src/main/java/platform/modules/sys/web/LoginController.java

@@ -157,15 +157,17 @@ public class LoginController extends BaseController {
             messagesMap.put("status", SUCCESS);
             messagesMap.put("message", "修改密码成功!");
 
-            //同步信息天启
-            SyncUserDto dto = new SyncUserDto();
-            dto.setAction(Constant.METHOD_STATUS.UPDATE);
-            dto.setOldUserName(user.getNick_name());
-            dto.setUserName(user.getUser_name());
-            dto.setUserLoginName(user.getNick_name());
-            dto.setPassword(newPassword);
-            dto.setToken(skyImageApiService.accessToken());
-            skyImageApiService.syncUserInfo(dto);
+            new Thread(() -> {
+                //同步信息天启
+                SyncUserDto dto = new SyncUserDto();
+                dto.setAction(Constant.METHOD_STATUS.UPDATE);
+                dto.setOldUserName(user.getNick_name());
+                dto.setUserName(user.getUser_name());
+                dto.setUserLoginName(user.getNick_name());
+                dto.setPassword(newPassword);
+                dto.setToken(skyImageApiService.accessToken());
+                skyImageApiService.syncUserInfo(dto);
+            }, "syncUserInfo").start();
 
             return messagesMap;
         } catch (Exception e) {

src/main/java/platform/modules/sys/web/UserController.java

@@ -72,7 +72,7 @@ public class UserController extends BaseController {
 
     @Autowired
     private GroupService groupService;
-    
+
     @Autowired
     private VerificationCodeUtil verificationCodeUtil;
 
@@ -83,37 +83,37 @@ public class UserController extends BaseController {
     @GetMapping(value = "/list")
     public String list(
             @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
-            String keyword, ModelMap modelMap,User searchCondition,String item_selected) throws Exception {
+            String keyword, ModelMap modelMap, User searchCondition, String item_selected) throws Exception {
         try {
             log.debug("分页查询用户列表参数! pageNum = {}, keyword = {}", pageNum, keyword);
-            PageInfo<User> pageInfo = userService.findPage2(pageNum, PAGESIZE, keyword,searchCondition);
+            PageInfo<User> pageInfo = userService.findPage2(pageNum, PAGESIZE, keyword, searchCondition);
             log.info("分页查询用户列表结果！ pageInfo = {}", pageInfo);
             modelMap.put("pageInfo", pageInfo);
             modelMap.put("keyword", keyword);
             modelMap.put("searchCondition", searchCondition);
             modelMap.put("user_type", ShiroUtils.getUserEntity().getUser_type());
             modelMap.put("streetList", streetService.findList());
-            modelMap.put("item_selected",item_selected);
+            modelMap.put("item_selected", item_selected);
             //根据角色查询
             Role role = new Role();
             role.setDel_flag(false);
             role.setUser_type(ShiroUtils.getUserEntity().getUser_type());
-            if(ShiroUtils.getUserType().equals(Constant.UserType.STREET)){
-            	//街道看见super创建的角色和自己创建的角色
+            if (ShiroUtils.getUserType().equals(Constant.UserType.STREET)) {
+                //街道看见super创建的角色和自己创建的角色
                 modelMap.addAttribute("roles", roleService.getSuperAndOwnRoles());
-            }else if(ShiroUtils.getUserType().equals(Constant.UserType.BUILD)){
-            	role.setBuild_id(ShiroUtils.getBuildId());
+            } else if (ShiroUtils.getUserType().equals(Constant.UserType.BUILD)) {
+                role.setBuild_id(ShiroUtils.getBuildId());
+                modelMap.addAttribute("roles", roleService.findListByWhere(role));
+            } else if (ShiroUtils.getUserType().equals(Constant.UserType.COMPANY)) {
+                role.setCompany_id(ShiroUtils.getCompanyId());
                 modelMap.addAttribute("roles", roleService.findListByWhere(role));
-            }else if(ShiroUtils.getUserType().equals(Constant.UserType.COMPANY)) {
-            	role.setCompany_id(ShiroUtils.getCompanyId());
+            } else if (ShiroUtils.getUserType().equals(Constant.UserType.SUPER)) {
+                role.setUser_type(null);//所有角色，除了企业角色，企业角色在前端页面过滤
                 modelMap.addAttribute("roles", roleService.findListByWhere(role));
-            }else if(ShiroUtils.getUserType().equals(Constant.UserType.SUPER)) {
-            	role.setUser_type(null);//所有角色，除了企业角色，企业角色在前端页面过滤
+            } else if (ShiroUtils.getUserType().equals(Constant.UserType.GOVERNMENT)) {
                 modelMap.addAttribute("roles", roleService.findListByWhere(role));
-            }else if(ShiroUtils.getUserType().equals(Constant.UserType.GOVERNMENT)) {
-            	modelMap.addAttribute("roles", roleService.findListByWhere(role));
             }
-            
+
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -122,14 +122,14 @@ public class UserController extends BaseController {
 
     @GetMapping("/role")
     @ResponseBody
-    public Object role(RoleQuery query){
+    public Object role(RoleQuery query) {
         Role role = new Role();
         role.setDel_flag(false);
 
         List<Role> sRoles = new ArrayList<>();
-        if (query.getUser_type() != null){
+        if (query.getUser_type() != null) {
             role.setUser_type(query.getUser_type());
-            if (ShiroUtils.getUserType().equals(Constant.UserType.STREET)){
+            if (ShiroUtils.getUserType().equals(Constant.UserType.STREET)) {
                 if (query.getUser_type().equals(Constant.UserType.STREET))
                     return ResponseMessage.success("success", roleService.getSuperAndOwnRoles());
                 if (query.getUser_type().equals(Constant.UserType.COMPANY))
@@ -137,7 +137,7 @@ public class UserController extends BaseController {
             }
         }
 
-        if (query.getStreet_id() != null){
+        if (query.getStreet_id() != null) {
             role.setStreet_id(query.getStreet_id());
 
             sRoles = getStreetSuperRole();
@@ -161,10 +161,10 @@ public class UserController extends BaseController {
     @GetMapping(value = "/findCompanyList")
     public String findCompanyList(
             @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
-            String keyword, ModelMap modelMap,User searchCondition,String item_selected) throws Exception {
+            String keyword, ModelMap modelMap, User searchCondition, String item_selected) throws Exception {
         try {
             log.debug("分页查询用户列表参数! pageNum = {}, keyword = {}", pageNum, keyword);
-            PageInfo<User> pageInfo = userService.findCompanyList(pageNum, PAGESIZE, keyword,searchCondition);
+            PageInfo<User> pageInfo = userService.findCompanyList(pageNum, PAGESIZE, keyword, searchCondition);
             log.info("分页查询用户列表结果！ pageInfo = {}", pageInfo);
             modelMap.put("pageInfo", pageInfo);
             modelMap.put("keyword", keyword);
@@ -176,6 +176,7 @@ public class UserController extends BaseController {
         }
         return BASE_BUILD_PATH + "user_company_list";
     }
+
     /**
      * 跳转到用户添加页面
      *
@@ -187,30 +188,30 @@ public class UserController extends BaseController {
         Department department = new Department();
         department.setDel_flag(false);
         department.setUser_type(ShiroUtils.getUserEntity().getUser_type());
-        if(ShiroUtils.getUserType().equals(Constant.UserType.SUPER)) {
-        	//超级管理员需要选择政府用户的政府部门
-        	department.setUser_type(Constant.UserType.GOVERNMENT);
+        if (ShiroUtils.getUserType().equals(Constant.UserType.SUPER)) {
+            //超级管理员需要选择政府用户的政府部门
+            department.setUser_type(Constant.UserType.GOVERNMENT);
         }
         Role role = new Role();
         role.setDel_flag(false);
         role.setUser_type(ShiroUtils.getUserEntity().getUser_type());
-        if(ShiroUtils.getUserType().equals(Constant.UserType.STREET)){
-        	//街道看见super创建的角色和自己创建的角色
+        if (ShiroUtils.getUserType().equals(Constant.UserType.STREET)) {
+            //街道看见super创建的角色和自己创建的角色
             modelMap.addAttribute("roles", roleService.getSuperAndOwnRoles());
-        	department.setStreet_id(ShiroUtils.getStreetId());
-        }else if(ShiroUtils.getUserType().equals(Constant.UserType.BUILD)){
-        	role.setBuild_id(ShiroUtils.getBuildId());
-        	department.setBuild_id(ShiroUtils.getBuildId());
+            department.setStreet_id(ShiroUtils.getStreetId());
+        } else if (ShiroUtils.getUserType().equals(Constant.UserType.BUILD)) {
+            role.setBuild_id(ShiroUtils.getBuildId());
+            department.setBuild_id(ShiroUtils.getBuildId());
+            modelMap.addAttribute("roles", roleService.findListByWhere(role));
+        } else if (ShiroUtils.getUserType().equals(Constant.UserType.COMPANY)) {
+            role.setCompany_id(ShiroUtils.getCompanyId());
+            department.setCompany_id(ShiroUtils.getCompanyId());
             modelMap.addAttribute("roles", roleService.findListByWhere(role));
-        }else if(ShiroUtils.getUserType().equals(Constant.UserType.COMPANY)) {
-        	role.setCompany_id(ShiroUtils.getCompanyId());
-        	department.setCompany_id(ShiroUtils.getCompanyId());
+        } else if (ShiroUtils.getUserType().equals(Constant.UserType.SUPER)) {
+            //super需要super所建的街道的角色，和政府角色,给不同的用户类型用户添加角色
+            roleService.getSuperAndGovRoles(modelMap);
+        } else if (ShiroUtils.getUserType().equals(Constant.UserType.GOVERNMENT)) {
             modelMap.addAttribute("roles", roleService.findListByWhere(role));
-        }else if(ShiroUtils.getUserType().equals(Constant.UserType.SUPER)) {
-        	//super需要super所建的街道的角色，和政府角色,给不同的用户类型用户添加角色
-        	roleService.getSuperAndGovRoles(modelMap);
-        }else if(ShiroUtils.getUserType().equals(Constant.UserType.GOVERNMENT)) {
-        	modelMap.addAttribute("roles", roleService.findListByWhere(role));
         }
 
         modelMap.addAttribute("departments", departmentService.findListByWhere(department));
@@ -246,11 +247,11 @@ public class UserController extends BaseController {
     @PostMapping(value = "/save")
     public ModelMap saveUser(User content) throws Exception {
         ModelMap messagesMap = new ModelMap();
-        if(IsTooFrequently()) {
-        	messagesMap.put("status", FAILURE);
+        if (IsTooFrequently()) {
+            messagesMap.put("status", FAILURE);
             messagesMap.put("message", "操作过于频繁，请稍后再试!");
             return messagesMap;
-    	}
+        }
         log.debug("添加用户参数! content = {}", content);
         Boolean flag = userService.saveUser(content);
         if (flag) {
@@ -282,33 +283,33 @@ public class UserController extends BaseController {
         modelMap.put("user", user);
         Department department = new Department();
         department.setUser_type(ShiroUtils.getUserEntity().getUser_type());
-        if(ShiroUtils.getUserType().equals(Constant.UserType.SUPER)) {
-        	//超级管理员需要选择政府用户的政府部门
-        	department.setUser_type(Constant.UserType.GOVERNMENT);
-        	//super需要super所建的街道的角色，和政府角色,给不同的用户类型用户添加角色
-        	roleService.getSuperAndGovRoles(modelMap);
+        if (ShiroUtils.getUserType().equals(Constant.UserType.SUPER)) {
+            //超级管理员需要选择政府用户的政府部门
+            department.setUser_type(Constant.UserType.GOVERNMENT);
+            //super需要super所建的街道的角色，和政府角色,给不同的用户类型用户添加角色
+            roleService.getSuperAndGovRoles(modelMap);
         }
         Role role = new Role();
         role.setUser_type(ShiroUtils.getUserEntity().getUser_type());
-        if(ShiroUtils.getUserType().equals(Constant.UserType.STREET)){
-        	//街道看见super创建的角色和自己创建的角色
+        if (ShiroUtils.getUserType().equals(Constant.UserType.STREET)) {
+            //街道看见super创建的角色和自己创建的角色
             modelMap.addAttribute("roles", roleService.getSuperAndOwnRoles());
-        	department.setStreet_id(ShiroUtils.getStreetId());
-        }else if(ShiroUtils.getUserType().equals(Constant.UserType.BUILD)){
-        	role.setBuild_id(ShiroUtils.getBuildId());
-        	department.setBuild_id(ShiroUtils.getBuildId());
+            department.setStreet_id(ShiroUtils.getStreetId());
+        } else if (ShiroUtils.getUserType().equals(Constant.UserType.BUILD)) {
+            role.setBuild_id(ShiroUtils.getBuildId());
+            department.setBuild_id(ShiroUtils.getBuildId());
+            modelMap.addAttribute("roles", roleService.findListByWhere(role));
+        } else if (ShiroUtils.getUserType().equals(Constant.UserType.COMPANY)) {
+            role.setCompany_id(ShiroUtils.getCompanyId());
+            department.setCompany_id(ShiroUtils.getCompanyId());
             modelMap.addAttribute("roles", roleService.findListByWhere(role));
-        }else if(ShiroUtils.getUserType().equals(Constant.UserType.COMPANY)) {
-        	role.setCompany_id(ShiroUtils.getCompanyId());
-        	department.setCompany_id(ShiroUtils.getCompanyId());
+        } else if (ShiroUtils.getUserType().equals(Constant.UserType.GOVERNMENT)) {
             modelMap.addAttribute("roles", roleService.findListByWhere(role));
-        }else if(ShiroUtils.getUserType().equals(Constant.UserType.GOVERNMENT)) {
-        	modelMap.addAttribute("roles", roleService.findListByWhere(role));
         }
         modelMap.addAttribute("departments", departmentService.findListByWhere(department));
 
         if (ShiroUtils.getUserEntity().getUser_type().equals(Constant.UserType.GOVERNMENT)) {
-        	Group group = new Group();
+            Group group = new Group();
             group.setUser_type(Constant.UserType.GOVERNMENT);
             modelMap.addAttribute("groups", groupService.findListByWhere(group));
             return BASE_GOVERNMENT_PATH + "user_edit";
@@ -376,21 +377,21 @@ public class UserController extends BaseController {
     public ModelMap updateUser(@PathVariable("id") int id, User content) throws Exception {
         ModelMap messagesMap = new ModelMap();
         log.debug("编辑用户参数! id= {}, content = {}", id, content);
-        if(IsTooFrequently()) {
-        	messagesMap.put("status", FAILURE);
+        if (IsTooFrequently()) {
+            messagesMap.put("status", FAILURE);
             messagesMap.put("message", "操作过于频繁，请稍后再试!");
             return messagesMap;
-    	}
-        if(null != content.getVerification_code()) {
-        	//验证码
-        	if(!verificationCodeUtil.validateVerificationCode(content.getPhone(), content.getVerification_code())) {
+        }
+        if (null != content.getVerification_code()) {
+            //验证码
+            if (!verificationCodeUtil.validateVerificationCode(content.getPhone(), content.getVerification_code())) {
                 log.info("验证码不正确! id = {}", id);
                 messagesMap.put("status", FAILURE);
-        		messagesMap.put("message", "验证码不正确!");
-        		return messagesMap;
-        	}
+                messagesMap.put("message", "验证码不正确!");
+                return messagesMap;
+            }
         }
-        
+
         User u = userService.findById(id);
         if (null == u) {
             log.info("编辑用户不存在! id = {}", id);
@@ -405,20 +406,22 @@ public class UserController extends BaseController {
             messagesMap.put("status", SUCCESS);
             messagesMap.put("message", "编辑成功!");
 
-            //同步信息给天启
-            SyncUserDto dto = new SyncUserDto();
-            dto.setAction(Constant.METHOD_STATUS.UPDATE);
-            dto.setOldUserName(u.getNick_name());
-            dto.setUserName(content.getUser_name());
-            dto.setUserLoginName(content.getNick_name());
+            new Thread(() -> {
+                //同步信息给天启
+                SyncUserDto dto = new SyncUserDto();
+                dto.setAction(Constant.METHOD_STATUS.UPDATE);
+                dto.setOldUserName(u.getNick_name());
+                dto.setUserName(content.getUser_name());
+                dto.setUserLoginName(content.getNick_name());
 //            dto.setPassword(content.getPassword());
 //            dto.setCompanyName(u.getCompany_name());
 //            if (null != u.getStreet_id()) {
 //                Street street = streetService.findById(u.getStreet_id());
 //                dto.setStreetName(street.getName());
 //            }
-            dto.setToken(skyImageApiService.accessToken());
-            skyImageApiService.syncUserInfo(dto);
+                dto.setToken(skyImageApiService.accessToken());
+                skyImageApiService.syncUserInfo(dto);
+            }, "syncUserInfo").start();
 
             return messagesMap;
         }
@@ -466,16 +469,17 @@ public class UserController extends BaseController {
         u.setPassword(SecureUtil.md5().digestHex(resetPassword));
         Boolean flag = userService.updateUser(u);
         if (flag) {
-
-            //同步信息给天启
-            SyncUserDto dto = new SyncUserDto();
-            dto.setAction(Constant.METHOD_STATUS.UPDATE);
-            dto.setOldUserName(u.getNick_name());
-            dto.setUserName(u.getUser_name());
-            dto.setUserLoginName(u.getNick_name());
-            dto.setPassword(resetPassword);
-            dto.setToken(skyImageApiService.accessToken());
-            skyImageApiService.syncUserInfo(dto);
+            new Thread(() -> {
+                //同步信息给天启
+                SyncUserDto dto = new SyncUserDto();
+                dto.setAction(Constant.METHOD_STATUS.UPDATE);
+                dto.setOldUserName(u.getNick_name());
+                dto.setUserName(u.getUser_name());
+                dto.setUserLoginName(u.getNick_name());
+                dto.setPassword(resetPassword);
+                dto.setToken(skyImageApiService.accessToken());
+                skyImageApiService.syncUserInfo(dto);
+            }, "syncUserInfo").start();
 
             log.info("重置密码成功! id= {}, u = {}", id);
             return ResponseMessage.success("重置密码成功");
@@ -498,15 +502,15 @@ public class UserController extends BaseController {
             return ResponseMessage.success("批量删除用户不存在");
         }
         for (String id : ids) {
-			if(id.equals(String.valueOf(ShiroUtils.getUserId()))) {
-				return ResponseMessage.error("删除失败，不能删除自己的账户！");
-			}
-		}
+            if (id.equals(String.valueOf(ShiroUtils.getUserId()))) {
+                return ResponseMessage.error("删除失败，不能删除自己的账户！");
+            }
+        }
         try {
-        	userService.deleteBatch(ids);
-        	return ResponseMessage.success("删除成功");
-        }catch(Exception e) {
-        	e.printStackTrace();
+            userService.deleteBatch(ids);
+            return ResponseMessage.success("删除成功");
+        } catch (Exception e) {
+            e.printStackTrace();
         }
 
         return ResponseMessage.error("删除失败");
@@ -527,8 +531,8 @@ public class UserController extends BaseController {
             return ResponseMessage.error("批量启用用户不存在");
         }
         for (String id : ids) {
-            if(id.equals(String.valueOf(ShiroUtils.getUserId()))) {
-            	return ResponseMessage.error("不能对自己的账号进行启用操作！");
+            if (id.equals(String.valueOf(ShiroUtils.getUserId()))) {
+                return ResponseMessage.error("不能对自己的账号进行启用操作！");
             }
         }
         for (String id : ids) {
@@ -556,8 +560,8 @@ public class UserController extends BaseController {
             return ResponseMessage.error("批量启用用户不存在");
         }
         for (String id : ids) {
-            if(id.equals(String.valueOf(ShiroUtils.getUserId()))) {
-            	return ResponseMessage.error("不能对自己的账号进行禁用操作！");
+            if (id.equals(String.valueOf(ShiroUtils.getUserId()))) {
+                return ResponseMessage.error("不能对自己的账号进行禁用操作！");
             }
         }
         for (String id : ids) {
@@ -610,9 +614,9 @@ public class UserController extends BaseController {
         Role role = new Role();
         role.setDel_flag(false);
         role.setUser_type(ShiroUtils.getUserEntity().getUser_type());
-        if(ShiroUtils.getUserEntity().getUser_type().equals(Constant.UserType.COMPANY)) {
-        	 role.setCompany_id(ShiroUtils.getCompanyId());
-        }else {
+        if (ShiroUtils.getUserEntity().getUser_type().equals(Constant.UserType.COMPANY)) {
+            role.setCompany_id(ShiroUtils.getCompanyId());
+        } else {
             role.setBuild_id(ShiroUtils.getBuildId());
         }
         modelMap.addAttribute("roles", roleService.findListByWhere(role));
@@ -630,13 +634,13 @@ public class UserController extends BaseController {
     @OperationLog(value = "添加用户")
     @ResponseBody
     @PostMapping(value = "/saveCompanyUser")
-    public ModelMap saveCompanyUser(User content,Integer company_id1) throws Exception {
-    	ModelMap messagesMap = new ModelMap();
-    	if(IsTooFrequently()) {
-        	messagesMap.put("status", FAILURE);
+    public ModelMap saveCompanyUser(User content, Integer company_id1) throws Exception {
+        ModelMap messagesMap = new ModelMap();
+        if (IsTooFrequently()) {
+            messagesMap.put("status", FAILURE);
             messagesMap.put("message", "操作过于频繁，请稍后再试!");
             return messagesMap;
-    	}
+        }
         log.debug("添加用户参数! content = {}", content);
         Boolean flag = userService.saveCompanyUser(content);
         if (flag) {
@@ -644,16 +648,18 @@ public class UserController extends BaseController {
             messagesMap.put("status", SUCCESS);
             messagesMap.put("message", "添加成功!");
 
-            //同步信息给天启
-            SyncUserDto dto = new SyncUserDto();
-            dto.setAction(Constant.METHOD_STATUS.INSERT);
-            dto.setOldUserName("");
-            dto.setUserName(content.getUser_name());
-            dto.setUserLoginName(content.getNick_name());
-            dto.setPassword(content.getPassword().trim());
-            dto.setCompanyName(content.getCompany_name());
-            dto.setToken(skyImageApiService.accessToken());
-            skyImageApiService.syncUserInfo(dto);
+            new Thread(() -> {
+                //同步信息给天启
+                SyncUserDto dto = new SyncUserDto();
+                dto.setAction(Constant.METHOD_STATUS.INSERT);
+                dto.setOldUserName("");
+                dto.setUserName(content.getUser_name());
+                dto.setUserLoginName(content.getNick_name());
+                dto.setPassword(content.getPassword().trim());
+                dto.setCompanyName(content.getCompany_name());
+                dto.setToken(skyImageApiService.accessToken());
+                skyImageApiService.syncUserInfo(dto);
+            }, "syncUserInfo").start();
 
             return messagesMap;
         }
@@ -679,9 +685,9 @@ public class UserController extends BaseController {
         Role role = new Role();
         role.setDel_flag(false);
         role.setUser_type(ShiroUtils.getUserEntity().getUser_type());
-        if(ShiroUtils.getUserEntity().getUser_type().equals(Constant.UserType.COMPANY)) {
-        	 role.setCompany_id(ShiroUtils.getCompanyId());
-        }else {
+        if (ShiroUtils.getUserEntity().getUser_type().equals(Constant.UserType.COMPANY)) {
+            role.setCompany_id(ShiroUtils.getCompanyId());
+        } else {
             role.setBuild_id(ShiroUtils.getBuildId());
         }
         modelMap.addAttribute("roles", roleService.findListByWhere(role));
@@ -699,7 +705,7 @@ public class UserController extends BaseController {
     @GetMapping(value = "/checkCompanyUser/{id}")
     public String checkCompanyUser(@PathVariable("id") int id, ModelMap modelMap) {
         //User user = userService.findById(id);
-    	User user = userService.getUser(id);
+        User user = userService.getUser(id);
         user.setRoleIds(userService.getUserRoleIds(id));
         modelMap.addAttribute("user", user);
         modelMap.put("user_type", ShiroUtils.getUserEntity().getUser_type());
@@ -715,14 +721,14 @@ public class UserController extends BaseController {
     @OperationLog(value = "编辑用户")
     @ResponseBody
     @PutMapping(value = "/updateCompanyUser/{id}")
-    public ModelMap updateCompanyUser(@PathVariable("id") int id, User content,Integer company_id) throws Exception {
+    public ModelMap updateCompanyUser(@PathVariable("id") int id, User content, Integer company_id) throws Exception {
         ModelMap messagesMap = new ModelMap();
         log.debug("编辑用户参数! id= {}, content = {}", id, content);
-        if(IsTooFrequently()) {
-        	messagesMap.put("status", FAILURE);
+        if (IsTooFrequently()) {
+            messagesMap.put("status", FAILURE);
             messagesMap.put("message", "操作过于频繁，请稍后再试!");
             return messagesMap;
-    	}
+        }
         User u = userService.findById(id);
         if (null == u) {
             log.info("编辑用户不存在! id = {}", id);
@@ -736,23 +742,26 @@ public class UserController extends BaseController {
             messagesMap.put("status", SUCCESS);
             messagesMap.put("message", "编辑成功!");
 
-            //同步信息给天启
-            SyncUserDto dto = new SyncUserDto();
-            dto.setAction(Constant.METHOD_STATUS.UPDATE);
-            dto.setOldUserName(u.getNick_name());
-            dto.setUserName(content.getUser_name());
-            dto.setUserLoginName(content.getNick_name());
-            dto.setPassword(content.getPassword().trim());
-            dto.setCompanyName(content.getCompany_name());
-            dto.setToken(skyImageApiService.accessToken());
-            skyImageApiService.syncUserInfo(dto);
+            new Thread(() -> {
+                //同步信息给天启
+                SyncUserDto dto = new SyncUserDto();
+                dto.setAction(Constant.METHOD_STATUS.UPDATE);
+                dto.setOldUserName(u.getNick_name());
+                dto.setUserName(content.getUser_name());
+                dto.setUserLoginName(content.getNick_name());
+                dto.setPassword(content.getPassword().trim());
+                dto.setCompanyName(content.getCompany_name());
+                dto.setToken(skyImageApiService.accessToken());
+                skyImageApiService.syncUserInfo(dto);
+            }, "syncUserInfo").start();
+
             return messagesMap;
         }
         messagesMap.put("status", FAILURE);
         messagesMap.put("message", "编辑失败!");
         return messagesMap;
     }
-    
+
     /**
      * 检验手机号是否存在
      *
@@ -780,24 +789,26 @@ public class UserController extends BaseController {
         log.info("检验用户名是否存在结果! flag = {}", flag);
         return flag;
     }
-    
+
     /**
      * 跳转到修改手机号页面
+     *
      * @return
      */
     @GetMapping(value = "/editPhone")
-    public String editPhone(ModelMap modelMap){
+    public String editPhone(ModelMap modelMap) {
         log.info("跳转到修改手机号页面成功!");
         modelMap.put("id", ShiroUtils.getUserId());
         return BASE_COMPANY_PATH + "accountInfo/editPhone";
     }
-    
+
     /**
      * 跳转到修改姓名页面
+     *
      * @return
      */
     @GetMapping(value = "/editUserName")
-    public String editUserName(ModelMap modelMap){
+    public String editUserName(ModelMap modelMap) {
         log.info("跳转到修改姓名页面成功!");
         modelMap.put("id", ShiroUtils.getUserId());
         return BASE_COMPANY_PATH + "accountInfo/editUserName";