疯狂的狮子li
|
d2b7843d97
|
fix 修复 count 语法异常
|
4 years ago |
|
疯狂的狮子li
|
9351d47948
|
fix 修复 合并错误
|
4 years ago |
|
疯狂的狮子li
|
bf98ee3c93
|
Merge remote-tracking branch 'origin/dev' into satoken
|
4 years ago |
|
疯狂的狮子li
|
dbba894544
|
发布 v3.4.0
|
4 years ago |
|
疯狂的狮子li
|
52673152cc
|
发布 v3.4.0
|
4 years ago |
|
疯狂的狮子li
|
42295ef2ac
|
Merge remote-tracking branch 'origin/dev' into satoken
# Conflicts:
# pom.xml
# 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/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/core/domain/model/LoginUser.java
# ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestDemoController.java
# ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestTreeController.java
# ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java
# ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/RepeatSubmitAspect.java
# ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
# ruoyi-framework/src/main/java/com/ruoyi/framework/config/SwaggerConfig.java
# ruoyi-framework/src/main/java/com/ruoyi/framework/web/exception/GlobalExceptionHandler.java
# ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java
# ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobLogController.java
# ruoyi-system/src/main/java/com/ruoyi/system/service/PermissionService.java
# ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserOnlineServiceImpl.java
# ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserDetailsServiceImpl.java
|
4 years ago |
|
疯狂的狮子li
|
a8a4f2101d
|
add 增加 mapper 目录下 package-info 防止建错目录
|
4 years ago |
|
疯狂的狮子Li
|
f46bd8b6ba
|
update 更新 Validation 框架国际化说明
|
4 years ago |
|
疯狂的狮子Li
|
d4e1d4ec38
|
!117 fix: 修复Object剩余存活时间BUG
Merge pull request !117 from dawn9117/N/A
|
4 years ago |
dawn9117
|
f517dc05ef
|
fix: 修复Object剩余存活时间BUG
|
4 years ago |
|
疯狂的狮子Li
|
a627de02c7
|
Merge remote-tracking branch 'origin/dev' into dev
|
4 years ago |
|
疯狂的狮子Li
|
a94a0589dd
|
update [重磅更新] Validator 校验框架支持国际化
|
4 years ago |
|
疯狂的狮子li
|
81755a280d
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
ruoyi-ui/src/utils/index.js
ruoyi-ui/src/views/register.vue
|
4 years ago |
|
疯狂的狮子Li
|
89d776acb5
|
fix 修复 OSS 工厂 未实例化服务更新加载问题
|
4 years ago |
|
疯狂的狮子Li
|
daf660e66d
|
update 更改 excel 方法注释 更清晰明显用法
|
4 years ago |
|
疯狂的狮子Li
|
e4020faff3
|
update 使用导入新写法 重构系统用户导入
|
4 years ago |
|
疯狂的狮子Li
|
e11b727584
|
update 修改移除无用回执信息
|
4 years ago |
|
疯狂的狮子Li
|
0a36a94b73
|
update 报错增加 excel 表头信息
|
4 years ago |
RuoYi
|
89e7cb19b9
|
注册成功提示类型success
|
4 years ago |
|
疯狂的狮子li
|
fa2bdcd5ac
|
update 抽象 Excel 导入支持自定义监听器
|
4 years ago |
|
若依
|
ea71c9b214
|
!376 camelCase中应该转换下划线，而不是横杠
Merge pull request !376 from khejing/master
|
4 years ago |
|
疯狂的狮子li
|
c00e397405
|
update 抽象 Excel 导入支持自定义监听器
|
4 years ago |
|
疯狂的狮子li
|
a2a2640d29
|
update 调整校验异常 返回完整信息
|
4 years ago |
|
疯狂的狮子Li
|
7c4a104823
|
!113 add 新增 excel 导入支持开启 Validator 数据验证
Merge pull request !113 from Yjoioooo/auto-5403234-dev-1637903026810
|
4 years ago |
|
疯狂的狮子li
|
7892ec5a59
|
fix 修复重复提交不生效问题 由于概念不同 使用 RedisUtils 重构
|
4 years ago |
khejing
|
e5fd1f76db
|
camelCase中应该是下划线，而不是横杠
|
4 years ago |
|
疯狂的狮子li
|
554ebebb92
|
fix 修复 获取剩余时间单位错误
|
4 years ago |
|
疯狂的狮子li
|
f604cf4988
|
fix 修复提交错误
|
4 years ago |
|
疯狂的狮子li
|
9de0e9157a
|
fix 接口重复鉴权BUG修复
|
4 years ago |
|
疯狂的狮子Li
|
b1be47f0a0
|
!114 接口重复鉴权BUG修复: ResourceConfig中已经配置鉴权拦截器, 添加sa-token-spring-aop会导致重复鉴权BUG
Merge pull request !114 from dawn9117/N/A
|
4 years ago |
|
疯狂的狮子Li
|
6502f21072
|
update 修改不规范命名
|
4 years ago |
|
dawn9117
|
a9e21702aa
|
接口重复鉴权BUG修复: ResourceConfig中已经配置鉴权拦截器, 添加sa-token-spring-aop会导致重复鉴权BUG
|
4 years ago |
|
疯狂的狮子li
|
48fd65d7f8
|
update satoken 标注为公测
|
4 years ago |
|
疯狂的狮子li
|
c1b0e176e5
|
update 在线用户管理 改为使用 satoken 工具实现 消除差异化
|
4 years ago |
|
疯狂的狮子li
|
e2d370bd9d
|
update 移除 satoken 自带集成 redis 改为使用 框架自身 Redission 实现 统一方案 性能优异
|
4 years ago |
|
疯狂的狮子li
|
2fe8291f1d
|
update 修改 LOGIN_TOKEN_KEY 内容 对应 satoken 的 key
|
4 years ago |
|
疯狂的狮子li
|
1d1732ab4a
|
update 常住token有效期改为一天
|
4 years ago |
|
疯狂的狮子li
|
1010ccca4d
|
update 更新 RedisUtils set保留ttl 兼容 5.X redis版本
|
4 years ago |
zhujie
|
c21ff85b57
|
update 增加excel导入样例
|
4 years ago |
|
zhujie
|
c3bb4d2a61
|
add 新增导入支持开启Validator数据验证，支持开启导入异常行继续读取，支持返回导入回执
|
4 years ago |
|
疯狂的狮子li
|
d2b7f8ef0f
|
remove 删除无用 js 文件
|
4 years ago |
|
疯狂的狮子li
|
af25588b88
|
Merge remote-tracking branch 'ruoyi-vue/master' into dev
# Conflicts:
# pom.xml
# ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java
# ruoyi-framework/src/main/java/com/ruoyi/framework/config/FilterConfig.java
# ruoyi-generator/pom.xml
# ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityInitializer.java
# ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java
# ruoyi-generator/src/main/resources/vm/js/api.js.vm
# ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm
# ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
# ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm
# ruoyi-quartz/src/main/java/com/ruoyi/quartz/config/ScheduleConfig.java
# ruoyi-ui/package.json
# ruoyi-ui/src/api/monitor/server.js
# ruoyi-ui/src/components/RuoYi/Doc/index.vue
# ruoyi-ui/src/components/RuoYi/Git/index.vue
# ruoyi-ui/src/components/SizeSelect/index.vue
# ruoyi-ui/src/layout/components/Sidebar/Logo.vue
# ruoyi-ui/src/layout/components/TagsView/index.vue
# ruoyi-ui/src/layout/index.vue
# ruoyi-ui/src/main.js
# ruoyi-ui/src/plugins/download.js
# ruoyi-ui/src/router/index.js
# ruoyi-ui/src/store/modules/permission.js
# ruoyi-ui/src/store/modules/settings.js
# ruoyi-ui/src/store/modules/tagsView.js
# ruoyi-ui/src/store/modules/user.js
# ruoyi-ui/src/views/login.vue
# ruoyi-ui/src/views/monitor/job/log.vue
# ruoyi-ui/src/views/system/dict/data.vue
# ruoyi-ui/src/views/system/role/index.vue
# ruoyi-ui/src/views/system/user/authRole.vue
# ruoyi-ui/src/views/system/user/index.vue
# ruoyi-ui/src/views/system/user/profile/resetPwd.vue
# ruoyi-ui/src/views/system/user/profile/userAvatar.vue
# ruoyi-ui/src/views/system/user/profile/userInfo.vue
|
4 years ago |
|
疯狂的狮子li
|
7546ef649c
|
update springboot 2.5.6 => 2.5.7
|
4 years ago |
|
疯狂的狮子li
|
2a3bf1d994
|
remove 删除无用 redis 依赖配置
|
4 years ago |
|
疯狂的狮子li
|
450657f871
|
update 迁移 satoken 路由拦截到单独配置类
|
4 years ago |
Ricky
|
664192da0b
|
升级velocity到最新版本2.3（语法升级）
|
4 years ago |
|
Ricky
|
9fc3e220a7
|
防止修改用户个人信息接口修改用户名
|
4 years ago |
|
Ricky
|
64f6a69d9a
|
修复代码生成复选框字典遗漏问题
|
4 years ago |
|
RuoYi
|
16734b1d88
|
升级velocity到最新版本2.3
|
4 years ago |
|
RuoYi
|
31106c91fb
|
修复使用 this.$options.data 报错问题
|
4 years ago |
