Commit 85bc297e authored by qiankunpingtai's avatar qiankunpingtai
Browse files

修改注册远程调用的问题

parent e5fa1828
...@@ -7,15 +7,11 @@ import com.github.pagehelper.PageHelper; ...@@ -7,15 +7,11 @@ import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.jsh.erp.constants.BusinessConstants; import com.jsh.erp.constants.BusinessConstants;
import com.jsh.erp.constants.ExceptionConstants; import com.jsh.erp.constants.ExceptionConstants;
import com.jsh.erp.datasource.entities.DepotEx;
import com.jsh.erp.datasource.entities.SerialNumberEx;
import com.jsh.erp.datasource.entities.User; import com.jsh.erp.datasource.entities.User;
import com.jsh.erp.datasource.entities.UserEx; import com.jsh.erp.datasource.entities.UserEx;
import com.jsh.erp.datasource.vo.TreeNode;
import com.jsh.erp.datasource.vo.TreeNodeEx; import com.jsh.erp.datasource.vo.TreeNodeEx;
import com.jsh.erp.exception.BusinessParamCheckingException; import com.jsh.erp.exception.BusinessParamCheckingException;
import com.jsh.erp.service.user.UserService; import com.jsh.erp.service.user.UserService;
import com.jsh.erp.service.userBusiness.UserBusinessService;
import com.jsh.erp.utils.*; import com.jsh.erp.utils.*;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
...@@ -25,11 +21,11 @@ import org.springframework.web.bind.annotation.*; ...@@ -25,11 +21,11 @@ import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource; import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.io.File;
import java.io.IOException;
import java.net.URLEncoder; import java.net.URLEncoder;
import java.security.NoSuchAlgorithmException; import java.security.NoSuchAlgorithmException;
import java.util.*; import java.util.*;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import static com.jsh.erp.utils.ResponseJsonUtil.returnJson; import static com.jsh.erp.utils.ResponseJsonUtil.returnJson;
...@@ -39,7 +35,7 @@ import static com.jsh.erp.utils.ResponseJsonUtil.returnJson; ...@@ -39,7 +35,7 @@ import static com.jsh.erp.utils.ResponseJsonUtil.returnJson;
@RestController @RestController
@RequestMapping(value = "/user") @RequestMapping(value = "/user")
public class UserController { public class UserController {
private Logger logger = LoggerFactory.getLogger(ResourceController.class); private Logger logger = LoggerFactory.getLogger(UserController.class);
@Value("${mybatis-plus.status}") @Value("${mybatis-plus.status}")
private String mybatisPlusStatus; private String mybatisPlusStatus;
...@@ -56,9 +52,6 @@ public class UserController { ...@@ -56,9 +52,6 @@ public class UserController {
@Resource @Resource
private UserService userService; private UserService userService;
@Resource
private UserBusinessService userBusinessService;
private static String message = "成功"; private static String message = "成功";
private static final String HTTP = "http://"; private static final String HTTP = "http://";
private static final String CODE_OK = "200"; private static final String CODE_OK = "200";
...@@ -357,31 +350,33 @@ public class UserController { ...@@ -357,31 +350,33 @@ public class UserController {
ue.setUsername(loginame); ue.setUsername(loginame);
ue.setLoginame(loginame); ue.setLoginame(loginame);
ue.setPassword(password); ue.setPassword(password);
ue = userService.registerUser(ue); ue = userService.registerUser(ue,manageRoleId);
/**
//调第三方接口创建租户管理信息 * create by: qiankunpingtai
String url = HTTP + manageIp + ":" + managePort + "/tenant/add"; * create time: 2019/4/9 17:17
JSONObject tenantObj = new JSONObject(); * website:https://qiankunpingtai.cn
tenantObj.put("tenantId", ue.getId()); * description:
tenantObj.put("loginName",ue.getLoginame()); * 这里涉及到多个项目,需要用分布式事务去处理
String param = URLEncoder.encode(tenantObj.toString()); * 为了不使问题复杂化,暂时另外开启一个线程去处理其它项目的数据操作
HttpClient.httpPost(url + "?info=" + param, param); */
logger.info("===============创建租户信息完成==============="); final UserEx ueFinal=ue;
final ExecutorService executorService = Executors.newFixedThreadPool(1);
//更新租户id executorService.execute(() -> {
User user = new User(); try{
user.setId(ue.getId()); //调第三方接口创建租户管理信息
user.setTenantId(ue.getId()); String url = HTTP + manageIp + ":" + managePort + "/tenant/add";
userService.updateUserTenant(user); JSONObject tenantObj = new JSONObject();
tenantObj.put("tenantId", ueFinal.getId());
tenantObj.put("loginName",ueFinal.getLoginame());
String param = URLEncoder.encode(tenantObj.toString());
HttpClient.httpPost(url + "?info=" + param, param);
logger.info("===============创建租户信息完成===============");
}catch(Exception e){
//记录一下第三方接口创建租户管理信息创建失败
logger.debug("调用第三方接口创建租户管理信息失败:tenantId:[{}],loginName:[{}]",ueFinal.getId(),ueFinal.getLoginame());
}
});
//新增用户与角色的关系
JSONObject ubObj = new JSONObject();
ubObj.put("type", "UserRole");
ubObj.put("keyid", ue.getId());
JSONArray ubArr = new JSONArray();
ubArr.add(manageRoleId);
ubObj.put("value", ubArr.toString());
userBusinessService.insertUserBusiness(ubObj.toString(), request);
return result; return result;
} }
/** /**
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment