From 2f940b0cd1c97abcdf27bbaf18a43e9a56ae48c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E8=AF=BA?= <1253070437@qq.com> Date: Thu, 24 Nov 2022 18:34:02 +0800 Subject: [PATCH 01/16] =?UTF-8?q?=E3=80=90=E6=96=B0=E5=A2=9E=E3=80=91readm?= =?UTF-8?q?e=E6=96=B0=E5=A2=9Egithub=E4=BB=A3=E7=A0=81=E4=B8=8B=E8=BD=BD?= =?UTF-8?q?=E9=95=9C=E5=83=8F=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index e2b98d97..f8ea9db1 100644 --- a/README.md +++ b/README.md @@ -47,7 +47,9 @@ Snowy谐音“小诺”，恰应小诺团队名称；意思为”下雪的、纯 ## 快速链接 -下载地址：[https://gitee.com/xiaonuobase/snowy](https://gitee.com/xiaonuobase/snowy) +gitee下载地址：[https://gitee.com/xiaonuobase/snowy](https://gitee.com/xiaonuobase/snowy) + +github下载地址（镜像）：[https://github.com/xiaonuobase/Snowy](https://github.com/xiaonuobase/Snowy) 演示地址：[https://snowy.xiaonuo.vip](https://snowy.xiaonuo.vip) From 518c971c882f7c32db3b0fdf092e51a8d21ff374 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BE=AE=E7=AC=91?= <1572089876@qq.com> Date: Fri, 25 Nov 2022 09:22:48 +0000 Subject: [PATCH 02/16] =?UTF-8?q?update=20AuthServiceImpl.java.=20?= =?UTF-8?q?=E5=8E=9F=E5=86=99=E6=B3=95=E5=AF=BC=E8=87=B4=20set=20null=20?= =?UTF-8?q?=E4=B8=8D=E7=94=9F=E6=95=88=EF=BC=8CgetClientLoginUser()=20?= =?UTF-8?q?=E5=A4=9A=E6=AC=A1=E8=B0=83=E7=94=A8=E8=BF=94=E5=9B=9E=E4=B8=8D?= =?UTF-8?q?=E5=90=8C=E5=AF=B9=E8=B1=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 微笑 <1572089876@qq.com> --- .../auth/modular/login/service/impl/AuthServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/snowy-plugin/snowy-plugin-auth/src/main/java/vip/xiaonuo/auth/modular/login/service/impl/AuthServiceImpl.java b/snowy-plugin/snowy-plugin-auth/src/main/java/vip/xiaonuo/auth/modular/login/service/impl/AuthServiceImpl.java index 231c372d..c41be25f 100644 --- a/snowy-plugin/snowy-plugin-auth/src/main/java/vip/xiaonuo/auth/modular/login/service/impl/AuthServiceImpl.java +++ b/snowy-plugin/snowy-plugin-auth/src/main/java/vip/xiaonuo/auth/modular/login/service/impl/AuthServiceImpl.java @@ -354,7 +354,7 @@ public class AuthServiceImpl implements AuthService { saBaseClientLoginUser.setPassword(null); saBaseClientLoginUser.setPermissionCodeList(null); saBaseClientLoginUser.setDataScopeList(null); - return StpClientLoginUserUtil.getClientLoginUser(); + return saBaseClientLoginUser; } @Override From 8ff73100753a6c7c65f518ff5d2208a6fe98d18a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8D=A2=E6=9D=B0?= <907298149@qq.com> Date: Sat, 3 Dec 2022 13:02:31 +0800 Subject: [PATCH 03/16] =?UTF-8?q?1.=E5=88=A0=E9=99=A4=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E5=88=B7=E6=96=B0=E8=A1=A8=E6=A0=BC=20=20=E4=BF=AE=E6=94=B9tab?= =?UTF-8?q?le.refresh(true)=3D=3D=3D=3D=3D=3D>table.value.refresh(true)=20?= =?UTF-8?q?2.=E4=BF=AE=E6=94=B9=E6=B3=A8=E9=87=8A=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- snowy-admin-web/src/views/dev/email/index.vue | 2 +- snowy-admin-web/src/views/dev/file/index.vue | 2 +- snowy-admin-web/src/views/dev/file/uploadForm.vue | 2 +- snowy-admin-web/src/views/dev/message/index.vue | 2 +- snowy-admin-web/src/views/dev/sms/index.vue | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/snowy-admin-web/src/views/dev/email/index.vue b/snowy-admin-web/src/views/dev/email/index.vue index 783eda44..e2022b52 100644 --- a/snowy-admin-web/src/views/dev/email/index.vue +++ b/snowy-admin-web/src/views/dev/email/index.vue @@ -154,7 +154,7 @@ } ] emailApi.emailDelete(params).then(() => { - table.refresh(true) + table.value.refresh(true) }) } // 批量删除 diff --git a/snowy-admin-web/src/views/dev/file/index.vue b/snowy-admin-web/src/views/dev/file/index.vue index cdeff1fd..65f18ad7 100644 --- a/snowy-admin-web/src/views/dev/file/index.vue +++ b/snowy-admin-web/src/views/dev/file/index.vue @@ -178,7 +178,7 @@ } ] fileApi.fileDelete(params).then(() => { - table.refresh(true) + table.value.refresh(true) }) } // 批量删除 diff --git a/snowy-admin-web/src/views/dev/file/uploadForm.vue b/snowy-admin-web/src/views/dev/file/uploadForm.vue index 0cf7c897..dd25cf73 100644 --- a/snowy-admin-web/src/views/dev/file/uploadForm.vue +++ b/snowy-admin-web/src/views/dev/file/uploadForm.vue @@ -118,7 +118,7 @@ uploadLoading.value = false }) } - // 上传腾讯文件 + // 上传Minio文件 const customRequestMinio = (data) => { uploadLoading.value = true const fileData = new FormData() diff --git a/snowy-admin-web/src/views/dev/message/index.vue b/snowy-admin-web/src/views/dev/message/index.vue index e854a931..0b4cebc6 100644 --- a/snowy-admin-web/src/views/dev/message/index.vue +++ b/snowy-admin-web/src/views/dev/message/index.vue @@ -118,7 +118,7 @@ } ] messageApi.messageDelete(params).then(() => { - table.refresh(true) + table.value.refresh(true) }) } // 批量删除 diff --git a/snowy-admin-web/src/views/dev/sms/index.vue b/snowy-admin-web/src/views/dev/sms/index.vue index fdea94f9..5762c1da 100644 --- a/snowy-admin-web/src/views/dev/sms/index.vue +++ b/snowy-admin-web/src/views/dev/sms/index.vue @@ -154,7 +154,7 @@ } ] smsApi.smsDelete(params).then(() => { - table.refresh(true) + table.value.refresh(true) }) } // 批量删除 From 87216deed137e9b502466333d3f0a1fc85e96b42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E8=AF=BA?= <1253070437@qq.com> Date: Sat, 3 Dec 2022 23:34:23 +0800 Subject: [PATCH 04/16] =?UTF-8?q?=E3=80=90=E6=9B=B4=E6=96=B0=E3=80=91?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BB=BB=E5=8A=A1=20https://gitee.com/xiaonu?= =?UTF-8?q?obase/snowy/issues/I63TJ2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- snowy-admin-web/src/layout/index.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/snowy-admin-web/src/layout/index.vue b/snowy-admin-web/src/layout/index.vue index b2625c14..fe46c91e 100644 --- a/snowy-admin-web/src/layout/index.vue +++ b/snowy-admin-web/src/layout/index.vue @@ -38,8 +38,8 @@
-
- +
+
@@ -139,8 +139,8 @@
-
- +
+
From 999e725a3fcfd90708ba11f31139253b9ef3a1ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E8=AF=BA?= <1253070437@qq.com> Date: Sat, 3 Dec 2022 23:46:29 +0800 Subject: [PATCH 05/16] =?UTF-8?q?=E3=80=90=E6=9B=B4=E6=96=B0=E3=80=91?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BB=BB=E5=8A=A1=EF=BC=88=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E5=8D=95=E9=A1=B5=E9=80=89=E6=8B=A9=E5=9B=BE=E6=A0=87=E6=8A=A5?= =?UTF-8?q?=E9=94=99=E9=97=AE=E9=A2=98=EF=BC=89=20https://gitee.com/xiaonu?= =?UTF-8?q?obase/snowy/issues/I63CSX?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- snowy-admin-web/src/components/Selector/iconSelector.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/snowy-admin-web/src/components/Selector/iconSelector.vue b/snowy-admin-web/src/components/Selector/iconSelector.vue index 5d0ecbfb..01dfb3c1 100644 --- a/snowy-admin-web/src/components/Selector/iconSelector.vue +++ b/snowy-admin-web/src/components/Selector/iconSelector.vue @@ -60,7 +60,7 @@ }, // 默认配置 defaultSetting(value) { - if ((value !== undefined) & (value !== '') & (value !== 'undefined')) { + if (value) { this.modelValue = value // 判断展开哪个 if (value.indexOf('-outlined') > -1 || value.indexOf('-filled') > -1 || value.indexOf('-two-tone') > -1) { From 1f7c06b777a337448da41a8c86ca580674712461 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E8=AF=BA?= <1253070437@qq.com> Date: Sun, 4 Dec 2022 00:33:56 +0800 Subject: [PATCH 06/16] =?UTF-8?q?=E3=80=90=E6=9B=B4=E6=96=B0=E3=80=91?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BB=BB=E5=8A=A1=EF=BC=88=E6=89=BE=E5=9B=9E?= =?UTF-8?q?=E5=AF=86=E7=A0=81=E8=BF=94=E5=9B=9EvalidCodeReqNo=E4=B8=8D?= =?UTF-8?q?=E4=B8=BA=E7=A9=BA=EF=BC=89=20https://gitee.com/xiaonuobase/sno?= =?UTF-8?q?wy/issues/I644Q8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/auth/findPwd/emailFindForm.vue | 11 ++++++----- .../src/views/auth/findPwd/phoneFindForm.vue | 5 +++-- .../user/controller/SysUserCenterController.java | 4 ++-- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/snowy-admin-web/src/views/auth/findPwd/emailFindForm.vue b/snowy-admin-web/src/views/auth/findPwd/emailFindForm.vue index 94aa1517..d7178fd8 100644 --- a/snowy-admin-web/src/views/auth/findPwd/emailFindForm.vue +++ b/snowy-admin-web/src/views/auth/findPwd/emailFindForm.vue @@ -102,7 +102,7 @@ let formRules = ref({}) const emailValidCodeReqNo = ref('') - // 点击获取短信验证码 + // 点击获取邮箱验证码 const getEmailValidCode = () => { formRules.value.email = [required(), rules.email] delete formRules.value.emailValidCode @@ -144,7 +144,6 @@ const emailLoginFormModalRef = ref() const emailFormModalData = ref({}) const validCodeBase64 = ref('') - const validCodeReqNo = ref('') const formModalRules = { validCode: [required(), rules.lettersNum] } @@ -158,10 +157,10 @@ visible.value = false } const handleOk = () => { - // 获取到里面的验证码，并发送短信 + // 获取到里面的验证码，并发送邮箱 emailLoginFormModalRef.value.validate().then(() => { visible.value = false - // 发送短信，首先拿到刚刚输入的手机号 + // 发送邮箱，首先拿到刚刚输入的邮箱 emailFormModalData.value.email = emailFormData.value.email // 禁用发送按钮，并设置为倒计时 state.value.smsSendBtn = true @@ -180,13 +179,15 @@ emailValidCodeReqNo.value = data visible.value = false setTimeout(hide, 500) - emailFormModalData.value.validCode = '' }) .catch(() => { setTimeout(hide, 100) clearInterval(interval) state.value.smsSendBtn = false }) + .finally(() => { + emailFormModalData.value.validCode = '' + }) }) } diff --git a/snowy-admin-web/src/views/auth/findPwd/phoneFindForm.vue b/snowy-admin-web/src/views/auth/findPwd/phoneFindForm.vue index 194fd253..406f98f6 100644 --- a/snowy-admin-web/src/views/auth/findPwd/phoneFindForm.vue +++ b/snowy-admin-web/src/views/auth/findPwd/phoneFindForm.vue @@ -145,7 +145,6 @@ const phoneLoginFormModalRef = ref() const phoneFormModalData = ref({}) const validCodeBase64 = ref('') - const validCodeReqNo = ref('') const formModalRules = { validCode: [required(), rules.lettersNum] } @@ -181,13 +180,15 @@ phoneValidCodeReqNo.value = data visible.value = false setTimeout(hide, 500) - phoneFormModalData.value.validCode = '' }) .catch(() => { setTimeout(hide, 100) clearInterval(interval) state.value.smsSendBtn = false }) + .finally(() => { + phoneFormModalData.value.validCode = '' + }) }) } diff --git a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/controller/SysUserCenterController.java b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/controller/SysUserCenterController.java index 86f2fe9b..e0057bdf 100644 --- a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/controller/SysUserCenterController.java +++ b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/controller/SysUserCenterController.java @@ -74,7 +74,7 @@ public class SysUserCenterController { @ApiOperation("找回密码获取手机验证码") @GetMapping("/sys/userCenter/findPasswordGetPhoneValidCode") public CommonResult findPasswordGetPhoneValidCode(@Valid SysUserGetPhoneValidCodeParam sysUserGetPhoneValidCodeParam) { - return CommonResult.ok(sysUserService.findPasswordGetPhoneValidCode(sysUserGetPhoneValidCodeParam)); + return CommonResult.data(sysUserService.findPasswordGetPhoneValidCode(sysUserGetPhoneValidCodeParam)); } /** @@ -87,7 +87,7 @@ public class SysUserCenterController { @ApiOperation("找回密码获取邮箱验证码") @GetMapping("/sys/userCenter/findPasswordGetEmailValidCode") public CommonResult findPasswordGetEmailValidCode(@Valid SysUserGetEmailValidCodeParam sysUserGetEmailValidCodeParam) { - return CommonResult.ok(sysUserService.findPasswordGetEmailValidCode(sysUserGetEmailValidCodeParam)); + return CommonResult.data(sysUserService.findPasswordGetEmailValidCode(sysUserGetEmailValidCodeParam)); } /** From 2275380e00e8510cbcc39634f5fdeb219e41e52d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E8=AF=BA?= <1253070437@qq.com> Date: Sun, 4 Dec 2022 00:46:38 +0800 Subject: [PATCH 07/16] =?UTF-8?q?=E3=80=90=E6=9B=B4=E6=96=B0=E3=80=91?= =?UTF-8?q?=E4=BF=AE=E5=A4=8DBC=E7=AB=AF=E9=89=B4=E6=9D=83=E9=97=AE?= =?UTF-8?q?=E9=A2=98=EF=BC=8C=E6=84=9F=E8=B0=A2=E7=A0=81=E4=BA=91=E5=B0=8F?= =?UTF-8?q?=E4=BC=99=EF=BC=88=E5=8F=AF=E8=BE=BE=E9=B8=AD=E7=BB=99=E6=88=91?= =?UTF-8?q?=E5=86=B2=E9=B8=AD=EF=BC=89=20https://gitee.com/xiaonuobase/sno?= =?UTF-8?q?wy/issues/I62WRX?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vip/xiaonuo/auth/core/config/AuthConfigure.java | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/snowy-plugin/snowy-plugin-auth/src/main/java/vip/xiaonuo/auth/core/config/AuthConfigure.java b/snowy-plugin/snowy-plugin-auth/src/main/java/vip/xiaonuo/auth/core/config/AuthConfigure.java index 532ba60e..7c2fd1bb 100644 --- a/snowy-plugin/snowy-plugin-auth/src/main/java/vip/xiaonuo/auth/core/config/AuthConfigure.java +++ b/snowy-plugin/snowy-plugin-auth/src/main/java/vip/xiaonuo/auth/core/config/AuthConfigure.java @@ -32,6 +32,7 @@ import springfox.documentation.service.Contact; import springfox.documentation.spi.DocumentationType; import springfox.documentation.spring.web.plugins.Docket; import vip.xiaonuo.auth.core.enums.SaClientTypeEnum; +import vip.xiaonuo.auth.core.util.StpClientLoginUserUtil; import vip.xiaonuo.auth.core.util.StpLoginUserUtil; import vip.xiaonuo.common.pojo.CommonResult; @@ -100,7 +101,11 @@ public class AuthConfigure implements WebMvcConfigurer { */ @Override public List getPermissionList(Object loginId, String loginType) { - return StpLoginUserUtil.getLoginUser().getPermissionCodeList(); + if (SaClientTypeEnum.B.getValue().equals(loginType)) { + return StpLoginUserUtil.getLoginUser().getPermissionCodeList(); + } else { + return StpClientLoginUserUtil.getClientLoginUser().getPermissionCodeList(); + } } /** @@ -108,7 +113,11 @@ public class AuthConfigure implements WebMvcConfigurer { */ @Override public List getRoleList(Object loginId, String loginType) { - return StpLoginUserUtil.getLoginUser().getRoleCodeList(); + if (SaClientTypeEnum.B.getValue().equals(loginType)) { + return StpLoginUserUtil.getLoginUser().getRoleCodeList(); + } else { + return StpClientLoginUserUtil.getClientLoginUser().getRoleCodeList(); + } } } From 52a61577b80d9178155a2527c8d72e4559953031 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E8=AF=BA?= <1253070437@qq.com> Date: Sun, 4 Dec 2022 01:06:47 +0800 Subject: [PATCH 08/16] =?UTF-8?q?=E3=80=90=E6=9B=B4=E6=96=B0=E3=80=91?= =?UTF-8?q?=E9=87=8D=E7=BD=AE=E5=AF=86=E7=A0=81=E6=97=B6=E5=80=99bug?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=8C=E5=AF=86=E7=A0=81=E4=BC=A0=E8=BE=93?= =?UTF-8?q?=E4=BD=BF=E7=94=A8=E5=8A=A0=E5=AF=86=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- snowy-admin-web/src/views/auth/findPwd/emailFindForm.vue | 3 ++- snowy-admin-web/src/views/auth/findPwd/phoneFindForm.vue | 3 ++- .../sys/modular/user/service/impl/SysUserServiceImpl.java | 5 ++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/snowy-admin-web/src/views/auth/findPwd/emailFindForm.vue b/snowy-admin-web/src/views/auth/findPwd/emailFindForm.vue index d7178fd8..bcdd3b6c 100644 --- a/snowy-admin-web/src/views/auth/findPwd/emailFindForm.vue +++ b/snowy-admin-web/src/views/auth/findPwd/emailFindForm.vue @@ -92,6 +92,7 @@ import router from '@/router' import { required, rules } from '@/utils/formRules' import userCenterApi from '@/api/sys/userCenterApi' + import smCrypto from "@/utils/smCrypto" const emailResetFormRef = ref() const emailFormData = ref({}) const islogin = ref(false) @@ -122,8 +123,8 @@ emailResetFormRef.value.validate().then(() => { emailFormData.value.validCode = emailFormData.value.emailValidCode - // delete emailFormData.value.emailValidCode emailFormData.value.validCodeReqNo = emailValidCodeReqNo.value + emailFormData.value.newPassword = smCrypto.doSm2Encrypt(emailFormData.value.newPassword) islogin.value = true userCenterApi .userFindPasswordByEmail(emailFormData.value) diff --git a/snowy-admin-web/src/views/auth/findPwd/phoneFindForm.vue b/snowy-admin-web/src/views/auth/findPwd/phoneFindForm.vue index 406f98f6..ce948866 100644 --- a/snowy-admin-web/src/views/auth/findPwd/phoneFindForm.vue +++ b/snowy-admin-web/src/views/auth/findPwd/phoneFindForm.vue @@ -93,6 +93,7 @@ import router from '@/router' import { required, rules } from '@/utils/formRules' import userCenterApi from '@/api/sys/userCenterApi' + import smCrypto from "@/utils/smCrypto" const phoneLoginFormRef = ref() const phoneFormData = ref({}) const islogin = ref(false) @@ -123,8 +124,8 @@ phoneLoginFormRef.value.validate().then(() => { phoneFormData.value.validCode = phoneFormData.value.phoneValidCode - // delete phoneFormData.value.phoneValidCode phoneFormData.value.validCodeReqNo = phoneValidCodeReqNo.value + phoneFormData.value.newPassword = smCrypto.doSm2Encrypt(phoneFormData.value.newPassword) islogin.value = true userCenterApi .userFindPasswordByPhone(phoneFormData.value) diff --git a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/service/impl/SysUserServiceImpl.java b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/service/impl/SysUserServiceImpl.java index a438c583..785692c6 100644 --- a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/service/impl/SysUserServiceImpl.java +++ b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/service/impl/SysUserServiceImpl.java @@ -33,7 +33,6 @@ import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.PhoneUtil; import cn.hutool.core.util.RandomUtil; import cn.hutool.core.util.StrUtil; -import cn.hutool.crypto.digest.BCrypt; import cn.hutool.json.JSONArray; import cn.hutool.json.JSONObject; import cn.hutool.json.JSONUtil; @@ -457,7 +456,7 @@ public class SysUserServiceImpl extends ServiceImpl impl validValidCode(sysUserFindPwdByPhoneParam.getValidCode(), sysUserFindPwdByPhoneParam.getValidCodeReqNo()); this.update(new LambdaUpdateWrapper().eq(SysUser::getPhone, sysUserFindPwdByPhoneParam.getPhone()).set(SysUser::getPassword, - BCrypt.hashpw(sysUserFindPwdByPhoneParam.getNewPassword()))); + CommonCryptogramUtil.doHashValue(CommonCryptogramUtil.doSm2Decrypt(sysUserFindPwdByPhoneParam.getNewPassword())))); } @Override @@ -466,7 +465,7 @@ public class SysUserServiceImpl extends ServiceImpl impl validValidCode(sysUserFindPwdByEmailParam.getValidCode(), sysUserFindPwdByEmailParam.getValidCodeReqNo()); this.update(new LambdaUpdateWrapper().eq(SysUser::getEmail, sysUserFindPwdByEmailParam.getEmail()).set(SysUser::getPassword, - BCrypt.hashpw(sysUserFindPwdByEmailParam.getNewPassword()))); + CommonCryptogramUtil.doHashValue(CommonCryptogramUtil.doSm2Decrypt(sysUserFindPwdByEmailParam.getNewPassword())))); } @Override From 405bf92794099350fd7a2b6c1fe68dd96607656a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E8=AF=BA?= <1253070437@qq.com> Date: Sun, 4 Dec 2022 01:24:54 +0800 Subject: [PATCH 09/16] =?UTF-8?q?=E3=80=90=E6=9B=B4=E6=96=B0=E3=80=91?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90=E4=B8=BB=E9=94=AE=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E4=B8=BA=E9=9D=9E=E5=86=99=E6=AD=BB=E7=8A=B6=E6=80=81?= =?UTF-8?q?=20https://gitee.com/xiaonuobase/snowy/issues/I64DLI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/backend/ServiceImpl.java.btl | 18 +++++++++++++++--- .../src/main/resources/frontend/form.vue.btl | 6 +++++- .../src/main/resources/frontend/index.vue.btl | 12 ++++++++++-- 3 files changed, 30 insertions(+), 6 deletions(-) diff --git a/snowy-plugin/snowy-plugin-gen/src/main/resources/backend/ServiceImpl.java.btl b/snowy-plugin/snowy-plugin-gen/src/main/resources/backend/ServiceImpl.java.btl index a60f75ad..82f6d092 100644 --- a/snowy-plugin/snowy-plugin-gen/src/main/resources/backend/ServiceImpl.java.btl +++ b/snowy-plugin/snowy-plugin-gen/src/main/resources/backend/ServiceImpl.java.btl @@ -81,7 +81,11 @@ public class ${className}ServiceImpl extends ServiceImpl<${className}Mapper, ${c @Override public void edit(${className}EditParam ${classNameFirstLower}EditParam) { - ${className} ${classNameFirstLower} = this.queryEntity(${classNameFirstLower}EditParam.getId()); + <% for(var i = 0; i < configList.~size; i++) { %> + <% if(configList[i].needTableId) { %> + ${className} ${classNameFirstLower} = this.queryEntity(${classNameFirstLower}EditParam.get${configList[i].fieldNameCamelCaseFirstUpper}()); + <% } %> + <% } %> BeanUtil.copyProperties(${classNameFirstLower}EditParam, ${classNameFirstLower}); this.updateById(${classNameFirstLower}); } @@ -90,12 +94,20 @@ public class ${className}ServiceImpl extends ServiceImpl<${className}Mapper, ${c @Override public void delete(List<${className}IdParam> ${classNameFirstLower}IdParamList) { // 执行删除 - this.removeBatchByIds(CollStreamUtil.toList(${classNameFirstLower}IdParamList, ${className}IdParam::getId)); + <% for(var i = 0; i < configList.~size; i++) { %> + <% if(configList[i].needTableId) { %> + this.removeBatchByIds(CollStreamUtil.toList(${classNameFirstLower}IdParamList, ${className}IdParam::get${configList[i].fieldNameCamelCaseFirstUpper}())); + <% } %> + <% } %> } @Override public ${className} detail(${className}IdParam ${classNameFirstLower}IdParam) { - return this.queryEntity(${classNameFirstLower}IdParam.getId()); + <% for(var i = 0; i < configList.~size; i++) { %> + <% if(configList[i].needTableId) { %> + return this.queryEntity(${classNameFirstLower}IdParam.get${configList[i].fieldNameCamelCaseFirstUpper}()); + <% } %> + <% } %> } @Override diff --git a/snowy-plugin/snowy-plugin-gen/src/main/resources/frontend/form.vue.btl b/snowy-plugin/snowy-plugin-gen/src/main/resources/frontend/form.vue.btl index 49a0d1a0..30f9071e 100644 --- a/snowy-plugin/snowy-plugin-gen/src/main/resources/frontend/form.vue.btl +++ b/snowy-plugin/snowy-plugin-gen/src/main/resources/frontend/form.vue.btl @@ -1,6 +1,10 @@