83 Commits (6c9979cedea486c2b62fa622a759f0df173b19bb)

Author SHA1 Message Date
疯狂的狮子Li 0995b5e821 update 优化 调用toAjax时的冗余三元操作符 3 years ago
疯狂的狮子li bc376899b2 update 优化 vue3说明文件 编码问题 3 years ago
疯狂的狮子li 60f3757672 fix 修复 点击删除后点击取消控制台报错问题 3 years ago
疯狂的狮子li 8c4091af01 Merge remote-tracking branch 'ruoyi-cloud/master' into dev
# Conflicts:
#	README.md
#	pom.xml
#	ruoyi-api/pom.xml
#	ruoyi-api/ruoyi-api-system/pom.xml
#	ruoyi-auth/pom.xml
#	ruoyi-common/pom.xml
#	ruoyi-common/ruoyi-common-core/pom.xml
#	ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/annotation/Excel.java
#	ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/GlobalException.java
#	ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/ServiceException.java
#	ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/text/Convert.java
#	ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelUtil.java
#	ruoyi-common/ruoyi-common-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
#	ruoyi-common/ruoyi-common-datascope/src/main/java/com/ruoyi/common/datascope/aspect/DataScopeAspect.java
#	ruoyi-common/ruoyi-common-excel/pom.xml
#	ruoyi-common/ruoyi-common-job/pom.xml
#	ruoyi-common/ruoyi-common-log/pom.xml
#	ruoyi-common/ruoyi-common-log/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
#	ruoyi-common/ruoyi-common-mybatis/pom.xml
#	ruoyi-common/ruoyi-common-redis/pom.xml
#	ruoyi-common/ruoyi-common-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
#	ruoyi-common/ruoyi-common-security/pom.xml
#	ruoyi-common/ruoyi-common-security/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
#	ruoyi-example/ruoyi-stream-mq/pom.xml
#	ruoyi-gateway/pom.xml
#	ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/KaptchaTextCreator.java
#	ruoyi-gateway/src/main/java/com/ruoyi/gateway/service/impl/ValidateCodeServiceImpl.java
#	ruoyi-modules/pom.xml
#	ruoyi-modules/ruoyi-gen/pom.xml
#	ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/v3/index.vue.vm
#	ruoyi-modules/ruoyi-job/pom.xml
#	ruoyi-modules/ruoyi-system/pom.xml
#	ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
#	ruoyi-ui/package.json
#	ruoyi-ui/src/views/index.vue
#	ruoyi-ui/src/views/login.vue
#	ruoyi-ui/src/views/register.vue
#	ruoyi-visual/pom.xml
#	ruoyi-visual/ruoyi-monitor/pom.xml
4 years ago
RuoYi c98f452431 防止vue3主键字段名与row或ids一致导致报错的问题 4 years ago
疯狂的狮子li 9256e938c6 remove 移除所有 swagger 配置 准备对接 springdoc 4 years ago
疯狂的狮子Li d2d23d1fbc update 简化生成代码注释 4 years ago
疯狂的狮子Li 2c5d743c0a update 修改 代码生成 controller 去除查询校验 由用户自行选择是否校验 4 years ago
疯狂的狮子li b6452dcf1f Merge branch 'master' of https://gitee.com/y_project/RuoYi-Cloud
 Conflicts:
	pom.xml
	ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysDept.java
	ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelUtil.java
	ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java
	ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
	ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
	ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml
	ruoyi-ui/src/views/system/user/index.vue
	sql/ry_config_20220510.sql
4 years ago
RuoYi 70f306418f 修改代码生成树形选择器组件 4 years ago
疯狂的狮子Li db46e5a8b0 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Cloud
 Conflicts:
	README.md
	pom.xml
	ruoyi-api/pom.xml
	ruoyi-api/ruoyi-api-resource/pom.xml
	ruoyi-api/ruoyi-api-system/pom.xml
	ruoyi-auth/pom.xml
	ruoyi-common/pom.xml
	ruoyi-common/ruoyi-common-core/pom.xml
	ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/PageUtils.java
	ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ip/IpUtils.java
	ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelUtil.java
	ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/controller/BaseController.java
	ruoyi-common/ruoyi-common-log/pom.xml
	ruoyi-common/ruoyi-common-mybatis/pom.xml
	ruoyi-common/ruoyi-common-redis/pom.xml
	ruoyi-common/ruoyi-common-security/pom.xml
	ruoyi-common/ruoyi-common-swagger/pom.xml
	ruoyi-gateway/pom.xml
	ruoyi-modules/pom.xml
	ruoyi-modules/ruoyi-gen/pom.xml
	ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/index-tree.vue.vm
	ruoyi-modules/ruoyi-job/pom.xml
	ruoyi-modules/ruoyi-resource/pom.xml
	ruoyi-modules/ruoyi-system/pom.xml
	ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
	ruoyi-ui/package.json
	ruoyi-ui/src/views/index.vue
	ruoyi-visual/pom.xml
	ruoyi-visual/ruoyi-monitor/pom.xml
4 years ago
RuoYi 6f7b02372e 代码生成树表新增(展开/折叠) 4 years ago
疯狂的狮子li e908329cc0 update 优化 TreeEntity 树实体 去除未知泛型 4 years ago
疯狂的狮子li eaf6fdc445 update 代码生成sql模板适配雪花id 4 years ago
疯狂的狮子li e2417b433a Merge branch 'master' of https://gitee.com/y_project/RuoYi-Cloud
 Conflicts:
	ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java
	ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/Constants.java
	ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelUtil.java
	ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/utils/FileUploadUtils.java
	ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/controller/GenController.java
	ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/index-tree.vue.vm
	ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/index.vue.vm
	ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
	ruoyi-ui/src/router/index.js
	ruoyi-ui/src/views/monitor/job/index.vue
	ruoyi-ui/src/views/monitor/job/log.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
4 years ago
RuoYi 8b3d75a6a0 开启TopNav没有子菜单情况隐藏侧边栏 4 years ago
RuoYi 7a09412ecb 修复表单清除元素位置未垂直居中问题(I4V27B) 4 years ago
疯狂的狮子li 710864a4f2 fix 修复一些小问题 4 years ago
疯狂的狮子li 0d827e55ff Merge branch 'master' of https://gitee.com/y_project/RuoYi-Cloud
 Conflicts:
	ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/auth/AuthLogic.java
	ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/util/VelocityUtils.java
	ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/index.vue.vm
	ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/v3/index.vue.vm
	ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
4 years ago
RuoYi 089ebaf9c5 代码生成子表支持日期/字典配置 4 years ago
疯狂的狮子li 43a7181fc7 update 优化 代码生成 pr 代码 4 years ago
yueye 1e22d7ce70 update 修改 代码生成 适配所有新功能 4 years ago
疯狂的狮子li bf151c5db2 update 补全 接口文档注解 调整返回类型为 R 4 years ago
疯狂的狮子Li db70abf9f0 !15 合并 新功能/satoken 分支 4 years ago
疯狂的狮子li 07ba70ec8c add 集成 EasyExcel 框架 完成业务功能切换
update 优化 Validation 校验框架功能
update 移除掉 StringUtils 语义不明确的api方法 使用特定工具替换
4 years ago
疯狂的狮子li 1de6f31b52 update 适配升级 springcloud 2021 springboot2.6 4 years ago
RuoYi 8223a5dcc4 Vue3前端代码生成模板同步到最新 4 years ago
疯狂的狮子li 3efd7c7bd4 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Cloud
 Conflicts:
	README.md
	ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/Constants.java
	ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/controller/SysJobController.java
	ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/ScheduleUtils.java
4 years ago
RuoYi 6274bfcd8c 代码生成列表图片支持预览 4 years ago
疯狂的狮子li 4e2d2858c7 update 使用 jackson 全局处理时间 4 years ago
RuoYi 5c90f0bbb7 新增Vue3前端代码生成模板 4 years ago
Ricky 2a452a00e0 升级velocity到最新版本2.3(语法升级) 4 years ago
Ricky 4d4123243c 修复代码生成复选框字典遗漏问题 4 years ago
RuoYi 73b38b143b 代码生成模板主子表删除方法缺少事务 4 years ago
RuoYi 173c0e384f 优化导出数据操作 4 years ago
RuoYi d8da1b796c 优化权限认证注解 4 years ago
RuoYi e46ea3ebac 自动生成代码漏掉 this.#[[$modal]]# 4 years ago
RuoYi 829451f05e 新增通用方法简化模态/缓存使用 4 years ago
RuoYi cae41a8da2 新增通用方法简化模态/缓存使用 4 years ago
RuoYi a10384c009 使用vue-data-dict简化数据字典使用 4 years ago
RuoYi d6188aa009 修复后端主子表代码模板方法名生成错误问题 4 years ago
RuoYi 34a6f2e1f1 查询列表设置数据字典样式回显 4 years ago
RuoYi 0e7c45173c 代码生成主子表多选行数据 4 years ago
RuoYi ea038a5437 优化代码生成模板 5 years ago
Ricky 887430874d 优化代码生成 5 years ago
Ricky 52f8693e1d 优化代码生成 5 years ago
RuoYi ee7607bcca 全局注册通用组件 5 years ago
RuoYi d8d8758cfa 修复关闭confirm提示框控制台报错问题 5 years ago
若依 cc658b9ece !66 代码生成优化
Merge pull request !66 from 雪忆天堂/N/A
5 years ago
RuoYi 33bae9509b 修正mapper模板注释 5 years ago