cfdeada3fd
Conflicts: pom.xml ruoyi-admin/src/main/resources/application.yml ruoyi-admin/src/main/resources/i18n/messages.properties ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java ruoyi-common/src/main/java/com/ruoyi/common/constant/UserConstants.java ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java ruoyi-common/src/main/java/com/ruoyi/common/filter/XssFilter.java ruoyi-common/src/main/java/com/ruoyi/common/utils/StringUtils.java ruoyi-framework/src/main/java/com/ruoyi/framework/config/FilterConfig.java ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java ruoyi-framework/src/main/java/com/ruoyi/framework/manager/factory/AsyncFactory.java ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/TokenService.java ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java ruoyi-generator/src/main/resources/vm/java/controller.java.vm ruoyi-generator/src/main/resources/vm/java/mapper.java.vm ruoyi-generator/src/main/resources/vm/java/service.java.vm ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java ruoyi-ui/src/api/login.js ruoyi-ui/src/router/index.js ruoyi-ui/src/utils/zipdownload.js ruoyi-ui/src/views/index.vue ruoyi-ui/src/views/login.vue ruoyi-ui/src/views/system/user/index.vue
38 lines
1.8 KiB
Properties
38 lines
1.8 KiB
Properties
#错误消息
|
||
not.null=* 必须填写
|
||
user.jcaptcha.error=验证码错误
|
||
user.jcaptcha.expire=验证码已失效
|
||
user.not.exists=用户不存在/密码错误
|
||
user.password.not.match=用户不存在/密码错误
|
||
user.password.retry.limit.count=密码输入错误{0}次
|
||
user.password.retry.limit.exceed=密码输入错误{0}次，帐户锁定10分钟
|
||
user.password.delete=对不起，您的账号已被删除
|
||
user.blocked=用户已封禁，请联系管理员
|
||
role.blocked=角色已封禁，请联系管理员
|
||
user.logout.success=退出成功
|
||
|
||
length.not.valid=长度必须在{min}到{max}个字符之间
|
||
|
||
user.username.not.valid=* 2到20个汉字、字母、数字或下划线组成，且必须以非数字开头
|
||
user.password.not.valid=* 5-50个字符
|
||
|
||
user.email.not.valid=邮箱格式错误
|
||
user.mobile.phone.number.not.valid=手机号格式错误
|
||
user.login.success=登录成功
|
||
user.register.success=注册成功
|
||
user.notfound=请重新登录
|
||
user.forcelogout=管理员强制退出，请重新登录
|
||
user.unknown.error=未知错误，请重新登录
|
||
|
||
##文件上传消息
|
||
upload.exceed.maxSize=上传的文件大小超出限制的文件大小！<br/>允许的文件最大大小是：{0}MB！
|
||
upload.filename.exceed.length=上传的文件名最长{0}个字符
|
||
|
||
##权限
|
||
no.permission=您没有数据的权限，请联系管理员添加权限 [{0}]
|
||
no.create.permission=您没有创建数据的权限，请联系管理员添加权限 [{0}]
|
||
no.update.permission=您没有修改数据的权限，请联系管理员添加权限 [{0}]
|
||
no.delete.permission=您没有删除数据的权限，请联系管理员添加权限 [{0}]
|
||
no.export.permission=您没有导出数据的权限，请联系管理员添加权限 [{0}]
|
||
no.view.permission=您没有查看数据的权限，请联系管理员添加权限 [{0}]
|