admin/lx-admin-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,453 Commits 3 Branches 0 Tags
Commit Graph

227 Commits

Author SHA1 Message Date
疯狂的狮子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
 2022-04-11 11:58:44 +08:00
RuoYi
d910888181 代码生成树表新增(展开/折叠) 2022-04-07 10:56:40 +08:00
疯狂的狮子li
7e1f024d28 update 适配 sqlserver 代码生成 解决一下小问题 2022-03-23 15:02:38 +08:00
疯狂的狮子li
cf67d606ae update 初步适配 postgres (代码生成两次导入有问题) 2022-03-17 19:52:40 +08:00
疯狂的狮子Li
880b3290e8 fix 修复代码生成导入表报错 2022-03-15 23:22:42 +08:00
疯狂的狮子li
3341eb5f2c update 优化 TreeEntity 树实体 去除未知泛型 2022-03-15 13:18:24 +08:00
疯狂的狮子li
12f5327e0e add 增加 oracle postgres sqlserver 模板sql 2022-03-15 11:58:53 +08:00
疯狂的狮子li
40f9fac1a5 update 代码生成sql模板适配雪花id 2022-03-15 11:58:26 +08:00
疯狂的狮子li
cd312f1348 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev 
 Conflicts:
	ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java
	ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
	ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java
	ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm
	ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
	ruoyi-ui/src/assets/styles/sidebar.scss
	ruoyi-ui/src/layout/components/Settings/index.vue
	ruoyi-ui/src/layout/index.vue
	ruoyi-ui/src/store/modules/app.js
	ruoyi-ui/src/store/modules/permission.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/online/index.vue
	ruoyi-ui/src/views/system/dict/data.vue
	ruoyi-ui/src/views/system/dict/index.vue
	ruoyi-ui/src/views/system/role/index.vue
	ruoyi-ui/src/views/system/user/index.vue
	ruoyi-ui/src/views/tool/gen/importTable.vue
 2022-03-15 10:20:53 +08:00
疯狂的狮子li
7f1356a447 update 重构代码生成 多数据库sql加载 使用xml特性动态切换sql 2022-03-14 14:05:37 +08:00
RuoYi
6130bebbb3 开启TopNav没有子菜单情况隐藏侧边栏 2022-03-06 09:03:44 +08:00
SG
4bd5009ec1
修复代码错误,其他文件也修改下 2022-03-04 14:38:57 +00:00
疯狂的狮子li
8ee749f137 update 初步适配oracle(未完成) 2022-03-04 21:09:46 +08:00
RuoYi
cb8f5de5af 修复表单清除元素位置未垂直居中问题(I4V27B) 2022-03-04 19:24:28 +08:00
疯狂的狮子li
2d813b2191 update 删除多余 参数类型 2022-03-04 13:42:08 +08:00
疯狂的狮子li
f1bf549e0f update 简化查询代码生成列表功能 2022-03-04 13:12:20 +08:00
疯狂的狮子li
b2d3abd9d6 update 优化去除sql差异化 时间范围统一使用 between 处理 2022-03-03 11:18:10 +08:00
疯狂的狮子li
6751b97db9 fix 修复一些小问题 2022-02-25 18:34:37 +08:00
疯狂的狮子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
 2022-02-24 15:30:20 +08:00
RuoYi
bb65cd1976 代码生成子表支持日期/字典配置 2022-02-24 09:28:51 +08:00
疯狂的狮子li
68a23c4918 update 优化代码生成 2022-02-14 16:02:22 +08:00
疯狂的狮子li
53da7140c2 update 调整返回类型为 R 2022-01-29 11:48:41 +08:00
疯狂的狮子Li
3706d2e1db update 去除链式调用注解 不符合规范导致很多奇葩问题 例如: copy为空问题 2022-01-25 21:50:54 +08:00
phanes
868942e202 update 格式化代码结构 统一编码格式 2022-01-16 17:46:24 +08:00
疯狂的狮子li
0b09272a60 update 代码生成调整 2022-01-13 15:28:00 +08:00
疯狂的狮子li
f9129bd54e update 代码生成调整 删除无用导报与逻辑 2022-01-13 15:23:17 +08:00
疯狂的狮子li
c0f3dff0f6 update 合并 satoken 解决不兼容不分 2022-01-13 11:27:09 +08:00
疯狂的狮子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
 2022-01-13 11:14:33 +08:00
疯狂的狮子li
a0bed51d96 update 格式化代码 统一间隔符 
update 格式化代码 统一间隔符
 2022-01-13 09:58:16 +08:00
疯狂的狮子li
857dec38d1 update 代码模板 适配新改动 2022-01-13 09:49:08 +08:00
疯狂的狮子li
8f6484e470 [重磅更新] 重写项目整体结构 数据处理下沉至 Mapper 符合 MVC 规范 减少循环依赖 2022-01-12 21:22:26 +08:00
疯狂的狮子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
 2022-01-12 20:53:03 +08:00
RuoYi
869dcf73f8 Vue3前端代码生成模板同步到最新 2022-01-11 17:20:50 +08:00
guxin0123
766361ac83
update ruoyi-generator/src/main/resources/vm/vue/v3/index.vue.vm. 
翻页组件多了一个 :p 导致生成代码无法翻页
 2022-01-11 04:57:26 +00:00
疯狂的狮子li
9bad713db5 fix 修复 index-tree.vue.vm 漏删 #end 2022-01-11 11:30:53 +08:00
疯狂的狮子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
 2022-01-07 15:41:18 +08:00
RuoYi
db4c2d3dd5 代码生成列表图片支持预览 2022-01-04 20:27:08 +08:00
疯狂的狮子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
 2021-12-27 09:50:42 +08:00
疯狂的狮子Li
63cb34b563 update 优化 pr 调整导包位置 2021-12-18 18:34:23 +08:00
抓蛙师
b87e45ce32 自动生成代码未引入此依赖 
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 2021-12-18 16:07:24 +08:00
疯狂的狮子li
d600cdd8a0 add 代码生成增加 vue3 页面模板 2021-12-16 15:09:35 +08:00
疯狂的狮子li
d2c6e27d07 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev 
 Conflicts:
	ruoyi-ui/src/views/system/user/index.vue
 2021-12-16 14:21:04 +08:00
疯狂的狮子li
30483dacfb update 回滚错误修改 2021-12-16 11:52:55 +08:00
疯狂的狮子li
9d81d95700 update 代码生成 数据库功能使用 mapper 操作 规范用法避免滥用 2021-12-16 11:45:58 +08:00
RuoYi
fef7ead0d5 新增Vue3前端代码生成模板 2021-12-16 09:51:11 +08:00
疯狂的狮子li
3f97d19381 update [重磅更新] 重构分页 简化使用 2021-12-15 13:29:54 +08:00
疯狂的狮子Li
317f6d5c87 fix 修复代码生成 sql异常 屏蔽代码生成数据权限过滤 2021-12-14 23:47:59 +08:00
疯狂的狮子li
abc378c727 fix 修复代码生成 导出注解错误 2021-12-13 10:03:00 +08:00
疯狂的狮子li
79fc16eeb7 fix 修复代码生成 导出注解错误 2021-12-13 10:02:32 +08:00
疯狂的狮子li
d4f49b10d7 update 重构代码生成分页相关 基于新分页方法 2021-12-03 15:58:16 +08:00