From 6de2f46a8668652df54d6c1a44a084a7661e234c Mon Sep 17 00:00:00 2001 From: penny <2500338766@qq.com> Date: Tue, 12 Apr 2022 23:36:59 +0800 Subject: [PATCH] =?UTF-8?q?feature1.0.0=EF=BC=9A=E5=88=9D=E5=A7=8B?= =?UTF-8?q?=E5=8C=96=E4=BB=93=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/bnyer/auth/BnyerAuthApplication.java | 17 +- bnyer-auth/src/main/resources/banner.txt | 13 - bnyer-auth/src/main/resources/bootstrap.yml | 19 +- bnyer-auth/src/main/resources/logback.xml | 4 +- bnyer-common/pom.xml | 2 +- .../gateway/BnyerGatewayApplication.java | 15 +- bnyer-gateway/src/main/resources/banner.txt | 14 - .../src/main/resources/bootstrap.yml | 18 +- bnyer-gateway/src/main/resources/logback.xml | 4 +- .../com/bnyer/file/BnyerFileApplication.java | 31 - .../bnyer-file/src/main/resources/banner.txt | 14 - .../com/bnyer/gen/BnyerGenApplication.java | 34 - .../java/com/bnyer/gen/config/GenConfig.java | 66 -- .../bnyer/gen/controller/GenController.java | 212 ------- .../java/com/bnyer/gen/domain/GenTable.java | 370 ----------- .../com/bnyer/gen/domain/GenTableColumn.java | 374 ----------- .../gen/mapper/GenTableColumnMapper.java | 61 -- .../com/bnyer/gen/mapper/GenTableMapper.java | 83 --- .../service/GenTableColumnServiceImpl.java | 69 -- .../gen/service/GenTableServiceImpl.java | 522 --------------- .../gen/service/IGenTableColumnService.java | 45 -- .../bnyer/gen/service/IGenTableService.java | 121 ---- .../java/com/bnyer/gen/util/GenUtils.java | 258 -------- .../bnyer/gen/util/VelocityInitializer.java | 34 - .../com/bnyer/gen/util/VelocityUtils.java | 402 ------------ .../bnyer-gen/src/main/resources/banner.txt | 14 - .../src/main/resources/bootstrap.yml | 25 - .../mapper/generator/GenTableColumnMapper.xml | 127 ---- .../mapper/generator/GenTableMapper.xml | 202 ------ .../main/resources/vm/java/controller.java.vm | 115 ---- .../src/main/resources/vm/java/domain.java.vm | 101 --- .../src/main/resources/vm/java/mapper.java.vm | 91 --- .../main/resources/vm/java/service.java.vm | 61 -- .../resources/vm/java/serviceImpl.java.vm | 169 ----- .../main/resources/vm/java/sub-domain.java.vm | 73 --- .../src/main/resources/vm/js/api.js.vm | 44 -- .../src/main/resources/vm/sql/sql.vm | 22 - .../main/resources/vm/vue/index-tree.vue.vm | 502 --------------- .../src/main/resources/vm/vue/index.vue.vm | 598 ------------------ .../resources/vm/vue/v3/index-tree.vue.vm | 484 -------------- .../src/main/resources/vm/vue/v3/index.vue.vm | 596 ----------------- .../src/main/resources/vm/vue/v3/readme.txt | 1 - .../src/main/resources/vm/xml/mapper.xml.vm | 135 ---- .../com/bnyer/job/BnyerJobApplication.java | 34 - .../bnyer-job/src/main/resources/banner.txt | 14 - .../src/main/resources/banner.txt | 14 - .../bnyer-file/pom.xml | 6 +- .../com/bnyer/file/BnyerFileApplication.java | 28 + .../com/bnyer/file/config/MinioConfig.java | 0 .../bnyer/file/config/ResourcesConfig.java | 0 .../file/controller/SysFileController.java | 0 .../service/FastDfsSysFileServiceImpl.java | 0 .../bnyer/file/service/ISysFileService.java | 0 .../file/service/LocalSysFileServiceImpl.java | 0 .../file/service/MinioSysFileServiceImpl.java | 0 .../com/bnyer/file/utils/FileUploadUtils.java | 0 .../src/main/resources/bootstrap.yml | 19 +- .../bnyer-file/src/main/resources/logback.xml | 4 +- .../bnyer-img}/pom.xml | 66 +- .../com/bnyer/img/BnyerImgApplication.java | 31 + .../src/main/resources/bootstrap.yml | 36 ++ .../bnyer-img}/src/main/resources/logback.xml | 6 +- .../bnyer-job/pom.xml | 6 +- .../com/bnyer/job/BnyerJobApplication.java | 31 + .../com/bnyer/job/config/ScheduleConfig.java | 0 .../job/controller/SysJobController.java | 0 .../job/controller/SysJobLogController.java | 0 .../java/com/bnyer/job/domain/SysJob.java | 0 .../java/com/bnyer/job/domain/SysJobLog.java | 0 .../com/bnyer/job/mapper/SysJobLogMapper.java | 0 .../com/bnyer/job/mapper/SysJobMapper.java | 0 .../bnyer/job/service/ISysJobLogService.java | 0 .../com/bnyer/job/service/ISysJobService.java | 0 .../job/service/SysJobLogServiceImpl.java | 0 .../bnyer/job/service/SysJobServiceImpl.java | 0 .../main/java/com/bnyer/job/task/RyTask.java | 0 .../com/bnyer/job/util/AbstractQuartzJob.java | 0 .../java/com/bnyer/job/util/CronUtils.java | 0 .../com/bnyer/job/util/JobInvokeUtil.java | 0 .../QuartzDisallowConcurrentExecution.java | 0 .../bnyer/job/util/QuartzJobExecution.java | 0 .../com/bnyer/job/util/ScheduleUtils.java | 0 .../src/main/resources/bootstrap.yml | 19 +- .../com/bnyer/job/mapper}/SysJobLogMapper.xml | 6 +- .../com/bnyer/job/mapper}/SysJobMapper.xml | 8 +- .../bnyer-job/src/main/resources/logback.xml | 4 +- .../bnyer-system/pom.xml | 8 +- .../bnyer/system/BnyerSystemApplication.java | 17 +- .../controller/SysConfigController.java | 0 .../system/controller/SysDeptController.java | 0 .../controller/SysDictDataController.java | 0 .../controller/SysDictTypeController.java | 0 .../controller/SysLogininforController.java | 0 .../system/controller/SysMenuController.java | 0 .../controller/SysNoticeController.java | 0 .../controller/SysOperlogController.java | 0 .../system/controller/SysPostController.java | 0 .../controller/SysProfileController.java | 0 .../system/controller/SysRoleController.java | 0 .../system/controller/SysUserController.java | 0 .../controller/SysUserOnlineController.java | 0 .../com/bnyer/system/domain/SysConfig.java | 0 .../java/com/bnyer/system/domain/SysMenu.java | 0 .../com/bnyer/system/domain/SysNotice.java | 0 .../java/com/bnyer/system/domain/SysPost.java | 0 .../com/bnyer/system/domain/SysRoleDept.java | 0 .../com/bnyer/system/domain/SysRoleMenu.java | 0 .../bnyer/system/domain/SysUserOnline.java | 0 .../com/bnyer/system/domain/SysUserPost.java | 0 .../com/bnyer/system/domain/SysUserRole.java | 0 .../com/bnyer/system/domain/vo/MetaVo.java | 0 .../com/bnyer/system/domain/vo/RouterVo.java | 0 .../bnyer/system/domain/vo/TreeSelect.java | 0 .../bnyer/system/mapper/SysConfigMapper.java | 0 .../bnyer/system/mapper/SysDeptMapper.java | 0 .../system/mapper/SysDictDataMapper.java | 0 .../system/mapper/SysDictTypeMapper.java | 0 .../system/mapper/SysLogininforMapper.java | 0 .../bnyer/system/mapper/SysMenuMapper.java | 0 .../bnyer/system/mapper/SysNoticeMapper.java | 0 .../bnyer/system/mapper/SysOperLogMapper.java | 0 .../bnyer/system/mapper/SysPostMapper.java | 0 .../system/mapper/SysRoleDeptMapper.java | 0 .../bnyer/system/mapper/SysRoleMapper.java | 0 .../system/mapper/SysRoleMenuMapper.java | 0 .../bnyer/system/mapper/SysUserMapper.java | 0 .../system/mapper/SysUserPostMapper.java | 0 .../system/mapper/SysUserRoleMapper.java | 0 .../system/service/ISysConfigService.java | 0 .../bnyer/system/service/ISysDeptService.java | 0 .../system/service/ISysDictDataService.java | 0 .../system/service/ISysDictTypeService.java | 0 .../system/service/ISysLogininforService.java | 0 .../bnyer/system/service/ISysMenuService.java | 0 .../system/service/ISysNoticeService.java | 0 .../system/service/ISysOperLogService.java | 0 .../system/service/ISysPermissionService.java | 0 .../bnyer/system/service/ISysPostService.java | 0 .../bnyer/system/service/ISysRoleService.java | 0 .../system/service/ISysUserOnlineService.java | 0 .../bnyer/system/service/ISysUserService.java | 0 .../service/impl/SysConfigServiceImpl.java | 0 .../service/impl/SysDeptServiceImpl.java | 0 .../service/impl/SysDictDataServiceImpl.java | 0 .../service/impl/SysDictTypeServiceImpl.java | 0 .../impl/SysLogininforServiceImpl.java | 0 .../service/impl/SysMenuServiceImpl.java | 0 .../service/impl/SysNoticeServiceImpl.java | 0 .../service/impl/SysOperLogServiceImpl.java | 0 .../impl/SysPermissionServiceImpl.java | 0 .../service/impl/SysPostServiceImpl.java | 0 .../service/impl/SysRoleServiceImpl.java | 0 .../impl/SysUserOnlineServiceImpl.java | 0 .../service/impl/SysUserServiceImpl.java | 0 .../src/main/resources/bootstrap.yml | 19 +- .../bnyer/system/mapper}/SysConfigMapper.xml | 10 +- .../bnyer/system/mapper}/SysDeptMapper.xml | 8 +- .../system/mapper}/SysDictDataMapper.xml | 0 .../system/mapper}/SysDictTypeMapper.xml | 0 .../system/mapper}/SysLogininforMapper.xml | 0 .../bnyer/system/mapper}/SysMenuMapper.xml | 10 +- .../bnyer/system/mapper}/SysNoticeMapper.xml | 8 +- .../bnyer/system/mapper}/SysOperLogMapper.xml | 0 .../bnyer/system/mapper}/SysPostMapper.xml | 8 +- .../system/mapper}/SysRoleDeptMapper.xml | 2 +- .../bnyer/system/mapper}/SysRoleMapper.xml | 0 .../system/mapper}/SysRoleMenuMapper.xml | 2 +- .../bnyer/system/mapper}/SysUserMapper.xml | 0 .../system/mapper}/SysUserPostMapper.xml | 2 +- .../system/mapper}/SysUserRoleMapper.xml | 4 +- .../src/main/resources/logback.xml | 4 +- {bnyer-modules => bnyer-services}/pom.xml | 6 +- .../monitor/BnyerMonitorApplication.java | 17 +- .../src/main/resources/banner.txt | 14 - .../src/main/resources/bootstrap.yml | 19 +- .../src/main/resources/logback.xml | 4 +- pom.xml | 2 +- 177 files changed, 328 insertions(+), 6330 deletions(-) delete mode 100644 bnyer-auth/src/main/resources/banner.txt delete mode 100644 bnyer-gateway/src/main/resources/banner.txt delete mode 100644 bnyer-modules/bnyer-file/src/main/java/com/bnyer/file/BnyerFileApplication.java delete mode 100644 bnyer-modules/bnyer-file/src/main/resources/banner.txt delete mode 100644 bnyer-modules/bnyer-gen/src/main/java/com/bnyer/gen/BnyerGenApplication.java delete mode 100644 bnyer-modules/bnyer-gen/src/main/java/com/bnyer/gen/config/GenConfig.java delete mode 100644 bnyer-modules/bnyer-gen/src/main/java/com/bnyer/gen/controller/GenController.java delete mode 100644 bnyer-modules/bnyer-gen/src/main/java/com/bnyer/gen/domain/GenTable.java delete mode 100644 bnyer-modules/bnyer-gen/src/main/java/com/bnyer/gen/domain/GenTableColumn.java delete mode 100644 bnyer-modules/bnyer-gen/src/main/java/com/bnyer/gen/mapper/GenTableColumnMapper.java delete mode 100644 bnyer-modules/bnyer-gen/src/main/java/com/bnyer/gen/mapper/GenTableMapper.java delete mode 100644 bnyer-modules/bnyer-gen/src/main/java/com/bnyer/gen/service/GenTableColumnServiceImpl.java delete mode 100644 bnyer-modules/bnyer-gen/src/main/java/com/bnyer/gen/service/GenTableServiceImpl.java delete mode 100644 bnyer-modules/bnyer-gen/src/main/java/com/bnyer/gen/service/IGenTableColumnService.java delete mode 100644 bnyer-modules/bnyer-gen/src/main/java/com/bnyer/gen/service/IGenTableService.java delete mode 100644 bnyer-modules/bnyer-gen/src/main/java/com/bnyer/gen/util/GenUtils.java delete mode 100644 bnyer-modules/bnyer-gen/src/main/java/com/bnyer/gen/util/VelocityInitializer.java delete mode 100644 bnyer-modules/bnyer-gen/src/main/java/com/bnyer/gen/util/VelocityUtils.java delete mode 100644 bnyer-modules/bnyer-gen/src/main/resources/banner.txt delete mode 100644 bnyer-modules/bnyer-gen/src/main/resources/bootstrap.yml delete mode 100644 bnyer-modules/bnyer-gen/src/main/resources/mapper/generator/GenTableColumnMapper.xml delete mode 100644 bnyer-modules/bnyer-gen/src/main/resources/mapper/generator/GenTableMapper.xml delete mode 100644 bnyer-modules/bnyer-gen/src/main/resources/vm/java/controller.java.vm delete mode 100644 bnyer-modules/bnyer-gen/src/main/resources/vm/java/domain.java.vm delete mode 100644 bnyer-modules/bnyer-gen/src/main/resources/vm/java/mapper.java.vm delete mode 100644 bnyer-modules/bnyer-gen/src/main/resources/vm/java/service.java.vm delete mode 100644 bnyer-modules/bnyer-gen/src/main/resources/vm/java/serviceImpl.java.vm delete mode 100644 bnyer-modules/bnyer-gen/src/main/resources/vm/java/sub-domain.java.vm delete mode 100644 bnyer-modules/bnyer-gen/src/main/resources/vm/js/api.js.vm delete mode 100644 bnyer-modules/bnyer-gen/src/main/resources/vm/sql/sql.vm delete mode 100644 bnyer-modules/bnyer-gen/src/main/resources/vm/vue/index-tree.vue.vm delete mode 100644 bnyer-modules/bnyer-gen/src/main/resources/vm/vue/index.vue.vm delete mode 100644 bnyer-modules/bnyer-gen/src/main/resources/vm/vue/v3/index-tree.vue.vm delete mode 100644 bnyer-modules/bnyer-gen/src/main/resources/vm/vue/v3/index.vue.vm delete mode 100644 bnyer-modules/bnyer-gen/src/main/resources/vm/vue/v3/readme.txt delete mode 100644 bnyer-modules/bnyer-gen/src/main/resources/vm/xml/mapper.xml.vm delete mode 100644 bnyer-modules/bnyer-job/src/main/java/com/bnyer/job/BnyerJobApplication.java delete mode 100644 bnyer-modules/bnyer-job/src/main/resources/banner.txt delete mode 100644 bnyer-modules/bnyer-system/src/main/resources/banner.txt rename {bnyer-modules => bnyer-services}/bnyer-file/pom.xml (94%) create mode 100644 bnyer-services/bnyer-file/src/main/java/com/bnyer/file/BnyerFileApplication.java rename {bnyer-modules => bnyer-services}/bnyer-file/src/main/java/com/bnyer/file/config/MinioConfig.java (100%) rename {bnyer-modules => bnyer-services}/bnyer-file/src/main/java/com/bnyer/file/config/ResourcesConfig.java (100%) rename {bnyer-modules => bnyer-services}/bnyer-file/src/main/java/com/bnyer/file/controller/SysFileController.java (100%) rename {bnyer-modules => bnyer-services}/bnyer-file/src/main/java/com/bnyer/file/service/FastDfsSysFileServiceImpl.java (100%) rename {bnyer-modules => bnyer-services}/bnyer-file/src/main/java/com/bnyer/file/service/ISysFileService.java (100%) rename {bnyer-modules => bnyer-services}/bnyer-file/src/main/java/com/bnyer/file/service/LocalSysFileServiceImpl.java (100%) rename {bnyer-modules => bnyer-services}/bnyer-file/src/main/java/com/bnyer/file/service/MinioSysFileServiceImpl.java (100%) rename {bnyer-modules => bnyer-services}/bnyer-file/src/main/java/com/bnyer/file/utils/FileUploadUtils.java (100%) rename {bnyer-modules => bnyer-services}/bnyer-file/src/main/resources/bootstrap.yml (50%) rename {bnyer-modules => bnyer-services}/bnyer-file/src/main/resources/logback.xml (97%) rename {bnyer-modules/bnyer-gen => bnyer-services/bnyer-img}/pom.xml (65%) create mode 100644 bnyer-services/bnyer-img/src/main/java/com/bnyer/img/BnyerImgApplication.java create mode 100644 bnyer-services/bnyer-img/src/main/resources/bootstrap.yml rename {bnyer-modules/bnyer-gen => bnyer-services/bnyer-img}/src/main/resources/logback.xml (95%) rename {bnyer-modules => bnyer-services}/bnyer-job/pom.xml (95%) create mode 100644 bnyer-services/bnyer-job/src/main/java/com/bnyer/job/BnyerJobApplication.java rename {bnyer-modules => bnyer-services}/bnyer-job/src/main/java/com/bnyer/job/config/ScheduleConfig.java (100%) rename {bnyer-modules => bnyer-services}/bnyer-job/src/main/java/com/bnyer/job/controller/SysJobController.java (100%) rename {bnyer-modules => bnyer-services}/bnyer-job/src/main/java/com/bnyer/job/controller/SysJobLogController.java (100%) rename {bnyer-modules => bnyer-services}/bnyer-job/src/main/java/com/bnyer/job/domain/SysJob.java (100%) rename {bnyer-modules => bnyer-services}/bnyer-job/src/main/java/com/bnyer/job/domain/SysJobLog.java (100%) rename {bnyer-modules => bnyer-services}/bnyer-job/src/main/java/com/bnyer/job/mapper/SysJobLogMapper.java (100%) rename {bnyer-modules => bnyer-services}/bnyer-job/src/main/java/com/bnyer/job/mapper/SysJobMapper.java (100%) rename {bnyer-modules => bnyer-services}/bnyer-job/src/main/java/com/bnyer/job/service/ISysJobLogService.java (100%) rename {bnyer-modules => bnyer-services}/bnyer-job/src/main/java/com/bnyer/job/service/ISysJobService.java (100%) rename {bnyer-modules => bnyer-services}/bnyer-job/src/main/java/com/bnyer/job/service/SysJobLogServiceImpl.java (100%) rename {bnyer-modules => bnyer-services}/bnyer-job/src/main/java/com/bnyer/job/service/SysJobServiceImpl.java (100%) rename {bnyer-modules => bnyer-services}/bnyer-job/src/main/java/com/bnyer/job/task/RyTask.java (100%) rename {bnyer-modules => bnyer-services}/bnyer-job/src/main/java/com/bnyer/job/util/AbstractQuartzJob.java (100%) rename {bnyer-modules => bnyer-services}/bnyer-job/src/main/java/com/bnyer/job/util/CronUtils.java (100%) rename {bnyer-modules => bnyer-services}/bnyer-job/src/main/java/com/bnyer/job/util/JobInvokeUtil.java (100%) rename {bnyer-modules => bnyer-services}/bnyer-job/src/main/java/com/bnyer/job/util/QuartzDisallowConcurrentExecution.java (100%) rename {bnyer-modules => bnyer-services}/bnyer-job/src/main/java/com/bnyer/job/util/QuartzJobExecution.java (100%) rename {bnyer-modules => bnyer-services}/bnyer-job/src/main/java/com/bnyer/job/util/ScheduleUtils.java (100%) rename {bnyer-modules => bnyer-services}/bnyer-job/src/main/resources/bootstrap.yml (50%) rename {bnyer-modules/bnyer-job/src/main/resources/mapper/job => bnyer-services/bnyer-job/src/main/resources/com/bnyer/job/mapper}/SysJobLogMapper.xml (93%) rename {bnyer-modules/bnyer-job/src/main/resources/mapper/job => bnyer-services/bnyer-job/src/main/resources/com/bnyer/job/mapper}/SysJobMapper.xml (92%) rename {bnyer-modules => bnyer-services}/bnyer-job/src/main/resources/logback.xml (97%) rename {bnyer-modules => bnyer-services}/bnyer-system/pom.xml (95%) rename {bnyer-modules => bnyer-services}/bnyer-system/src/main/java/com/bnyer/system/BnyerSystemApplication.java (50%) rename {bnyer-modules => bnyer-services}/bnyer-system/src/main/java/com/bnyer/system/controller/SysConfigController.java (100%) rename {bnyer-modules => bnyer-services}/bnyer-system/src/main/java/com/bnyer/system/controller/SysDeptController.java (100%) rename {bnyer-modules => bnyer-services}/bnyer-system/src/main/java/com/bnyer/system/controller/SysDictDataController.java (100%) rename {bnyer-modules => bnyer-services}/bnyer-system/src/main/java/com/bnyer/system/controller/SysDictTypeController.java (100%) rename {bnyer-modules => bnyer-services}/bnyer-system/src/main/java/com/bnyer/system/controller/SysLogininforController.java (100%) rename {bnyer-modules => bnyer-services}/bnyer-system/src/main/java/com/bnyer/system/controller/SysMenuController.java (100%) rename {bnyer-modules => bnyer-services}/bnyer-system/src/main/java/com/bnyer/system/controller/SysNoticeController.java (100%) rename {bnyer-modules => bnyer-services}/bnyer-system/src/main/java/com/bnyer/system/controller/SysOperlogController.java (100%) rename {bnyer-modules => bnyer-services}/bnyer-system/src/main/java/com/bnyer/system/controller/SysPostController.java (100%) rename {bnyer-modules => bnyer-services}/bnyer-system/src/main/java/com/bnyer/system/controller/SysProfileController.java (100%) rename {bnyer-modules => bnyer-services}/bnyer-system/src/main/java/com/bnyer/system/controller/SysRoleController.java (100%) rename {bnyer-modules => bnyer-services}/bnyer-system/src/main/java/com/bnyer/system/controller/SysUserController.java (100%) rename {bnyer-modules => bnyer-services}/bnyer-system/src/main/java/com/bnyer/system/controller/SysUserOnlineController.java (100%) rename {bnyer-modules => bnyer-services}/bnyer-system/src/main/java/com/bnyer/system/domain/SysConfig.java (100%) rename {bnyer-modules => bnyer-services}/bnyer-system/src/main/java/com/bnyer/system/domain/SysMenu.java (100%) rename {bnyer-modules => bnyer-services}/bnyer-system/src/main/java/com/bnyer/system/domain/SysNotice.java (100%) rename {bnyer-modules => bnyer-services}/bnyer-system/src/main/java/com/bnyer/system/domain/SysPost.java (100%) rename {bnyer-modules => bnyer-services}/bnyer-system/src/main/java/com/bnyer/system/domain/SysRoleDept.java (100%) rename {bnyer-modules => bnyer-services}/bnyer-system/src/main/java/com/bnyer/system/domain/SysRoleMenu.java (100%) rename {bnyer-modules => bnyer-services}/bnyer-system/src/main/java/com/bnyer/system/domain/SysUserOnline.java (100%) rename {bnyer-modules => bnyer-services}/bnyer-system/src/main/java/com/bnyer/system/domain/SysUserPost.java (100%) rename {bnyer-modules => bnyer-services}/bnyer-system/src/main/java/com/bnyer/system/domain/SysUserRole.java (100%) rename {bnyer-modules => bnyer-services}/bnyer-system/src/main/java/com/bnyer/system/domain/vo/MetaVo.java (100%) rename {bnyer-modules => bnyer-services}/bnyer-system/src/main/java/com/bnyer/system/domain/vo/RouterVo.java (100%) rename {bnyer-modules => bnyer-services}/bnyer-system/src/main/java/com/bnyer/system/domain/vo/TreeSelect.java (100%) rename {bnyer-modules => bnyer-services}/bnyer-system/src/main/java/com/bnyer/system/mapper/SysConfigMapper.java (100%) rename {bnyer-modules => bnyer-services}/bnyer-system/src/main/java/com/bnyer/system/mapper/SysDeptMapper.java (100%) rename {bnyer-modules => bnyer-services}/bnyer-system/src/main/java/com/bnyer/system/mapper/SysDictDataMapper.java (100%) rename {bnyer-modules => bnyer-services}/bnyer-system/src/main/java/com/bnyer/system/mapper/SysDictTypeMapper.java (100%) rename {bnyer-modules => bnyer-services}/bnyer-system/src/main/java/com/bnyer/system/mapper/SysLogininforMapper.java (100%) rename {bnyer-modules => bnyer-services}/bnyer-system/src/main/java/com/bnyer/system/mapper/SysMenuMapper.java (100%) rename {bnyer-modules => bnyer-services}/bnyer-system/src/main/java/com/bnyer/system/mapper/SysNoticeMapper.java (100%) rename {bnyer-modules => bnyer-services}/bnyer-system/src/main/java/com/bnyer/system/mapper/SysOperLogMapper.java (100%) rename {bnyer-modules => bnyer-services}/bnyer-system/src/main/java/com/bnyer/system/mapper/SysPostMapper.java (100%) rename {bnyer-modules => bnyer-services}/bnyer-system/src/main/java/com/bnyer/system/mapper/SysRoleDeptMapper.java (100%) rename {bnyer-modules => bnyer-services}/bnyer-system/src/main/java/com/bnyer/system/mapper/SysRoleMapper.java (100%) rename {bnyer-modules => bnyer-services}/bnyer-system/src/main/java/com/bnyer/system/mapper/SysRoleMenuMapper.java (100%) rename {bnyer-modules => bnyer-services}/bnyer-system/src/main/java/com/bnyer/system/mapper/SysUserMapper.java (100%) rename {bnyer-modules => bnyer-services}/bnyer-system/src/main/java/com/bnyer/system/mapper/SysUserPostMapper.java (100%) rename {bnyer-modules => bnyer-services}/bnyer-system/src/main/java/com/bnyer/system/mapper/SysUserRoleMapper.java (100%) rename {bnyer-modules => bnyer-services}/bnyer-system/src/main/java/com/bnyer/system/service/ISysConfigService.java (100%) rename {bnyer-modules => bnyer-services}/bnyer-system/src/main/java/com/bnyer/system/service/ISysDeptService.java (100%) rename {bnyer-modules => bnyer-services}/bnyer-system/src/main/java/com/bnyer/system/service/ISysDictDataService.java (100%) rename {bnyer-modules => bnyer-services}/bnyer-system/src/main/java/com/bnyer/system/service/ISysDictTypeService.java (100%) rename {bnyer-modules => bnyer-services}/bnyer-system/src/main/java/com/bnyer/system/service/ISysLogininforService.java (100%) rename {bnyer-modules => bnyer-services}/bnyer-system/src/main/java/com/bnyer/system/service/ISysMenuService.java (100%) rename {bnyer-modules => bnyer-services}/bnyer-system/src/main/java/com/bnyer/system/service/ISysNoticeService.java (100%) rename {bnyer-modules => bnyer-services}/bnyer-system/src/main/java/com/bnyer/system/service/ISysOperLogService.java (100%) rename {bnyer-modules => bnyer-services}/bnyer-system/src/main/java/com/bnyer/system/service/ISysPermissionService.java (100%) rename {bnyer-modules => bnyer-services}/bnyer-system/src/main/java/com/bnyer/system/service/ISysPostService.java (100%) rename {bnyer-modules => bnyer-services}/bnyer-system/src/main/java/com/bnyer/system/service/ISysRoleService.java (100%) rename {bnyer-modules => bnyer-services}/bnyer-system/src/main/java/com/bnyer/system/service/ISysUserOnlineService.java (100%) rename {bnyer-modules => bnyer-services}/bnyer-system/src/main/java/com/bnyer/system/service/ISysUserService.java (100%) rename {bnyer-modules => bnyer-services}/bnyer-system/src/main/java/com/bnyer/system/service/impl/SysConfigServiceImpl.java (100%) rename {bnyer-modules => bnyer-services}/bnyer-system/src/main/java/com/bnyer/system/service/impl/SysDeptServiceImpl.java (100%) rename {bnyer-modules => bnyer-services}/bnyer-system/src/main/java/com/bnyer/system/service/impl/SysDictDataServiceImpl.java (100%) rename {bnyer-modules => bnyer-services}/bnyer-system/src/main/java/com/bnyer/system/service/impl/SysDictTypeServiceImpl.java (100%) rename {bnyer-modules => bnyer-services}/bnyer-system/src/main/java/com/bnyer/system/service/impl/SysLogininforServiceImpl.java (100%) rename {bnyer-modules => bnyer-services}/bnyer-system/src/main/java/com/bnyer/system/service/impl/SysMenuServiceImpl.java (100%) rename {bnyer-modules => bnyer-services}/bnyer-system/src/main/java/com/bnyer/system/service/impl/SysNoticeServiceImpl.java (100%) rename {bnyer-modules => bnyer-services}/bnyer-system/src/main/java/com/bnyer/system/service/impl/SysOperLogServiceImpl.java (100%) rename {bnyer-modules => bnyer-services}/bnyer-system/src/main/java/com/bnyer/system/service/impl/SysPermissionServiceImpl.java (100%) rename {bnyer-modules => bnyer-services}/bnyer-system/src/main/java/com/bnyer/system/service/impl/SysPostServiceImpl.java (100%) rename {bnyer-modules => bnyer-services}/bnyer-system/src/main/java/com/bnyer/system/service/impl/SysRoleServiceImpl.java (100%) rename {bnyer-modules => bnyer-services}/bnyer-system/src/main/java/com/bnyer/system/service/impl/SysUserOnlineServiceImpl.java (100%) rename {bnyer-modules => bnyer-services}/bnyer-system/src/main/java/com/bnyer/system/service/impl/SysUserServiceImpl.java (100%) rename {bnyer-modules => bnyer-services}/bnyer-system/src/main/resources/bootstrap.yml (50%) rename {bnyer-modules/bnyer-system/src/main/resources/mapper/system => bnyer-services/bnyer-system/src/main/resources/com/bnyer/system/mapper}/SysConfigMapper.xml (90%) rename {bnyer-modules/bnyer-system/src/main/resources/mapper/system => bnyer-services/bnyer-system/src/main/resources/com/bnyer/system/mapper}/SysDeptMapper.xml (94%) rename {bnyer-modules/bnyer-system/src/main/resources/mapper/system => bnyer-services/bnyer-system/src/main/resources/com/bnyer/system/mapper}/SysDictDataMapper.xml (100%) rename {bnyer-modules/bnyer-system/src/main/resources/mapper/system => bnyer-services/bnyer-system/src/main/resources/com/bnyer/system/mapper}/SysDictTypeMapper.xml (100%) rename {bnyer-modules/bnyer-system/src/main/resources/mapper/system => bnyer-services/bnyer-system/src/main/resources/com/bnyer/system/mapper}/SysLogininforMapper.xml (100%) rename {bnyer-modules/bnyer-system/src/main/resources/mapper/system => bnyer-services/bnyer-system/src/main/resources/com/bnyer/system/mapper}/SysMenuMapper.xml (95%) rename {bnyer-modules/bnyer-system/src/main/resources/mapper/system => bnyer-services/bnyer-system/src/main/resources/com/bnyer/system/mapper}/SysNoticeMapper.xml (91%) rename {bnyer-modules/bnyer-system/src/main/resources/mapper/system => bnyer-services/bnyer-system/src/main/resources/com/bnyer/system/mapper}/SysOperLogMapper.xml (100%) rename {bnyer-modules/bnyer-system/src/main/resources/mapper/system => bnyer-services/bnyer-system/src/main/resources/com/bnyer/system/mapper}/SysPostMapper.xml (92%) rename {bnyer-modules/bnyer-system/src/main/resources/mapper/system => bnyer-services/bnyer-system/src/main/resources/com/bnyer/system/mapper}/SysRoleDeptMapper.xml (92%) rename {bnyer-modules/bnyer-system/src/main/resources/mapper/system => bnyer-services/bnyer-system/src/main/resources/com/bnyer/system/mapper}/SysRoleMapper.xml (100%) rename {bnyer-modules/bnyer-system/src/main/resources/mapper/system => bnyer-services/bnyer-system/src/main/resources/com/bnyer/system/mapper}/SysRoleMenuMapper.xml (92%) rename {bnyer-modules/bnyer-system/src/main/resources/mapper/system => bnyer-services/bnyer-system/src/main/resources/com/bnyer/system/mapper}/SysUserMapper.xml (100%) rename {bnyer-modules/bnyer-system/src/main/resources/mapper/system => bnyer-services/bnyer-system/src/main/resources/com/bnyer/system/mapper}/SysUserPostMapper.xml (92%) rename {bnyer-modules/bnyer-system/src/main/resources/mapper/system => bnyer-services/bnyer-system/src/main/resources/com/bnyer/system/mapper}/SysUserRoleMapper.xml (88%) rename {bnyer-modules => bnyer-services}/bnyer-system/src/main/resources/logback.xml (97%) rename {bnyer-modules => bnyer-services}/pom.xml (85%) delete mode 100644 bnyer-visual/bnyer-monitor/src/main/resources/banner.txt diff --git a/bnyer-auth/src/main/java/com/bnyer/auth/BnyerAuthApplication.java b/bnyer-auth/src/main/java/com/bnyer/auth/BnyerAuthApplication.java index 4574afe..0ec0984 100644 --- a/bnyer-auth/src/main/java/com/bnyer/auth/BnyerAuthApplication.java +++ b/bnyer-auth/src/main/java/com/bnyer/auth/BnyerAuthApplication.java @@ -17,15 +17,12 @@ public class BnyerAuthApplication public static void main(String[] args) { SpringApplication.run(BnyerAuthApplication.class, args); - System.out.println("(♥◠‿◠)ﾉﾞ 认证授权中心启动成功 ლ(´ڡ`ლ)ﾞ \n" + - " .-------. ____ __ \n" + - " | _ _ \\ \\ \\ / / \n" + - " | ( ' ) | \\ _. / ' \n" + - " |(_ o _) / _( )_ .' \n" + - " | (_,_).' __ ___(_ o _)' \n" + - " | |\\ \\ | || |(_,_)' \n" + - " | | \\ `' /| `-' / \n" + - " | | \\ / \\ / \n" + - " ''-' `'-' `-..-' "); + System.out.println("(♥◠‿◠)ﾉﾞ bnyer认证服务启动成功 ლ(´ڡ`ლ)ﾞ \n" + + "__________ \n" + + "\\______ \\ ____ ___.__. ___________ \n" + + " | | _// < | |/ __ \\_ __ \\\n" + + " | | \\ | \\___ \\ ___/| | \\/\n" + + " |______ /___| / ____|\\___ >__| \n" + + " \\/ \\/\\/ \\/ \n"); } } diff --git a/bnyer-auth/src/main/resources/banner.txt b/bnyer-auth/src/main/resources/banner.txt deleted file mode 100644 index 34068df..0000000 --- a/bnyer-auth/src/main/resources/banner.txt +++ /dev/null @@ -1,13 +0,0 @@ -Spring Boot Version: ${spring-boot.version} -Spring Application Name: ${spring.application.name} - .----------------. .-----------------. .----------------. .----------------. .----------------. .----------------. .----------------. .----------------. .----------------. .----------------. -| .--------------. || .--------------. || .--------------. || .--------------. || .--------------. || .--------------. || .--------------. || .--------------. || .--------------. || .--------------. | -| | ______ | || | ____ _____ | || | ____ ____ | || | _________ | || | _______ | || | | || | __ | || | _____ _____ | || | _________ | || | ____ ____ | | -| | |_ _ \ | || ||_ \|_ _| | || | |_ _||_ _| | || | |_ ___ | | || | |_ __ \ | || | | || | / \ | || ||_ _||_ _|| || | | _ _ | | || | |_ || _| | | -| | | |_) | | || | | \ | | | || | \ \ / / | || | | |_ \_| | || | | |__) | | || | ______ | || | / /\ \ | || | | | | | | || | |_/ | | \_| | || | | |__| | | | -| | | __'. | || | | |\ \| | | || | \ \/ / | || | | _| _ | || | | __ / | || | |______| | || | / ____ \ | || | | ' ' | | || | | | | || | | __ | | | -| | _| |__) | | || | _| |_\ |_ | || | _| |_ | || | _| |___/ | | || | _| | \ \_ | || | | || | _/ / \ \_ | || | \ `--' / | || | _| |_ | || | _| | | |_ | | -| | |_______/ | || ||_____|\____| | || | |______| | || | |_________| | || | |____| |___| | || | | || ||____| |____|| || | `.__.' | || | |_____| | || | |____||____| | | -| | | || | | || | | || | | || | | || | | || | | || | | || | | || | | | -| '--------------' || '--------------' || '--------------' || '--------------' || '--------------' || '--------------' || '--------------' || '--------------' || '--------------' || '--------------' | - '----------------' '----------------' '----------------' '----------------' '----------------' '----------------' '----------------' '----------------' '----------------' '----------------' diff --git a/bnyer-auth/src/main/resources/bootstrap.yml b/bnyer-auth/src/main/resources/bootstrap.yml index 3072753..7722023 100644 --- a/bnyer-auth/src/main/resources/bootstrap.yml +++ b/bnyer-auth/src/main/resources/bootstrap.yml @@ -1,9 +1,12 @@ # Tomcat server: - port: 9200 + port: 8010 # Spring -spring: +spring: + main: + #解决循环依赖问题 + allow-circular-references: true application: # 应用名称 name: bnyer-auth @@ -14,12 +17,20 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 127.0.0.1:8848 + server-addr: 127.0.0.1:6231 + # 命名空间地址 + namespace: 52a72b07-7081-445b-b500-76976957abbc + # 命名空间 + group: dev config: # 配置中心地址 - server-addr: 127.0.0.1:8848 + server-addr: 127.0.0.1:6231 # 配置文件格式 file-extension: yml + # 命名空间地址 + namespace: 52a72b07-7081-445b-b500-76976957abbc + # 命名空间 + group: dev # 共享配置 shared-configs: - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} diff --git a/bnyer-auth/src/main/resources/logback.xml b/bnyer-auth/src/main/resources/logback.xml index 62306e5..0e867b3 100644 --- a/bnyer-auth/src/main/resources/logback.xml +++ b/bnyer-auth/src/main/resources/logback.xml @@ -20,7 +20,7 @@ ${log.path}/info.%d{yyyy-MM-dd}.log - 60 + 20 ${log.pattern} @@ -42,7 +42,7 @@ ${log.path}/error.%d{yyyy-MM-dd}.log - 60 + 20 ${log.pattern} diff --git a/bnyer-common/pom.xml b/bnyer-common/pom.xml index 67176f5..197f450 100644 --- a/bnyer-common/pom.xml +++ b/bnyer-common/pom.xml @@ -15,7 +15,7 @@ bnyer-common-swagger bnyer-common-security bnyer-common-datascope - bnyer-common-datasource + bnyer-common-datasource bnyer-common diff --git a/bnyer-gateway/src/main/java/com/bnyer/gateway/BnyerGatewayApplication.java b/bnyer-gateway/src/main/java/com/bnyer/gateway/BnyerGatewayApplication.java index 05df04d..f8dc158 100644 --- a/bnyer-gateway/src/main/java/com/bnyer/gateway/BnyerGatewayApplication.java +++ b/bnyer-gateway/src/main/java/com/bnyer/gateway/BnyerGatewayApplication.java @@ -16,14 +16,11 @@ public class BnyerGatewayApplication { SpringApplication.run(BnyerGatewayApplication.class, args); System.out.println("(♥◠‿◠)ﾉﾞ bnyer网关启动成功 ლ(´ڡ`ლ)ﾞ \n" + - " .-------. ____ __ \n" + - " | _ _ \\ \\ \\ / / \n" + - " | ( ' ) | \\ _. / ' \n" + - " |(_ o _) / _( )_ .' \n" + - " | (_,_).' __ ___(_ o _)' \n" + - " | |\\ \\ | || |(_,_)' \n" + - " | | \\ `' /| `-' / \n" + - " | | \\ / \\ / \n" + - " ''-' `'-' `-..-' "); + "__________ \n" + + "\\______ \\ ____ ___.__. ___________ \n" + + " | | _// < | |/ __ \\_ __ \\\n" + + " | | \\ | \\___ \\ ___/| | \\/\n" + + " |______ /___| / ____|\\___ >__| \n" + + " \\/ \\/\\/ \\/ \n"); } } diff --git a/bnyer-gateway/src/main/resources/banner.txt b/bnyer-gateway/src/main/resources/banner.txt deleted file mode 100644 index db4bd8a..0000000 --- a/bnyer-gateway/src/main/resources/banner.txt +++ /dev/null @@ -1,14 +0,0 @@ -Spring Boot Version: ${spring-boot.version} -Spring Application Name: ${spring.application.name} - - .----------------. .-----------------. .----------------. .----------------. .----------------. .----------------. .----------------. .----------------. .----------------. .----------------. .----------------. .----------------. .----------------. -| .--------------. || .--------------. || .--------------. || .--------------. || .--------------. || .--------------. || .--------------. || .--------------. || .--------------. || .--------------. || .--------------. || .--------------. || .--------------. | -| | ______ | || | ____ _____ | || | ____ ____ | || | _________ | || | _______ | || | | || | ______ | || | __ | || | _________ | || | _________ | || | _____ _____ | || | __ | || | ____ ____ | | -| | |_ _ \ | || ||_ \|_ _| | || | |_ _||_ _| | || | |_ ___ | | || | |_ __ \ | || | | || | .' ___ | | || | / \ | || | | _ _ | | || | |_ ___ | | || ||_ _||_ _|| || | / \ | || | |_ _||_ _| | | -| | | |_) | | || | | \ | | | || | \ \ / / | || | | |_ \_| | || | | |__) | | || | ______ | || | / .' \_| | || | / /\ \ | || | |_/ | | \_| | || | | |_ \_| | || | | | /\ | | | || | / /\ \ | || | \ \ / / | | -| | | __'. | || | | |\ \| | | || | \ \/ / | || | | _| _ | || | | __ / | || | |______| | || | | | ____ | || | / ____ \ | || | | | | || | | _| _ | || | | |/ \| | | || | / ____ \ | || | \ \/ / | | -| | _| |__) | | || | _| |_\ |_ | || | _| |_ | || | _| |___/ | | || | _| | \ \_ | || | | || | \ `.___] _| | || | _/ / \ \_ | || | _| |_ | || | _| |___/ | | || | | /\ | | || | _/ / \ \_ | || | _| |_ | | -| | |_______/ | || ||_____|\____| | || | |______| | || | |_________| | || | |____| |___| | || | | || | `._____.' | || ||____| |____|| || | |_____| | || | |_________| | || | |__/ \__| | || ||____| |____|| || | |______| | | -| | | || | | || | | || | | || | | || | | || | | || | | || | | || | | || | | || | | || | | | -| '--------------' || '--------------' || '--------------' || '--------------' || '--------------' || '--------------' || '--------------' || '--------------' || '--------------' || '--------------' || '--------------' || '--------------' || '--------------' | - '----------------' '----------------' '----------------' '----------------' '----------------' '----------------' '----------------' '----------------' '----------------' '----------------' '----------------' '----------------' '----------------' diff --git a/bnyer-gateway/src/main/resources/bootstrap.yml b/bnyer-gateway/src/main/resources/bootstrap.yml index 1dbe10a..995dbef 100644 --- a/bnyer-gateway/src/main/resources/bootstrap.yml +++ b/bnyer-gateway/src/main/resources/bootstrap.yml @@ -1,6 +1,6 @@ # Tomcat server: - port: 8080 + port: 7010 # Spring spring: @@ -17,12 +17,20 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 127.0.0.1:8848 + server-addr: 127.0.0.1:6231 + # 命名空间地址 + namespace: 52a72b07-7081-445b-b500-76976957abbc + # 命名空间分组 + group: dev config: # 配置中心地址 - server-addr: 127.0.0.1:8848 + server-addr: 127.0.0.1:6231 # 配置文件格式 file-extension: yml + # 命名空间地址 + namespace: 52a72b07-7081-445b-b500-76976957abbc + # 命名空间分组 + group: dev # 共享配置 shared-configs: - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} @@ -31,12 +39,12 @@ spring: eager: true transport: # 控制台地址 - dashboard: 127.0.0.1:8718 + dashboard: 127.0.0.1:7011 # nacos配置持久化 datasource: ds1: nacos: - server-addr: 127.0.0.1:8848 + server-addr: 127.0.0.1:6231 dataId: sentinel-bnyer-gateway groupId: DEFAULT_GROUP data-type: json diff --git a/bnyer-gateway/src/main/resources/logback.xml b/bnyer-gateway/src/main/resources/logback.xml index 84a2d44..3f6912c 100644 --- a/bnyer-gateway/src/main/resources/logback.xml +++ b/bnyer-gateway/src/main/resources/logback.xml @@ -20,7 +20,7 @@ ${log.path}/info.%d{yyyy-MM-dd}.log - 60 + 20 ${log.pattern} @@ -42,7 +42,7 @@ ${log.path}/error.%d{yyyy-MM-dd}.log - 60 + 20 ${log.pattern} diff --git a/bnyer-modules/bnyer-file/src/main/java/com/bnyer/file/BnyerFileApplication.java b/bnyer-modules/bnyer-file/src/main/java/com/bnyer/file/BnyerFileApplication.java deleted file mode 100644 index 36e23cc..0000000 --- a/bnyer-modules/bnyer-file/src/main/java/com/bnyer/file/BnyerFileApplication.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.bnyer.file; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; -import com.bnyer.common.swagger.annotation.EnableCustomSwagger2; - -/** - * 文件服务 - * - * @author ruoyi - */ -@EnableCustomSwagger2 -@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class }) -public class BnyerFileApplication -{ - public static void main(String[] args) - { - SpringApplication.run(BnyerFileApplication.class, args); - System.out.println("(♥◠‿◠)ﾉﾞ 文件服务模块启动成功 ლ(´ڡ`ლ)ﾞ \n" + - " .-------. ____ __ \n" + - " | _ _ \\ \\ \\ / / \n" + - " | ( ' ) | \\ _. / ' \n" + - " |(_ o _) / _( )_ .' \n" + - " | (_,_).' __ ___(_ o _)' \n" + - " | |\\ \\ | || |(_,_)' \n" + - " | | \\ `' /| `-' / \n" + - " | | \\ / \\ / \n" + - " ''-' `'-' `-..-' "); - } -} diff --git a/bnyer-modules/bnyer-file/src/main/resources/banner.txt b/bnyer-modules/bnyer-file/src/main/resources/banner.txt deleted file mode 100644 index 1aab93b..0000000 --- a/bnyer-modules/bnyer-file/src/main/resources/banner.txt +++ /dev/null @@ -1,14 +0,0 @@ -Spring Boot Version: ${spring-boot.version} -Spring Application Name: ${spring.application.name} - - .----------------. .-----------------. .----------------. .----------------. .----------------. .----------------. .----------------. .----------------. .----------------. .----------------. -| .--------------. || .--------------. || .--------------. || .--------------. || .--------------. || .--------------. || .--------------. || .--------------. || .--------------. || .--------------. | -| | ______ | || | ____ _____ | || | ____ ____ | || | _________ | || | _______ | || | | || | _________ | || | _____ | || | _____ | || | _________ | | -| | |_ _ \ | || ||_ \|_ _| | || | |_ _||_ _| | || | |_ ___ | | || | |_ __ \ | || | | || | |_ ___ | | || | |_ _| | || | |_ _| | || | |_ ___ | | | -| | | |_) | | || | | \ | | | || | \ \ / / | || | | |_ \_| | || | | |__) | | || | ______ | || | | |_ \_| | || | | | | || | | | | || | | |_ \_| | | -| | | __'. | || | | |\ \| | | || | \ \/ / | || | | _| _ | || | | __ / | || | |______| | || | | _| | || | | | | || | | | _ | || | | _| _ | | -| | _| |__) | | || | _| |_\ |_ | || | _| |_ | || | _| |___/ | | || | _| | \ \_ | || | | || | _| |_ | || | _| |_ | || | _| |__/ | | || | _| |___/ | | | -| | |_______/ | || ||_____|\____| | || | |______| | || | |_________| | || | |____| |___| | || | | || | |_____| | || | |_____| | || | |________| | || | |_________| | | -| | | || | | || | | || | | || | | || | | || | | || | | || | | || | | | -| '--------------' || '--------------' || '--------------' || '--------------' || '--------------' || '--------------' || '--------------' || '--------------' || '--------------' || '--------------' | - '----------------' '----------------' '----------------' '----------------' '----------------' '----------------' '----------------' '----------------' '----------------' '----------------' diff --git a/bnyer-modules/bnyer-gen/src/main/java/com/bnyer/gen/BnyerGenApplication.java b/bnyer-modules/bnyer-gen/src/main/java/com/bnyer/gen/BnyerGenApplication.java deleted file mode 100644 index f66ce67..0000000 --- a/bnyer-modules/bnyer-gen/src/main/java/com/bnyer/gen/BnyerGenApplication.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.bnyer.gen; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import com.bnyer.common.security.annotation.EnableCustomConfig; -import com.bnyer.common.security.annotation.EnableRyFeignClients; -import com.bnyer.common.swagger.annotation.EnableCustomSwagger2; - -/** - * 代码生成 - * - * @author ruoyi - */ -@EnableCustomConfig -@EnableCustomSwagger2 -@EnableRyFeignClients -@SpringBootApplication -public class BnyerGenApplication -{ - public static void main(String[] args) - { - SpringApplication.run(BnyerGenApplication.class, args); - System.out.println("(♥◠‿◠)ﾉﾞ 代码生成模块启动成功 ლ(´ڡ`ლ)ﾞ \n" + - " .-------. ____ __ \n" + - " | _ _ \\ \\ \\ / / \n" + - " | ( ' ) | \\ _. / ' \n" + - " |(_ o _) / _( )_ .' \n" + - " | (_,_).' __ ___(_ o _)' \n" + - " | |\\ \\ | || |(_,_)' \n" + - " | | \\ `' /| `-' / \n" + - " | | \\ / \\ / \n" + - " ''-' `'-' `-..-' "); - } -} diff --git a/bnyer-modules/bnyer-gen/src/main/java/com/bnyer/gen/config/GenConfig.java b/bnyer-modules/bnyer-gen/src/main/java/com/bnyer/gen/config/GenConfig.java deleted file mode 100644 index da98fd0..0000000 --- a/bnyer-modules/bnyer-gen/src/main/java/com/bnyer/gen/config/GenConfig.java +++ /dev/null @@ -1,66 +0,0 @@ -package com.bnyer.gen.config; - -import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.stereotype.Component; - -/** - * 代码生成相关配置 - * - * @author ruoyi - */ -@Component -@ConfigurationProperties(prefix = "gen") -public class GenConfig -{ - /** 作者 */ - public static String author; - - /** 生成包路径 */ - public static String packageName; - - /** 自动去除表前缀，默认是false */ - public static boolean autoRemovePre; - - /** 表前缀(类名不会包含表前缀) */ - public static String tablePrefix; - - public static String getAuthor() - { - return author; - } - - public void setAuthor(String author) - { - GenConfig.author = author; - } - - public static String getPackageName() - { - return packageName; - } - - public void setPackageName(String packageName) - { - GenConfig.packageName = packageName; - } - - public static boolean getAutoRemovePre() - { - return autoRemovePre; - } - - public void setAutoRemovePre(boolean autoRemovePre) - { - GenConfig.autoRemovePre = autoRemovePre; - } - - public static String getTablePrefix() - { - return tablePrefix; - } - - public void setTablePrefix(String tablePrefix) - { - GenConfig.tablePrefix = tablePrefix; - } -} diff --git a/bnyer-modules/bnyer-gen/src/main/java/com/bnyer/gen/controller/GenController.java b/bnyer-modules/bnyer-gen/src/main/java/com/bnyer/gen/controller/GenController.java deleted file mode 100644 index b578df9..0000000 --- a/bnyer-modules/bnyer-gen/src/main/java/com/bnyer/gen/controller/GenController.java +++ /dev/null @@ -1,212 +0,0 @@ -package com.bnyer.gen.controller; - -import java.io.IOException; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import javax.servlet.http.HttpServletResponse; - -import com.bnyer.gen.domain.GenTableColumn; -import com.bnyer.gen.service.IGenTableColumnService; -import org.apache.commons.io.IOUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -import com.bnyer.common.core.text.Convert; -import com.bnyer.common.core.web.controller.BaseController; -import com.bnyer.common.core.web.domain.AjaxResult; -import com.bnyer.common.core.web.page.TableDataInfo; -import com.bnyer.common.log.annotation.Log; -import com.bnyer.common.log.enums.BusinessType; -import com.bnyer.common.security.annotation.RequiresPermissions; -import com.bnyer.gen.domain.GenTable; -import com.bnyer.gen.service.IGenTableService; - -/** - * 代码生成 操作处理 - * - * @author ruoyi - */ -@RequestMapping("/gen") -@RestController -public class GenController extends BaseController -{ - @Autowired - private IGenTableService genTableService; - - @Autowired - private IGenTableColumnService genTableColumnService; - - /** - * 查询代码生成列表 - */ - @RequiresPermissions("tool:gen:list") - @GetMapping("/list") - public TableDataInfo genList(GenTable genTable) - { - startPage(); - List list = genTableService.selectGenTableList(genTable); - return getDataTable(list); - } - - /** - * 修改代码生成业务 - */ - @RequiresPermissions("tool:gen:query") - @GetMapping(value = "/{tableId}") - public AjaxResult getInfo(@PathVariable Long tableId) - { - GenTable table = genTableService.selectGenTableById(tableId); - List tables = genTableService.selectGenTableAll(); - List list = genTableColumnService.selectGenTableColumnListByTableId(tableId); - Map map = new HashMap(); - map.put("info", table); - map.put("rows", list); - map.put("tables", tables); - return AjaxResult.success(map); - } - - /** - * 查询数据库列表 - */ - @RequiresPermissions("tool:gen:list") - @GetMapping("/db/list") - public TableDataInfo dataList(GenTable genTable) - { - startPage(); - List list = genTableService.selectDbTableList(genTable); - return getDataTable(list); - } - - /** - * 查询数据表字段列表 - */ - @GetMapping(value = "/column/{tableId}") - public TableDataInfo columnList(Long tableId) - { - TableDataInfo dataInfo = new TableDataInfo(); - List list = genTableColumnService.selectGenTableColumnListByTableId(tableId); - dataInfo.setRows(list); - dataInfo.setTotal(list.size()); - return dataInfo; - } - - /** - * 导入表结构（保存） - */ - @RequiresPermissions("tool:gen:import") - @Log(title = "代码生成", businessType = BusinessType.IMPORT) - @PostMapping("/importTable") - public AjaxResult importTableSave(String tables) - { - String[] tableNames = Convert.toStrArray(tables); - // 查询表信息 - List tableList = genTableService.selectDbTableListByNames(tableNames); - genTableService.importGenTable(tableList); - return AjaxResult.success(); - } - - /** - * 修改保存代码生成业务 - */ - @RequiresPermissions("tool:gen:edit") - @Log(title = "代码生成", businessType = BusinessType.UPDATE) - @PutMapping - public AjaxResult editSave(@Validated @RequestBody GenTable genTable) - { - genTableService.validateEdit(genTable); - genTableService.updateGenTable(genTable); - return AjaxResult.success(); - } - - /** - * 删除代码生成 - */ - @RequiresPermissions("tool:gen:remove") - @Log(title = "代码生成", businessType = BusinessType.DELETE) - @DeleteMapping("/{tableIds}") - public AjaxResult remove(@PathVariable Long[] tableIds) - { - genTableService.deleteGenTableByIds(tableIds); - return AjaxResult.success(); - } - - /** - * 预览代码 - */ - @RequiresPermissions("tool:gen:preview") - @GetMapping("/preview/{tableId}") - public AjaxResult preview(@PathVariable("tableId") Long tableId) throws IOException - { - Map dataMap = genTableService.previewCode(tableId); - return AjaxResult.success(dataMap); - } - - /** - * 生成代码（下载方式） - */ - @RequiresPermissions("tool:gen:code") - @Log(title = "代码生成", businessType = BusinessType.GENCODE) - @GetMapping("/download/{tableName}") - public void download(HttpServletResponse response, @PathVariable("tableName") String tableName) throws IOException - { - byte[] data = genTableService.downloadCode(tableName); - genCode(response, data); - } - - /** - * 生成代码（自定义路径） - */ - @RequiresPermissions("tool:gen:code") - @Log(title = "代码生成", businessType = BusinessType.GENCODE) - @GetMapping("/genCode/{tableName}") - public AjaxResult genCode(@PathVariable("tableName") String tableName) - { - genTableService.generatorCode(tableName); - return AjaxResult.success(); - } - - /** - * 同步数据库 - */ - @RequiresPermissions("tool:gen:edit") - @Log(title = "代码生成", businessType = BusinessType.UPDATE) - @GetMapping("/synchDb/{tableName}") - public AjaxResult synchDb(@PathVariable("tableName") String tableName) - { - genTableService.synchDb(tableName); - return AjaxResult.success(); - } - - /** - * 批量生成代码 - */ - @RequiresPermissions("tool:gen:code") - @Log(title = "代码生成", businessType = BusinessType.GENCODE) - @GetMapping("/batchGenCode") - public void batchGenCode(HttpServletResponse response, String tables) throws IOException - { - String[] tableNames = Convert.toStrArray(tables); - byte[] data = genTableService.downloadCode(tableNames); - genCode(response, data); - } - - /** - * 生成zip文件 - */ - private void genCode(HttpServletResponse response, byte[] data) throws IOException - { - response.reset(); - response.setHeader("Content-Disposition", "attachment; filename=\"bnyer.zip\""); - response.addHeader("Content-Length", "" + data.length); - response.setContentType("application/octet-stream; charset=UTF-8"); - IOUtils.write(data, response.getOutputStream()); - } -} diff --git a/bnyer-modules/bnyer-gen/src/main/java/com/bnyer/gen/domain/GenTable.java b/bnyer-modules/bnyer-gen/src/main/java/com/bnyer/gen/domain/GenTable.java deleted file mode 100644 index a9af890..0000000 --- a/bnyer-modules/bnyer-gen/src/main/java/com/bnyer/gen/domain/GenTable.java +++ /dev/null @@ -1,370 +0,0 @@ -package com.bnyer.gen.domain; - -import java.util.List; -import javax.validation.Valid; -import javax.validation.constraints.NotBlank; -import org.apache.commons.lang3.ArrayUtils; -import com.bnyer.common.core.constant.GenConstants; -import com.bnyer.common.core.utils.StringUtils; -import com.bnyer.common.core.web.domain.BaseEntity; - -/** - * 业务表 gen_table - * - * @author ruoyi - */ -public class GenTable extends BaseEntity -{ - private static final long serialVersionUID = 1L; - - /** 编号 */ - private Long tableId; - - /** 表名称 */ - @NotBlank(message = "表名称不能为空") - private String tableName; - - /** 表描述 */ - @NotBlank(message = "表描述不能为空") - private String tableComment; - - /** 关联父表的表名 */ - private String subTableName; - - /** 本表关联父表的外键名 */ - private String subTableFkName; - - /** 实体类名称(首字母大写) */ - @NotBlank(message = "实体类名称不能为空") - private String className; - - /** 使用的模板（crud单表操作 tree树表操作 sub主子表操作） */ - private String tplCategory; - - /** 生成包路径 */ - @NotBlank(message = "生成包路径不能为空") - private String packageName; - - /** 生成模块名 */ - @NotBlank(message = "生成模块名不能为空") - private String moduleName; - - /** 生成业务名 */ - @NotBlank(message = "生成业务名不能为空") - private String businessName; - - /** 生成功能名 */ - @NotBlank(message = "生成功能名不能为空") - private String functionName; - - /** 生成作者 */ - @NotBlank(message = "作者不能为空") - private String functionAuthor; - - /** 生成代码方式（0zip压缩包 1自定义路径） */ - private String genType; - - /** 生成路径（不填默认项目路径） */ - private String genPath; - - /** 主键信息 */ - private GenTableColumn pkColumn; - - /** 子表信息 */ - private GenTable subTable; - - /** 表列信息 */ - @Valid - private List columns; - - /** 其它生成选项 */ - private String options; - - /** 树编码字段 */ - private String treeCode; - - /** 树父编码字段 */ - private String treeParentCode; - - /** 树名称字段 */ - private String treeName; - - /** 上级菜单ID字段 */ - private String parentMenuId; - - /** 上级菜单名称字段 */ - private String parentMenuName; - - public Long getTableId() - { - return tableId; - } - - public void setTableId(Long tableId) - { - this.tableId = tableId; - } - - public String getTableName() - { - return tableName; - } - - public void setTableName(String tableName) - { - this.tableName = tableName; - } - - public String getTableComment() - { - return tableComment; - } - - public void setTableComment(String tableComment) - { - this.tableComment = tableComment; - } - - public String getSubTableName() - { - return subTableName; - } - - public void setSubTableName(String subTableName) - { - this.subTableName = subTableName; - } - - public String getSubTableFkName() - { - return subTableFkName; - } - - public void setSubTableFkName(String subTableFkName) - { - this.subTableFkName = subTableFkName; - } - - public String getClassName() - { - return className; - } - - public void setClassName(String className) - { - this.className = className; - } - - public String getTplCategory() - { - return tplCategory; - } - - public void setTplCategory(String tplCategory) - { - this.tplCategory = tplCategory; - } - - public String getPackageName() - { - return packageName; - } - - public void setPackageName(String packageName) - { - this.packageName = packageName; - } - - public String getModuleName() - { - return moduleName; - } - - public void setModuleName(String moduleName) - { - this.moduleName = moduleName; - } - - public String getBusinessName() - { - return businessName; - } - - public void setBusinessName(String businessName) - { - this.businessName = businessName; - } - - public String getFunctionName() - { - return functionName; - } - - public void setFunctionName(String functionName) - { - this.functionName = functionName; - } - - public String getFunctionAuthor() - { - return functionAuthor; - } - - public void setFunctionAuthor(String functionAuthor) - { - this.functionAuthor = functionAuthor; - } - - public String getGenType() - { - return genType; - } - - public void setGenType(String genType) - { - this.genType = genType; - } - - public String getGenPath() - { - return genPath; - } - - public void setGenPath(String genPath) - { - this.genPath = genPath; - } - - public GenTableColumn getPkColumn() - { - return pkColumn; - } - - public void setPkColumn(GenTableColumn pkColumn) - { - this.pkColumn = pkColumn; - } - - public GenTable getSubTable() - { - return subTable; - } - - public void setSubTable(GenTable subTable) - { - this.subTable = subTable; - } - public List getColumns() - { - return columns; - } - - public void setColumns(List columns) - { - this.columns = columns; - } - - public String getOptions() - { - return options; - } - - public void setOptions(String options) - { - this.options = options; - } - - public String getTreeCode() - { - return treeCode; - } - - public void setTreeCode(String treeCode) - { - this.treeCode = treeCode; - } - - public String getTreeParentCode() - { - return treeParentCode; - } - - public void setTreeParentCode(String treeParentCode) - { - this.treeParentCode = treeParentCode; - } - - public String getTreeName() - { - return treeName; - } - - public void setTreeName(String treeName) - { - this.treeName = treeName; - } - - public String getParentMenuId() - { - return parentMenuId; - } - - public void setParentMenuId(String parentMenuId) - { - this.parentMenuId = parentMenuId; - } - - public String getParentMenuName() - { - return parentMenuName; - } - - public void setParentMenuName(String parentMenuName) - { - this.parentMenuName = parentMenuName; - } - - public boolean isSub() - { - return isSub(this.tplCategory); - } - - public static boolean isSub(String tplCategory) - { - return tplCategory != null && StringUtils.equals(GenConstants.TPL_SUB, tplCategory); - } - public boolean isTree() - { - return isTree(this.tplCategory); - } - - public static boolean isTree(String tplCategory) - { - return tplCategory != null && StringUtils.equals(GenConstants.TPL_TREE, tplCategory); - } - - public boolean isCrud() - { - return isCrud(this.tplCategory); - } - - public static boolean isCrud(String tplCategory) - { - return tplCategory != null && StringUtils.equals(GenConstants.TPL_CRUD, tplCategory); - } - - public boolean isSuperColumn(String javaField) - { - return isSuperColumn(this.tplCategory, javaField); - } - - public static boolean isSuperColumn(String tplCategory, String javaField) - { - if (isTree(tplCategory)) - { - return StringUtils.equalsAnyIgnoreCase(javaField, - ArrayUtils.addAll(GenConstants.TREE_ENTITY, GenConstants.BASE_ENTITY)); - } - return StringUtils.equalsAnyIgnoreCase(javaField, GenConstants.BASE_ENTITY); - } -} diff --git a/bnyer-modules/bnyer-gen/src/main/java/com/bnyer/gen/domain/GenTableColumn.java b/bnyer-modules/bnyer-gen/src/main/java/com/bnyer/gen/domain/GenTableColumn.java deleted file mode 100644 index 1e6db3b..0000000 --- a/bnyer-modules/bnyer-gen/src/main/java/com/bnyer/gen/domain/GenTableColumn.java +++ /dev/null @@ -1,374 +0,0 @@ -package com.bnyer.gen.domain; - -import javax.validation.constraints.NotBlank; - -import com.bnyer.common.core.utils.StringUtils; -import com.bnyer.common.core.web.domain.BaseEntity; - -/** - * 代码生成业务字段表 gen_table_column - * - * @author ruoyi - */ -public class GenTableColumn extends BaseEntity -{ - private static final long serialVersionUID = 1L; - - /** 编号 */ - private Long columnId; - - /** 归属表编号 */ - private Long tableId; - - /** 列名称 */ - private String columnName; - - /** 列描述 */ - private String columnComment; - - /** 列类型 */ - private String columnType; - - /** JAVA类型 */ - private String javaType; - - /** JAVA字段名 */ - @NotBlank(message = "Java属性不能为空") - private String javaField; - - /** 是否主键（1是） */ - private String isPk; - - /** 是否自增（1是） */ - private String isIncrement; - - /** 是否必填（1是） */ - private String isRequired; - - /** 是否为插入字段（1是） */ - private String isInsert; - - /** 是否编辑字段（1是） */ - private String isEdit; - - /** 是否列表字段（1是） */ - private String isList; - - /** 是否查询字段（1是） */ - private String isQuery; - - /** 查询方式（EQ等于、NE不等于、GT大于、LT小于、LIKE模糊、BETWEEN范围） */ - private String queryType; - - /** 显示类型（input文本框、textarea文本域、select下拉框、checkbox复选框、radio单选框、datetime日期控件、image图片上传控件、upload文件上传控件、editor富文本控件） */ - private String htmlType; - - /** 字典类型 */ - private String dictType; - - /** 排序 */ - private Integer sort; - - public void setColumnId(Long columnId) - { - this.columnId = columnId; - } - - public Long getColumnId() - { - return columnId; - } - - public void setTableId(Long tableId) - { - this.tableId = tableId; - } - - public Long getTableId() - { - return tableId; - } - - public void setColumnName(String columnName) - { - this.columnName = columnName; - } - - public String getColumnName() - { - return columnName; - } - - public void setColumnComment(String columnComment) - { - this.columnComment = columnComment; - } - - public String getColumnComment() - { - return columnComment; - } - - public void setColumnType(String columnType) - { - this.columnType = columnType; - } - - public String getColumnType() - { - return columnType; - } - - public void setJavaType(String javaType) - { - this.javaType = javaType; - } - - public String getJavaType() - { - return javaType; - } - - public void setJavaField(String javaField) - { - this.javaField = javaField; - } - - public String getJavaField() - { - return javaField; - } - - public String getCapJavaField() - { - return StringUtils.capitalize(javaField); - } - - public void setIsPk(String isPk) - { - this.isPk = isPk; - } - - public String getIsPk() - { - return isPk; - } - - public boolean isPk() - { - return isPk(this.isPk); - } - - public boolean isPk(String isPk) - { - return isPk != null && StringUtils.equals("1", isPk); - } - - public String getIsIncrement() - { - return isIncrement; - } - - public void setIsIncrement(String isIncrement) - { - this.isIncrement = isIncrement; - } - - public boolean isIncrement() - { - return isIncrement(this.isIncrement); - } - - public boolean isIncrement(String isIncrement) - { - return isIncrement != null && StringUtils.equals("1", isIncrement); - } - - public void setIsRequired(String isRequired) - { - this.isRequired = isRequired; - } - - public String getIsRequired() - { - return isRequired; - } - - public boolean isRequired() - { - return isRequired(this.isRequired); - } - - public boolean isRequired(String isRequired) - { - return isRequired != null && StringUtils.equals("1", isRequired); - } - - public void setIsInsert(String isInsert) - { - this.isInsert = isInsert; - } - - public String getIsInsert() - { - return isInsert; - } - - public boolean isInsert() - { - return isInsert(this.isInsert); - } - - public boolean isInsert(String isInsert) - { - return isInsert != null && StringUtils.equals("1", isInsert); - } - - public void setIsEdit(String isEdit) - { - this.isEdit = isEdit; - } - - public String getIsEdit() - { - return isEdit; - } - - public boolean isEdit() - { - return isInsert(this.isEdit); - } - - public boolean isEdit(String isEdit) - { - return isEdit != null && StringUtils.equals("1", isEdit); - } - - public void setIsList(String isList) - { - this.isList = isList; - } - - public String getIsList() - { - return isList; - } - - public boolean isList() - { - return isList(this.isList); - } - - public boolean isList(String isList) - { - return isList != null && StringUtils.equals("1", isList); - } - - public void setIsQuery(String isQuery) - { - this.isQuery = isQuery; - } - - public String getIsQuery() - { - return isQuery; - } - - public boolean isQuery() - { - return isQuery(this.isQuery); - } - - public boolean isQuery(String isQuery) - { - return isQuery != null && StringUtils.equals("1", isQuery); - } - - public void setQueryType(String queryType) - { - this.queryType = queryType; - } - - public String getQueryType() - { - return queryType; - } - - public String getHtmlType() - { - return htmlType; - } - - public void setHtmlType(String htmlType) - { - this.htmlType = htmlType; - } - - public void setDictType(String dictType) - { - this.dictType = dictType; - } - - public String getDictType() - { - return dictType; - } - - public void setSort(Integer sort) - { - this.sort = sort; - } - - public Integer getSort() - { - return sort; - } - - public boolean isSuperColumn() - { - return isSuperColumn(this.javaField); - } - - public static boolean isSuperColumn(String javaField) - { - return StringUtils.equalsAnyIgnoreCase(javaField, - // BaseEntity - "createBy", "createTime", "updateBy", "updateTime", "remark", - // TreeEntity - "parentName", "parentId", "orderNum", "ancestors"); - } - - public boolean isUsableColumn() - { - return isUsableColumn(javaField); - } - - public static boolean isUsableColumn(String javaField) - { - // isSuperColumn()中的名单用于避免生成多余Domain属性，若某些属性在生成页面时需要用到不能忽略，则放在此处白名单 - return StringUtils.equalsAnyIgnoreCase(javaField, "parentId", "orderNum", "remark"); - } - - public String readConverterExp() - { - String remarks = StringUtils.substringBetween(this.columnComment, "（", "）"); - StringBuffer sb = new StringBuffer(); - if (StringUtils.isNotEmpty(remarks)) - { - for (String value : remarks.split(" ")) - { - if (StringUtils.isNotEmpty(value)) - { - Object startStr = value.subSequence(0, 1); - String endStr = value.substring(1); - sb.append("").append(startStr).append("=").append(endStr).append(","); - } - } - return sb.deleteCharAt(sb.length() - 1).toString(); - } - else - { - return this.columnComment; - } - } -} \ No newline at end of file diff --git a/bnyer-modules/bnyer-gen/src/main/java/com/bnyer/gen/mapper/GenTableColumnMapper.java b/bnyer-modules/bnyer-gen/src/main/java/com/bnyer/gen/mapper/GenTableColumnMapper.java deleted file mode 100644 index 6829737..0000000 --- a/bnyer-modules/bnyer-gen/src/main/java/com/bnyer/gen/mapper/GenTableColumnMapper.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.bnyer.gen.mapper; - -import java.util.List; - -import com.bnyer.gen.domain.GenTableColumn; - -/** - * 业务字段 数据层 - * - * @author ruoyi - */ -public interface GenTableColumnMapper -{ - /** - * 根据表名称查询列信息 - * - * @param tableName 表名称 - * @return 列信息 - */ - public List selectDbTableColumnsByName(String tableName); - - /** - * 查询业务字段列表 - * - * @param tableId 业务字段编号 - * @return 业务字段集合 - */ - public List selectGenTableColumnListByTableId(Long tableId); - - /** - * 新增业务字段 - * - * @param genTableColumn 业务字段信息 - * @return 结果 - */ - public int insertGenTableColumn(GenTableColumn genTableColumn); - - /** - * 修改业务字段 - * - * @param genTableColumn 业务字段信息 - * @return 结果 - */ - public int updateGenTableColumn(GenTableColumn genTableColumn); - - /** - * 删除业务字段 - * - * @param genTableColumns 列数据 - * @return 结果 - */ - public int deleteGenTableColumns(List genTableColumns); - - /** - * 批量删除业务字段 - * - * @param ids 需要删除的数据ID - * @return 结果 - */ - public int deleteGenTableColumnByIds(Long[] ids); -} \ No newline at end of file diff --git a/bnyer-modules/bnyer-gen/src/main/java/com/bnyer/gen/mapper/GenTableMapper.java b/bnyer-modules/bnyer-gen/src/main/java/com/bnyer/gen/mapper/GenTableMapper.java deleted file mode 100644 index 13abcd8..0000000 --- a/bnyer-modules/bnyer-gen/src/main/java/com/bnyer/gen/mapper/GenTableMapper.java +++ /dev/null @@ -1,83 +0,0 @@ -package com.bnyer.gen.mapper; - -import java.util.List; -import com.bnyer.gen.domain.GenTable; - -/** - * 业务 数据层 - * - * @author ruoyi - */ -public interface GenTableMapper -{ - /** - * 查询业务列表 - * - * @param genTable 业务信息 - * @return 业务集合 - */ - public List selectGenTableList(GenTable genTable); - - /** - * 查询据库列表 - * - * @param genTable 业务信息 - * @return 数据库表集合 - */ - public List selectDbTableList(GenTable genTable); - - /** - * 查询据库列表 - * - * @param tableNames 表名称组 - * @return 数据库表集合 - */ - public List selectDbTableListByNames(String[] tableNames); - - /** - * 查询所有表信息 - * - * @return 表信息集合 - */ - public List selectGenTableAll(); - - /** - * 查询表ID业务信息 - * - * @param id 业务ID - * @return 业务信息 - */ - public GenTable selectGenTableById(Long id); - - /** - * 查询表名称业务信息 - * - * @param tableName 表名称 - * @return 业务信息 - */ - public GenTable selectGenTableByName(String tableName); - - /** - * 新增业务 - * - * @param genTable 业务信息 - * @return 结果 - */ - public int insertGenTable(GenTable genTable); - - /** - * 修改业务 - * - * @param genTable 业务信息 - * @return 结果 - */ - public int updateGenTable(GenTable genTable); - - /** - * 批量删除业务 - * - * @param ids 需要删除的数据ID - * @return 结果 - */ - public int deleteGenTableByIds(Long[] ids); -} \ No newline at end of file diff --git a/bnyer-modules/bnyer-gen/src/main/java/com/bnyer/gen/service/GenTableColumnServiceImpl.java b/bnyer-modules/bnyer-gen/src/main/java/com/bnyer/gen/service/GenTableColumnServiceImpl.java deleted file mode 100644 index 1725be6..0000000 --- a/bnyer-modules/bnyer-gen/src/main/java/com/bnyer/gen/service/GenTableColumnServiceImpl.java +++ /dev/null @@ -1,69 +0,0 @@ -package com.bnyer.gen.service; - -import java.util.List; - -import com.bnyer.gen.domain.GenTableColumn; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import com.bnyer.common.core.text.Convert; -import com.bnyer.gen.mapper.GenTableColumnMapper; - -/** - * 业务字段 服务层实现 - * - * @author ruoyi - */ -@Service -public class GenTableColumnServiceImpl implements IGenTableColumnService -{ - @Autowired - private GenTableColumnMapper genTableColumnMapper; - - /** - * 查询业务字段列表 - * - * @param tableId 业务字段编号 - * @return 业务字段集合 - */ - @Override - public List selectGenTableColumnListByTableId(Long tableId) - { - return genTableColumnMapper.selectGenTableColumnListByTableId(tableId); - } - - /** - * 新增业务字段 - * - * @param genTableColumn 业务字段信息 - * @return 结果 - */ - @Override - public int insertGenTableColumn(GenTableColumn genTableColumn) - { - return genTableColumnMapper.insertGenTableColumn(genTableColumn); - } - - /** - * 修改业务字段 - * - * @param genTableColumn 业务字段信息 - * @return 结果 - */ - @Override - public int updateGenTableColumn(GenTableColumn genTableColumn) - { - return genTableColumnMapper.updateGenTableColumn(genTableColumn); - } - - /** - * 删除业务字段对象 - * - * @param ids 需要删除的数据ID - * @return 结果 - */ - @Override - public int deleteGenTableColumnByIds(String ids) - { - return genTableColumnMapper.deleteGenTableColumnByIds(Convert.toLongArray(ids)); - } -} \ No newline at end of file diff --git a/bnyer-modules/bnyer-gen/src/main/java/com/bnyer/gen/service/GenTableServiceImpl.java b/bnyer-modules/bnyer-gen/src/main/java/com/bnyer/gen/service/GenTableServiceImpl.java deleted file mode 100644 index 70f2f7d..0000000 --- a/bnyer-modules/bnyer-gen/src/main/java/com/bnyer/gen/service/GenTableServiceImpl.java +++ /dev/null @@ -1,522 +0,0 @@ -package com.bnyer.gen.service; - -import java.io.ByteArrayOutputStream; -import java.io.File; -import java.io.IOException; -import java.io.StringWriter; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import java.util.function.Function; -import java.util.stream.Collectors; -import java.util.zip.ZipEntry; -import java.util.zip.ZipOutputStream; - -import com.bnyer.gen.domain.GenTableColumn; -import com.bnyer.gen.mapper.GenTableColumnMapper; -import com.bnyer.gen.mapper.GenTableMapper; -import com.bnyer.gen.util.VelocityUtils; -import org.apache.commons.io.FileUtils; -import org.apache.commons.io.IOUtils; -import org.apache.velocity.Template; -import org.apache.velocity.VelocityContext; -import org.apache.velocity.app.Velocity; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; -import com.bnyer.common.core.constant.Constants; -import com.bnyer.common.core.constant.GenConstants; -import com.bnyer.common.core.exception.ServiceException; -import com.bnyer.common.core.text.CharsetKit; -import com.bnyer.common.core.utils.StringUtils; -import com.bnyer.common.security.utils.SecurityUtils; -import com.bnyer.gen.domain.GenTable; -import com.bnyer.gen.util.GenUtils; -import com.bnyer.gen.util.VelocityInitializer; - -/** - * 业务 服务层实现 - * - * @author ruoyi - */ -@Service -public class GenTableServiceImpl implements IGenTableService -{ - private static final Logger log = LoggerFactory.getLogger(GenTableServiceImpl.class); - - @Autowired - private GenTableMapper genTableMapper; - - @Autowired - private GenTableColumnMapper genTableColumnMapper; - - /** - * 查询业务信息 - * - * @param id 业务ID - * @return 业务信息 - */ - @Override - public GenTable selectGenTableById(Long id) - { - GenTable genTable = genTableMapper.selectGenTableById(id); - setTableFromOptions(genTable); - return genTable; - } - - /** - * 查询业务列表 - * - * @param genTable 业务信息 - * @return 业务集合 - */ - @Override - public List selectGenTableList(GenTable genTable) - { - return genTableMapper.selectGenTableList(genTable); - } - - /** - * 查询据库列表 - * - * @param genTable 业务信息 - * @return 数据库表集合 - */ - @Override - public List selectDbTableList(GenTable genTable) - { - return genTableMapper.selectDbTableList(genTable); - } - - /** - * 查询据库列表 - * - * @param tableNames 表名称组 - * @return 数据库表集合 - */ - @Override - public List selectDbTableListByNames(String[] tableNames) - { - return genTableMapper.selectDbTableListByNames(tableNames); - } - - /** - * 查询所有表信息 - * - * @return 表信息集合 - */ - @Override - public List selectGenTableAll() - { - return genTableMapper.selectGenTableAll(); - } - - /** - * 修改业务 - * - * @param genTable 业务信息 - * @return 结果 - */ - @Override - @Transactional(rollbackFor = Exception.class) - public void updateGenTable(GenTable genTable) - { - String options = JSON.toJSONString(genTable.getParams()); - genTable.setOptions(options); - int row = genTableMapper.updateGenTable(genTable); - if (row > 0) - { - for (GenTableColumn cenTableColumn : genTable.getColumns()) - { - genTableColumnMapper.updateGenTableColumn(cenTableColumn); - } - } - } - - /** - * 删除业务对象 - * - * @param tableIds 需要删除的数据ID - * @return 结果 - */ - @Override - @Transactional(rollbackFor = Exception.class) - public void deleteGenTableByIds(Long[] tableIds) - { - genTableMapper.deleteGenTableByIds(tableIds); - genTableColumnMapper.deleteGenTableColumnByIds(tableIds); - } - - /** - * 导入表结构 - * - * @param tableList 导入表列表 - */ - @Override - @Transactional(rollbackFor = Exception.class) - public void importGenTable(List tableList) - { - String operName = SecurityUtils.getUsername(); - try - { - for (GenTable table : tableList) - { - String tableName = table.getTableName(); - GenUtils.initTable(table, operName); - int row = genTableMapper.insertGenTable(table); - if (row > 0) - { - // 保存列信息 - List genTableColumns = genTableColumnMapper.selectDbTableColumnsByName(tableName); - for (GenTableColumn column : genTableColumns) - { - GenUtils.initColumnField(column, table); - genTableColumnMapper.insertGenTableColumn(column); - } - } - } - } - catch (Exception e) - { - throw new ServiceException("导入失败：" + e.getMessage()); - } - } - - /** - * 预览代码 - * - * @param tableId 表编号 - * @return 预览数据列表 - */ - @Override - public Map previewCode(Long tableId) - { - Map dataMap = new LinkedHashMap<>(); - // 查询表信息 - GenTable table = genTableMapper.selectGenTableById(tableId); - // 设置主子表信息 - setSubTable(table); - // 设置主键列信息 - setPkColumn(table); - VelocityInitializer.initVelocity(); - - VelocityContext context = VelocityUtils.prepareContext(table); - - // 获取模板列表 - List templates = VelocityUtils.getTemplateList(table.getTplCategory()); - for (String template : templates) - { - // 渲染模板 - StringWriter sw = new StringWriter(); - Template tpl = Velocity.getTemplate(template, Constants.UTF8); - tpl.merge(context, sw); - dataMap.put(template, sw.toString()); - } - return dataMap; - } - - /** - * 生成代码（下载方式） - * - * @param tableName 表名称 - * @return 数据 - */ - @Override - public byte[] downloadCode(String tableName) - { - ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); - ZipOutputStream zip = new ZipOutputStream(outputStream); - generatorCode(tableName, zip); - IOUtils.closeQuietly(zip); - return outputStream.toByteArray(); - } - - /** - * 生成代码（自定义路径） - * - * @param tableName 表名称 - */ - @Override - public void generatorCode(String tableName) - { - // 查询表信息 - GenTable table = genTableMapper.selectGenTableByName(tableName); - // 设置主子表信息 - setSubTable(table); - // 设置主键列信息 - setPkColumn(table); - - VelocityInitializer.initVelocity(); - - VelocityContext context = VelocityUtils.prepareContext(table); - - // 获取模板列表 - List templates = VelocityUtils.getTemplateList(table.getTplCategory()); - for (String template : templates) - { - if (!StringUtils.containsAny(template, "sql.vm", "api.js.vm", "index.vue.vm", "index-tree.vue.vm")) - { - // 渲染模板 - StringWriter sw = new StringWriter(); - Template tpl = Velocity.getTemplate(template, Constants.UTF8); - tpl.merge(context, sw); - try - { - String path = getGenPath(table, template); - FileUtils.writeStringToFile(new File(path), sw.toString(), CharsetKit.UTF_8); - } - catch (IOException e) - { - throw new ServiceException("渲染模板失败，表名：" + table.getTableName()); - } - } - } - } - - /** - * 同步数据库 - * - * @param tableName 表名称 - */ - @Override - @Transactional(rollbackFor = Exception.class) - public void synchDb(String tableName) - { - GenTable table = genTableMapper.selectGenTableByName(tableName); - List tableColumns = table.getColumns(); - Map tableColumnMap = tableColumns.stream().collect(Collectors.toMap(GenTableColumn::getColumnName, Function.identity())); - - List dbTableColumns = genTableColumnMapper.selectDbTableColumnsByName(tableName); - if (StringUtils.isEmpty(dbTableColumns)) - { - throw new ServiceException("同步数据失败，原表结构不存在"); - } - List dbTableColumnNames = dbTableColumns.stream().map(GenTableColumn::getColumnName).collect(Collectors.toList()); - - dbTableColumns.forEach(column -> { - GenUtils.initColumnField(column, table); - if (tableColumnMap.containsKey(column.getColumnName())) - { - GenTableColumn prevColumn = tableColumnMap.get(column.getColumnName()); - column.setColumnId(prevColumn.getColumnId()); - if (column.isList()) - { - // 如果是列表，继续保留查询方式/字典类型选项 - column.setDictType(prevColumn.getDictType()); - column.setQueryType(prevColumn.getQueryType()); - } - if (StringUtils.isNotEmpty(prevColumn.getIsRequired()) && !column.isPk() - && (column.isInsert() || column.isEdit()) - && ((column.isUsableColumn()) || (!column.isSuperColumn()))) - { - // 如果是(新增/修改&非主键/非忽略及父属性)，继续保留必填/显示类型选项 - column.setIsRequired(prevColumn.getIsRequired()); - column.setHtmlType(prevColumn.getHtmlType()); - } - genTableColumnMapper.updateGenTableColumn(column); - } - else - { - genTableColumnMapper.insertGenTableColumn(column); - } - }); - - List delColumns = tableColumns.stream().filter(column -> !dbTableColumnNames.contains(column.getColumnName())).collect(Collectors.toList()); - if (StringUtils.isNotEmpty(delColumns)) - { - genTableColumnMapper.deleteGenTableColumns(delColumns); - } - } - - /** - * 批量生成代码（下载方式） - * - * @param tableNames 表数组 - * @return 数据 - */ - @Override - public byte[] downloadCode(String[] tableNames) - { - ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); - ZipOutputStream zip = new ZipOutputStream(outputStream); - for (String tableName : tableNames) - { - generatorCode(tableName, zip); - } - IOUtils.closeQuietly(zip); - return outputStream.toByteArray(); - } - - /** - * 查询表信息并生成代码 - */ - private void generatorCode(String tableName, ZipOutputStream zip) - { - // 查询表信息 - GenTable table = genTableMapper.selectGenTableByName(tableName); - // 设置主子表信息 - setSubTable(table); - // 设置主键列信息 - setPkColumn(table); - - VelocityInitializer.initVelocity(); - - VelocityContext context = VelocityUtils.prepareContext(table); - - // 获取模板列表 - List templates = VelocityUtils.getTemplateList(table.getTplCategory()); - for (String template : templates) - { - // 渲染模板 - StringWriter sw = new StringWriter(); - Template tpl = Velocity.getTemplate(template, Constants.UTF8); - tpl.merge(context, sw); - try - { - // 添加到zip - zip.putNextEntry(new ZipEntry(VelocityUtils.getFileName(template, table))); - IOUtils.write(sw.toString(), zip, Constants.UTF8); - IOUtils.closeQuietly(sw); - zip.flush(); - zip.closeEntry(); - } - catch (IOException e) - { - log.error("渲染模板失败，表名：" + table.getTableName(), e); - } - } - } - - /** - * 修改保存参数校验 - * - * @param genTable 业务信息 - */ - @Override - public void validateEdit(GenTable genTable) - { - if (GenConstants.TPL_TREE.equals(genTable.getTplCategory())) - { - String options = JSON.toJSONString(genTable.getParams()); - JSONObject paramsObj = JSONObject.parseObject(options); - if (StringUtils.isEmpty(paramsObj.getString(GenConstants.TREE_CODE))) - { - throw new ServiceException("树编码字段不能为空"); - } - else if (StringUtils.isEmpty(paramsObj.getString(GenConstants.TREE_PARENT_CODE))) - { - throw new ServiceException("树父编码字段不能为空"); - } - else if (StringUtils.isEmpty(paramsObj.getString(GenConstants.TREE_NAME))) - { - throw new ServiceException("树名称字段不能为空"); - } - else if (GenConstants.TPL_SUB.equals(genTable.getTplCategory())) - { - if (StringUtils.isEmpty(genTable.getSubTableName())) - { - throw new ServiceException("关联子表的表名不能为空"); - } - else if (StringUtils.isEmpty(genTable.getSubTableFkName())) - { - throw new ServiceException("子表关联的外键名不能为空"); - } - } - } - } - - /** - * 设置主键列信息 - * - * @param table 业务表信息 - */ - public void setPkColumn(GenTable table) - { - for (GenTableColumn column : table.getColumns()) - { - if (column.isPk()) - { - table.setPkColumn(column); - break; - } - } - if (StringUtils.isNull(table.getPkColumn())) - { - table.setPkColumn(table.getColumns().get(0)); - } - if (GenConstants.TPL_SUB.equals(table.getTplCategory())) - { - for (GenTableColumn column : table.getSubTable().getColumns()) - { - if (column.isPk()) - { - table.getSubTable().setPkColumn(column); - break; - } - } - if (StringUtils.isNull(table.getSubTable().getPkColumn())) - { - table.getSubTable().setPkColumn(table.getSubTable().getColumns().get(0)); - } - } - } - - /** - * 设置主子表信息 - * - * @param table 业务表信息 - */ - public void setSubTable(GenTable table) - { - String subTableName = table.getSubTableName(); - if (StringUtils.isNotEmpty(subTableName)) - { - table.setSubTable(genTableMapper.selectGenTableByName(subTableName)); - } - } - - /** - * 设置代码生成其他选项值 - * - * @param genTable 设置后的生成对象 - */ - public void setTableFromOptions(GenTable genTable) - { - JSONObject paramsObj = JSONObject.parseObject(genTable.getOptions()); - if (StringUtils.isNotNull(paramsObj)) - { - String treeCode = paramsObj.getString(GenConstants.TREE_CODE); - String treeParentCode = paramsObj.getString(GenConstants.TREE_PARENT_CODE); - String treeName = paramsObj.getString(GenConstants.TREE_NAME); - String parentMenuId = paramsObj.getString(GenConstants.PARENT_MENU_ID); - String parentMenuName = paramsObj.getString(GenConstants.PARENT_MENU_NAME); - - genTable.setTreeCode(treeCode); - genTable.setTreeParentCode(treeParentCode); - genTable.setTreeName(treeName); - genTable.setParentMenuId(parentMenuId); - genTable.setParentMenuName(parentMenuName); - } - } - - /** - * 获取代码生成地址 - * - * @param table 业务表信息 - * @param template 模板文件路径 - * @return 生成地址 - */ - public static String getGenPath(GenTable table, String template) - { - String genPath = table.getGenPath(); - if (StringUtils.equals(genPath, "/")) - { - return System.getProperty("user.dir") + File.separator + "src" + File.separator + VelocityUtils.getFileName(template, table); - } - return genPath + File.separator + VelocityUtils.getFileName(template, table); - } -} diff --git a/bnyer-modules/bnyer-gen/src/main/java/com/bnyer/gen/service/IGenTableColumnService.java b/bnyer-modules/bnyer-gen/src/main/java/com/bnyer/gen/service/IGenTableColumnService.java deleted file mode 100644 index e7b0753..0000000 --- a/bnyer-modules/bnyer-gen/src/main/java/com/bnyer/gen/service/IGenTableColumnService.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.bnyer.gen.service; - -import java.util.List; - -import com.bnyer.gen.domain.GenTableColumn; - -/** - * 业务字段 服务层 - * - * @author ruoyi - */ -public interface IGenTableColumnService -{ - /** - * 查询业务字段列表 - * - * @param tableId 业务字段编号 - * @return 业务字段集合 - */ - public List selectGenTableColumnListByTableId(Long tableId); - - /** - * 新增业务字段 - * - * @param genTableColumn 业务字段信息 - * @return 结果 - */ - public int insertGenTableColumn(GenTableColumn genTableColumn); - - /** - * 修改业务字段 - * - * @param genTableColumn 业务字段信息 - * @return 结果 - */ - public int updateGenTableColumn(GenTableColumn genTableColumn); - - /** - * 删除业务字段信息 - * - * @param ids 需要删除的数据ID - * @return 结果 - */ - public int deleteGenTableColumnByIds(String ids); -} diff --git a/bnyer-modules/bnyer-gen/src/main/java/com/bnyer/gen/service/IGenTableService.java b/bnyer-modules/bnyer-gen/src/main/java/com/bnyer/gen/service/IGenTableService.java deleted file mode 100644 index 03b29e0..0000000 --- a/bnyer-modules/bnyer-gen/src/main/java/com/bnyer/gen/service/IGenTableService.java +++ /dev/null @@ -1,121 +0,0 @@ -package com.bnyer.gen.service; - -import java.util.List; -import java.util.Map; -import com.bnyer.gen.domain.GenTable; - -/** - * 业务 服务层 - * - * @author ruoyi - */ -public interface IGenTableService -{ - /** - * 查询业务列表 - * - * @param genTable 业务信息 - * @return 业务集合 - */ - public List selectGenTableList(GenTable genTable); - - /** - * 查询据库列表 - * - * @param genTable 业务信息 - * @return 数据库表集合 - */ - public List selectDbTableList(GenTable genTable); - - /** - * 查询据库列表 - * - * @param tableNames 表名称组 - * @return 数据库表集合 - */ - public List selectDbTableListByNames(String[] tableNames); - - /** - * 查询所有表信息 - * - * @return 表信息集合 - */ - public List selectGenTableAll(); - - /** - * 查询业务信息 - * - * @param id 业务ID - * @return 业务信息 - */ - public GenTable selectGenTableById(Long id); - - /** - * 修改业务 - * - * @param genTable 业务信息 - * @return 结果 - */ - public void updateGenTable(GenTable genTable); - - /** - * 删除业务信息 - * - * @param tableIds 需要删除的表数据ID - * @return 结果 - */ - public void deleteGenTableByIds(Long[] tableIds); - - /** - * 导入表结构 - * - * @param tableList 导入表列表 - */ - public void importGenTable(List tableList); - - /** - * 预览代码 - * - * @param tableId 表编号 - * @return 预览数据列表 - */ - public Map previewCode(Long tableId); - - /** - * 生成代码（下载方式） - * - * @param tableName 表名称 - * @return 数据 - */ - public byte[] downloadCode(String tableName); - - /** - * 生成代码（自定义路径） - * - * @param tableName 表名称 - * @return 数据 - */ - public void generatorCode(String tableName); - - /** - * 同步数据库 - * - * @param tableName 表名称 - */ - public void synchDb(String tableName); - - /** - * 批量生成代码（下载方式） - * - * @param tableNames 表数组 - * @return 数据 - */ - public byte[] downloadCode(String[] tableNames); - - /** - * 修改保存参数校验 - * - * @param genTable 业务信息 - */ - public void validateEdit(GenTable genTable); -} diff --git a/bnyer-modules/bnyer-gen/src/main/java/com/bnyer/gen/util/GenUtils.java b/bnyer-modules/bnyer-gen/src/main/java/com/bnyer/gen/util/GenUtils.java deleted file mode 100644 index ffbb1fe..0000000 --- a/bnyer-modules/bnyer-gen/src/main/java/com/bnyer/gen/util/GenUtils.java +++ /dev/null @@ -1,258 +0,0 @@ -package com.bnyer.gen.util; - -import java.util.Arrays; - -import com.bnyer.gen.config.GenConfig; -import com.bnyer.gen.domain.GenTableColumn; -import org.apache.commons.lang3.RegExUtils; -import com.bnyer.common.core.constant.GenConstants; -import com.bnyer.common.core.utils.StringUtils; -import com.bnyer.gen.domain.GenTable; - -/** - * 代码生成器 工具类 - * - * @author ruoyi - */ -public class GenUtils -{ - /** - * 初始化表信息 - */ - public static void initTable(GenTable genTable, String operName) - { - genTable.setClassName(convertClassName(genTable.getTableName())); - genTable.setPackageName(GenConfig.getPackageName()); - genTable.setModuleName(getModuleName(GenConfig.getPackageName())); - genTable.setBusinessName(getBusinessName(genTable.getTableName())); - genTable.setFunctionName(replaceText(genTable.getTableComment())); - genTable.setFunctionAuthor(GenConfig.getAuthor()); - genTable.setCreateBy(operName); - } - - /** - * 初始化列属性字段 - */ - public static void initColumnField(GenTableColumn column, GenTable table) - { - String dataType = getDbType(column.getColumnType()); - String columnName = column.getColumnName(); - column.setTableId(table.getTableId()); - column.setCreateBy(table.getCreateBy()); - // 设置java字段名 - column.setJavaField(StringUtils.toCamelCase(columnName)); - // 设置默认类型 - column.setJavaType(GenConstants.TYPE_STRING); - column.setQueryType(GenConstants.QUERY_EQ); - - if (arraysContains(GenConstants.COLUMNTYPE_STR, dataType) || arraysContains(GenConstants.COLUMNTYPE_TEXT, dataType)) - { - // 字符串长度超过500设置为文本域 - Integer columnLength = getColumnLength(column.getColumnType()); - String htmlType = columnLength >= 500 || arraysContains(GenConstants.COLUMNTYPE_TEXT, dataType) ? GenConstants.HTML_TEXTAREA : GenConstants.HTML_INPUT; - column.setHtmlType(htmlType); - } - else if (arraysContains(GenConstants.COLUMNTYPE_TIME, dataType)) - { - column.setJavaType(GenConstants.TYPE_DATE); - column.setHtmlType(GenConstants.HTML_DATETIME); - } - else if (arraysContains(GenConstants.COLUMNTYPE_NUMBER, dataType)) - { - column.setHtmlType(GenConstants.HTML_INPUT); - - // 如果是浮点型 统一用BigDecimal - String[] str = StringUtils.split(StringUtils.substringBetween(column.getColumnType(), "(", ")"), ","); - if (str != null && str.length == 2 && Integer.parseInt(str[1]) > 0) - { - column.setJavaType(GenConstants.TYPE_BIGDECIMAL); - } - // 如果是整形 - else if (str != null && str.length == 1 && Integer.parseInt(str[0]) <= 10) - { - column.setJavaType(GenConstants.TYPE_INTEGER); - } - // 长整形 - else - { - column.setJavaType(GenConstants.TYPE_LONG); - } - } - - // 插入字段（默认所有字段都需要插入） - column.setIsInsert(GenConstants.REQUIRE); - - // 编辑字段 - if (!arraysContains(GenConstants.COLUMNNAME_NOT_EDIT, columnName) && !column.isPk()) - { - column.setIsEdit(GenConstants.REQUIRE); - } - // 列表字段 - if (!arraysContains(GenConstants.COLUMNNAME_NOT_LIST, columnName) && !column.isPk()) - { - column.setIsList(GenConstants.REQUIRE); - } - // 查询字段 - if (!arraysContains(GenConstants.COLUMNNAME_NOT_QUERY, columnName) && !column.isPk()) - { - column.setIsQuery(GenConstants.REQUIRE); - } - - // 查询字段类型 - if (StringUtils.endsWithIgnoreCase(columnName, "name")) - { - column.setQueryType(GenConstants.QUERY_LIKE); - } - // 状态字段设置单选框 - if (StringUtils.endsWithIgnoreCase(columnName, "status")) - { - column.setHtmlType(GenConstants.HTML_RADIO); - } - // 类型&性别字段设置下拉框 - else if (StringUtils.endsWithIgnoreCase(columnName, "type") - || StringUtils.endsWithIgnoreCase(columnName, "sex")) - { - column.setHtmlType(GenConstants.HTML_SELECT); - } - // 图片字段设置图片上传控件 - else if (StringUtils.endsWithIgnoreCase(columnName, "image")) - { - column.setHtmlType(GenConstants.HTML_IMAGE_UPLOAD); - } - // 文件字段设置文件上传控件 - else if (StringUtils.endsWithIgnoreCase(columnName, "file")) - { - column.setHtmlType(GenConstants.HTML_FILE_UPLOAD); - } - // 内容字段设置富文本控件 - else if (StringUtils.endsWithIgnoreCase(columnName, "content")) - { - column.setHtmlType(GenConstants.HTML_EDITOR); - } - } - - /** - * 校验数组是否包含指定值 - * - * @param arr 数组 - * @param targetValue 值 - * @return 是否包含 - */ - public static boolean arraysContains(String[] arr, String targetValue) - { - return Arrays.asList(arr).contains(targetValue); - } - - /** - * 获取模块名 - * - * @param packageName 包名 - * @return 模块名 - */ - public static String getModuleName(String packageName) - { - int lastIndex = packageName.lastIndexOf("."); - int nameLength = packageName.length(); - return StringUtils.substring(packageName, lastIndex + 1, nameLength); - } - - /** - * 获取业务名 - * - * @param tableName 表名 - * @return 业务名 - */ - public static String getBusinessName(String tableName) - { - int lastIndex = tableName.lastIndexOf("_"); - int nameLength = tableName.length(); - return StringUtils.substring(tableName, lastIndex + 1, nameLength); - } - - /** - * 表名转换成Java类名 - * - * @param tableName 表名称 - * @return 类名 - */ - public static String convertClassName(String tableName) - { - boolean autoRemovePre = GenConfig.getAutoRemovePre(); - String tablePrefix = GenConfig.getTablePrefix(); - if (autoRemovePre && StringUtils.isNotEmpty(tablePrefix)) - { - String[] searchList = StringUtils.split(tablePrefix, ","); - tableName = replaceFirst(tableName, searchList); - } - return StringUtils.convertToCamelCase(tableName); - } - - /** - * 批量替换前缀 - * - * @param replacementm 替换值 - * @param searchList 替换列表 - * @return - */ - public static String replaceFirst(String replacementm, String[] searchList) - { - String text = replacementm; - for (String searchString : searchList) - { - if (replacementm.startsWith(searchString)) - { - text = replacementm.replaceFirst(searchString, ""); - break; - } - } - return text; - } - - /** - * 关键字替换 - * - * @param text 需要被替换的名字 - * @return 替换后的名字 - */ - public static String replaceText(String text) - { - return RegExUtils.replaceAll(text, "(?:表|若依)", ""); - } - - /** - * 获取数据库类型字段 - * - * @param columnType 列类型 - * @return 截取后的列类型 - */ - public static String getDbType(String columnType) - { - if (StringUtils.indexOf(columnType, "(") > 0) - { - return StringUtils.substringBefore(columnType, "("); - } - else - { - return columnType; - } - } - - /** - * 获取字段长度 - * - * @param columnType 列类型 - * @return 截取后的列类型 - */ - public static Integer getColumnLength(String columnType) - { - if (StringUtils.indexOf(columnType, "(") > 0) - { - String length = StringUtils.substringBetween(columnType, "(", ")"); - return Integer.valueOf(length); - } - else - { - return 0; - } - } -} diff --git a/bnyer-modules/bnyer-gen/src/main/java/com/bnyer/gen/util/VelocityInitializer.java b/bnyer-modules/bnyer-gen/src/main/java/com/bnyer/gen/util/VelocityInitializer.java deleted file mode 100644 index daea01d..0000000 --- a/bnyer-modules/bnyer-gen/src/main/java/com/bnyer/gen/util/VelocityInitializer.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.bnyer.gen.util; - -import java.util.Properties; -import org.apache.velocity.app.Velocity; -import com.bnyer.common.core.constant.Constants; - -/** - * VelocityEngine工厂 - * - * @author ruoyi - */ -public class VelocityInitializer -{ - /** - * 初始化vm方法 - */ - public static void initVelocity() - { - Properties p = new Properties(); - try - { - // 加载classpath目录下的vm文件 - p.setProperty("resource.loader.file.class", "org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader"); - // 定义字符集 - p.setProperty(Velocity.INPUT_ENCODING, Constants.UTF8); - // 初始化Velocity引擎，指定配置Properties - Velocity.init(p); - } - catch (Exception e) - { - throw new RuntimeException(e); - } - } -} diff --git a/bnyer-modules/bnyer-gen/src/main/java/com/bnyer/gen/util/VelocityUtils.java b/bnyer-modules/bnyer-gen/src/main/java/com/bnyer/gen/util/VelocityUtils.java deleted file mode 100644 index 36cb8d2..0000000 --- a/bnyer-modules/bnyer-gen/src/main/java/com/bnyer/gen/util/VelocityUtils.java +++ /dev/null @@ -1,402 +0,0 @@ -package com.bnyer.gen.util; - -import java.util.ArrayList; -import java.util.HashSet; -import java.util.List; -import java.util.Set; - -import com.bnyer.gen.domain.GenTableColumn; -import org.apache.velocity.VelocityContext; -import com.alibaba.fastjson.JSONObject; -import com.bnyer.common.core.constant.GenConstants; -import com.bnyer.common.core.utils.DateUtils; -import com.bnyer.common.core.utils.StringUtils; -import com.bnyer.gen.domain.GenTable; - -/** - * 模板工具类 - * - * @author ruoyi - */ -public class VelocityUtils -{ - /** 项目空间路径 */ - private static final String PROJECT_PATH = "main/java"; - - /** mybatis空间路径 */ - private static final String MYBATIS_PATH = "main/resources/mapper"; - - /** 默认上级菜单，系统工具 */ - private static final String DEFAULT_PARENT_MENU_ID = "3"; - - /** - * 设置模板变量信息 - * - * @return 模板列表 - */ - public static VelocityContext prepareContext(GenTable genTable) - { - String moduleName = genTable.getModuleName(); - String businessName = genTable.getBusinessName(); - String packageName = genTable.getPackageName(); - String tplCategory = genTable.getTplCategory(); - String functionName = genTable.getFunctionName(); - - VelocityContext velocityContext = new VelocityContext(); - velocityContext.put("tplCategory", genTable.getTplCategory()); - velocityContext.put("tableName", genTable.getTableName()); - velocityContext.put("functionName", StringUtils.isNotEmpty(functionName) ? functionName : "【请填写功能名称】"); - velocityContext.put("ClassName", genTable.getClassName()); - velocityContext.put("className", StringUtils.uncapitalize(genTable.getClassName())); - velocityContext.put("moduleName", genTable.getModuleName()); - velocityContext.put("BusinessName", StringUtils.capitalize(genTable.getBusinessName())); - velocityContext.put("businessName", genTable.getBusinessName()); - velocityContext.put("basePackage", getPackagePrefix(packageName)); - velocityContext.put("packageName", packageName); - velocityContext.put("author", genTable.getFunctionAuthor()); - velocityContext.put("datetime", DateUtils.getDate()); - velocityContext.put("pkColumn", genTable.getPkColumn()); - velocityContext.put("importList", getImportList(genTable)); - velocityContext.put("permissionPrefix", getPermissionPrefix(moduleName, businessName)); - velocityContext.put("columns", genTable.getColumns()); - velocityContext.put("table", genTable); - velocityContext.put("dicts", getDicts(genTable)); - setMenuVelocityContext(velocityContext, genTable); - if (GenConstants.TPL_TREE.equals(tplCategory)) - { - setTreeVelocityContext(velocityContext, genTable); - } - if (GenConstants.TPL_SUB.equals(tplCategory)) - { - setSubVelocityContext(velocityContext, genTable); - } - return velocityContext; - } - - public static void setMenuVelocityContext(VelocityContext context, GenTable genTable) - { - String options = genTable.getOptions(); - JSONObject paramsObj = JSONObject.parseObject(options); - String parentMenuId = getParentMenuId(paramsObj); - context.put("parentMenuId", parentMenuId); - } - - public static void setTreeVelocityContext(VelocityContext context, GenTable genTable) - { - String options = genTable.getOptions(); - JSONObject paramsObj = JSONObject.parseObject(options); - String treeCode = getTreecode(paramsObj); - String treeParentCode = getTreeParentCode(paramsObj); - String treeName = getTreeName(paramsObj); - - context.put("treeCode", treeCode); - context.put("treeParentCode", treeParentCode); - context.put("treeName", treeName); - context.put("expandColumn", getExpandColumn(genTable)); - if (paramsObj.containsKey(GenConstants.TREE_PARENT_CODE)) - { - context.put("tree_parent_code", paramsObj.getString(GenConstants.TREE_PARENT_CODE)); - } - if (paramsObj.containsKey(GenConstants.TREE_NAME)) - { - context.put("tree_name", paramsObj.getString(GenConstants.TREE_NAME)); - } - } - - public static void setSubVelocityContext(VelocityContext context, GenTable genTable) - { - GenTable subTable = genTable.getSubTable(); - String subTableName = genTable.getSubTableName(); - String subTableFkName = genTable.getSubTableFkName(); - String subClassName = genTable.getSubTable().getClassName(); - String subTableFkClassName = StringUtils.convertToCamelCase(subTableFkName); - - context.put("subTable", subTable); - context.put("subTableName", subTableName); - context.put("subTableFkName", subTableFkName); - context.put("subTableFkClassName", subTableFkClassName); - context.put("subTableFkclassName", StringUtils.uncapitalize(subTableFkClassName)); - context.put("subClassName", subClassName); - context.put("subclassName", StringUtils.uncapitalize(subClassName)); - context.put("subImportList", getImportList(genTable.getSubTable())); - } - - /** - * 获取模板信息 - * - * @return 模板列表 - */ - public static List getTemplateList(String tplCategory) - { - List templates = new ArrayList(); - templates.add("vm/java/domain.java.vm"); - templates.add("vm/java/mapper.java.vm"); - templates.add("vm/java/service.java.vm"); - templates.add("vm/java/serviceImpl.java.vm"); - templates.add("vm/java/controller.java.vm"); - templates.add("vm/xml/mapper.xml.vm"); - templates.add("vm/sql/sql.vm"); - templates.add("vm/js/api.js.vm"); - if (GenConstants.TPL_CRUD.equals(tplCategory)) - { - templates.add("vm/vue/index.vue.vm"); - } - else if (GenConstants.TPL_TREE.equals(tplCategory)) - { - templates.add("vm/vue/index-tree.vue.vm"); - } - else if (GenConstants.TPL_SUB.equals(tplCategory)) - { - templates.add("vm/vue/index.vue.vm"); - templates.add("vm/java/sub-domain.java.vm"); - } - return templates; - } - - /** - * 获取文件名 - */ - public static String getFileName(String template, GenTable genTable) - { - // 文件名称 - String fileName = ""; - // 包路径 - String packageName = genTable.getPackageName(); - // 模块名 - String moduleName = genTable.getModuleName(); - // 大写类名 - String className = genTable.getClassName(); - // 业务名称 - String businessName = genTable.getBusinessName(); - - String javaPath = PROJECT_PATH + "/" + StringUtils.replace(packageName, ".", "/"); - String mybatisPath = MYBATIS_PATH + "/" + moduleName; - String vuePath = "vue"; - - if (template.contains("domain.java.vm")) - { - fileName = StringUtils.format("{}/domain/{}.java", javaPath, className); - } - if (template.contains("sub-domain.java.vm") && StringUtils.equals(GenConstants.TPL_SUB, genTable.getTplCategory())) - { - fileName = StringUtils.format("{}/domain/{}.java", javaPath, genTable.getSubTable().getClassName()); - } - else if (template.contains("mapper.java.vm")) - { - fileName = StringUtils.format("{}/mapper/{}Mapper.java", javaPath, className); - } - else if (template.contains("service.java.vm")) - { - fileName = StringUtils.format("{}/service/I{}Service.java", javaPath, className); - } - else if (template.contains("serviceImpl.java.vm")) - { - fileName = StringUtils.format("{}/service/impl/{}ServiceImpl.java", javaPath, className); - } - else if (template.contains("controller.java.vm")) - { - fileName = StringUtils.format("{}/controller/{}Controller.java", javaPath, className); - } - else if (template.contains("mapper.xml.vm")) - { - fileName = StringUtils.format("{}/{}Mapper.xml", mybatisPath, className); - } - else if (template.contains("sql.vm")) - { - fileName = businessName + "Menu.sql"; - } - else if (template.contains("api.js.vm")) - { - fileName = StringUtils.format("{}/api/{}/{}.js", vuePath, moduleName, businessName); - } - else if (template.contains("index.vue.vm")) - { - fileName = StringUtils.format("{}/views/{}/{}/index.vue", vuePath, moduleName, businessName); - } - else if (template.contains("index-tree.vue.vm")) - { - fileName = StringUtils.format("{}/views/{}/{}/index.vue", vuePath, moduleName, businessName); - } - return fileName; - } - - /** - * 获取包前缀 - * - * @param packageName 包名称 - * @return 包前缀名称 - */ - public static String getPackagePrefix(String packageName) - { - int lastIndex = packageName.lastIndexOf("."); - return StringUtils.substring(packageName, 0, lastIndex); - } - - /** - * 根据列类型获取导入包 - * - * @param genTable 业务表对象 - * @return 返回需要导入的包列表 - */ - public static HashSet getImportList(GenTable genTable) - { - List columns = genTable.getColumns(); - GenTable subGenTable = genTable.getSubTable(); - HashSet importList = new HashSet(); - if (StringUtils.isNotNull(subGenTable)) - { - importList.add("java.util.List"); - } - for (GenTableColumn column : columns) - { - if (!column.isSuperColumn() && GenConstants.TYPE_DATE.equals(column.getJavaType())) - { - importList.add("java.util.Date"); - importList.add("com.fasterxml.jackson.annotation.JsonFormat"); - } - else if (!column.isSuperColumn() && GenConstants.TYPE_BIGDECIMAL.equals(column.getJavaType())) - { - importList.add("java.math.BigDecimal"); - } - } - return importList; - } - - /** - * 根据列类型获取字典组 - * - * @param genTable 业务表对象 - * @return 返回字典组 - */ - public static String getDicts(GenTable genTable) - { - List columns = genTable.getColumns(); - Set dicts = new HashSet(); - addDicts(dicts, columns); - if (StringUtils.isNotNull(genTable.getSubTable())) - { - List subColumns = genTable.getSubTable().getColumns(); - addDicts(dicts, subColumns); - } - return StringUtils.join(dicts, ", "); - } - - /** - * 添加字典列表 - * - * @param dicts 字典列表 - * @param columns 列集合 - */ - public static void addDicts(Set dicts, List columns) - { - for (GenTableColumn column : columns) - { - if (!column.isSuperColumn() && StringUtils.isNotEmpty(column.getDictType()) && StringUtils.equalsAny( - column.getHtmlType(), - new String[] { GenConstants.HTML_SELECT, GenConstants.HTML_RADIO, GenConstants.HTML_CHECKBOX })) - { - dicts.add("'" + column.getDictType() + "'"); - } - } - } - - /** - * 获取权限前缀 - * - * @param moduleName 模块名称 - * @param businessName 业务名称 - * @return 返回权限前缀 - */ - public static String getPermissionPrefix(String moduleName, String businessName) - { - return StringUtils.format("{}:{}", moduleName, businessName); - } - - /** - * 获取上级菜单ID字段 - * - * @param paramsObj 生成其他选项 - * @return 上级菜单ID字段 - */ - public static String getParentMenuId(JSONObject paramsObj) - { - if (StringUtils.isNotEmpty(paramsObj) && paramsObj.containsKey(GenConstants.PARENT_MENU_ID) - && StringUtils.isNotEmpty(paramsObj.getString(GenConstants.PARENT_MENU_ID))) - { - return paramsObj.getString(GenConstants.PARENT_MENU_ID); - } - return DEFAULT_PARENT_MENU_ID; - } - - /** - * 获取树编码 - * - * @param paramsObj 生成其他选项 - * @return 树编码 - */ - public static String getTreecode(JSONObject paramsObj) - { - if (paramsObj.containsKey(GenConstants.TREE_CODE)) - { - return StringUtils.toCamelCase(paramsObj.getString(GenConstants.TREE_CODE)); - } - return StringUtils.EMPTY; - } - - /** - * 获取树父编码 - * - * @param paramsObj 生成其他选项 - * @return 树父编码 - */ - public static String getTreeParentCode(JSONObject paramsObj) - { - if (paramsObj.containsKey(GenConstants.TREE_PARENT_CODE)) - { - return StringUtils.toCamelCase(paramsObj.getString(GenConstants.TREE_PARENT_CODE)); - } - return StringUtils.EMPTY; - } - - /** - * 获取树名称 - * - * @param paramsObj 生成其他选项 - * @return 树名称 - */ - public static String getTreeName(JSONObject paramsObj) - { - if (paramsObj.containsKey(GenConstants.TREE_NAME)) - { - return StringUtils.toCamelCase(paramsObj.getString(GenConstants.TREE_NAME)); - } - return StringUtils.EMPTY; - } - - /** - * 获取需要在哪一列上面显示展开按钮 - * - * @param genTable 业务表对象 - * @return 展开按钮列序号 - */ - public static int getExpandColumn(GenTable genTable) - { - String options = genTable.getOptions(); - JSONObject paramsObj = JSONObject.parseObject(options); - String treeName = paramsObj.getString(GenConstants.TREE_NAME); - int num = 0; - for (GenTableColumn column : genTable.getColumns()) - { - if (column.isList()) - { - num++; - String columnName = column.getColumnName(); - if (columnName.equals(treeName)) - { - break; - } - } - } - return num; - } -} diff --git a/bnyer-modules/bnyer-gen/src/main/resources/banner.txt b/bnyer-modules/bnyer-gen/src/main/resources/banner.txt deleted file mode 100644 index 4553a2e..0000000 --- a/bnyer-modules/bnyer-gen/src/main/resources/banner.txt +++ /dev/null @@ -1,14 +0,0 @@ -Spring Boot Version: ${spring-boot.version} -Spring Application Name: ${spring.application.name} - - .----------------. .-----------------. .----------------. .----------------. .----------------. .----------------. .----------------. .----------------. .-----------------. -| .--------------. || .--------------. || .--------------. || .--------------. || .--------------. || .--------------. || .--------------. || .--------------. || .--------------. | -| | ______ | || | ____ _____ | || | ____ ____ | || | _________ | || | _______ | || | | || | ______ | || | _________ | || | ____ _____ | | -| | |_ _ \ | || ||_ \|_ _| | || | |_ _||_ _| | || | |_ ___ | | || | |_ __ \ | || | | || | .' ___ | | || | |_ ___ | | || ||_ \|_ _| | | -| | | |_) | | || | | \ | | | || | \ \ / / | || | | |_ \_| | || | | |__) | | || | ______ | || | / .' \_| | || | | |_ \_| | || | | \ | | | | -| | | __'. | || | | |\ \| | | || | \ \/ / | || | | _| _ | || | | __ / | || | |______| | || | | | ____ | || | | _| _ | || | | |\ \| | | | -| | _| |__) | | || | _| |_\ |_ | || | _| |_ | || | _| |___/ | | || | _| | \ \_ | || | | || | \ `.___] _| | || | _| |___/ | | || | _| |_\ |_ | | -| | |_______/ | || ||_____|\____| | || | |______| | || | |_________| | || | |____| |___| | || | | || | `._____.' | || | |_________| | || ||_____|\____| | | -| | | || | | || | | || | | || | | || | | || | | || | | || | | | -| '--------------' || '--------------' || '--------------' || '--------------' || '--------------' || '--------------' || '--------------' || '--------------' || '--------------' | - '----------------' '----------------' '----------------' '----------------' '----------------' '----------------' '----------------' '----------------' '----------------' diff --git a/bnyer-modules/bnyer-gen/src/main/resources/bootstrap.yml b/bnyer-modules/bnyer-gen/src/main/resources/bootstrap.yml deleted file mode 100644 index 1502afa..0000000 --- a/bnyer-modules/bnyer-gen/src/main/resources/bootstrap.yml +++ /dev/null @@ -1,25 +0,0 @@ -# Tomcat -server: - port: 9202 - -# Spring -spring: - application: - # 应用名称 - name: bnyer-gen - profiles: - # 环境配置 - active: dev - cloud: - nacos: - discovery: - # 服务注册地址 - server-addr: 127.0.0.1:8848 - config: - # 配置中心地址 - server-addr: 127.0.0.1:8848 - # 配置文件格式 - file-extension: yml - # 共享配置 - shared-configs: - - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} diff --git a/bnyer-modules/bnyer-gen/src/main/resources/mapper/generator/GenTableColumnMapper.xml b/bnyer-modules/bnyer-gen/src/main/resources/mapper/generator/GenTableColumnMapper.xml deleted file mode 100644 index b037028..0000000 --- a/bnyer-modules/bnyer-gen/src/main/resources/mapper/generator/GenTableColumnMapper.xml +++ /dev/null @@ -1,127 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - select column_id, table_id, column_name, column_comment, column_type, java_type, java_field, is_pk, is_increment, is_required, is_insert, is_edit, is_list, is_query, query_type, html_type, dict_type, sort, create_by, create_time, update_by, update_time from gen_table_column - - - - - - - - insert into gen_table_column ( - table_id, - column_name, - column_comment, - column_type, - java_type, - java_field, - is_pk, - is_increment, - is_required, - is_insert, - is_edit, - is_list, - is_query, - query_type, - html_type, - dict_type, - sort, - create_by, - create_time - )values( - #{tableId}, - #{columnName}, - #{columnComment}, - #{columnType}, - #{javaType}, - #{javaField}, - #{isPk}, - #{isIncrement}, - #{isRequired}, - #{isInsert}, - #{isEdit}, - #{isList}, - #{isQuery}, - #{queryType}, - #{htmlType}, - #{dictType}, - #{sort}, - #{createBy}, - sysdate() - ) - - - - update gen_table_column - - column_comment = #{columnComment}, - java_type = #{javaType}, - java_field = #{javaField}, - is_insert = #{isInsert}, - is_edit = #{isEdit}, - is_list = #{isList}, - is_query = #{isQuery}, - is_required = #{isRequired}, - query_type = #{queryType}, - html_type = #{htmlType}, - dict_type = #{dictType}, - sort = #{sort}, - update_by = #{updateBy}, - update_time = sysdate() - - where column_id = #{columnId} - - - - delete from gen_table_column where table_id in - - #{tableId} - - - - - delete from gen_table_column where column_id in - - #{item.columnId} - - - - \ No newline at end of file diff --git a/bnyer-modules/bnyer-gen/src/main/resources/mapper/generator/GenTableMapper.xml b/bnyer-modules/bnyer-gen/src/main/resources/mapper/generator/GenTableMapper.xml deleted file mode 100644 index 2c74762..0000000 --- a/bnyer-modules/bnyer-gen/src/main/resources/mapper/generator/GenTableMapper.xml +++ /dev/null @@ -1,202 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - select table_id, table_name, table_comment, sub_table_name, sub_table_fk_name, class_name, tpl_category, package_name, module_name, business_name, function_name, function_author, gen_type, gen_path, options, create_by, create_time, update_by, update_time, remark from gen_table - - - - - - - - - - - - - - - - - - insert into gen_table ( - table_name, - table_comment, - class_name, - tpl_category, - package_name, - module_name, - business_name, - function_name, - function_author, - gen_type, - gen_path, - remark, - create_by, - create_time - )values( - #{tableName}, - #{tableComment}, - #{className}, - #{tplCategory}, - #{packageName}, - #{moduleName}, - #{businessName}, - #{functionName}, - #{functionAuthor}, - #{genType}, - #{genPath}, - #{remark}, - #{createBy}, - sysdate() - ) - - - - update gen_table - - table_name = #{tableName}, - table_comment = #{tableComment}, - sub_table_name = #{subTableName}, - sub_table_fk_name = #{subTableFkName}, - class_name = #{className}, - function_author = #{functionAuthor}, - gen_type = #{genType}, - gen_path = #{genPath}, - tpl_category = #{tplCategory}, - package_name = #{packageName}, - module_name = #{moduleName}, - business_name = #{businessName}, - function_name = #{functionName}, - options = #{options}, - update_by = #{updateBy}, - remark = #{remark}, - update_time = sysdate() - - where table_id = #{tableId} - - - - delete from gen_table where table_id in - - #{tableId} - - - - \ No newline at end of file diff --git a/bnyer-modules/bnyer-gen/src/main/resources/vm/java/controller.java.vm b/bnyer-modules/bnyer-gen/src/main/resources/vm/java/controller.java.vm deleted file mode 100644 index b806e36..0000000 --- a/bnyer-modules/bnyer-gen/src/main/resources/vm/java/controller.java.vm +++ /dev/null @@ -1,115 +0,0 @@ -package ${packageName}.controller; - -import java.util.List; -import javax.servlet.http.HttpServletResponse; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -import com.bnyer.common.log.annotation.Log; -import com.bnyer.common.log.enums.BusinessType; -import com.bnyer.common.security.annotation.RequiresPermissions; -import ${packageName}.domain.${ClassName}; -import ${packageName}.service.I${ClassName}Service; -import com.bnyer.common.core.web.controller.BaseController; -import com.bnyer.common.core.web.domain.AjaxResult; -import com.bnyer.common.core.utils.poi.ExcelUtil; -#if($table.crud || $table.sub) -import com.bnyer.common.core.web.page.TableDataInfo; -#elseif($table.tree) -#end - -/** - * ${functionName}Controller - * - * @author ${author} - * @date ${datetime} - */ -@RestController -@RequestMapping("/${businessName}") -public class ${ClassName}Controller extends BaseController -{ - @Autowired - private I${ClassName}Service ${className}Service; - - /** - * 查询${functionName}列表 - */ - @RequiresPermissions("${permissionPrefix}:list") - @GetMapping("/list") -#if($table.crud || $table.sub) - public TableDataInfo list(${ClassName} ${className}) - { - startPage(); - List<${ClassName}> list = ${className}Service.select${ClassName}List(${className}); - return getDataTable(list); - } -#elseif($table.tree) - public AjaxResult list(${ClassName} ${className}) - { - List<${ClassName}> list = ${className}Service.select${ClassName}List(${className}); - return AjaxResult.success(list); - } -#end - - /** - * 导出${functionName}列表 - */ - @RequiresPermissions("${permissionPrefix}:export") - @Log(title = "${functionName}", businessType = BusinessType.EXPORT) - @PostMapping("/export") - public void export(HttpServletResponse response, ${ClassName} ${className}) - { - List<${ClassName}> list = ${className}Service.select${ClassName}List(${className}); - ExcelUtil<${ClassName}> util = new ExcelUtil<${ClassName}>(${ClassName}.class); - util.exportExcel(response, list, "${functionName}数据"); - } - - /** - * 获取${functionName}详细信息 - */ - @RequiresPermissions("${permissionPrefix}:query") - @GetMapping(value = "/{${pkColumn.javaField}}") - public AjaxResult getInfo(@PathVariable("${pkColumn.javaField}") ${pkColumn.javaType} ${pkColumn.javaField}) - { - return AjaxResult.success(${className}Service.select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaField})); - } - - /** - * 新增${functionName} - */ - @RequiresPermissions("${permissionPrefix}:add") - @Log(title = "${functionName}", businessType = BusinessType.INSERT) - @PostMapping - public AjaxResult add(@RequestBody ${ClassName} ${className}) - { - return toAjax(${className}Service.insert${ClassName}(${className})); - } - - /** - * 修改${functionName} - */ - @RequiresPermissions("${permissionPrefix}:edit") - @Log(title = "${functionName}", businessType = BusinessType.UPDATE) - @PutMapping - public AjaxResult edit(@RequestBody ${ClassName} ${className}) - { - return toAjax(${className}Service.update${ClassName}(${className})); - } - - /** - * 删除${functionName} - */ - @RequiresPermissions("${permissionPrefix}:remove") - @Log(title = "${functionName}", businessType = BusinessType.DELETE) - @DeleteMapping("/{${pkColumn.javaField}s}") - public AjaxResult remove(@PathVariable ${pkColumn.javaType}[] ${pkColumn.javaField}s) - { - return toAjax(${className}Service.delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaField}s)); - } -} diff --git a/bnyer-modules/bnyer-gen/src/main/resources/vm/java/domain.java.vm b/bnyer-modules/bnyer-gen/src/main/resources/vm/java/domain.java.vm deleted file mode 100644 index 817e081..0000000 --- a/bnyer-modules/bnyer-gen/src/main/resources/vm/java/domain.java.vm +++ /dev/null @@ -1,101 +0,0 @@ -package ${packageName}.domain; - -#foreach ($import in $importList) -import ${import}; -#end -import com.bnyer.common.core.annotation.Excel; -#if($table.crud || $table.sub) -#elseif($table.tree) -#end - -/** - * ${functionName}对象 ${tableName} - * - * @author ${author} - * @date ${datetime} - */ -#if($table.crud || $table.sub) -#set($Entity="BaseEntity") -#elseif($table.tree) -#set($Entity="TreeEntity") -#end -public class ${ClassName} extends ${Entity} -{ - private static final long serialVersionUID = 1L; - -#foreach ($column in $columns) -#if(!$table.isSuperColumn($column.javaField)) - /** $column.columnComment */ -#if($column.list) -#set($parentheseIndex=$column.columnComment.indexOf("（")) -#if($parentheseIndex != -1) -#set($comment=$column.columnComment.substring(0, $parentheseIndex)) -#else -#set($comment=$column.columnComment) -#end -#if($parentheseIndex != -1) - @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") -#elseif($column.javaType == 'Date') - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "${comment}", width = 30, dateFormat = "yyyy-MM-dd") -#else - @Excel(name = "${comment}") -#end -#end - private $column.javaType $column.javaField; - -#end -#end -#if($table.sub) - /** $table.subTable.functionName信息 */ - private List<${subClassName}> ${subclassName}List; - -#end -#foreach ($column in $columns) -#if(!$table.isSuperColumn($column.javaField)) -#if($column.javaField.length() > 2 && $column.javaField.substring(1,2).matches("[A-Z]")) -#set($AttrName=$column.javaField) -#else -#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)}) -#end - public void set${AttrName}($column.javaType $column.javaField) - { - this.$column.javaField = $column.javaField; - } - - public $column.javaType get${AttrName}() - { - return $column.javaField; - } -#end -#end - -#if($table.sub) - public List<${subClassName}> get${subClassName}List() - { - return ${subclassName}List; - } - - public void set${subClassName}List(List<${subClassName}> ${subclassName}List) - { - this.${subclassName}List = ${subclassName}List; - } - -#end - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) -#foreach ($column in $columns) -#if($column.javaField.length() > 2 && $column.javaField.substring(1,2).matches("[A-Z]")) -#set($AttrName=$column.javaField) -#else -#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)}) -#end - .append("${column.javaField}", get${AttrName}()) -#end -#if($table.sub) - .append("${subclassName}List", get${subClassName}List()) -#end - .toString(); - } -} diff --git a/bnyer-modules/bnyer-gen/src/main/resources/vm/java/mapper.java.vm b/bnyer-modules/bnyer-gen/src/main/resources/vm/java/mapper.java.vm deleted file mode 100644 index 7e7d7c2..0000000 --- a/bnyer-modules/bnyer-gen/src/main/resources/vm/java/mapper.java.vm +++ /dev/null @@ -1,91 +0,0 @@ -package ${packageName}.mapper; - -import java.util.List; -import ${packageName}.domain.${ClassName}; -#if($table.sub) -import ${packageName}.domain.${subClassName}; -#end - -/** - * ${functionName}Mapper接口 - * - * @author ${author} - * @date ${datetime} - */ -public interface ${ClassName}Mapper -{ - /** - * 查询${functionName} - * - * @param ${pkColumn.javaField} ${functionName}主键 - * @return ${functionName} - */ - public ${ClassName} select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField}); - - /** - * 查询${functionName}列表 - * - * @param ${className} ${functionName} - * @return ${functionName}集合 - */ - public List<${ClassName}> select${ClassName}List(${ClassName} ${className}); - - /** - * 新增${functionName} - * - * @param ${className} ${functionName} - * @return 结果 - */ - public int insert${ClassName}(${ClassName} ${className}); - - /** - * 修改${functionName} - * - * @param ${className} ${functionName} - * @return 结果 - */ - public int update${ClassName}(${ClassName} ${className}); - - /** - * 删除${functionName} - * - * @param ${pkColumn.javaField} ${functionName}主键 - * @return 结果 - */ - public int delete${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField}); - - /** - * 批量删除${functionName} - * - * @param ${pkColumn.javaField}s 需要删除的数据主键集合 - * @return 结果 - */ - public int delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaType}[] ${pkColumn.javaField}s); -#if($table.sub) - - /** - * 批量删除${subTable.functionName} - * - * @param ${pkColumn.javaField}s 需要删除的数据主键集合 - * @return 结果 - */ - public int delete${subClassName}By${subTableFkClassName}s(${pkColumn.javaType}[] ${pkColumn.javaField}s); - - /** - * 批量新增${subTable.functionName} - * - * @param ${subclassName}List ${subTable.functionName}列表 - * @return 结果 - */ - public int batch${subClassName}(List<${subClassName}> ${subclassName}List); - - - /** - * 通过${functionName}主键删除${subTable.functionName}信息 - * - * @param ${pkColumn.javaField} ${functionName}ID - * @return 结果 - */ - public int delete${subClassName}By${subTableFkClassName}(${pkColumn.javaType} ${pkColumn.javaField}); -#end -} diff --git a/bnyer-modules/bnyer-gen/src/main/resources/vm/java/service.java.vm b/bnyer-modules/bnyer-gen/src/main/resources/vm/java/service.java.vm deleted file mode 100644 index 264882b..0000000 --- a/bnyer-modules/bnyer-gen/src/main/resources/vm/java/service.java.vm +++ /dev/null @@ -1,61 +0,0 @@ -package ${packageName}.service; - -import java.util.List; -import ${packageName}.domain.${ClassName}; - -/** - * ${functionName}Service接口 - * - * @author ${author} - * @date ${datetime} - */ -public interface I${ClassName}Service -{ - /** - * 查询${functionName} - * - * @param ${pkColumn.javaField} ${functionName}主键 - * @return ${functionName} - */ - public ${ClassName} select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField}); - - /** - * 查询${functionName}列表 - * - * @param ${className} ${functionName} - * @return ${functionName}集合 - */ - public List<${ClassName}> select${ClassName}List(${ClassName} ${className}); - - /** - * 新增${functionName} - * - * @param ${className} ${functionName} - * @return 结果 - */ - public int insert${ClassName}(${ClassName} ${className}); - - /** - * 修改${functionName} - * - * @param ${className} ${functionName} - * @return 结果 - */ - public int update${ClassName}(${ClassName} ${className}); - - /** - * 批量删除${functionName} - * - * @param ${pkColumn.javaField}s 需要删除的${functionName}主键集合 - * @return 结果 - */ - public int delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaType}[] ${pkColumn.javaField}s); - - /** - * 删除${functionName}信息 - * - * @param ${pkColumn.javaField} ${functionName}主键 - * @return 结果 - */ - public int delete${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField}); -} diff --git a/bnyer-modules/bnyer-gen/src/main/resources/vm/java/serviceImpl.java.vm b/bnyer-modules/bnyer-gen/src/main/resources/vm/java/serviceImpl.java.vm deleted file mode 100644 index 938a4db..0000000 --- a/bnyer-modules/bnyer-gen/src/main/resources/vm/java/serviceImpl.java.vm +++ /dev/null @@ -1,169 +0,0 @@ -package ${packageName}.service.impl; - -import java.util.List; -#foreach ($column in $columns) -#if($column.javaField == 'createTime' || $column.javaField == 'updateTime') -import com.bnyer.common.core.utils.DateUtils; -#break -#end -#end -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -#if($table.sub) -import java.util.ArrayList; -import com.bnyer.common.core.utils.StringUtils; -import org.springframework.transaction.annotation.Transactional; -import ${packageName}.domain.${subClassName}; -#end -import ${packageName}.mapper.${ClassName}Mapper; -import ${packageName}.domain.${ClassName}; -import ${packageName}.service.I${ClassName}Service; - -/** - * ${functionName}Service业务层处理 - * - * @author ${author} - * @date ${datetime} - */ -@Service -public class ${ClassName}ServiceImpl implements I${ClassName}Service -{ - @Autowired - private ${ClassName}Mapper ${className}Mapper; - - /** - * 查询${functionName} - * - * @param ${pkColumn.javaField} ${functionName}主键 - * @return ${functionName} - */ - @Override - public ${ClassName} select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField}) - { - return ${className}Mapper.select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaField}); - } - - /** - * 查询${functionName}列表 - * - * @param ${className} ${functionName} - * @return ${functionName} - */ - @Override - public List<${ClassName}> select${ClassName}List(${ClassName} ${className}) - { - return ${className}Mapper.select${ClassName}List(${className}); - } - - /** - * 新增${functionName} - * - * @param ${className} ${functionName} - * @return 结果 - */ -#if($table.sub) - @Transactional -#end - @Override - public int insert${ClassName}(${ClassName} ${className}) - { -#foreach ($column in $columns) -#if($column.javaField == 'createTime') - ${className}.setCreateTime(DateUtils.getNowDate()); -#end -#end -#if($table.sub) - int rows = ${className}Mapper.insert${ClassName}(${className}); - insert${subClassName}(${className}); - return rows; -#else - return ${className}Mapper.insert${ClassName}(${className}); -#end - } - - /** - * 修改${functionName} - * - * @param ${className} ${functionName} - * @return 结果 - */ -#if($table.sub) - @Transactional -#end - @Override - public int update${ClassName}(${ClassName} ${className}) - { -#foreach ($column in $columns) -#if($column.javaField == 'updateTime') - ${className}.setUpdateTime(DateUtils.getNowDate()); -#end -#end -#if($table.sub) - ${className}Mapper.delete${subClassName}By${subTableFkClassName}(${className}.get${pkColumn.capJavaField}()); - insert${subClassName}(${className}); -#end - return ${className}Mapper.update${ClassName}(${className}); - } - - /** - * 批量删除${functionName} - * - * @param ${pkColumn.javaField}s 需要删除的${functionName}主键 - * @return 结果 - */ -#if($table.sub) - @Transactional -#end - @Override - public int delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaType}[] ${pkColumn.javaField}s) - { -#if($table.sub) - ${className}Mapper.delete${subClassName}By${subTableFkClassName}s(${pkColumn.javaField}s); -#end - return ${className}Mapper.delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaField}s); - } - - /** - * 删除${functionName}信息 - * - * @param ${pkColumn.javaField} ${functionName}主键 - * @return 结果 - */ -#if($table.sub) - @Transactional -#end - @Override - public int delete${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField}) - { -#if($table.sub) - ${className}Mapper.delete${subClassName}By${subTableFkClassName}(${pkColumn.javaField}); -#end - return ${className}Mapper.delete${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaField}); - } -#if($table.sub) - - /** - * 新增${subTable.functionName}信息 - * - * @param ${className} ${functionName}对象 - */ - public void insert${subClassName}(${ClassName} ${className}) - { - List<${subClassName}> ${subclassName}List = ${className}.get${subClassName}List(); - ${pkColumn.javaType} ${pkColumn.javaField} = ${className}.get${pkColumn.capJavaField}(); - if (StringUtils.isNotNull(${subclassName}List)) - { - List<${subClassName}> list = new ArrayList<${subClassName}>(); - for (${subClassName} ${subclassName} : ${subclassName}List) - { - ${subclassName}.set${subTableFkClassName}(${pkColumn.javaField}); - list.add(${subclassName}); - } - if (list.size() > 0) - { - ${className}Mapper.batch${subClassName}(list); - } - } - } -#end -} diff --git a/bnyer-modules/bnyer-gen/src/main/resources/vm/java/sub-domain.java.vm b/bnyer-modules/bnyer-gen/src/main/resources/vm/java/sub-domain.java.vm deleted file mode 100644 index fe6caf4..0000000 --- a/bnyer-modules/bnyer-gen/src/main/resources/vm/java/sub-domain.java.vm +++ /dev/null @@ -1,73 +0,0 @@ -package ${packageName}.domain; - -#foreach ($import in $subImportList) -import ${import}; -#end -import com.bnyer.common.core.annotation.Excel; - -/** - * ${subTable.functionName}对象 ${subTableName} - * - * @author ${author} - * @date ${datetime} - */ -public class ${subClassName} extends BaseEntity -{ - private static final long serialVersionUID = 1L; - -#foreach ($column in $subTable.columns) -#if(!$table.isSuperColumn($column.javaField)) - /** $column.columnComment */ -#if($column.list) -#set($parentheseIndex=$column.columnComment.indexOf("（")) -#if($parentheseIndex != -1) -#set($comment=$column.columnComment.substring(0, $parentheseIndex)) -#else -#set($comment=$column.columnComment) -#end -#if($parentheseIndex != -1) - @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") -#elseif($column.javaType == 'Date') - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "${comment}", width = 30, dateFormat = "yyyy-MM-dd") -#else - @Excel(name = "${comment}") -#end -#end - private $column.javaType $column.javaField; - -#end -#end -#foreach ($column in $subTable.columns) -#if(!$table.isSuperColumn($column.javaField)) -#if($column.javaField.length() > 2 && $column.javaField.substring(1,2).matches("[A-Z]")) -#set($AttrName=$column.javaField) -#else -#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)}) -#end - public void set${AttrName}($column.javaType $column.javaField) - { - this.$column.javaField = $column.javaField; - } - - public $column.javaType get${AttrName}() - { - return $column.javaField; - } -#end -#end - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) -#foreach ($column in $subTable.columns) -#if($column.javaField.length() > 2 && $column.javaField.substring(1,2).matches("[A-Z]")) -#set($AttrName=$column.javaField) -#else -#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)}) -#end - .append("${column.javaField}", get${AttrName}()) -#end - .toString(); - } -} diff --git a/bnyer-modules/bnyer-gen/src/main/resources/vm/js/api.js.vm b/bnyer-modules/bnyer-gen/src/main/resources/vm/js/api.js.vm deleted file mode 100644 index 9295524..0000000 --- a/bnyer-modules/bnyer-gen/src/main/resources/vm/js/api.js.vm +++ /dev/null @@ -1,44 +0,0 @@ -import request from '@/utils/request' - -// 查询${functionName}列表 -export function list${BusinessName}(query) { - return request({ - url: '/${moduleName}/${businessName}/list', - method: 'get', - params: query - }) -} - -// 查询${functionName}详细 -export function get${BusinessName}(${pkColumn.javaField}) { - return request({ - url: '/${moduleName}/${businessName}/' + ${pkColumn.javaField}, - method: 'get' - }) -} - -// 新增${functionName} -export function add${BusinessName}(data) { - return request({ - url: '/${moduleName}/${businessName}', - method: 'post', - data: data - }) -} - -// 修改${functionName} -export function update${BusinessName}(data) { - return request({ - url: '/${moduleName}/${businessName}', - method: 'put', - data: data - }) -} - -// 删除${functionName} -export function del${BusinessName}(${pkColumn.javaField}) { - return request({ - url: '/${moduleName}/${businessName}/' + ${pkColumn.javaField}, - method: 'delete' - }) -} diff --git a/bnyer-modules/bnyer-gen/src/main/resources/vm/sql/sql.vm b/bnyer-modules/bnyer-gen/src/main/resources/vm/sql/sql.vm deleted file mode 100644 index 0575583..0000000 --- a/bnyer-modules/bnyer-gen/src/main/resources/vm/sql/sql.vm +++ /dev/null @@ -1,22 +0,0 @@ --- 菜单 SQL -insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark) -values('${functionName}', '${parentMenuId}', '1', '${businessName}', '${moduleName}/${businessName}/index', 1, 0, 'C', '0', '0', '${permissionPrefix}:list', '#', 'admin', sysdate(), '', null, '${functionName}菜单'); - --- 按钮父菜单ID -SELECT @parentId := LAST_INSERT_ID(); - --- 按钮 SQL -insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark) -values('${functionName}查询', @parentId, '1', '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:query', '#', 'admin', sysdate(), '', null, ''); - -insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark) -values('${functionName}新增', @parentId, '2', '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:add', '#', 'admin', sysdate(), '', null, ''); - -insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark) -values('${functionName}修改', @parentId, '3', '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:edit', '#', 'admin', sysdate(), '', null, ''); - -insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark) -values('${functionName}删除', @parentId, '4', '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:remove', '#', 'admin', sysdate(), '', null, ''); - -insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark) -values('${functionName}导出', @parentId, '5', '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:export', '#', 'admin', sysdate(), '', null, ''); \ No newline at end of file diff --git a/bnyer-modules/bnyer-gen/src/main/resources/vm/vue/index-tree.vue.vm b/bnyer-modules/bnyer-gen/src/main/resources/vm/vue/index-tree.vue.vm deleted file mode 100644 index 3def704..0000000 --- a/bnyer-modules/bnyer-gen/src/main/resources/vm/vue/index-tree.vue.vm +++ /dev/null @@ -1,502 +0,0 @@ - - - diff --git a/bnyer-modules/bnyer-gen/src/main/resources/vm/vue/index.vue.vm b/bnyer-modules/bnyer-gen/src/main/resources/vm/vue/index.vue.vm deleted file mode 100644 index e9a1fae..0000000 --- a/bnyer-modules/bnyer-gen/src/main/resources/vm/vue/index.vue.vm +++ /dev/null @@ -1,598 +0,0 @@ - - - diff --git a/bnyer-modules/bnyer-gen/src/main/resources/vm/vue/v3/index-tree.vue.vm b/bnyer-modules/bnyer-gen/src/main/resources/vm/vue/v3/index-tree.vue.vm deleted file mode 100644 index 11bbe52..0000000 --- a/bnyer-modules/bnyer-gen/src/main/resources/vm/vue/v3/index-tree.vue.vm +++ /dev/null @@ -1,484 +0,0 @@ - - - diff --git a/bnyer-modules/bnyer-gen/src/main/resources/vm/vue/v3/index.vue.vm b/bnyer-modules/bnyer-gen/src/main/resources/vm/vue/v3/index.vue.vm deleted file mode 100644 index a363ef3..0000000 --- a/bnyer-modules/bnyer-gen/src/main/resources/vm/vue/v3/index.vue.vm +++ /dev/null @@ -1,596 +0,0 @@ - - - diff --git a/bnyer-modules/bnyer-gen/src/main/resources/vm/vue/v3/readme.txt b/bnyer-modules/bnyer-gen/src/main/resources/vm/vue/v3/readme.txt deleted file mode 100644 index 10362d6..0000000 --- a/bnyer-modules/bnyer-gen/src/main/resources/vm/vue/v3/readme.txt +++ /dev/null @@ -1 +0,0 @@ -ʹõRuoYi-Cloud-Vue3ǰˣôҪһ´Ŀ¼ģindex.vue.vmindex-tree.vue.vmļϼvueĿ¼ \ No newline at end of file diff --git a/bnyer-modules/bnyer-gen/src/main/resources/vm/xml/mapper.xml.vm b/bnyer-modules/bnyer-gen/src/main/resources/vm/xml/mapper.xml.vm deleted file mode 100644 index 0ceb3d8..0000000 --- a/bnyer-modules/bnyer-gen/src/main/resources/vm/xml/mapper.xml.vm +++ /dev/null @@ -1,135 +0,0 @@ - - - - - -#foreach ($column in $columns) - -#end - -#if($table.sub) - - - - - - -#foreach ($column in $subTable.columns) - -#end - -#end - - - select#foreach($column in $columns) $column.columnName#if($foreach.count != $columns.size()),#end#end from ${tableName} - - - - - - - - insert into ${tableName} - -#foreach($column in $columns) -#if($column.columnName != $pkColumn.columnName || !$pkColumn.increment) - $column.columnName, -#end -#end - - -#foreach($column in $columns) -#if($column.columnName != $pkColumn.columnName || !$pkColumn.increment) - #{$column.javaField}, -#end -#end - - - - - update ${tableName} - -#foreach($column in $columns) -#if($column.columnName != $pkColumn.columnName) - $column.columnName = #{$column.javaField}, -#end -#end - - where ${pkColumn.columnName} = #{${pkColumn.javaField}} - - - - delete from ${tableName} where ${pkColumn.columnName} = #{${pkColumn.javaField}} - - - - delete from ${tableName} where ${pkColumn.columnName} in - - #{${pkColumn.javaField}} - - -#if($table.sub) - - - delete from ${subTableName} where ${subTableFkName} in - - #{${subTableFkclassName}} - - - - - delete from ${subTableName} where ${subTableFkName} = #{${subTableFkclassName}} - - - - insert into ${subTableName}(#foreach($column in $subTable.columns) $column.columnName#if($foreach.count != $subTable.columns.size()),#end#end) values - - (#foreach($column in $subTable.columns) #{item.$column.javaField}#if($foreach.count != $subTable.columns.size()),#end#end) - - -#end - \ No newline at end of file diff --git a/bnyer-modules/bnyer-job/src/main/java/com/bnyer/job/BnyerJobApplication.java b/bnyer-modules/bnyer-job/src/main/java/com/bnyer/job/BnyerJobApplication.java deleted file mode 100644 index 23f3f92..0000000 --- a/bnyer-modules/bnyer-job/src/main/java/com/bnyer/job/BnyerJobApplication.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.bnyer.job; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import com.bnyer.common.security.annotation.EnableCustomConfig; -import com.bnyer.common.security.annotation.EnableRyFeignClients; -import com.bnyer.common.swagger.annotation.EnableCustomSwagger2; - -/** - * 定时任务 - * - * @author ruoyi - */ -@EnableCustomConfig -@EnableCustomSwagger2 -@EnableRyFeignClients -@SpringBootApplication -public class BnyerJobApplication -{ - public static void main(String[] args) - { - SpringApplication.run(BnyerJobApplication.class, args); - System.out.println("(♥◠‿◠)ﾉﾞ 定时任务模块启动成功 ლ(´ڡ`ლ)ﾞ \n" + - " .-------. ____ __ \n" + - " | _ _ \\ \\ \\ / / \n" + - " | ( ' ) | \\ _. / ' \n" + - " |(_ o _) / _( )_ .' \n" + - " | (_,_).' __ ___(_ o _)' \n" + - " | |\\ \\ | || |(_,_)' \n" + - " | | \\ `' /| `-' / \n" + - " | | \\ / \\ / \n" + - " ''-' `'-' `-..-' "); - } -} diff --git a/bnyer-modules/bnyer-job/src/main/resources/banner.txt b/bnyer-modules/bnyer-job/src/main/resources/banner.txt deleted file mode 100644 index b9711d6..0000000 --- a/bnyer-modules/bnyer-job/src/main/resources/banner.txt +++ /dev/null @@ -1,14 +0,0 @@ -Spring Boot Version: ${spring-boot.version} -Spring Application Name: ${spring.application.name} - - .----------------. .-----------------. .----------------. .----------------. .----------------. .----------------. .----------------. .----------------. .----------------. -| .--------------. || .--------------. || .--------------. || .--------------. || .--------------. || .--------------. || .--------------. || .--------------. || .--------------. | -| | ______ | || | ____ _____ | || | ____ ____ | || | _________ | || | _______ | || | | || | _____ | || | ____ | || | ______ | | -| | |_ _ \ | || ||_ \|_ _| | || | |_ _||_ _| | || | |_ ___ | | || | |_ __ \ | || | | || | |_ _| | || | .' `. | || | |_ _ \ | | -| | | |_) | | || | | \ | | | || | \ \ / / | || | | |_ \_| | || | | |__) | | || | ______ | || | | | | || | / .--. \ | || | | |_) | | | -| | | __'. | || | | |\ \| | | || | \ \/ / | || | | _| _ | || | | __ / | || | |______| | || | _ | | | || | | | | | | || | | __'. | | -| | _| |__) | | || | _| |_\ |_ | || | _| |_ | || | _| |___/ | | || | _| | \ \_ | || | | || | | |_' | | || | \ `--' / | || | _| |__) | | | -| | |_______/ | || ||_____|\____| | || | |______| | || | |_________| | || | |____| |___| | || | | || | `.___.' | || | `.____.' | || | |_______/ | | -| | | || | | || | | || | | || | | || | | || | | || | | || | | | -| '--------------' || '--------------' || '--------------' || '--------------' || '--------------' || '--------------' || '--------------' || '--------------' || '--------------' | - '----------------' '----------------' '----------------' '----------------' '----------------' '----------------' '----------------' '----------------' '----------------' diff --git a/bnyer-modules/bnyer-system/src/main/resources/banner.txt b/bnyer-modules/bnyer-system/src/main/resources/banner.txt deleted file mode 100644 index 296fdf8..0000000 --- a/bnyer-modules/bnyer-system/src/main/resources/banner.txt +++ /dev/null @@ -1,14 +0,0 @@ -Spring Boot Version: ${spring-boot.version} -Spring Application Name: ${spring.application.name} - - .----------------. .-----------------. .----------------. .----------------. .----------------. .----------------. .----------------. .----------------. .----------------. .----------------. .----------------. .----------------. -| .--------------. || .--------------. || .--------------. || .--------------. || .--------------. || .--------------. || .--------------. || .--------------. || .--------------. || .--------------. || .--------------. || .--------------. | -| | ______ | || | ____ _____ | || | ____ ____ | || | _________ | || | _______ | || | | || | _______ | || | ____ ____ | || | _______ | || | _________ | || | _________ | || | ____ ____ | | -| | |_ _ \ | || ||_ \|_ _| | || | |_ _||_ _| | || | |_ ___ | | || | |_ __ \ | || | | || | / ___ | | || | |_ _||_ _| | || | / ___ | | || | | _ _ | | || | |_ ___ | | || ||_ \ / _|| | -| | | |_) | | || | | \ | | | || | \ \ / / | || | | |_ \_| | || | | |__) | | || | ______ | || | | (__ \_| | || | \ \ / / | || | | (__ \_| | || | |_/ | | \_| | || | | |_ \_| | || | | \/ | | | -| | | __'. | || | | |\ \| | | || | \ \/ / | || | | _| _ | || | | __ / | || | |______| | || | '.___`-. | || | \ \/ / | || | '.___`-. | || | | | | || | | _| _ | || | | |\ /| | | | -| | _| |__) | | || | _| |_\ |_ | || | _| |_ | || | _| |___/ | | || | _| | \ \_ | || | | || | |`\____) | | || | _| |_ | || | |`\____) | | || | _| |_ | || | _| |___/ | | || | _| |_\/_| |_ | | -| | |_______/ | || ||_____|\____| | || | |______| | || | |_________| | || | |____| |___| | || | | || | |_______.' | || | |______| | || | |_______.' | || | |_____| | || | |_________| | || ||_____||_____|| | -| | | || | | || | | || | | || | | || | | || | | || | | || | | || | | || | | || | | | -| '--------------' || '--------------' || '--------------' || '--------------' || '--------------' || '--------------' || '--------------' || '--------------' || '--------------' || '--------------' || '--------------' || '--------------' | - '----------------' '----------------' '----------------' '----------------' '----------------' '----------------' '----------------' '----------------' '----------------' '----------------' '----------------' '----------------' diff --git a/bnyer-modules/bnyer-file/pom.xml b/bnyer-services/bnyer-file/pom.xml similarity index 94% rename from bnyer-modules/bnyer-file/pom.xml rename to bnyer-services/bnyer-file/pom.xml index 13e250f..657ad41 100644 --- a/bnyer-modules/bnyer-file/pom.xml +++ b/bnyer-services/bnyer-file/pom.xml @@ -4,15 +4,15 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> com.dimensionalnode - bnyer-modules + bnyer-services 1.0.0 4.0.0 - bnyer-modules-file + bnyer-file - bnyer-modules-file文件服务 + bnyer-file文件服务 diff --git a/bnyer-services/bnyer-file/src/main/java/com/bnyer/file/BnyerFileApplication.java b/bnyer-services/bnyer-file/src/main/java/com/bnyer/file/BnyerFileApplication.java new file mode 100644 index 0000000..ef57633 --- /dev/null +++ b/bnyer-services/bnyer-file/src/main/java/com/bnyer/file/BnyerFileApplication.java @@ -0,0 +1,28 @@ +package com.bnyer.file; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; +import com.bnyer.common.swagger.annotation.EnableCustomSwagger2; + +/** + * 文件服务 + * + * @author ruoyi + */ +@EnableCustomSwagger2 +@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class }) +public class BnyerFileApplication +{ + public static void main(String[] args) + { + SpringApplication.run(BnyerFileApplication.class, args); + System.out.println("(♥◠‿◠)ﾉﾞ bnyer文件服务启动成功 ლ(´ڡ`ლ)ﾞ \n" + + "__________ \n" + + "\\______ \\ ____ ___.__. ___________ \n" + + " | | _// < | |/ __ \\_ __ \\\n" + + " | | \\ | \\___ \\ ___/| | \\/\n" + + " |______ /___| / ____|\\___ >__| \n" + + " \\/ \\/\\/ \\/ \n"); + } +} diff --git a/bnyer-modules/bnyer-file/src/main/java/com/bnyer/file/config/MinioConfig.java b/bnyer-services/bnyer-file/src/main/java/com/bnyer/file/config/MinioConfig.java similarity index 100% rename from bnyer-modules/bnyer-file/src/main/java/com/bnyer/file/config/MinioConfig.java rename to bnyer-services/bnyer-file/src/main/java/com/bnyer/file/config/MinioConfig.java diff --git a/bnyer-modules/bnyer-file/src/main/java/com/bnyer/file/config/ResourcesConfig.java b/bnyer-services/bnyer-file/src/main/java/com/bnyer/file/config/ResourcesConfig.java similarity index 100% rename from bnyer-modules/bnyer-file/src/main/java/com/bnyer/file/config/ResourcesConfig.java rename to bnyer-services/bnyer-file/src/main/java/com/bnyer/file/config/ResourcesConfig.java diff --git a/bnyer-modules/bnyer-file/src/main/java/com/bnyer/file/controller/SysFileController.java b/bnyer-services/bnyer-file/src/main/java/com/bnyer/file/controller/SysFileController.java similarity index 100% rename from bnyer-modules/bnyer-file/src/main/java/com/bnyer/file/controller/SysFileController.java rename to bnyer-services/bnyer-file/src/main/java/com/bnyer/file/controller/SysFileController.java diff --git a/bnyer-modules/bnyer-file/src/main/java/com/bnyer/file/service/FastDfsSysFileServiceImpl.java b/bnyer-services/bnyer-file/src/main/java/com/bnyer/file/service/FastDfsSysFileServiceImpl.java similarity index 100% rename from bnyer-modules/bnyer-file/src/main/java/com/bnyer/file/service/FastDfsSysFileServiceImpl.java rename to bnyer-services/bnyer-file/src/main/java/com/bnyer/file/service/FastDfsSysFileServiceImpl.java diff --git a/bnyer-modules/bnyer-file/src/main/java/com/bnyer/file/service/ISysFileService.java b/bnyer-services/bnyer-file/src/main/java/com/bnyer/file/service/ISysFileService.java similarity index 100% rename from bnyer-modules/bnyer-file/src/main/java/com/bnyer/file/service/ISysFileService.java rename to bnyer-services/bnyer-file/src/main/java/com/bnyer/file/service/ISysFileService.java diff --git a/bnyer-modules/bnyer-file/src/main/java/com/bnyer/file/service/LocalSysFileServiceImpl.java b/bnyer-services/bnyer-file/src/main/java/com/bnyer/file/service/LocalSysFileServiceImpl.java similarity index 100% rename from bnyer-modules/bnyer-file/src/main/java/com/bnyer/file/service/LocalSysFileServiceImpl.java rename to bnyer-services/bnyer-file/src/main/java/com/bnyer/file/service/LocalSysFileServiceImpl.java diff --git a/bnyer-modules/bnyer-file/src/main/java/com/bnyer/file/service/MinioSysFileServiceImpl.java b/bnyer-services/bnyer-file/src/main/java/com/bnyer/file/service/MinioSysFileServiceImpl.java similarity index 100% rename from bnyer-modules/bnyer-file/src/main/java/com/bnyer/file/service/MinioSysFileServiceImpl.java rename to bnyer-services/bnyer-file/src/main/java/com/bnyer/file/service/MinioSysFileServiceImpl.java diff --git a/bnyer-modules/bnyer-file/src/main/java/com/bnyer/file/utils/FileUploadUtils.java b/bnyer-services/bnyer-file/src/main/java/com/bnyer/file/utils/FileUploadUtils.java similarity index 100% rename from bnyer-modules/bnyer-file/src/main/java/com/bnyer/file/utils/FileUploadUtils.java rename to bnyer-services/bnyer-file/src/main/java/com/bnyer/file/utils/FileUploadUtils.java diff --git a/bnyer-modules/bnyer-file/src/main/resources/bootstrap.yml b/bnyer-services/bnyer-file/src/main/resources/bootstrap.yml similarity index 50% rename from bnyer-modules/bnyer-file/src/main/resources/bootstrap.yml rename to bnyer-services/bnyer-file/src/main/resources/bootstrap.yml index 19780f9..88be0d4 100644 --- a/bnyer-modules/bnyer-file/src/main/resources/bootstrap.yml +++ b/bnyer-services/bnyer-file/src/main/resources/bootstrap.yml @@ -1,9 +1,12 @@ # Tomcat server: - port: 9300 + port: 8011 # Spring -spring: +spring: + main: + #解决循环依赖问题 + allow-circular-references: true application: # 应用名称 name: bnyer-file @@ -14,12 +17,20 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 127.0.0.1:8848 + server-addr: 127.0.0.1:6231 + # 命名空间地址 + namespace: 52a72b07-7081-445b-b500-76976957abbc + # 命名空间 + group: dev config: # 配置中心地址 - server-addr: 127.0.0.1:8848 + server-addr: 127.0.0.1:6231 # 配置文件格式 file-extension: yml + # 命名空间地址 + namespace: 52a72b07-7081-445b-b500-76976957abbc + # 命名空间 + group: dev # 共享配置 shared-configs: - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} diff --git a/bnyer-modules/bnyer-file/src/main/resources/logback.xml b/bnyer-services/bnyer-file/src/main/resources/logback.xml similarity index 97% rename from bnyer-modules/bnyer-file/src/main/resources/logback.xml rename to bnyer-services/bnyer-file/src/main/resources/logback.xml index 7b476e4..e7f6a8c 100644 --- a/bnyer-modules/bnyer-file/src/main/resources/logback.xml +++ b/bnyer-services/bnyer-file/src/main/resources/logback.xml @@ -20,7 +20,7 @@ ${log.path}/info.%d{yyyy-MM-dd}.log - 60 + 20 ${log.pattern} @@ -42,7 +42,7 @@ ${log.path}/error.%d{yyyy-MM-dd}.log - 60 + 20 ${log.pattern} diff --git a/bnyer-modules/bnyer-gen/pom.xml b/bnyer-services/bnyer-img/pom.xml similarity index 65% rename from bnyer-modules/bnyer-gen/pom.xml rename to bnyer-services/bnyer-img/pom.xml index 852deb9..ac8ddf3 100644 --- a/bnyer-modules/bnyer-gen/pom.xml +++ b/bnyer-services/bnyer-img/pom.xml @@ -4,97 +4,77 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> com.dimensionalnode - bnyer-modules + bnyer-services 1.0.0 4.0.0 - bnyer-modules-gen + bnyer-img - bnyer-modules-gen代码生成 + bnyer-img图片平台服务 - - + com.alibaba.cloud spring-cloud-starter-alibaba-nacos-discovery - + com.alibaba.cloud spring-cloud-starter-alibaba-nacos-config - + com.alibaba.cloud spring-cloud-starter-alibaba-sentinel - + org.springframework.boot spring-boot-starter-actuator - + io.springfox springfox-swagger-ui ${swagger.fox.version} - - - - org.apache.velocity - velocity-engine-core - - - - - commons-collections - commons-collections - - + mysql mysql-connector-java - + + + + com.dimensionalnode + bnyer-common-datasource + + + + + com.dimensionalnode + bnyer-common-datascope + + com.dimensionalnode bnyer-common-log - + com.dimensionalnode bnyer-common-swagger - - - - ${project.artifactId} - - - org.springframework.boot - spring-boot-maven-plugin - - - - repackage - - - - - - - \ No newline at end of file diff --git a/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/BnyerImgApplication.java b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/BnyerImgApplication.java new file mode 100644 index 0000000..433f48d --- /dev/null +++ b/bnyer-services/bnyer-img/src/main/java/com/bnyer/img/BnyerImgApplication.java @@ -0,0 +1,31 @@ +package com.bnyer.img; + +import com.bnyer.common.security.annotation.EnableCustomConfig; +import com.bnyer.common.security.annotation.EnableRyFeignClients; +import com.bnyer.common.swagger.annotation.EnableCustomSwagger2; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +/** + * 系统模块 + * + * @author penny + */ +@EnableCustomConfig +@EnableCustomSwagger2 +@EnableRyFeignClients +@SpringBootApplication +public class BnyerImgApplication +{ + public static void main(String[] args) + { + SpringApplication.run(BnyerImgApplication.class, args); + System.out.println("(♥◠‿◠)ﾉﾞ bnyer图片平台服务启动成功 ლ(´ڡ`ლ)ﾞ \n" + + "__________ \n" + + "\\______ \\ ____ ___.__. ___________ \n" + + " | | _// < | |/ __ \\_ __ \\\n" + + " | | \\ | \\___ \\ ___/| | \\/\n" + + " |______ /___| / ____|\\___ >__| \n" + + " \\/ \\/\\/ \\/ \n"); + } +} diff --git a/bnyer-services/bnyer-img/src/main/resources/bootstrap.yml b/bnyer-services/bnyer-img/src/main/resources/bootstrap.yml new file mode 100644 index 0000000..c23d3b5 --- /dev/null +++ b/bnyer-services/bnyer-img/src/main/resources/bootstrap.yml @@ -0,0 +1,36 @@ +# Tomcat +server: + port: 9102 + +# Spring +spring: + main: + #解决循环依赖问题 + allow-circular-references: true + application: + # 应用名称 + name: bnyer-img + profiles: + # 环境配置 + active: dev + cloud: + nacos: + discovery: + # 服务注册地址 + server-addr: 127.0.0.1:6231 + # 命名空间地址 + namespace: 52a72b07-7081-445b-b500-76976957abbc + # 命名空间 + group: dev + config: + # 配置中心地址 + server-addr: 127.0.0.1:6231 + # 配置文件格式 + file-extension: yml + # 命名空间地址 + namespace: 52a72b07-7081-445b-b500-76976957abbc + # 命名空间 + group: dev + # 共享配置 + shared-configs: + - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} diff --git a/bnyer-modules/bnyer-gen/src/main/resources/logback.xml b/bnyer-services/bnyer-img/src/main/resources/logback.xml similarity index 95% rename from bnyer-modules/bnyer-gen/src/main/resources/logback.xml rename to bnyer-services/bnyer-img/src/main/resources/logback.xml index 1c3c379..c1cc6b9 100644 --- a/bnyer-modules/bnyer-gen/src/main/resources/logback.xml +++ b/bnyer-services/bnyer-img/src/main/resources/logback.xml @@ -1,7 +1,7 @@ - + @@ -20,7 +20,7 @@ ${log.path}/info.%d{yyyy-MM-dd}.log - 60 + 20 ${log.pattern} @@ -42,7 +42,7 @@ ${log.path}/error.%d{yyyy-MM-dd}.log - 60 + 20 ${log.pattern} diff --git a/bnyer-modules/bnyer-job/pom.xml b/bnyer-services/bnyer-job/pom.xml similarity index 95% rename from bnyer-modules/bnyer-job/pom.xml rename to bnyer-services/bnyer-job/pom.xml index 791829f..30c6c9a 100644 --- a/bnyer-modules/bnyer-job/pom.xml +++ b/bnyer-services/bnyer-job/pom.xml @@ -4,15 +4,15 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> com.dimensionalnode - bnyer-modules + bnyer-services 1.0.0 4.0.0 - bnyer-modules-job + bnyer-job - bnyer-modules-job定时任务 + bnyer-job定时任务服务 diff --git a/bnyer-services/bnyer-job/src/main/java/com/bnyer/job/BnyerJobApplication.java b/bnyer-services/bnyer-job/src/main/java/com/bnyer/job/BnyerJobApplication.java new file mode 100644 index 0000000..0e1f11e --- /dev/null +++ b/bnyer-services/bnyer-job/src/main/java/com/bnyer/job/BnyerJobApplication.java @@ -0,0 +1,31 @@ +package com.bnyer.job; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import com.bnyer.common.security.annotation.EnableCustomConfig; +import com.bnyer.common.security.annotation.EnableRyFeignClients; +import com.bnyer.common.swagger.annotation.EnableCustomSwagger2; + +/** + * 定时任务 + * + * @author ruoyi + */ +@EnableCustomConfig +@EnableCustomSwagger2 +@EnableRyFeignClients +@SpringBootApplication +public class BnyerJobApplication +{ + public static void main(String[] args) + { + SpringApplication.run(BnyerJobApplication.class, args); + System.out.println("(♥◠‿◠)ﾉﾞ bnyer认识任务服务启动成功 ლ(´ڡ`ლ)ﾞ \n" + + "__________ \n" + + "\\______ \\ ____ ___.__. ___________ \n" + + " | | _// < | |/ __ \\_ __ \\\n" + + " | | \\ | \\___ \\ ___/| | \\/\n" + + " |______ /___| / ____|\\___ >__| \n" + + " \\/ \\/\\/ \\/ \n"); + } +} diff --git a/bnyer-modules/bnyer-job/src/main/java/com/bnyer/job/config/ScheduleConfig.java b/bnyer-services/bnyer-job/src/main/java/com/bnyer/job/config/ScheduleConfig.java similarity index 100% rename from bnyer-modules/bnyer-job/src/main/java/com/bnyer/job/config/ScheduleConfig.java rename to bnyer-services/bnyer-job/src/main/java/com/bnyer/job/config/ScheduleConfig.java diff --git a/bnyer-modules/bnyer-job/src/main/java/com/bnyer/job/controller/SysJobController.java b/bnyer-services/bnyer-job/src/main/java/com/bnyer/job/controller/SysJobController.java similarity index 100% rename from bnyer-modules/bnyer-job/src/main/java/com/bnyer/job/controller/SysJobController.java rename to bnyer-services/bnyer-job/src/main/java/com/bnyer/job/controller/SysJobController.java diff --git a/bnyer-modules/bnyer-job/src/main/java/com/bnyer/job/controller/SysJobLogController.java b/bnyer-services/bnyer-job/src/main/java/com/bnyer/job/controller/SysJobLogController.java similarity index 100% rename from bnyer-modules/bnyer-job/src/main/java/com/bnyer/job/controller/SysJobLogController.java rename to bnyer-services/bnyer-job/src/main/java/com/bnyer/job/controller/SysJobLogController.java diff --git a/bnyer-modules/bnyer-job/src/main/java/com/bnyer/job/domain/SysJob.java b/bnyer-services/bnyer-job/src/main/java/com/bnyer/job/domain/SysJob.java similarity index 100% rename from bnyer-modules/bnyer-job/src/main/java/com/bnyer/job/domain/SysJob.java rename to bnyer-services/bnyer-job/src/main/java/com/bnyer/job/domain/SysJob.java diff --git a/bnyer-modules/bnyer-job/src/main/java/com/bnyer/job/domain/SysJobLog.java b/bnyer-services/bnyer-job/src/main/java/com/bnyer/job/domain/SysJobLog.java similarity index 100% rename from bnyer-modules/bnyer-job/src/main/java/com/bnyer/job/domain/SysJobLog.java rename to bnyer-services/bnyer-job/src/main/java/com/bnyer/job/domain/SysJobLog.java diff --git a/bnyer-modules/bnyer-job/src/main/java/com/bnyer/job/mapper/SysJobLogMapper.java b/bnyer-services/bnyer-job/src/main/java/com/bnyer/job/mapper/SysJobLogMapper.java similarity index 100% rename from bnyer-modules/bnyer-job/src/main/java/com/bnyer/job/mapper/SysJobLogMapper.java rename to bnyer-services/bnyer-job/src/main/java/com/bnyer/job/mapper/SysJobLogMapper.java diff --git a/bnyer-modules/bnyer-job/src/main/java/com/bnyer/job/mapper/SysJobMapper.java b/bnyer-services/bnyer-job/src/main/java/com/bnyer/job/mapper/SysJobMapper.java similarity index 100% rename from bnyer-modules/bnyer-job/src/main/java/com/bnyer/job/mapper/SysJobMapper.java rename to bnyer-services/bnyer-job/src/main/java/com/bnyer/job/mapper/SysJobMapper.java diff --git a/bnyer-modules/bnyer-job/src/main/java/com/bnyer/job/service/ISysJobLogService.java b/bnyer-services/bnyer-job/src/main/java/com/bnyer/job/service/ISysJobLogService.java similarity index 100% rename from bnyer-modules/bnyer-job/src/main/java/com/bnyer/job/service/ISysJobLogService.java rename to bnyer-services/bnyer-job/src/main/java/com/bnyer/job/service/ISysJobLogService.java diff --git a/bnyer-modules/bnyer-job/src/main/java/com/bnyer/job/service/ISysJobService.java b/bnyer-services/bnyer-job/src/main/java/com/bnyer/job/service/ISysJobService.java similarity index 100% rename from bnyer-modules/bnyer-job/src/main/java/com/bnyer/job/service/ISysJobService.java rename to bnyer-services/bnyer-job/src/main/java/com/bnyer/job/service/ISysJobService.java diff --git a/bnyer-modules/bnyer-job/src/main/java/com/bnyer/job/service/SysJobLogServiceImpl.java b/bnyer-services/bnyer-job/src/main/java/com/bnyer/job/service/SysJobLogServiceImpl.java similarity index 100% rename from bnyer-modules/bnyer-job/src/main/java/com/bnyer/job/service/SysJobLogServiceImpl.java rename to bnyer-services/bnyer-job/src/main/java/com/bnyer/job/service/SysJobLogServiceImpl.java diff --git a/bnyer-modules/bnyer-job/src/main/java/com/bnyer/job/service/SysJobServiceImpl.java b/bnyer-services/bnyer-job/src/main/java/com/bnyer/job/service/SysJobServiceImpl.java similarity index 100% rename from bnyer-modules/bnyer-job/src/main/java/com/bnyer/job/service/SysJobServiceImpl.java rename to bnyer-services/bnyer-job/src/main/java/com/bnyer/job/service/SysJobServiceImpl.java diff --git a/bnyer-modules/bnyer-job/src/main/java/com/bnyer/job/task/RyTask.java b/bnyer-services/bnyer-job/src/main/java/com/bnyer/job/task/RyTask.java similarity index 100% rename from bnyer-modules/bnyer-job/src/main/java/com/bnyer/job/task/RyTask.java rename to bnyer-services/bnyer-job/src/main/java/com/bnyer/job/task/RyTask.java diff --git a/bnyer-modules/bnyer-job/src/main/java/com/bnyer/job/util/AbstractQuartzJob.java b/bnyer-services/bnyer-job/src/main/java/com/bnyer/job/util/AbstractQuartzJob.java similarity index 100% rename from bnyer-modules/bnyer-job/src/main/java/com/bnyer/job/util/AbstractQuartzJob.java rename to bnyer-services/bnyer-job/src/main/java/com/bnyer/job/util/AbstractQuartzJob.java diff --git a/bnyer-modules/bnyer-job/src/main/java/com/bnyer/job/util/CronUtils.java b/bnyer-services/bnyer-job/src/main/java/com/bnyer/job/util/CronUtils.java similarity index 100% rename from bnyer-modules/bnyer-job/src/main/java/com/bnyer/job/util/CronUtils.java rename to bnyer-services/bnyer-job/src/main/java/com/bnyer/job/util/CronUtils.java diff --git a/bnyer-modules/bnyer-job/src/main/java/com/bnyer/job/util/JobInvokeUtil.java b/bnyer-services/bnyer-job/src/main/java/com/bnyer/job/util/JobInvokeUtil.java similarity index 100% rename from bnyer-modules/bnyer-job/src/main/java/com/bnyer/job/util/JobInvokeUtil.java rename to bnyer-services/bnyer-job/src/main/java/com/bnyer/job/util/JobInvokeUtil.java diff --git a/bnyer-modules/bnyer-job/src/main/java/com/bnyer/job/util/QuartzDisallowConcurrentExecution.java b/bnyer-services/bnyer-job/src/main/java/com/bnyer/job/util/QuartzDisallowConcurrentExecution.java similarity index 100% rename from bnyer-modules/bnyer-job/src/main/java/com/bnyer/job/util/QuartzDisallowConcurrentExecution.java rename to bnyer-services/bnyer-job/src/main/java/com/bnyer/job/util/QuartzDisallowConcurrentExecution.java diff --git a/bnyer-modules/bnyer-job/src/main/java/com/bnyer/job/util/QuartzJobExecution.java b/bnyer-services/bnyer-job/src/main/java/com/bnyer/job/util/QuartzJobExecution.java similarity index 100% rename from bnyer-modules/bnyer-job/src/main/java/com/bnyer/job/util/QuartzJobExecution.java rename to bnyer-services/bnyer-job/src/main/java/com/bnyer/job/util/QuartzJobExecution.java diff --git a/bnyer-modules/bnyer-job/src/main/java/com/bnyer/job/util/ScheduleUtils.java b/bnyer-services/bnyer-job/src/main/java/com/bnyer/job/util/ScheduleUtils.java similarity index 100% rename from bnyer-modules/bnyer-job/src/main/java/com/bnyer/job/util/ScheduleUtils.java rename to bnyer-services/bnyer-job/src/main/java/com/bnyer/job/util/ScheduleUtils.java diff --git a/bnyer-modules/bnyer-job/src/main/resources/bootstrap.yml b/bnyer-services/bnyer-job/src/main/resources/bootstrap.yml similarity index 50% rename from bnyer-modules/bnyer-job/src/main/resources/bootstrap.yml rename to bnyer-services/bnyer-job/src/main/resources/bootstrap.yml index 3cdeddc..c52ce76 100644 --- a/bnyer-modules/bnyer-job/src/main/resources/bootstrap.yml +++ b/bnyer-services/bnyer-job/src/main/resources/bootstrap.yml @@ -1,9 +1,12 @@ # Tomcat server: - port: 9203 + port: 8012 # Spring -spring: +spring: + main: + #解决循环依赖问题 + allow-circular-references: true application: # 应用名称 name: bnyer-job @@ -14,12 +17,20 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 127.0.0.1:8848 + server-addr: 127.0.0.1:6231 + # 命名空间地址 + namespace: 52a72b07-7081-445b-b500-76976957abbc + # 命名空间 + group: dev config: # 配置中心地址 - server-addr: 127.0.0.1:8848 + server-addr: 127.0.0.1:6231 # 配置文件格式 file-extension: yml + # 命名空间地址 + namespace: 52a72b07-7081-445b-b500-76976957abbc + # 命名空间 + group: dev # 共享配置 shared-configs: - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} diff --git a/bnyer-modules/bnyer-job/src/main/resources/mapper/job/SysJobLogMapper.xml b/bnyer-services/bnyer-job/src/main/resources/com/bnyer/job/mapper/SysJobLogMapper.xml similarity index 93% rename from bnyer-modules/bnyer-job/src/main/resources/mapper/job/SysJobLogMapper.xml rename to bnyer-services/bnyer-job/src/main/resources/com/bnyer/job/mapper/SysJobLogMapper.xml index 2cd19a6..8fbf386 100644 --- a/bnyer-modules/bnyer-job/src/main/resources/mapper/job/SysJobLogMapper.xml +++ b/bnyer-services/bnyer-job/src/main/resources/com/bnyer/job/mapper/SysJobLogMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -20,7 +20,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" from sys_job_log - @@ -68,7 +68,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" truncate table sys_job_log - + insert into sys_job_log( job_log_id, job_name, diff --git a/bnyer-modules/bnyer-job/src/main/resources/mapper/job/SysJobMapper.xml b/bnyer-services/bnyer-job/src/main/resources/com/bnyer/job/mapper/SysJobMapper.xml similarity index 92% rename from bnyer-modules/bnyer-job/src/main/resources/mapper/job/SysJobMapper.xml rename to bnyer-services/bnyer-job/src/main/resources/com/bnyer/job/mapper/SysJobMapper.xml index 4c97416..612a482 100644 --- a/bnyer-modules/bnyer-job/src/main/resources/mapper/job/SysJobMapper.xml +++ b/bnyer-services/bnyer-job/src/main/resources/com/bnyer/job/mapper/SysJobMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -25,7 +25,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" from sys_job - @@ -63,7 +63,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + update sys_job job_name = #{jobName}, @@ -80,7 +80,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where job_id = #{jobId} - + insert into sys_job( job_id, job_name, diff --git a/bnyer-modules/bnyer-job/src/main/resources/logback.xml b/bnyer-services/bnyer-job/src/main/resources/logback.xml similarity index 97% rename from bnyer-modules/bnyer-job/src/main/resources/logback.xml rename to bnyer-services/bnyer-job/src/main/resources/logback.xml index 5c62443..93fee1e 100644 --- a/bnyer-modules/bnyer-job/src/main/resources/logback.xml +++ b/bnyer-services/bnyer-job/src/main/resources/logback.xml @@ -20,7 +20,7 @@ ${log.path}/info.%d{yyyy-MM-dd}.log - 60 + 20 ${log.pattern} @@ -42,7 +42,7 @@ ${log.path}/error.%d{yyyy-MM-dd}.log - 60 + 20 ${log.pattern} diff --git a/bnyer-modules/bnyer-system/pom.xml b/bnyer-services/bnyer-system/pom.xml similarity index 95% rename from bnyer-modules/bnyer-system/pom.xml rename to bnyer-services/bnyer-system/pom.xml index 9391d8d..9fd50b0 100644 --- a/bnyer-modules/bnyer-system/pom.xml +++ b/bnyer-services/bnyer-system/pom.xml @@ -4,15 +4,15 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> com.dimensionalnode - bnyer-modules + bnyer-services 1.0.0 4.0.0 - bnyer-modules-system + bnyer-system - bnyer-modules-system系统模块 + bnyer-system系统服务 @@ -53,7 +53,7 @@ mysql mysql-connector-java - + com.dimensionalnode diff --git a/bnyer-modules/bnyer-system/src/main/java/com/bnyer/system/BnyerSystemApplication.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/BnyerSystemApplication.java similarity index 50% rename from bnyer-modules/bnyer-system/src/main/java/com/bnyer/system/BnyerSystemApplication.java rename to bnyer-services/bnyer-system/src/main/java/com/bnyer/system/BnyerSystemApplication.java index f21d4c7..7845642 100644 --- a/bnyer-modules/bnyer-system/src/main/java/com/bnyer/system/BnyerSystemApplication.java +++ b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/BnyerSystemApplication.java @@ -20,15 +20,12 @@ public class BnyerSystemApplication public static void main(String[] args) { SpringApplication.run(BnyerSystemApplication.class, args); - System.out.println("(♥◠‿◠)ﾉﾞ 系统模块启动成功 ლ(´ڡ`ლ)ﾞ \n" + - " .-------. ____ __ \n" + - " | _ _ \\ \\ \\ / / \n" + - " | ( ' ) | \\ _. / ' \n" + - " |(_ o _) / _( )_ .' \n" + - " | (_,_).' __ ___(_ o _)' \n" + - " | |\\ \\ | || |(_,_)' \n" + - " | | \\ `' /| `-' / \n" + - " | | \\ / \\ / \n" + - " ''-' `'-' `-..-' "); + System.out.println("(♥◠‿◠)ﾉﾞ bnyer系统服务启动成功 ლ(´ڡ`ლ)ﾞ \n" + + "__________ \n" + + "\\______ \\ ____ ___.__. ___________ \n" + + " | | _// < | |/ __ \\_ __ \\\n" + + " | | \\ | \\___ \\ ___/| | \\/\n" + + " |______ /___| / ____|\\___ >__| \n" + + " \\/ \\/\\/ \\/ \n"); } } diff --git a/bnyer-modules/bnyer-system/src/main/java/com/bnyer/system/controller/SysConfigController.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/SysConfigController.java similarity index 100% rename from bnyer-modules/bnyer-system/src/main/java/com/bnyer/system/controller/SysConfigController.java rename to bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/SysConfigController.java diff --git a/bnyer-modules/bnyer-system/src/main/java/com/bnyer/system/controller/SysDeptController.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/SysDeptController.java similarity index 100% rename from bnyer-modules/bnyer-system/src/main/java/com/bnyer/system/controller/SysDeptController.java rename to bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/SysDeptController.java diff --git a/bnyer-modules/bnyer-system/src/main/java/com/bnyer/system/controller/SysDictDataController.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/SysDictDataController.java similarity index 100% rename from bnyer-modules/bnyer-system/src/main/java/com/bnyer/system/controller/SysDictDataController.java rename to bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/SysDictDataController.java diff --git a/bnyer-modules/bnyer-system/src/main/java/com/bnyer/system/controller/SysDictTypeController.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/SysDictTypeController.java similarity index 100% rename from bnyer-modules/bnyer-system/src/main/java/com/bnyer/system/controller/SysDictTypeController.java rename to bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/SysDictTypeController.java diff --git a/bnyer-modules/bnyer-system/src/main/java/com/bnyer/system/controller/SysLogininforController.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/SysLogininforController.java similarity index 100% rename from bnyer-modules/bnyer-system/src/main/java/com/bnyer/system/controller/SysLogininforController.java rename to bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/SysLogininforController.java diff --git a/bnyer-modules/bnyer-system/src/main/java/com/bnyer/system/controller/SysMenuController.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/SysMenuController.java similarity index 100% rename from bnyer-modules/bnyer-system/src/main/java/com/bnyer/system/controller/SysMenuController.java rename to bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/SysMenuController.java diff --git a/bnyer-modules/bnyer-system/src/main/java/com/bnyer/system/controller/SysNoticeController.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/SysNoticeController.java similarity index 100% rename from bnyer-modules/bnyer-system/src/main/java/com/bnyer/system/controller/SysNoticeController.java rename to bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/SysNoticeController.java diff --git a/bnyer-modules/bnyer-system/src/main/java/com/bnyer/system/controller/SysOperlogController.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/SysOperlogController.java similarity index 100% rename from bnyer-modules/bnyer-system/src/main/java/com/bnyer/system/controller/SysOperlogController.java rename to bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/SysOperlogController.java diff --git a/bnyer-modules/bnyer-system/src/main/java/com/bnyer/system/controller/SysPostController.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/SysPostController.java similarity index 100% rename from bnyer-modules/bnyer-system/src/main/java/com/bnyer/system/controller/SysPostController.java rename to bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/SysPostController.java diff --git a/bnyer-modules/bnyer-system/src/main/java/com/bnyer/system/controller/SysProfileController.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/SysProfileController.java similarity index 100% rename from bnyer-modules/bnyer-system/src/main/java/com/bnyer/system/controller/SysProfileController.java rename to bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/SysProfileController.java diff --git a/bnyer-modules/bnyer-system/src/main/java/com/bnyer/system/controller/SysRoleController.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/SysRoleController.java similarity index 100% rename from bnyer-modules/bnyer-system/src/main/java/com/bnyer/system/controller/SysRoleController.java rename to bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/SysRoleController.java diff --git a/bnyer-modules/bnyer-system/src/main/java/com/bnyer/system/controller/SysUserController.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/SysUserController.java similarity index 100% rename from bnyer-modules/bnyer-system/src/main/java/com/bnyer/system/controller/SysUserController.java rename to bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/SysUserController.java diff --git a/bnyer-modules/bnyer-system/src/main/java/com/bnyer/system/controller/SysUserOnlineController.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/SysUserOnlineController.java similarity index 100% rename from bnyer-modules/bnyer-system/src/main/java/com/bnyer/system/controller/SysUserOnlineController.java rename to bnyer-services/bnyer-system/src/main/java/com/bnyer/system/controller/SysUserOnlineController.java diff --git a/bnyer-modules/bnyer-system/src/main/java/com/bnyer/system/domain/SysConfig.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/domain/SysConfig.java similarity index 100% rename from bnyer-modules/bnyer-system/src/main/java/com/bnyer/system/domain/SysConfig.java rename to bnyer-services/bnyer-system/src/main/java/com/bnyer/system/domain/SysConfig.java diff --git a/bnyer-modules/bnyer-system/src/main/java/com/bnyer/system/domain/SysMenu.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/domain/SysMenu.java similarity index 100% rename from bnyer-modules/bnyer-system/src/main/java/com/bnyer/system/domain/SysMenu.java rename to bnyer-services/bnyer-system/src/main/java/com/bnyer/system/domain/SysMenu.java diff --git a/bnyer-modules/bnyer-system/src/main/java/com/bnyer/system/domain/SysNotice.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/domain/SysNotice.java similarity index 100% rename from bnyer-modules/bnyer-system/src/main/java/com/bnyer/system/domain/SysNotice.java rename to bnyer-services/bnyer-system/src/main/java/com/bnyer/system/domain/SysNotice.java diff --git a/bnyer-modules/bnyer-system/src/main/java/com/bnyer/system/domain/SysPost.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/domain/SysPost.java similarity index 100% rename from bnyer-modules/bnyer-system/src/main/java/com/bnyer/system/domain/SysPost.java rename to bnyer-services/bnyer-system/src/main/java/com/bnyer/system/domain/SysPost.java diff --git a/bnyer-modules/bnyer-system/src/main/java/com/bnyer/system/domain/SysRoleDept.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/domain/SysRoleDept.java similarity index 100% rename from bnyer-modules/bnyer-system/src/main/java/com/bnyer/system/domain/SysRoleDept.java rename to bnyer-services/bnyer-system/src/main/java/com/bnyer/system/domain/SysRoleDept.java diff --git a/bnyer-modules/bnyer-system/src/main/java/com/bnyer/system/domain/SysRoleMenu.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/domain/SysRoleMenu.java similarity index 100% rename from bnyer-modules/bnyer-system/src/main/java/com/bnyer/system/domain/SysRoleMenu.java rename to bnyer-services/bnyer-system/src/main/java/com/bnyer/system/domain/SysRoleMenu.java diff --git a/bnyer-modules/bnyer-system/src/main/java/com/bnyer/system/domain/SysUserOnline.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/domain/SysUserOnline.java similarity index 100% rename from bnyer-modules/bnyer-system/src/main/java/com/bnyer/system/domain/SysUserOnline.java rename to bnyer-services/bnyer-system/src/main/java/com/bnyer/system/domain/SysUserOnline.java diff --git a/bnyer-modules/bnyer-system/src/main/java/com/bnyer/system/domain/SysUserPost.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/domain/SysUserPost.java similarity index 100% rename from bnyer-modules/bnyer-system/src/main/java/com/bnyer/system/domain/SysUserPost.java rename to bnyer-services/bnyer-system/src/main/java/com/bnyer/system/domain/SysUserPost.java diff --git a/bnyer-modules/bnyer-system/src/main/java/com/bnyer/system/domain/SysUserRole.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/domain/SysUserRole.java similarity index 100% rename from bnyer-modules/bnyer-system/src/main/java/com/bnyer/system/domain/SysUserRole.java rename to bnyer-services/bnyer-system/src/main/java/com/bnyer/system/domain/SysUserRole.java diff --git a/bnyer-modules/bnyer-system/src/main/java/com/bnyer/system/domain/vo/MetaVo.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/domain/vo/MetaVo.java similarity index 100% rename from bnyer-modules/bnyer-system/src/main/java/com/bnyer/system/domain/vo/MetaVo.java rename to bnyer-services/bnyer-system/src/main/java/com/bnyer/system/domain/vo/MetaVo.java diff --git a/bnyer-modules/bnyer-system/src/main/java/com/bnyer/system/domain/vo/RouterVo.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/domain/vo/RouterVo.java similarity index 100% rename from bnyer-modules/bnyer-system/src/main/java/com/bnyer/system/domain/vo/RouterVo.java rename to bnyer-services/bnyer-system/src/main/java/com/bnyer/system/domain/vo/RouterVo.java diff --git a/bnyer-modules/bnyer-system/src/main/java/com/bnyer/system/domain/vo/TreeSelect.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/domain/vo/TreeSelect.java similarity index 100% rename from bnyer-modules/bnyer-system/src/main/java/com/bnyer/system/domain/vo/TreeSelect.java rename to bnyer-services/bnyer-system/src/main/java/com/bnyer/system/domain/vo/TreeSelect.java diff --git a/bnyer-modules/bnyer-system/src/main/java/com/bnyer/system/mapper/SysConfigMapper.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/mapper/SysConfigMapper.java similarity index 100% rename from bnyer-modules/bnyer-system/src/main/java/com/bnyer/system/mapper/SysConfigMapper.java rename to bnyer-services/bnyer-system/src/main/java/com/bnyer/system/mapper/SysConfigMapper.java diff --git a/bnyer-modules/bnyer-system/src/main/java/com/bnyer/system/mapper/SysDeptMapper.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/mapper/SysDeptMapper.java similarity index 100% rename from bnyer-modules/bnyer-system/src/main/java/com/bnyer/system/mapper/SysDeptMapper.java rename to bnyer-services/bnyer-system/src/main/java/com/bnyer/system/mapper/SysDeptMapper.java diff --git a/bnyer-modules/bnyer-system/src/main/java/com/bnyer/system/mapper/SysDictDataMapper.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/mapper/SysDictDataMapper.java similarity index 100% rename from bnyer-modules/bnyer-system/src/main/java/com/bnyer/system/mapper/SysDictDataMapper.java rename to bnyer-services/bnyer-system/src/main/java/com/bnyer/system/mapper/SysDictDataMapper.java diff --git a/bnyer-modules/bnyer-system/src/main/java/com/bnyer/system/mapper/SysDictTypeMapper.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/mapper/SysDictTypeMapper.java similarity index 100% rename from bnyer-modules/bnyer-system/src/main/java/com/bnyer/system/mapper/SysDictTypeMapper.java rename to bnyer-services/bnyer-system/src/main/java/com/bnyer/system/mapper/SysDictTypeMapper.java diff --git a/bnyer-modules/bnyer-system/src/main/java/com/bnyer/system/mapper/SysLogininforMapper.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/mapper/SysLogininforMapper.java similarity index 100% rename from bnyer-modules/bnyer-system/src/main/java/com/bnyer/system/mapper/SysLogininforMapper.java rename to bnyer-services/bnyer-system/src/main/java/com/bnyer/system/mapper/SysLogininforMapper.java diff --git a/bnyer-modules/bnyer-system/src/main/java/com/bnyer/system/mapper/SysMenuMapper.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/mapper/SysMenuMapper.java similarity index 100% rename from bnyer-modules/bnyer-system/src/main/java/com/bnyer/system/mapper/SysMenuMapper.java rename to bnyer-services/bnyer-system/src/main/java/com/bnyer/system/mapper/SysMenuMapper.java diff --git a/bnyer-modules/bnyer-system/src/main/java/com/bnyer/system/mapper/SysNoticeMapper.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/mapper/SysNoticeMapper.java similarity index 100% rename from bnyer-modules/bnyer-system/src/main/java/com/bnyer/system/mapper/SysNoticeMapper.java rename to bnyer-services/bnyer-system/src/main/java/com/bnyer/system/mapper/SysNoticeMapper.java diff --git a/bnyer-modules/bnyer-system/src/main/java/com/bnyer/system/mapper/SysOperLogMapper.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/mapper/SysOperLogMapper.java similarity index 100% rename from bnyer-modules/bnyer-system/src/main/java/com/bnyer/system/mapper/SysOperLogMapper.java rename to bnyer-services/bnyer-system/src/main/java/com/bnyer/system/mapper/SysOperLogMapper.java diff --git a/bnyer-modules/bnyer-system/src/main/java/com/bnyer/system/mapper/SysPostMapper.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/mapper/SysPostMapper.java similarity index 100% rename from bnyer-modules/bnyer-system/src/main/java/com/bnyer/system/mapper/SysPostMapper.java rename to bnyer-services/bnyer-system/src/main/java/com/bnyer/system/mapper/SysPostMapper.java diff --git a/bnyer-modules/bnyer-system/src/main/java/com/bnyer/system/mapper/SysRoleDeptMapper.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/mapper/SysRoleDeptMapper.java similarity index 100% rename from bnyer-modules/bnyer-system/src/main/java/com/bnyer/system/mapper/SysRoleDeptMapper.java rename to bnyer-services/bnyer-system/src/main/java/com/bnyer/system/mapper/SysRoleDeptMapper.java diff --git a/bnyer-modules/bnyer-system/src/main/java/com/bnyer/system/mapper/SysRoleMapper.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/mapper/SysRoleMapper.java similarity index 100% rename from bnyer-modules/bnyer-system/src/main/java/com/bnyer/system/mapper/SysRoleMapper.java rename to bnyer-services/bnyer-system/src/main/java/com/bnyer/system/mapper/SysRoleMapper.java diff --git a/bnyer-modules/bnyer-system/src/main/java/com/bnyer/system/mapper/SysRoleMenuMapper.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/mapper/SysRoleMenuMapper.java similarity index 100% rename from bnyer-modules/bnyer-system/src/main/java/com/bnyer/system/mapper/SysRoleMenuMapper.java rename to bnyer-services/bnyer-system/src/main/java/com/bnyer/system/mapper/SysRoleMenuMapper.java diff --git a/bnyer-modules/bnyer-system/src/main/java/com/bnyer/system/mapper/SysUserMapper.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/mapper/SysUserMapper.java similarity index 100% rename from bnyer-modules/bnyer-system/src/main/java/com/bnyer/system/mapper/SysUserMapper.java rename to bnyer-services/bnyer-system/src/main/java/com/bnyer/system/mapper/SysUserMapper.java diff --git a/bnyer-modules/bnyer-system/src/main/java/com/bnyer/system/mapper/SysUserPostMapper.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/mapper/SysUserPostMapper.java similarity index 100% rename from bnyer-modules/bnyer-system/src/main/java/com/bnyer/system/mapper/SysUserPostMapper.java rename to bnyer-services/bnyer-system/src/main/java/com/bnyer/system/mapper/SysUserPostMapper.java diff --git a/bnyer-modules/bnyer-system/src/main/java/com/bnyer/system/mapper/SysUserRoleMapper.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/mapper/SysUserRoleMapper.java similarity index 100% rename from bnyer-modules/bnyer-system/src/main/java/com/bnyer/system/mapper/SysUserRoleMapper.java rename to bnyer-services/bnyer-system/src/main/java/com/bnyer/system/mapper/SysUserRoleMapper.java diff --git a/bnyer-modules/bnyer-system/src/main/java/com/bnyer/system/service/ISysConfigService.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/ISysConfigService.java similarity index 100% rename from bnyer-modules/bnyer-system/src/main/java/com/bnyer/system/service/ISysConfigService.java rename to bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/ISysConfigService.java diff --git a/bnyer-modules/bnyer-system/src/main/java/com/bnyer/system/service/ISysDeptService.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/ISysDeptService.java similarity index 100% rename from bnyer-modules/bnyer-system/src/main/java/com/bnyer/system/service/ISysDeptService.java rename to bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/ISysDeptService.java diff --git a/bnyer-modules/bnyer-system/src/main/java/com/bnyer/system/service/ISysDictDataService.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/ISysDictDataService.java similarity index 100% rename from bnyer-modules/bnyer-system/src/main/java/com/bnyer/system/service/ISysDictDataService.java rename to bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/ISysDictDataService.java diff --git a/bnyer-modules/bnyer-system/src/main/java/com/bnyer/system/service/ISysDictTypeService.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/ISysDictTypeService.java similarity index 100% rename from bnyer-modules/bnyer-system/src/main/java/com/bnyer/system/service/ISysDictTypeService.java rename to bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/ISysDictTypeService.java diff --git a/bnyer-modules/bnyer-system/src/main/java/com/bnyer/system/service/ISysLogininforService.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/ISysLogininforService.java similarity index 100% rename from bnyer-modules/bnyer-system/src/main/java/com/bnyer/system/service/ISysLogininforService.java rename to bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/ISysLogininforService.java diff --git a/bnyer-modules/bnyer-system/src/main/java/com/bnyer/system/service/ISysMenuService.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/ISysMenuService.java similarity index 100% rename from bnyer-modules/bnyer-system/src/main/java/com/bnyer/system/service/ISysMenuService.java rename to bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/ISysMenuService.java diff --git a/bnyer-modules/bnyer-system/src/main/java/com/bnyer/system/service/ISysNoticeService.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/ISysNoticeService.java similarity index 100% rename from bnyer-modules/bnyer-system/src/main/java/com/bnyer/system/service/ISysNoticeService.java rename to bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/ISysNoticeService.java diff --git a/bnyer-modules/bnyer-system/src/main/java/com/bnyer/system/service/ISysOperLogService.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/ISysOperLogService.java similarity index 100% rename from bnyer-modules/bnyer-system/src/main/java/com/bnyer/system/service/ISysOperLogService.java rename to bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/ISysOperLogService.java diff --git a/bnyer-modules/bnyer-system/src/main/java/com/bnyer/system/service/ISysPermissionService.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/ISysPermissionService.java similarity index 100% rename from bnyer-modules/bnyer-system/src/main/java/com/bnyer/system/service/ISysPermissionService.java rename to bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/ISysPermissionService.java diff --git a/bnyer-modules/bnyer-system/src/main/java/com/bnyer/system/service/ISysPostService.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/ISysPostService.java similarity index 100% rename from bnyer-modules/bnyer-system/src/main/java/com/bnyer/system/service/ISysPostService.java rename to bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/ISysPostService.java diff --git a/bnyer-modules/bnyer-system/src/main/java/com/bnyer/system/service/ISysRoleService.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/ISysRoleService.java similarity index 100% rename from bnyer-modules/bnyer-system/src/main/java/com/bnyer/system/service/ISysRoleService.java rename to bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/ISysRoleService.java diff --git a/bnyer-modules/bnyer-system/src/main/java/com/bnyer/system/service/ISysUserOnlineService.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/ISysUserOnlineService.java similarity index 100% rename from bnyer-modules/bnyer-system/src/main/java/com/bnyer/system/service/ISysUserOnlineService.java rename to bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/ISysUserOnlineService.java diff --git a/bnyer-modules/bnyer-system/src/main/java/com/bnyer/system/service/ISysUserService.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/ISysUserService.java similarity index 100% rename from bnyer-modules/bnyer-system/src/main/java/com/bnyer/system/service/ISysUserService.java rename to bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/ISysUserService.java diff --git a/bnyer-modules/bnyer-system/src/main/java/com/bnyer/system/service/impl/SysConfigServiceImpl.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/impl/SysConfigServiceImpl.java similarity index 100% rename from bnyer-modules/bnyer-system/src/main/java/com/bnyer/system/service/impl/SysConfigServiceImpl.java rename to bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/impl/SysConfigServiceImpl.java diff --git a/bnyer-modules/bnyer-system/src/main/java/com/bnyer/system/service/impl/SysDeptServiceImpl.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/impl/SysDeptServiceImpl.java similarity index 100% rename from bnyer-modules/bnyer-system/src/main/java/com/bnyer/system/service/impl/SysDeptServiceImpl.java rename to bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/impl/SysDeptServiceImpl.java diff --git a/bnyer-modules/bnyer-system/src/main/java/com/bnyer/system/service/impl/SysDictDataServiceImpl.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/impl/SysDictDataServiceImpl.java similarity index 100% rename from bnyer-modules/bnyer-system/src/main/java/com/bnyer/system/service/impl/SysDictDataServiceImpl.java rename to bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/impl/SysDictDataServiceImpl.java diff --git a/bnyer-modules/bnyer-system/src/main/java/com/bnyer/system/service/impl/SysDictTypeServiceImpl.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/impl/SysDictTypeServiceImpl.java similarity index 100% rename from bnyer-modules/bnyer-system/src/main/java/com/bnyer/system/service/impl/SysDictTypeServiceImpl.java rename to bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/impl/SysDictTypeServiceImpl.java diff --git a/bnyer-modules/bnyer-system/src/main/java/com/bnyer/system/service/impl/SysLogininforServiceImpl.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/impl/SysLogininforServiceImpl.java similarity index 100% rename from bnyer-modules/bnyer-system/src/main/java/com/bnyer/system/service/impl/SysLogininforServiceImpl.java rename to bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/impl/SysLogininforServiceImpl.java diff --git a/bnyer-modules/bnyer-system/src/main/java/com/bnyer/system/service/impl/SysMenuServiceImpl.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/impl/SysMenuServiceImpl.java similarity index 100% rename from bnyer-modules/bnyer-system/src/main/java/com/bnyer/system/service/impl/SysMenuServiceImpl.java rename to bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/impl/SysMenuServiceImpl.java diff --git a/bnyer-modules/bnyer-system/src/main/java/com/bnyer/system/service/impl/SysNoticeServiceImpl.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/impl/SysNoticeServiceImpl.java similarity index 100% rename from bnyer-modules/bnyer-system/src/main/java/com/bnyer/system/service/impl/SysNoticeServiceImpl.java rename to bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/impl/SysNoticeServiceImpl.java diff --git a/bnyer-modules/bnyer-system/src/main/java/com/bnyer/system/service/impl/SysOperLogServiceImpl.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/impl/SysOperLogServiceImpl.java similarity index 100% rename from bnyer-modules/bnyer-system/src/main/java/com/bnyer/system/service/impl/SysOperLogServiceImpl.java rename to bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/impl/SysOperLogServiceImpl.java diff --git a/bnyer-modules/bnyer-system/src/main/java/com/bnyer/system/service/impl/SysPermissionServiceImpl.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/impl/SysPermissionServiceImpl.java similarity index 100% rename from bnyer-modules/bnyer-system/src/main/java/com/bnyer/system/service/impl/SysPermissionServiceImpl.java rename to bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/impl/SysPermissionServiceImpl.java diff --git a/bnyer-modules/bnyer-system/src/main/java/com/bnyer/system/service/impl/SysPostServiceImpl.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/impl/SysPostServiceImpl.java similarity index 100% rename from bnyer-modules/bnyer-system/src/main/java/com/bnyer/system/service/impl/SysPostServiceImpl.java rename to bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/impl/SysPostServiceImpl.java diff --git a/bnyer-modules/bnyer-system/src/main/java/com/bnyer/system/service/impl/SysRoleServiceImpl.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/impl/SysRoleServiceImpl.java similarity index 100% rename from bnyer-modules/bnyer-system/src/main/java/com/bnyer/system/service/impl/SysRoleServiceImpl.java rename to bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/impl/SysRoleServiceImpl.java diff --git a/bnyer-modules/bnyer-system/src/main/java/com/bnyer/system/service/impl/SysUserOnlineServiceImpl.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/impl/SysUserOnlineServiceImpl.java similarity index 100% rename from bnyer-modules/bnyer-system/src/main/java/com/bnyer/system/service/impl/SysUserOnlineServiceImpl.java rename to bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/impl/SysUserOnlineServiceImpl.java diff --git a/bnyer-modules/bnyer-system/src/main/java/com/bnyer/system/service/impl/SysUserServiceImpl.java b/bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/impl/SysUserServiceImpl.java similarity index 100% rename from bnyer-modules/bnyer-system/src/main/java/com/bnyer/system/service/impl/SysUserServiceImpl.java rename to bnyer-services/bnyer-system/src/main/java/com/bnyer/system/service/impl/SysUserServiceImpl.java diff --git a/bnyer-modules/bnyer-system/src/main/resources/bootstrap.yml b/bnyer-services/bnyer-system/src/main/resources/bootstrap.yml similarity index 50% rename from bnyer-modules/bnyer-system/src/main/resources/bootstrap.yml rename to bnyer-services/bnyer-system/src/main/resources/bootstrap.yml index 2925110..eeafdae 100644 --- a/bnyer-modules/bnyer-system/src/main/resources/bootstrap.yml +++ b/bnyer-services/bnyer-system/src/main/resources/bootstrap.yml @@ -1,9 +1,12 @@ # Tomcat server: - port: 9201 + port: 9101 # Spring -spring: +spring: + main: + #解决循环依赖问题 + allow-circular-references: true application: # 应用名称 name: bnyer-system @@ -14,12 +17,20 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 127.0.0.1:8848 + server-addr: 127.0.0.1:6231 + # 命名空间地址 + namespace: 52a72b07-7081-445b-b500-76976957abbc + # 命名空间 + group: dev config: # 配置中心地址 - server-addr: 127.0.0.1:8848 + server-addr: 127.0.0.1:6231 # 配置文件格式 file-extension: yml + # 命名空间地址 + namespace: 52a72b07-7081-445b-b500-76976957abbc + # 命名空间 + group: dev # 共享配置 shared-configs: - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} diff --git a/bnyer-modules/bnyer-system/src/main/resources/mapper/system/SysConfigMapper.xml b/bnyer-services/bnyer-system/src/main/resources/com/bnyer/system/mapper/SysConfigMapper.xml similarity index 90% rename from bnyer-modules/bnyer-system/src/main/resources/mapper/system/SysConfigMapper.xml rename to bnyer-services/bnyer-system/src/main/resources/com/bnyer/system/mapper/SysConfigMapper.xml index cf0b89c..27c5cdf 100644 --- a/bnyer-modules/bnyer-system/src/main/resources/mapper/system/SysConfigMapper.xml +++ b/bnyer-services/bnyer-system/src/main/resources/com/bnyer/system/mapper/SysConfigMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -33,12 +33,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - - @@ -64,7 +64,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where config_key = #{configKey} limit 1 - + insert into sys_config ( config_name, config_key, @@ -84,7 +84,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ) - + update sys_config config_name = #{configName}, diff --git a/bnyer-modules/bnyer-system/src/main/resources/mapper/system/SysDeptMapper.xml b/bnyer-services/bnyer-system/src/main/resources/com/bnyer/system/mapper/SysDeptMapper.xml similarity index 94% rename from bnyer-modules/bnyer-system/src/main/resources/mapper/system/SysDeptMapper.xml rename to bnyer-services/bnyer-system/src/main/resources/com/bnyer/system/mapper/SysDeptMapper.xml index ccc7251..4ea86ad 100644 --- a/bnyer-modules/bnyer-system/src/main/resources/mapper/system/SysDeptMapper.xml +++ b/bnyer-services/bnyer-system/src/main/resources/com/bnyer/system/mapper/SysDeptMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -27,7 +27,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" from sys_dept d - where d.del_flag = '0' @@ -85,7 +85,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where dept_name=#{deptName} and parent_id = #{parentId} limit 1 - + insert into sys_dept( dept_id, parent_id, @@ -113,7 +113,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ) - + update sys_dept parent_id = #{parentId}, diff --git a/bnyer-modules/bnyer-system/src/main/resources/mapper/system/SysDictDataMapper.xml b/bnyer-services/bnyer-system/src/main/resources/com/bnyer/system/mapper/SysDictDataMapper.xml similarity index 100% rename from bnyer-modules/bnyer-system/src/main/resources/mapper/system/SysDictDataMapper.xml rename to bnyer-services/bnyer-system/src/main/resources/com/bnyer/system/mapper/SysDictDataMapper.xml diff --git a/bnyer-modules/bnyer-system/src/main/resources/mapper/system/SysDictTypeMapper.xml b/bnyer-services/bnyer-system/src/main/resources/com/bnyer/system/mapper/SysDictTypeMapper.xml similarity index 100% rename from bnyer-modules/bnyer-system/src/main/resources/mapper/system/SysDictTypeMapper.xml rename to bnyer-services/bnyer-system/src/main/resources/com/bnyer/system/mapper/SysDictTypeMapper.xml diff --git a/bnyer-modules/bnyer-system/src/main/resources/mapper/system/SysLogininforMapper.xml b/bnyer-services/bnyer-system/src/main/resources/com/bnyer/system/mapper/SysLogininforMapper.xml similarity index 100% rename from bnyer-modules/bnyer-system/src/main/resources/mapper/system/SysLogininforMapper.xml rename to bnyer-services/bnyer-system/src/main/resources/com/bnyer/system/mapper/SysLogininforMapper.xml diff --git a/bnyer-modules/bnyer-system/src/main/resources/mapper/system/SysMenuMapper.xml b/bnyer-services/bnyer-system/src/main/resources/com/bnyer/system/mapper/SysMenuMapper.xml similarity index 95% rename from bnyer-modules/bnyer-system/src/main/resources/mapper/system/SysMenuMapper.xml rename to bnyer-services/bnyer-system/src/main/resources/com/bnyer/system/mapper/SysMenuMapper.xml index d4e3c53..8bf6eab 100644 --- a/bnyer-modules/bnyer-system/src/main/resources/mapper/system/SysMenuMapper.xml +++ b/bnyer-services/bnyer-system/src/main/resources/com/bnyer/system/mapper/SysMenuMapper.xml @@ -4,7 +4,7 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -32,7 +32,7 @@ from sys_menu - @@ -54,7 +54,7 @@ order by m.parent_id, m.order_num - select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.`query`, m.visible, m.status, ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time from sys_menu m left join sys_role_menu rm on m.menu_id = rm.menu_id @@ -125,7 +125,7 @@ where menu_name=#{menuName} and parent_id = #{parentId} limit 1 - + update sys_menu menu_name = #{menuName}, @@ -148,7 +148,7 @@ where menu_id = #{menuId} - + insert into sys_menu( menu_id, parent_id, diff --git a/bnyer-modules/bnyer-system/src/main/resources/mapper/system/SysNoticeMapper.xml b/bnyer-services/bnyer-system/src/main/resources/com/bnyer/system/mapper/SysNoticeMapper.xml similarity index 91% rename from bnyer-modules/bnyer-system/src/main/resources/mapper/system/SysNoticeMapper.xml rename to bnyer-services/bnyer-system/src/main/resources/com/bnyer/system/mapper/SysNoticeMapper.xml index 0cfbaa5..ab755cb 100644 --- a/bnyer-modules/bnyer-system/src/main/resources/mapper/system/SysNoticeMapper.xml +++ b/bnyer-services/bnyer-system/src/main/resources/com/bnyer/system/mapper/SysNoticeMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -27,7 +27,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where notice_id = #{noticeId} - @@ -42,7 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + insert into sys_notice ( notice_title, notice_type, @@ -62,7 +62,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ) - + update sys_notice notice_title = #{noticeTitle}, diff --git a/bnyer-modules/bnyer-system/src/main/resources/mapper/system/SysOperLogMapper.xml b/bnyer-services/bnyer-system/src/main/resources/com/bnyer/system/mapper/SysOperLogMapper.xml similarity index 100% rename from bnyer-modules/bnyer-system/src/main/resources/mapper/system/SysOperLogMapper.xml rename to bnyer-services/bnyer-system/src/main/resources/com/bnyer/system/mapper/SysOperLogMapper.xml diff --git a/bnyer-modules/bnyer-system/src/main/resources/mapper/system/SysPostMapper.xml b/bnyer-services/bnyer-system/src/main/resources/com/bnyer/system/mapper/SysPostMapper.xml similarity index 92% rename from bnyer-modules/bnyer-system/src/main/resources/mapper/system/SysPostMapper.xml rename to bnyer-services/bnyer-system/src/main/resources/com/bnyer/system/mapper/SysPostMapper.xml index b8a79df..93374cc 100644 --- a/bnyer-modules/bnyer-system/src/main/resources/mapper/system/SysPostMapper.xml +++ b/bnyer-services/bnyer-system/src/main/resources/com/bnyer/system/mapper/SysPostMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -22,7 +22,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" from sys_post - @@ -72,7 +72,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where post_code=#{postCode} limit 1 - + update sys_post post_code = #{postCode}, @@ -86,7 +86,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where post_id = #{postId} - + insert into sys_post( post_id, post_code, diff --git a/bnyer-modules/bnyer-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml b/bnyer-services/bnyer-system/src/main/resources/com/bnyer/system/mapper/SysRoleDeptMapper.xml similarity index 92% rename from bnyer-modules/bnyer-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml rename to bnyer-services/bnyer-system/src/main/resources/com/bnyer/system/mapper/SysRoleDeptMapper.xml index 6da2ec6..67e2d51 100644 --- a/bnyer-modules/bnyer-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml +++ b/bnyer-services/bnyer-system/src/main/resources/com/bnyer/system/mapper/SysRoleDeptMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + diff --git a/bnyer-modules/bnyer-system/src/main/resources/mapper/system/SysRoleMapper.xml b/bnyer-services/bnyer-system/src/main/resources/com/bnyer/system/mapper/SysRoleMapper.xml similarity index 100% rename from bnyer-modules/bnyer-system/src/main/resources/mapper/system/SysRoleMapper.xml rename to bnyer-services/bnyer-system/src/main/resources/com/bnyer/system/mapper/SysRoleMapper.xml diff --git a/bnyer-modules/bnyer-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml b/bnyer-services/bnyer-system/src/main/resources/com/bnyer/system/mapper/SysRoleMenuMapper.xml similarity index 92% rename from bnyer-modules/bnyer-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml rename to bnyer-services/bnyer-system/src/main/resources/com/bnyer/system/mapper/SysRoleMenuMapper.xml index 9688466..e9e9007 100644 --- a/bnyer-modules/bnyer-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml +++ b/bnyer-services/bnyer-system/src/main/resources/com/bnyer/system/mapper/SysRoleMenuMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + diff --git a/bnyer-modules/bnyer-system/src/main/resources/mapper/system/SysUserMapper.xml b/bnyer-services/bnyer-system/src/main/resources/com/bnyer/system/mapper/SysUserMapper.xml similarity index 100% rename from bnyer-modules/bnyer-system/src/main/resources/mapper/system/SysUserMapper.xml rename to bnyer-services/bnyer-system/src/main/resources/com/bnyer/system/mapper/SysUserMapper.xml diff --git a/bnyer-modules/bnyer-system/src/main/resources/mapper/system/SysUserPostMapper.xml b/bnyer-services/bnyer-system/src/main/resources/com/bnyer/system/mapper/SysUserPostMapper.xml similarity index 92% rename from bnyer-modules/bnyer-system/src/main/resources/mapper/system/SysUserPostMapper.xml rename to bnyer-services/bnyer-system/src/main/resources/com/bnyer/system/mapper/SysUserPostMapper.xml index 8068974..2ca540b 100644 --- a/bnyer-modules/bnyer-system/src/main/resources/mapper/system/SysUserPostMapper.xml +++ b/bnyer-services/bnyer-system/src/main/resources/com/bnyer/system/mapper/SysUserPostMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + diff --git a/bnyer-modules/bnyer-system/src/main/resources/mapper/system/SysUserRoleMapper.xml b/bnyer-services/bnyer-system/src/main/resources/com/bnyer/system/mapper/SysUserRoleMapper.xml similarity index 88% rename from bnyer-modules/bnyer-system/src/main/resources/mapper/system/SysUserRoleMapper.xml rename to bnyer-services/bnyer-system/src/main/resources/com/bnyer/system/mapper/SysUserRoleMapper.xml index 573cf4e..699a930 100644 --- a/bnyer-modules/bnyer-system/src/main/resources/mapper/system/SysUserRoleMapper.xml +++ b/bnyer-services/bnyer-system/src/main/resources/com/bnyer/system/mapper/SysUserRoleMapper.xml @@ -4,7 +4,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -31,7 +31,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + delete from sys_user_role where user_id=#{userId} and role_id=#{roleId} diff --git a/bnyer-modules/bnyer-system/src/main/resources/logback.xml b/bnyer-services/bnyer-system/src/main/resources/logback.xml similarity index 97% rename from bnyer-modules/bnyer-system/src/main/resources/logback.xml rename to bnyer-services/bnyer-system/src/main/resources/logback.xml index 1f39404..0d22b7c 100644 --- a/bnyer-modules/bnyer-system/src/main/resources/logback.xml +++ b/bnyer-services/bnyer-system/src/main/resources/logback.xml @@ -20,7 +20,7 @@ ${log.path}/info.%d{yyyy-MM-dd}.log - 60 + 20 ${log.pattern} @@ -42,7 +42,7 @@ ${log.path}/error.%d{yyyy-MM-dd}.log - 60 + 20 ${log.pattern} diff --git a/bnyer-modules/pom.xml b/bnyer-services/pom.xml similarity index 85% rename from bnyer-modules/pom.xml rename to bnyer-services/pom.xml index adcd933..0c4673f 100644 --- a/bnyer-modules/pom.xml +++ b/bnyer-services/pom.xml @@ -10,16 +10,16 @@ bnyer-system - bnyer-gen bnyer-job bnyer-file + bnyer-img - bnyer-modules + bnyer-services pom - bnyer-modules业务模块 + bnyer-services业务模块 diff --git a/bnyer-visual/bnyer-monitor/src/main/java/com/bnyer/modules/monitor/BnyerMonitorApplication.java b/bnyer-visual/bnyer-monitor/src/main/java/com/bnyer/modules/monitor/BnyerMonitorApplication.java index 1ce2cc3..01582ad 100644 --- a/bnyer-visual/bnyer-monitor/src/main/java/com/bnyer/modules/monitor/BnyerMonitorApplication.java +++ b/bnyer-visual/bnyer-monitor/src/main/java/com/bnyer/modules/monitor/BnyerMonitorApplication.java @@ -16,15 +16,12 @@ public class BnyerMonitorApplication public static void main(String[] args) { SpringApplication.run(BnyerMonitorApplication.class, args); - System.out.println("(♥◠‿◠)ﾉﾞ bnyer监控中心启动成功 ლ(´ڡ`ლ)ﾞ \n" + - " .-------. ____ __ \n" + - " | _ _ \\ \\ \\ / / \n" + - " | ( ' ) | \\ _. / ' \n" + - " |(_ o _) / _( )_ .' \n" + - " | (_,_).' __ ___(_ o _)' \n" + - " | |\\ \\ | || |(_,_)' \n" + - " | | \\ `' /| `-' / \n" + - " | | \\ / \\ / \n" + - " ''-' `'-' `-..-' "); + System.out.println("(♥◠‿◠)ﾉﾞ bnyer监控服务启动成功 ლ(´ڡ`ლ)ﾞ \n" + + "__________ \n" + + "\\______ \\ ____ ___.__. ___________ \n" + + " | | _// < | |/ __ \\_ __ \\\n" + + " | | \\ | \\___ \\ ___/| | \\/\n" + + " |______ /___| / ____|\\___ >__| \n" + + " \\/ \\/\\/ \\/ \n"); } } diff --git a/bnyer-visual/bnyer-monitor/src/main/resources/banner.txt b/bnyer-visual/bnyer-monitor/src/main/resources/banner.txt deleted file mode 100644 index e93c82b..0000000 --- a/bnyer-visual/bnyer-monitor/src/main/resources/banner.txt +++ /dev/null @@ -1,14 +0,0 @@ -Spring Boot Version: ${spring-boot.version} -Spring Application Name: ${spring.application.name} - - .----------------. .-----------------. .----------------. .----------------. .----------------. .----------------. .----------------. .----------------. .-----------------. .----------------. .----------------. .----------------. .----------------. -| .--------------. || .--------------. || .--------------. || .--------------. || .--------------. || .--------------. || .--------------. || .--------------. || .--------------. || .--------------. || .--------------. || .--------------. || .--------------. | -| | ______ | || | ____ _____ | || | ____ ____ | || | _________ | || | _______ | || | | || | ____ ____ | || | ____ | || | ____ _____ | || | _____ | || | _________ | || | ____ | || | _______ | | -| | |_ _ \ | || ||_ \|_ _| | || | |_ _||_ _| | || | |_ ___ | | || | |_ __ \ | || | | || ||_ \ / _|| || | .' `. | || ||_ \|_ _| | || | |_ _| | || | | _ _ | | || | .' `. | || | |_ __ \ | | -| | | |_) | | || | | \ | | | || | \ \ / / | || | | |_ \_| | || | | |__) | | || | ______ | || | | \/ | | || | / .--. \ | || | | \ | | | || | | | | || | |_/ | | \_| | || | / .--. \ | || | | |__) | | | -| | | __'. | || | | |\ \| | | || | \ \/ / | || | | _| _ | || | | __ / | || | |______| | || | | |\ /| | | || | | | | | | || | | |\ \| | | || | | | | || | | | | || | | | | | | || | | __ / | | -| | _| |__) | | || | _| |_\ |_ | || | _| |_ | || | _| |___/ | | || | _| | \ \_ | || | | || | _| |_\/_| |_ | || | \ `--' / | || | _| |_\ |_ | || | _| |_ | || | _| |_ | || | \ `--' / | || | _| | \ \_ | | -| | |_______/ | || ||_____|\____| | || | |______| | || | |_________| | || | |____| |___| | || | | || ||_____||_____|| || | `.____.' | || ||_____|\____| | || | |_____| | || | |_____| | || | `.____.' | || | |____| |___| | | -| | | || | | || | | || | | || | | || | | || | | || | | || | | || | | || | | || | | || | | | -| '--------------' || '--------------' || '--------------' || '--------------' || '--------------' || '--------------' || '--------------' || '--------------' || '--------------' || '--------------' || '--------------' || '--------------' || '--------------' | - '----------------' '----------------' '----------------' '----------------' '----------------' '----------------' '----------------' '----------------' '----------------' '----------------' '----------------' '----------------' '----------------' diff --git a/bnyer-visual/bnyer-monitor/src/main/resources/bootstrap.yml b/bnyer-visual/bnyer-monitor/src/main/resources/bootstrap.yml index 5be8b2d..3dd0726 100644 --- a/bnyer-visual/bnyer-monitor/src/main/resources/bootstrap.yml +++ b/bnyer-visual/bnyer-monitor/src/main/resources/bootstrap.yml @@ -1,9 +1,12 @@ # Tomcat server: - port: 9100 + port: 7012 # Spring -spring: +spring: + main: + #解决循环依赖问题 + allow-circular-references: true application: # 应用名称 name: bnyer-monitor @@ -14,12 +17,20 @@ spring: nacos: discovery: # 服务注册地址 - server-addr: 127.0.0.1:8848 + server-addr: 127.0.0.1:6231 + # 命名空间地址 + namespace: 52a72b07-7081-445b-b500-76976957abbc + # 命名空间 + group: dev config: # 配置中心地址 - server-addr: 127.0.0.1:8848 + server-addr: 127.0.0.1:6231 # 配置文件格式 file-extension: yml + # 命名空间地址 + namespace: 52a72b07-7081-445b-b500-76976957abbc + # 命名空间 + group: dev # 共享配置 shared-configs: - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} diff --git a/bnyer-visual/bnyer-monitor/src/main/resources/logback.xml b/bnyer-visual/bnyer-monitor/src/main/resources/logback.xml index 848be70..455be94 100644 --- a/bnyer-visual/bnyer-monitor/src/main/resources/logback.xml +++ b/bnyer-visual/bnyer-monitor/src/main/resources/logback.xml @@ -20,7 +20,7 @@ ${log.path}/info.%d{yyyy-MM-dd}.log - 60 + 20 ${log.pattern} @@ -42,7 +42,7 @@ ${log.path}/error.%d{yyyy-MM-dd}.log - 60 + 20 ${log.pattern} diff --git a/pom.xml b/pom.xml index 1b3d98e..e9e8328 100644 --- a/pom.xml +++ b/pom.xml @@ -245,7 +245,7 @@ bnyer-auth bnyer-gateway bnyer-visual - bnyer-modules + bnyer-services bnyer-api bnyer-common