diff --git a/collect-sdry/src/main/resources/logback.xml b/collect-sdry/src/main/resources/logback.xml index 23dc795..95faea9 100644 --- a/collect-sdry/src/main/resources/logback.xml +++ b/collect-sdry/src/main/resources/logback.xml @@ -9,6 +9,12 @@ + + + + + + @@ -47,9 +53,12 @@ + + + - + diff --git a/common-collect/src/main/java/com/docus/server/collect/basic/http/test/TestRestController.java b/common-collect/src/main/java/com/docus/server/collect/basic/http/test/TestRestController.java index e783ab4..bd6fcd7 100644 --- a/common-collect/src/main/java/com/docus/server/collect/basic/http/test/TestRestController.java +++ b/common-collect/src/main/java/com/docus/server/collect/basic/http/test/TestRestController.java @@ -43,7 +43,7 @@ public class TestRestController { @ApiOperation("TEST-2") @GetMapping("/get2") - public void get2() throws Exception { + public void get2(String msg) throws Exception { TaskOriginalMessage message = messageService.findByState(StateEnum.FAIL).get(0); IJobHandler jobHandler = TrackRetrySpringExecutor.loadJobHandler(message.getRetryKey()); String name = ((MethodJobHandler) jobHandler).getMethod().getParameterTypes()[0].getName(); diff --git a/common-collect/src/main/java/com/docus/server/collect/user/view/UserViewCollectJob.java b/common-collect/src/main/java/com/docus/server/collect/user/view/UserViewCollectJob.java index 3d0ef80..cc522d6 100644 --- a/common-collect/src/main/java/com/docus/server/collect/user/view/UserViewCollectJob.java +++ b/common-collect/src/main/java/com/docus/server/collect/user/view/UserViewCollectJob.java @@ -52,7 +52,7 @@ public class UserViewCollectJob extends AbstractCollectJob { public void doHandle(List results, String param) { //docus-BasicDataReceive同步user逻辑 Collection userNames = ListUtils.distinctSelect(results, UserDTO::getUserName); - List powerUsers = userService.findByList1("userName", userNames); + List powerUsers = userService.findByUserNameList(userNames); List existUserNames = ListUtils.distinctSelect(powerUsers, PowerUser::getUserName); results.forEach(p -> { @@ -73,34 +73,38 @@ public class UserViewCollectJob extends AbstractCollectJob { taskConfig.getPageNum(), taskConfig.getPageSize()); } - private void insertUserAndThirdLogin(UserDTO p, String userName) { - p.setPwd(userProperties.getPassword()); + private void insertUserAndThirdLogin(UserDTO userDTO, String userName) { - if (Func.isEmpty(p.getAuthorId())) { - p.setAuthorId("admin"); + if (Func.isEmpty(userDTO.getAuthorId())) { + userDTO.setAuthorId("admin"); } - if (Func.isEmpty(p.getAuthorName())) { - p.setAuthorName("admin"); + if (Func.isEmpty(userDTO.getAuthorName())) { + userDTO.setAuthorName("admin"); } - if (Func.isNotBlank(p.getDeptId())) { - PowerDept powerDept = deptService.findByDeptCode(p.getDeptId()); + if (Func.isNotBlank(userDTO.getDeptId())) { + PowerDept powerDept = deptService.findByDeptCode(userDTO.getDeptId()); if (!Objects.isNull(powerDept)) { - p.setDeptId(String.valueOf(powerDept.getDeptId())); + userDTO.setDeptId(String.valueOf(powerDept.getDeptId())); } } PowerUser powerUser = userService.findByUserName(userName); + PowerThirdLogin powerThirdLogin = new PowerThirdLogin(); powerThirdLogin.setId(idService.getDateSeq()); - powerThirdLogin.setPowerUserId(String.valueOf(powerUser.getUserId())); + powerThirdLogin.setUser("0"); + if (Func.notNull(powerUser)) { + powerThirdLogin.setPowerUserId(String.valueOf(powerUser.getUserId())); + } powerThirdLogin.setUser(userName); - powerThirdLogin.setPwd(p.getPwd()); + powerThirdLogin.setPwd(userDTO.getPwd()); powerThirdLogin.setSource(0); powerThirdLogin.setCreateTime(DateUtil.now()); + userDTO.setPwd(userProperties.getPassword()); - userService.insertOrUpdatePowerUser(p); + userService.insertOrUpdatePowerUser(userDTO); thirdLoginService.savePowerThirdLogin(powerThirdLogin); } diff --git a/common-collect/src/main/java/com/docus/server/collect/web/common/entity/TaskConfig.java b/common-collect/src/main/java/com/docus/server/collect/web/common/entity/TaskConfig.java index f00c393..644610b 100644 --- a/common-collect/src/main/java/com/docus/server/collect/web/common/entity/TaskConfig.java +++ b/common-collect/src/main/java/com/docus/server/collect/web/common/entity/TaskConfig.java @@ -104,11 +104,4 @@ public class TaskConfig { } return this.startTime; } - - public String getLastErrorMsg() { - if (null != lastErrorMsg && lastErrorMsg.length() > 1000) { - return lastErrorMsg.substring(0, 1000); - } - return lastErrorMsg; - } } diff --git a/common-collect/src/main/java/com/docus/server/collect/web/job/AbstractCollectJob.java b/common-collect/src/main/java/com/docus/server/collect/web/job/AbstractCollectJob.java index e9de0b5..4ac9baa 100644 --- a/common-collect/src/main/java/com/docus/server/collect/web/job/AbstractCollectJob.java +++ b/common-collect/src/main/java/com/docus/server/collect/web/job/AbstractCollectJob.java @@ -14,6 +14,7 @@ import com.docus.server.sys.service.IPowerDeptService; import com.docus.server.sys.service.IPowerThirdLoginService; import com.docus.server.sys.service.IPowerUserService; import com.xxl.job.core.context.XxlJobHelper; +import jodd.exception.ExceptionUtil; import lombok.extern.slf4j.Slf4j; import javax.annotation.Resource; @@ -52,7 +53,7 @@ public abstract class AbstractCollectJob implements IJob { } } catch (Exception ex) { log.error(ex.getMessage(), ex); - updateTaskState(ex.getMessage(), taskConfig); + updateTaskState(getExceptionMessage(ex), taskConfig); } refreshTaskState(taskConfig); @@ -73,7 +74,7 @@ public abstract class AbstractCollectJob implements IJob { } } catch (Exception ex) { log.error(ex.getMessage(), ex); - updateTaskState(ex.getMessage(), taskConfig); + updateTaskState(getExceptionMessage(ex), taskConfig); } refreshTaskState(taskConfig); @@ -135,4 +136,12 @@ public abstract class AbstractCollectJob implements IJob { return XxlJobHelper.getJobParam(); } + private String getExceptionMessage(Exception ex) { + String lastErrorMsg = ExceptionUtil.exceptionChainToString(ex); + if (null != lastErrorMsg && lastErrorMsg.length() > 1000) { + return lastErrorMsg.substring(0, 1000); + } + return lastErrorMsg; + } + } diff --git a/common-docus/docus-sys/src/main/java/com/docus/server/sys/service/IPowerUserService.java b/common-docus/docus-sys/src/main/java/com/docus/server/sys/service/IPowerUserService.java index eb02341..ceefb89 100644 --- a/common-docus/docus-sys/src/main/java/com/docus/server/sys/service/IPowerUserService.java +++ b/common-docus/docus-sys/src/main/java/com/docus/server/sys/service/IPowerUserService.java @@ -33,8 +33,19 @@ public interface IPowerUserService { */ void batchInsertOrUpdatePowerUser(List users); + /** + * 根据username查询用户信息 + * + * @param userName 用户名 + * @return + */ + PowerUser findByUserName(String userName); - PowerUser findByUserName(String userValue); - - List findByList1(String userName, Collection userNames); + /** + * 根据userNames查询用户信息 + * + * @param userNames 用户名 + * @return + */ + List findByUserNameList(Collection userNames); } diff --git a/common-docus/docus-sys/src/main/java/com/docus/server/sys/service/impl/PowerThirdLoginServiceImpl.java b/common-docus/docus-sys/src/main/java/com/docus/server/sys/service/impl/PowerThirdLoginServiceImpl.java index cde4a62..dc05e87 100644 --- a/common-docus/docus-sys/src/main/java/com/docus/server/sys/service/impl/PowerThirdLoginServiceImpl.java +++ b/common-docus/docus-sys/src/main/java/com/docus/server/sys/service/impl/PowerThirdLoginServiceImpl.java @@ -1,5 +1,6 @@ package com.docus.server.sys.service.impl; +import com.docus.core.util.Func; import com.docus.server.sys.common.pojo.entity.PowerThirdLogin; import com.docus.server.sys.infrastructure.dao.IPowerThirdLoginDao; import com.docus.server.sys.service.IPowerThirdLoginService; @@ -33,8 +34,10 @@ public class PowerThirdLoginServiceImpl implements IPowerThirdLoginService { @Override public void updateThirdLogin(String pwd, String userName) { PowerThirdLogin user = findByUserName(userName); - user.setPwd(pwd); - powerThirdLoginDao.updateById(user); + if (Func.notNull(user)) { + user.setPwd(pwd); + powerThirdLoginDao.updateById(user); + } } } diff --git a/common-docus/docus-sys/src/main/java/com/docus/server/sys/service/impl/PowerUserServiceImpl.java b/common-docus/docus-sys/src/main/java/com/docus/server/sys/service/impl/PowerUserServiceImpl.java index 84d9263..704e646 100644 --- a/common-docus/docus-sys/src/main/java/com/docus/server/sys/service/impl/PowerUserServiceImpl.java +++ b/common-docus/docus-sys/src/main/java/com/docus/server/sys/service/impl/PowerUserServiceImpl.java @@ -36,13 +36,13 @@ public class PowerUserServiceImpl implements IPowerUserService { } @Override - public PowerUser findByUserName(String userValue) { - return userDao.findOneBy("userName", userValue); + public PowerUser findByUserName(String userName) { + return userDao.findOneBy("userName", userName); } @Override - public List findByList1(String userName, Collection values) { - return userDao.findByList(userName, values); + public List findByUserNameList(Collection values) { + return userDao.findByList("userName", values); } @Transactional diff --git a/docus-api-common/pom.xml b/docus-api-common/pom.xml index 3943446..66c0c80 100644 --- a/docus-api-common/pom.xml +++ b/docus-api-common/pom.xml @@ -15,31 +15,6 @@ docus-client-interface 1.0-SNAPSHOT - - - - com.github.pagehelper - pagehelper - 5.2.0 - - - - - - - - - - - - - - - - - - -