From f5475bc59ff69e7da485e02b31c6e55c27979f24 Mon Sep 17 00:00:00 2001 From: vincent Date: Wed, 9 Sep 2026 09:49:34 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4siqLoginMock=E6=96=B9?= =?UTF-8?q?=E6=B3=95=E7=9B=B8=E5=85=B3=E7=9A=84=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../IAppEnterpriseLoginService.java | 7 - .../impl/AppEnterpriseLoginServiceImpl.java | 50 +- .../src/api/enterprise/index.js | 3 - .../views/enterprise/home/enterpriseHome.vue | 2 +- .../enterprise/home/enterpriseHomeV2-bak.vue | 1172 ++++++++--------- .../enterprise/home/enterpriseHomeV2.vue | 2 +- 6 files changed, 589 insertions(+), 647 deletions(-) diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/enterprise/IAppEnterpriseLoginService.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/enterprise/IAppEnterpriseLoginService.java index a5d99571..ff525024 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/enterprise/IAppEnterpriseLoginService.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/enterprise/IAppEnterpriseLoginService.java @@ -19,12 +19,5 @@ public interface IAppEnterpriseLoginService { */ Map siqLogin(AppEnterpriseLoginBo bo); - /** - * 深I企模拟登录(开发/联调) - * @param bo 登录参数 - * @return 登录结果,包含token和用户信息 - */ - Map siqLoginMock(AppEnterpriseLoginBo bo); - public Map doSiqLoginWithLock(JSONObject userInfo); } 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 f7204e61..579bcd62 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 @@ -122,18 +122,7 @@ public class AppEnterpriseLoginServiceImpl implements IAppEnterpriseLoginService return doSiqLoginWithLock(userInfo); } - /** - * 深i企模拟登录(开发/联调) - */ - @Override - public Map siqLoginMock(AppEnterpriseLoginBo bo) { - log.info("---> 深i企模拟登录 userId:{}", bo.getUserId()); - JSONObject userInfo = getMockSiqUserInfo(bo.getCode()); - if (StringUtils.isNotEmpty(bo.getUserId())) { - userInfo.put("userId", bo.getUserId()); - } - return doSiqLoginWithLock(userInfo); - } + /** * 加锁后完成用户注册、企业关联并签发 token @@ -564,41 +553,4 @@ public class AppEnterpriseLoginServiceImpl implements IAppEnterpriseLoginService return token; } - - /** - * 获取模拟的深i企用户信息(用于测试) - * - * @param code 授权码 - * @return 模拟的用户信息JSON对象 - */ - private JSONObject getMockSiqUserInfo(String code) { - JSONObject userInfo = new JSONObject(); - - // 随机生成账号:test + 6位随机数字 - String randomSuffix = String.format("%06d", (int)(Math.random() * 1000000)); - String account = "test" + randomSuffix; - - userInfo.put("userId", "100001"); - userInfo.put("account", account); - userInfo.put("userName", "测试用户"); - userInfo.put("phone", IdCardCryptoUtil.symmetricEncryptIdCard(secretKey, "13800138000")); - - userInfo.put("corpCid", "91440300662678582M"); - userInfo.put("corpName", "深圳农牧美益肉业有限公司"); - userInfo.put("companyOrgType", "有限责任公司"); - userInfo.put("establishDate", "2010-01-15"); - userInfo.put("businessScope", "安防产品、电子产品的技术开发与销售;计算机软件的技术开发;计算机系统集成;国内贸易(不含专营、专控、专卖商品及限制项目);汽车购销。(法律、行政法规、国务院决定禁止的项目除外,限制的项目须取得许可后方可经营)信息技术咨询服务。(除依法须经批准的项目外,凭营业执照依法自主开展经营活动)"); - userInfo.put("regLocation", "深圳市南山区粤海街道高新区社区白石路3609号深圳湾科技生态园二区9栋B4座616"); - userInfo.put("regCapital", "5000万元人民币"); - userInfo.put("legalPersonName", "张三"); - userInfo.put("termStart", "2004-11-12"); - userInfo.put("termEnd", "2040-01-14"); - - log.info("返回模拟深i企用户信息: userId={}, account={}, corpName={}", - userInfo.getString("userId"), - userInfo.getString("account"), - userInfo.getString("corpName")); - - return userInfo; - } } diff --git a/zdxt-web-client/zdxt-efcode-enterprise-app/src/api/enterprise/index.js b/zdxt-web-client/zdxt-efcode-enterprise-app/src/api/enterprise/index.js index d3e054e8..597411c9 100644 --- a/zdxt-web-client/zdxt-efcode-enterprise-app/src/api/enterprise/index.js +++ b/zdxt-web-client/zdxt-efcode-enterprise-app/src/api/enterprise/index.js @@ -87,9 +87,6 @@ export const getComplaintItemList = (params, success, error) => _post(enterprise //深i企登录 export const getSiqLoginAuth = (params, success, error) => _post(enterpriseAppBaseUrl + "/enterprise/login/siqLogin", params, success, error); -//深i企模拟登录(通过userId模拟) -export const getSiqLoginAuthMock = (params, success, error) => _post(enterpriseAppBaseUrl + "/enterprise/login/siqLoginMock", params, success, error); - //强制生成二维码 export const forceGenerateQrCode = (params, success, error) => _get(enterpriseAppBaseUrl+"/enterpriseInfo/forceGenerateQrCode",params,success,error) diff --git a/zdxt-web-client/zdxt-efcode-enterprise-app/src/views/enterprise/home/enterpriseHome.vue b/zdxt-web-client/zdxt-efcode-enterprise-app/src/views/enterprise/home/enterpriseHome.vue index dc7e2c8f..5c6d3bce 100644 --- a/zdxt-web-client/zdxt-efcode-enterprise-app/src/views/enterprise/home/enterpriseHome.vue +++ b/zdxt-web-client/zdxt-efcode-enterprise-app/src/views/enterprise/home/enterpriseHome.vue @@ -99,7 +99,7 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 45775faf..378695fc 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 @@ -68,7 +68,7 @@