diff --git a/script/sql/zfjd-refactoring-v1/008-迁移数据.sql b/script/sql/zfjd-refactoring-v1/008-迁移数据.sql index d8c9da25..674f3f1c 100644 --- a/script/sql/zfjd-refactoring-v1/008-迁移数据.sql +++ b/script/sql/zfjd-refactoring-v1/008-迁移数据.sql @@ -40,3 +40,5 @@ SELECT FROM sys_user su INNER JOIN enterprise_information ei ON ei.user_id = su.user_id WHERE su.dept_id = '405'; + +update enterprise_user set salt='584564' where salt=''; diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/LoginController.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/LoginController.java index 4445ea3e..60cbef71 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/LoginController.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/LoginController.java @@ -3,6 +3,7 @@ package com.zdxt.enforcementcode.controller.app; import cn.dev33.satoken.stp.StpUtil; import cn.dev33.satoken.stp.parameter.SaLoginParameter; import cn.hutool.crypto.digest.DigestUtil; +import com.zdxt.enforcementcode.common.commonenum.PlatformTypeEnums; import lombok.extern.slf4j.Slf4j; import org.dromara.common.core.domain.R; import org.dromara.common.core.domain.model.LoginUser; @@ -77,6 +78,7 @@ public abstract class LoginController { loginUser.setNickname(nickName); loginUser.setUserType(userType); loginUser.setDeptId(deptId); + loginUser.setPlatformType(PlatformTypeEnums.ENTERPRISE.getKey()); SaLoginParameter model = new SaLoginParameter(); model.setDeviceType(deviceType); diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppEntEnterpriseInformationController.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppEntEnterpriseInformationController.java index ec1934c3..4979476e 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppEntEnterpriseInformationController.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppEntEnterpriseInformationController.java @@ -76,25 +76,28 @@ public class AppEntEnterpriseInformationController { */ @SaIgnore @GetMapping("/getQrCode") - public R> getQrCode() { + public R> getQrCode(@RequestParam String enterpriseNumber) { //根据当前登录用户部门ID 查询企业统一信用代码 - LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.eq(EnterpriseInformation::getId, LoginHelper.getDeptId()); - EnterpriseInformation enterpriseInformation = enterpriseInformationMapper.selectOne(lqw); - if(enterpriseInformation == null){ - return R.fail("企业纳税识别号不存在"); +// LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); +// lqw.eq(EnterpriseInformation::getId, LoginHelper.getDeptId()); +// EnterpriseInformation enterpriseInformation = enterpriseInformationMapper.selectOne(lqw); +// if(enterpriseInformation == null){ +// return R.fail("企业纳税识别号不存在"); +// } + if (enterpriseNumber == null || enterpriseNumber.trim().isEmpty()) { + return R.fail("企业纳税识别号不能为空"); } // 1. 查询最新的有效二维码记录 - QrCodeGenerateHistoryVo qrCodeVo = qrCodeGenerateHistoryService.queryLatestByEnterpriseNumber(enterpriseInformation.getEnterpriseNumber()); + QrCodeGenerateHistoryVo qrCodeVo = qrCodeGenerateHistoryService.queryLatestByEnterpriseNumber(enterpriseNumber); if (qrCodeVo == null) { return R.fail("未找到该企业的二维码记录"); } // 2. 查询企业名称（从企业信息表获取） String enterpriseName = ""; - EnterpriseInformationVo enterpriseInfo = enterpriseInformationService.queryByEnterpriseNumber(enterpriseInformation.getEnterpriseNumber()); + EnterpriseInformationVo enterpriseInfo = enterpriseInformationService.queryByEnterpriseNumber(enterpriseNumber); if (enterpriseInfo != null) { enterpriseName = enterpriseInfo.getEnterpriseName(); } diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppEntLoginController.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppEntLoginController.java index 672665ad..f016e80f 100644 --- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppEntLoginController.java +++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppEntLoginController.java @@ -2,8 +2,10 @@ package com.zdxt.enforcementcode.controller.app.enterprise; import cn.dev33.satoken.annotation.SaIgnore; import com.zdxt.enforcementcode.controller.app.LoginController; +import com.zdxt.enforcementcode.domain.vo.EnterpriseUserRefVo; import com.zdxt.enforcementcode.domain.vo.EnterpriseUserVo; import com.zdxt.enforcementcode.service.IEnterpriseInformationService; +import com.zdxt.enforcementcode.service.IEnterpriseUserRefService; import com.zdxt.enforcementcode.service.IEnterpriseUserService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -11,6 +13,7 @@ import org.dromara.common.core.domain.R; import org.springframework.web.bind.annotation.*; import java.util.HashMap; +import java.util.List; import java.util.Map; /** @@ -24,7 +27,7 @@ public class AppEntLoginController extends LoginController { private final IEnterpriseUserService enterpriseUserService; private final IEnterpriseInformationService enterpriseInformationService; - + private final IEnterpriseUserRefService enterpriseUserRefService; /** * 企业端用户登录 * @@ -65,9 +68,27 @@ public class AppEntLoginController extends LoginController { return R.fail("用户名或密码错误"); } + List refList = enterpriseUserRefService.queryListByUserId(user.getUserId()); + + List> dataList = new java.util.ArrayList<>(); + /*if (refList != null && !refList.isEmpty()) { + for (EnterpriseUserRefVo ref : refList) { + Map data = new HashMap<>(); + data.put("enterpriseId", ref.getEnterpriseId()); + data.put("enterpriseName", ref.getEnterpriseName()); + data.put("enterpriseNumber", ref.getEnterpriseNumber()); + dataList.add(data); + + enterpriseInformationService.generateQrCode("", ref.getEnterpriseNumber(), "app.enterprise", "getUserRefEnterpriseInfo"); + } + }*/ + if(dataList != null && !dataList.isEmpty()){ + throw new RuntimeException("该用户没有关联企业"); + } + // 6. 构建LoginUser并生成SaToken String token = doSaTokenLogin(user.getUserId(), user.getUserName(), user.getNickName(), - user.getDeptId(), "enterprise_user", "enterprise_app", "9e6eb24cd4e169a98b0d2cd8034d877b"); + refList.get(0).getEnterpriseId(), "enterprise_user", "enterprise_app", "9e6eb24cd4e169a98b0d2cd8034d877b"); // 7. 构造返回数据 Map data = new HashMap<>(); diff --git a/zdxt-web-client/zdxt-efcode-enterprise-app/src/views/enterprise/auth/loginByPassword.vue b/zdxt-web-client/zdxt-efcode-enterprise-app/src/views/enterprise/auth/loginByPassword.vue index 465b610b..bb3e5827 100644 --- a/zdxt-web-client/zdxt-efcode-enterprise-app/src/views/enterprise/auth/loginByPassword.vue +++ b/zdxt-web-client/zdxt-efcode-enterprise-app/src/views/enterprise/auth/loginByPassword.vue @@ -59,6 +59,7 @@ { account: 'qintongzhen138', name: '欧姆龙电子部件（深圳）有限公司', password: 'szsf@zfjd' }, { account: 'XP073215', name: '深圳市强达电路股份有限公司', password: 'szsf@zfjd' }, { account: '33ef1970fd449676fa4bc197', name: '吉田拉链（深圳）有限公司公明工厂', password: 'szsf@zfjd' }, + { account: 'test093590', name: '新粤云（深圳）信息技术有限公司', password: 'szsf@zfjd' } ]; const selectTestEnterprise = (item) => { diff --git a/zdxt-web-client/zdxt-efcode-enterprise-app/src/views/enterprise/qr/qrCode.vue b/zdxt-web-client/zdxt-efcode-enterprise-app/src/views/enterprise/qr/qrCode.vue index c5424ef7..bb30f4ad 100644 --- a/zdxt-web-client/zdxt-efcode-enterprise-app/src/views/enterprise/qr/qrCode.vue +++ b/zdxt-web-client/zdxt-efcode-enterprise-app/src/views/enterprise/qr/qrCode.vue @@ -42,8 +42,7 @@ import {queryEnterpriseInformationQrCode, forceGenerateQrCode} from '../../../ap import * as w6s from 'szient-js-sdk'; import sha1 from 'crypto-js/sha1'; import { reactive } from "vue"; -const { useMy } = $globalStore - +const { useCommon } = $globalStore; const router = useRouter(); const route = useRoute(); const data = reactive({ @@ -60,7 +59,7 @@ const goBack = () => { onMounted(() => { - queryEnterpriseInformationQrCode({}, success =>{ + queryEnterpriseInformationQrCode({"enterpriseNumber":useCommon.enterpriseNumber}, success =>{ if(success.code === 200 && success.data){ data.qrCodeUrl = import.meta.env.VITE_FILE_URL + (success.data.qrCodeUrl || ''); console.log(data.qrCodeUrl); diff --git a/zdxt-web-client/zdxt-efcode-enterprise-app/vite-config/index.js b/zdxt-web-client/zdxt-efcode-enterprise-app/vite-config/index.js index 5000f44d..6cb1e28c 100644 --- a/zdxt-web-client/zdxt-efcode-enterprise-app/vite-config/index.js +++ b/zdxt-web-client/zdxt-efcode-enterprise-app/vite-config/index.js @@ -57,7 +57,12 @@ const baseCfg = (viteEnv = {}) => { console.error(`[Proxy Error] ${req.method} ${req.url}`, err.message); }); } - } + }, + '/profile': { + target: VITE_PROXY_TARGET || 'http://139.186.148.21:8080', + rewrite: (path) => path.replace(/^\/profile/, '/ent-ep/profile'), + changeOrigin: true, + } } }, build: { diff --git a/zdxt-web-client/zdxt-efcode-enterprise-app/vite-env/.env.enterprise-dev-zrb b/zdxt-web-client/zdxt-efcode-enterprise-app/vite-env/.env.enterprise-dev-zrb index 9a6a4707..3da59f75 100644 --- a/zdxt-web-client/zdxt-efcode-enterprise-app/vite-env/.env.enterprise-dev-zrb +++ b/zdxt-web-client/zdxt-efcode-enterprise-app/vite-env/.env.enterprise-dev-zrb @@ -4,4 +4,5 @@ VITE_PROXY_TARGET = 'http://localhost:17000' VITE_BASE_URL = '/efcode20-ent-app/api/ent-ep' VITE_CONTEXT_PATH = '/efcode20-ent-app/' VITE_DEFAULT_LOGIN = '/enterprise/loginByPassword' +VITE_FILE_URL = '' VITE_APP_ENV = 'dev' diff --git a/zdxt-web-client/zdxt-efcode-enterprise-app/vite-env/.env.enterprise-prod b/zdxt-web-client/zdxt-efcode-enterprise-app/vite-env/.env.enterprise-prod index 5fde8abd..45ef9c0a 100644 --- a/zdxt-web-client/zdxt-efcode-enterprise-app/vite-env/.env.enterprise-prod +++ b/zdxt-web-client/zdxt-efcode-enterprise-app/vite-env/.env.enterprise-prod @@ -5,3 +5,4 @@ VITE_BASE_URL = '/efcode20-ent-app/api/ent-ep' VITE_CONTEXT_PATH = '/efcode20-ent-app/' VITE_DEFAULT_LOGIN = '/enterprise/loginByPassword' VITE_APP_ENV = 'prod' +VITE_FILE_URL = '' diff --git a/zdxt-web-server/zdxt-admin-web-server/src/test/java/com/zdxt/service/test/ResetUserPasswordTest.java b/zdxt-web-server/zdxt-admin-web-server/src/test/java/com/zdxt/service/test/ResetUserPasswordTest.java index c3a6e68c..1de8f6fb 100644 --- a/zdxt-web-server/zdxt-admin-web-server/src/test/java/com/zdxt/service/test/ResetUserPasswordTest.java +++ b/zdxt-web-server/zdxt-admin-web-server/src/test/java/com/zdxt/service/test/ResetUserPasswordTest.java @@ -106,7 +106,7 @@ public class ResetUserPasswordTest { // 1. 指定需要重置密码的用户ID列表 List userIds = Arrays.asList( // TODO: 在此填入需要重置的用户ID - "17608540150", "17608557492", "17608540121", "17608594890", "17608565612", "17608601734", "17608556724" + "17608540150", "17608557492", "17608540121", "17608594890", "17608565612", "17608601734", "17608556724","2064275054386966530","2064274295779979265" ); // 2. 根据ID列表查询企业用户