admin/lx-admin-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,436 Commits 3 Branches 0 Tags
Commit Graph

1436 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
疯狂的狮子li
3ade542d81 fix 修复 druid 监控 集群模式下 无法路由到同一台服务器问题 nginx 使用 ip_hash 路由方式 保障同 ip 路由到同服务器 2021-08-22 10:42:58 +08:00
疯狂的狮子li
0e2ff6a6da update 优化copy工具增加空判断 2021-08-22 10:41:26 +08:00
疯狂的狮子li
0c9a778736 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev 
 Conflicts:
	ruoyi-ui/src/directive/index.js
 2021-08-22 10:40:36 +08:00
RuoYi
d1ef19f08a 自定义可拖动弹窗高度指令 2021-08-20 17:57:44 +08:00
RuoYi
e6e10308ff 自定义可拖动弹窗宽度指令 2021-08-20 17:45:25 +08:00
疯狂的狮子li
40347e4cb8 fix 修复 excel 导入与 class 未对应问题 2021-08-20 17:00:57 +08:00
疯狂的狮子li
33c16e562b update springboot 2.5.3 => 2.5.4 
update hutool 5.7.7 => 5.7.9
update feign-okhttp 11.2 => 11.6
 2021-08-20 14:47:49 +08:00
RuoYi
cb5ee9c8a1 补充定时任务表字段注释 2021-08-20 11:04:15 +08:00
疯狂的狮子li
c3b44e835d update 同步 ruoyi 更新代码 2021-08-19 17:37:44 +08:00
疯狂的狮子li
c380b77617 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev 
 Conflicts:
	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.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/Constants.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/PermissionService.java
	ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java
	ruoyi-ui/src/layout/index.vue
 2021-08-19 17:33:46 +08:00
疯狂的狮子Li
7fafd94e39 !80 update 优化oss配置错误时的错误信息 
Merge pull request !80 from 友杰/auto-8071125-dev-1629364607691
 2021-08-19 09:23:46 +00:00
youjie
89a75e7800 update 优化oss配置错误时的错误信息 2021-08-19 17:16:36 +08:00
RuoYi
1e37f0430b 定时任务屏蔽ldap远程调用 2021-08-19 15:26:22 +08:00
若依
295173258c !295 update 优化 使用权限工具 获取用户信息 
Merge pull request !295 from 疯狂的狮子Li/update
 2021-08-19 06:55:13 +00:00
若依
fec90d0487 !294 update ruoyi-ui/src/layout/index.vue. 
Merge pull request !294 from aasdd/N/A
 2021-08-19 06:49:06 +00:00
疯狂的狮子li
aead560227 update 优化 使用权限工具 获取用户信息 2021-08-19 11:13:59 +08:00
疯狂的狮子li
36fae5c926 update 优化 OSS 模块与上传组件 异常处理 2021-08-18 19:14:26 +08:00
疯狂的狮子li
88e3805ff9 fix 修复 OSS配置清空被过滤问题 2021-08-18 18:24:05 +08:00
aasdd
8133c60ab3 update ruoyi-ui/src/layout/index.vue. 
删掉此处代码，使右边栏动画生效。现在是没有动画的
 2021-08-18 09:29:22 +00:00
疯狂的狮子li
e981388aa7 fix 修复 新版本说明 标签错误 2021-08-18 16:53:56 +08:00
疯狂的狮子li
9dd0ed4329 fix 修复 富文本图片路径错误问题 2021-08-18 14:49:31 +08:00
疯狂的狮子li
e3d90b820d Merge remote-tracking branch 'origin/dev' into dev 2021-08-18 14:13:55 +08:00
疯狂的狮子li
8c7507b048 fix 修复 minio 无 perfix 问题 2021-08-18 14:13:46 +08:00
疯狂的狮子Li
b19111b9bf Merge branch 'master' of gitee.com:JavaLionLi/RuoYi-Vue-Plus into dev 2021-08-18 03:11:04 +00:00
疯狂的狮子li
a937e3f268 发布 v3.0.0 2021-08-18 11:09:14 +08:00
疯狂的狮子li
4eb94f4a1e update 更新vip群信息 2021-08-18 10:44:08 +08:00
疯狂的狮子li
8cc673ec95 update 同步 ruoyi 自定义限流 新功能 2021-08-17 14:39:38 +08:00
疯狂的狮子li
c271ffc066 update 同步 ruoyi 自定义限流 新功能 2021-08-17 14:34:29 +08:00
疯狂的狮子li
896939ce4e Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev 
 Conflicts:
	ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excels.java
	ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/config/RedisConfig.java
 2021-08-17 14:23:19 +08:00
RuoYi
5c155f5f11 支持自定义注解实现接口限流 2021-08-17 14:08:18 +08:00
疯狂的狮子li
5bfb2dae13 update 优化OSS异常判断 2021-08-17 11:43:14 +08:00
疯狂的狮子li
52d0d62c35 update 同步 ruoyi 适配改动 2021-08-17 10:45:01 +08:00
疯狂的狮子li
d3abd6c96e Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev 
 Conflicts:
	ruoyi-common/src/main/java/com/ruoyi/common/exception/CustomException.java
	ruoyi-common/src/main/java/com/ruoyi/common/exception/base/BaseException.java
	ruoyi-common/src/main/java/com/ruoyi/common/exception/file/FileException.java
	ruoyi-common/src/main/java/com/ruoyi/common/exception/user/UserException.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/sql/SqlUtil.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/web/exception/GlobalExceptionHandler.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/UserDetailsServiceImpl.java
	ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
	ruoyi-ui/src/components/Breadcrumb/index.vue
 2021-08-17 10:38:07 +08:00
RuoYi
03cf98d3c9 优化异常信息 2021-08-16 16:25:25 +08:00
若依
6f51f729ba !289 添加日期范围支持重复添加多组日期范围，请求参数中对象的属性为null、undefined不进行拼接 
Merge pull request !289 from wangzhaoqiang/master
 2021-08-16 08:23:27 +00:00
疯狂的狮子li
73d2ed4c02 update 更新批量演示demo代码 2021-08-16 16:18:36 +08:00
wangzhaoqiang
57b159eb98 添加日期范围支持重复添加多组日期范围，请求参数中对象的属性为null、undefined不进行拼接 2021-08-16 14:48:34 +08:00
若依
08da6834a5 !288 修正方法名单词拼写错误 
Merge pull request !288 from 稚屿/N/A
 2021-08-16 02:36:36 +00:00
若依
268468fb47 !287 更新到【默认首页使用keep-alive缓存】后报错 
Merge pull request !287 from wangzhaoqiang/master
 2021-08-16 02:36:29 +00:00
稚屿
333e19339c 修正方法名单词拼写错误 2021-08-15 10:26:05 +00:00
疯狂的狮子li
25b47db3cb update 移除Spring注入 改为全局缓存 并使用更新时间确保集群配置最终一致性 2021-08-15 16:59:46 +08:00
wangzhaoqiang
7b6ccd9b22 解决登录后浏览器后台Breadcrumb组件报错 2021-08-14 20:16:48 +08:00
疯狂的狮子li
881edb3e62 update springboot admin 2.4.3 => 2.5.0 (新增 Quartz 专属监控页) 2021-08-14 14:53:25 +08:00
疯狂的狮子li
bb1d8d5796 remove 删除无用常量 2021-08-14 14:30:52 +08:00
疯狂的狮子li
cb13642e85 update 重写 OSS 模块相关实现 支持动态配置(页面配置) 2021-08-13 21:09:24 +08:00
疯狂的狮子li
6473d4d8be Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev 
 Conflicts:
	bin/clean.bat
	bin/run.bat
	ruoyi-common/src/main/java/com/ruoyi/common/config/RuoYiConfig.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUtils.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
	ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
	ruoyi-ui/bin/run-web.bat
	ruoyi-ui/src/components/ImageUpload/index.vue
	ruoyi-ui/src/router/index.js
	ruoyi-ui/src/views/index.vue
 2021-08-13 17:36:26 +08:00
RuoYi
5d6f134609 多图上传组件移除多余的api地址 2021-08-13 15:15:35 +08:00
RuoYi
f02743bde5 代码生成主子表多选行数据 2021-08-13 14:50:35 +08:00
疯狂的狮子li
8c09c30ca0 remove 删除OSS配置页面无用按钮 2021-08-13 14:32:24 +08:00
疯狂的狮子li
86fba4aed4 remove 删除配置文件 OSS存储相关配置 2021-08-13 14:10:16 +08:00