疯狂的狮子li
|
76a2e7f8e5
|
Merge remote-tracking branch 'origin/dev' into satoken
# Conflicts:
# ruoyi-system/src/main/java/com/ruoyi/system/service/PermissionService.java
# ruoyi-system/src/main/java/com/ruoyi/system/service/SysLoginService.java
# ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TokenServiceImpl.java
# ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserDetailsServiceImpl.java
|
4 years ago |
|
疯狂的狮子li
|
3f142dd0fa
|
发布 v3.2.0
|
4 years ago |
|
疯狂的狮子li
|
553c29ab8a
|
update 整合 satoken 权限、鉴权一体化框架
|
4 years ago |
|
疯狂的狮子li
|
f85bad3388
|
update 调整依赖结构 解决依赖冲突
|
4 years ago |
RuoYi
|
db193a46e8
|
若依 3.7.0
|
4 years ago |
|
疯狂的狮子li
|
ddf8d6ad6b
|
发布 v3.1.0
|
4 years ago |
|
疯狂的狮子li
|
a937e3f268
|
发布 v3.0.0
|
4 years ago |
|
疯狂的狮子li
|
8c912a8133
|
add 集成 性能分析插件 p6spy 更强劲的 SQL 分析
|
4 years ago |
|
疯狂的狮子li
|
70b77d9801
|
add 增加 easyexcel 依赖
|
4 years ago |
|
疯狂的狮子li
|
973471c63b
|
发布 v2.6.0
|
4 years ago |
|
疯狂的狮子li
|
eea8f33cf9
|
发布 v2.5.2 bug修复版
(cherry picked from commit b12bdd1f15)
|
4 years ago |
|
疯狂的狮子li
|
55546dfc80
|
发布 v2.5.1 针对 v2.5.0 版本新特性bug修复
|
5 years ago |
|
疯狂的狮子li
|
e085ec9418
|
发布 v2.5.0
|
5 years ago |
|
RuoYi
|
170cfb356c
|
若依 3.6.0
|
5 years ago |
|
疯狂的狮子li
|
1c11d7ccc1
|
update 转移 springboot-admin 到扩展模块项目
|
5 years ago |
|
疯狂的狮子li
|
5647cf7a7e
|
update 规范maven写法
|
5 years ago |
sxq
|
645c926bbd
|
集成lock4j框架，删除redisson锁，使用lock4j的锁。
|
5 years ago |
|
疯狂的狮子li
|
c950daf301
|
update 优化 多数据源集成 相关pr
|
5 years ago |
|
疯狂的狮子li
|
0140965a30
|
update 优化 jdk11 相关 pr
|
5 years ago |
|
疯狂的狮子li
|
d10099d9e9
|
update 适配 jdk11
|
5 years ago |
朱杰
|
ac3f9e5f33
|
【update】JDK11支持
|
5 years ago |
|
疯狂的狮子li
|
d98faaffee
|
update 移除 fastjson 增加 jackson 工具类 重写相关业务
|
5 years ago |
|
疯狂的狮子li
|
524683eabd
|
update swagger 升级为 3.0.0 使用 OAS_30 协议
|
5 years ago |
|
疯狂的狮子li
|
99c4692a0d
|
update 升级 luttuce 为 redisson 性能更强 工具更全
|
5 years ago |
|
疯狂的狮子li
|
6c195af2a3
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
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/filter/XssHttpServletRequestWrapper.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/ExceptionUtil.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/uuid/IdUtils.java
ruoyi-framework/pom.xml
ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java
ruoyi-framework/src/main/java/com/ruoyi/framework/config/RedisConfig.java
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java
ruoyi-generator/pom.xml
ruoyi-generator/src/main/resources/vm/java/mapper.java.vm
ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
ruoyi-quartz/pom.xml
ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJob.java
ruoyi-system/pom.xml
ruoyi-ui/package.json
ruoyi-ui/public/index.html
ruoyi-ui/src/views/index.vue
ruoyi-ui/src/views/monitor/job/index.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/notice/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
|
5 years ago |
|
RuoYi
|
5e64a93d11
|
若依 3.5.0
|
5 years ago |
|
疯狂的狮子li
|
2ebcffb22e
|
update 配置统一提取为 properties 配置类
|
5 years ago |
|
疯狂的狮子li
|
5bc6057050
|
fix maven install 异常
|
5 years ago |
|
疯狂的狮子li
|
ee064fa84c
|
update swagger升级3.0.2
|
5 years ago |
|
疯狂的狮子li
|
20e82d708b
|
remove 移除 pagehelper 分页工具
|
5 years ago |
|
疯狂的狮子li
|
98624e66e5
|
正式发布 1.0.0
|
5 years ago |
|
疯狂的狮子li
|
5fcef39a2e
|
add 集成 spring-boot-admin 全方位监控
|
5 years ago |
|
疯狂的狮子li
|
63a582404b
|
update swagger 模板修改为 swagger-bootstrap-ui
|
5 years ago |
|
疯狂的狮子li
|
04e1dc351e
|
update 移除无用依赖
|
5 years ago |
|
疯狂的狮子li
|
ac99fddfe6
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-admin/src/main/resources/application.yml
ruoyi-ui/package.json
ruoyi-ui/src/views/index.vue
|
5 years ago |
|
RuoYi
|
0b5c7f4c96
|
若依 3.4.0
|
5 years ago |
|
疯狂的狮子li
|
118c02144f
|
集成 Feign 接口化管理 Http请求(如短信,支付,推送等)
|
5 years ago |
|
疯狂的狮子li
|
7e476b941e
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-admin/src/main/resources/application.yml
ruoyi-common/src/main/java/com/ruoyi/common/core/redis/RedisCache.java
ruoyi-ui/package.json
ruoyi-ui/src/main.js
ruoyi-ui/src/views/index.vue
ruoyi-ui/src/views/tool/gen/index.vue
|
5 years ago |
|
RuoYi
|
8988d0b4ab
|
若依 3.3.0
|
5 years ago |
|
疯狂的狮子li
|
ff563c44e2
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java
ruoyi-admin/src/main/resources/application.yml
ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUtils.java
ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java
ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java
ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
ruoyi-ui/package.json
ruoyi-ui/src/views/index.vue
ruoyi-ui/src/views/tool/gen/editTable.vue
|
5 years ago |
|
RuoYi
|
8f145bba3a
|
若依 v3.2.1
|
5 years ago |
|
RuoYi
|
69256940df
|
若依 3.2
|
5 years ago |
|
疯狂的狮子li
|
bd39b971cf
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-admin/src/main/resources/application.yml
ruoyi-ui/package.json
ruoyi-ui/src/utils/ruoyi.js
ruoyi-ui/src/views/monitor/job/index.vue
|
5 years ago |
|
疯狂的狮子li
|
088bc98a43
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
Conflicts:
ruoyi-admin/src/main/resources/application.yml
ruoyi-ui/package.json
|
5 years ago |
|
RuoYi
|
8f9f0c04cc
|
若依 3.1
|
5 years ago |
|
疯狂的狮子li
|
1e79d6f56f
|
同步升级3.0
|
5 years ago |
|
RuoYi
|
cee572f237
|
若依 3.0
|
6 years ago |
