From 76b1e51f0b4f28467ea266959c42232a3d0c54dd Mon Sep 17 00:00:00 2001 From: "wangiegie@gmail.com" Date: Sun, 14 Jan 2018 23:08:45 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=9B=AE=E5=BD=95?= =?UTF-8?q?=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- {pig-auth-service => pig-auth}/pom.xml | 4 +-- .../pig/auth/PigAuthServerApplication.java | 0 .../PigWebResponseExceptionTranslator.java | 0 .../mobile/MobileAuthenticationFilter.java | 0 .../mobile/MobileAuthenticationProvider.java | 0 .../mobile/MobileAuthenticationToken.java | 0 .../mobile/MobileLoginSuccessHandler.java | 0 .../mobile/MobileSecurityConfigurer.java | 0 .../pig/auth/config/AuthServerConfig.java | 0 .../auth/config/PigAuthorizationConfig.java | 0 .../config/ResourceServerConfiguration.java | 0 .../pig/auth/controller/UserController.java | 0 .../github/pig/auth/feign/UserService.java | 2 +- .../fallback/UserServiceFallbackImpl.java | 0 .../auth/serivce/UserDetailServiceImpl.java | 0 .../auth/util/MobileAuthenticationToken.java | 0 .../github/pig/auth/util/UserDetailsImpl.java | 0 .../src/main/resources/bootstrap.yml | 2 +- .../src/main/resources/logback.xml | 0 pig-config/src/main/resources/application.yml | 2 +- .../github/pig/gateway/feign/MenuService.java | 2 +- .../github/pig/gateway/feign/UserService.java | 2 +- .../pig-upms-service}/pom.xml | 10 +++---- .../github/pig/admin/PigAdminApplication.java | 0 .../admin/common/config/KaptchaConfig.java | 0 .../common/config/MybatisPlusConfig.java | 0 .../pig/admin/common/config/RabbitConfig.java | 0 .../common/listener/LogReceiveListener.java | 0 .../common/util/PigResourcesGenerator.java | 0 .../pig/admin/common/util/TreeUtil.java | 0 .../pig/admin/controller/DictController.java | 0 .../pig/admin/controller/LogController.java | 0 .../pig/admin/controller/MenuController.java | 0 .../pig/admin/controller/RoleController.java | 0 .../pig/admin/controller/UserController.java | 0 .../controller/ValidateCodeController.java | 0 .../com/github/pig/admin/dto/MenuTree.java | 0 .../com/github/pig/admin/dto/RouteConfig.java | 0 .../com/github/pig/admin/dto/TreeNode.java | 0 .../com/github/pig/admin/dto/UserDto.java | 0 .../com/github/pig/admin/dto/UserInfo.java | 0 .../com/github/pig/admin/entity/SysDict.java | 0 .../com/github/pig/admin/entity/SysMenu.java | 0 .../com/github/pig/admin/entity/SysRole.java | 0 .../github/pig/admin/entity/SysRoleMenu.java | 0 .../com/github/pig/admin/entity/SysUser.java | 0 .../github/pig/admin/entity/SysUserRole.java | 0 .../pig/admin/mapper/SysDictMapper.java | 0 .../github/pig/admin/mapper/SysLogMapper.java | 0 .../pig/admin/mapper/SysMenuMapper.java | 0 .../pig/admin/mapper/SysRoleMapper.java | 0 .../pig/admin/mapper/SysRoleMenuMapper.java | 0 .../pig/admin/mapper/SysUserMapper.java | 0 .../pig/admin/mapper/SysUserRoleMapper.java | 0 .../pig/admin/service/SysDictService.java | 0 .../pig/admin/service/SysLogService.java | 0 .../pig/admin/service/SysMenuService.java | 0 .../pig/admin/service/SysRoleMenuService.java | 0 .../pig/admin/service/SysRoleService.java | 0 .../pig/admin/service/SysUserRoleService.java | 0 .../github/pig/admin/service/UserService.java | 0 .../service/impl/SysDictServiceImpl.java | 0 .../admin/service/impl/SysLogServiceImpl.java | 0 .../service/impl/SysMenuServiceImpl.java | 0 .../service/impl/SysRoleMenuServiceImpl.java | 0 .../service/impl/SysRoleServiceImpl.java | 0 .../service/impl/SysUserRoleServiceImpl.java | 0 .../admin/service/impl/UserServiceImpl.java | 0 .../src/main/resources/bootstrap.yml | 2 +- .../src/main/resources/logback.xml | 0 .../main/resources/mapper/SysDictMapper.xml | 0 .../main/resources/mapper/SysLogMapper.xml | 0 .../main/resources/mapper/SysMenuMapper.xml | 0 .../main/resources/mapper/SysRoleMapper.xml | 0 .../resources/mapper/SysRoleMenuMapper.xml | 0 .../main/resources/mapper/SysUserMapper.xml | 0 .../resources/mapper/SysUserRoleMapper.xml | 0 .../resources/templates/controller.java.vm | 0 .../main/resources/templates/listvue.vue.vm | 0 .../src/main/resources/templates/menu.sql.vm | 0 .../test/java/PigAdminApplicationTest.java | 0 .../admin/controller/UserControllerTest.java | 1 - pig-modules/pom.xml | 26 +++++++++++++++++++ pom.xml | 8 +++--- 84 files changed, 43 insertions(+), 18 deletions(-) rename {pig-auth-service => pig-auth}/pom.xml (96%) rename {pig-auth-service => pig-auth}/src/main/java/com/github/pig/auth/PigAuthServerApplication.java (100%) rename {pig-auth-service => pig-auth}/src/main/java/com/github/pig/auth/component/PigWebResponseExceptionTranslator.java (100%) rename {pig-auth-service => pig-auth}/src/main/java/com/github/pig/auth/component/mobile/MobileAuthenticationFilter.java (100%) rename {pig-auth-service => pig-auth}/src/main/java/com/github/pig/auth/component/mobile/MobileAuthenticationProvider.java (100%) rename {pig-auth-service => pig-auth}/src/main/java/com/github/pig/auth/component/mobile/MobileAuthenticationToken.java (100%) rename {pig-auth-service => pig-auth}/src/main/java/com/github/pig/auth/component/mobile/MobileLoginSuccessHandler.java (100%) rename {pig-auth-service => pig-auth}/src/main/java/com/github/pig/auth/component/mobile/MobileSecurityConfigurer.java (100%) rename {pig-auth-service => pig-auth}/src/main/java/com/github/pig/auth/config/AuthServerConfig.java (100%) rename {pig-auth-service => pig-auth}/src/main/java/com/github/pig/auth/config/PigAuthorizationConfig.java (100%) rename {pig-auth-service => pig-auth}/src/main/java/com/github/pig/auth/config/ResourceServerConfiguration.java (100%) rename {pig-auth-service => pig-auth}/src/main/java/com/github/pig/auth/controller/UserController.java (100%) rename {pig-auth-service => pig-auth}/src/main/java/com/github/pig/auth/feign/UserService.java (91%) rename {pig-auth-service => pig-auth}/src/main/java/com/github/pig/auth/feign/fallback/UserServiceFallbackImpl.java (100%) rename {pig-auth-service => pig-auth}/src/main/java/com/github/pig/auth/serivce/UserDetailServiceImpl.java (100%) rename {pig-auth-service => pig-auth}/src/main/java/com/github/pig/auth/util/MobileAuthenticationToken.java (100%) rename {pig-auth-service => pig-auth}/src/main/java/com/github/pig/auth/util/UserDetailsImpl.java (100%) rename {pig-auth-service => pig-auth}/src/main/resources/bootstrap.yml (95%) rename {pig-auth-service => pig-auth}/src/main/resources/logback.xml (100%) rename {pig-admin-service => pig-modules/pig-upms-service}/pom.xml (91%) rename {pig-admin-service => pig-modules/pig-upms-service}/src/main/java/com/github/pig/admin/PigAdminApplication.java (100%) rename {pig-admin-service => pig-modules/pig-upms-service}/src/main/java/com/github/pig/admin/common/config/KaptchaConfig.java (100%) rename {pig-admin-service => pig-modules/pig-upms-service}/src/main/java/com/github/pig/admin/common/config/MybatisPlusConfig.java (100%) rename {pig-admin-service => pig-modules/pig-upms-service}/src/main/java/com/github/pig/admin/common/config/RabbitConfig.java (100%) rename {pig-admin-service => pig-modules/pig-upms-service}/src/main/java/com/github/pig/admin/common/listener/LogReceiveListener.java (100%) rename {pig-admin-service => pig-modules/pig-upms-service}/src/main/java/com/github/pig/admin/common/util/PigResourcesGenerator.java (100%) rename {pig-admin-service => pig-modules/pig-upms-service}/src/main/java/com/github/pig/admin/common/util/TreeUtil.java (100%) rename {pig-admin-service => pig-modules/pig-upms-service}/src/main/java/com/github/pig/admin/controller/DictController.java (100%) rename {pig-admin-service => pig-modules/pig-upms-service}/src/main/java/com/github/pig/admin/controller/LogController.java (100%) rename {pig-admin-service => pig-modules/pig-upms-service}/src/main/java/com/github/pig/admin/controller/MenuController.java (100%) rename {pig-admin-service => pig-modules/pig-upms-service}/src/main/java/com/github/pig/admin/controller/RoleController.java (100%) rename {pig-admin-service => pig-modules/pig-upms-service}/src/main/java/com/github/pig/admin/controller/UserController.java (100%) rename {pig-admin-service => pig-modules/pig-upms-service}/src/main/java/com/github/pig/admin/controller/ValidateCodeController.java (100%) rename {pig-admin-service => pig-modules/pig-upms-service}/src/main/java/com/github/pig/admin/dto/MenuTree.java (100%) rename {pig-admin-service => pig-modules/pig-upms-service}/src/main/java/com/github/pig/admin/dto/RouteConfig.java (100%) rename {pig-admin-service => pig-modules/pig-upms-service}/src/main/java/com/github/pig/admin/dto/TreeNode.java (100%) rename {pig-admin-service => pig-modules/pig-upms-service}/src/main/java/com/github/pig/admin/dto/UserDto.java (100%) rename {pig-admin-service => pig-modules/pig-upms-service}/src/main/java/com/github/pig/admin/dto/UserInfo.java (100%) rename {pig-admin-service => pig-modules/pig-upms-service}/src/main/java/com/github/pig/admin/entity/SysDict.java (100%) rename {pig-admin-service => pig-modules/pig-upms-service}/src/main/java/com/github/pig/admin/entity/SysMenu.java (100%) rename {pig-admin-service => pig-modules/pig-upms-service}/src/main/java/com/github/pig/admin/entity/SysRole.java (100%) rename {pig-admin-service => pig-modules/pig-upms-service}/src/main/java/com/github/pig/admin/entity/SysRoleMenu.java (100%) rename {pig-admin-service => pig-modules/pig-upms-service}/src/main/java/com/github/pig/admin/entity/SysUser.java (100%) rename {pig-admin-service => pig-modules/pig-upms-service}/src/main/java/com/github/pig/admin/entity/SysUserRole.java (100%) rename {pig-admin-service => pig-modules/pig-upms-service}/src/main/java/com/github/pig/admin/mapper/SysDictMapper.java (100%) rename {pig-admin-service => pig-modules/pig-upms-service}/src/main/java/com/github/pig/admin/mapper/SysLogMapper.java (100%) rename {pig-admin-service => pig-modules/pig-upms-service}/src/main/java/com/github/pig/admin/mapper/SysMenuMapper.java (100%) rename {pig-admin-service => pig-modules/pig-upms-service}/src/main/java/com/github/pig/admin/mapper/SysRoleMapper.java (100%) rename {pig-admin-service => pig-modules/pig-upms-service}/src/main/java/com/github/pig/admin/mapper/SysRoleMenuMapper.java (100%) rename {pig-admin-service => pig-modules/pig-upms-service}/src/main/java/com/github/pig/admin/mapper/SysUserMapper.java (100%) rename {pig-admin-service => pig-modules/pig-upms-service}/src/main/java/com/github/pig/admin/mapper/SysUserRoleMapper.java (100%) rename {pig-admin-service => pig-modules/pig-upms-service}/src/main/java/com/github/pig/admin/service/SysDictService.java (100%) rename {pig-admin-service => pig-modules/pig-upms-service}/src/main/java/com/github/pig/admin/service/SysLogService.java (100%) rename {pig-admin-service => pig-modules/pig-upms-service}/src/main/java/com/github/pig/admin/service/SysMenuService.java (100%) rename {pig-admin-service => pig-modules/pig-upms-service}/src/main/java/com/github/pig/admin/service/SysRoleMenuService.java (100%) rename {pig-admin-service => pig-modules/pig-upms-service}/src/main/java/com/github/pig/admin/service/SysRoleService.java (100%) rename {pig-admin-service => pig-modules/pig-upms-service}/src/main/java/com/github/pig/admin/service/SysUserRoleService.java (100%) rename {pig-admin-service => pig-modules/pig-upms-service}/src/main/java/com/github/pig/admin/service/UserService.java (100%) rename {pig-admin-service => pig-modules/pig-upms-service}/src/main/java/com/github/pig/admin/service/impl/SysDictServiceImpl.java (100%) rename {pig-admin-service => pig-modules/pig-upms-service}/src/main/java/com/github/pig/admin/service/impl/SysLogServiceImpl.java (100%) rename {pig-admin-service => pig-modules/pig-upms-service}/src/main/java/com/github/pig/admin/service/impl/SysMenuServiceImpl.java (100%) rename {pig-admin-service => pig-modules/pig-upms-service}/src/main/java/com/github/pig/admin/service/impl/SysRoleMenuServiceImpl.java (100%) rename {pig-admin-service => pig-modules/pig-upms-service}/src/main/java/com/github/pig/admin/service/impl/SysRoleServiceImpl.java (100%) rename {pig-admin-service => pig-modules/pig-upms-service}/src/main/java/com/github/pig/admin/service/impl/SysUserRoleServiceImpl.java (100%) rename {pig-admin-service => pig-modules/pig-upms-service}/src/main/java/com/github/pig/admin/service/impl/UserServiceImpl.java (100%) rename {pig-admin-service => pig-modules/pig-upms-service}/src/main/resources/bootstrap.yml (95%) rename {pig-admin-service => pig-modules/pig-upms-service}/src/main/resources/logback.xml (100%) rename {pig-admin-service => pig-modules/pig-upms-service}/src/main/resources/mapper/SysDictMapper.xml (100%) rename {pig-admin-service => pig-modules/pig-upms-service}/src/main/resources/mapper/SysLogMapper.xml (100%) rename {pig-admin-service => pig-modules/pig-upms-service}/src/main/resources/mapper/SysMenuMapper.xml (100%) rename {pig-admin-service => pig-modules/pig-upms-service}/src/main/resources/mapper/SysRoleMapper.xml (100%) rename {pig-admin-service => pig-modules/pig-upms-service}/src/main/resources/mapper/SysRoleMenuMapper.xml (100%) rename {pig-admin-service => pig-modules/pig-upms-service}/src/main/resources/mapper/SysUserMapper.xml (100%) rename {pig-admin-service => pig-modules/pig-upms-service}/src/main/resources/mapper/SysUserRoleMapper.xml (100%) rename {pig-admin-service => pig-modules/pig-upms-service}/src/main/resources/templates/controller.java.vm (100%) rename {pig-admin-service => pig-modules/pig-upms-service}/src/main/resources/templates/listvue.vue.vm (100%) rename {pig-admin-service => pig-modules/pig-upms-service}/src/main/resources/templates/menu.sql.vm (100%) rename {pig-admin-service => pig-modules/pig-upms-service}/src/test/java/PigAdminApplicationTest.java (100%) rename {pig-admin-service => pig-modules/pig-upms-service}/src/test/java/com/github/pig/admin/controller/UserControllerTest.java (98%) create mode 100644 pig-modules/pom.xml diff --git a/pig-auth-service/pom.xml b/pig-auth/pom.xml similarity index 96% rename from pig-auth-service/pom.xml rename to pig-auth/pom.xml index 4a14b80f..34e6c1f0 100644 --- a/pig-auth-service/pom.xml +++ b/pig-auth/pom.xml @@ -4,11 +4,11 @@ 4.0.0 com.github.pig - pig-auth-service + pig-auth ${pig.version} jar - pig-auth-service + pig-auth jwt 认证服务 diff --git a/pig-auth-service/src/main/java/com/github/pig/auth/PigAuthServerApplication.java b/pig-auth/src/main/java/com/github/pig/auth/PigAuthServerApplication.java similarity index 100% rename from pig-auth-service/src/main/java/com/github/pig/auth/PigAuthServerApplication.java rename to pig-auth/src/main/java/com/github/pig/auth/PigAuthServerApplication.java diff --git a/pig-auth-service/src/main/java/com/github/pig/auth/component/PigWebResponseExceptionTranslator.java b/pig-auth/src/main/java/com/github/pig/auth/component/PigWebResponseExceptionTranslator.java similarity index 100% rename from pig-auth-service/src/main/java/com/github/pig/auth/component/PigWebResponseExceptionTranslator.java rename to pig-auth/src/main/java/com/github/pig/auth/component/PigWebResponseExceptionTranslator.java diff --git a/pig-auth-service/src/main/java/com/github/pig/auth/component/mobile/MobileAuthenticationFilter.java b/pig-auth/src/main/java/com/github/pig/auth/component/mobile/MobileAuthenticationFilter.java similarity index 100% rename from pig-auth-service/src/main/java/com/github/pig/auth/component/mobile/MobileAuthenticationFilter.java rename to pig-auth/src/main/java/com/github/pig/auth/component/mobile/MobileAuthenticationFilter.java diff --git a/pig-auth-service/src/main/java/com/github/pig/auth/component/mobile/MobileAuthenticationProvider.java b/pig-auth/src/main/java/com/github/pig/auth/component/mobile/MobileAuthenticationProvider.java similarity index 100% rename from pig-auth-service/src/main/java/com/github/pig/auth/component/mobile/MobileAuthenticationProvider.java rename to pig-auth/src/main/java/com/github/pig/auth/component/mobile/MobileAuthenticationProvider.java diff --git a/pig-auth-service/src/main/java/com/github/pig/auth/component/mobile/MobileAuthenticationToken.java b/pig-auth/src/main/java/com/github/pig/auth/component/mobile/MobileAuthenticationToken.java similarity index 100% rename from pig-auth-service/src/main/java/com/github/pig/auth/component/mobile/MobileAuthenticationToken.java rename to pig-auth/src/main/java/com/github/pig/auth/component/mobile/MobileAuthenticationToken.java diff --git a/pig-auth-service/src/main/java/com/github/pig/auth/component/mobile/MobileLoginSuccessHandler.java b/pig-auth/src/main/java/com/github/pig/auth/component/mobile/MobileLoginSuccessHandler.java similarity index 100% rename from pig-auth-service/src/main/java/com/github/pig/auth/component/mobile/MobileLoginSuccessHandler.java rename to pig-auth/src/main/java/com/github/pig/auth/component/mobile/MobileLoginSuccessHandler.java diff --git a/pig-auth-service/src/main/java/com/github/pig/auth/component/mobile/MobileSecurityConfigurer.java b/pig-auth/src/main/java/com/github/pig/auth/component/mobile/MobileSecurityConfigurer.java similarity index 100% rename from pig-auth-service/src/main/java/com/github/pig/auth/component/mobile/MobileSecurityConfigurer.java rename to pig-auth/src/main/java/com/github/pig/auth/component/mobile/MobileSecurityConfigurer.java diff --git a/pig-auth-service/src/main/java/com/github/pig/auth/config/AuthServerConfig.java b/pig-auth/src/main/java/com/github/pig/auth/config/AuthServerConfig.java similarity index 100% rename from pig-auth-service/src/main/java/com/github/pig/auth/config/AuthServerConfig.java rename to pig-auth/src/main/java/com/github/pig/auth/config/AuthServerConfig.java diff --git a/pig-auth-service/src/main/java/com/github/pig/auth/config/PigAuthorizationConfig.java b/pig-auth/src/main/java/com/github/pig/auth/config/PigAuthorizationConfig.java similarity index 100% rename from pig-auth-service/src/main/java/com/github/pig/auth/config/PigAuthorizationConfig.java rename to pig-auth/src/main/java/com/github/pig/auth/config/PigAuthorizationConfig.java diff --git a/pig-auth-service/src/main/java/com/github/pig/auth/config/ResourceServerConfiguration.java b/pig-auth/src/main/java/com/github/pig/auth/config/ResourceServerConfiguration.java similarity index 100% rename from pig-auth-service/src/main/java/com/github/pig/auth/config/ResourceServerConfiguration.java rename to pig-auth/src/main/java/com/github/pig/auth/config/ResourceServerConfiguration.java diff --git a/pig-auth-service/src/main/java/com/github/pig/auth/controller/UserController.java b/pig-auth/src/main/java/com/github/pig/auth/controller/UserController.java similarity index 100% rename from pig-auth-service/src/main/java/com/github/pig/auth/controller/UserController.java rename to pig-auth/src/main/java/com/github/pig/auth/controller/UserController.java diff --git a/pig-auth-service/src/main/java/com/github/pig/auth/feign/UserService.java b/pig-auth/src/main/java/com/github/pig/auth/feign/UserService.java similarity index 91% rename from pig-auth-service/src/main/java/com/github/pig/auth/feign/UserService.java rename to pig-auth/src/main/java/com/github/pig/auth/feign/UserService.java index e440527f..c80f1e14 100644 --- a/pig-auth-service/src/main/java/com/github/pig/auth/feign/UserService.java +++ b/pig-auth/src/main/java/com/github/pig/auth/feign/UserService.java @@ -10,7 +10,7 @@ import org.springframework.web.bind.annotation.PathVariable; * @author lengleng * @date 2017/10/31 */ -@FeignClient(name = "pig-admin-service", fallback = UserServiceFallbackImpl.class) +@FeignClient(name = "pig-upms-service", fallback = UserServiceFallbackImpl.class) public interface UserService { /** * 通过用户名查询用户、角色信息 diff --git a/pig-auth-service/src/main/java/com/github/pig/auth/feign/fallback/UserServiceFallbackImpl.java b/pig-auth/src/main/java/com/github/pig/auth/feign/fallback/UserServiceFallbackImpl.java similarity index 100% rename from pig-auth-service/src/main/java/com/github/pig/auth/feign/fallback/UserServiceFallbackImpl.java rename to pig-auth/src/main/java/com/github/pig/auth/feign/fallback/UserServiceFallbackImpl.java diff --git a/pig-auth-service/src/main/java/com/github/pig/auth/serivce/UserDetailServiceImpl.java b/pig-auth/src/main/java/com/github/pig/auth/serivce/UserDetailServiceImpl.java similarity index 100% rename from pig-auth-service/src/main/java/com/github/pig/auth/serivce/UserDetailServiceImpl.java rename to pig-auth/src/main/java/com/github/pig/auth/serivce/UserDetailServiceImpl.java diff --git a/pig-auth-service/src/main/java/com/github/pig/auth/util/MobileAuthenticationToken.java b/pig-auth/src/main/java/com/github/pig/auth/util/MobileAuthenticationToken.java similarity index 100% rename from pig-auth-service/src/main/java/com/github/pig/auth/util/MobileAuthenticationToken.java rename to pig-auth/src/main/java/com/github/pig/auth/util/MobileAuthenticationToken.java diff --git a/pig-auth-service/src/main/java/com/github/pig/auth/util/UserDetailsImpl.java b/pig-auth/src/main/java/com/github/pig/auth/util/UserDetailsImpl.java similarity index 100% rename from pig-auth-service/src/main/java/com/github/pig/auth/util/UserDetailsImpl.java rename to pig-auth/src/main/java/com/github/pig/auth/util/UserDetailsImpl.java diff --git a/pig-auth-service/src/main/resources/bootstrap.yml b/pig-auth/src/main/resources/bootstrap.yml similarity index 95% rename from pig-auth-service/src/main/resources/bootstrap.yml rename to pig-auth/src/main/resources/bootstrap.yml index 884af322..d9111f47 100644 --- a/pig-auth-service/src/main/resources/bootstrap.yml +++ b/pig-auth/src/main/resources/bootstrap.yml @@ -1,6 +1,6 @@ spring: application: - name: pig-auth-service + name: pig-auth profiles: active: dev cloud: diff --git a/pig-auth-service/src/main/resources/logback.xml b/pig-auth/src/main/resources/logback.xml similarity index 100% rename from pig-auth-service/src/main/resources/logback.xml rename to pig-auth/src/main/resources/logback.xml diff --git a/pig-config/src/main/resources/application.yml b/pig-config/src/main/resources/application.yml index b6f4fe88..23f3f45d 100644 --- a/pig-config/src/main/resources/application.yml +++ b/pig-config/src/main/resources/application.yml @@ -10,7 +10,7 @@ spring: config: server: git: - uri: https://gitee.com/cqzqxq_lxh/pig-config.git + uri: https://gitee.com/boding1/pig-config.git --- spring: profiles: dev diff --git a/pig-gateway/src/main/java/com/github/pig/gateway/feign/MenuService.java b/pig-gateway/src/main/java/com/github/pig/gateway/feign/MenuService.java index 272269f3..9b0f09ca 100644 --- a/pig-gateway/src/main/java/com/github/pig/gateway/feign/MenuService.java +++ b/pig-gateway/src/main/java/com/github/pig/gateway/feign/MenuService.java @@ -12,7 +12,7 @@ import java.util.Set; * @author lengleng * @date 2017/10/31 */ -@FeignClient(name = "pig-admin-service", fallback = MenuServiceFallbackImpl.class) +@FeignClient(name = "pig-upms-service", fallback = MenuServiceFallbackImpl.class) public interface MenuService { /** * 通过角色名查询菜单 diff --git a/pig-gateway/src/main/java/com/github/pig/gateway/feign/UserService.java b/pig-gateway/src/main/java/com/github/pig/gateway/feign/UserService.java index 43d654ae..27e5e074 100644 --- a/pig-gateway/src/main/java/com/github/pig/gateway/feign/UserService.java +++ b/pig-gateway/src/main/java/com/github/pig/gateway/feign/UserService.java @@ -10,7 +10,7 @@ import org.springframework.web.bind.annotation.PathVariable; * @author lengleng * @date 2017/10/31 */ -@FeignClient(name = "pig-admin-service", fallback = UserServiceFallbackImpl.class) +@FeignClient(name = "pig-upms-service", fallback = UserServiceFallbackImpl.class) public interface UserService { /** * 通过用户名查询用户、角色信息 diff --git a/pig-admin-service/pom.xml b/pig-modules/pig-upms-service/pom.xml similarity index 91% rename from pig-admin-service/pom.xml rename to pig-modules/pig-upms-service/pom.xml index aceb0dd8..8e64b71c 100644 --- a/pig-admin-service/pom.xml +++ b/pig-modules/pig-upms-service/pom.xml @@ -4,16 +4,16 @@ 4.0.0 com.github.pig - pig-admin-service + pig-upms-service ${pig.version} jar - pig-admin-service - pig-admin-service + pig-upms-service + pig-upms-service - com.github - pig + com.github.pig + pig-modules ${pig.version} diff --git a/pig-admin-service/src/main/java/com/github/pig/admin/PigAdminApplication.java b/pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/PigAdminApplication.java similarity index 100% rename from pig-admin-service/src/main/java/com/github/pig/admin/PigAdminApplication.java rename to pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/PigAdminApplication.java diff --git a/pig-admin-service/src/main/java/com/github/pig/admin/common/config/KaptchaConfig.java b/pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/common/config/KaptchaConfig.java similarity index 100% rename from pig-admin-service/src/main/java/com/github/pig/admin/common/config/KaptchaConfig.java rename to pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/common/config/KaptchaConfig.java diff --git a/pig-admin-service/src/main/java/com/github/pig/admin/common/config/MybatisPlusConfig.java b/pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/common/config/MybatisPlusConfig.java similarity index 100% rename from pig-admin-service/src/main/java/com/github/pig/admin/common/config/MybatisPlusConfig.java rename to pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/common/config/MybatisPlusConfig.java diff --git a/pig-admin-service/src/main/java/com/github/pig/admin/common/config/RabbitConfig.java b/pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/common/config/RabbitConfig.java similarity index 100% rename from pig-admin-service/src/main/java/com/github/pig/admin/common/config/RabbitConfig.java rename to pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/common/config/RabbitConfig.java diff --git a/pig-admin-service/src/main/java/com/github/pig/admin/common/listener/LogReceiveListener.java b/pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/common/listener/LogReceiveListener.java similarity index 100% rename from pig-admin-service/src/main/java/com/github/pig/admin/common/listener/LogReceiveListener.java rename to pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/common/listener/LogReceiveListener.java diff --git a/pig-admin-service/src/main/java/com/github/pig/admin/common/util/PigResourcesGenerator.java b/pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/common/util/PigResourcesGenerator.java similarity index 100% rename from pig-admin-service/src/main/java/com/github/pig/admin/common/util/PigResourcesGenerator.java rename to pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/common/util/PigResourcesGenerator.java diff --git a/pig-admin-service/src/main/java/com/github/pig/admin/common/util/TreeUtil.java b/pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/common/util/TreeUtil.java similarity index 100% rename from pig-admin-service/src/main/java/com/github/pig/admin/common/util/TreeUtil.java rename to pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/common/util/TreeUtil.java diff --git a/pig-admin-service/src/main/java/com/github/pig/admin/controller/DictController.java b/pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/controller/DictController.java similarity index 100% rename from pig-admin-service/src/main/java/com/github/pig/admin/controller/DictController.java rename to pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/controller/DictController.java diff --git a/pig-admin-service/src/main/java/com/github/pig/admin/controller/LogController.java b/pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/controller/LogController.java similarity index 100% rename from pig-admin-service/src/main/java/com/github/pig/admin/controller/LogController.java rename to pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/controller/LogController.java diff --git a/pig-admin-service/src/main/java/com/github/pig/admin/controller/MenuController.java b/pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/controller/MenuController.java similarity index 100% rename from pig-admin-service/src/main/java/com/github/pig/admin/controller/MenuController.java rename to pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/controller/MenuController.java diff --git a/pig-admin-service/src/main/java/com/github/pig/admin/controller/RoleController.java b/pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/controller/RoleController.java similarity index 100% rename from pig-admin-service/src/main/java/com/github/pig/admin/controller/RoleController.java rename to pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/controller/RoleController.java diff --git a/pig-admin-service/src/main/java/com/github/pig/admin/controller/UserController.java b/pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/controller/UserController.java similarity index 100% rename from pig-admin-service/src/main/java/com/github/pig/admin/controller/UserController.java rename to pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/controller/UserController.java diff --git a/pig-admin-service/src/main/java/com/github/pig/admin/controller/ValidateCodeController.java b/pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/controller/ValidateCodeController.java similarity index 100% rename from pig-admin-service/src/main/java/com/github/pig/admin/controller/ValidateCodeController.java rename to pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/controller/ValidateCodeController.java diff --git a/pig-admin-service/src/main/java/com/github/pig/admin/dto/MenuTree.java b/pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/dto/MenuTree.java similarity index 100% rename from pig-admin-service/src/main/java/com/github/pig/admin/dto/MenuTree.java rename to pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/dto/MenuTree.java diff --git a/pig-admin-service/src/main/java/com/github/pig/admin/dto/RouteConfig.java b/pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/dto/RouteConfig.java similarity index 100% rename from pig-admin-service/src/main/java/com/github/pig/admin/dto/RouteConfig.java rename to pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/dto/RouteConfig.java diff --git a/pig-admin-service/src/main/java/com/github/pig/admin/dto/TreeNode.java b/pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/dto/TreeNode.java similarity index 100% rename from pig-admin-service/src/main/java/com/github/pig/admin/dto/TreeNode.java rename to pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/dto/TreeNode.java diff --git a/pig-admin-service/src/main/java/com/github/pig/admin/dto/UserDto.java b/pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/dto/UserDto.java similarity index 100% rename from pig-admin-service/src/main/java/com/github/pig/admin/dto/UserDto.java rename to pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/dto/UserDto.java diff --git a/pig-admin-service/src/main/java/com/github/pig/admin/dto/UserInfo.java b/pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/dto/UserInfo.java similarity index 100% rename from pig-admin-service/src/main/java/com/github/pig/admin/dto/UserInfo.java rename to pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/dto/UserInfo.java diff --git a/pig-admin-service/src/main/java/com/github/pig/admin/entity/SysDict.java b/pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/entity/SysDict.java similarity index 100% rename from pig-admin-service/src/main/java/com/github/pig/admin/entity/SysDict.java rename to pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/entity/SysDict.java diff --git a/pig-admin-service/src/main/java/com/github/pig/admin/entity/SysMenu.java b/pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/entity/SysMenu.java similarity index 100% rename from pig-admin-service/src/main/java/com/github/pig/admin/entity/SysMenu.java rename to pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/entity/SysMenu.java diff --git a/pig-admin-service/src/main/java/com/github/pig/admin/entity/SysRole.java b/pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/entity/SysRole.java similarity index 100% rename from pig-admin-service/src/main/java/com/github/pig/admin/entity/SysRole.java rename to pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/entity/SysRole.java diff --git a/pig-admin-service/src/main/java/com/github/pig/admin/entity/SysRoleMenu.java b/pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/entity/SysRoleMenu.java similarity index 100% rename from pig-admin-service/src/main/java/com/github/pig/admin/entity/SysRoleMenu.java rename to pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/entity/SysRoleMenu.java diff --git a/pig-admin-service/src/main/java/com/github/pig/admin/entity/SysUser.java b/pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/entity/SysUser.java similarity index 100% rename from pig-admin-service/src/main/java/com/github/pig/admin/entity/SysUser.java rename to pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/entity/SysUser.java diff --git a/pig-admin-service/src/main/java/com/github/pig/admin/entity/SysUserRole.java b/pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/entity/SysUserRole.java similarity index 100% rename from pig-admin-service/src/main/java/com/github/pig/admin/entity/SysUserRole.java rename to pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/entity/SysUserRole.java diff --git a/pig-admin-service/src/main/java/com/github/pig/admin/mapper/SysDictMapper.java b/pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/mapper/SysDictMapper.java similarity index 100% rename from pig-admin-service/src/main/java/com/github/pig/admin/mapper/SysDictMapper.java rename to pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/mapper/SysDictMapper.java diff --git a/pig-admin-service/src/main/java/com/github/pig/admin/mapper/SysLogMapper.java b/pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/mapper/SysLogMapper.java similarity index 100% rename from pig-admin-service/src/main/java/com/github/pig/admin/mapper/SysLogMapper.java rename to pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/mapper/SysLogMapper.java diff --git a/pig-admin-service/src/main/java/com/github/pig/admin/mapper/SysMenuMapper.java b/pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/mapper/SysMenuMapper.java similarity index 100% rename from pig-admin-service/src/main/java/com/github/pig/admin/mapper/SysMenuMapper.java rename to pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/mapper/SysMenuMapper.java diff --git a/pig-admin-service/src/main/java/com/github/pig/admin/mapper/SysRoleMapper.java b/pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/mapper/SysRoleMapper.java similarity index 100% rename from pig-admin-service/src/main/java/com/github/pig/admin/mapper/SysRoleMapper.java rename to pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/mapper/SysRoleMapper.java diff --git a/pig-admin-service/src/main/java/com/github/pig/admin/mapper/SysRoleMenuMapper.java b/pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/mapper/SysRoleMenuMapper.java similarity index 100% rename from pig-admin-service/src/main/java/com/github/pig/admin/mapper/SysRoleMenuMapper.java rename to pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/mapper/SysRoleMenuMapper.java diff --git a/pig-admin-service/src/main/java/com/github/pig/admin/mapper/SysUserMapper.java b/pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/mapper/SysUserMapper.java similarity index 100% rename from pig-admin-service/src/main/java/com/github/pig/admin/mapper/SysUserMapper.java rename to pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/mapper/SysUserMapper.java diff --git a/pig-admin-service/src/main/java/com/github/pig/admin/mapper/SysUserRoleMapper.java b/pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/mapper/SysUserRoleMapper.java similarity index 100% rename from pig-admin-service/src/main/java/com/github/pig/admin/mapper/SysUserRoleMapper.java rename to pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/mapper/SysUserRoleMapper.java diff --git a/pig-admin-service/src/main/java/com/github/pig/admin/service/SysDictService.java b/pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/service/SysDictService.java similarity index 100% rename from pig-admin-service/src/main/java/com/github/pig/admin/service/SysDictService.java rename to pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/service/SysDictService.java diff --git a/pig-admin-service/src/main/java/com/github/pig/admin/service/SysLogService.java b/pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/service/SysLogService.java similarity index 100% rename from pig-admin-service/src/main/java/com/github/pig/admin/service/SysLogService.java rename to pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/service/SysLogService.java diff --git a/pig-admin-service/src/main/java/com/github/pig/admin/service/SysMenuService.java b/pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/service/SysMenuService.java similarity index 100% rename from pig-admin-service/src/main/java/com/github/pig/admin/service/SysMenuService.java rename to pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/service/SysMenuService.java diff --git a/pig-admin-service/src/main/java/com/github/pig/admin/service/SysRoleMenuService.java b/pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/service/SysRoleMenuService.java similarity index 100% rename from pig-admin-service/src/main/java/com/github/pig/admin/service/SysRoleMenuService.java rename to pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/service/SysRoleMenuService.java diff --git a/pig-admin-service/src/main/java/com/github/pig/admin/service/SysRoleService.java b/pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/service/SysRoleService.java similarity index 100% rename from pig-admin-service/src/main/java/com/github/pig/admin/service/SysRoleService.java rename to pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/service/SysRoleService.java diff --git a/pig-admin-service/src/main/java/com/github/pig/admin/service/SysUserRoleService.java b/pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/service/SysUserRoleService.java similarity index 100% rename from pig-admin-service/src/main/java/com/github/pig/admin/service/SysUserRoleService.java rename to pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/service/SysUserRoleService.java diff --git a/pig-admin-service/src/main/java/com/github/pig/admin/service/UserService.java b/pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/service/UserService.java similarity index 100% rename from pig-admin-service/src/main/java/com/github/pig/admin/service/UserService.java rename to pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/service/UserService.java diff --git a/pig-admin-service/src/main/java/com/github/pig/admin/service/impl/SysDictServiceImpl.java b/pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/service/impl/SysDictServiceImpl.java similarity index 100% rename from pig-admin-service/src/main/java/com/github/pig/admin/service/impl/SysDictServiceImpl.java rename to pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/service/impl/SysDictServiceImpl.java diff --git a/pig-admin-service/src/main/java/com/github/pig/admin/service/impl/SysLogServiceImpl.java b/pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/service/impl/SysLogServiceImpl.java similarity index 100% rename from pig-admin-service/src/main/java/com/github/pig/admin/service/impl/SysLogServiceImpl.java rename to pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/service/impl/SysLogServiceImpl.java diff --git a/pig-admin-service/src/main/java/com/github/pig/admin/service/impl/SysMenuServiceImpl.java b/pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/service/impl/SysMenuServiceImpl.java similarity index 100% rename from pig-admin-service/src/main/java/com/github/pig/admin/service/impl/SysMenuServiceImpl.java rename to pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/service/impl/SysMenuServiceImpl.java diff --git a/pig-admin-service/src/main/java/com/github/pig/admin/service/impl/SysRoleMenuServiceImpl.java b/pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/service/impl/SysRoleMenuServiceImpl.java similarity index 100% rename from pig-admin-service/src/main/java/com/github/pig/admin/service/impl/SysRoleMenuServiceImpl.java rename to pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/service/impl/SysRoleMenuServiceImpl.java diff --git a/pig-admin-service/src/main/java/com/github/pig/admin/service/impl/SysRoleServiceImpl.java b/pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/service/impl/SysRoleServiceImpl.java similarity index 100% rename from pig-admin-service/src/main/java/com/github/pig/admin/service/impl/SysRoleServiceImpl.java rename to pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/service/impl/SysRoleServiceImpl.java diff --git a/pig-admin-service/src/main/java/com/github/pig/admin/service/impl/SysUserRoleServiceImpl.java b/pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/service/impl/SysUserRoleServiceImpl.java similarity index 100% rename from pig-admin-service/src/main/java/com/github/pig/admin/service/impl/SysUserRoleServiceImpl.java rename to pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/service/impl/SysUserRoleServiceImpl.java diff --git a/pig-admin-service/src/main/java/com/github/pig/admin/service/impl/UserServiceImpl.java b/pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/service/impl/UserServiceImpl.java similarity index 100% rename from pig-admin-service/src/main/java/com/github/pig/admin/service/impl/UserServiceImpl.java rename to pig-modules/pig-upms-service/src/main/java/com/github/pig/admin/service/impl/UserServiceImpl.java diff --git a/pig-admin-service/src/main/resources/bootstrap.yml b/pig-modules/pig-upms-service/src/main/resources/bootstrap.yml similarity index 95% rename from pig-admin-service/src/main/resources/bootstrap.yml rename to pig-modules/pig-upms-service/src/main/resources/bootstrap.yml index 9d5bd184..1ae7e9f8 100644 --- a/pig-admin-service/src/main/resources/bootstrap.yml +++ b/pig-modules/pig-upms-service/src/main/resources/bootstrap.yml @@ -1,6 +1,6 @@ spring: application: - name: pig-admin-service + name: pig-upms-service profiles: active: dev cloud: diff --git a/pig-admin-service/src/main/resources/logback.xml b/pig-modules/pig-upms-service/src/main/resources/logback.xml similarity index 100% rename from pig-admin-service/src/main/resources/logback.xml rename to pig-modules/pig-upms-service/src/main/resources/logback.xml diff --git a/pig-admin-service/src/main/resources/mapper/SysDictMapper.xml b/pig-modules/pig-upms-service/src/main/resources/mapper/SysDictMapper.xml similarity index 100% rename from pig-admin-service/src/main/resources/mapper/SysDictMapper.xml rename to pig-modules/pig-upms-service/src/main/resources/mapper/SysDictMapper.xml diff --git a/pig-admin-service/src/main/resources/mapper/SysLogMapper.xml b/pig-modules/pig-upms-service/src/main/resources/mapper/SysLogMapper.xml similarity index 100% rename from pig-admin-service/src/main/resources/mapper/SysLogMapper.xml rename to pig-modules/pig-upms-service/src/main/resources/mapper/SysLogMapper.xml diff --git a/pig-admin-service/src/main/resources/mapper/SysMenuMapper.xml b/pig-modules/pig-upms-service/src/main/resources/mapper/SysMenuMapper.xml similarity index 100% rename from pig-admin-service/src/main/resources/mapper/SysMenuMapper.xml rename to pig-modules/pig-upms-service/src/main/resources/mapper/SysMenuMapper.xml diff --git a/pig-admin-service/src/main/resources/mapper/SysRoleMapper.xml b/pig-modules/pig-upms-service/src/main/resources/mapper/SysRoleMapper.xml similarity index 100% rename from pig-admin-service/src/main/resources/mapper/SysRoleMapper.xml rename to pig-modules/pig-upms-service/src/main/resources/mapper/SysRoleMapper.xml diff --git a/pig-admin-service/src/main/resources/mapper/SysRoleMenuMapper.xml b/pig-modules/pig-upms-service/src/main/resources/mapper/SysRoleMenuMapper.xml similarity index 100% rename from pig-admin-service/src/main/resources/mapper/SysRoleMenuMapper.xml rename to pig-modules/pig-upms-service/src/main/resources/mapper/SysRoleMenuMapper.xml diff --git a/pig-admin-service/src/main/resources/mapper/SysUserMapper.xml b/pig-modules/pig-upms-service/src/main/resources/mapper/SysUserMapper.xml similarity index 100% rename from pig-admin-service/src/main/resources/mapper/SysUserMapper.xml rename to pig-modules/pig-upms-service/src/main/resources/mapper/SysUserMapper.xml diff --git a/pig-admin-service/src/main/resources/mapper/SysUserRoleMapper.xml b/pig-modules/pig-upms-service/src/main/resources/mapper/SysUserRoleMapper.xml similarity index 100% rename from pig-admin-service/src/main/resources/mapper/SysUserRoleMapper.xml rename to pig-modules/pig-upms-service/src/main/resources/mapper/SysUserRoleMapper.xml diff --git a/pig-admin-service/src/main/resources/templates/controller.java.vm b/pig-modules/pig-upms-service/src/main/resources/templates/controller.java.vm similarity index 100% rename from pig-admin-service/src/main/resources/templates/controller.java.vm rename to pig-modules/pig-upms-service/src/main/resources/templates/controller.java.vm diff --git a/pig-admin-service/src/main/resources/templates/listvue.vue.vm b/pig-modules/pig-upms-service/src/main/resources/templates/listvue.vue.vm similarity index 100% rename from pig-admin-service/src/main/resources/templates/listvue.vue.vm rename to pig-modules/pig-upms-service/src/main/resources/templates/listvue.vue.vm diff --git a/pig-admin-service/src/main/resources/templates/menu.sql.vm b/pig-modules/pig-upms-service/src/main/resources/templates/menu.sql.vm similarity index 100% rename from pig-admin-service/src/main/resources/templates/menu.sql.vm rename to pig-modules/pig-upms-service/src/main/resources/templates/menu.sql.vm diff --git a/pig-admin-service/src/test/java/PigAdminApplicationTest.java b/pig-modules/pig-upms-service/src/test/java/PigAdminApplicationTest.java similarity index 100% rename from pig-admin-service/src/test/java/PigAdminApplicationTest.java rename to pig-modules/pig-upms-service/src/test/java/PigAdminApplicationTest.java diff --git a/pig-admin-service/src/test/java/com/github/pig/admin/controller/UserControllerTest.java b/pig-modules/pig-upms-service/src/test/java/com/github/pig/admin/controller/UserControllerTest.java similarity index 98% rename from pig-admin-service/src/test/java/com/github/pig/admin/controller/UserControllerTest.java rename to pig-modules/pig-upms-service/src/test/java/com/github/pig/admin/controller/UserControllerTest.java index 7cdd5de7..7b8ef706 100644 --- a/pig-admin-service/src/test/java/com/github/pig/admin/controller/UserControllerTest.java +++ b/pig-modules/pig-upms-service/src/test/java/com/github/pig/admin/controller/UserControllerTest.java @@ -2,7 +2,6 @@ package com.github.pig.admin.controller; import com.github.pig.admin.dto.UserDto; import com.xiaoleilu.hutool.http.HttpUtil; -import com.xiaoleilu.hutool.json.JSON; import com.xiaoleilu.hutool.json.JSONUtil; import org.apache.commons.collections.MapUtils; import org.junit.Before; diff --git a/pig-modules/pom.xml b/pig-modules/pom.xml new file mode 100644 index 00000000..3557e318 --- /dev/null +++ b/pig-modules/pom.xml @@ -0,0 +1,26 @@ + + + pig + com.github + ${pig.version} + + 4.0.0 + + com.github.pig + pig-modules + ${pig.version} + pom + + pig-modules + http://maven.apache.org + + + UTF-8 + + + + pig-upms-service + + + diff --git a/pom.xml b/pom.xml index 7e529913..3aac0dca 100644 --- a/pom.xml +++ b/pom.xml @@ -45,13 +45,13 @@ + pig-auth + pig-config pig-common pig-eureka - pig-config - pig-visual pig-gateway - pig-auth-service - pig-admin-service + pig-modules + pig-visual From aba17c7d82387b51e7974e1df6c07b654c64e4bd Mon Sep 17 00:00:00 2001 From: "wangiegie@gmail.com" Date: Sun, 14 Jan 2018 23:12:11 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=9B=AE=E5=BD=95?= =?UTF-8?q?=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pig-config/src/main/resources/application.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pig-config/src/main/resources/application.yml b/pig-config/src/main/resources/application.yml index 23f3f45d..b6f4fe88 100644 --- a/pig-config/src/main/resources/application.yml +++ b/pig-config/src/main/resources/application.yml @@ -10,7 +10,7 @@ spring: config: server: git: - uri: https://gitee.com/boding1/pig-config.git + uri: https://gitee.com/cqzqxq_lxh/pig-config.git --- spring: profiles: dev