|
@@ -60,6 +60,7 @@ import java.util.*;
|
|
|
@Api(tags = "用户登录")
|
|
|
@Slf4j
|
|
|
public class LoginController {
|
|
|
+ private static final String DOMAIN_SERVER = "http://adsp.tjyourong.com.cn/";
|
|
|
@Autowired
|
|
|
private ISysUserService sysUserService;
|
|
|
@Autowired
|
|
@@ -96,33 +97,36 @@ public class LoginController {
|
|
|
Result<JSONObject> result = new Result<>();
|
|
|
//1:根据code值获取用户飞书信息
|
|
|
try {
|
|
|
+ if(null == code||code.trim().equals("")){
|
|
|
+ String url = AuthProvider.getAuthUrl("");
|
|
|
+ response.sendRedirect(url);
|
|
|
+ return ;
|
|
|
+ }
|
|
|
JSONObject data = AuthProvider.getFeishuUserInfo(code);
|
|
|
- System.out.println(data.toJSONString());
|
|
|
String accessToken = data.getJSONObject("data").getString("access_token");
|
|
|
String openId = data.getJSONObject("data").getString("open_id");
|
|
|
//根据accessToken
|
|
|
JSONObject userData = AuthProvider.getUserInfo(accessToken);
|
|
|
- System.out.println(userData.toJSONString());
|
|
|
JSONObject dataObject = userData.getJSONObject("data");
|
|
|
String email = dataObject.getString("email");
|
|
|
if(null == email||email.trim().equals("")){
|
|
|
- response.sendRedirect("http://localhost:3000/errorPage?desc="+ UrlEncoded.encodeString("飞书账号未绑定邮箱"));
|
|
|
+ response.sendRedirect(DOMAIN_SERVER+"errorPage?desc="+ UrlEncoded.encodeString("飞书账号未绑定邮箱"));
|
|
|
return ;
|
|
|
}
|
|
|
SysUser sysUser = sysUserService.getUserByEmail(email);
|
|
|
if (sysUser == null) {
|
|
|
- response.sendRedirect("http://localhost:3000/errorPage?desc="+ UrlEncoded.encodeString("该用户未注册系统账户,请联系管理员"));
|
|
|
+ response.sendRedirect(DOMAIN_SERVER+"errorPage?desc="+ UrlEncoded.encodeString("该用户未注册系统账户,请联系管理员"));
|
|
|
return ;
|
|
|
}
|
|
|
if(sysUser.getStatus() != 1){
|
|
|
- response.sendRedirect("http://localhost:3000/errorPage?desc="+UrlEncoded.encodeString("该用户已被冻结,请联系管理员"));
|
|
|
+ response.sendRedirect(DOMAIN_SERVER+"errorPage?desc="+UrlEncoded.encodeString("该用户已被冻结,请联系管理员"));
|
|
|
return ;
|
|
|
}
|
|
|
String departId = sysDepartService.selectIdByOrdCode(sysUser.getOrgCode());
|
|
|
sysUser.setDepartId(departId);
|
|
|
result = sysUserService.checkUserIsEffective(sysUser);
|
|
|
if (!result.isSuccess()) {
|
|
|
- response.sendRedirect("http://localhost:3000/errorPage?desc="+UrlEncoded.encodeString(result.getMessage()));
|
|
|
+ response.sendRedirect(DOMAIN_SERVER+"errorPage?desc="+UrlEncoded.encodeString(result.getMessage()));
|
|
|
return ;
|
|
|
}
|
|
|
//用户登录信息
|
|
@@ -144,11 +148,11 @@ public class LoginController {
|
|
|
feishuUser.setUpdateTime(new Date());
|
|
|
corpFeishuUserService.save(feishuUser);
|
|
|
}
|
|
|
- response.sendRedirect("http://localhost:3000/dashboard/analysis");
|
|
|
+ response.sendRedirect(DOMAIN_SERVER+"dashboard/analysis");
|
|
|
return ;
|
|
|
} catch (Exception e) {
|
|
|
e.printStackTrace();
|
|
|
- response.sendRedirect("http://localhost:3000/errorPage?desc=系统异常,请联系管理员");
|
|
|
+ response.sendRedirect(DOMAIN_SERVER+"errorPage?desc="+ UrlEncoded.encodeString("系统异常,请联系管理员"));
|
|
|
return;
|
|
|
}
|
|
|
}
|