疯狂的狮子li
|
efa2f23510
|
🐬发布 4.3.1 修复了一些问题建议升级
|
3 years ago |
|
疯狂的狮子Li
|
95010d4a4c
|
Merge remote-tracking branch 'ruoyi-vue/master' into dev
# Conflicts:
# README.md
# pom.xml
# ruoyi-admin/pom.xml
# ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
# ruoyi-admin/src/main/resources/application.yml
# ruoyi-common/pom.xml
# ruoyi-common/src/main/java/com/ruoyi/common/core/domain/R.java
# ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
# ruoyi-framework/pom.xml
# ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/RateLimiterAspect.java
# ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysRegisterService.java
# ruoyi-generator/pom.xml
# ruoyi-job/pom.xml
# ruoyi-system/pom.xml
# ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java
# ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java
# ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
# ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
# ruoyi-ui/package.json
# ruoyi-ui/src/views/index.vue
|
3 years ago |
RuoYi
|
a32a931d24
|
升级core-js到最新版本3.25.3
|
3 years ago |
|
RuoYi
|
e95a1245c5
|
若依 3.8.4
|
3 years ago |
|
RuoYi
|
d7441edae7
|
升级core-js到最新版本3.25.2
|
3 years ago |
|
RuoYi
|
c3faa1a925
|
升级element-ui到最新版本2.15.10
|
3 years ago |
|
疯狂的狮子li
|
adfae03953
|
🐣发布 4.3.0 正式版
|
3 years ago |
|
疯狂的狮子li
|
d1681dc18c
|
👀 发布 4.3.0-beta2 公测版
|
3 years ago |
|
疯狂的狮子li
|
e57682aa53
|
👀 发布 4.3.0-beta1 公测版
|
3 years ago |
|
疯狂的狮子li
|
4a796d0e81
|
update 优化 前后端多环境部署保持一致 删除无用环境文件
|
3 years ago |
|
疯狂的狮子li
|
7545323eba
|
😘 发布 4.2.0
|
4 years ago |
|
RuoYi
|
6f48fc3c58
|
若依 3.8.3
|
4 years ago |
|
疯狂的狮子li
|
426aeb0a7f
|
发布 4.2.0-beta1 公测版
|
4 years ago |
|
疯狂的狮子li
|
aac6e0521a
|
发布 4.1.0
|
4 years ago |
|
疯狂的狮子li
|
7e25a80c5b
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excel.java
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java
ruoyi-common/src/main/java/com/ruoyi/common/core/page/TableSupport.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/PageUtils.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-quartz/src/main/java/com/ruoyi/quartz/util/ScheduleUtils.java
ruoyi-ui/package.json
|
4 years ago |
|
RuoYi
|
68a616d7c7
|
升级element-ui到最新版本2.15.8
|
4 years ago |
|
疯狂的狮子Li
|
d637f03067
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
README.md
pom.xml
ruoyi-admin/pom.xml
ruoyi-admin/src/main/resources/application.yml
ruoyi-common/pom.xml
ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java
ruoyi-common/src/main/java/com/ruoyi/common/core/redis/RedisCache.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/PageUtils.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/ip/IpUtils.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
ruoyi-framework/pom.xml
ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java
ruoyi-generator/pom.xml
ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java
ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm
ruoyi-job/pom.xml
ruoyi-system/pom.xml
ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
ruoyi-ui/README.md
ruoyi-ui/bin/package.bat
ruoyi-ui/package.json
ruoyi-ui/src/views/index.vue
|
4 years ago |
|
RuoYi
|
bac3b3a0dc
|
降级jsencrypt版本兼容IE浏览器
|
4 years ago |
|
RuoYi
|
a854e0ca8e
|
若依 3.8.2
|
4 years ago |
|
疯狂的狮子li
|
42df37bb21
|
发布 4.0.1 大升级 4.X 之后第一个修复版本
|
4 years ago |
|
疯狂的狮子li
|
7f305962f2
|
发布 4.0.0
|
4 years ago |
|
RuoYi
|
6353f4ff09
|
若依 3.8.1
|
4 years ago |
|
疯狂的狮子li
|
ed659da488
|
发布 v3.5.0-release 正式版
|
4 years ago |
|
RuoYi
|
b2189ae965
|
集成compression-webpack-plugin插件实现打包Gzip压缩
|
4 years ago |
|
疯狂的狮子li
|
a3504dac6e
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
pom.xml
ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/PageUtils.java
ruoyi-ui/package.json
ruoyi-ui/src/main.js
ruoyi-ui/src/router/index.js
ruoyi-ui/src/store/modules/permission.js
ruoyi-ui/vue.config.js
|
4 years ago |
|
RuoYi
|
a028b566ed
|
集成compression-webpack-plugin插件实现打包Gzip压缩
|
4 years ago |
|
RuoYi
|
6e14601c7c
|
修复版本差异导致的懒加载报错问题
|
4 years ago |
|
疯狂的狮子li
|
29c46a15f9
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
README.md
pom.xml
ruoyi-admin/pom.xml
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java
ruoyi-admin/src/main/resources/application.yml
ruoyi-common/pom.xml
ruoyi-framework/pom.xml
ruoyi-generator/pom.xml
ruoyi-job/pom.xml
ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/JobInvokeUtil.java
ruoyi-system/pom.xml
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysPostMapper.java
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysMenuService.java
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPostService.java
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.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/SysMenuMapper.xml
ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml
ruoyi-ui/package.json
ruoyi-ui/src/directive/index.js
ruoyi-ui/src/plugins/download.js
ruoyi-ui/src/views/index.vue
ruoyi-ui/src/views/monitor/online/index.vue
ruoyi-ui/src/views/system/user/authRole.vue
ruoyi-ui/src/views/system/user/index.vue
ruoyi-ui/src/views/tool/gen/basicInfoForm.vue
ruoyi-ui/src/views/tool/gen/genInfoForm.vue
|
4 years ago |
|
RuoYi
|
4644176e26
|
升级clipboard到最新版本2.0.8
|
4 years ago |
|
RuoYi
|
6bfae2652f
|
若依 3.8.0
|
4 years ago |
|
疯狂的狮子li
|
f43a5cb244
|
update 更改前端工程文件版本号
|
4 years ago |
|
疯狂的狮子li
|
af25588b88
|
Merge remote-tracking branch 'ruoyi-vue/master' into dev
# Conflicts:
# pom.xml
# ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java
# ruoyi-framework/src/main/java/com/ruoyi/framework/config/FilterConfig.java
# ruoyi-generator/pom.xml
# ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityInitializer.java
# ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java
# ruoyi-generator/src/main/resources/vm/js/api.js.vm
# ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm
# ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
# ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm
# ruoyi-quartz/src/main/java/com/ruoyi/quartz/config/ScheduleConfig.java
# ruoyi-ui/package.json
# ruoyi-ui/src/api/monitor/server.js
# ruoyi-ui/src/components/RuoYi/Doc/index.vue
# ruoyi-ui/src/components/RuoYi/Git/index.vue
# ruoyi-ui/src/components/SizeSelect/index.vue
# ruoyi-ui/src/layout/components/Sidebar/Logo.vue
# ruoyi-ui/src/layout/components/TagsView/index.vue
# ruoyi-ui/src/layout/index.vue
# ruoyi-ui/src/main.js
# ruoyi-ui/src/plugins/download.js
# ruoyi-ui/src/router/index.js
# ruoyi-ui/src/store/modules/permission.js
# ruoyi-ui/src/store/modules/settings.js
# ruoyi-ui/src/store/modules/tagsView.js
# ruoyi-ui/src/store/modules/user.js
# ruoyi-ui/src/views/login.vue
# ruoyi-ui/src/views/monitor/job/log.vue
# ruoyi-ui/src/views/system/dict/data.vue
# ruoyi-ui/src/views/system/role/index.vue
# ruoyi-ui/src/views/system/user/authRole.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/userAvatar.vue
# ruoyi-ui/src/views/system/user/profile/userInfo.vue
|
4 years ago |
|
RuoYi
|
026a427103
|
优化前端代码
|
4 years ago |
|
RuoYi
|
4f194aa101
|
升级js-cookie到最新版本3.0.1
|
4 years ago |
|
疯狂的狮子li
|
ce279ca360
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm
ruoyi-ui/package.json
ruoyi-ui/src/utils/request.js
|
4 years ago |
|
RuoYi
|
fcf606acde
|
升级jsencrypt到最新版本3.2.1
|
4 years ago |
|
疯狂的狮子li
|
64add90edd
|
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-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/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-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/config/RuoYiConfig.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
ruoyi-generator/src/main/resources/vm/java/controller.java.vm
ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java
ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobLogController.java
ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/JobInvokeUtil.java
ruoyi-ui/package.json
ruoyi-ui/src/api/monitor/logininfor.js
ruoyi-ui/src/api/monitor/operlog.js
ruoyi-ui/src/api/system/config.js
ruoyi-ui/src/api/system/dict/data.js
ruoyi-ui/src/api/system/dict/type.js
ruoyi-ui/src/api/system/post.js
ruoyi-ui/src/api/system/role.js
ruoyi-ui/src/api/system/user.js
ruoyi-ui/src/main.js
ruoyi-ui/src/utils/request.js
ruoyi-ui/src/views/monitor/job/index.vue
ruoyi-ui/src/views/monitor/job/log.vue
ruoyi-ui/src/views/monitor/logininfor/index.vue
ruoyi-ui/src/views/monitor/operlog/index.vue
ruoyi-ui/src/views/system/config/index.vue
ruoyi-ui/src/views/system/dict/data.vue
ruoyi-ui/src/views/system/dict/index.vue
ruoyi-ui/src/views/system/post/index.vue
ruoyi-ui/src/views/system/role/index.vue
ruoyi-ui/src/views/system/user/index.vue
|
4 years ago |
|
RuoYi
|
cb9c0e79eb
|
升级core-js到最新版本3.19.1
|
4 years ago |
|
RuoYi
|
4e817a1109
|
升级axios到最新版本0.24.0
|
4 years ago |
|
疯狂的狮子li
|
d6e080d546
|
发布 v3.3.0
|
4 years ago |
|
疯狂的狮子li
|
741a5b275b
|
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/SysRegisterController.java
ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/TestController.java
ruoyi-admin/src/main/resources/mybatis/mybatis-config.xml
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
ruoyi-framework/src/main/java/com/ruoyi/framework/config/ResourcesConfig.java
ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/RepeatSubmitInterceptor.java
ruoyi-system/src/main/java/com/ruoyi/system/service/SysRegisterService.java
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
ruoyi-ui/package.json
ruoyi-ui/src/views/monitor/server/index.vue
|
4 years ago |
|
RuoYi
|
f1fed76273
|
升级element-ui到最新版本2.15.6
|
4 years ago |
|
疯狂的狮子li
|
3f142dd0fa
|
发布 v3.2.0
|
4 years ago |
|
疯狂的狮子li
|
ca5823fcdf
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
ruoyi-ui/package.json
|
4 years ago |
|
RuoYi
|
25f50d74c5
|
升级sass-loader到最新版本10.1.1
|
4 years ago |
|
RuoYi
|
266f4d6806
|
升级dart-sass到版本1.32.13
|
4 years ago |
|
疯狂的狮子li
|
5a8d3ddef0
|
update 回退 dart-sass 新版报大量警告
|
4 years ago |
|
疯狂的狮子li
|
75b22e9a23
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUtils.java
ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
ruoyi-ui/package.json
ruoyi-ui/src/main.js
ruoyi-ui/src/views/monitor/job/index.vue
ruoyi-ui/src/views/monitor/job/log.vue
ruoyi-ui/src/views/monitor/logininfor/index.vue
ruoyi-ui/src/views/monitor/operlog/index.vue
ruoyi-ui/src/views/system/config/index.vue
ruoyi-ui/src/views/system/dict/data.vue
ruoyi-ui/src/views/system/dict/index.vue
ruoyi-ui/src/views/system/post/index.vue
ruoyi-ui/src/views/system/role/index.vue
ruoyi-ui/src/views/system/user/index.vue
ruoyi-ui/src/views/tool/build/index.vue
ruoyi-ui/src/views/tool/gen/index.vue
|
4 years ago |
|
RuoYi
|
02b95f95a8
|
升级file-saver到最新版本2.0.5
|
4 years ago |
|
RuoYi
|
2a6d2d733e
|
升级dart-sass到最新版本1.42.1
|
4 years ago |
