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

112 Commits

Author SHA1 Message Date
疯狂的狮子li
da2cb61cae update 调整 pr !107 代码格式 2021-10-29 17:37:15 +08: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
7e3c9c1094 update 删除无用setUsername 使用自动注入 2021-10-27 13:26:24 +08:00
疯狂的狮子li
b8a8b76c38 fix 修复跨域访问无权限获取请求头 download-filename 导致文件名为空问题 2021-10-22 12:38:33 +08:00
疯狂的狮子li
a6fb88d74c update [重大更新]全业务 增加 接口文档注解 格式化代码 2021-10-15 15:19:42 +08:00
疯狂的狮子Li
49fc74be5d fix 修复更新问题 导出文件名乱码 2021-09-27 21:30:07 +08:00
疯狂的狮子li
50599487f8 update [重大改动] 将 framework 与 system 模块 解耦 2021-09-17 14:48:36 +08:00
疯狂的狮子li
d3d3972bea update OSS模块 关于下载403报错信息优化 2021-09-14 17:52:19 +08:00
疯狂的狮子li
c1c6c1cf30 update 将所有 云存储字样 改为 对象存储 避免误解 2021-09-10 10:51:40 +08:00
疯狂的狮子li
182edef28a update 所有业务适配 RedisUtils 新工具 2021-09-07 13:20:24 +08:00
疯狂的狮子li
8b2f7f0e64 update 优化验证码配置 使用泛型 防止错误输入 2021-09-02 15:19:18 +08:00
疯狂的狮子li
31c2cfa53c Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev 
 Conflicts:
	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.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-quartz/src/main/java/com/ruoyi/quartz/service/impl/SysJobServiceImpl.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.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-system/src/main/resources/mapper/system/SysDeptMapper.xml
	ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml
	ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
 2021-08-26 11:10:42 +08:00
RuoYi
e52092c6d4 修改时检查用户数据权限范围 2021-08-24 16:00:39 +08:00
疯狂的狮子li
3c0f992e76 fix 解决搜索校验不通过问题 2021-08-23 18:20:07 +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
aead560227 update 优化 使用权限工具 获取用户信息 2021-08-19 11:13:59 +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
cb13642e85 update 重写 OSS 模块相关实现 支持动态配置(页面配置) 2021-08-13 21:09:24 +08:00
疯狂的狮子li
652a39b11c update 修正 PR 相关问题 2021-08-13 14:04:57 +08:00
疯狂的狮子li
824635df7f update 修正 PR 相关问题 2021-08-13 12:37:34 +08:00
孤舟烟雨
c9f7314cd0 !77 update 对象存储配置 重构到数据库 动态配置 
* 增加对象存储配置sql
* 修改对象存储配置
* Merge branch 'dev' of https://gitee.com/JavaLionLi/RuoYi-Vue-Plus into dev
* 增加对象存储配置
* 增加对象存储配置
 2021-08-13 02:03:46 +00:00
疯狂的狮子li
c2de299834 update 同步ruoyi 2021-08-09 10:05:27 +08:00
疯狂的狮子li
9bfa420a76 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev 
 Conflicts:
	README.md
	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/SysRoleController.java
	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.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/web/service/UserDetailsServiceImpl.java
	ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java
	ruoyi-ui/package.json
	ruoyi-ui/src/views/system/menu/index.vue
 2021-08-09 09:55:50 +08:00
RuoYi
3243428009 优化用户不能删除自己 2021-08-08 19:12:52 +08:00
RuoYi
7736097f6b 提取通用方法到基类控制器 2021-08-08 19:12:12 +08:00
疯狂的狮子li
79bf332c53 remove 移除通用上传下载接口与配置 2021-08-04 19:11:39 +08:00
疯狂的狮子li
08db4a5f53 update 更改所有业务excel导出 2021-08-04 19:03:25 +08:00
疯狂的狮子li
9cf4794146 update 更新 SysUser 导入导出 2021-08-04 18:29:38 +08:00
疯狂的狮子li
e1fcbc6476 update 移动文件存储 controller 到 admin 模块 2021-08-04 17:27:33 +08:00
疯狂的狮子li
0539c2f927 update 重写系统部分业务导出 2021-08-04 11:46:55 +08:00
疯狂的狮子li
80067d32fc fix 头像上传 未走OSS存储问题 2021-08-04 11:15:16 +08:00
疯狂的狮子li
da4e080656 update 修改 操作日志导出 适配easyexcel工具 2021-08-03 19:29:59 +08:00
疯狂的狮子li
c813046594 update 日常校验 统一重构到 StringUtils 便于维护扩展 2021-08-02 19:28:41 +08:00
疯狂的狮子li
f8ab5663ef update 日常字符串校验 统一重构到 StringUtils 便于维护扩展 2021-08-02 12:15:14 +08:00
疯狂的狮子li
cfdeada3fd Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev 
 Conflicts:
	pom.xml
	ruoyi-admin/src/main/resources/application.yml
	ruoyi-admin/src/main/resources/i18n/messages.properties
	ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java
	ruoyi-common/src/main/java/com/ruoyi/common/constant/UserConstants.java
	ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
	ruoyi-common/src/main/java/com/ruoyi/common/filter/XssFilter.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/StringUtils.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/config/FilterConfig.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/manager/factory/AsyncFactory.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/TokenService.java
	ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java
	ruoyi-generator/src/main/resources/vm/java/controller.java.vm
	ruoyi-generator/src/main/resources/vm/java/mapper.java.vm
	ruoyi-generator/src/main/resources/vm/java/service.java.vm
	ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm
	ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm
	ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
	ruoyi-ui/src/api/login.js
	ruoyi-ui/src/router/index.js
	ruoyi-ui/src/utils/zipdownload.js
	ruoyi-ui/src/views/index.vue
	ruoyi-ui/src/views/login.vue
	ruoyi-ui/src/views/system/user/index.vue
 2021-08-02 11:21:09 +08:00
RuoYi
5397e345ca 新增是否开启用户注册功能 2021-07-30 21:23:35 +08:00
疯狂的狮子li
06944747fd Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev 
 Conflicts:
	pom.xml
	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java
	ruoyi-admin/src/main/resources/application.yml
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
	ruoyi-ui/package.json
	ruoyi-ui/src/router/index.js
	ruoyi-ui/src/views/monitor/job/index.vue
	ruoyi-ui/src/views/system/dict/index.vue
	ruoyi-ui/src/views/system/menu/index.vue
	ruoyi-ui/src/views/system/role/index.vue
	ruoyi-ui/src/views/system/user/index.vue
	ruoyi-ui/src/views/system/user/profile/resetPwd.vue
	ruoyi-ui/src/views/tool/gen/index.vue
 2021-07-27 12:42:41 +08:00
江强
3347ca4d74 fix:Issue #I42GRW 修复任意账户越权漏洞 2021-07-27 09:33:12 +08:00
疯狂的狮子li
79eb42d3fe remove 删除 自带通用上传 接口 使用OSS模块替换 2021-07-26 14:36:59 +08:00
疯狂的狮子li
fd5414f82e Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev 
 Conflicts:
	ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java
	ruoyi-ui/src/components/ImageUpload/index.vue
	ruoyi-ui/src/views/login.vue
	sql/ry_20210713.sql
 2021-07-13 13:34:10 +08:00
RuoYi
7b894da43c 参数管理支持配置验证码开关 2021-07-13 10:30:40 +08:00
疯狂的狮子li
8ddd71a818 update 使用hutool重构 判断是否url 2021-07-12 14:29:49 +08:00
疯狂的狮子li
cd34c87afa fix 修复升级合并错误 2021-07-12 11:00:12 +08:00
疯狂的狮子li
599016a63a update 同步ruoyi修正差异 2021-07-12 09:44:46 +08:00
疯狂的狮子li
8231953e29 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev 
 Conflicts:
	pom.xml
	ruoyi-admin/pom.xml
	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java
	ruoyi-admin/src/main/resources/application.yml
	ruoyi-common/pom.xml
	ruoyi-common/src/main/java/com/ruoyi/common/constant/UserConstants.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/StringUtils.java
	ruoyi-framework/pom.xml
	ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
	ruoyi-generator/pom.xml
	ruoyi-quartz/pom.xml
	ruoyi-system/pom.xml
	ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MetaVo.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
	ruoyi-ui/package.json
	ruoyi-ui/src/components/HeaderSearch/index.vue
	ruoyi-ui/src/layout/components/AppMain.vue
	ruoyi-ui/src/router/index.js
	ruoyi-ui/src/store/modules/permission.js
	ruoyi-ui/src/views/index.vue
 2021-07-12 09:37:23 +08:00
RuoYi
5879c2484a 菜单路由配置支持内链访问 2021-07-11 16:31:10 +08:00
RuoYi
c02dad2ca3 默认访问首页新增提示语 2021-07-11 15:28:11 +08:00