diff --git a/snowy-admin-web/src/style/index.less b/snowy-admin-web/src/style/index.less index db69a0b6..336ccd46 100644 --- a/snowy-admin-web/src/style/index.less +++ b/snowy-admin-web/src/style/index.less @@ -486,10 +486,6 @@ body, .snowy-theme-dark .odd { background-color: #1d1d1d } -// 解决浏览器F12爆红aria-hidden问题 -.ant-modal div[aria-hidden="true"] { - display: none !important -} // 以下是重写表单设计器的样式 .list-main { diff --git a/snowy-admin-web/src/views/auth/client/login/login.vue b/snowy-admin-web/src/views/auth/client/login/login.vue index 8071edb4..8428818c 100644 --- a/snowy-admin-web/src/views/auth/client/login/login.vue +++ b/snowy-admin-web/src/views/auth/client/login/login.vue @@ -62,10 +62,8 @@
- 忘记密码？ - - 没有账号？前往注册 - + 忘记密码？ + 没有账号？前往注册
@@ -91,7 +89,7 @@
- 后台登录 + 后台登录
diff --git a/snowy-admin-web/src/views/auth/client/register/index.vue b/snowy-admin-web/src/views/auth/client/register/index.vue index 700d2b9a..5007727d 100644 --- a/snowy-admin-web/src/views/auth/client/register/index.vue +++ b/snowy-admin-web/src/views/auth/client/register/index.vue @@ -215,7 +215,7 @@
- 已有账号？前往登录 + 已有账号？前往登录
diff --git a/snowy-admin-web/src/views/auth/login/login.vue b/snowy-admin-web/src/views/auth/login/login.vue index f0ccf456..26ae2254 100644 --- a/snowy-admin-web/src/views/auth/login/login.vue +++ b/snowy-admin-web/src/views/auth/login/login.vue @@ -135,7 +135,7 @@ const { proxy } = getCurrentInstance() const activeKey = ref('userAccount') - const captchaOpen = ref(configData.SYS_BASE_CONFIG.SNOWY_SYS_DEFAULT_CAPTCHA_OPEN) + const captchaOpen = ref(configData.SYS_BASE_CONFIG.SNOWY_SYS_DEFAULT_CAPTCHA_OPEN_FLAG_FOR_B) const registerOpen = ref('false') const phoneLogin = ref('false') const emailLogin = ref('false') diff --git a/snowy-admin-web/src/views/dev/file/index.vue b/snowy-admin-web/src/views/dev/file/index.vue index d5e56b8a..a1e1ae38 100644 --- a/snowy-admin-web/src/views/dev/file/index.vue +++ b/snowy-admin-web/src/views/dev/file/index.vue @@ -110,7 +110,7 @@ - + @@ -238,7 +238,7 @@ } ] fileApi.fileDelete(params).then(() => { - tableRef.value.refresh(true) + tableRef.value.refresh() }) } // 批量删除 diff --git a/snowy-admin-web/src/views/sys/role/grantPermissionForm.vue b/snowy-admin-web/src/views/sys/role/grantPermissionForm.vue index 8afccf04..eac08006 100644 --- a/snowy-admin-web/src/views/sys/role/grantPermissionForm.vue +++ b/snowy-admin-web/src/views/sys/role/grantPermissionForm.vue @@ -472,7 +472,10 @@ } // 截取api串中的中文及括号 const subStrApi = (api) => { - return api.substring(0, api.indexOf('[')) + if (api.indexOf('[') > -1) { + return api.substring(0, api.indexOf('[')) + } + return api } // 验证并提交数据 const onSubmit = () => { diff --git a/snowy-admin-web/src/views/sys/user/grantPermissionForm.vue b/snowy-admin-web/src/views/sys/user/grantPermissionForm.vue index 17e18b93..7be754ac 100644 --- a/snowy-admin-web/src/views/sys/user/grantPermissionForm.vue +++ b/snowy-admin-web/src/views/sys/user/grantPermissionForm.vue @@ -474,7 +474,10 @@ } // 截取api串中的中文及括号 const subStrApi = (api) => { - return api.substring(0, api.indexOf('[')) + if (api.indexOf('[') > -1) { + return api.substring(0, api.indexOf('[')) + } + return api } // 验证并提交数据 const onSubmit = () => { diff --git a/snowy-plugin/snowy-plugin-auth/src/main/java/vip/xiaonuo/auth/modular/login/param/AuthAccountPasswordLoginParam.java b/snowy-plugin/snowy-plugin-auth/src/main/java/vip/xiaonuo/auth/modular/login/param/AuthAccountPasswordLoginParam.java index f5e50273..d7604d6a 100644 --- a/snowy-plugin/snowy-plugin-auth/src/main/java/vip/xiaonuo/auth/modular/login/param/AuthAccountPasswordLoginParam.java +++ b/snowy-plugin/snowy-plugin-auth/src/main/java/vip/xiaonuo/auth/modular/login/param/AuthAccountPasswordLoginParam.java @@ -29,12 +29,12 @@ public class AuthAccountPasswordLoginParam { /** 账号 */ @Schema(description = "账号", requiredMode = Schema.RequiredMode.REQUIRED) - @NotBlank(message = "账号不能为空") + @NotBlank(message = "account不能为空") private String account; /** 密码 */ @Schema(description = "密码", requiredMode = Schema.RequiredMode.REQUIRED) - @NotBlank(message = "密码不能为空") + @NotBlank(message = "password不能为空") private String password; /** 设备 */ diff --git a/snowy-plugin/snowy-plugin-auth/src/main/java/vip/xiaonuo/auth/modular/login/param/AuthEmailValidCodeLoginParam.java b/snowy-plugin/snowy-plugin-auth/src/main/java/vip/xiaonuo/auth/modular/login/param/AuthEmailValidCodeLoginParam.java index 57017cfe..c581b36f 100644 --- a/snowy-plugin/snowy-plugin-auth/src/main/java/vip/xiaonuo/auth/modular/login/param/AuthEmailValidCodeLoginParam.java +++ b/snowy-plugin/snowy-plugin-auth/src/main/java/vip/xiaonuo/auth/modular/login/param/AuthEmailValidCodeLoginParam.java @@ -29,17 +29,17 @@ public class AuthEmailValidCodeLoginParam { /** 邮箱 */ @Schema(description = "邮箱", requiredMode = Schema.RequiredMode.REQUIRED) - @NotBlank(message = "邮箱不能为空") + @NotBlank(message = "email不能为空") private String email; /** 验证码 */ @Schema(description = "验证码", requiredMode = Schema.RequiredMode.REQUIRED) - @NotBlank(message = "验证码不能为空") + @NotBlank(message = "validCode不能为空") private String validCode; /** 验证码请求号 */ @Schema(description = "验证码请求号", requiredMode = Schema.RequiredMode.REQUIRED) - @NotBlank(message = "验证码请求号不能为空") + @NotBlank(message = "validCodeReqNo不能为空") private String validCodeReqNo; /** 设备 */ diff --git a/snowy-plugin/snowy-plugin-auth/src/main/java/vip/xiaonuo/auth/modular/login/param/AuthGetEmailValidCodeParam.java b/snowy-plugin/snowy-plugin-auth/src/main/java/vip/xiaonuo/auth/modular/login/param/AuthGetEmailValidCodeParam.java index 201838f6..107a1a7e 100644 --- a/snowy-plugin/snowy-plugin-auth/src/main/java/vip/xiaonuo/auth/modular/login/param/AuthGetEmailValidCodeParam.java +++ b/snowy-plugin/snowy-plugin-auth/src/main/java/vip/xiaonuo/auth/modular/login/param/AuthGetEmailValidCodeParam.java @@ -29,16 +29,16 @@ public class AuthGetEmailValidCodeParam { /** 邮箱 */ @Schema(description = "邮箱", requiredMode = Schema.RequiredMode.REQUIRED) - @NotBlank(message = "邮箱不能为空") + @NotBlank(message = "email不能为空") private String email; /** 验证码 */ @Schema(description = "验证码", requiredMode = Schema.RequiredMode.REQUIRED) - @NotBlank(message = "验证码不能为空") + @NotBlank(message = "validCode不能为空") private String validCode; /** 验证码请求号 */ @Schema(description = "验证码请求号", requiredMode = Schema.RequiredMode.REQUIRED) - @NotBlank(message = "验证码请求号不能为空") + @NotBlank(message = "validCodeReqNo不能为空") private String validCodeReqNo; } diff --git a/snowy-plugin/snowy-plugin-auth/src/main/java/vip/xiaonuo/auth/modular/login/param/AuthGetPhoneValidCodeParam.java b/snowy-plugin/snowy-plugin-auth/src/main/java/vip/xiaonuo/auth/modular/login/param/AuthGetPhoneValidCodeParam.java index 9bc12811..34292c30 100644 --- a/snowy-plugin/snowy-plugin-auth/src/main/java/vip/xiaonuo/auth/modular/login/param/AuthGetPhoneValidCodeParam.java +++ b/snowy-plugin/snowy-plugin-auth/src/main/java/vip/xiaonuo/auth/modular/login/param/AuthGetPhoneValidCodeParam.java @@ -29,16 +29,16 @@ public class AuthGetPhoneValidCodeParam { /** 手机号 */ @Schema(description = "手机号", requiredMode = Schema.RequiredMode.REQUIRED) - @NotBlank(message = "手机号不能为空") + @NotBlank(message = "phone不能为空") private String phone; /** 验证码 */ @Schema(description = "验证码", requiredMode = Schema.RequiredMode.REQUIRED) - @NotBlank(message = "验证码不能为空") + @NotBlank(message = "validCode不能为空") private String validCode; /** 验证码请求号 */ @Schema(description = "验证码请求号", requiredMode = Schema.RequiredMode.REQUIRED) - @NotBlank(message = "验证码请求号不能为空") + @NotBlank(message = "validCodeReqNo不能为空") private String validCodeReqNo; } diff --git a/snowy-plugin/snowy-plugin-auth/src/main/java/vip/xiaonuo/auth/modular/login/param/AuthPhoneValidCodeLoginParam.java b/snowy-plugin/snowy-plugin-auth/src/main/java/vip/xiaonuo/auth/modular/login/param/AuthPhoneValidCodeLoginParam.java index 88631b95..1801f333 100644 --- a/snowy-plugin/snowy-plugin-auth/src/main/java/vip/xiaonuo/auth/modular/login/param/AuthPhoneValidCodeLoginParam.java +++ b/snowy-plugin/snowy-plugin-auth/src/main/java/vip/xiaonuo/auth/modular/login/param/AuthPhoneValidCodeLoginParam.java @@ -29,17 +29,17 @@ public class AuthPhoneValidCodeLoginParam { /** 手机号 */ @Schema(description = "手机号", requiredMode = Schema.RequiredMode.REQUIRED) - @NotBlank(message = "手机号不能为空") + @NotBlank(message = "phone不能为空") private String phone; /** 验证码 */ @Schema(description = "验证码", requiredMode = Schema.RequiredMode.REQUIRED) - @NotBlank(message = "验证码不能为空") + @NotBlank(message = "validCode不能为空") private String validCode; /** 验证码请求号 */ @Schema(description = "验证码请求号", requiredMode = Schema.RequiredMode.REQUIRED) - @NotBlank(message = "验证码请求号不能为空") + @NotBlank(message = "validCodeReqNo不能为空") private String validCodeReqNo; /** 设备 */ diff --git a/snowy-plugin/snowy-plugin-auth/src/main/java/vip/xiaonuo/auth/modular/login/param/AuthRegisterParam.java b/snowy-plugin/snowy-plugin-auth/src/main/java/vip/xiaonuo/auth/modular/login/param/AuthRegisterParam.java index cf059a9d..92a06fd3 100644 --- a/snowy-plugin/snowy-plugin-auth/src/main/java/vip/xiaonuo/auth/modular/login/param/AuthRegisterParam.java +++ b/snowy-plugin/snowy-plugin-auth/src/main/java/vip/xiaonuo/auth/modular/login/param/AuthRegisterParam.java @@ -29,12 +29,12 @@ public class AuthRegisterParam { /** 账号 */ @Schema(description = "账号", requiredMode = Schema.RequiredMode.REQUIRED) - @NotBlank(message = "账号不能为空") + @NotBlank(message = "account不能为空") private String account; /** 密码 */ @Schema(description = "密码", requiredMode = Schema.RequiredMode.REQUIRED) - @NotBlank(message = "密码不能为空") + @NotBlank(message = "password不能为空") private String password; /** 验证码 */ diff --git a/snowy-plugin/snowy-plugin-client/src/main/java/vip/xiaonuo/client/modular/user/param/ClientUserGetEmailValidCodeParam.java b/snowy-plugin/snowy-plugin-client/src/main/java/vip/xiaonuo/client/modular/user/param/ClientUserGetEmailValidCodeParam.java index 0e7db7e7..d3cbce11 100644 --- a/snowy-plugin/snowy-plugin-client/src/main/java/vip/xiaonuo/client/modular/user/param/ClientUserGetEmailValidCodeParam.java +++ b/snowy-plugin/snowy-plugin-client/src/main/java/vip/xiaonuo/client/modular/user/param/ClientUserGetEmailValidCodeParam.java @@ -29,16 +29,16 @@ public class ClientUserGetEmailValidCodeParam { /** 邮箱 */ @Schema(description = "邮箱") - @NotBlank(message = "邮箱不能为空") + @NotBlank(message = "email不能为空") private String email; /** 验证码 */ @Schema(description = "验证码") - @NotBlank(message = "验证码不能为空") + @NotBlank(message = "validCode不能为空") private String validCode; /** 验证码请求号 */ @Schema(description = "验证码请求号") - @NotBlank(message = "验证码请求号不能为空") + @NotBlank(message = "validCodeReqNo不能为空") private String validCodeReqNo; } diff --git a/snowy-plugin/snowy-plugin-client/src/main/java/vip/xiaonuo/client/modular/user/param/ClientUserGetPhoneValidCodeParam.java b/snowy-plugin/snowy-plugin-client/src/main/java/vip/xiaonuo/client/modular/user/param/ClientUserGetPhoneValidCodeParam.java index f291fab5..45492936 100644 --- a/snowy-plugin/snowy-plugin-client/src/main/java/vip/xiaonuo/client/modular/user/param/ClientUserGetPhoneValidCodeParam.java +++ b/snowy-plugin/snowy-plugin-client/src/main/java/vip/xiaonuo/client/modular/user/param/ClientUserGetPhoneValidCodeParam.java @@ -29,16 +29,16 @@ public class ClientUserGetPhoneValidCodeParam { /** 手机号 */ @Schema(description = "手机号") - @NotBlank(message = "手机号不能为空") + @NotBlank(message = "phone不能为空") private String phone; /** 验证码 */ @Schema(description = "验证码") - @NotBlank(message = "验证码不能为空") + @NotBlank(message = "validCode不能为空") private String validCode; /** 验证码请求号 */ @Schema(description = "验证码请求号") - @NotBlank(message = "验证码请求号不能为空") + @NotBlank(message = "validCodeReqNo不能为空") private String validCodeReqNo; } 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 1ed78f4f..df6de57c 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 @@ -250,15 +250,6 @@ public class ${className}ServiceImpl extends ServiceImpl<${className}Mapper, ${c } } - @Override - public ${className} queryEntity(String id) { - ${className} ${classNameFirstLower} = this.getById(id); - if(ObjectUtil.isEmpty(${classNameFirstLower})) { - throw new CommonException("${functionName}不存在，id值为：{}", id); - } - return ${classNameFirstLower}; - } - @Override public void exportData(List<${className}IdParam> ${classNameFirstLower}IdParamList, HttpServletResponse response) throws IOException { File tempFile = null; diff --git a/snowy-plugin/snowy-plugin-gen/src/main/resources/sqlend/Mysql.sql.btl b/snowy-plugin/snowy-plugin-gen/src/main/resources/sqlend/Mysql.sql.btl index 5184a06f..025e2f54 100644 --- a/snowy-plugin/snowy-plugin-gen/src/main/resources/sqlend/Mysql.sql.btl +++ b/snowy-plugin/snowy-plugin-gen/src/main/resources/sqlend/Mysql.sql.btl @@ -15,7 +15,7 @@ INSERT INTO `SYS_RESOURCE` VALUES ('${deleteButtonId}', '${menuId}', '删除${fu INSERT INTO `SYS_RESOURCE` VALUES ('${importButtonId}', '${menuId}', '导入${functionName}', NULL, '${classNameFirstLower}Import', 'BUTTON', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 5, NULL, 'NOT_DELETE', NULL, NULL, NULL, NULL); -INSERT INTO `SYS_RESOURCE` VALUES ('${exportButtonId}', ${menuId}', '导出${functionName}', NULL, '${classNameFirstLower}Export', 'BUTTON', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 6, NULL, 'NOT_DELETE', NULL, NULL, NULL, NULL); +INSERT INTO `SYS_RESOURCE` VALUES ('${exportButtonId}', '${menuId}', '导出${functionName}', NULL, '${classNameFirstLower}Export', 'BUTTON', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 6, NULL, 'NOT_DELETE', NULL, NULL, NULL, NULL); <% if (mobileModuleId != null && mobileModuleId != '') { %> INSERT INTO `MOBILE_RESOURCE` VALUES ('${menuId}', '0', '${functionName}管理', NULL, 'MENU', '${mobileModuleId}', 'MENU', '/pages/${moduleName}/${busName}/index', 'apartment-outlined', '#1890ff', 'YES', 'ENABLE', 99, NULL, 'NOT_DELETE', NULL, NULL, NULL, NULL); diff --git a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/param/SysUserGetEmailValidCodeParam.java b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/param/SysUserGetEmailValidCodeParam.java index 89e22463..586270ba 100644 --- a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/param/SysUserGetEmailValidCodeParam.java +++ b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/param/SysUserGetEmailValidCodeParam.java @@ -29,16 +29,16 @@ public class SysUserGetEmailValidCodeParam { /** 邮箱 */ @Schema(description = "邮箱") - @NotBlank(message = "邮箱不能为空") + @NotBlank(message = "email不能为空") private String email; /** 验证码 */ @Schema(description = "验证码") - @NotBlank(message = "验证码不能为空") + @NotBlank(message = "validCode不能为空") private String validCode; /** 验证码请求号 */ @Schema(description = "验证码请求号") - @NotBlank(message = "验证码请求号不能为空") + @NotBlank(message = "validCodeReqNo不能为空") private String validCodeReqNo; } diff --git a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/param/SysUserGetPhoneValidCodeParam.java b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/param/SysUserGetPhoneValidCodeParam.java index 473f0967..9f99aeb4 100644 --- a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/param/SysUserGetPhoneValidCodeParam.java +++ b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/param/SysUserGetPhoneValidCodeParam.java @@ -29,16 +29,16 @@ public class SysUserGetPhoneValidCodeParam { /** 手机号 */ @Schema(description = "手机号") - @NotBlank(message = "手机号不能为空") + @NotBlank(message = "phone不能为空") private String phone; /** 验证码 */ @Schema(description = "验证码") - @NotBlank(message = "验证码不能为空") + @NotBlank(message = "validCode不能为空") private String validCode; /** 验证码请求号 */ @Schema(description = "验证码请求号") - @NotBlank(message = "验证码请求号不能为空") + @NotBlank(message = "validCodeReqNo不能为空") private String validCodeReqNo; } diff --git a/snowy-web-app/src/main/java/vip/xiaonuo/core/config/GlobalConfigure.java b/snowy-web-app/src/main/java/vip/xiaonuo/core/config/GlobalConfigure.java index 37b6ebe4..7a9e8e42 100644 --- a/snowy-web-app/src/main/java/vip/xiaonuo/core/config/GlobalConfigure.java +++ b/snowy-web-app/src/main/java/vip/xiaonuo/core/config/GlobalConfigure.java @@ -154,13 +154,20 @@ public class GlobalConfigure implements WebMvcConfigurer { /* 系统字典树 */ "/dev/dict/tree", - /* 用户个人中心相关 */ + /* B端用户个人中心相关 */ "/sys/userCenter/getPicCaptcha", "/sys/userCenter/findPasswordGetPhoneValidCode", "/sys/userCenter/findPasswordGetEmailValidCode", "/sys/userCenter/findPasswordByPhone", "/sys/userCenter/findPasswordByEmail", + /* C端用户个人中心相关 */ + "/client/userCenter/getPicCaptcha", + "/client/userCenter/findPasswordGetPhoneValidCode", + "/client/userCenter/findPasswordGetEmailValidCode", + "/client/userCenter/findPasswordByPhone", + "/client/userCenter/findPasswordByEmail", + /* 文件下载 */ "/dev/file/download" };