From a0a249239e8e7495a0f97ffeae28a1566ccbdc1f Mon Sep 17 00:00:00 2001 From: b2baccline <23131013+b2baccline@users.noreply.github.com> Date: Mon, 2 Mar 2020 20:15:30 +0800 Subject: [PATCH] =?UTF-8?q?:hammer:=20=E8=B0=83=E6=95=B4=E5=90=8E=E5=8F=B0?= =?UTF-8?q?=E7=9A=84=E4=BB=A3=E7=A0=81=E7=BB=93=E6=9E=84=EF=BC=8C=E6=8A=BD?= =?UTF-8?q?=E5=8F=96=E8=84=9A=E6=89=8B=E6=9E=B6=E8=87=AA=E5=B8=A6=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E8=87=B3core=E6=A8=A1=E5=9D=97=EF=BC=8C=E5=BD=93?= =?UTF-8?q?=E4=BA=8C=E6=AC=A1=E5=BC=80=E5=8F=91=E6=97=B6=EF=BC=8C=E5=9C=A8?= =?UTF-8?q?boot=E6=A8=A1=E5=9D=97=E4=B8=AD=E7=9B=B4=E6=8E=A5=E5=BC=80?= =?UTF-8?q?=E5=8F=91=E3=80=82=E4=B9=9F=E5=8F=AF=E7=9B=B4=E6=8E=A5=E5=88=9B?= =?UTF-8?q?=E5=BB=BA=E6=96=B0=E7=9A=84=E9=A1=B9=E7=9B=AE=EF=BC=8C=E5=BC=95?= =?UTF-8?q?=E5=85=A5admin-corejar=E5=8C=85=E8=BF=9B=E8=A1=8C=E5=BC=80?= =?UTF-8?q?=E5=8F=91=EF=BC=8C=E6=96=B9=E4=BE=BF=E5=90=8E=E7=BB=AD=E8=B7=9F?= =?UTF-8?q?=E9=9A=8F=E8=84=9A=E6=89=8B=E6=9E=B6=E4=BB=A3=E7=A0=81=E5=8D=87?= =?UTF-8?q?=E7=BA=A7=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ballcat-admin/ballcat-admin-boot/pom.xml | 70 ++++++++++++++ .../packages}/admin/AdminApplication.java | 4 +- .../cdao/swaggerbootstrapui.js | 0 .../src/main/resources/application-dev.yml | 0 .../src/main/resources/application-prod.yml | 0 .../src/main/resources/application-test.yml | 0 .../src/main/resources/application.yml | 2 +- .../src/main/resources/logback-spring.xml | 0 ballcat-admin/ballcat-admin-core/pom.xml | 73 +++++++++++++++ .../admin/constants/SecurityConst.java | 0 .../admin/constants/SysPermissionConst.java | 0 .../ballcat/admin/constants/SysUserConst.java | 0 .../admin/constants/UrlMappingConst.java | 0 .../conf/controller/BaseConfigController.java | 0 .../modules/job/AdminDemoJobHandler.java | 0 .../controller/AdminAccessLogController.java | 0 .../AdminOperationLogController.java | 0 .../controller/ApiAccessLogController.java | 0 .../log/mapper/AdminAccessLogMapper.java | 0 .../log/mapper/AdminOperationLogMapper.java | 0 .../log/model/entity/AdminAccessLog.java | 0 .../log/model/entity/AdminOperationLog.java | 0 .../log/service/AdminAccessLogService.java | 0 .../log/service/OperationLogAdminService.java | 0 .../AdminAccessLogHandlerServiceImpl.java | 0 .../impl/AdminAccessLogServiceImpl.java | 0 .../impl/AdminErrorLogHandlerServiceImpl.java | 0 .../impl/OperationLogAdminServiceImpl.java | 0 .../log/thread/AccessLogAdminSaveThread.java | 0 .../sys/controller/AuthController.java | 0 .../sys/controller/AuthTestController.java | 0 .../controller/SysPermissionController.java | 0 .../sys/controller/SysRoleController.java | 0 .../sys/controller/SysUserController.java | 0 .../sys/mapper/SysPermissionMapper.java | 0 .../modules/sys/mapper/SysRoleMapper.java | 0 .../sys/mapper/SysRolePermissionMapper.java | 0 .../modules/sys/mapper/SysUserMapper.java | 0 .../modules/sys/mapper/SysUserRoleMapper.java | 0 .../converter/OperationLogConverter.java | 0 .../converter/SysPermissionConverter.java | 0 .../sys/model/converter/SysUserConverter.java | 0 .../modules/sys/model/dto/SysUserDTO.java | 0 .../modules/sys/model/dto/SysUserScope.java | 0 .../sys/model/entity/SysPermission.java | 0 .../modules/sys/model/entity/SysRole.java | 0 .../sys/model/entity/SysRolePermission.java | 0 .../modules/sys/model/entity/SysUser.java | 1 + .../modules/sys/model/entity/SysUserRole.java | 0 .../admin/modules/sys/model/qo/SysUserQO.java | 0 .../modules/sys/model/vo/PermissionVO.java | 0 .../admin/modules/sys/model/vo/Router.java | 0 .../admin/modules/sys/model/vo/UserInfo.java | 0 .../modules/sys/service/FileService.java | 0 .../sys/service/SysPermissionService.java | 0 .../sys/service/SysRolePermissionService.java | 0 .../modules/sys/service/SysRoleService.java | 0 .../sys/service/SysUserRoleService.java | 0 .../modules/sys/service/SysUserService.java | 0 .../sys/service/impl/FileServiceImpl.java | 0 .../impl/SysPermissionServiceImpl.java | 0 .../impl/SysRolePermissionServiceImpl.java | 0 .../sys/service/impl/SysRoleServiceImpl.java | 0 .../service/impl/SysUserRoleServiceImpl.java | 0 .../sys/service/impl/SysUserServiceImpl.java | 0 .../oauth/CustomAuthenticationEntryPoint.java | 0 .../oauth/CustomPermissionEvaluator.java | 0 .../admin/oauth/CustomTokenEnhancer.java | 0 .../ballcat/admin/oauth/SysUserDetails.java | 0 .../oauth/SysUserDetailsServiceImpl.java | 0 .../CustomAuthorizationServerConfigurer.java | 0 .../CustomResourceServerConfigurer.java | 0 .../oauth/config/PermitAllUrlProperties.java | 0 .../oauth/config/SpringSecurityConfig.java | 0 .../exception/CustomOAuth2Exception.java | 0 .../CustomOAuth2ExceptionSerializer.java | 0 .../CustomWebResponseExceptionTranslator.java | 0 .../filter/LoginPasswordDecoderFilter.java | 0 .../mobile/MobileAuthenticationProvider.java | 2 +- .../mobile/MobileAuthenticationToken.java | 0 .../oauth/mobile/MobileTokenGranter.java | 0 .../admin/oauth/util/SecurityUtils.java | 0 .../mapper/log/AdminOperationLogMapper.xml | 0 .../resources/mapper/sys/PermissionMapper.xml | 0 .../main/resources/mapper/sys/RoleMapper.xml | 0 .../mapper/sys/RolePermissionMapper.xml | 0 .../resources/mapper/sys/SysUserMapper.xml | 0 .../mapper/sys/SysUserRoleMapper.xml | 0 ballcat-admin/pom.xml | 91 +------------------ .../ballcat/admin/test/ConvertTest.java | 27 ------ .../hccake/ballcat/admin/test/TestUpdate.java | 29 ------ .../conf/mybatis/MybatisPlusConfig.java | 2 +- 92 files changed, 154 insertions(+), 147 deletions(-) create mode 100644 ballcat-admin/ballcat-admin-boot/pom.xml rename ballcat-admin/{src/main/java/com/hccake/ballcat => ballcat-admin-boot/src/main/java/com/your/packages}/admin/AdminApplication.java (84%) rename ballcat-admin/{src/main/resources/META-INF/resources/webjars/bycdao-ui => ballcat-admin-boot/src/main/resources/META-INF.resources.webjars.bycdao-ui}/cdao/swaggerbootstrapui.js (100%) rename ballcat-admin/{ => ballcat-admin-boot}/src/main/resources/application-dev.yml (100%) rename ballcat-admin/{ => ballcat-admin-boot}/src/main/resources/application-prod.yml (100%) rename ballcat-admin/{ => ballcat-admin-boot}/src/main/resources/application-test.yml (100%) rename ballcat-admin/{ => ballcat-admin-boot}/src/main/resources/application.yml (97%) rename ballcat-admin/{ => ballcat-admin-boot}/src/main/resources/logback-spring.xml (100%) create mode 100644 ballcat-admin/ballcat-admin-core/pom.xml rename ballcat-admin/{ => ballcat-admin-core}/src/main/java/com/hccake/ballcat/admin/constants/SecurityConst.java (100%) rename ballcat-admin/{ => ballcat-admin-core}/src/main/java/com/hccake/ballcat/admin/constants/SysPermissionConst.java (100%) rename ballcat-admin/{ => ballcat-admin-core}/src/main/java/com/hccake/ballcat/admin/constants/SysUserConst.java (100%) rename ballcat-admin/{ => ballcat-admin-core}/src/main/java/com/hccake/ballcat/admin/constants/UrlMappingConst.java (100%) rename ballcat-admin/{ => ballcat-admin-core}/src/main/java/com/hccake/ballcat/admin/modules/conf/controller/BaseConfigController.java (100%) rename ballcat-admin/{ => ballcat-admin-core}/src/main/java/com/hccake/ballcat/admin/modules/job/AdminDemoJobHandler.java (100%) rename ballcat-admin/{ => ballcat-admin-core}/src/main/java/com/hccake/ballcat/admin/modules/log/controller/AdminAccessLogController.java (100%) rename ballcat-admin/{ => ballcat-admin-core}/src/main/java/com/hccake/ballcat/admin/modules/log/controller/AdminOperationLogController.java (100%) rename ballcat-admin/{ => ballcat-admin-core}/src/main/java/com/hccake/ballcat/admin/modules/log/controller/ApiAccessLogController.java (100%) rename ballcat-admin/{ => ballcat-admin-core}/src/main/java/com/hccake/ballcat/admin/modules/log/mapper/AdminAccessLogMapper.java (100%) rename ballcat-admin/{ => ballcat-admin-core}/src/main/java/com/hccake/ballcat/admin/modules/log/mapper/AdminOperationLogMapper.java (100%) rename ballcat-admin/{ => ballcat-admin-core}/src/main/java/com/hccake/ballcat/admin/modules/log/model/entity/AdminAccessLog.java (100%) rename ballcat-admin/{ => ballcat-admin-core}/src/main/java/com/hccake/ballcat/admin/modules/log/model/entity/AdminOperationLog.java (100%) rename ballcat-admin/{ => ballcat-admin-core}/src/main/java/com/hccake/ballcat/admin/modules/log/service/AdminAccessLogService.java (100%) rename ballcat-admin/{ => ballcat-admin-core}/src/main/java/com/hccake/ballcat/admin/modules/log/service/OperationLogAdminService.java (100%) rename ballcat-admin/{ => ballcat-admin-core}/src/main/java/com/hccake/ballcat/admin/modules/log/service/impl/AdminAccessLogHandlerServiceImpl.java (100%) rename ballcat-admin/{ => ballcat-admin-core}/src/main/java/com/hccake/ballcat/admin/modules/log/service/impl/AdminAccessLogServiceImpl.java (100%) rename ballcat-admin/{ => ballcat-admin-core}/src/main/java/com/hccake/ballcat/admin/modules/log/service/impl/AdminErrorLogHandlerServiceImpl.java (100%) rename ballcat-admin/{ => ballcat-admin-core}/src/main/java/com/hccake/ballcat/admin/modules/log/service/impl/OperationLogAdminServiceImpl.java (100%) rename ballcat-admin/{ => ballcat-admin-core}/src/main/java/com/hccake/ballcat/admin/modules/log/thread/AccessLogAdminSaveThread.java (100%) rename ballcat-admin/{ => ballcat-admin-core}/src/main/java/com/hccake/ballcat/admin/modules/sys/controller/AuthController.java (100%) rename ballcat-admin/{ => ballcat-admin-core}/src/main/java/com/hccake/ballcat/admin/modules/sys/controller/AuthTestController.java (100%) rename ballcat-admin/{ => ballcat-admin-core}/src/main/java/com/hccake/ballcat/admin/modules/sys/controller/SysPermissionController.java (100%) rename ballcat-admin/{ => ballcat-admin-core}/src/main/java/com/hccake/ballcat/admin/modules/sys/controller/SysRoleController.java (100%) rename ballcat-admin/{ => ballcat-admin-core}/src/main/java/com/hccake/ballcat/admin/modules/sys/controller/SysUserController.java (100%) rename ballcat-admin/{ => ballcat-admin-core}/src/main/java/com/hccake/ballcat/admin/modules/sys/mapper/SysPermissionMapper.java (100%) rename ballcat-admin/{ => ballcat-admin-core}/src/main/java/com/hccake/ballcat/admin/modules/sys/mapper/SysRoleMapper.java (100%) rename ballcat-admin/{ => ballcat-admin-core}/src/main/java/com/hccake/ballcat/admin/modules/sys/mapper/SysRolePermissionMapper.java (100%) rename ballcat-admin/{ => ballcat-admin-core}/src/main/java/com/hccake/ballcat/admin/modules/sys/mapper/SysUserMapper.java (100%) rename ballcat-admin/{ => ballcat-admin-core}/src/main/java/com/hccake/ballcat/admin/modules/sys/mapper/SysUserRoleMapper.java (100%) rename ballcat-admin/{ => ballcat-admin-core}/src/main/java/com/hccake/ballcat/admin/modules/sys/model/converter/OperationLogConverter.java (100%) rename ballcat-admin/{ => ballcat-admin-core}/src/main/java/com/hccake/ballcat/admin/modules/sys/model/converter/SysPermissionConverter.java (100%) rename ballcat-admin/{ => ballcat-admin-core}/src/main/java/com/hccake/ballcat/admin/modules/sys/model/converter/SysUserConverter.java (100%) rename ballcat-admin/{ => ballcat-admin-core}/src/main/java/com/hccake/ballcat/admin/modules/sys/model/dto/SysUserDTO.java (100%) rename ballcat-admin/{ => ballcat-admin-core}/src/main/java/com/hccake/ballcat/admin/modules/sys/model/dto/SysUserScope.java (100%) rename ballcat-admin/{ => ballcat-admin-core}/src/main/java/com/hccake/ballcat/admin/modules/sys/model/entity/SysPermission.java (100%) rename ballcat-admin/{ => ballcat-admin-core}/src/main/java/com/hccake/ballcat/admin/modules/sys/model/entity/SysRole.java (100%) rename ballcat-admin/{ => ballcat-admin-core}/src/main/java/com/hccake/ballcat/admin/modules/sys/model/entity/SysRolePermission.java (100%) rename ballcat-admin/{ => ballcat-admin-core}/src/main/java/com/hccake/ballcat/admin/modules/sys/model/entity/SysUser.java (98%) rename ballcat-admin/{ => ballcat-admin-core}/src/main/java/com/hccake/ballcat/admin/modules/sys/model/entity/SysUserRole.java (100%) rename ballcat-admin/{ => ballcat-admin-core}/src/main/java/com/hccake/ballcat/admin/modules/sys/model/qo/SysUserQO.java (100%) rename ballcat-admin/{ => ballcat-admin-core}/src/main/java/com/hccake/ballcat/admin/modules/sys/model/vo/PermissionVO.java (100%) rename ballcat-admin/{ => ballcat-admin-core}/src/main/java/com/hccake/ballcat/admin/modules/sys/model/vo/Router.java (100%) rename ballcat-admin/{ => ballcat-admin-core}/src/main/java/com/hccake/ballcat/admin/modules/sys/model/vo/UserInfo.java (100%) rename ballcat-admin/{ => ballcat-admin-core}/src/main/java/com/hccake/ballcat/admin/modules/sys/service/FileService.java (100%) rename ballcat-admin/{ => ballcat-admin-core}/src/main/java/com/hccake/ballcat/admin/modules/sys/service/SysPermissionService.java (100%) rename ballcat-admin/{ => ballcat-admin-core}/src/main/java/com/hccake/ballcat/admin/modules/sys/service/SysRolePermissionService.java (100%) rename ballcat-admin/{ => ballcat-admin-core}/src/main/java/com/hccake/ballcat/admin/modules/sys/service/SysRoleService.java (100%) rename ballcat-admin/{ => ballcat-admin-core}/src/main/java/com/hccake/ballcat/admin/modules/sys/service/SysUserRoleService.java (100%) rename ballcat-admin/{ => ballcat-admin-core}/src/main/java/com/hccake/ballcat/admin/modules/sys/service/SysUserService.java (100%) rename ballcat-admin/{ => ballcat-admin-core}/src/main/java/com/hccake/ballcat/admin/modules/sys/service/impl/FileServiceImpl.java (100%) rename ballcat-admin/{ => ballcat-admin-core}/src/main/java/com/hccake/ballcat/admin/modules/sys/service/impl/SysPermissionServiceImpl.java (100%) rename ballcat-admin/{ => ballcat-admin-core}/src/main/java/com/hccake/ballcat/admin/modules/sys/service/impl/SysRolePermissionServiceImpl.java (100%) rename ballcat-admin/{ => ballcat-admin-core}/src/main/java/com/hccake/ballcat/admin/modules/sys/service/impl/SysRoleServiceImpl.java (100%) rename ballcat-admin/{ => ballcat-admin-core}/src/main/java/com/hccake/ballcat/admin/modules/sys/service/impl/SysUserRoleServiceImpl.java (100%) rename ballcat-admin/{ => ballcat-admin-core}/src/main/java/com/hccake/ballcat/admin/modules/sys/service/impl/SysUserServiceImpl.java (100%) rename ballcat-admin/{ => ballcat-admin-core}/src/main/java/com/hccake/ballcat/admin/oauth/CustomAuthenticationEntryPoint.java (100%) rename ballcat-admin/{ => ballcat-admin-core}/src/main/java/com/hccake/ballcat/admin/oauth/CustomPermissionEvaluator.java (100%) rename ballcat-admin/{ => ballcat-admin-core}/src/main/java/com/hccake/ballcat/admin/oauth/CustomTokenEnhancer.java (100%) rename ballcat-admin/{ => ballcat-admin-core}/src/main/java/com/hccake/ballcat/admin/oauth/SysUserDetails.java (100%) rename ballcat-admin/{ => ballcat-admin-core}/src/main/java/com/hccake/ballcat/admin/oauth/SysUserDetailsServiceImpl.java (100%) rename ballcat-admin/{ => ballcat-admin-core}/src/main/java/com/hccake/ballcat/admin/oauth/config/CustomAuthorizationServerConfigurer.java (100%) rename ballcat-admin/{ => ballcat-admin-core}/src/main/java/com/hccake/ballcat/admin/oauth/config/CustomResourceServerConfigurer.java (100%) rename ballcat-admin/{ => ballcat-admin-core}/src/main/java/com/hccake/ballcat/admin/oauth/config/PermitAllUrlProperties.java (100%) rename ballcat-admin/{ => ballcat-admin-core}/src/main/java/com/hccake/ballcat/admin/oauth/config/SpringSecurityConfig.java (100%) rename ballcat-admin/{ => ballcat-admin-core}/src/main/java/com/hccake/ballcat/admin/oauth/exception/CustomOAuth2Exception.java (100%) rename ballcat-admin/{ => ballcat-admin-core}/src/main/java/com/hccake/ballcat/admin/oauth/exception/CustomOAuth2ExceptionSerializer.java (100%) rename ballcat-admin/{ => ballcat-admin-core}/src/main/java/com/hccake/ballcat/admin/oauth/exception/CustomWebResponseExceptionTranslator.java (100%) rename ballcat-admin/{ => ballcat-admin-core}/src/main/java/com/hccake/ballcat/admin/oauth/filter/LoginPasswordDecoderFilter.java (100%) rename ballcat-admin/{ => ballcat-admin-core}/src/main/java/com/hccake/ballcat/admin/oauth/mobile/MobileAuthenticationProvider.java (98%) rename ballcat-admin/{ => ballcat-admin-core}/src/main/java/com/hccake/ballcat/admin/oauth/mobile/MobileAuthenticationToken.java (100%) rename ballcat-admin/{ => ballcat-admin-core}/src/main/java/com/hccake/ballcat/admin/oauth/mobile/MobileTokenGranter.java (100%) rename ballcat-admin/{ => ballcat-admin-core}/src/main/java/com/hccake/ballcat/admin/oauth/util/SecurityUtils.java (100%) rename ballcat-admin/{ => ballcat-admin-core}/src/main/resources/mapper/log/AdminOperationLogMapper.xml (100%) rename ballcat-admin/{ => ballcat-admin-core}/src/main/resources/mapper/sys/PermissionMapper.xml (100%) rename ballcat-admin/{ => ballcat-admin-core}/src/main/resources/mapper/sys/RoleMapper.xml (100%) rename ballcat-admin/{ => ballcat-admin-core}/src/main/resources/mapper/sys/RolePermissionMapper.xml (100%) rename ballcat-admin/{ => ballcat-admin-core}/src/main/resources/mapper/sys/SysUserMapper.xml (100%) rename ballcat-admin/{ => ballcat-admin-core}/src/main/resources/mapper/sys/SysUserRoleMapper.xml (100%) delete mode 100644 ballcat-admin/src/test/java/com/hccake/ballcat/admin/test/ConvertTest.java delete mode 100644 ballcat-admin/src/test/java/com/hccake/ballcat/admin/test/TestUpdate.java diff --git a/ballcat-admin/ballcat-admin-boot/pom.xml b/ballcat-admin/ballcat-admin-boot/pom.xml new file mode 100644 index 00000000..9483d066 --- /dev/null +++ b/ballcat-admin/ballcat-admin-boot/pom.xml @@ -0,0 +1,70 @@ + + + + ballcat-admin + com.hccake + 0.0.1 + + 4.0.0 + + ballcat-admin-boot + jar + + + + + com.hccake + ballcat-admin-core + 0.0.1 + + + com.hccake + ballcat-common-log + + + com.hccake + ballcat-common-swagger + + + com.hccake + ballcat-common-job + + + + org.springframework.boot + spring-boot-starter-web + + + + org.springframework.boot + spring-boot-starter-undertow + + + + mysql + mysql-connector-java + + + + de.codecentric + spring-boot-admin-starter-client + + + org.springframework.boot + spring-boot-starter-actuator + + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + \ No newline at end of file diff --git a/ballcat-admin/src/main/java/com/hccake/ballcat/admin/AdminApplication.java b/ballcat-admin/ballcat-admin-boot/src/main/java/com/your/packages/admin/AdminApplication.java similarity index 84% rename from ballcat-admin/src/main/java/com/hccake/ballcat/admin/AdminApplication.java rename to ballcat-admin/ballcat-admin-boot/src/main/java/com/your/packages/admin/AdminApplication.java index 29c19419..d5ebc4a1 100644 --- a/ballcat-admin/src/main/java/com/hccake/ballcat/admin/AdminApplication.java +++ b/ballcat-admin/ballcat-admin-boot/src/main/java/com/your/packages/admin/AdminApplication.java @@ -1,4 +1,4 @@ -package com.hccake.ballcat.admin; +package com.your.packages.admin; import com.hccake.ballcat.commom.log.access.annotation.EnableAccessLog; import com.hccake.ballcat.common.job.annotation.EnableXxlJob; @@ -14,7 +14,7 @@ import org.springframework.boot.web.servlet.ServletComponentScan; @EnableSwagger2Aggregator @EnableAccessLog @ServletComponentScan("com.hccake.ballcat.admin.oauth.filter") -@SpringBootApplication +@SpringBootApplication(scanBasePackages = {"com.hccake.ballcat.admin", "com.your.packages.admin"}) public class AdminApplication { public static void main(String[] args) { diff --git a/ballcat-admin/src/main/resources/META-INF/resources/webjars/bycdao-ui/cdao/swaggerbootstrapui.js b/ballcat-admin/ballcat-admin-boot/src/main/resources/META-INF.resources.webjars.bycdao-ui/cdao/swaggerbootstrapui.js similarity index 100% rename from ballcat-admin/src/main/resources/META-INF/resources/webjars/bycdao-ui/cdao/swaggerbootstrapui.js rename to ballcat-admin/ballcat-admin-boot/src/main/resources/META-INF.resources.webjars.bycdao-ui/cdao/swaggerbootstrapui.js diff --git a/ballcat-admin/src/main/resources/application-dev.yml b/ballcat-admin/ballcat-admin-boot/src/main/resources/application-dev.yml similarity index 100% rename from ballcat-admin/src/main/resources/application-dev.yml rename to ballcat-admin/ballcat-admin-boot/src/main/resources/application-dev.yml diff --git a/ballcat-admin/src/main/resources/application-prod.yml b/ballcat-admin/ballcat-admin-boot/src/main/resources/application-prod.yml similarity index 100% rename from ballcat-admin/src/main/resources/application-prod.yml rename to ballcat-admin/ballcat-admin-boot/src/main/resources/application-prod.yml diff --git a/ballcat-admin/src/main/resources/application-test.yml b/ballcat-admin/ballcat-admin-boot/src/main/resources/application-test.yml similarity index 100% rename from ballcat-admin/src/main/resources/application-test.yml rename to ballcat-admin/ballcat-admin-boot/src/main/resources/application-test.yml diff --git a/ballcat-admin/src/main/resources/application.yml b/ballcat-admin/ballcat-admin-boot/src/main/resources/application.yml similarity index 97% rename from ballcat-admin/src/main/resources/application.yml rename to ballcat-admin/ballcat-admin-boot/src/main/resources/application.yml index 7c6cd7d7..ffca91ac 100644 --- a/ballcat-admin/src/main/resources/application.yml +++ b/ballcat-admin/ballcat-admin-boot/src/main/resources/application.yml @@ -36,7 +36,7 @@ management: # mybatis-plus相关配置 mybatis-plus: - mapper-locations: classpath:/mapper/*/*Mapper.xml + mapper-locations: classpath*:/mapper/*/*Mapper.xml global-config: banner: false db-config: diff --git a/ballcat-admin/src/main/resources/logback-spring.xml b/ballcat-admin/ballcat-admin-boot/src/main/resources/logback-spring.xml similarity index 100% rename from ballcat-admin/src/main/resources/logback-spring.xml rename to ballcat-admin/ballcat-admin-boot/src/main/resources/logback-spring.xml diff --git a/ballcat-admin/ballcat-admin-core/pom.xml b/ballcat-admin/ballcat-admin-core/pom.xml new file mode 100644 index 00000000..911318dd --- /dev/null +++ b/ballcat-admin/ballcat-admin-core/pom.xml @@ -0,0 +1,73 @@ + + + + ballcat-admin + com.hccake + 0.0.1 + + 4.0.0 + + ballcat-admin-core + + + + com.hccake + ballcat-common-job + + + com.hccake + ballcat-common-conf + + + com.hccake + ballcat-common-modules + + + com.hccake + ballcat-common-log + + + com.hccake + ballcat-common-storage + + + + com.hccake + ballcat-common-swagger + + + + com.hccake + ballcat-common-mail + + + + com.github.xiaoymin + knife4j-spring-ui + 1.9.6 + + + io.springfox + springfox-swagger-ui + 2.9.2 + + + + com.baomidou + mybatis-plus-boot-starter + + + + org.springframework.boot + spring-boot-starter-data-redis + + + + org.springframework.security.oauth + spring-security-oauth2 + + + + \ No newline at end of file diff --git a/ballcat-admin/src/main/java/com/hccake/ballcat/admin/constants/SecurityConst.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/constants/SecurityConst.java similarity index 100% rename from ballcat-admin/src/main/java/com/hccake/ballcat/admin/constants/SecurityConst.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/constants/SecurityConst.java diff --git a/ballcat-admin/src/main/java/com/hccake/ballcat/admin/constants/SysPermissionConst.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/constants/SysPermissionConst.java similarity index 100% rename from ballcat-admin/src/main/java/com/hccake/ballcat/admin/constants/SysPermissionConst.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/constants/SysPermissionConst.java diff --git a/ballcat-admin/src/main/java/com/hccake/ballcat/admin/constants/SysUserConst.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/constants/SysUserConst.java similarity index 100% rename from ballcat-admin/src/main/java/com/hccake/ballcat/admin/constants/SysUserConst.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/constants/SysUserConst.java diff --git a/ballcat-admin/src/main/java/com/hccake/ballcat/admin/constants/UrlMappingConst.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/constants/UrlMappingConst.java similarity index 100% rename from ballcat-admin/src/main/java/com/hccake/ballcat/admin/constants/UrlMappingConst.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/constants/UrlMappingConst.java diff --git a/ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/conf/controller/BaseConfigController.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/conf/controller/BaseConfigController.java similarity index 100% rename from ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/conf/controller/BaseConfigController.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/conf/controller/BaseConfigController.java diff --git a/ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/job/AdminDemoJobHandler.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/job/AdminDemoJobHandler.java similarity index 100% rename from ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/job/AdminDemoJobHandler.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/job/AdminDemoJobHandler.java diff --git a/ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/log/controller/AdminAccessLogController.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/log/controller/AdminAccessLogController.java similarity index 100% rename from ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/log/controller/AdminAccessLogController.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/log/controller/AdminAccessLogController.java diff --git a/ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/log/controller/AdminOperationLogController.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/log/controller/AdminOperationLogController.java similarity index 100% rename from ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/log/controller/AdminOperationLogController.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/log/controller/AdminOperationLogController.java diff --git a/ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/log/controller/ApiAccessLogController.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/log/controller/ApiAccessLogController.java similarity index 100% rename from ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/log/controller/ApiAccessLogController.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/log/controller/ApiAccessLogController.java diff --git a/ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/log/mapper/AdminAccessLogMapper.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/log/mapper/AdminAccessLogMapper.java similarity index 100% rename from ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/log/mapper/AdminAccessLogMapper.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/log/mapper/AdminAccessLogMapper.java diff --git a/ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/log/mapper/AdminOperationLogMapper.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/log/mapper/AdminOperationLogMapper.java similarity index 100% rename from ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/log/mapper/AdminOperationLogMapper.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/log/mapper/AdminOperationLogMapper.java diff --git a/ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/log/model/entity/AdminAccessLog.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/log/model/entity/AdminAccessLog.java similarity index 100% rename from ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/log/model/entity/AdminAccessLog.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/log/model/entity/AdminAccessLog.java diff --git a/ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/log/model/entity/AdminOperationLog.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/log/model/entity/AdminOperationLog.java similarity index 100% rename from ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/log/model/entity/AdminOperationLog.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/log/model/entity/AdminOperationLog.java diff --git a/ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/log/service/AdminAccessLogService.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/log/service/AdminAccessLogService.java similarity index 100% rename from ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/log/service/AdminAccessLogService.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/log/service/AdminAccessLogService.java diff --git a/ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/log/service/OperationLogAdminService.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/log/service/OperationLogAdminService.java similarity index 100% rename from ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/log/service/OperationLogAdminService.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/log/service/OperationLogAdminService.java diff --git a/ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/log/service/impl/AdminAccessLogHandlerServiceImpl.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/log/service/impl/AdminAccessLogHandlerServiceImpl.java similarity index 100% rename from ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/log/service/impl/AdminAccessLogHandlerServiceImpl.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/log/service/impl/AdminAccessLogHandlerServiceImpl.java diff --git a/ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/log/service/impl/AdminAccessLogServiceImpl.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/log/service/impl/AdminAccessLogServiceImpl.java similarity index 100% rename from ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/log/service/impl/AdminAccessLogServiceImpl.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/log/service/impl/AdminAccessLogServiceImpl.java diff --git a/ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/log/service/impl/AdminErrorLogHandlerServiceImpl.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/log/service/impl/AdminErrorLogHandlerServiceImpl.java similarity index 100% rename from ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/log/service/impl/AdminErrorLogHandlerServiceImpl.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/log/service/impl/AdminErrorLogHandlerServiceImpl.java diff --git a/ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/log/service/impl/OperationLogAdminServiceImpl.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/log/service/impl/OperationLogAdminServiceImpl.java similarity index 100% rename from ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/log/service/impl/OperationLogAdminServiceImpl.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/log/service/impl/OperationLogAdminServiceImpl.java diff --git a/ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/log/thread/AccessLogAdminSaveThread.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/log/thread/AccessLogAdminSaveThread.java similarity index 100% rename from ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/log/thread/AccessLogAdminSaveThread.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/log/thread/AccessLogAdminSaveThread.java diff --git a/ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/sys/controller/AuthController.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/controller/AuthController.java similarity index 100% rename from ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/sys/controller/AuthController.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/controller/AuthController.java diff --git a/ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/sys/controller/AuthTestController.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/controller/AuthTestController.java similarity index 100% rename from ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/sys/controller/AuthTestController.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/controller/AuthTestController.java diff --git a/ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/sys/controller/SysPermissionController.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/controller/SysPermissionController.java similarity index 100% rename from ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/sys/controller/SysPermissionController.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/controller/SysPermissionController.java diff --git a/ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/sys/controller/SysRoleController.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/controller/SysRoleController.java similarity index 100% rename from ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/sys/controller/SysRoleController.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/controller/SysRoleController.java diff --git a/ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/sys/controller/SysUserController.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/controller/SysUserController.java similarity index 100% rename from ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/sys/controller/SysUserController.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/controller/SysUserController.java diff --git a/ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/sys/mapper/SysPermissionMapper.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/mapper/SysPermissionMapper.java similarity index 100% rename from ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/sys/mapper/SysPermissionMapper.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/mapper/SysPermissionMapper.java diff --git a/ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/sys/mapper/SysRoleMapper.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/mapper/SysRoleMapper.java similarity index 100% rename from ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/sys/mapper/SysRoleMapper.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/mapper/SysRoleMapper.java diff --git a/ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/sys/mapper/SysRolePermissionMapper.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/mapper/SysRolePermissionMapper.java similarity index 100% rename from ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/sys/mapper/SysRolePermissionMapper.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/mapper/SysRolePermissionMapper.java diff --git a/ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/sys/mapper/SysUserMapper.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/mapper/SysUserMapper.java similarity index 100% rename from ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/sys/mapper/SysUserMapper.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/mapper/SysUserMapper.java diff --git a/ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/sys/mapper/SysUserRoleMapper.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/mapper/SysUserRoleMapper.java similarity index 100% rename from ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/sys/mapper/SysUserRoleMapper.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/mapper/SysUserRoleMapper.java diff --git a/ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/sys/model/converter/OperationLogConverter.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/converter/OperationLogConverter.java similarity index 100% rename from ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/sys/model/converter/OperationLogConverter.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/converter/OperationLogConverter.java diff --git a/ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/sys/model/converter/SysPermissionConverter.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/converter/SysPermissionConverter.java similarity index 100% rename from ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/sys/model/converter/SysPermissionConverter.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/converter/SysPermissionConverter.java diff --git a/ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/sys/model/converter/SysUserConverter.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/converter/SysUserConverter.java similarity index 100% rename from ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/sys/model/converter/SysUserConverter.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/converter/SysUserConverter.java diff --git a/ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/sys/model/dto/SysUserDTO.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/dto/SysUserDTO.java similarity index 100% rename from ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/sys/model/dto/SysUserDTO.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/dto/SysUserDTO.java diff --git a/ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/sys/model/dto/SysUserScope.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/dto/SysUserScope.java similarity index 100% rename from ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/sys/model/dto/SysUserScope.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/dto/SysUserScope.java diff --git a/ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/sys/model/entity/SysPermission.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/entity/SysPermission.java similarity index 100% rename from ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/sys/model/entity/SysPermission.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/entity/SysPermission.java diff --git a/ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/sys/model/entity/SysRole.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/entity/SysRole.java similarity index 100% rename from ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/sys/model/entity/SysRole.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/entity/SysRole.java diff --git a/ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/sys/model/entity/SysRolePermission.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/entity/SysRolePermission.java similarity index 100% rename from ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/sys/model/entity/SysRolePermission.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/entity/SysRolePermission.java diff --git a/ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/sys/model/entity/SysUser.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/entity/SysUser.java similarity index 98% rename from ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/sys/model/entity/SysUser.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/entity/SysUser.java index 12d95de5..2a91e7cc 100644 --- a/ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/sys/model/entity/SysUser.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/entity/SysUser.java @@ -89,5 +89,6 @@ private static final long serialVersionUID = 1L; * 更新时间 */ @ApiModelProperty(value="更新时间") + @TableField(fill = FieldFill.UPDATE) private LocalDateTime updateTime; } diff --git a/ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/sys/model/entity/SysUserRole.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/entity/SysUserRole.java similarity index 100% rename from ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/sys/model/entity/SysUserRole.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/entity/SysUserRole.java diff --git a/ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/sys/model/qo/SysUserQO.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/qo/SysUserQO.java similarity index 100% rename from ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/sys/model/qo/SysUserQO.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/qo/SysUserQO.java diff --git a/ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/sys/model/vo/PermissionVO.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/vo/PermissionVO.java similarity index 100% rename from ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/sys/model/vo/PermissionVO.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/vo/PermissionVO.java diff --git a/ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/sys/model/vo/Router.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/vo/Router.java similarity index 100% rename from ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/sys/model/vo/Router.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/vo/Router.java diff --git a/ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/sys/model/vo/UserInfo.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/vo/UserInfo.java similarity index 100% rename from ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/sys/model/vo/UserInfo.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/model/vo/UserInfo.java diff --git a/ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/sys/service/FileService.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/FileService.java similarity index 100% rename from ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/sys/service/FileService.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/FileService.java diff --git a/ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/sys/service/SysPermissionService.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/SysPermissionService.java similarity index 100% rename from ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/sys/service/SysPermissionService.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/SysPermissionService.java diff --git a/ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/sys/service/SysRolePermissionService.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/SysRolePermissionService.java similarity index 100% rename from ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/sys/service/SysRolePermissionService.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/SysRolePermissionService.java diff --git a/ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/sys/service/SysRoleService.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/SysRoleService.java similarity index 100% rename from ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/sys/service/SysRoleService.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/SysRoleService.java diff --git a/ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/sys/service/SysUserRoleService.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/SysUserRoleService.java similarity index 100% rename from ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/sys/service/SysUserRoleService.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/SysUserRoleService.java diff --git a/ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/sys/service/SysUserService.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/SysUserService.java similarity index 100% rename from ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/sys/service/SysUserService.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/SysUserService.java diff --git a/ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/sys/service/impl/FileServiceImpl.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/impl/FileServiceImpl.java similarity index 100% rename from ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/sys/service/impl/FileServiceImpl.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/impl/FileServiceImpl.java diff --git a/ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/sys/service/impl/SysPermissionServiceImpl.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/impl/SysPermissionServiceImpl.java similarity index 100% rename from ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/sys/service/impl/SysPermissionServiceImpl.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/impl/SysPermissionServiceImpl.java diff --git a/ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/sys/service/impl/SysRolePermissionServiceImpl.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/impl/SysRolePermissionServiceImpl.java similarity index 100% rename from ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/sys/service/impl/SysRolePermissionServiceImpl.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/impl/SysRolePermissionServiceImpl.java diff --git a/ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/sys/service/impl/SysRoleServiceImpl.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/impl/SysRoleServiceImpl.java similarity index 100% rename from ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/sys/service/impl/SysRoleServiceImpl.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/impl/SysRoleServiceImpl.java diff --git a/ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/sys/service/impl/SysUserRoleServiceImpl.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/impl/SysUserRoleServiceImpl.java similarity index 100% rename from ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/sys/service/impl/SysUserRoleServiceImpl.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/impl/SysUserRoleServiceImpl.java diff --git a/ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/sys/service/impl/SysUserServiceImpl.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/impl/SysUserServiceImpl.java similarity index 100% rename from ballcat-admin/src/main/java/com/hccake/ballcat/admin/modules/sys/service/impl/SysUserServiceImpl.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/service/impl/SysUserServiceImpl.java diff --git a/ballcat-admin/src/main/java/com/hccake/ballcat/admin/oauth/CustomAuthenticationEntryPoint.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/oauth/CustomAuthenticationEntryPoint.java similarity index 100% rename from ballcat-admin/src/main/java/com/hccake/ballcat/admin/oauth/CustomAuthenticationEntryPoint.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/oauth/CustomAuthenticationEntryPoint.java diff --git a/ballcat-admin/src/main/java/com/hccake/ballcat/admin/oauth/CustomPermissionEvaluator.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/oauth/CustomPermissionEvaluator.java similarity index 100% rename from ballcat-admin/src/main/java/com/hccake/ballcat/admin/oauth/CustomPermissionEvaluator.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/oauth/CustomPermissionEvaluator.java diff --git a/ballcat-admin/src/main/java/com/hccake/ballcat/admin/oauth/CustomTokenEnhancer.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/oauth/CustomTokenEnhancer.java similarity index 100% rename from ballcat-admin/src/main/java/com/hccake/ballcat/admin/oauth/CustomTokenEnhancer.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/oauth/CustomTokenEnhancer.java diff --git a/ballcat-admin/src/main/java/com/hccake/ballcat/admin/oauth/SysUserDetails.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/oauth/SysUserDetails.java similarity index 100% rename from ballcat-admin/src/main/java/com/hccake/ballcat/admin/oauth/SysUserDetails.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/oauth/SysUserDetails.java diff --git a/ballcat-admin/src/main/java/com/hccake/ballcat/admin/oauth/SysUserDetailsServiceImpl.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/oauth/SysUserDetailsServiceImpl.java similarity index 100% rename from ballcat-admin/src/main/java/com/hccake/ballcat/admin/oauth/SysUserDetailsServiceImpl.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/oauth/SysUserDetailsServiceImpl.java diff --git a/ballcat-admin/src/main/java/com/hccake/ballcat/admin/oauth/config/CustomAuthorizationServerConfigurer.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/oauth/config/CustomAuthorizationServerConfigurer.java similarity index 100% rename from ballcat-admin/src/main/java/com/hccake/ballcat/admin/oauth/config/CustomAuthorizationServerConfigurer.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/oauth/config/CustomAuthorizationServerConfigurer.java diff --git a/ballcat-admin/src/main/java/com/hccake/ballcat/admin/oauth/config/CustomResourceServerConfigurer.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/oauth/config/CustomResourceServerConfigurer.java similarity index 100% rename from ballcat-admin/src/main/java/com/hccake/ballcat/admin/oauth/config/CustomResourceServerConfigurer.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/oauth/config/CustomResourceServerConfigurer.java diff --git a/ballcat-admin/src/main/java/com/hccake/ballcat/admin/oauth/config/PermitAllUrlProperties.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/oauth/config/PermitAllUrlProperties.java similarity index 100% rename from ballcat-admin/src/main/java/com/hccake/ballcat/admin/oauth/config/PermitAllUrlProperties.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/oauth/config/PermitAllUrlProperties.java diff --git a/ballcat-admin/src/main/java/com/hccake/ballcat/admin/oauth/config/SpringSecurityConfig.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/oauth/config/SpringSecurityConfig.java similarity index 100% rename from ballcat-admin/src/main/java/com/hccake/ballcat/admin/oauth/config/SpringSecurityConfig.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/oauth/config/SpringSecurityConfig.java diff --git a/ballcat-admin/src/main/java/com/hccake/ballcat/admin/oauth/exception/CustomOAuth2Exception.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/oauth/exception/CustomOAuth2Exception.java similarity index 100% rename from ballcat-admin/src/main/java/com/hccake/ballcat/admin/oauth/exception/CustomOAuth2Exception.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/oauth/exception/CustomOAuth2Exception.java diff --git a/ballcat-admin/src/main/java/com/hccake/ballcat/admin/oauth/exception/CustomOAuth2ExceptionSerializer.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/oauth/exception/CustomOAuth2ExceptionSerializer.java similarity index 100% rename from ballcat-admin/src/main/java/com/hccake/ballcat/admin/oauth/exception/CustomOAuth2ExceptionSerializer.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/oauth/exception/CustomOAuth2ExceptionSerializer.java diff --git a/ballcat-admin/src/main/java/com/hccake/ballcat/admin/oauth/exception/CustomWebResponseExceptionTranslator.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/oauth/exception/CustomWebResponseExceptionTranslator.java similarity index 100% rename from ballcat-admin/src/main/java/com/hccake/ballcat/admin/oauth/exception/CustomWebResponseExceptionTranslator.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/oauth/exception/CustomWebResponseExceptionTranslator.java diff --git a/ballcat-admin/src/main/java/com/hccake/ballcat/admin/oauth/filter/LoginPasswordDecoderFilter.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/oauth/filter/LoginPasswordDecoderFilter.java similarity index 100% rename from ballcat-admin/src/main/java/com/hccake/ballcat/admin/oauth/filter/LoginPasswordDecoderFilter.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/oauth/filter/LoginPasswordDecoderFilter.java diff --git a/ballcat-admin/src/main/java/com/hccake/ballcat/admin/oauth/mobile/MobileAuthenticationProvider.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/oauth/mobile/MobileAuthenticationProvider.java similarity index 98% rename from ballcat-admin/src/main/java/com/hccake/ballcat/admin/oauth/mobile/MobileAuthenticationProvider.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/oauth/mobile/MobileAuthenticationProvider.java index 0fa42874..58c2fa5e 100644 --- a/ballcat-admin/src/main/java/com/hccake/ballcat/admin/oauth/mobile/MobileAuthenticationProvider.java +++ b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/oauth/mobile/MobileAuthenticationProvider.java @@ -32,7 +32,7 @@ public class MobileAuthenticationProvider implements AuthenticationProvider { MobileAuthenticationToken mobileAuthenticationToken = (MobileAuthenticationToken) authentication; String principal = mobileAuthenticationToken.getPrincipal().toString(); - UserDetails userDetails = userDetailsService.loadUserByUsername("admin"); + UserDetails userDetails = userDetailsService.loadUserByUsername("com/hccake/ballcat/admin"); if (userDetails == null) { log.debug("Authentication failed: no credentials provided"); diff --git a/ballcat-admin/src/main/java/com/hccake/ballcat/admin/oauth/mobile/MobileAuthenticationToken.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/oauth/mobile/MobileAuthenticationToken.java similarity index 100% rename from ballcat-admin/src/main/java/com/hccake/ballcat/admin/oauth/mobile/MobileAuthenticationToken.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/oauth/mobile/MobileAuthenticationToken.java diff --git a/ballcat-admin/src/main/java/com/hccake/ballcat/admin/oauth/mobile/MobileTokenGranter.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/oauth/mobile/MobileTokenGranter.java similarity index 100% rename from ballcat-admin/src/main/java/com/hccake/ballcat/admin/oauth/mobile/MobileTokenGranter.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/oauth/mobile/MobileTokenGranter.java diff --git a/ballcat-admin/src/main/java/com/hccake/ballcat/admin/oauth/util/SecurityUtils.java b/ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/oauth/util/SecurityUtils.java similarity index 100% rename from ballcat-admin/src/main/java/com/hccake/ballcat/admin/oauth/util/SecurityUtils.java rename to ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/oauth/util/SecurityUtils.java diff --git a/ballcat-admin/src/main/resources/mapper/log/AdminOperationLogMapper.xml b/ballcat-admin/ballcat-admin-core/src/main/resources/mapper/log/AdminOperationLogMapper.xml similarity index 100% rename from ballcat-admin/src/main/resources/mapper/log/AdminOperationLogMapper.xml rename to ballcat-admin/ballcat-admin-core/src/main/resources/mapper/log/AdminOperationLogMapper.xml diff --git a/ballcat-admin/src/main/resources/mapper/sys/PermissionMapper.xml b/ballcat-admin/ballcat-admin-core/src/main/resources/mapper/sys/PermissionMapper.xml similarity index 100% rename from ballcat-admin/src/main/resources/mapper/sys/PermissionMapper.xml rename to ballcat-admin/ballcat-admin-core/src/main/resources/mapper/sys/PermissionMapper.xml diff --git a/ballcat-admin/src/main/resources/mapper/sys/RoleMapper.xml b/ballcat-admin/ballcat-admin-core/src/main/resources/mapper/sys/RoleMapper.xml similarity index 100% rename from ballcat-admin/src/main/resources/mapper/sys/RoleMapper.xml rename to ballcat-admin/ballcat-admin-core/src/main/resources/mapper/sys/RoleMapper.xml diff --git a/ballcat-admin/src/main/resources/mapper/sys/RolePermissionMapper.xml b/ballcat-admin/ballcat-admin-core/src/main/resources/mapper/sys/RolePermissionMapper.xml similarity index 100% rename from ballcat-admin/src/main/resources/mapper/sys/RolePermissionMapper.xml rename to ballcat-admin/ballcat-admin-core/src/main/resources/mapper/sys/RolePermissionMapper.xml diff --git a/ballcat-admin/src/main/resources/mapper/sys/SysUserMapper.xml b/ballcat-admin/ballcat-admin-core/src/main/resources/mapper/sys/SysUserMapper.xml similarity index 100% rename from ballcat-admin/src/main/resources/mapper/sys/SysUserMapper.xml rename to ballcat-admin/ballcat-admin-core/src/main/resources/mapper/sys/SysUserMapper.xml diff --git a/ballcat-admin/src/main/resources/mapper/sys/SysUserRoleMapper.xml b/ballcat-admin/ballcat-admin-core/src/main/resources/mapper/sys/SysUserRoleMapper.xml similarity index 100% rename from ballcat-admin/src/main/resources/mapper/sys/SysUserRoleMapper.xml rename to ballcat-admin/ballcat-admin-core/src/main/resources/mapper/sys/SysUserRoleMapper.xml diff --git a/ballcat-admin/pom.xml b/ballcat-admin/pom.xml index 1310cc27..ddbc33f9 100644 --- a/ballcat-admin/pom.xml +++ b/ballcat-admin/pom.xml @@ -10,92 +10,11 @@ 4.0.0 ballcat-admin + pom - - - com.hccake - ballcat-common-job - - - com.hccake - ballcat-common-conf - - - com.hccake - ballcat-common-modules - - - com.hccake - ballcat-common-log - - - com.hccake - ballcat-common-storage - - - - com.hccake - ballcat-common-swagger - - - - com.github.xiaoymin - knife4j-spring-ui - 1.9.6 - - - io.springfox - springfox-swagger-ui - 2.9.2 - - - - com.baomidou - mybatis-plus-boot-starter - - - - org.springframework.boot - spring-boot-starter-web - - - - org.springframework.boot - spring-boot-starter-undertow - - - - org.springframework.boot - spring-boot-starter-data-redis - - - - mysql - mysql-connector-java - - - - org.springframework.security.oauth - spring-security-oauth2 - - - - de.codecentric - spring-boot-admin-starter-client - - - org.springframework.boot - spring-boot-starter-actuator - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - + + ballcat-admin-core + ballcat-admin-boot + \ No newline at end of file diff --git a/ballcat-admin/src/test/java/com/hccake/ballcat/admin/test/ConvertTest.java b/ballcat-admin/src/test/java/com/hccake/ballcat/admin/test/ConvertTest.java deleted file mode 100644 index 101783cf..00000000 --- a/ballcat-admin/src/test/java/com/hccake/ballcat/admin/test/ConvertTest.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.hccake.ballcat.admin.test; - -import com.hccake.ballcat.admin.modules.sys.model.converter.SysPermissionConverter; -import com.hccake.ballcat.admin.modules.sys.model.vo.PermissionVO; -import com.hccake.ballcat.admin.modules.sys.model.vo.Router; -import org.junit.Test; - -/** - * @author Hccake - * @version 1.0 - * @date 2019/9/19 11:42 - */ -public class ConvertTest { - - @Test - public void test(){ - - PermissionVO sysPermission = new PermissionVO(); - sysPermission.setIcon("icon"); - sysPermission.setCode("code"); - sysPermission.setParentId(-1); - - Router router = SysPermissionConverter.INSTANCE.toRouter(sysPermission); - System.out.println(router); - - } -} diff --git a/ballcat-admin/src/test/java/com/hccake/ballcat/admin/test/TestUpdate.java b/ballcat-admin/src/test/java/com/hccake/ballcat/admin/test/TestUpdate.java deleted file mode 100644 index c6f2ba3e..00000000 --- a/ballcat-admin/src/test/java/com/hccake/ballcat/admin/test/TestUpdate.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.hccake.ballcat.admin.test; - -import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.hccake.ballcat.admin.modules.sys.model.entity.SysRole; -import org.junit.Test; -import org.springframework.boot.test.context.SpringBootTest; - -/** - * @author Hccake - * @version 1.0 - * @date 2019/9/17 9:58 - */ -@SpringBootTest -public class TestUpdate { - - - - - @Test - public void test() { - - Wrapper wrapper = Wrappers.query(); - System.out.println(wrapper.getSqlSelect()); - System.out.println(wrapper.getCustomSqlSegment()); - System.out.println(wrapper.getExpression().getSqlSegment()); - } - -} diff --git a/ballcat-common/ballcat-common-conf/src/main/java/com/hccake/ballcat/common/conf/mybatis/MybatisPlusConfig.java b/ballcat-common/ballcat-common-conf/src/main/java/com/hccake/ballcat/common/conf/mybatis/MybatisPlusConfig.java index d5f3adcc..c3c6929d 100644 --- a/ballcat-common/ballcat-common-conf/src/main/java/com/hccake/ballcat/common/conf/mybatis/MybatisPlusConfig.java +++ b/ballcat-common/ballcat-common-conf/src/main/java/com/hccake/ballcat/common/conf/mybatis/MybatisPlusConfig.java @@ -10,7 +10,7 @@ import org.springframework.context.annotation.Configuration; * @date 2017/10/29 */ @Configuration -@MapperScan("com.hccake.ballcat.**.mapper") +@MapperScan(basePackages = {"com.hccake.ballcat.**.mapper", "com.your.packages.**.mapper"}) public class MybatisPlusConfig { /**