From 73220d880148eaea7d62ce6fbec276e3795d2a11 Mon Sep 17 00:00:00 2001 From: shil <452061493@qq.com> Date: Wed, 17 Jun 2026 17:34:45 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E7=8E=AF=E5=A2=83=E7=9A=84si?= =?UTF-8?q?q=20=E9=80=9A=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/encrypt/config/jasypt/JasyptUtils.java | 2 +- .../enterprise/AppEnterpriseLoginController.java | 1 - .../impl/AppEnterpriseLoginServiceImpl.java | 15 ++------------- .../views/enterprise/home/enterpriseHomeV2.vue | 1 + .../src/main/resources/application-dev.yml | 4 ++-- 5 files changed, 6 insertions(+), 17 deletions(-) diff --git a/zdxt-common/zdxt-common-encrypt/src/main/java/org/dromara/common/encrypt/config/jasypt/JasyptUtils.java b/zdxt-common/zdxt-common-encrypt/src/main/java/org/dromara/common/encrypt/config/jasypt/JasyptUtils.java index 21e9d6cb..4de768e6 100644 --- a/zdxt-common/zdxt-common-encrypt/src/main/java/org/dromara/common/encrypt/config/jasypt/JasyptUtils.java +++ b/zdxt-common/zdxt-common-encrypt/src/main/java/org/dromara/common/encrypt/config/jasypt/JasyptUtils.java @@ -55,6 +55,6 @@ public final class JasyptUtils { String channelcs1 = encryptWithMD5("a06qY2lYeURkNFo4dU5NWD==", "ATPfOhpnAVp6yBas7RU"); // String channelcs2 = decryptWithMD5("jGDVr5PtJpE/xa9FyHzmV2PhFrtctWjETGP5lrUlOyZ68APa81+jbQYA9RNKMI/dldAm7xxTQian8370eQqlYSAyoQV9EYlhsK3MgJkn4+OmnfBNmg227+/hizsmt1swxyW2uQbdlhzw6QaXYJ175Rjtlq1yVx+NOiamEoeSO4hzHWqxKTJT/y19fHg6QTuQc3r+PEsAFQp503HsvC5lgA==", "ATPfOhpnAVp6yBas7RU"); System.out.println(channelcs1); - System.out.println(decryptWithMD5("zTr/tj2VgFxQyunI4eIL7NyRWDPSMPSB0VlwTYeHTdsEWyu1H96xWw==","ATPfOhpnAVp6yBas7RU")); + System.out.println(decryptWithMD5("amY2xX5mjlyBg8wGGqaZoZv1vWCHnsj/l5a7gsGimead7xTC773KyQ==","ATPfOhpnAVp6yBas7RU")); } } diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppEnterpriseLoginController.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppEnterpriseLoginController.java index c642b0c1..028806ea 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppEnterpriseLoginController.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppEnterpriseLoginController.java @@ -52,7 +52,6 @@ public class AppEnterpriseLoginController { @ApiResponse(description = "企业端-用户登录（深i企）") @PostMapping("/siqLogin") public R> siqLogin(@RequestBody AppEnterpriseLoginBo bo) { - System.out.println("接收到登录请求"); Map result = appEnterpriseLoginService.siqLogin(bo); return R.ok("登录成功", result); } diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/enterprise/impl/AppEnterpriseLoginServiceImpl.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/enterprise/impl/AppEnterpriseLoginServiceImpl.java index ba31aaed..a23a9ae7 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/enterprise/impl/AppEnterpriseLoginServiceImpl.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/enterprise/impl/AppEnterpriseLoginServiceImpl.java @@ -116,10 +116,8 @@ public class AppEnterpriseLoginServiceImpl implements IAppEnterpriseLoginService */ @Override public Map siqLogin(AppEnterpriseLoginBo bo) { - log.info("---> 深i企登录用户 code：{}", bo.getCode()); JSONObject userInfo = siqLoginInfo(bo); log.info("---> 深i企登录用户信息：{}", userInfo); - log.info("---> 后面为本地登录的验证了!!! <---"); return doSiqLoginWithLock(userInfo); } @@ -290,30 +288,22 @@ public class AppEnterpriseLoginServiceImpl implements IAppEnterpriseLoginService public JSONObject siqLoginInfo(AppEnterpriseLoginBo bo) { try { Map params = new HashMap<>(); - log.info("调用深i企登录接口，参数: {}", bo); String accessKeySign = IdCardCryptoUtil.symmetricEncryptIdCard(secretKey, bo.getCode()); - params.put("accessKeySign", accessKeySign); params.put("appCode", code); - log.info("调用深i企登录接口，参数加密后: {}", params); - + params.put("accessKeySign", accessKeySign); String data = HttpUtil.httpSendPost( siqUrl + ApiConstants.API_SIQUSERLOGIN, JSONObject.toJSONString(params), new HashMap<>() ); - log.info("调用深i企登录接口响应: {}", data); JSONObject jsonObject = JSONObject.parseObject(data); JSONObject userInfo = jsonObject.getJSONObject("data"); - if (userInfo == null) { log.error("深i企接口返回数据为空: {}", data); throw new BaseException("深i企接口返回数据异常"); } - - log.info("解析深i企登录接口响应成功，用户信息: {}", userInfo); return userInfo; - } catch (BaseException e) { throw e; } catch (Exception e) { @@ -336,8 +326,7 @@ public class AppEnterpriseLoginServiceImpl implements IAppEnterpriseLoginService EnterpriseInformation existingEnterprise = enterpriseInformationMapper.selectOne(queryWrapper); if (existingEnterprise != null) { - log.info("企业已存在，执行更新操作: enterpriseNumber={}, enterpriseId={}", - enterpriseNumber, existingEnterprise.getId()); + log.info("企业已存在，执行更新操作: enterpriseNumber={}, enterpriseId={}", enterpriseNumber, existingEnterprise.getId()); existingEnterprise.setEnterpriseName(userInfo.getString("corpName")); existingEnterprise.setCompanyOrgType(userInfo.getString("companyOrgType")); diff --git a/zdxt-web-client/zdxt-efcode-enterprise-app/src/views/enterprise/home/enterpriseHomeV2.vue b/zdxt-web-client/zdxt-efcode-enterprise-app/src/views/enterprise/home/enterpriseHomeV2.vue index c16c37b8..4fac58eb 100644 --- a/zdxt-web-client/zdxt-efcode-enterprise-app/src/views/enterprise/home/enterpriseHomeV2.vue +++ b/zdxt-web-client/zdxt-efcode-enterprise-app/src/views/enterprise/home/enterpriseHomeV2.vue @@ -271,6 +271,7 @@ onMounted(() => { console.log(res) console.log("认证", res); console.log("code: " + res.result.result.code); + // getSiqLoginAuth({ code: "13b6a16b-1d08-4e9c-b4b6-4cc2101cd770" }, success => { getSiqLoginAuth({ code: res.result.result.code }, success => { useCommon.SET_USER_PHONENUMBER(success.data.phonenumber.toString()); useCommon.SET_USER_ID(success.data.userId); diff --git a/zdxt-web-server/zdxt-admin-web-server/src/main/resources/application-dev.yml b/zdxt-web-server/zdxt-admin-web-server/src/main/resources/application-dev.yml index 9919ecde..a507b9ae 100644 --- a/zdxt-web-server/zdxt-admin-web-server/src/main/resources/application-dev.yml +++ b/zdxt-web-server/zdxt-admin-web-server/src/main/resources/application-dev.yml @@ -290,9 +290,9 @@ siq: # code: zfjdm # secretKey: SXRpWEhVN3RHM3ZFbzRQcQ== #测试 - siqUrl: http://egbpub.siqhz.com/egb/api/thirdauth + siqUrl: https://egbpub.siqhz.com/egb/api/thirdauth code: TEST - secretKey: ENC(amY2xX5mjlyBg8wGGqaZoZv1vWCHnsj/l5a7gsGimead7xTC773KyQ==) + secretKey: ENC(6+WSjXj7UebpPJGq69e7aVZ1ZIrL9wnPcD+rU5XDFCNYGQM8fVvtcQ==) # 模拟数据开关（true=使用模拟数据，false=调用真实接口） mock: enabled: false