Commit 43cbf4b6 authored by 钱坤's avatar 钱坤

早报发送的长链改为短链

新增后门接口强制重发某个机构某日的早报,
parent 9c49ccf5
...@@ -5,6 +5,6 @@ import org.springframework.web.bind.annotation.PostMapping; ...@@ -5,6 +5,6 @@ import org.springframework.web.bind.annotation.PostMapping;
@FeignClient(value = "shorturl", url = "${tanpu.feo-shorter.svc:}", path = "/") @FeignClient(value = "shorturl", url = "${tanpu.feo-shorter.svc:}", path = "/")
public interface ShorterFeign { public interface ShorterFeign {
@PostMapping("/shorter/get") @PostMapping(value = "/shorter/get")
ShorterResp getShorter(String url); ShorterResp getShorter(String url);
} }
...@@ -429,9 +429,11 @@ public class OrgSyncByWxcpJob { ...@@ -429,9 +429,11 @@ public class OrgSyncByWxcpJob {
continue; continue;
} }
// 更新 // 更新
if (!userInfo.getUiUsername().equals(wxCpUser.getName()) || StrUtil.isBlankIfStr(userInfo.getUiHeadimgMp()) if (!StringUtils.equals(userInfo.getUiNickname(), wxCpUser.getName()) ||
!userInfo.getUiUsername().equals(wxCpUser.getName()) || StrUtil.isBlankIfStr(userInfo.getUiHeadimgMp())
|| !wxCpUser.getUserId().equals(userInfo.getWxcpUid()) || StrUtil.isBlankIfStr(userInfo.getUiWechatXcxQrcode()) || !wxCpUser.getUserId().equals(userInfo.getWxcpUid()) || StrUtil.isBlankIfStr(userInfo.getUiWechatXcxQrcode())
|| !userInfo.getUiShenfen().equals(String.valueOf(wxCpUser.getIsLeader()))) { || !userInfo.getUiShenfen().equals(String.valueOf(wxCpUser.getIsLeader()))) {
userInfo.setUiNickname(wxCpUser.getName());
userInfo.setUiUsername(wxCpUser.getName()); userInfo.setUiUsername(wxCpUser.getName());
userInfo.setUiHeadimgMp(wxCpUser.getThumbAvatar()); userInfo.setUiHeadimgMp(wxCpUser.getThumbAvatar());
userInfo.setWxcpUid(wxCpUser.getUserId()); userInfo.setWxcpUid(wxCpUser.getUserId());
...@@ -449,6 +451,7 @@ public class OrgSyncByWxcpJob { ...@@ -449,6 +451,7 @@ public class OrgSyncByWxcpJob {
Gender gender = wxCpUser.getGender(); Gender gender = wxCpUser.getGender();
String sex = gender.getCode().equals("1") ? BaseConstant.Gender.MAN : BaseConstant.Gender.WOMEN; String sex = gender.getCode().equals("1") ? BaseConstant.Gender.MAN : BaseConstant.Gender.WOMEN;
userInfo.setUiSex(sex); userInfo.setUiSex(sex);
userInfo.setUiNickname(wxCpUser.getName());
userInfo.setUiHeadimg(wxCpUser.getThumbAvatar()); userInfo.setUiHeadimg(wxCpUser.getThumbAvatar());
userInfo.setUiHeadimgMp(wxCpUser.getThumbAvatar()); userInfo.setUiHeadimgMp(wxCpUser.getThumbAvatar());
userInfo.setOrgId(orgId); userInfo.setOrgId(orgId);
......
Markdown is supported
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