mirror of
https://codeup.aliyun.com/67762337eccfc218f6110e0e/per-boe/java-servers.git
synced 2025-12-09 02:46:50 +08:00
szx-1194 获取用户信息用http
This commit is contained in:
@@ -60,6 +60,9 @@ public class ThirdApi {
|
||||
@Value("${orgTree.orgChildTreeList}")
|
||||
private String orgChildTreeListUrl;
|
||||
|
||||
@Value("${userBasic.getUserBasicInfo}")
|
||||
private String getUserBasicInfo;
|
||||
|
||||
@Autowired
|
||||
UserDao userDao;
|
||||
|
||||
@@ -382,6 +385,46 @@ public class ThirdApi {
|
||||
|
||||
}
|
||||
|
||||
public List<UserBasicInfoVo> getUserBasicInfoByWorkNums2(String workNum, String token) {
|
||||
try {
|
||||
// 参数校验
|
||||
if (StringUtils.isBlank(workNum)) {
|
||||
log.warn("getUserBasicInfoByWorkNums2 workNum为空");
|
||||
return Collections.emptyList();
|
||||
}
|
||||
|
||||
// 构建URL参数,将单个workNum作为列表参数传递
|
||||
Map<String, Object> params = new HashMap<>();
|
||||
params.put("workNums", Collections.singletonList(workNum));
|
||||
|
||||
log.info("getUserBasicInfoByWorkNums2 请求参数: workNum={}, url={}", workNum, getUserBasicInfo);
|
||||
|
||||
// 发送HTTP GET请求
|
||||
String responseStr = HttpRequest.get(getUserBasicInfo)
|
||||
.form(params)
|
||||
.header("token", token)
|
||||
.execute()
|
||||
.body();
|
||||
|
||||
log.info("getUserBasicInfoByWorkNums2 响应结果: {}", responseStr);
|
||||
|
||||
// 解析响应
|
||||
UserBasicInfoResultVo resultVo = JSONUtil.parseObj(responseStr).toBean(UserBasicInfoResultVo.class);
|
||||
log.info("getUserBasicInfoByWorkNums2 解析结果: {}", resultVo);
|
||||
if (resultVo != null && resultVo.getStatus() == 200 && resultVo.getResult() != null) {
|
||||
return resultVo.getResult();
|
||||
} else {
|
||||
log.error("getUserBasicInfoByWorkNums2 请求失败: status={}, message={}",
|
||||
resultVo != null ? resultVo.getStatus() : "null",
|
||||
resultVo != null ? resultVo.getMessage() : "响应为空");
|
||||
return Collections.emptyList();
|
||||
}
|
||||
} catch (Exception e) {
|
||||
log.error("getUserBasicInfoByWorkNums2 HTTP请求异常: workNum={}", workNum, e);
|
||||
return Collections.emptyList();
|
||||
}
|
||||
}
|
||||
|
||||
public void updateOrSaveCourse(CourseParam param, String token){
|
||||
log.info("---------------准备同步在线课到讲师管理完毕 ------- param " + param);
|
||||
String resp = Optional.ofNullable(
|
||||
|
||||
@@ -466,7 +466,7 @@ public class CourseManageApi extends ApiBaseController{
|
||||
|
||||
@PostMapping("/submit")
|
||||
@AutoLog(module = "课程",action = "提交课程",info = "")
|
||||
public JsonResponse<CourseFullDto> submitCourseFull(@RequestBody CourseFullDto dto){
|
||||
public JsonResponse<CourseFullDto> submitCourseFull(HttpServletRequest request, @RequestBody CourseFullDto dto){
|
||||
if(dto.getCourse()==null){
|
||||
return badRequest("无课程信息");
|
||||
}
|
||||
@@ -587,7 +587,7 @@ public class CourseManageApi extends ApiBaseController{
|
||||
dto.getCourse().getOrgName(),
|
||||
dto.getCourse().getSysCreateBy(),dto.getCourse().getName());
|
||||
//邮件发送
|
||||
String email= this.getEmail(dto.getAuditUser().getCode());
|
||||
String email= this.getEmail(dto.getAuditUser().getCode(), request);
|
||||
if (StringUtils.isBlank( email)) {
|
||||
email=dto.getAuditUser().getEmail();
|
||||
}
|
||||
@@ -609,17 +609,23 @@ public class CourseManageApi extends ApiBaseController{
|
||||
}
|
||||
}
|
||||
|
||||
private String getEmail(String code) {
|
||||
private String getEmail(String code, HttpServletRequest request) {
|
||||
|
||||
String token = request.getHeader("Xboe-Access-Token");
|
||||
if (StringUtils.isEmpty(token)) {
|
||||
token = request.getHeader("token");
|
||||
}
|
||||
if (StringUtils.isEmpty(token)) {
|
||||
token = request.getHeader("x-access-token");
|
||||
}
|
||||
|
||||
log.info("审批获取邮箱新 code:{}", code);
|
||||
if (StringUtils.isBlank( code)) {
|
||||
return null;
|
||||
}
|
||||
try {
|
||||
List<String> workNums = new ArrayList(1){{
|
||||
add(code);
|
||||
}};
|
||||
log.info("审批获取邮箱 workNums:{}", workNums);
|
||||
List<UserBasicInfoVo> userBasicInfoVoList = thirdApi.getUserBasicInfoByWorkNums(workNums);
|
||||
log.info("审批获取邮箱 workNums:{}", code);
|
||||
List<UserBasicInfoVo> userBasicInfoVoList = thirdApi.getUserBasicInfoByWorkNums2(code, token);
|
||||
log.info("审批获取邮箱 userBasicInfoVoList:{}", userBasicInfoVoList);
|
||||
if (CollectionUtils.isEmpty(userBasicInfoVoList)) {
|
||||
return null;
|
||||
@@ -742,7 +748,7 @@ public class CourseManageApi extends ApiBaseController{
|
||||
//邮件发送
|
||||
if(!isLocalDevelopment()) {
|
||||
//只是非高度环境上才会发送
|
||||
String newEmail = getEmail(ucode);
|
||||
String newEmail = getEmail(ucode,request);
|
||||
if (StringUtils.isNotBlank(newEmail)) {
|
||||
email = newEmail;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user