mirror of
https://github.com/dromara/RuoYi-Vue-Plus.git
synced 2025-09-24 07:19:46 +08:00
Merge remote-tracking branch 'origin/dev' into satoken
# Conflicts: # ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/CacheController.java # ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java # ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java # ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java # ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java # ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java # ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java # ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java # ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java # ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java # ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java # ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssConfigController.java # ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssController.java # ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java # ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java # ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java # ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java # ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java # ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java # ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java # ruoyi-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java # ruoyi-framework/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java # ruoyi-framework/src/main/java/com/ruoyi/framework/mybatisplus/CreateAndUpdateMetaObjectHandler.java # ruoyi-framework/src/main/java/com/ruoyi/framework/security/filter/JwtAuthenticationTokenFilter.java # ruoyi-framework/src/main/java/com/ruoyi/framework/security/handle/AuthenticationEntryPointImpl.java # ruoyi-framework/src/main/java/com/ruoyi/framework/web/exception/GlobalExceptionHandler.java # ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java # ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java # ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserOnlineService.java # ruoyi-system/src/main/java/com/ruoyi/system/service/SysLoginService.java # ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserOnlineServiceImpl.java # ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TokenServiceImpl.java
This commit is contained in:
疯狂的狮子li
@ -1,4 +1,43 @@
|
||||
# 数据源配置
|
||||
--- # 监控配置
|
||||
spring:
|
||||
boot:
|
||||
admin:
|
||||
# Spring Boot Admin Client 客户端的相关配置
|
||||
client:
|
||||
# 增加客户端开关
|
||||
enabled: true
|
||||
# 设置 Spring Boot Admin Server 地址
|
||||
url: http://localhost:9090/admin
|
||||
instance:
|
||||
prefer-ip: true # 注册实例时，优先使用 IP
|
||||
username: ruoyi
|
||||
password: 123456
|
||||
|
||||
--- # xxl-job 配置
|
||||
xxl:
|
||||
job:
|
||||
# 执行器开关
|
||||
enabled: true
|
||||
# 调度中心地址：如调度中心集群部署存在多个地址则用逗号分隔。
|
||||
admin-addresses: http://localhost:9100/xxl-job-admin
|
||||
# 执行器通讯TOKEN：非空时启用
|
||||
access-token: xxl-job
|
||||
# 执行器配置
|
||||
executor:
|
||||
# 执行器AppName：执行器心跳注册分组依据；为空则关闭自动注册
|
||||
appname: xxl-job-executor
|
||||
# 执行器端口号 执行器从9101开始往后写
|
||||
port: 9101
|
||||
# 执行器注册：默认IP:PORT
|
||||
address:
|
||||
# 执行器IP：默认自动获取IP
|
||||
ip:
|
||||
# 执行器运行日志文件存储磁盘路径
|
||||
logpath: ./logs/xxl-job
|
||||
# 执行器日志文件保存天数：大于3生效
|
||||
logretentiondays: 30
|
||||
|
||||
--- # 数据源配置
|
||||
spring:
|
||||
datasource:
|
||||
type: com.alibaba.druid.pool.DruidDataSource
|
||||
@ -117,79 +156,3 @@ redisson:
|
||||
subscriptionsPerConnection: 5
|
||||
# DNS监测时间间隔，单位：毫秒
|
||||
dnsMonitoringInterval: 5000
|
||||
|
||||
#--- # redis 集群配置(单机与集群只能开启一个另一个需要注释掉)
|
||||
#spring:
|
||||
# redis:
|
||||
# cluster:
|
||||
# nodes:
|
||||
# - 192.168.0.100:6379
|
||||
# - 192.168.0.101:6379
|
||||
# - 192.168.0.102:6379
|
||||
# # 密码
|
||||
# password:
|
||||
# # 连接超时时间
|
||||
# timeout: 10s
|
||||
# # 是否开启ssl
|
||||
# ssl: false
|
||||
#
|
||||
#redisson:
|
||||
# # 线程池数量
|
||||
# threads: 16
|
||||
# # Netty线程池数量
|
||||
# nettyThreads: 32
|
||||
# # 传输模式
|
||||
# transportMode: "NIO"
|
||||
# # 集群配置
|
||||
# clusterServersConfig:
|
||||
# # 客户端名称
|
||||
# clientName: ${ruoyi.name}
|
||||
# # master最小空闲连接数
|
||||
# masterConnectionMinimumIdleSize: 32
|
||||
# # master连接池大小
|
||||
# masterConnectionPoolSize: 64
|
||||
# # slave最小空闲连接数
|
||||
# slaveConnectionMinimumIdleSize: 32
|
||||
# # slave连接池大小
|
||||
# slaveConnectionPoolSize: 64
|
||||
# # 连接空闲超时，单位：毫秒
|
||||
# idleConnectionTimeout: 10000
|
||||
# # ping连接间隔
|
||||
# pingConnectionInterval: 1000
|
||||
# # 命令等待超时，单位：毫秒
|
||||
# timeout: 3000
|
||||
# # 如果尝试在此限制之内发送成功，则开始启用 timeout 计时。
|
||||
# retryAttempts: 3
|
||||
# # 命令重试发送时间间隔，单位：毫秒
|
||||
# retryInterval: 1500
|
||||
# # 从可用服务器的内部列表中排除 Redis Slave 重新连接尝试的间隔。
|
||||
# failedSlaveReconnectionInterval: 3000
|
||||
# # 发布和订阅连接池最小空闲连接数
|
||||
# subscriptionConnectionMinimumIdleSize: 1
|
||||
# # 发布和订阅连接池大小
|
||||
# subscriptionConnectionPoolSize: 50
|
||||
# # 单个连接最大订阅数量
|
||||
# subscriptionsPerConnection: 5
|
||||
# # 扫描间隔
|
||||
# scanInterval: 1000
|
||||
# # DNS监测时间间隔，单位：毫秒
|
||||
# dnsMonitoringInterval: 5000
|
||||
# # 读取模式
|
||||
# readMode: "SLAVE"
|
||||
# # 订阅模式
|
||||
# subscriptionMode: "MASTER"
|
||||
|
||||
--- # 监控配置
|
||||
spring:
|
||||
boot:
|
||||
admin:
|
||||
# Spring Boot Admin Client 客户端的相关配置
|
||||
client:
|
||||
# 增加客户端开关
|
||||
enabled: true
|
||||
# 设置 Spring Boot Admin Server 地址
|
||||
url: http://localhost:9090/admin
|
||||
instance:
|
||||
prefer-ip: true # 注册实例时，优先使用 IP
|
||||
username: ruoyi
|
||||
password: 123456
|
||||
|
||||
@ -1,4 +1,43 @@
|
||||
# 数据源配置
|
||||
--- # 监控配置
|
||||
spring:
|
||||
boot:
|
||||
admin:
|
||||
# Spring Boot Admin Client 客户端的相关配置
|
||||
client:
|
||||
# 增加客户端开关
|
||||
enabled: true
|
||||
# 设置 Spring Boot Admin Server 地址
|
||||
url: http://172.30.0.90:9090/admin
|
||||
instance:
|
||||
prefer-ip: true # 注册实例时，优先使用 IP
|
||||
username: ruoyi
|
||||
password: 123456
|
||||
|
||||
--- # xxl-job 配置
|
||||
xxl:
|
||||
job:
|
||||
# 执行器开关
|
||||
enabled: true
|
||||
# 调度中心地址：如调度中心集群部署存在多个地址则用逗号分隔。
|
||||
admin-addresses: http://172.30.0.92:9100/xxl-job-admin
|
||||
# 执行器通讯TOKEN：非空时启用
|
||||
access-token: xxl-job
|
||||
# 执行器配置
|
||||
executor:
|
||||
# 执行器AppName：执行器心跳注册分组依据；为空则关闭自动注册
|
||||
appname: xxl-job-executor
|
||||
# 执行器端口号 执行器从9101开始往后写
|
||||
port: 9101
|
||||
# 执行器注册：默认IP:PORT
|
||||
address:
|
||||
# 执行器IP：默认自动获取IP
|
||||
ip:
|
||||
# 执行器运行日志文件存储磁盘路径
|
||||
logpath: ./logs/xxl-job
|
||||
# 执行器日志文件保存天数：大于3生效
|
||||
logretentiondays: 30
|
||||
|
||||
--- # 数据源配置
|
||||
spring:
|
||||
datasource:
|
||||
type: com.alibaba.druid.pool.DruidDataSource
|
||||
@ -117,79 +156,3 @@ redisson:
|
||||
subscriptionsPerConnection: 5
|
||||
# DNS监测时间间隔，单位：毫秒
|
||||
dnsMonitoringInterval: 5000
|
||||
|
||||
#--- # redis 集群配置(单机与集群只能开启一个另一个需要注释掉)
|
||||
#spring:
|
||||
# redis:
|
||||
# cluster:
|
||||
# nodes:
|
||||
# - 192.168.0.100:6379
|
||||
# - 192.168.0.101:6379
|
||||
# - 192.168.0.102:6379
|
||||
# # 密码
|
||||
# password:
|
||||
# # 连接超时时间
|
||||
# timeout: 10s
|
||||
# # 是否开启ssl
|
||||
# ssl: false
|
||||
#
|
||||
#redisson:
|
||||
# # 线程池数量
|
||||
# threads: 16
|
||||
# # Netty线程池数量
|
||||
# nettyThreads: 32
|
||||
# # 传输模式
|
||||
# transportMode: "NIO"
|
||||
# # 集群配置
|
||||
# clusterServersConfig:
|
||||
# # 客户端名称
|
||||
# clientName: ${ruoyi.name}
|
||||
# # master最小空闲连接数
|
||||
# masterConnectionMinimumIdleSize: 32
|
||||
# # master连接池大小
|
||||
# masterConnectionPoolSize: 64
|
||||
# # slave最小空闲连接数
|
||||
# slaveConnectionMinimumIdleSize: 32
|
||||
# # slave连接池大小
|
||||
# slaveConnectionPoolSize: 64
|
||||
# # 连接空闲超时，单位：毫秒
|
||||
# idleConnectionTimeout: 10000
|
||||
# # ping连接间隔
|
||||
# pingConnectionInterval: 1000
|
||||
# # 命令等待超时，单位：毫秒
|
||||
# timeout: 3000
|
||||
# # 如果尝试在此限制之内发送成功，则开始启用 timeout 计时。
|
||||
# retryAttempts: 3
|
||||
# # 命令重试发送时间间隔，单位：毫秒
|
||||
# retryInterval: 1500
|
||||
# # 从可用服务器的内部列表中排除 Redis Slave 重新连接尝试的间隔。
|
||||
# failedSlaveReconnectionInterval: 3000
|
||||
# # 发布和订阅连接池最小空闲连接数
|
||||
# subscriptionConnectionMinimumIdleSize: 1
|
||||
# # 发布和订阅连接池大小
|
||||
# subscriptionConnectionPoolSize: 50
|
||||
# # 单个连接最大订阅数量
|
||||
# subscriptionsPerConnection: 5
|
||||
# # 扫描间隔
|
||||
# scanInterval: 1000
|
||||
# # DNS监测时间间隔，单位：毫秒
|
||||
# dnsMonitoringInterval: 5000
|
||||
# # 读取模式
|
||||
# readMode: "SLAVE"
|
||||
# # 订阅模式
|
||||
# subscriptionMode: "MASTER"
|
||||
|
||||
--- # 监控配置
|
||||
spring:
|
||||
boot:
|
||||
admin:
|
||||
# Spring Boot Admin Client 客户端的相关配置
|
||||
client:
|
||||
# 增加客户端开关
|
||||
enabled: true
|
||||
# 设置 Spring Boot Admin Server 地址
|
||||
url: http://172.30.0.90:9090/admin
|
||||
instance:
|
||||
prefer-ip: true # 注册实例时，优先使用 IP
|
||||
username: ruoyi
|
||||
password: 123456
|
||||
|
||||
@ -43,14 +43,6 @@ server:
|
||||
io: 8
|
||||
# 阻塞任务线程池, 当执行类似servlet请求阻塞操作, undertow会从这个线程池中取得线程,它的值设置取决于系统的负载
|
||||
worker: 256
|
||||
# # tomcat 配置
|
||||
# tomcat:
|
||||
# # tomcat的URI编码
|
||||
# uri-encoding: UTF-8
|
||||
# # tomcat最大线程数，默认为200
|
||||
# max-threads: 500
|
||||
# # Tomcat启动初始化的线程数，默认值25
|
||||
# min-spare-threads: 30
|
||||
|
||||
# 日志配置
|
||||
logging:
|
||||
@ -59,6 +51,10 @@ logging:
|
||||
org.springframework: warn
|
||||
config: classpath:logback.xml
|
||||
|
||||
# tlog 全局访问性能拦截
|
||||
tlog:
|
||||
enable-invoke-time-print: true
|
||||
|
||||
# Spring配置
|
||||
spring:
|
||||
application:
|
||||
@ -161,43 +157,24 @@ mybatis-plus:
|
||||
mapperLocations: classpath*:mapper/**/*Mapper.xml
|
||||
# 实体扫描，多个package用逗号或者分号分隔
|
||||
typeAliasesPackage: com.ruoyi.**.domain
|
||||
# 针对 typeAliasesPackage，如果配置了该属性，则仅仅会扫描路径下以该类作为父类的域对象
|
||||
#typeAliasesSuperType: Class<?>
|
||||
# 如果配置了该属性，SqlSessionFactoryBean 会把该包下面的类注册为对应的 TypeHandler
|
||||
#typeHandlersPackage: null
|
||||
# 如果配置了该属性，会将路径下的枚举类进行注入，让实体类字段能够简单快捷的使用枚举属性
|
||||
#typeEnumsPackage: null
|
||||
# 启动时是否检查 MyBatis XML 文件的存在，默认不检查
|
||||
checkConfigLocation: false
|
||||
# 通过该属性可指定 MyBatis 的执行器，MyBatis 的执行器总共有三种：
|
||||
# SIMPLE：该执行器类型不做特殊的事情，为每个语句的执行创建一个新的预处理语句（PreparedStatement）
|
||||
# REUSE：该执行器类型会复用预处理语句（PreparedStatement）
|
||||
# BATCH：该执行器类型会批量执行所有的更新语句
|
||||
# SIMPLE：每个语句创建新的预处理器 REUSE：会复用预处理器 BATCH：批量执行所有的更新
|
||||
executorType: SIMPLE
|
||||
configuration:
|
||||
# 自动驼峰命名规则（camel case）映射
|
||||
# 如果您的数据库命名符合规则无需使用 @TableField 注解指定数据库字段名
|
||||
mapUnderscoreToCamelCase: true
|
||||
# 默认枚举处理类,如果配置了该属性,枚举将统一使用指定处理器进行处理
|
||||
# org.apache.ibatis.type.EnumTypeHandler : 存储枚举的名称
|
||||
# org.apache.ibatis.type.EnumOrdinalTypeHandler : 存储枚举的索引
|
||||
# com.baomidou.mybatisplus.extension.handlers.MybatisEnumTypeHandler : 枚举类需要实现IEnum接口或字段标记@EnumValue注解.
|
||||
defaultEnumTypeHandler: org.apache.ibatis.type.EnumTypeHandler
|
||||
# 当设置为 true 的时候，懒加载的对象可能被任何懒属性全部加载，否则，每个属性都按需加载。需要和 lazyLoadingEnabled 一起使用。
|
||||
aggressiveLazyLoading: true
|
||||
# MyBatis 自动映射策略
|
||||
# NONE：不启用自动映射
|
||||
# PARTIAL：只对非嵌套的 resultMap 进行自动映射
|
||||
# FULL：对所有的 resultMap 都进行自动映射
|
||||
# NONE：不启用 PARTIAL：只对非嵌套 resultMap 自动映射 FULL：对所有 resultMap 自动映射
|
||||
autoMappingBehavior: PARTIAL
|
||||
# MyBatis 自动映射时未知列或未知属性处理策
|
||||
# NONE：不做任何处理 (默认值)
|
||||
# WARNING：以日志的形式打印相关警告信息
|
||||
# FAILING：当作映射失败处理，并抛出异常和详细信息
|
||||
# NONE：不做处理 WARNING：打印相关警告 FAILING：抛出异常和详细信息
|
||||
autoMappingUnknownColumnBehavior: NONE
|
||||
# Mybatis一级缓存，默认为 SESSION
|
||||
# SESSION session级别缓存，同一个session相同查询语句不会再次查询数据库
|
||||
# STATEMENT 关闭一级缓存
|
||||
# SESSION session级别缓存 STATEMENT 关闭一级缓存
|
||||
localCacheScope: SESSION
|
||||
# 开启Mybatis二级缓存，默认为 true
|
||||
cacheEnabled: false
|
||||
@ -212,32 +189,18 @@ mybatis-plus:
|
||||
enableSqlRunner: false
|
||||
dbConfig:
|
||||
# 主键类型
|
||||
# AUTO 数据库ID自增
|
||||
# NONE 空
|
||||
# INPUT 用户输入ID
|
||||
# ASSIGN_ID 全局唯一ID
|
||||
# ASSIGN_UUID 全局唯一ID UUID
|
||||
# AUTO 自增 NONE 空 INPUT 用户输入 ASSIGN_ID 雪花 ASSIGN_UUID 唯一 UUID
|
||||
idType: AUTO
|
||||
# 表名前缀
|
||||
tablePrefix: null
|
||||
# 字段 format,例: %s,(对主键无效)
|
||||
columnFormat: null
|
||||
# 表名是否使用驼峰转下划线命名,只对表名生效
|
||||
tableUnderline: true
|
||||
# 大写命名,对表名和字段名均生效
|
||||
capitalMode: false
|
||||
# 全局的entity的逻辑删除字段属性名
|
||||
logicDeleteField: null
|
||||
# 逻辑已删除值
|
||||
logicDeleteValue: 2
|
||||
# 逻辑未删除值
|
||||
logicNotDeleteValue: 0
|
||||
# 字段验证策略之 insert,在 insert 的时候的字段验证策略
|
||||
# IGNORED 忽略判断
|
||||
# NOT_NULL 非NULL判断
|
||||
# NOT_EMPTY 非空判断(只对字符串类型字段,其他类型字段依然为非NULL判断)
|
||||
# DEFAULT 默认的,一般只用于注解里
|
||||
# NEVER 不加入 SQL
|
||||
# IGNORED 忽略 NOT_NULL 非NULL NOT_EMPTY 非空 DEFAULT 默认 NEVER 不加入 SQL
|
||||
insertStrategy: NOT_NULL
|
||||
# 字段验证策略之 update,在 update 的时候的字段验证策略
|
||||
updateStrategy: NOT_NULL
|
||||
@ -262,10 +225,12 @@ swagger:
|
||||
email: crazylionli@163.com
|
||||
url: https://gitee.com/JavaLionLi/RuoYi-Vue-Plus
|
||||
groups:
|
||||
- name: 演示案例
|
||||
- name: 1.演示案例
|
||||
basePackage: com.ruoyi.demo
|
||||
- name: 系统模块
|
||||
basePackage: com.ruoyi.admin
|
||||
- name: 2.系统模块
|
||||
basePackage: com.ruoyi.web
|
||||
- name: 3.代码生成模块
|
||||
basePackage: com.ruoyi.generator
|
||||
|
||||
# 防止XSS攻击
|
||||
xss:
|
||||
|
||||
@ -10,12 +10,9 @@ 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=登录成功
|
||||
@ -23,11 +20,9 @@ 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}]
|
||||
|
||||
@ -1,33 +1,32 @@
|
||||
#错误消息
|
||||
not.null=
|
||||
user.jcaptcha.error=
|
||||
user.jcaptcha.expire=
|
||||
user.not.exists=
|
||||
user.password.not.match=
|
||||
user.password.retry.limit.count=
|
||||
user.password.retry.limit.exceed=
|
||||
user.password.delete=
|
||||
user.blocked=
|
||||
role.blocked=
|
||||
user.logout.success=
|
||||
length.not.valid=
|
||||
user.username.not.valid=
|
||||
user.password.not.valid=
|
||||
user.email.not.valid=
|
||||
user.mobile.phone.number.not.valid=
|
||||
user.login.success=
|
||||
user.register.success=register success
|
||||
user.notfound=
|
||||
user.unknown.error=
|
||||
|
||||
not.null=* Required fill in
|
||||
user.jcaptcha.error=Captcha error
|
||||
user.jcaptcha.expire=Captcha invalid
|
||||
user.not.exists=User does not exist/Password error
|
||||
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 10 minutes
|
||||
user.password.delete=Sorry, your account has been deleted
|
||||
user.blocked=User 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.valid=* 2 to 20 chinese characters, letters, numbers or underscores, and must start with a non number
|
||||
user.password.not.valid=* 5-50 characters
|
||||
user.email.not.valid=Mailbox format error
|
||||
user.mobile.phone.number.not.valid=Phone number format error
|
||||
user.login.success=Login successful
|
||||
user.register.success=Register successful
|
||||
user.notfound=Please login again
|
||||
user.forcelogout=The administrator is forced to exit，please login again
|
||||
user.unknown.error=Unknown error, please login again
|
||||
##文件上传消息
|
||||
upload.exceed.maxSize=
|
||||
upload.filename.exceed.length=
|
||||
|
||||
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=
|
||||
no.create.permission=
|
||||
no.update.permission=
|
||||
no.delete.permission=
|
||||
no.export.permission=
|
||||
no.view.permission=
|
||||
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}]
|
||||
|
||||
@ -10,12 +10,9 @@ 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=登录成功
|
||||
@ -23,11 +20,9 @@ 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}]
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
|
||||
<!-- 控制台输出 -->
|
||||
<appender name="console" class="ch.qos.logback.core.ConsoleAppender">
|
||||
<encoder>
|
||||
<encoder class="com.yomahub.tlog.core.enhance.logback.AspectLogbackEncoder">
|
||||
<pattern>${console.log.pattern}</pattern>
|
||||
<charset>utf-8</charset>
|
||||
</encoder>
|
||||
@ -22,7 +22,7 @@
|
||||
<!-- 日志最大 1天 -->
|
||||
<maxHistory>1</maxHistory>
|
||||
</rollingPolicy>
|
||||
<encoder>
|
||||
<encoder class="com.yomahub.tlog.core.enhance.logback.AspectLogbackEncoder">
|
||||
<pattern>${log.pattern}</pattern>
|
||||
<charset>utf-8</charset>
|
||||
</encoder>
|
||||
@ -42,7 +42,7 @@
|
||||
<!-- 日志最大的历史 60天 -->
|
||||
<maxHistory>60</maxHistory>
|
||||
</rollingPolicy>
|
||||
<encoder>
|
||||
<encoder class="com.yomahub.tlog.core.enhance.logback.AspectLogbackEncoder">
|
||||
<pattern>${log.pattern}</pattern>
|
||||
</encoder>
|
||||
<filter class="ch.qos.logback.classic.filter.LevelFilter">
|
||||
@ -64,7 +64,7 @@
|
||||
<!-- 日志最大的历史 60天 -->
|
||||
<maxHistory>60</maxHistory>
|
||||
</rollingPolicy>
|
||||
<encoder>
|
||||
<encoder class="com.yomahub.tlog.core.enhance.logback.AspectLogbackEncoder">
|
||||
<pattern>${log.pattern}</pattern>
|
||||
</encoder>
|
||||
<filter class="ch.qos.logback.classic.filter.LevelFilter">
|
||||
@ -86,7 +86,7 @@
|
||||
<!-- 日志最大的历史 60天 -->
|
||||
<maxHistory>60</maxHistory>
|
||||
</rollingPolicy>
|
||||
<encoder>
|
||||
<encoder class="com.yomahub.tlog.core.enhance.logback.AspectLogbackEncoder">
|
||||
<pattern>${log.pattern}</pattern>
|
||||
</encoder>
|
||||
</appender>
|
||||
|
||||
Reference in New Issue
Block a user