疯狂的狮子li
|
568e2a9337
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
pom.xml
ruoyi-framework/src/main/java/com/ruoyi/framework/web/domain/server/Jvm.java
ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java
ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
ruoyi-generator/src/main/resources/vm/vue/v3/index.vue.vm
ruoyi-quartz/src/main/java/com/ruoyi/quartz/config/ScheduleConfig.java
ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
ruoyi-ui/src/components/Pagination/index.vue
ruoyi-ui/src/permission.js
ruoyi-ui/src/utils/request.js
ruoyi-ui/src/views/monitor/job/index.vue
ruoyi-ui/src/views/monitor/server/index.vue
ruoyi-ui/src/views/system/user/index.vue
ruoyi-ui/src/views/system/user/profile/userInfo.vue
|
4 years ago |
RuoYi
|
bb65cd1976
|
代码生成子表支持日期/字典配置
|
4 years ago |
|
疯狂的狮子li
|
7f305962f2
|
发布 4.0.0
|
4 years ago |
|
疯狂的狮子li
|
4ea636366d
|
update 优化代码生成 使用新 JsonUtils.parseMap 方法
|
4 years ago |
|
疯狂的狮子li
|
54f5b59c8c
|
update 优化代码生成 使用新 JsonUtils.parseMap 方法
|
4 years ago |
|
疯狂的狮子li
|
6c01241b96
|
fix 回滚代码生成部分优化 修复优化导致的问题
|
4 years ago |
|
疯狂的狮子li
|
68a23c4918
|
update 优化代码生成
|
4 years ago |
|
疯狂的狮子li
|
ee2f74dc5e
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
.gitignore
ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginBody.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/DictUtils.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/ExceptionUtil.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/ServletUtils.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/file/ImageUtils.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/http/HttpHelper.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/http/HttpUtils.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/ip/AddressUtils.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/sign/Md5Utils.java
ruoyi-common/src/main/java/com/ruoyi/common/utils/sql/SqlUtil.java
ruoyi-common/src/main/java/com/ruoyi/common/xss/XssValidator.java
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysRegisterService.java
ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java
ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java
ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.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/ISysLogininforService.java
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPostService.java
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.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/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.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/SysRoleServiceImpl.java
ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
ruoyi-ui/src/components/FileUpload/index.vue
ruoyi-ui/src/views/tool/build/index.vue
|
4 years ago |
|
RuoYi
|
81630a096f
|
代码生成同步保留必填/类型选项
|
4 years ago |
稚屿
|
c99eb98001
|
代码优化
|
4 years ago |
|
疯狂的狮子li
|
53da7140c2
|
update 调整返回类型为 R
|
4 years ago |
|
疯狂的狮子Li
|
3706d2e1db
|
update 去除链式调用注解 不符合规范导致很多奇葩问题 例如: copy为空问题
|
4 years ago |
|
疯狂的狮子li
|
b87aeb9b95
|
update 移除掉 StringUtils 语义不明确的api方法 使用特定工具替换
|
4 years ago |
|
疯狂的狮子li
|
3600875707
|
update 优化 代码生成 字段更新未同步
|
4 years ago |
|
疯狂的狮子li
|
8052d75957
|
Merge remote-tracking branch 'ruoyi-vue/master' into dev
# Conflicts:
# ruoyi-admin/src/main/resources/application.yml
# ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java
# ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java
# ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java
# ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java
# ruoyi-ui/src/views/login.vue
# ruoyi-ui/src/views/register.vue
|
4 years ago |
|
疯狂的狮子li
|
a43e6e06e0
|
update 优化多用户体系处理 更名 LoginUtils 为 LoginHelper 支持 LoginUser 多级缓存
|
4 years ago |
phanes
|
868942e202
|
update 格式化代码结构 统一编码格式
|
4 years ago |
|
RuoYi
|
b1b82857ba
|
优化字段更新未同步
|
4 years ago |
|
疯狂的狮子li
|
0b09272a60
|
update 代码生成调整
|
4 years ago |
|
疯狂的狮子li
|
f9129bd54e
|
update 代码生成调整 删除无用导报与逻辑
|
4 years ago |
|
疯狂的狮子li
|
c0f3dff0f6
|
update 合并 satoken 解决不兼容不分
|
4 years ago |
|
疯狂的狮子li
|
6ca8535166
|
Merge remote-tracking branch 'origin/satoken' 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/aspectj/DataScopeAspect.java
# ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/RepeatSubmitAspect.java
# ruoyi-framework/src/main/java/com/ruoyi/framework/config/AsyncConfig.java
# ruoyi-framework/src/main/java/com/ruoyi/framework/config/SwaggerConfig.java
# ruoyi-framework/src/main/java/com/ruoyi/framework/handler/CreateAndUpdateMetaObjectHandler.java
# ruoyi-framework/src/main/java/com/ruoyi/framework/security/handle/LogoutSuccessHandlerImpl.java
# ruoyi-system/src/main/java/com/ruoyi/system/service/SysLoginService.java
# ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserOnlineServiceImpl.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
# ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
|
4 years ago |
|
疯狂的狮子li
|
a0bed51d96
|
update 格式化代码 统一间隔符
update 格式化代码 统一间隔符
|
4 years ago |
|
疯狂的狮子li
|
857dec38d1
|
update 代码模板 适配新改动
|
4 years ago |
|
疯狂的狮子li
|
8f6484e470
|
[重磅更新] 重写项目整体结构 数据处理下沉至 Mapper 符合 MVC 规范 减少循环依赖
|
4 years ago |
|
疯狂的狮子li
|
5413b37d71
|
Merge remote-tracking branch 'ruoyi-vue/master' into dev
# Conflicts:
# README.md
# ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/ScheduleUtils.java
# ruoyi-ui/src/views/index.vue
|
4 years ago |
|
RuoYi
|
869dcf73f8
|
Vue3前端代码生成模板同步到最新
|
4 years ago |
guxin0123
|
766361ac83
|
update ruoyi-generator/src/main/resources/vm/vue/v3/index.vue.vm.
翻页组件多了一个 :p 导致生成代码无法翻页
|
4 years ago |
|
疯狂的狮子li
|
9bad713db5
|
fix 修复 index-tree.vue.vm 漏删 #end
|
4 years ago |
|
疯狂的狮子li
|
d9a0de20f8
|
Merge remote-tracking branch 'ruoyi-vue/master' into dev
# Conflicts:
# ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java
# ruoyi-common/src/main/java/com/ruoyi/common/utils/PageUtils.java
# 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/vue/v3/index-tree.vue.vm
# ruoyi-generator/src/main/resources/vm/vue/v3/index.vue.vm
# ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java
# ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/ScheduleUtils.java
|
4 years ago |
|
RuoYi
|
db4c2d3dd5
|
代码生成列表图片支持预览
|
4 years ago |
|
RuoYi
|
6353f4ff09
|
若依 3.8.1
|
4 years ago |
|
疯狂的狮子li
|
948ad86049
|
Merge remote-tracking branch 'origin/dev' into satoken
|
4 years ago |
|
疯狂的狮子li
|
ed659da488
|
发布 v3.5.0-release 正式版
|
4 years ago |
|
疯狂的狮子li
|
dd37247e65
|
Merge remote-tracking branch 'origin/dev' into satoken
# Conflicts:
# pom.xml
# ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.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-common/pom.xml
# ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.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-demo/src/main/java/com/ruoyi/demo/controller/TestDemoController.java
# ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java
# ruoyi-framework/src/main/java/com/ruoyi/framework/security/handle/LogoutSuccessHandlerImpl.java
# ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/PermissionService.java
# ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java
# ruoyi-system/src/main/java/com/ruoyi/system/service/SysLoginService.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/java/com/ruoyi/system/service/impl/TokenServiceImpl.java
# ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserDetailsServiceImpl.java
|
4 years ago |
|
疯狂的狮子li
|
295cd3670f
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
pom.xml
ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java
|
4 years ago |
|
RuoYi
|
e4df0c6da1
|
优化代码生成字典组重复问题
|
4 years ago |
|
疯狂的狮子Li
|
63cb34b563
|
update 优化 pr 调整导包位置
|
4 years ago |
抓蛙师
|
b87e45ce32
|
自动生成代码未引入此依赖
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
4 years ago |
|
疯狂的狮子li
|
d600cdd8a0
|
add 代码生成增加 vue3 页面模板
|
4 years ago |
|
疯狂的狮子li
|
d2c6e27d07
|
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts:
ruoyi-ui/src/views/system/user/index.vue
|
4 years ago |
|
疯狂的狮子li
|
30483dacfb
|
update 回滚错误修改
|
4 years ago |
|
疯狂的狮子li
|
9d81d95700
|
update 代码生成 数据库功能使用 mapper 操作 规范用法避免滥用
|
4 years ago |
|
RuoYi
|
fef7ead0d5
|
新增Vue3前端代码生成模板
|
4 years ago |
|
疯狂的狮子li
|
3f97d19381
|
update [重磅更新] 重构分页 简化使用
|
4 years ago |
|
疯狂的狮子Li
|
317f6d5c87
|
fix 修复代码生成 sql异常 屏蔽代码生成数据权限过滤
|
4 years ago |
|
疯狂的狮子li
|
abc378c727
|
fix 修复代码生成 导出注解错误
|
4 years ago |
|
疯狂的狮子li
|
79fc16eeb7
|
fix 修复代码生成 导出注解错误
|
4 years ago |
|
疯狂的狮子li
|
e763381186
|
update [重磅更新] 登录流程升级 支持缓存
|
4 years ago |
|
疯狂的狮子li
|
d4f49b10d7
|
update 重构代码生成分页相关 基于新分页方法
|
4 years ago |
