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

79 Commits

Author SHA1 Message Date
疯狂的狮子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
疯狂的狮子li
ea506de048 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev 
 Conflicts:
	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java
	ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm
	ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
	ruoyi-ui/src/directive/index.js
	ruoyi-ui/src/directive/permission/hasPermi.js
	ruoyi-ui/src/directive/permission/hasRole.js
	ruoyi-ui/src/main.js
	ruoyi-ui/src/views/system/notice/index.vue
 2021-07-09 18:07:32 +08:00
RuoYi
da1095e298 授权用户添加访问权限 2021-07-09 17:08:30 +08:00
疯狂的狮子li
59114a14ff update 同步 ruoyi 对新业务进行修正 2021-07-06 13:05:47 +08:00
疯狂的狮子li
aa14085746 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev 
 Conflicts:
	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/entity/SysUser.java
	ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.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/SysRoleServiceImpl.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
	ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
	ruoyi-ui/src/api/system/role.js
	ruoyi-ui/src/api/system/user.js
	ruoyi-ui/src/assets/styles/ruoyi.scss
	ruoyi-ui/src/router/index.js
	ruoyi-ui/src/views/system/role/index.vue
	ruoyi-ui/src/views/system/user/index.vue
 2021-07-06 12:01:05 +08:00
RuoYi
90c41d498c 角色管理新增分配用户功能 2021-07-05 14:54:09 +08:00
RuoYi
9c7901f526 用户管理新增分配角色功能 2021-07-01 18:01:36 +08:00
疯狂的狮子li
66f453452e fix 相对路径下载问题 2021-06-24 15:41:16 +08:00
dingzhongyuan
cf16e31632 多数据源替换成dynamic-datasource 2021-06-22 11:31:04 +08:00
疯狂的狮子li
a1717eac6d update 升级 hutool 5.7.1 适配工具类 2021-06-16 15:39:19 +08:00
疯狂的狮子li
b3541e9758 update 优化 使用 hutool 替换 ruoyi 自带工具类 解决部分方法过期与高版本JDK不兼容问题 2021-06-12 20:13:35 +08:00
RuoYi
2ace3257f9 升级swagger到最新版本v3.0.0 2021-06-09 20:07:36 +08:00
RuoYi
c16ee7fc2c 升级swagger到最新版本v3.0.0 2021-06-08 16:34:36 +08:00
疯狂的狮子li
dcf125a08a update 优化 redis锁pr 代码 2021-06-04 16:09:43 +08:00
sxq
ad6386a618 redis分布式锁（基于注解形势）。 2021-06-04 15:00:56 +08:00
RuoYi
edd2981076 调整用户测试接口swagger注解 2021-06-02 11:45:30 +08:00
疯狂的狮子li
d0b2166525 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev 
 Conflicts:
	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.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-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictDataService.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictTypeService.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java
	ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
	ruoyi-ui/src/api/system/config.js
	ruoyi-ui/src/api/system/dict/type.js
	ruoyi-ui/src/views/system/config/index.vue
	ruoyi-ui/src/views/system/dict/index.vue
 2021-05-28 10:07:15 +08:00
RuoYi
af9cfb40a4 优化参数&字典缓存操作 2021-05-27 17:38:44 +08:00
朱杰
5dc873209e add 增加验证码开关 2021-05-25 14:02:34 +08:00
疯狂的狮子li
7076deb2b6 update 请求响应对象 与 分页对象 结构修改 适配接口文档配置 2021-05-20 13:23:12 +08:00
疯狂的狮子li
db18050b86 update 验证码生成更新为无符号整数计算 2021-05-19 22:57:34 +08:00
疯狂的狮子li
2ebcffb22e update 配置统一提取为 properties 配置类 2021-05-17 13:39:59 +08:00
疯狂的狮子li
ee064fa84c update swagger升级3.0.2 2021-05-15 14:25:48 +08:00
疯狂的狮子li
b5064021e6 remove 移除ruoyi自带服务监控(Admin已全部包含) 2021-05-15 14:23:43 +08:00
疯狂的狮子li
f01bb5966a update 使用 MP 分页工具 重构业务 2021-05-13 21:25:51 +08:00
疯狂的狮子li
c33c3de43a 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/monitor/SysOperlogController.java
	ruoyi-common/src/main/java/com/ruoyi/common/exception/file/InvalidExtensionException.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/Arith.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/file/MimeTypeUtils.java
	ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java
	ruoyi-ui/src/assets/styles/element-ui.scss
	ruoyi-ui/src/views/index.vue
 2021-05-11 17:14:53 +08:00
RuoYi
32f333a00e 删除操作日志记录日志 2021-05-11 14:25:39 +08:00
疯狂的狮子li
dafdb43c84 update 配置转移到 yml 文件 统一管理 2021-05-11 10:02:32 +08:00
疯狂的狮子li
961c60dd1a update 更新banner 2021-05-10 23:53:15 +08:00
疯狂的狮子li
f8633f8c4e fix Feign 熔断不生效 bug 2021-04-19 17:38:47 +08:00
疯狂的狮子li
5d1e977442 个人信息添加手机&邮箱重复验证 2021-03-22 09:30:12 +08:00
疯狂的狮子li
8434511e39 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue 
 Conflicts:
	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java
 2021-03-22 09:29:25 +08:00
RuoYi
67371a9028 个人信息添加手机&邮箱重复验证 2021-03-21 08:53:11 +08:00
wugh
1270b056d5 [bug修复] 解决调整验证码干扰的类型无效,只用circle的bug 
[优化] 调整使用那种验证码的逻辑判断,使用switch优化,并减少重复代码
 2021-03-19 19:28:43 +08:00