提交

base-starter/src/main/resources/i18n/messages.properties

@@ -1,61 +1,61 @@
-#????
-not.null=* ????
-user.jcaptcha.error=?????
-user.jcaptcha.expire=??????
-user.not.exists=???, ?????{0} ???.
-user.password.not.match=?????/????
-user.password.retry.limit.count=??????{0}?
-user.password.retry.limit.exceed=??????{0}??????{1}??
-user.password.delete=?????????{0} ????
-user.blocked=?????????{0} ??????????
-role.blocked=????????????
-user.logout.success=????
-length.not.valid=?????{min}?{max}?????
-user.username.not.blank=???????
-user.username.not.valid=* 2?20?????????????????????????
-user.username.length.valid=???????{min}?{max}?????
-user.password.not.blank=????????
-user.password.length.valid=?????????{min}?{max}?????
-user.password.not.valid=* 5-50???
-user.email.not.valid=??????
-user.email.not.blank=??????
-user.phonenumber.not.blank=?????????
-user.mobile.phone.number.not.valid=???????
-user.login.success=????
-user.register.success=????
-user.register.save.error=???? {0} ??????????
-user.register.error=??????????????
-user.notfound=?????
-user.forcelogout=?????????????
-user.unknown.error=??????????
-auth.grant.type.error=????????
-auth.grant.type.blocked=?????????
-auth.grant.type.not.blank=??????????
-auth.clientid.not.blank=?????id????
-##??????
-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}]
-repeat.submit.message=?????????????
-rate.limiter.message=????????????
-sms.code.not.blank=?????????
-sms.code.retry.limit.count=?????????{0}?
-sms.code.retry.limit.exceed=?????????{0}??????{1}??
-email.code.not.blank=?????????
-email.code.retry.limit.count=?????????{0}?
-email.code.retry.limit.exceed=?????????{0}??????{1}??
-xcx.code.not.blank=???[code]????
-social.source.not.blank=???????[source]????
-social.code.not.blank=???????[code]????
-social.state.not.blank=???????[state]????
-##??
-tenant.number.not.blank=????????
-tenant.not.exists=???, ??????????????
-tenant.blocked=??????????????????
-tenant.expired=??????????????????
+#错误消息
+not.null=* 必须填写
+user.jcaptcha.error=验证码错误
+user.jcaptcha.expire=验证码已失效
+user.not.exists=对不起, 您的账号：{0} 不存在.
+user.password.not.match=用户不存在/密码错误
+user.password.retry.limit.count=密码输入错误{0}次
+user.password.retry.limit.exceed=密码输入错误{0}次，帐户锁定{1}分钟
+user.password.delete=对不起，您的账号：{0} 已被删除
+user.blocked=对不起，您的账号：{0} 已禁用，请联系管理员
+role.blocked=角色已封禁，请联系管理员
+user.logout.success=退出成功
+length.not.valid=长度必须在{min}到{max}个字符之间
+user.username.not.blank=用户名不能为空
+user.username.not.valid=* 2到20个汉字、字母、数字或下划线组成，且必须以非数字开头
+user.username.length.valid=账户长度必须在{min}到{max}个字符之间
+user.password.not.blank=用户密码不能为空
+user.password.length.valid=用户密码长度必须在{min}到{max}个字符之间
+user.password.not.valid=* 5-50个字符
+user.email.not.valid=邮箱格式错误
+user.email.not.blank=邮箱不能为空
+user.phonenumber.not.blank=用户手机号不能为空
+user.mobile.phone.number.not.valid=手机号格式错误
+user.login.success=登录成功
+user.register.success=注册成功
+user.register.save.error=保存用户 {0} 失败，注册账号已存在
+user.register.error=注册失败，请联系系统管理人员
+user.notfound=请重新登录
+user.forcelogout=管理员强制退出，请重新登录
+user.unknown.error=未知错误，请重新登录
+auth.grant.type.error=认证权限类型错误
+auth.grant.type.blocked=认证权限类型已禁用
+auth.grant.type.not.blank=认证权限类型不能为空
+auth.clientid.not.blank=认证客户端id不能为空
+##文件上传消息
+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}]
+repeat.submit.message=不允许重复提交，请稍候再试
+rate.limiter.message=访问过于频繁，请稍候再试
+sms.code.not.blank=短信验证码不能为空
+sms.code.retry.limit.count=短信验证码输入错误{0}次
+sms.code.retry.limit.exceed=短信验证码输入错误{0}次，帐户锁定{1}分钟
+email.code.not.blank=邮箱验证码不能为空
+email.code.retry.limit.count=邮箱验证码输入错误{0}次
+email.code.retry.limit.exceed=邮箱验证码输入错误{0}次，帐户锁定{1}分钟
+xcx.code.not.blank=小程序[code]不能为空
+social.source.not.blank=第三方登录平台[source]不能为空
+social.code.not.blank=第三方登录平台[code]不能为空
+social.state.not.blank=第三方登录平台[state]不能为空
+##租户
+tenant.number.not.blank=租户编号不能为空
+tenant.not.exists=对不起, 您的租户不存在，请联系管理员
+tenant.blocked=对不起，您的租户已禁用，请联系管理员
+tenant.expired=对不起，您的租户已过期，请联系管理员

base-starter/src/main/resources/i18n/messages_en_US.properties

@@ -1,4 +1,4 @@
-#????
+#错误消息
 not.null=* Required fill in
 user.jcaptcha.error=Captcha error
 user.jcaptcha.expire=Captcha invalid
@@ -6,9 +6,9 @@ user.not.exists=Sorry, your account: {0} does not exist
 user.password.not.match=User does not exist/Password error
 user.password.retry.limit.count=Password input error {0} times
 user.password.retry.limit.exceed=Password input error {0} times, account locked for {1} minutes
-user.password.delete=Sorry, your account?{0} has been deleted
+user.password.delete=Sorry, your account：{0} has been deleted
 user.blocked=Sorry, your account: {0} has been disabled. Please contact the administrator
-role.blocked=Role disabled?please contact administrators
+role.blocked=Role disabled，please contact administrators
 user.logout.success=Exit successful
 length.not.valid=The length must be between {min} and {max} characters
 user.username.not.blank=Username cannot be blank
@@ -26,22 +26,22 @@ user.register.success=Register successful
 user.register.save.error=Failed to save user {0}, The registered account already exists
 user.register.error=Register failed, please contact system administrator
 user.notfound=Please login again
-user.forcelogout=The administrator is forced to exit?please login again
+user.forcelogout=The administrator is forced to exit，please login again
 user.unknown.error=Unknown error, please login again
 auth.grant.type.error=Auth grant type error
 auth.grant.type.blocked=Auth grant type disabled
 auth.grant.type.not.blank=Auth grant type cannot be blank
 auth.clientid.not.blank=Auth clientid cannot be blank
-##??????
-upload.exceed.maxSize=The uploaded file size exceeds the limit file size?<br/>the maximum allowed file size is?{0}MB?
+##文件上传消息
+upload.exceed.maxSize=The uploaded file size exceeds the limit file size！<br/>the maximum allowed file size is：{0}MB！
 upload.filename.exceed.length=The maximum length of uploaded file name is {0} characters
-##??
-no.permission=You do not have permission to the data?please contact your administrator to add permissions [{0}]
-no.create.permission=You do not have permission to create data?please contact your administrator to add permissions [{0}]
-no.update.permission=You do not have permission to modify data?please contact your administrator to add permissions [{0}]
-no.delete.permission=You do not have permission to delete data?please contact your administrator to add permissions [{0}]
-no.export.permission=You do not have permission to export data?please contact your administrator to add permissions [{0}]
-no.view.permission=You do not have permission to view data?please contact your administrator to add permissions [{0}]
+##权限
+no.permission=You do not have permission to the data，please contact your administrator to add permissions [{0}]
+no.create.permission=You do not have permission to create data，please contact your administrator to add permissions [{0}]
+no.update.permission=You do not have permission to modify data，please contact your administrator to add permissions [{0}]
+no.delete.permission=You do not have permission to delete data，please contact your administrator to add permissions [{0}]
+no.export.permission=You do not have permission to export data，please contact your administrator to add permissions [{0}]
+no.view.permission=You do not have permission to view data，please contact your administrator to add permissions [{0}]
 repeat.submit.message=Repeat submit is not allowed, please try again later
 rate.limiter.message=Visit too frequently, please try again later
 sms.code.not.blank=Sms code cannot be blank
@@ -54,7 +54,7 @@ xcx.code.not.blank=Mini program [code] cannot be blank
 social.source.not.blank=Social login platform [source] cannot be blank
 social.code.not.blank=Social login platform [code] cannot be blank
 social.state.not.blank=Social login platform [state] cannot be blank
-##??
+##租户
 tenant.number.not.blank=Tenant number cannot be blank
 tenant.not.exists=Sorry, your tenant does not exist. Please contact the administrator
 tenant.blocked=Sorry, your tenant is disabled. Please contact the administrator

base-starter/src/main/resources/i18n/messages_zh_CN.properties

@@ -1,61 +1,61 @@
-#????
-not.null=* ????
-user.jcaptcha.error=?????
-user.jcaptcha.expire=??????
-user.not.exists=???, ?????{0} ???.
-user.password.not.match=?????/????
-user.password.retry.limit.count=??????{0}?
-user.password.retry.limit.exceed=??????{0}??????{1}??
-user.password.delete=?????????{0} ????
-user.blocked=?????????{0} ??????????
-role.blocked=????????????
-user.logout.success=????
-length.not.valid=?????{min}?{max}?????
-user.username.not.blank=???????
-user.username.not.valid=* 2?20?????????????????????????
-user.username.length.valid=???????{min}?{max}?????
-user.password.not.blank=????????
-user.password.length.valid=?????????{min}?{max}?????
-user.password.not.valid=* 5-50???
-user.email.not.valid=??????
-user.email.not.blank=??????
-user.phonenumber.not.blank=?????????
-user.mobile.phone.number.not.valid=???????
-user.login.success=????
-user.register.success=????
-user.register.save.error=???? {0} ??????????
-user.register.error=??????????????
-user.notfound=?????
-user.forcelogout=?????????????
-user.unknown.error=??????????
-auth.grant.type.error=????????
-auth.grant.type.blocked=?????????
-auth.grant.type.not.blank=??????????
-auth.clientid.not.blank=?????id????
-##??????
-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}]
-repeat.submit.message=?????????????
-rate.limiter.message=????????????
-sms.code.not.blank=?????????
-sms.code.retry.limit.count=?????????{0}?
-sms.code.retry.limit.exceed=?????????{0}??????{1}??
-email.code.not.blank=?????????
-email.code.retry.limit.count=?????????{0}?
-email.code.retry.limit.exceed=?????????{0}??????{1}??
-xcx.code.not.blank=???[code]????
-social.source.not.blank=???????[source]????
-social.code.not.blank=???????[code]????
-social.state.not.blank=???????[state]????
-##??
-tenant.number.not.blank=????????
-tenant.not.exists=???, ??????????????
-tenant.blocked=??????????????????
-tenant.expired=??????????????????
+#错误消息
+not.null=* 必须填写
+user.jcaptcha.error=验证码错误
+user.jcaptcha.expire=验证码已失效
+user.not.exists=对不起, 您的账号：{0} 不存在.
+user.password.not.match=用户不存在/密码错误
+user.password.retry.limit.count=密码输入错误{0}次
+user.password.retry.limit.exceed=密码输入错误{0}次，帐户锁定{1}分钟
+user.password.delete=对不起，您的账号：{0} 已被删除
+user.blocked=对不起，您的账号：{0} 已禁用，请联系管理员
+role.blocked=角色已封禁，请联系管理员
+user.logout.success=退出成功
+length.not.valid=长度必须在{min}到{max}个字符之间
+user.username.not.blank=用户名不能为空
+user.username.not.valid=* 2到20个汉字、字母、数字或下划线组成，且必须以非数字开头
+user.username.length.valid=账户长度必须在{min}到{max}个字符之间
+user.password.not.blank=用户密码不能为空
+user.password.length.valid=用户密码长度必须在{min}到{max}个字符之间
+user.password.not.valid=* 5-50个字符
+user.email.not.valid=邮箱格式错误
+user.email.not.blank=邮箱不能为空
+user.phonenumber.not.blank=用户手机号不能为空
+user.mobile.phone.number.not.valid=手机号格式错误
+user.login.success=登录成功
+user.register.success=注册成功
+user.register.save.error=保存用户 {0} 失败，注册账号已存在
+user.register.error=注册失败，请联系系统管理人员
+user.notfound=请重新登录
+user.forcelogout=管理员强制退出，请重新登录
+user.unknown.error=未知错误，请重新登录
+auth.grant.type.error=认证权限类型错误
+auth.grant.type.blocked=认证权限类型已禁用
+auth.grant.type.not.blank=认证权限类型不能为空
+auth.clientid.not.blank=认证客户端id不能为空
+##文件上传消息
+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}]
+repeat.submit.message=不允许重复提交，请稍候再试
+rate.limiter.message=访问过于频繁，请稍候再试
+sms.code.not.blank=短信验证码不能为空
+sms.code.retry.limit.count=短信验证码输入错误{0}次
+sms.code.retry.limit.exceed=短信验证码输入错误{0}次，帐户锁定{1}分钟
+email.code.not.blank=邮箱验证码不能为空
+email.code.retry.limit.count=邮箱验证码输入错误{0}次
+email.code.retry.limit.exceed=邮箱验证码输入错误{0}次，帐户锁定{1}分钟
+xcx.code.not.blank=小程序[code]不能为空
+social.source.not.blank=第三方登录平台[source]不能为空
+social.code.not.blank=第三方登录平台[code]不能为空
+social.state.not.blank=第三方登录平台[state]不能为空
+##租户
+tenant.number.not.blank=租户编号不能为空
+tenant.not.exists=对不起, 您的租户不存在，请联系管理员
+tenant.blocked=对不起，您的租户已禁用，请联系管理员
+tenant.expired=对不起，您的租户已过期，请联系管理员

base-starter/src/main/resources/spy.properties

@@ -1,28 +1,28 @@
-# p6spy ??????????
+# p6spy 性能分析插件配置文件
 modulelist=com.baomidou.mybatisplus.extension.p6spy.MybatisPlusLogFactory,com.p6spy.engine.outage.P6OutageFactory
-# ???????
+# 自定义日志打印
 logMessageFormat=com.baomidou.mybatisplus.extension.p6spy.P6SpyLogger
-#????????
+#日志输出到控制台
 appender=com.baomidou.mybatisplus.extension.p6spy.StdoutLogger
-# ???????? sql
+# 使用日志系统记录 sql
 #appender=com.p6spy.engine.spy.appender.Slf4JLogger
-# ?? p6spy driver ??
+# 设置 p6spy driver 代理
 #deregisterdrivers=true
-# ??JDBC URL??
+# 取消JDBC URL前缀
 useprefix=true
-# ???? Log ??,????????error,info,batch,debug,statement,commit,rollback,result,resultset.
+# 配置记录 Log 例外,可去掉的结果集有error,info,batch,debug,statement,commit,rollback,result,resultset.
 excludecategories=info,debug,result,commit,resultset
-# ????
+# 日期格式
 dateformat=yyyy-MM-dd HH:mm:ss
-# SQL????????
+# SQL语句打印时间格式
 databaseDialectTimestampFormat=yyyy-MM-dd HH:mm:ss
-# ???????
+# 实际驱动可多个
 #driverlist=org.h2.Driver
-# ?????SQL??
+# 是否开启慢SQL记录
 outagedetection=true
-# ?SQL???? 2 ?
+# 慢SQL记录标准 2 秒
 outagedetectioninterval=2
-# ???? Log
+# 是否过滤 Log
 filter=true
-# ?? Log ????? sql ?????????
+# 过滤 Log 时所排除的 sql 关键字，以逗号分隔
 exclude=SELECT 1