|
@@ -19,6 +19,7 @@ import com.dragonsoft.encrypt.EncryptHandler;
|
|
import org.slf4j.Logger;
|
|
import org.slf4j.Logger;
|
|
import org.slf4j.LoggerFactory;
|
|
import org.slf4j.LoggerFactory;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
|
+import org.springframework.beans.factory.annotation.Value;
|
|
import org.springframework.web.bind.annotation.*;
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
|
|
|
import javax.servlet.http.HttpServletRequest;
|
|
import javax.servlet.http.HttpServletRequest;
|
|
@@ -29,6 +30,12 @@ import java.util.*;
|
|
public class UserController {
|
|
public class UserController {
|
|
private static final Logger LOGGER = LoggerFactory.getLogger(UserController.class);
|
|
private static final Logger LOGGER = LoggerFactory.getLogger(UserController.class);
|
|
|
|
|
|
|
|
+ @Value("${external.esou.url}")
|
|
|
|
+ private String esouUrl;
|
|
|
|
+ @Value("${external.dcuc.url}")
|
|
|
|
+ private String dcucUrl;
|
|
|
|
+
|
|
|
|
+
|
|
@Autowired
|
|
@Autowired
|
|
private SysUserService sysUserService;
|
|
private SysUserService sysUserService;
|
|
@Autowired
|
|
@Autowired
|
|
@@ -45,8 +52,6 @@ public class UserController {
|
|
userInfo.put("deptCode", loginUser.getOrgCode());
|
|
userInfo.put("deptCode", loginUser.getOrgCode());
|
|
userInfo.put("deptName", loginUser.getUser().getOrgName());
|
|
userInfo.put("deptName", loginUser.getUser().getOrgName());
|
|
userInfo.put("idCard", loginUser.getIdCard());
|
|
userInfo.put("idCard", loginUser.getIdCard());
|
|
- EncryptHandler encryptHandler = EncryptFactory.getInstance();
|
|
|
|
- userInfo.put("encryptIdCard", encryptHandler.encapsulateString(loginUser.getIdCard()));
|
|
|
|
|
|
|
|
try {
|
|
try {
|
|
// 获取当前在线人数
|
|
// 获取当前在线人数
|
|
@@ -69,9 +74,16 @@ public class UserController {
|
|
LOGGER.error("获取用户[{}]上次登录信息失败", loginUser.getIdCard(), e);
|
|
LOGGER.error("获取用户[{}]上次登录信息失败", loginUser.getIdCard(), e);
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ Map<String, String> links = new HashMap<>();
|
|
|
|
+ EncryptHandler encryptHandler = EncryptFactory.getInstance();
|
|
|
|
+ String encryptIdCard = encryptHandler.encapsulateString(loginUser.getIdCard());
|
|
|
|
+ links.put("esouUrl", esouUrl.replace("{USER_IDCARD}", encryptIdCard));
|
|
|
|
+ links.put("dcucUrl", dcucUrl);
|
|
|
|
+
|
|
Map<String, Object> data = new HashMap<>(2);
|
|
Map<String, Object> data = new HashMap<>(2);
|
|
data.put("roles", loginUser.getPermissions());
|
|
data.put("roles", loginUser.getPermissions());
|
|
data.put("userInfo", userInfo);
|
|
data.put("userInfo", userInfo);
|
|
|
|
+ data.put("links", links);
|
|
return R.ok(data);
|
|
return R.ok(data);
|
|
}
|
|
}
|
|
|
|
|