zhoutaoo · JoeseaLea · Jun 6, 2020 · Jun 6, 2020 · Jun 6, 2020 · Jun 6, 2020
diff --git a/.gitignore b/.gitignore
@@ -5,3 +5,9 @@ data
 logs
 target
 
+.settings/
+
+.classpath
+.project
+.factorypath
+
diff --git a/auth/pom.xml b/auth/pom.xml
diff --git a/auth/authentication-client/.gitignore → base-authclient/.gitignore b/auth/authentication-client/.gitignore → base-authclient/.gitignore
diff --git a/auth/authentication-client/pom.xml → base-authclient/pom.xml b/auth/authentication-client/pom.xml → base-authclient/pom.xml
@@ -34,7 +34,7 @@
             <dependency>
                 <groupId>org.springframework.cloud</groupId>
                 <artifactId>spring-cloud-openfeign</artifactId>
-                <version>2.0.0.RC2</version>
+                <version>2.1.0.RELEASE</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -55,12 +55,6 @@
             <groupId>io.github.openfeign</groupId>
             <artifactId>feign-okhttp</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-            <version>RELEASE</version>
-            <scope>provided</scope>
-        </dependency>
         <!--oauth2认证-->
         <dependency>
             <groupId>io.jsonwebtoken</groupId>
@@ -79,5 +73,12 @@
             <artifactId>mockito-core</artifactId>
             <version>1.10.19</version>
         </dependency>
+        <!--使用 lombok 简化 Java 代码-->
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>1.18.10</version>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
 </project>
diff --git a/...auth/client/config/FeignOkHttpConfig.java → ...auth/client/config/FeignOkHttpConfig.java b/...auth/client/config/FeignOkHttpConfig.java → ...auth/client/config/FeignOkHttpConfig.java
diff --git a/...ud/auth/client/provider/AuthProvider.java → ...ud/auth/client/provider/AuthProvider.java b/...ud/auth/client/provider/AuthProvider.java → ...ud/auth/client/provider/AuthProvider.java
diff --git a/...oud/auth/client/service/IAuthService.java → ...oud/auth/client/service/IAuthService.java b/...oud/auth/client/service/IAuthService.java → ...oud/auth/client/service/IAuthService.java
diff --git a/...auth/client/service/impl/AuthService.java → ...auth/client/service/impl/AuthService.java b/...auth/client/service/impl/AuthService.java → ...auth/client/service/impl/AuthService.java
diff --git a/...client/src/main/resources/application.yml → ...client/src/main/resources/application.yml b/...client/src/main/resources/application.yml → ...client/src/main/resources/application.yml
diff --git a/.../client/service/impl/AuthServiceTest.java → .../client/service/impl/AuthServiceTest.java b/.../client/service/impl/AuthServiceTest.java → .../client/service/impl/AuthServiceTest.java
diff --git a/auth/authentication-server/.gitignore → base-authentication/.gitignore b/auth/authentication-server/.gitignore → base-authentication/.gitignore
diff --git a/auth/authentication-server/pom.xml → base-authentication/pom.xml b/auth/authentication-server/pom.xml → base-authentication/pom.xml
@@ -13,7 +13,7 @@
 
     <parent>
         <groupId>com.springboot.cloud</groupId>
-        <artifactId>auth</artifactId>
+        <artifactId>cloud</artifactId>
         <version>0.0.1-SNAPSHOT</version>
     </parent>
 
@@ -24,18 +24,49 @@
             <version>0.0.1-SNAPSHOT</version>
         </dependency>
         <!--oauth2认证-->
+        <dependency>
+            <groupId>org.springframework.security.oauth</groupId>
+            <artifactId>spring-security-oauth2</artifactId>
+            <version>[2.2.4,)</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.security</groupId>
+            <artifactId>spring-security-jwt</artifactId>
+            <version>RELEASE</version>
+        </dependency>
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-security</artifactId>
         </dependency>
-        <!--Swagger2 - RESTful API文档-->
         <dependency>
-            <groupId>io.springfox</groupId>
-            <artifactId>springfox-swagger2</artifactId>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-openfeign</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+        <!--mybatis依赖包-->
+        <dependency>
+            <groupId>org.mybatis.spring.boot</groupId>
+            <artifactId>mybatis-spring-boot-starter</artifactId>
+            <version>1.3.2</version>
+        </dependency>
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>druid-spring-boot-starter</artifactId>
+            <version>1.1.9</version>
+        </dependency>
+        <!--数据库-->
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+            <version>8.0.18</version>
         </dependency>
+        <!--Redis缓存-->
         <dependency>
-            <groupId>io.springfox</groupId>
-            <artifactId>springfox-swagger-ui</artifactId>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-redis</artifactId>
         </dependency>
         <!--jetcache缓存 -->
         <dependency>

diff --git a/auth/authentication-server/readme.md → base-authentication/readme.md b/auth/authentication-server/readme.md → base-authentication/readme.md
diff --git a/...ication-server/src/main/docker/Dockerfile → ...authentication/src/main/docker/Dockerfile b/...ication-server/src/main/docker/Dockerfile → ...authentication/src/main/docker/Dockerfile
diff --git a/...tion/Oauth2AuthenticationApplication.java → ...tion/Oauth2AuthenticationApplication.java b/...tion/Oauth2AuthenticationApplication.java → ...tion/Oauth2AuthenticationApplication.java
diff --git a/...auth/authentication/config/BusConfig.java → ...auth/authentication/config/BusConfig.java b/...auth/authentication/config/BusConfig.java → ...auth/authentication/config/BusConfig.java
diff --git a/...entication/config/LoadResourceDefine.java → ...entication/config/LoadResourceDefine.java b/...entication/config/LoadResourceDefine.java → ...entication/config/LoadResourceDefine.java
diff --git a/...tication/config/ResourceServerConfig.java → ...tication/config/ResourceServerConfig.java b/...tication/config/ResourceServerConfig.java → ...tication/config/ResourceServerConfig.java
diff --git a/...th/authentication/events/BusReceiver.java → ...th/authentication/events/BusReceiver.java b/...th/authentication/events/BusReceiver.java → ...th/authentication/events/BusReceiver.java
diff --git a/...entication/provider/ResourceProvider.java → ...entication/provider/ResourceProvider.java b/...entication/provider/ResourceProvider.java → ...entication/provider/ResourceProvider.java
diff --git a/...on/provider/ResourceProviderFallback.java → ...on/provider/ResourceProviderFallback.java b/...on/provider/ResourceProviderFallback.java → ...on/provider/ResourceProviderFallback.java
diff --git a/...cation/rest/AuthenticationController.java → ...cation/rest/AuthenticationController.java b/...cation/rest/AuthenticationController.java → ...cation/rest/AuthenticationController.java
diff --git a/...n/rest/HttpServletRequestAuthWrapper.java → ...n/rest/HttpServletRequestAuthWrapper.java b/...n/rest/HttpServletRequestAuthWrapper.java → ...n/rest/HttpServletRequestAuthWrapper.java
diff --git a/...ation/service/IAuthenticationService.java → ...ation/service/IAuthenticationService.java b/...ation/service/IAuthenticationService.java → ...ation/service/IAuthenticationService.java
diff --git a/...hentication/service/IResourceService.java → ...hentication/service/IResourceService.java b/...hentication/service/IResourceService.java → ...hentication/service/IResourceService.java
diff --git a/...ication/service/NewMvcRequestMatcher.java → ...ication/service/NewMvcRequestMatcher.java b/...ication/service/NewMvcRequestMatcher.java → ...ication/service/NewMvcRequestMatcher.java
diff --git a/...n/service/impl/AuthenticationService.java → ...n/service/impl/AuthenticationService.java b/...n/service/impl/AuthenticationService.java → ...n/service/impl/AuthenticationService.java
diff --git a/...ication/service/impl/ResourceService.java → ...ication/service/impl/ResourceService.java b/...ication/service/impl/ResourceService.java → ...ication/service/impl/ResourceService.java
diff --git a/...dmin/organization/entity/po/Resource.java → ...dmin/organization/entity/po/Resource.java b/...dmin/organization/entity/po/Resource.java → ...dmin/organization/entity/po/Resource.java
diff --git a/...server/src/main/resources/application.yml → ...cation/src/main/resources/application.yml b/...server/src/main/resources/application.yml → ...cation/src/main/resources/application.yml
diff --git a/...n-server/src/main/resources/bootstrap.yml → ...tication/src/main/resources/bootstrap.yml b/...n-server/src/main/resources/bootstrap.yml → ...tication/src/main/resources/bootstrap.yml
diff --git a/...auth/authentication/ApplicationTests.java → ...auth/authentication/ApplicationTests.java b/...auth/authentication/ApplicationTests.java → ...auth/authentication/ApplicationTests.java
diff --git a/...rvice/impl/AuthenticationServiceTest.java → ...rvice/impl/AuthenticationServiceTest.java b/...rvice/impl/AuthenticationServiceTest.java → ...rvice/impl/AuthenticationServiceTest.java
diff --git a/...ion/service/impl/ResourceServiceTest.java → ...ion/service/impl/ResourceServiceTest.java b/...ion/service/impl/ResourceServiceTest.java → ...ion/service/impl/ResourceServiceTest.java
diff --git a/...server/src/test/resources/application.yml → ...cation/src/test/resources/application.yml b/...server/src/test/resources/application.yml → ...cation/src/test/resources/application.yml
diff --git a/auth/authorization-server/.gitignore → base-authorization/.gitignore b/auth/authorization-server/.gitignore → base-authorization/.gitignore
diff --git a/auth/authorization-server/pom.xml → base-authorization/pom.xml b/auth/authorization-server/pom.xml → base-authorization/pom.xml
@@ -13,7 +13,7 @@
 
     <parent>
         <groupId>com.springboot.cloud</groupId>
-        <artifactId>auth</artifactId>
+        <artifactId>cloud</artifactId>
         <version>0.0.1-SNAPSHOT</version>
     </parent>
 
@@ -24,10 +24,50 @@
             <version>0.0.1-SNAPSHOT</version>
         </dependency>
         <!--oauth2认证-->
+        <dependency>
+            <groupId>org.springframework.security.oauth</groupId>
+            <artifactId>spring-security-oauth2</artifactId>
+            <version>[2.2.4,)</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.security</groupId>
+            <artifactId>spring-security-jwt</artifactId>
+            <version>RELEASE</version>
+        </dependency>
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-security</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-openfeign</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+        <!--mybatis依赖包-->
+        <dependency>
+            <groupId>org.mybatis.spring.boot</groupId>
+            <artifactId>mybatis-spring-boot-starter</artifactId>
+            <version>1.3.2</version>
+        </dependency>
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>druid-spring-boot-starter</artifactId>
+            <version>1.1.9</version>
+        </dependency>
+        <!--数据库-->
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+            <version>8.0.18</version>
+        </dependency>
+        <!--Redis缓存-->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-redis</artifactId>
+        </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>

diff --git a/auth/authorization-server/readme.md → base-authorization/readme.md b/auth/authorization-server/readme.md → base-authorization/readme.md
diff --git a/...ization-server/src/main/docker/Dockerfile → ...-authorization/src/main/docker/Dockerfile b/...ization-server/src/main/docker/Dockerfile → ...-authorization/src/main/docker/Dockerfile
diff --git a/...ation/Oauth2AuthorizationApplication.java → ...ation/Oauth2AuthorizationApplication.java b/...ation/Oauth2AuthorizationApplication.java → ...ation/Oauth2AuthorizationApplication.java
diff --git a/...ion/config/AuthorizationServerConfig.java → ...ion/config/AuthorizationServerConfig.java b/...ion/config/AuthorizationServerConfig.java → ...ion/config/AuthorizationServerConfig.java
diff --git a/...ation/config/WebServerSecurityConfig.java → ...ation/config/WebServerSecurityConfig.java b/...ation/config/WebServerSecurityConfig.java → ...ation/config/WebServerSecurityConfig.java
diff --git a/...gboot/auth/authorization/entity/Role.java → ...gboot/auth/authorization/entity/Role.java b/...gboot/auth/authorization/entity/Role.java → ...gboot/auth/authorization/entity/Role.java
diff --git a/...gboot/auth/authorization/entity/User.java → ...gboot/auth/authorization/entity/User.java b/...gboot/auth/authorization/entity/User.java → ...gboot/auth/authorization/entity/User.java
diff --git a/...uthorization/exception/AuthErrorType.java → ...uthorization/exception/AuthErrorType.java b/...uthorization/exception/AuthErrorType.java → ...uthorization/exception/AuthErrorType.java
diff --git a/...ation/exception/CustomOauthException.java → ...ation/exception/CustomOauthException.java b/...ation/exception/CustomOauthException.java → ...ation/exception/CustomOauthException.java
diff --git a/...ption/CustomOauthExceptionSerializer.java → ...ption/CustomOauthExceptionSerializer.java b/...ption/CustomOauthExceptionSerializer.java → ...ption/CustomOauthExceptionSerializer.java
diff --git a/...CustomWebResponseExceptionTranslator.java → ...CustomWebResponseExceptionTranslator.java b/...CustomWebResponseExceptionTranslator.java → ...CustomWebResponseExceptionTranslator.java
diff --git a/...ception/GlobalExceptionHandlerAdvice.java → ...ception/GlobalExceptionHandlerAdvice.java b/...ception/GlobalExceptionHandlerAdvice.java → ...ception/GlobalExceptionHandlerAdvice.java
diff --git a/...tion/oauth2/CustomUserDetailsService.java → ...tion/oauth2/CustomUserDetailsService.java b/...tion/oauth2/CustomUserDetailsService.java → ...tion/oauth2/CustomUserDetailsService.java
diff --git a/...tion/oauth2/MobileUserDetailsService.java → ...tion/oauth2/MobileUserDetailsService.java b/...tion/oauth2/MobileUserDetailsService.java → ...tion/oauth2/MobileUserDetailsService.java
diff --git a/.../oauth2/enhancer/CustomTokenEnhancer.java → .../oauth2/enhancer/CustomTokenEnhancer.java b/.../oauth2/enhancer/CustomTokenEnhancer.java → .../oauth2/enhancer/CustomTokenEnhancer.java
diff --git a/...granter/MobileAuthenticationProvider.java → ...granter/MobileAuthenticationProvider.java b/...granter/MobileAuthenticationProvider.java → ...granter/MobileAuthenticationProvider.java
diff --git a/...h2/granter/MobileAuthenticationToken.java → ...h2/granter/MobileAuthenticationToken.java b/...h2/granter/MobileAuthenticationToken.java → ...h2/granter/MobileAuthenticationToken.java
diff --git a/...on/oauth2/granter/MobileTokenGranter.java → ...on/oauth2/granter/MobileTokenGranter.java b/...on/oauth2/granter/MobileTokenGranter.java → ...on/oauth2/granter/MobileTokenGranter.java
diff --git a/...zation/provider/OrganizationProvider.java → ...zation/provider/OrganizationProvider.java b/...zation/provider/OrganizationProvider.java → ...zation/provider/OrganizationProvider.java
diff --git a/...rovider/OrganizationProviderFallback.java → ...rovider/OrganizationProviderFallback.java b/...rovider/OrganizationProviderFallback.java → ...rovider/OrganizationProviderFallback.java
diff --git a/...thorization/provider/SmsCodeProvider.java → ...thorization/provider/SmsCodeProvider.java b/...thorization/provider/SmsCodeProvider.java → ...thorization/provider/SmsCodeProvider.java
diff --git a/...ion/provider/SmsCodeProviderFallback.java → ...ion/provider/SmsCodeProviderFallback.java b/...ion/provider/SmsCodeProviderFallback.java → ...ion/provider/SmsCodeProviderFallback.java
diff --git a/...h/authorization/service/IRoleService.java → ...h/authorization/service/IRoleService.java b/...h/authorization/service/IRoleService.java → ...h/authorization/service/IRoleService.java
diff --git a/...h/authorization/service/IUserService.java → ...h/authorization/service/IUserService.java b/...h/authorization/service/IUserService.java → ...h/authorization/service/IUserService.java
diff --git a/...thorization/service/impl/RoleService.java → ...thorization/service/impl/RoleService.java b/...thorization/service/impl/RoleService.java → ...thorization/service/impl/RoleService.java
diff --git a/...thorization/service/impl/UserService.java → ...thorization/service/impl/UserService.java b/...thorization/service/impl/UserService.java → ...thorization/service/impl/UserService.java
diff --git a/...server/src/main/resources/application.yml → ...zation/src/main/resources/application.yml b/...server/src/main/resources/application.yml → ...zation/src/main/resources/application.yml
diff --git a/...n-server/src/main/resources/bootstrap.yml → ...rization/src/main/resources/bootstrap.yml b/...n-server/src/main/resources/bootstrap.yml → ...rization/src/main/resources/bootstrap.yml
diff --git a/.../auth/authorization/ApplicationTests.java → .../auth/authorization/ApplicationTests.java b/.../auth/authorization/ApplicationTests.java → .../auth/authorization/ApplicationTests.java
diff --git a/...server/src/test/resources/application.yml → ...zation/src/test/resources/application.yml b/...server/src/test/resources/application.yml → ...zation/src/test/resources/application.yml
diff --git a/sysadmin/organization/pom.xml → base-organization/pom.xml b/sysadmin/organization/pom.xml → base-organization/pom.xml
@@ -4,17 +4,18 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>organization</artifactId>
+    <artifactId>base-organization</artifactId>
     <version>0.0.1-SNAPSHOT</version>
     <packaging>jar</packaging>
 
-    <name>organization</name>
+    <name>base-organization</name>
     <description>Demo Organization project for Spring Boot</description>
 
     <parent>
-        <artifactId>sysadmin</artifactId>
+        <artifactId>webapps</artifactId>
         <groupId>com.springboot.cloud</groupId>
         <version>0.0.1-SNAPSHOT</version>
+        <relativePath>../webapps/pom.xml</relativePath>
     </parent>
 
     <dependencies>

diff --git a/sysadmin/db/db.sql → base-organization/src/main/db/db.sql b/sysadmin/db/db.sql → base-organization/src/main/db/db.sql
diff --git a/...n/organization/src/main/docker/Dockerfile → base-organization/src/main/docker/Dockerfile b/...n/organization/src/main/docker/Dockerfile → base-organization/src/main/docker/Dockerfile
diff --git a/...organization/OrganizationApplication.java → ...organization/OrganizationApplication.java b/...organization/OrganizationApplication.java → ...organization/OrganizationApplication.java
diff --git a/...sadmin/organization/config/BusConfig.java → ...sadmin/organization/config/BusConfig.java b/...sadmin/organization/config/BusConfig.java → ...sadmin/organization/config/BusConfig.java
diff --git a/...anization/config/MyMetaObjectHandler.java → ...anization/config/MyMetaObjectHandler.java b/...anization/config/MyMetaObjectHandler.java → ...anization/config/MyMetaObjectHandler.java
diff --git a/...in/organization/config/MyRedisConfig.java → ...in/organization/config/MyRedisConfig.java b/...in/organization/config/MyRedisConfig.java → ...in/organization/config/MyRedisConfig.java
diff --git a/...in/organization/config/MybatisConfig.java → ...in/organization/config/MybatisConfig.java b/...in/organization/config/MybatisConfig.java → ...in/organization/config/MybatisConfig.java
diff --git a/...in/organization/config/SwaggerConfig.java → ...in/organization/config/SwaggerConfig.java b/...in/organization/config/SwaggerConfig.java → ...in/organization/config/SwaggerConfig.java
diff --git a/...config/WebServerMvcConfigurerAdapter.java → ...config/WebServerMvcConfigurerAdapter.java b/...config/WebServerMvcConfigurerAdapter.java → ...config/WebServerMvcConfigurerAdapter.java
diff --git a/...ysadmin/organization/dao/GroupMapper.java → ...ysadmin/organization/dao/GroupMapper.java b/...ysadmin/organization/dao/GroupMapper.java → ...ysadmin/organization/dao/GroupMapper.java
diff --git a/...sysadmin/organization/dao/MenuMapper.java → ...sysadmin/organization/dao/MenuMapper.java b/...sysadmin/organization/dao/MenuMapper.java → ...sysadmin/organization/dao/MenuMapper.java
diff --git a/...dmin/organization/dao/PositionMapper.java → ...dmin/organization/dao/PositionMapper.java b/...dmin/organization/dao/PositionMapper.java → ...dmin/organization/dao/PositionMapper.java
diff --git a/...dmin/organization/dao/ResourceMapper.java → ...dmin/organization/dao/ResourceMapper.java b/...dmin/organization/dao/ResourceMapper.java → ...dmin/organization/dao/ResourceMapper.java
diff --git a/...sysadmin/organization/dao/RoleMapper.java → ...sysadmin/organization/dao/RoleMapper.java b/...sysadmin/organization/dao/RoleMapper.java → ...sysadmin/organization/dao/RoleMapper.java
diff --git a/.../organization/dao/RoleResourceMapper.java → .../organization/dao/RoleResourceMapper.java b/.../organization/dao/RoleResourceMapper.java → .../organization/dao/RoleResourceMapper.java
diff --git a/...sysadmin/organization/dao/UserMapper.java → ...sysadmin/organization/dao/UserMapper.java b/...sysadmin/organization/dao/UserMapper.java → ...sysadmin/organization/dao/UserMapper.java
diff --git a/...dmin/organization/dao/UserRoleMapper.java → ...dmin/organization/dao/UserRoleMapper.java b/...dmin/organization/dao/UserRoleMapper.java → ...dmin/organization/dao/UserRoleMapper.java
diff --git a/...n/organization/entity/form/GroupForm.java → ...n/organization/entity/form/GroupForm.java b/...n/organization/entity/form/GroupForm.java → ...n/organization/entity/form/GroupForm.java
diff --git a/...anization/entity/form/GroupQueryForm.java → ...anization/entity/form/GroupQueryForm.java b/...anization/entity/form/GroupQueryForm.java → ...anization/entity/form/GroupQueryForm.java
diff --git a/...in/organization/entity/form/MenuForm.java → ...in/organization/entity/form/MenuForm.java b/...in/organization/entity/form/MenuForm.java → ...in/organization/entity/form/MenuForm.java
diff --git a/...ganization/entity/form/MenuQueryForm.java → ...ganization/entity/form/MenuQueryForm.java b/...ganization/entity/form/MenuQueryForm.java → ...ganization/entity/form/MenuQueryForm.java
diff --git a/...rganization/entity/form/PositionForm.java → ...rganization/entity/form/PositionForm.java b/...rganization/entity/form/PositionForm.java → ...rganization/entity/form/PositionForm.java
diff --git a/...zation/entity/form/PositionQueryForm.java → ...zation/entity/form/PositionQueryForm.java b/...zation/entity/form/PositionQueryForm.java → ...zation/entity/form/PositionQueryForm.java
diff --git a/...rganization/entity/form/ResourceForm.java → ...rganization/entity/form/ResourceForm.java b/...rganization/entity/form/ResourceForm.java → ...rganization/entity/form/ResourceForm.java
diff --git a/...zation/entity/form/ResourceQueryForm.java → ...zation/entity/form/ResourceQueryForm.java b/...zation/entity/form/ResourceQueryForm.java → ...zation/entity/form/ResourceQueryForm.java
diff --git a/...in/organization/entity/form/RoleForm.java → ...in/organization/entity/form/RoleForm.java b/...in/organization/entity/form/RoleForm.java → ...in/organization/entity/form/RoleForm.java
diff --git a/...ganization/entity/form/RoleQueryForm.java → ...ganization/entity/form/RoleQueryForm.java b/...ganization/entity/form/RoleQueryForm.java → ...ganization/entity/form/RoleQueryForm.java
diff --git a/...anization/entity/form/RoleUpdateForm.java → ...anization/entity/form/RoleUpdateForm.java b/...anization/entity/form/RoleUpdateForm.java → ...anization/entity/form/RoleUpdateForm.java
diff --git a/...in/organization/entity/form/UserForm.java → ...in/organization/entity/form/UserForm.java b/...in/organization/entity/form/UserForm.java → ...in/organization/entity/form/UserForm.java
diff --git a/...ganization/entity/form/UserQueryForm.java → ...ganization/entity/form/UserQueryForm.java b/...ganization/entity/form/UserQueryForm.java → ...ganization/entity/form/UserQueryForm.java
diff --git a/...anization/entity/form/UserUpdateForm.java → ...anization/entity/form/UserUpdateForm.java b/...anization/entity/form/UserUpdateForm.java → ...anization/entity/form/UserUpdateForm.java
diff --git a/...ization/entity/param/GroupQueryParam.java → ...ization/entity/param/GroupQueryParam.java b/...ization/entity/param/GroupQueryParam.java → ...ization/entity/param/GroupQueryParam.java
diff --git a/...nization/entity/param/MenuQueryParam.java → ...nization/entity/param/MenuQueryParam.java b/...nization/entity/param/MenuQueryParam.java → ...nization/entity/param/MenuQueryParam.java
diff --git a/...tion/entity/param/PositionQueryParam.java → ...tion/entity/param/PositionQueryParam.java b/...tion/entity/param/PositionQueryParam.java → ...tion/entity/param/PositionQueryParam.java
diff --git a/...tion/entity/param/ResourceQueryParam.java → ...tion/entity/param/ResourceQueryParam.java b/...tion/entity/param/ResourceQueryParam.java → ...tion/entity/param/ResourceQueryParam.java
diff --git a/...nization/entity/param/RoleQueryParam.java → ...nization/entity/param/RoleQueryParam.java b/...nization/entity/param/RoleQueryParam.java → ...nization/entity/param/RoleQueryParam.java
diff --git a/...nization/entity/param/UserQueryParam.java → ...nization/entity/param/UserQueryParam.java b/...nization/entity/param/UserQueryParam.java → ...nization/entity/param/UserQueryParam.java
diff --git a/...ysadmin/organization/entity/po/Group.java → ...ysadmin/organization/entity/po/Group.java b/...ysadmin/organization/entity/po/Group.java → ...ysadmin/organization/entity/po/Group.java
diff --git a/...sysadmin/organization/entity/po/Menu.java → ...sysadmin/organization/entity/po/Menu.java b/...sysadmin/organization/entity/po/Menu.java → ...sysadmin/organization/entity/po/Menu.java
diff --git a/...dmin/organization/entity/po/Position.java → ...dmin/organization/entity/po/Position.java b/...dmin/organization/entity/po/Position.java → ...dmin/organization/entity/po/Position.java
diff --git a/...dmin/organization/entity/po/Resource.java → ...dmin/organization/entity/po/Resource.java b/...dmin/organization/entity/po/Resource.java → ...dmin/organization/entity/po/Resource.java
diff --git a/...sysadmin/organization/entity/po/Role.java → ...sysadmin/organization/entity/po/Role.java b/...sysadmin/organization/entity/po/Role.java → ...sysadmin/organization/entity/po/Role.java
diff --git a/.../organization/entity/po/RoleResource.java → .../organization/entity/po/RoleResource.java b/.../organization/entity/po/RoleResource.java → .../organization/entity/po/RoleResource.java
diff --git a/...sysadmin/organization/entity/po/User.java → ...sysadmin/organization/entity/po/User.java b/...sysadmin/organization/entity/po/User.java → ...sysadmin/organization/entity/po/User.java
diff --git a/...dmin/organization/entity/po/UserRole.java → ...dmin/organization/entity/po/UserRole.java b/...dmin/organization/entity/po/UserRole.java → ...dmin/organization/entity/po/UserRole.java
diff --git a/...sadmin/organization/entity/vo/UserVo.java → ...sadmin/organization/entity/vo/UserVo.java b/...sadmin/organization/entity/vo/UserVo.java → ...sadmin/organization/entity/vo/UserVo.java
diff --git a/...dmin/organization/events/EventSender.java → ...dmin/organization/events/EventSender.java b/...dmin/organization/events/EventSender.java → ...dmin/organization/events/EventSender.java
diff --git a/...ception/GlobalExceptionHandlerAdvice.java → ...ception/GlobalExceptionHandlerAdvice.java b/...ception/GlobalExceptionHandlerAdvice.java → ...ception/GlobalExceptionHandlerAdvice.java
diff --git a/...tion/exception/OrganizationErrorType.java → ...tion/exception/OrganizationErrorType.java b/...tion/exception/OrganizationErrorType.java → ...tion/exception/OrganizationErrorType.java
diff --git a/...tion/exception/RoleNotFoundException.java → ...tion/exception/RoleNotFoundException.java b/...tion/exception/RoleNotFoundException.java → ...tion/exception/RoleNotFoundException.java
diff --git a/...tion/exception/UserNotFoundException.java → ...tion/exception/UserNotFoundException.java b/...tion/exception/UserNotFoundException.java → ...tion/exception/UserNotFoundException.java
diff --git a/...in/organization/rest/GroupController.java → ...in/organization/rest/GroupController.java b/...in/organization/rest/GroupController.java → ...in/organization/rest/GroupController.java
diff --git a/...min/organization/rest/MenuController.java → ...min/organization/rest/MenuController.java b/...min/organization/rest/MenuController.java → ...min/organization/rest/MenuController.java
diff --git a/...organization/rest/PositionController.java → ...organization/rest/PositionController.java b/...organization/rest/PositionController.java → ...organization/rest/PositionController.java
diff --git a/...organization/rest/ResourceController.java → ...organization/rest/ResourceController.java b/...organization/rest/ResourceController.java → ...organization/rest/ResourceController.java
diff --git a/...min/organization/rest/RoleController.java → ...min/organization/rest/RoleController.java b/...min/organization/rest/RoleController.java → ...min/organization/rest/RoleController.java
diff --git a/...min/organization/rest/UserController.java → ...min/organization/rest/UserController.java b/...min/organization/rest/UserController.java → ...min/organization/rest/UserController.java
diff --git a/...n/organization/service/IGroupService.java → ...n/organization/service/IGroupService.java b/...n/organization/service/IGroupService.java → ...n/organization/service/IGroupService.java
diff --git a/...in/organization/service/IMenuService.java → ...in/organization/service/IMenuService.java b/...in/organization/service/IMenuService.java → ...in/organization/service/IMenuService.java
diff --git a/...rganization/service/IPositionService.java → ...rganization/service/IPositionService.java b/...rganization/service/IPositionService.java → ...rganization/service/IPositionService.java
diff --git a/...rganization/service/IResourceService.java → ...rganization/service/IResourceService.java b/...rganization/service/IResourceService.java → ...rganization/service/IResourceService.java
diff --git a/...ization/service/IRoleResourceService.java → ...ization/service/IRoleResourceService.java b/...ization/service/IRoleResourceService.java → ...ization/service/IRoleResourceService.java
diff --git a/...in/organization/service/IRoleService.java → ...in/organization/service/IRoleService.java b/...in/organization/service/IRoleService.java → ...in/organization/service/IRoleService.java
diff --git a/...rganization/service/IUserRoleService.java → ...rganization/service/IUserRoleService.java b/...rganization/service/IUserRoleService.java → ...rganization/service/IUserRoleService.java
diff --git a/...in/organization/service/IUserService.java → ...in/organization/service/IUserService.java b/...in/organization/service/IUserService.java → ...in/organization/service/IUserService.java
diff --git a/...ganization/service/impl/GroupService.java → ...ganization/service/impl/GroupService.java b/...ganization/service/impl/GroupService.java → ...ganization/service/impl/GroupService.java
diff --git a/...rganization/service/impl/MenuService.java → ...rganization/service/impl/MenuService.java b/...rganization/service/impl/MenuService.java → ...rganization/service/impl/MenuService.java
diff --git a/...ization/service/impl/PositionService.java → ...ization/service/impl/PositionService.java b/...ization/service/impl/PositionService.java → ...ization/service/impl/PositionService.java
diff --git a/...ization/service/impl/ResourceService.java → ...ization/service/impl/ResourceService.java b/...ization/service/impl/ResourceService.java → ...ization/service/impl/ResourceService.java
diff --git a/...ion/service/impl/RoleResourceService.java → ...ion/service/impl/RoleResourceService.java b/...ion/service/impl/RoleResourceService.java → ...ion/service/impl/RoleResourceService.java
diff --git a/...rganization/service/impl/RoleService.java → ...rganization/service/impl/RoleService.java b/...rganization/service/impl/RoleService.java → ...rganization/service/impl/RoleService.java
diff --git a/...ization/service/impl/UserRoleService.java → ...ization/service/impl/UserRoleService.java b/...ization/service/impl/UserRoleService.java → ...ization/service/impl/UserRoleService.java
diff --git a/...rganization/service/impl/UserService.java → ...rganization/service/impl/UserService.java b/...rganization/service/impl/UserService.java → ...rganization/service/impl/UserService.java
diff --git a/...zation/src/main/resources/application.yml → ...zation/src/main/resources/application.yml b/...zation/src/main/resources/application.yml → ...zation/src/main/resources/application.yml
diff --git a/...nization/src/main/resources/bootstrap.yml → ...nization/src/main/resources/bootstrap.yml b/...nization/src/main/resources/bootstrap.yml → ...nization/src/main/resources/bootstrap.yml
diff --git a/center/bus/.gitignore → center-bus/.gitignore b/center/bus/.gitignore → center-bus/.gitignore
diff --git a/center/bus/pom.xml → center-bus/pom.xml b/center/bus/pom.xml → center-bus/pom.xml
@@ -13,7 +13,7 @@
 
     <parent>
         <groupId>com.springboot.cloud</groupId>
-        <artifactId>center</artifactId>
+        <artifactId>cloud</artifactId>
         <version>0.0.1-SNAPSHOT</version>
     </parent>
 

diff --git a/center/bus/readme.md → center-bus/readme.md b/center/bus/readme.md → center-bus/readme.md
diff --git a/center/bus/src/main/docker/Dockerfile → center-bus/src/main/docker/Dockerfile b/center/bus/src/main/docker/Dockerfile → center-bus/src/main/docker/Dockerfile
diff --git a/...boot/cloud/center/bus/BusApplication.java → ...boot/cloud/center/bus/BusApplication.java b/...boot/cloud/center/bus/BusApplication.java → ...boot/cloud/center/bus/BusApplication.java
diff --git a/...er/bus/src/main/resources/application.yml → ...er-bus/src/main/resources/application.yml b/...er/bus/src/main/resources/application.yml → ...er-bus/src/main/resources/application.yml
diff --git a/center/bus/src/main/resources/bootstrap.yml → center-bus/src/main/resources/bootstrap.yml b/center/bus/src/main/resources/bootstrap.yml → center-bus/src/main/resources/bootstrap.yml
@@ -2,7 +2,7 @@ server:
   port: ${SERVER_PORT:8071}
 spring:
   application:
-    name: bus
+    name: center-bus
   cloud:
     nacos:
       discovery:

diff --git a/...cloud/center/bus/BusApplicationTests.java → ...cloud/center/bus/BusApplicationTests.java b/...cloud/center/bus/BusApplicationTests.java → ...cloud/center/bus/BusApplicationTests.java
diff --git a/center/pom.xml b/center/pom.xml
diff --git a/common/core/.gitignore → common-core/.gitignore b/common/core/.gitignore → common-core/.gitignore
diff --git a/common/core/pom.xml → common-core/pom.xml b/common/core/pom.xml → common-core/pom.xml
@@ -18,13 +18,25 @@
         <maven.compiler.target>1.8</maven.compiler.target>
     </properties>
 
-    <parent>
-        <groupId>com.springboot.cloud</groupId>
-        <artifactId>common</artifactId>
-        <version>0.0.1-SNAPSHOT</version>
-    </parent>
-
     <dependencies>
+        <dependency>
+            <groupId>commons-lang</groupId>
+            <artifactId>commons-lang</artifactId>
+            <version>2.6</version>
+        </dependency>
+        <!--使用 guava-->
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>30.0-jre</version>
+        </dependency>
+        <!--使用 lombok 简化 Java 代码-->
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>1.18.10</version>
+            <scope>provided</scope>
+        </dependency>
         <!--Swagger2 - RESTful API文档-->
         <dependency>
             <groupId>io.springfox</groupId>

diff --git a/common/core/readme.md → common-core/readme.md b/common/core/readme.md → common-core/readme.md
diff --git a/...t/cloud/common/core/entity/vo/Result.java → ...t/cloud/common/core/entity/vo/Result.java b/...t/cloud/common/core/entity/vo/Result.java → ...t/cloud/common/core/entity/vo/Result.java
diff --git a/.../common/core/exception/BaseException.java → .../common/core/exception/BaseException.java b/.../common/core/exception/BaseException.java → .../common/core/exception/BaseException.java
diff --git a/...loud/common/core/exception/ErrorType.java → ...loud/common/core/exception/ErrorType.java b/...loud/common/core/exception/ErrorType.java → ...loud/common/core/exception/ErrorType.java
diff --git a/...mmon/core/exception/ServiceException.java → ...mmon/core/exception/ServiceException.java b/...mmon/core/exception/ServiceException.java → ...mmon/core/exception/ServiceException.java
diff --git a/...ommon/core/exception/SystemErrorType.java → ...ommon/core/exception/SystemErrorType.java b/...ommon/core/exception/SystemErrorType.java → ...ommon/core/exception/SystemErrorType.java
diff --git a/...d/common/core/util/UserContextHolder.java → ...d/common/core/util/UserContextHolder.java b/...d/common/core/util/UserContextHolder.java → ...d/common/core/util/UserContextHolder.java
diff --git a/common/test/pom.xml → common-test/pom.xml b/common/test/pom.xml → common-test/pom.xml
@@ -18,12 +18,18 @@
         <maven.compiler.target>1.8</maven.compiler.target>
     </properties>
 
-    <parent>
-        <groupId>com.springboot.cloud</groupId>
-        <artifactId>common</artifactId>
-        <version>0.0.1-SNAPSHOT</version>
-    </parent>
-
     <dependencies>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-core</artifactId>
+            <version>5.0.8.RELEASE</version>
+        </dependency>
+        <!--测试-->
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.12</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 </project>
diff --git a/common/test/readme.md → common-test/readme.md b/common/test/readme.md → common-test/readme.md
diff --git a/...boot/cloud/common/test/PrivateHelper.java → ...boot/cloud/common/test/PrivateHelper.java b/...boot/cloud/common/test/PrivateHelper.java → ...boot/cloud/common/test/PrivateHelper.java
diff --git a/.../cloud/common/test/PrivateHelperTest.java → .../cloud/common/test/PrivateHelperTest.java b/.../cloud/common/test/PrivateHelperTest.java → .../cloud/common/test/PrivateHelperTest.java
diff --git a/...boot/cloud/common/test/PrivateObject.java → ...boot/cloud/common/test/PrivateObject.java b/...boot/cloud/common/test/PrivateObject.java → ...boot/cloud/common/test/PrivateObject.java