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

1949 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
疯狂的狮子li
1ff306ff40 fix 修复 xxl-job-admin 部署问题 2021-11-01 13:49:54 +08:00
疯狂的狮子li
c4e17ff847 fix 修复 xxl-job-admin 部署问题 2021-11-01 13:49:11 +08:00
RuoYi
3ae5ec92a5 登录/验证码请求headers不设置token 2021-11-01 13:29:27 +08:00
若依
2fe919b6ce !361 优化一些布尔判断语法 
Merge pull request !361 from 清溪先生/master
 2021-11-01 05:28:59 +00:00
疯狂的狮子li
a8ab3ffd01 update 升级 docker 基础镜像 2021-11-01 09:55:14 +08:00
疯狂的狮子Li
f3c9a4a81c fix 修复 SysOss、SysOssConfig 未继承 BaseEntity 基础实体问题 2021-10-31 21:30:36 +08:00
疯狂的狮子Li
cd0aad10b0 fix 修复 SysOss、SysOssConfig 未继承 BaseEntity 基础实体问题 2021-10-31 21:28:19 +08:00
疯狂的狮子li
da2cb61cae update 调整 pr !107 代码格式 2021-10-29 17:37:15 +08:00
疯狂的狮子Li
e4c691fd5f !107 add 新增 Admin 监控 Bean 初始化 startup trace 监控插件 
Merge pull request !107 from shenxinquan/auto-480232-dev-1635497752042
 2021-10-29 09:36:13 +00:00
sxq
ea2e560bd9 去掉jfr相关类。 2021-10-29 17:28:33 +08:00
sxq
25321984fa 新增startup trace监控。 2021-10-29 16:55:42 +08:00
疯狂的狮子li
24ebc73ee5 Merge remote-tracking branch 'origin/dev' into satoken 2021-10-29 09:15:31 +08:00
疯狂的狮子li
d6e080d546 发布 v3.3.0 2021-10-29 09:14:49 +08:00
疯狂的狮子li
f5f16aac96 Merge remote-tracking branch 'origin/dev' into satoken 
# Conflicts:
#	ruoyi-common/pom.xml
 2021-10-28 10:56:21 +08:00
疯狂的狮子li
5c6f30a8a9 update RedisUtils 更新删除 hash 数据方法 2021-10-28 10:43:46 +08:00
疯狂的狮子li
e8e8ae9fd7 update minio 8.3.1 => 8.3.3 2021-10-28 10:43:02 +08:00
疯狂的狮子li
3353ead5d3 update 搜索框 更新文本域生成 用于模糊查询 2021-10-28 09:45:29 +08:00
疯狂的狮子li
160beb8e1c update jdk11 适配依赖 调整到 common 包 2021-10-28 09:44:57 +08:00
疯狂的狮子li
3f0d3ffb8a Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev 
 Conflicts:
	pom.xml
	ruoyi-common/pom.xml
	ruoyi-common/src/main/java/com/ruoyi/common/core/redis/RedisCache.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
 2021-10-28 09:40:02 +08:00
Awen
13c770b6be 优化一些布尔判断语法 2021-10-27 19:03:29 +08:00
RuoYi
2eb55528ec 升级spring-boot到最新版本2.5.6 2021-10-27 16:23:35 +08:00
RuoYi
839f631d6b 添加Jaxb依赖，防止jdk8以上出现的兼容错误 2021-10-27 16:22:57 +08:00
若依
8faae71157 !359 update ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java. 
Merge pull request !359 from Remenber_Ray/N/A
 2021-10-27 07:37:19 +00:00
若依
b87e0fa124 !358 update ruoyi-common/src/main/java/com/ruoyi/common/core/redis/RedisCache.java. 
Merge pull request !358 from 雪丛/N/A
 2021-10-27 07:34:47 +00:00
疯狂的狮子li
d1037c6c9a Merge remote-tracking branch 'origin/dev' into satoken 2021-10-27 13:43:17 +08:00
疯狂的狮子li
bb205a5cdb update 注释掉原定时任务相关sql 下个版本移除 2021-10-27 13:42:51 +08:00
疯狂的狮子li
6e73d8b3ab update 同步 dev 分支 更新最新改动 2021-10-27 13:28:26 +08:00
疯狂的狮子li
82a2dd8732 Merge remote-tracking branch 'origin/dev' into satoken 2021-10-27 13:26:46 +08:00
疯狂的狮子li
7e3c9c1094 update 删除无用setUsername 使用自动注入 2021-10-27 13:26:24 +08:00
疯狂的狮子li
695cb6d76b 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
 2021-10-27 13:16:19 +08:00
疯狂的狮子li
dbb2d8462b update 迁移所有脚本文件至script目录 2021-10-26 19:42:27 +08:00
疯狂的狮子li
3bf96c6cd7 update 删除重复依赖 补全演示demo注解参数 2021-10-26 19:09:50 +08:00
疯狂的狮子li
61375c4bbb Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev 
 Conflicts:
	ruoyi-common/pom.xml
 2021-10-26 18:57:55 +08:00
疯狂的狮子li
2e4689d557 update 更新xxl-job执行器开关功能 2021-10-26 18:30:02 +08:00
Ricky
b6596d021b 替换自定义验证注解 2021-10-26 17:22:20 +08:00
Remenber_Ray
0628dc9b2f update ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java. 2021-10-26 08:02:48 +00:00
疯狂的狮子Li
3117080be3 !105 1:升级springboot版本到2.5.6。 2:升级hutool版本到5.7.15。 
Merge pull request !105 from shenxinquan/auto-480232-dev-1635232384088
 2021-10-26 07:14:18 +00:00
sxq
16d6e11e94 1:升级springboot版本到2.5.6。 
2:升级hutool版本到5.7.15。
 2021-10-26 15:12:58 +08:00
疯狂的狮子li
c9a3164a29 fix swagger 单接口缺少 Authorization 参数 2021-10-26 12:53:21 +08:00
雪丛
790aa0d24b update ruoyi-common/src/main/java/com/ruoyi/common/core/redis/RedisCache.java. 
增加删除Hash中的数据
 2021-10-26 01:42:12 +00:00
疯狂的狮子Li
d254340b9b fix 修正错别字 2021-10-25 18:33:26 +08:00
疯狂的狮子Li
42a3117e2a Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev 
 Conflicts:
	pom.xml
	ruoyi-common/src/main/java/com/ruoyi/common/annotation/RepeatSubmit.java
	ruoyi-common/src/main/java/com/ruoyi/common/core/domain/AjaxResult.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/Threads.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUtils.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/RateLimiterAspect.java
	ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java
	ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml
	ruoyi-ui/src/layout/components/Settings/index.vue
	ruoyi-ui/src/plugins/download.js
	ruoyi-ui/src/store/modules/permission.js
	ruoyi-ui/src/views/index.vue
	ruoyi-ui/src/views/monitor/server/index.vue
	ruoyi-ui/src/views/system/role/index.vue
	ry.bat
 2021-10-25 18:24:55 +08:00
疯狂的狮子Li
e47dcb10de fix 修复原生 任务调度中心 集成之后 字体图标被过滤问题 2021-10-25 18:03:44 +08:00
RuoYi
8a7dcf8a80 修正错别字 2021-10-25 10:26:00 +08:00
若依
0c30ffa11f !354 update ruoyi-common/src/main/java/com/ruoyi/common/utils/Threads.java. 
Merge pull request !354 from Remenber_Ray/N/A
 2021-10-25 01:55:51 +00:00
若依
0904bf6446 !355 fix 跨域访问之后 下载无法获取 download-filename 
Merge pull request !355 from 疯狂的狮子Li/master
 2021-10-25 01:55:23 +00:00
疯狂的狮子Li
2173ed504d update 更新关于全局路径设置与文档链接 2021-10-24 17:23:15 +08:00
疯狂的狮子Li
4583787759 fix 跨域访问之后 下载无法获取 download-filename 2021-10-24 17:13:04 +08:00
Remenber_Ray
17550a5f4b update ruoyi-common/src/main/java/com/ruoyi/common/utils/Threads.java. 
修复描述错误
 2021-10-24 02:34:25 +00:00
RuoYi
a4558c32b2 解析blob响应是否登录失效 2021-10-23 10:23:32 +08:00