45 Commits

Author SHA1 Message Date
疯狂的狮子Li
0fc796b90d update 适配 javax.servlet 替换为 jakarta.servlet 更新所有代码
update 适配 ServletUtils 更换继承 JakartaServletUtil
2023-01-13 23:04:09 +08:00
scmiot
9f2dc5c233
删除几个Controller和代码生成模板中冗余的三元表达式。
Signed-off-by: scmiot <scmiot@qq.com>
2022-10-29 08:23:09 +00:00
疯狂的狮子li
7f04327625 update 优化 自定义 openapi 处理器 彻底实现零注解无入侵生成文档 2022-07-08 19:17:48 +08:00
疯狂的狮子li
dd25573ebc update 使用 @param 注释替换 @Parameter 注解
fix 修复 token 无法传递 与 无法持久化问题
2022-07-08 15:49:15 +08:00
疯狂的狮子li
d9e54388e7 add 整合 springdoc-openapi-javadoc 基于代码注释生成文档 2022-07-07 19:07:59 +08:00
疯狂的狮子li
0b07780619 add 整合 springdoc 移除 knife4j 2022-07-07 18:08:14 +08:00
疯狂的狮子Li
666c80877c update 修改 代码生成 controller 去除查询校验 由用户自行选择是否校验 2022-05-28 23:30:58 +08:00
疯狂的狮子li
53da7140c2 update 调整返回类型为 R 2022-01-29 11:48:41 +08:00
phanes
868942e202 update 格式化代码结构 统一编码格式 2022-01-16 17:46:24 +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
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
疯狂的狮子li
42295ef2ac Merge remote-tracking branch 'origin/dev' into satoken
# Conflicts:
#	pom.xml
#	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/monitor/SysUserOnlineController.java
#	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java
#	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.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/SysLoginController.java
#	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java
#	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java
#	ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.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-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
#	ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java
#	ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestDemoController.java
#	ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestTreeController.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/SecurityConfig.java
#	ruoyi-framework/src/main/java/com/ruoyi/framework/config/SwaggerConfig.java
#	ruoyi-framework/src/main/java/com/ruoyi/framework/web/exception/GlobalExceptionHandler.java
#	ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java
#	ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobLogController.java
#	ruoyi-system/src/main/java/com/ruoyi/system/service/PermissionService.java
#	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserOnlineServiceImpl.java
#	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserDetailsServiceImpl.java
2021-11-29 13:56:25 +08:00
疯狂的狮子li
f8487f581b update 补全所有接口 单参数接口文档 2021-11-18 17:01:23 +08:00
疯狂的狮子li
b699b5fef5 fix 修复代码生成 导包未修改问题 2021-11-15 16:57:16 +08:00
疯狂的狮子li
553c29ab8a update 整合 satoken 权限、鉴权一体化框架 2021-09-23 19:13:58 +08:00
疯狂的狮子li
5f2f4bb7ef add 增加查询校验组 2021-08-23 18:17:45 +08:00
疯狂的狮子li
4e54190e3a update 代码生成模板 适配新excel导出 2021-08-05 10:22:29 +08:00
疯狂的狮子li
83cc800e97 update 多bo合并 使用分组校验 生成bo代码 2021-07-26 13:12:56 +08:00
疯狂的狮子li
fdd8c65b36 fix 修复接口单参数校验无效问题 2021-07-18 19:53:16 +08:00
疯狂的狮子li
ceeac476ec update 优化 代码生成器 增加表单防重注解 2021-06-10 00:04:19 +08:00
疯狂的狮子li
d2c745d3fd add 代码生成器 增加校验注解 2021-05-14 15:12:40 +08:00
疯狂的狮子li
0c7e52d9c3 update 代码生成器修改为MP分页(完成) 2021-05-14 10:44:04 +08:00
疯狂的狮子li
81b50b9b3c update 代码生成器修改为MP分页(未完成) 2021-05-13 23:52:36 +08:00
疯狂的狮子li
927777291e update 导出 Excel 工作表的名称修改 2021-04-14 14:36:27 +08:00
疯狂的狮子li
f093da99ec Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
 Conflicts:
	ruoyi-admin/src/main/resources/application-prod.yml
	ruoyi-generator/src/main/resources/vm/java/controller.java.vm
	ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm
	ruoyi-ui/src/assets/styles/ruoyi.scss
	ruoyi-ui/src/assets/styles/sidebar.scss
	ruoyi-ui/src/layout/components/Navbar.vue
	ruoyi-ui/src/layout/components/Settings/index.vue
	ruoyi-ui/src/layout/components/TagsView/index.vue
	ruoyi-ui/src/settings.js
	ruoyi-ui/src/store/getters.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/views/monitor/druid/index.vue
2021-04-14 13:22:31 +08:00
RuoYi
fe2ccbdc1b 优化代码生成导出模板名称 2021-04-13 14:49:42 +08:00
lihy2021
6595c68df1 导出 Excel 工作表的名称 由 ${businessName} 更改为 ${functionName} 2021-04-12 14:52:14 +08:00
疯狂的狮子li
ccd48965a8 fix controller 接口路径问题 2021-04-04 20:01:36 +08:00
疯狂的狮子li
a50df84a72 fix 生成 remove 方法参数类型错误 2021-04-03 17:00:47 +08:00
疯狂的狮子li
4a1ff5a5ac update 修改controller生成模板 规范代码结构 2021-04-01 17:57:54 +08:00
wugh
3d6fbb93f5 !11 [功能] 拆分出Vo,QueryBo,AddBo,EditBo等领域对象
* [修改] 错误引入的无用导包删除
* [新增] 增加Vo,QueryBo,AddBo,EditBo等视图,并调整controller,service的调用代码
* [新增] 增加CreateAndUpdateMetaObjectHandler,配合fill注解,实现创建和修改人的自动设置,减少重复代码
2021-03-22 09:32:49 +08:00
疯狂的狮子li
684eadbcc6 Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
 Conflicts:
	ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java
	ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java
	ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java
	ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java
	ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/GenTableMapper.java
	ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java
	ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenTableService.java
	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/mapper/generator/GenTableMapper.xml
	ruoyi-generator/src/main/resources/vm/java/controller.java.vm
	ruoyi-generator/src/main/resources/vm/java/domain.java.vm
	ruoyi-generator/src/main/resources/vm/java/mapper.java.vm
	ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm
	ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
	ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm
	ruoyi-ui/src/views/system/user/index.vue
	ruoyi-ui/src/views/tool/gen/editTable.vue
	ruoyi-ui/src/views/tool/gen/genInfoForm.vue
	ruoyi-ui/src/views/tool/gen/index.vue
	sql/ry_20210108.sql
2021-01-11 09:58:41 +08:00
RuoYi
14a859899c 代码生成模板支持主子表 2021-01-08 10:47:36 +08:00
疯狂的狮子li
817da5bc04 修复export与list结果不统一问题 2020-12-18 16:50:58 +08:00
wangxianl
a514330db3 修复export与list结果不统一的问题 2020-12-18 15:47:07 +08:00
疯狂的狮子li
2b0cf24be4 修改 controller 生成器 解决where条件重复bug 2020-12-18 09:47:35 +08:00
疯狂的狮子li
b029a7265a 将controller条件查询器改完隐式泛型 2020-12-18 00:02:40 +08:00
wangzhijun
fe39a7bc7b 模板controller导入;模板vue列表页当有查询条件时报错 2020-12-09 16:16:53 +08:00
疯狂的狮子li
93093d9f55 更改 MybatisPlus Lambda查询 改为官方推荐写法 2020-11-05 13:56:49 +08:00
疯狂的狮子li
cb92e41b76 修复生成树结构报错 2020-10-07 12:27:29 +08:00
疯狂的狮子li
8e1b8a3a3f 全注入 可能会出现小白乱用的情况 改成@Autowired构造注入 2020-07-22 18:46:34 +08:00
疯狂的狮子li
1e79d6f56f 同步升级3.0 2020-07-20 10:41:32 +08:00
RuoYi
cee572f237 若依 3.0 2020-07-19 10:25:40 +08:00