gitee
/
snowy
mirror of https://gitee.com/xiaonuobase/snowy
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Pre Merge pull request !275 from 小诺/dev

pull/275/MERGE
小诺 2025-07-07 17:20:43 +00:00 committed by Gitee
parent c964ce0508 6d78e12894
commit ddbbaa5628
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
20 changed files with 52 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
snowy-admin-web/src/style/index.less
View File

@ -486,10 +486,6 @@ body,
.snowy-theme-dark .odd { .snowy-theme-dark .odd {
background-color: #1d1d1d background-color: #1d1d1d
} }
// 解决浏览器F12爆红aria-hidden问题
.ant-modal div[aria-hidden="true"] {
display: none !important
}
// 以下是重写表单设计器的样式 // 以下是重写表单设计器的样式
.list-main { .list-main {

8
snowy-admin-web/src/views/auth/client/login/login.vue
View File

@ -62,10 +62,8 @@
<a-form-item> <a-form-item>
<div style="display: flex; justify-content: space-between"> <div style="display: flex; justify-content: space-between">
<a href="/front/client/findPwd" class="xn-color-0d84ff">忘记密码？</a> <a href="/front/client/findPwd">忘记密码？</a>
<a href="/front/client/register" class="xn-color-0d84ff" v-if="registerOpen === 'true'"> <a href="/front/client/register" v-if="registerOpen === 'true'"> 没有账号？前往注册 </a>
没有账号？前往注册
</a>
</div> </div>
</a-form-item> </a-form-item>
<a-form-item> <a-form-item>
@ -91,7 +89,7 @@
</a-tab-pane> </a-tab-pane>
</a-tabs> </a-tabs>
<div v-if="configData.FRONT_BACK_LOGIN_URL_SHOW"> <div v-if="configData.FRONT_BACK_LOGIN_URL_SHOW">
<a href="/login" class="xn-color-0d84ff">后台登录</a> <a href="/login">后台登录</a>
</div> </div>
</a-card> </a-card>
</div> </div>

2
snowy-admin-web/src/views/auth/client/register/index.vue
View File

@ -215,7 +215,7 @@
</a-button> </a-button>
</a-form-item> </a-form-item>
<div style="display: flex; justify-content: flex-end"> <div style="display: flex; justify-content: flex-end">
<a href="/front/client/login" class="xn-color-0d84ff">已有账号？前往登录</a> <a href="/front/client/login">已有账号？前往登录</a>
</div> </div>
</a-form> </a-form>
</a-card> </a-card>

2
snowy-admin-web/src/views/auth/login/login.vue
View File

@ -135,7 +135,7 @@
const { proxy } = getCurrentInstance() const { proxy } = getCurrentInstance()
const activeKey = ref('userAccount') 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 registerOpen = ref('false')
const phoneLogin = ref('false') const phoneLogin = ref('false')
const emailLogin = ref('false') const emailLogin = ref('false')

4
snowy-admin-web/src/views/dev/file/index.vue
View File

@ -110,7 +110,7 @@
</template> </template>
</s-table> </s-table>
</a-card> </a-card>
<uploadForm ref="uploadFormRef" @successful="tableRef.refresh(true)" /> <uploadForm ref="uploadFormRef" @successful="tableRef.refresh()" />
<detail ref="detailRef" /> <detail ref="detailRef" />
</div> </div>
<preview v-if="!indexShow" ref="previewRef" @goBack="previewBack" /> <preview v-if="!indexShow" ref="previewRef" @goBack="previewBack" />
@ -238,7 +238,7 @@
} }
] ]
fileApi.fileDelete(params).then(() => { fileApi.fileDelete(params).then(() => {
tableRef.value.refresh(true) tableRef.value.refresh()
}) })
} }
// 批量删除 // 批量删除

3
snowy-admin-web/src/views/sys/role/grantPermissionForm.vue
View File

@ -472,8 +472,11 @@
} }
// 截取api串中的中文及括号 // 截取api串中的中文及括号
const subStrApi = (api) => { const subStrApi = (api) => {
if (api.indexOf('[') > -1) {
return api.substring(0, api.indexOf('[')) return api.substring(0, api.indexOf('['))
} }
return api
}
// 验证并提交数据 // 验证并提交数据
const onSubmit = () => { const onSubmit = () => {
const param = convertData() const param = convertData()

3
snowy-admin-web/src/views/sys/user/grantPermissionForm.vue
View File

@ -474,8 +474,11 @@
} }
// 截取api串中的中文及括号 // 截取api串中的中文及括号
const subStrApi = (api) => { const subStrApi = (api) => {
if (api.indexOf('[') > -1) {
return api.substring(0, api.indexOf('[')) return api.substring(0, api.indexOf('['))
} }
return api
}
// 验证并提交数据 // 验证并提交数据
const onSubmit = () => { const onSubmit = () => {
const param = convertData() const param = convertData()

4
snowy-plugin/snowy-plugin-auth/src/main/java/vip/xiaonuo/auth/modular/login/param/AuthAccountPasswordLoginParam.java
View File

@ -29,12 +29,12 @@ public class AuthAccountPasswordLoginParam {
/** 账号 */ /** 账号 */
@Schema(description = "账号", requiredMode = Schema.RequiredMode.REQUIRED) @Schema(description = "账号", requiredMode = Schema.RequiredMode.REQUIRED)
@NotBlank(message = "账号不能为空") @NotBlank(message = "account不能为空")
private String account; private String account;
/** 密码 */ /** 密码 */
@Schema(description = "密码", requiredMode = Schema.RequiredMode.REQUIRED) @Schema(description = "密码", requiredMode = Schema.RequiredMode.REQUIRED)
@NotBlank(message = "密码不能为空") @NotBlank(message = "password不能为空")
private String password; private String password;
/** 设备 */ /** 设备 */

6
snowy-plugin/snowy-plugin-auth/src/main/java/vip/xiaonuo/auth/modular/login/param/AuthEmailValidCodeLoginParam.java
View File

@ -29,17 +29,17 @@ public class AuthEmailValidCodeLoginParam {
/** 邮箱 */ /** 邮箱 */
@Schema(description = "邮箱", requiredMode = Schema.RequiredMode.REQUIRED) @Schema(description = "邮箱", requiredMode = Schema.RequiredMode.REQUIRED)
@NotBlank(message = "邮箱不能为空") @NotBlank(message = "email不能为空")
private String email; private String email;
/** 验证码 */ /** 验证码 */
@Schema(description = "验证码", requiredMode = Schema.RequiredMode.REQUIRED) @Schema(description = "验证码", requiredMode = Schema.RequiredMode.REQUIRED)
@NotBlank(message = "验证码不能为空") @NotBlank(message = "validCode不能为空")
private String validCode; private String validCode;
/** 验证码请求号 */ /** 验证码请求号 */
@Schema(description = "验证码请求号", requiredMode = Schema.RequiredMode.REQUIRED) @Schema(description = "验证码请求号", requiredMode = Schema.RequiredMode.REQUIRED)
@NotBlank(message = "验证码请求号不能为空") @NotBlank(message = "validCodeReqNo不能为空")
private String validCodeReqNo; private String validCodeReqNo;
/** 设备 */ /** 设备 */

6
snowy-plugin/snowy-plugin-auth/src/main/java/vip/xiaonuo/auth/modular/login/param/AuthGetEmailValidCodeParam.java
View File

@ -29,16 +29,16 @@ public class AuthGetEmailValidCodeParam {
/** 邮箱 */ /** 邮箱 */
@Schema(description = "邮箱", requiredMode = Schema.RequiredMode.REQUIRED) @Schema(description = "邮箱", requiredMode = Schema.RequiredMode.REQUIRED)
@NotBlank(message = "邮箱不能为空") @NotBlank(message = "email不能为空")
private String email; private String email;
/** 验证码 */ /** 验证码 */
@Schema(description = "验证码", requiredMode = Schema.RequiredMode.REQUIRED) @Schema(description = "验证码", requiredMode = Schema.RequiredMode.REQUIRED)
@NotBlank(message = "验证码不能为空") @NotBlank(message = "validCode不能为空")
private String validCode; private String validCode;
/** 验证码请求号 */ /** 验证码请求号 */
@Schema(description = "验证码请求号", requiredMode = Schema.RequiredMode.REQUIRED) @Schema(description = "验证码请求号", requiredMode = Schema.RequiredMode.REQUIRED)
@NotBlank(message = "验证码请求号不能为空") @NotBlank(message = "validCodeReqNo不能为空")
private String validCodeReqNo; private String validCodeReqNo;
} }

6
snowy-plugin/snowy-plugin-auth/src/main/java/vip/xiaonuo/auth/modular/login/param/AuthGetPhoneValidCodeParam.java
View File

@ -29,16 +29,16 @@ public class AuthGetPhoneValidCodeParam {
/** 手机号 */ /** 手机号 */
@Schema(description = "手机号", requiredMode = Schema.RequiredMode.REQUIRED) @Schema(description = "手机号", requiredMode = Schema.RequiredMode.REQUIRED)
@NotBlank(message = "手机号不能为空") @NotBlank(message = "phone不能为空")
private String phone; private String phone;
/** 验证码 */ /** 验证码 */
@Schema(description = "验证码", requiredMode = Schema.RequiredMode.REQUIRED) @Schema(description = "验证码", requiredMode = Schema.RequiredMode.REQUIRED)
@NotBlank(message = "验证码不能为空") @NotBlank(message = "validCode不能为空")
private String validCode; private String validCode;
/** 验证码请求号 */ /** 验证码请求号 */
@Schema(description = "验证码请求号", requiredMode = Schema.RequiredMode.REQUIRED) @Schema(description = "验证码请求号", requiredMode = Schema.RequiredMode.REQUIRED)
@NotBlank(message = "验证码请求号不能为空") @NotBlank(message = "validCodeReqNo不能为空")
private String validCodeReqNo; private String validCodeReqNo;
} }

6
snowy-plugin/snowy-plugin-auth/src/main/java/vip/xiaonuo/auth/modular/login/param/AuthPhoneValidCodeLoginParam.java
View File

@ -29,17 +29,17 @@ public class AuthPhoneValidCodeLoginParam {
/** 手机号 */ /** 手机号 */
@Schema(description = "手机号", requiredMode = Schema.RequiredMode.REQUIRED) @Schema(description = "手机号", requiredMode = Schema.RequiredMode.REQUIRED)
@NotBlank(message = "手机号不能为空") @NotBlank(message = "phone不能为空")
private String phone; private String phone;
/** 验证码 */ /** 验证码 */
@Schema(description = "验证码", requiredMode = Schema.RequiredMode.REQUIRED) @Schema(description = "验证码", requiredMode = Schema.RequiredMode.REQUIRED)
@NotBlank(message = "验证码不能为空") @NotBlank(message = "validCode不能为空")
private String validCode; private String validCode;
/** 验证码请求号 */ /** 验证码请求号 */
@Schema(description = "验证码请求号", requiredMode = Schema.RequiredMode.REQUIRED) @Schema(description = "验证码请求号", requiredMode = Schema.RequiredMode.REQUIRED)
@NotBlank(message = "验证码请求号不能为空") @NotBlank(message = "validCodeReqNo不能为空")
private String validCodeReqNo; private String validCodeReqNo;
/** 设备 */ /** 设备 */

4
snowy-plugin/snowy-plugin-auth/src/main/java/vip/xiaonuo/auth/modular/login/param/AuthRegisterParam.java
View File

@ -29,12 +29,12 @@ public class AuthRegisterParam {
/** 账号 */ /** 账号 */
@Schema(description = "账号", requiredMode = Schema.RequiredMode.REQUIRED) @Schema(description = "账号", requiredMode = Schema.RequiredMode.REQUIRED)
@NotBlank(message = "账号不能为空") @NotBlank(message = "account不能为空")
private String account; private String account;
/** 密码 */ /** 密码 */
@Schema(description = "密码", requiredMode = Schema.RequiredMode.REQUIRED) @Schema(description = "密码", requiredMode = Schema.RequiredMode.REQUIRED)
@NotBlank(message = "密码不能为空") @NotBlank(message = "password不能为空")
private String password; private String password;
/** 验证码 */ /** 验证码 */

6
snowy-plugin/snowy-plugin-client/src/main/java/vip/xiaonuo/client/modular/user/param/ClientUserGetEmailValidCodeParam.java
View File

@ -29,16 +29,16 @@ public class ClientUserGetEmailValidCodeParam {
/** 邮箱 */ /** 邮箱 */
@Schema(description = "邮箱") @Schema(description = "邮箱")
@NotBlank(message = "邮箱不能为空") @NotBlank(message = "email不能为空")
private String email; private String email;
/** 验证码 */ /** 验证码 */
@Schema(description = "验证码") @Schema(description = "验证码")
@NotBlank(message = "验证码不能为空") @NotBlank(message = "validCode不能为空")
private String validCode; private String validCode;
/** 验证码请求号 */ /** 验证码请求号 */
@Schema(description = "验证码请求号") @Schema(description = "验证码请求号")
@NotBlank(message = "验证码请求号不能为空") @NotBlank(message = "validCodeReqNo不能为空")
private String validCodeReqNo; private String validCodeReqNo;
} }

6
snowy-plugin/snowy-plugin-client/src/main/java/vip/xiaonuo/client/modular/user/param/ClientUserGetPhoneValidCodeParam.java
View File

@ -29,16 +29,16 @@ public class ClientUserGetPhoneValidCodeParam {
/** 手机号 */ /** 手机号 */
@Schema(description = "手机号") @Schema(description = "手机号")
@NotBlank(message = "手机号不能为空") @NotBlank(message = "phone不能为空")
private String phone; private String phone;
/** 验证码 */ /** 验证码 */
@Schema(description = "验证码") @Schema(description = "验证码")
@NotBlank(message = "验证码不能为空") @NotBlank(message = "validCode不能为空")
private String validCode; private String validCode;
/** 验证码请求号 */ /** 验证码请求号 */
@Schema(description = "验证码请求号") @Schema(description = "验证码请求号")
@NotBlank(message = "验证码请求号不能为空") @NotBlank(message = "validCodeReqNo不能为空")
private String validCodeReqNo; private String validCodeReqNo;
} }

9
snowy-plugin/snowy-plugin-gen/src/main/resources/backend/ServiceImpl.java.btl
View File

@ -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 @Override
public void exportData(List<${className}IdParam> ${classNameFirstLower}IdParamList, HttpServletResponse response) throws IOException { public void exportData(List<${className}IdParam> ${classNameFirstLower}IdParamList, HttpServletResponse response) throws IOException {
File tempFile = null; File tempFile = null;

2
snowy-plugin/snowy-plugin-gen/src/main/resources/sqlend/Mysql.sql.btl
View File

@ -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 ('${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 != '') { %> <% 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); 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);

6
snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/param/SysUserGetEmailValidCodeParam.java
View File

@ -29,16 +29,16 @@ public class SysUserGetEmailValidCodeParam {
/** 邮箱 */ /** 邮箱 */
@Schema(description = "邮箱") @Schema(description = "邮箱")
@NotBlank(message = "邮箱不能为空") @NotBlank(message = "email不能为空")
private String email; private String email;
/** 验证码 */ /** 验证码 */
@Schema(description = "验证码") @Schema(description = "验证码")
@NotBlank(message = "验证码不能为空") @NotBlank(message = "validCode不能为空")
private String validCode; private String validCode;
/** 验证码请求号 */ /** 验证码请求号 */
@Schema(description = "验证码请求号") @Schema(description = "验证码请求号")
@NotBlank(message = "验证码请求号不能为空") @NotBlank(message = "validCodeReqNo不能为空")
private String validCodeReqNo; private String validCodeReqNo;
} }

6
snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/param/SysUserGetPhoneValidCodeParam.java
View File

@ -29,16 +29,16 @@ public class SysUserGetPhoneValidCodeParam {
/** 手机号 */ /** 手机号 */
@Schema(description = "手机号") @Schema(description = "手机号")
@NotBlank(message = "手机号不能为空") @NotBlank(message = "phone不能为空")
private String phone; private String phone;
/** 验证码 */ /** 验证码 */
@Schema(description = "验证码") @Schema(description = "验证码")
@NotBlank(message = "验证码不能为空") @NotBlank(message = "validCode不能为空")
private String validCode; private String validCode;
/** 验证码请求号 */ /** 验证码请求号 */
@Schema(description = "验证码请求号") @Schema(description = "验证码请求号")
@NotBlank(message = "验证码请求号不能为空") @NotBlank(message = "validCodeReqNo不能为空")
private String validCodeReqNo; private String validCodeReqNo;
} }

9
snowy-web-app/src/main/java/vip/xiaonuo/core/config/GlobalConfigure.java
View File

@ -154,13 +154,20 @@ public class GlobalConfigure implements WebMvcConfigurer {
/* 系统字典树 */ /* 系统字典树 */
"/dev/dict/tree", "/dev/dict/tree",
/* 用户个人中心相关 */ /* B端用户个人中心相关 */
"/sys/userCenter/getPicCaptcha", "/sys/userCenter/getPicCaptcha",
"/sys/userCenter/findPasswordGetPhoneValidCode", "/sys/userCenter/findPasswordGetPhoneValidCode",
"/sys/userCenter/findPasswordGetEmailValidCode", "/sys/userCenter/findPasswordGetEmailValidCode",
"/sys/userCenter/findPasswordByPhone", "/sys/userCenter/findPasswordByPhone",
"/sys/userCenter/findPasswordByEmail", "/sys/userCenter/findPasswordByEmail",
/* C端用户个人中心相关 */
"/client/userCenter/getPicCaptcha",
"/client/userCenter/findPasswordGetPhoneValidCode",
"/client/userCenter/findPasswordGetEmailValidCode",
"/client/userCenter/findPasswordByPhone",
"/client/userCenter/findPasswordByEmail",
/* 文件下载 */ /* 文件下载 */
"/dev/file/download" "/dev/file/download"
}; };