疯狂的狮子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
|
5 years ago |
RuoYi
|
7b894da43c
|
参数管理支持配置验证码开关
|
5 years ago |
|
疯狂的狮子li
|
8ddd71a818
|
update 使用hutool重构 判断是否url
|
5 years ago |
|
疯狂的狮子li
|
cd34c87afa
|
fix 修复升级合并错误
|
5 years ago |
|
疯狂的狮子li
|
599016a63a
|
update 同步ruoyi修正差异
|
5 years ago |
|
疯狂的狮子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
|
5 years ago |
|
RuoYi
|
5879c2484a
|
菜单路由配置支持内链访问
|
5 years ago |
|
RuoYi
|
c02dad2ca3
|
默认访问首页新增提示语
|
5 years ago |
|
疯狂的狮子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
|
5 years ago |
|
RuoYi
|
da1095e298
|
授权用户添加访问权限
|
5 years ago |
|
疯狂的狮子li
|
59114a14ff
|
update 同步 ruoyi 对新业务进行修正
|
5 years ago |
|
疯狂的狮子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
|
5 years ago |
|
RuoYi
|
90c41d498c
|
角色管理新增分配用户功能
|
5 years ago |
|
RuoYi
|
9c7901f526
|
用户管理新增分配角色功能
|
5 years ago |
|
疯狂的狮子li
|
66f453452e
|
fix 相对路径下载问题
|
5 years ago |
dingzhongyuan
|
cf16e31632
|
多数据源替换成dynamic-datasource
|
5 years ago |
|
疯狂的狮子li
|
a1717eac6d
|
update 升级 hutool 5.7.1 适配工具类
|
5 years ago |
|
疯狂的狮子li
|
b3541e9758
|
update 优化 使用 hutool 替换 ruoyi 自带工具类 解决部分方法过期与高版本JDK不兼容问题
|
5 years ago |
|
RuoYi
|
2ace3257f9
|
升级swagger到最新版本v3.0.0
|
5 years ago |
|
RuoYi
|
c16ee7fc2c
|
升级swagger到最新版本v3.0.0
|
5 years ago |
|
疯狂的狮子li
|
dcf125a08a
|
update 优化 redis锁pr 代码
|
5 years ago |
sxq
|
ad6386a618
|
redis分布式锁（基于注解形势）。
|
5 years ago |
|
RuoYi
|
edd2981076
|
调整用户测试接口swagger注解
|
5 years ago |
|
疯狂的狮子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
|
5 years ago |
|
RuoYi
|
af9cfb40a4
|
优化参数&字典缓存操作
|
5 years ago |
朱杰
|
5dc873209e
|
add 增加验证码开关
|
5 years ago |
|
疯狂的狮子li
|
7076deb2b6
|
update 请求响应对象 与 分页对象 结构修改 适配接口文档配置
|
5 years ago |
|
疯狂的狮子li
|
db18050b86
|
update 验证码生成更新为无符号整数计算
|
5 years ago |
|
疯狂的狮子li
|
2ebcffb22e
|
update 配置统一提取为 properties 配置类
|
5 years ago |
|
疯狂的狮子li
|
ee064fa84c
|
update swagger升级3.0.2
|
5 years ago |
|
疯狂的狮子li
|
b5064021e6
|
remove 移除ruoyi自带服务监控(Admin已全部包含)
|
5 years ago |
|
疯狂的狮子li
|
f01bb5966a
|
update 使用 MP 分页工具 重构业务
|
5 years ago |
|
疯狂的狮子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
|
5 years ago |
|
RuoYi
|
32f333a00e
|
删除操作日志记录日志
|
5 years ago |
|
疯狂的狮子li
|
dafdb43c84
|
update 配置转移到 yml 文件 统一管理
|
5 years ago |
|
疯狂的狮子li
|
961c60dd1a
|
update 更新banner
|
5 years ago |
|
疯狂的狮子li
|
f8633f8c4e
|
fix Feign 熔断不生效 bug
|
5 years ago |
|
疯狂的狮子li
|
5d1e977442
|
个人信息添加手机&邮箱重复验证
|
5 years ago |
|
疯狂的狮子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
|
5 years ago |
|
RuoYi
|
67371a9028
|
个人信息添加手机&邮箱重复验证
|
5 years ago |
wugh
|
1270b056d5
|
[bug修复] 解决调整验证码干扰的类型无效,只用circle的bug
[优化] 调整使用那种验证码的逻辑判断,使用switch优化,并减少重复代码
|
5 years ago |
|
疯狂的狮子li
|
31ddb2aee3
|
update swagger 升级为 knife4j
|
5 years ago |
|
疯狂的狮子li
|
63a582404b
|
update swagger 模板修改为 swagger-bootstrap-ui
|
5 years ago |
|
疯狂的狮子li
|
9b4b9e0c74
|
update 删除通用工具 改为使用hutool
|
5 years ago |
|
疯狂的狮子li
|
2509815a4f
|
fix 验证码点击不刷新 bug
|
5 years ago |
|
疯狂的狮子li
|
57cfad671f
|
update 使用hutool重写验证码生成
|
5 years ago |
|
疯狂的狮子li
|
118c02144f
|
集成 Feign 接口化管理 Http请求(如短信,支付,推送等)
|
5 years ago |
|
疯狂的狮子li
|
f56f57a236
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMenuMapper.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/SysRoleMenuMapper.xml
ruoyi-ui/package.json
ruoyi-ui/src/assets/styles/ruoyi.scss
ruoyi-ui/src/assets/styles/sidebar.scss
ruoyi-ui/src/assets/styles/variables.scss
ruoyi-ui/src/components/HeaderSearch/index.vue
ruoyi-ui/src/components/Screenfull/index.vue
ruoyi-ui/src/layout/components/Settings/index.vue
ruoyi-ui/src/layout/components/Sidebar/Logo.vue
ruoyi-ui/src/layout/components/Sidebar/SidebarItem.vue
ruoyi-ui/src/layout/components/Sidebar/index.vue
ruoyi-ui/src/layout/components/TagsView/ScrollPane.vue
ruoyi-ui/src/layout/index.vue
ruoyi-ui/src/main.js
ruoyi-ui/src/settings.js
ruoyi-ui/src/store/modules/settings.js
ruoyi-ui/src/store/modules/user.js
ruoyi-ui/src/views/login.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/userInfo.vue
ruoyi-ui/src/views/tool/gen/editTable.vue
ruoyi-ui/src/views/tool/gen/index.vue
ruoyi-ui/vue.config.js
|
5 years ago |
|
RuoYi
|
9e387dc447
|
去除用户手机邮箱部门必填验证
|
5 years ago |
|
RuoYi
|
474cca921e
|
回显数据字典防止空值报错
|
5 years ago |
