I3_YF_SEAT
/
impp-core
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev' into test

Browse Source
yun-zuoyi
wynne1005 4 years ago
parent 3f5fbc16ef 8fbdb6d56a
commit 4c769a8b83
5 changed files with 49 additions and 41 deletions
Show Stats Download Patch File Download Diff File

39
modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/ExternalSystemController.java
Unescape Escape View File

@ -62,19 +62,19 @@ public class ExternalSystemController {
private RabbitTemplate rabbitTemplate; private RabbitTemplate rabbitTemplate;
@GetMapping(value = "/enterprise-wechat/msg-callback") @GetMapping(value = "/enterprise-wechat/msg-callback")
@ApiOperation(value = "消息回调测试",notes = "消息回调测试") @ApiOperation(value = "消息回调测试", notes = "消息回调测试")
public String test(@RequestParam(name = "msg_signature") String msgSignature, String timestamp, public String test(@RequestParam(name = "msg_signature") String msgSignature, String timestamp,
String nonce, String echostr) throws AesException { String nonce, String echostr) throws AesException {
return new WorkWeChatTool().msgCallbackVerify(msgSignature, timestamp,nonce, echostr); return new WorkWeChatTool().msgCallbackVerify(msgSignature, timestamp, nonce, echostr);
} }
@PostMapping(value = "/enterprise-wechat/msg-callback") @PostMapping(value = "/enterprise-wechat/msg-callback")
@ApiOperation(value = "消息回调",notes = "消息回调") @ApiOperation(value = "消息回调", notes = "消息回调")
public ResultBean listSysLocaleLanguage(@RequestParam(name = "msg_signature") String msgSignature, String timestamp, public ResultBean listSysLocaleLanguage(@RequestParam(name = "msg_signature") String msgSignature, String timestamp,
String nonce,@RequestBody String msgStr) { String nonce, @RequestBody String msgStr) {
try { try {
WorkWeChatTool workWeChatTool = new WorkWeChatTool(); WorkWeChatTool workWeChatTool = new WorkWeChatTool();
MsgTaskCardEvent msgTaskCardEvent = workWeChatTool.msgCallbackDecrypt(msgSignature,timestamp,nonce,msgStr); MsgTaskCardEvent msgTaskCardEvent = workWeChatTool.msgCallbackDecrypt(msgSignature, timestamp, nonce, msgStr);
rabbitTemplate.convertAndSend(PlatformConstWords.QUEUE_IMPP_WORK_WECHAT_MSG_CALLBACK, JSON.toJSONString(msgTaskCardEvent)); rabbitTemplate.convertAndSend(PlatformConstWords.QUEUE_IMPP_WORK_WECHAT_MSG_CALLBACK, JSON.toJSONString(msgTaskCardEvent));
return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultObject(msgTaskCardEvent); return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultObject(msgTaskCardEvent);
} catch (ImppBusiException busExcep) { } catch (ImppBusiException busExcep) {
@ -85,7 +85,7 @@ public class ExternalSystemController {
} }
@GetMapping(value = "/enterprise-wechat/bind-user-ref") @GetMapping(value = "/enterprise-wechat/bind-user-ref")
@ApiOperation(value = "绑定用户关系",notes = "绑定用户关系") @ApiOperation(value = "绑定用户关系", notes = "绑定用户关系")
public ResultBean workWeChatUserBind() { public ResultBean workWeChatUserBind() {
try { try {
WorkWeChatTool workWeChatTool = new WorkWeChatTool(); WorkWeChatTool workWeChatTool = new WorkWeChatTool();
@ -118,7 +118,7 @@ public class ExternalSystemController {
); );
// 判断是否存在如果存在则修改，不存在则新增 // 判断是否存在如果存在则修改，不存在则新增
if(sysRefUserExternal == null){ if (sysRefUserExternal == null) {
sysRefUserExternal = new SysRefUserExternal(); sysRefUserExternal = new SysRefUserExternal();
sysRefUserExternal.setUserId(sysUser.getId()); sysRefUserExternal.setUserId(sysUser.getId());
sysRefUserExternal.setExternalRef(ImppEnumUtil.USER_EXTERNAL_REF.WORK_WECHAT.getValue()); sysRefUserExternal.setExternalRef(ImppEnumUtil.USER_EXTERNAL_REF.WORK_WECHAT.getValue());
@ -132,33 +132,34 @@ public class ExternalSystemController {
} }
return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
}catch(ImppBusiException busExcep){ } catch (ImppBusiException busExcep) {
return ResultBean.fail(busExcep); return ResultBean.fail(busExcep);
}catch(Exception e){ } catch (Exception e) {
return ImppExceptionBuilder.newInstance().buildExceptionResult(e); return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
} }
} }
private String getUserProperty(ImppEnumUtil.USER_BIND_PROPERTY userBindProperty,SysUser sysUser){ private String getUserProperty(ImppEnumUtil.USER_BIND_PROPERTY userBindProperty, SysUser sysUser) {
String userBindPropertyValue = null; String userBindPropertyValue = null;
switch (userBindProperty){ switch (userBindProperty) {
case USER_LOGIN_NAME: case USER_LOGIN_NAME:
userBindPropertyValue =sysUser.getUserLoginName(); userBindPropertyValue = sysUser.getUserLoginName();
break; break;
case USER_NAME: case USER_NAME:
userBindPropertyValue = sysUser.getUserName(); userBindPropertyValue = sysUser.getUserName();
break; break;
case USER_EMP_NO: case USER_EMP_NO:
userBindPropertyValue =sysUser.getUserEmpNo(); userBindPropertyValue = sysUser.getUserEmpNo();
break;
case EMAIL:
userBindPropertyValue =sysUser.getUserEmail();
break; break;
//FIXME 松下取消邮箱校验
// case EMAIL:
// userBindPropertyValue =sysUser.getUserEmail();
// break;
case USER_PHONE: case USER_PHONE:
userBindPropertyValue =sysUser.getUserPhone(); userBindPropertyValue = sysUser.getUserPhone();
break; break;
case USER_WECHAT_NO: case USER_WECHAT_NO:
userBindPropertyValue =sysUser.getUserWeChatNo(); userBindPropertyValue = sysUser.getUserWeChatNo();
break; break;
} }
return userBindPropertyValue; return userBindPropertyValue;

8
modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserController.java
Unescape Escape View File

@ -81,7 +81,8 @@ public class SysUserController extends CoreBaseController{
ValidatorBean.beginValid(sysUser) ValidatorBean.beginValid(sysUser)
.numberCheck("userInfoId",sysUser.getUserInfoId()) .numberCheck("userInfoId",sysUser.getUserInfoId())
.notNull("userLoginName",sysUser.getUserLoginName()) .notNull("userLoginName",sysUser.getUserLoginName())
.notNull("userEmail",sysUser.getUserEmail()) // FIXME 松下取消邮箱校验
// .notNull("userEmail",sysUser.getUserEmail())
.notNull("userLoginPassword",sysUser.getUserLoginPassword()); .notNull("userLoginPassword",sysUser.getUserLoginPassword());
if(roleIds == null || roleIds.length <= 0){ if(roleIds == null || roleIds.length <= 0){
@ -143,8 +144,9 @@ public class SysUserController extends CoreBaseController{
ValidatorBean.beginValid(sysUser) ValidatorBean.beginValid(sysUser)
.numberCheck("id",sysUser.getUserInfoId()) .numberCheck("id",sysUser.getUserInfoId())
.numberCheck("userInfoId",sysUser.getUserInfoId()) .numberCheck("userInfoId",sysUser.getUserInfoId())
.notNull("userLoginName",sysUser.getUserLoginName()) .notNull("userLoginName",sysUser.getUserLoginName());
.notNull("userEmail",sysUser.getUserEmail()); // FIXME 松下取消邮箱校验
// .notNull("userEmail",sysUser.getUserEmail());
if(roleIds == null || roleIds.length <= 0){ if(roleIds == null || roleIds.length <= 0){
throw ImppExceptionBuilder.newInstance() throw ImppExceptionBuilder.newInstance()

9
modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/MessageMailQueueReceiver.java
Unescape Escape View File

@ -109,8 +109,8 @@ public class MessageMailQueueReceiver {
sysFileAttach.setFileNameRdd(sysFile.getFileOriginalName()); sysFileAttach.setFileNameRdd(sysFile.getFileOriginalName());
sysFileAttach.setFilePathRdd(sysFile.getFilePath()); sysFileAttach.setFilePathRdd(sysFile.getFilePath());
sysFileAttachService.insertSysFileAttach(sysFileAttach); sysFileAttachService.insertSysFileAttach(sysFileAttach);
}finally { } finally {
if(in != null) { if (in != null) {
in.close(); in.close();
} }
} }
@ -137,7 +137,10 @@ public class MessageMailQueueReceiver {
for (String receiver : messageReceiver) { for (String receiver : messageReceiver) {
sysUser = sysUserService.getSysUserById(Long.parseLong(receiver)); sysUser = sysUserService.getSysUserById(Long.parseLong(receiver));
// FIXME 松下取消邮件唯一性
if (StringUtils.isEmpty(sysUser.getUserEmail())) {
continue;
}
refUserMessage = new SysRefUserMessage(); refUserMessage = new SysRefUserMessage();
refUserMessage.setMessageId(msg.getId()); refUserMessage.setMessageId(msg.getId());
refUserMessage.setMessageSoftType(msg.getMessageSoftType()); refUserMessage.setMessageSoftType(msg.getMessageSoftType());

17
modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/PersonnelServiceService.java
Unescape Escape View File

@ -639,14 +639,15 @@ public class PersonnelServiceService implements IPersonnelService {
} }
// 邮箱唯一教研 // 邮箱唯一教研
if(!checkSysUserEmail(user.getUserEmail(),user.getUserInfoId() == null ? 0 : user.getUserInfoId())){ // FIXME 松下移除邮箱校验
throw ImppExceptionBuilder.newInstance() // if(!checkSysUserEmail(user.getUserEmail(),user.getUserInfoId() == null ? 0 : user.getUserInfoId())){
.setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) // throw ImppExceptionBuilder.newInstance()
.setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_EXIT.getCode()) // .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
.setErrorDetail("邮箱已存在") // .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_EXIT.getCode())
.setErrorSolution("请重新输入邮箱") // .setErrorDetail("邮箱已存在")
.build(); // .setErrorSolution("请重新输入邮箱")
} // .build();
// }
// 手机号唯一教研 // 手机号唯一教研
if(!checkSysUserPhone(user.getUserPhone(),user.getUserInfoId() == null ? 0 : user.getUserInfoId())){ if(!checkSysUserPhone(user.getUserPhone(),user.getUserInfoId() == null ? 0 : user.getUserInfoId())){

17
modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserService.java
Unescape Escape View File

@ -590,14 +590,15 @@ public class SysUserService implements ISysUserService {
} }
// 登录名唯一教研 // 登录名唯一教研
if (!checkSysUserEmail(user.getUserEmail(), user.getId() == null ? 0 : user.getId())) { // FIXME 松下移除用户邮箱
throw ImppExceptionBuilder.newInstance() // if (!checkSysUserEmail(user.getUserEmail(), user.getId() == null ? 0 : user.getId())) {
.setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) // throw ImppExceptionBuilder.newInstance()
.setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_EXIT.getCode()) // .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
.setErrorDetail("邮箱已存在") // .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_EXIT.getCode())
.setErrorSolution("请重新输入邮箱") // .setErrorDetail("邮箱已存在")
.build(); // .setErrorSolution("请重新输入邮箱")
} // .build();
// }
// 登录名唯一教研 // 登录名唯一教研
if (!checkSysUserPhone(user.getUserPhone(), user.getId() == null ? 0 : user.getId())) { if (!checkSysUserPhone(user.getUserPhone(), user.getId() == null ? 0 : user.getId())) {

Write Preview
Loading…
Cancel
Save