From face3d535577e031ada564212c7149f630205930 Mon Sep 17 00:00:00 2001 From: zhanglei Date: Wed, 8 Jul 2026 21:07:16 +0800 Subject: [PATCH 1/2] bug --- .../safetyeval/app/executor/AccountExecutor.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/AccountExecutor.java b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/AccountExecutor.java index 3b8b66b..3b76156 100644 --- a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/AccountExecutor.java +++ b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/AccountExecutor.java @@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.jjb.saas.system.client.user.request.UserAddCmd; import com.zcloud.gbscommon.utils.MD5; import com.zcloud.gbscommon.utils.Sm2Util; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; import org.qinan.safetyeval.client.api.AccountApi; import org.qinan.safetyeval.client.co.AccountCO; import org.qinan.safetyeval.client.dto.*; @@ -30,6 +32,7 @@ import org.springframework.transaction.annotation.Transactional; * @author safety-eval */ @Service +@Slf4j public class AccountExecutor implements AccountApi { @Lazy @@ -118,10 +121,12 @@ public class AccountExecutor implements AccountApi { userAddCmd.setAccount(result.getAccount()); userAddCmd.setTenantId(result.getTenantId()); userAddCmd.setName(result.getUserName()); - if (result.getPassword() != null) { - defPassword = result.getPassword(); + String pas = defPassword; + if (StringUtils.isNotBlank(result.getPassword())) { + pas = result.getPassword(); } - String encrypt = Sm2Util.encryptHex(MD5.md5(defPassword), publicKey); + log.info("同步用户密码:{}", pas); + String encrypt = Sm2Util.encryptHex(MD5.md5(pas), publicKey); userAddCmd.setPassword(encrypt); try { gbsUserFacadeClient.add(userAddCmd); @@ -129,7 +134,7 @@ public class AccountExecutor implements AccountApi { // 回滚数据, 清除account表示数据,orgInfo数据 orgInfoMapper.delete(new LambdaQueryWrapper() .eq(OrgInfoDO::getCreateId, result.getId())); - accountDomainService.delete(result.getId()); + throw new BizException(ErrorCode.GBS_USER_SYNC_ERROR); } return SingleResponse.success(toCO(result)); From d30e1cd6e6ab299da5fad1d61568d20e74adec7e Mon Sep 17 00:00:00 2001 From: huwei <3313749341@qq.com> Date: Wed, 8 Jul 2026 21:08:33 +0800 Subject: [PATCH 2/2] =?UTF-8?q?bug=E9=97=AE=E9=A2=98=E4=BF=AE=E6=8A=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/qinan/safetyeval/app/executor/AccountExecutor.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/AccountExecutor.java b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/AccountExecutor.java index 3b8b66b..89489c2 100644 --- a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/AccountExecutor.java +++ b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/AccountExecutor.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.jjb.saas.system.client.user.request.UserAddCmd; import com.zcloud.gbscommon.utils.MD5; import com.zcloud.gbscommon.utils.Sm2Util; +import groovy.util.logging.Slf4j; import org.qinan.safetyeval.client.api.AccountApi; import org.qinan.safetyeval.client.co.AccountCO; import org.qinan.safetyeval.client.dto.*; @@ -143,6 +144,7 @@ public class AccountExecutor implements AccountApi { @Override public SingleResponse checkTerminalType() { + System.err.println(AuthUserContextAdapter.getCurrentUser()); AccountEntity accountEntity = accountDomainService.get(AuthUserContextAdapter.getCurrentUserId()); if (accountEntity == null || accountEntity.getType() == null) { throw new BizException(ErrorCode.ACCOUNT_NOT_FOUND);