diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..c81f6e4 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,12 @@ +[submodule "epdc-cloud-parent-yushan"] + path = epdc-cloud-parent-yushan + url = http://121.42.41.42:7070/r/epdc-cloud-parent-yushan.git +[submodule "epdc-cloud-commons-yushan"] + path = epdc-cloud-commons-yushan + url = http://121.42.41.42:7070/r/epdc-cloud-commons-yushan.git +[submodule "epdc-cloud-gateway-yushan"] + path = epdc-cloud-gateway-yushan + url = http://121.42.41.42:7070/r/epdc-cloud-gateway-yushan.git +[submodule "epdc-cloud-client-yushan"] + path = epdc-cloud-client-yushan + url = http://121.42.41.42:7070/r/epdc-cloud-client-yushan.git diff --git a/Dockerfile b/epdc-cloud-auth/Dockerfile similarity index 100% rename from Dockerfile rename to epdc-cloud-auth/Dockerfile diff --git a/epdc-cloud-auth/pom.xml b/epdc-cloud-auth/pom.xml new file mode 100644 index 0000000..374a1ba --- /dev/null +++ b/epdc-cloud-auth/pom.xml @@ -0,0 +1,175 @@ + + + 4.0.0 + + + com.esua.epdc.yushan + epdc-cloud-parent-yushan + 1.0.0 + ../epdc-cloud-parent-yushan + + + epdc-cloud-auth + jar + 榆山党群e家微服务身份认证模块 + + + 0.10.4 + 0.0.9 + + + + + com.esua.epdc.yushan + epdc-common-clienttoken + ${epdc-cloud-commons.version} + + + + org.springframework.boot + spring-boot-starter-web + + + org.springframework.cloud + spring-cloud-starter-openfeign + + + org.springframework.cloud + spring-cloud-starter-netflix-hystrix + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-discovery + + + io.jsonwebtoken + jjwt + 0.7.0 + + + com.github.axet + kaptcha + ${kaptcha.version} + + + + com.google.guava + guava + + + + org.springframework.cloud + spring-cloud-starter-zipkin + + + + + com.esua.epdc.yushan + epdc-cloud-admin-client + ${epdc-cloud-client.version} + + + + + + ${project.artifactId} + + + org.springframework.boot + spring-boot-maven-plugin + + + org.apache.maven.plugins + maven-surefire-plugin + + true + + + + org.apache.maven.plugins + maven-deploy-plugin + + true + + + + com.spotify + dockerfile-maven-plugin + + + + + + + dev + + true + + + 9091 + dev + dev + + + 2 + 114.215.125.123 + 9603 + epdc!redis@master1405 + + + false + 47.104.224.45:8848 + + 6a3577b4-7b79-43f6-aebb-9c3f31263f6a + + http://localhost:9411 + + + + test + + 10002 + test + test + + + 2 + 114.215.125.123 + 9603 + epdc!redis@master1405 + + + true + 47.104.224.45:8848 + 47.104.85.99 + 6a3577b4-7b79-43f6-aebb-9c3f31263f6a + + http://localhost:9411 + + + + + prod + + 9056 + prod + prod + + + 0 + 172.16.0.54 + 6379 + Elink833066 + + + true + 172.16.0.52:8848 + + + + http://172.31.171.61:9411 + + + + diff --git a/src/main/java/com/elink/esua/epdc/AuthApplication.java b/epdc-cloud-auth/src/main/java/com/elink/esua/epdc/AuthApplication.java similarity index 100% rename from src/main/java/com/elink/esua/epdc/AuthApplication.java rename to epdc-cloud-auth/src/main/java/com/elink/esua/epdc/AuthApplication.java diff --git a/src/main/java/com/elink/esua/epdc/async/UserDeptTask.java b/epdc-cloud-auth/src/main/java/com/elink/esua/epdc/async/UserDeptTask.java similarity index 100% rename from src/main/java/com/elink/esua/epdc/async/UserDeptTask.java rename to epdc-cloud-auth/src/main/java/com/elink/esua/epdc/async/UserDeptTask.java diff --git a/src/main/java/com/elink/esua/epdc/config/KaptchaConfig.java b/epdc-cloud-auth/src/main/java/com/elink/esua/epdc/config/KaptchaConfig.java similarity index 100% rename from src/main/java/com/elink/esua/epdc/config/KaptchaConfig.java rename to epdc-cloud-auth/src/main/java/com/elink/esua/epdc/config/KaptchaConfig.java diff --git a/src/main/java/com/elink/esua/epdc/config/ModuleConfigImpl.java b/epdc-cloud-auth/src/main/java/com/elink/esua/epdc/config/ModuleConfigImpl.java similarity index 100% rename from src/main/java/com/elink/esua/epdc/config/ModuleConfigImpl.java rename to epdc-cloud-auth/src/main/java/com/elink/esua/epdc/config/ModuleConfigImpl.java diff --git a/src/main/java/com/elink/esua/epdc/config/SwaggerConfig.java b/epdc-cloud-auth/src/main/java/com/elink/esua/epdc/config/SwaggerConfig.java similarity index 100% rename from src/main/java/com/elink/esua/epdc/config/SwaggerConfig.java rename to epdc-cloud-auth/src/main/java/com/elink/esua/epdc/config/SwaggerConfig.java diff --git a/src/main/java/com/elink/esua/epdc/config/ThreadConfig.java b/epdc-cloud-auth/src/main/java/com/elink/esua/epdc/config/ThreadConfig.java similarity index 100% rename from src/main/java/com/elink/esua/epdc/config/ThreadConfig.java rename to epdc-cloud-auth/src/main/java/com/elink/esua/epdc/config/ThreadConfig.java diff --git a/src/main/java/com/elink/esua/epdc/controller/AuthController.java b/epdc-cloud-auth/src/main/java/com/elink/esua/epdc/controller/AuthController.java similarity index 100% rename from src/main/java/com/elink/esua/epdc/controller/AuthController.java rename to epdc-cloud-auth/src/main/java/com/elink/esua/epdc/controller/AuthController.java diff --git a/src/main/java/com/elink/esua/epdc/dto/AuthorizationDTO.java b/epdc-cloud-auth/src/main/java/com/elink/esua/epdc/dto/AuthorizationDTO.java similarity index 100% rename from src/main/java/com/elink/esua/epdc/dto/AuthorizationDTO.java rename to epdc-cloud-auth/src/main/java/com/elink/esua/epdc/dto/AuthorizationDTO.java diff --git a/src/main/java/com/elink/esua/epdc/dto/LoginDTO.java b/epdc-cloud-auth/src/main/java/com/elink/esua/epdc/dto/LoginDTO.java similarity index 100% rename from src/main/java/com/elink/esua/epdc/dto/LoginDTO.java rename to epdc-cloud-auth/src/main/java/com/elink/esua/epdc/dto/LoginDTO.java diff --git a/src/main/java/com/elink/esua/epdc/feign/ResourceFeignClient.java b/epdc-cloud-auth/src/main/java/com/elink/esua/epdc/feign/ResourceFeignClient.java similarity index 100% rename from src/main/java/com/elink/esua/epdc/feign/ResourceFeignClient.java rename to epdc-cloud-auth/src/main/java/com/elink/esua/epdc/feign/ResourceFeignClient.java diff --git a/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java b/epdc-cloud-auth/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java similarity index 100% rename from src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java rename to epdc-cloud-auth/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java diff --git a/src/main/java/com/elink/esua/epdc/feign/fallback/ResourceFeignClientFallback.java b/epdc-cloud-auth/src/main/java/com/elink/esua/epdc/feign/fallback/ResourceFeignClientFallback.java similarity index 100% rename from src/main/java/com/elink/esua/epdc/feign/fallback/ResourceFeignClientFallback.java rename to epdc-cloud-auth/src/main/java/com/elink/esua/epdc/feign/fallback/ResourceFeignClientFallback.java diff --git a/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java b/epdc-cloud-auth/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java similarity index 100% rename from src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java rename to epdc-cloud-auth/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java diff --git a/src/main/java/com/elink/esua/epdc/jwt/JwtProperties.java b/epdc-cloud-auth/src/main/java/com/elink/esua/epdc/jwt/JwtProperties.java similarity index 100% rename from src/main/java/com/elink/esua/epdc/jwt/JwtProperties.java rename to epdc-cloud-auth/src/main/java/com/elink/esua/epdc/jwt/JwtProperties.java diff --git a/src/main/java/com/elink/esua/epdc/jwt/JwtUtils.java b/epdc-cloud-auth/src/main/java/com/elink/esua/epdc/jwt/JwtUtils.java similarity index 100% rename from src/main/java/com/elink/esua/epdc/jwt/JwtUtils.java rename to epdc-cloud-auth/src/main/java/com/elink/esua/epdc/jwt/JwtUtils.java diff --git a/src/main/java/com/elink/esua/epdc/redis/CaptchaRedis.java b/epdc-cloud-auth/src/main/java/com/elink/esua/epdc/redis/CaptchaRedis.java similarity index 100% rename from src/main/java/com/elink/esua/epdc/redis/CaptchaRedis.java rename to epdc-cloud-auth/src/main/java/com/elink/esua/epdc/redis/CaptchaRedis.java diff --git a/src/main/java/com/elink/esua/epdc/service/AuthService.java b/epdc-cloud-auth/src/main/java/com/elink/esua/epdc/service/AuthService.java similarity index 100% rename from src/main/java/com/elink/esua/epdc/service/AuthService.java rename to epdc-cloud-auth/src/main/java/com/elink/esua/epdc/service/AuthService.java diff --git a/src/main/java/com/elink/esua/epdc/service/CaptchaService.java b/epdc-cloud-auth/src/main/java/com/elink/esua/epdc/service/CaptchaService.java similarity index 100% rename from src/main/java/com/elink/esua/epdc/service/CaptchaService.java rename to epdc-cloud-auth/src/main/java/com/elink/esua/epdc/service/CaptchaService.java diff --git a/src/main/java/com/elink/esua/epdc/service/ResourceService.java b/epdc-cloud-auth/src/main/java/com/elink/esua/epdc/service/ResourceService.java similarity index 100% rename from src/main/java/com/elink/esua/epdc/service/ResourceService.java rename to epdc-cloud-auth/src/main/java/com/elink/esua/epdc/service/ResourceService.java diff --git a/src/main/java/com/elink/esua/epdc/service/impl/AuthServiceImpl.java b/epdc-cloud-auth/src/main/java/com/elink/esua/epdc/service/impl/AuthServiceImpl.java similarity index 100% rename from src/main/java/com/elink/esua/epdc/service/impl/AuthServiceImpl.java rename to epdc-cloud-auth/src/main/java/com/elink/esua/epdc/service/impl/AuthServiceImpl.java diff --git a/src/main/java/com/elink/esua/epdc/service/impl/CaptchaServiceImpl.java b/epdc-cloud-auth/src/main/java/com/elink/esua/epdc/service/impl/CaptchaServiceImpl.java similarity index 100% rename from src/main/java/com/elink/esua/epdc/service/impl/CaptchaServiceImpl.java rename to epdc-cloud-auth/src/main/java/com/elink/esua/epdc/service/impl/CaptchaServiceImpl.java diff --git a/src/main/java/com/elink/esua/epdc/service/impl/ResourceServiceImpl.java b/epdc-cloud-auth/src/main/java/com/elink/esua/epdc/service/impl/ResourceServiceImpl.java similarity index 100% rename from src/main/java/com/elink/esua/epdc/service/impl/ResourceServiceImpl.java rename to epdc-cloud-auth/src/main/java/com/elink/esua/epdc/service/impl/ResourceServiceImpl.java diff --git a/src/main/resources/application.yml b/epdc-cloud-auth/src/main/resources/application.yml similarity index 100% rename from src/main/resources/application.yml rename to epdc-cloud-auth/src/main/resources/application.yml diff --git a/src/main/resources/logback-spring.xml b/epdc-cloud-auth/src/main/resources/logback-spring.xml similarity index 100% rename from src/main/resources/logback-spring.xml rename to epdc-cloud-auth/src/main/resources/logback-spring.xml diff --git a/epdc-cloud-client-yushan b/epdc-cloud-client-yushan new file mode 160000 index 0000000..1c7aebb --- /dev/null +++ b/epdc-cloud-client-yushan @@ -0,0 +1 @@ +Subproject commit 1c7aebb5c7d914a9c9689abd530fc8153462a40e diff --git a/epdc-cloud-commons-yushan b/epdc-cloud-commons-yushan new file mode 160000 index 0000000..dc416d2 --- /dev/null +++ b/epdc-cloud-commons-yushan @@ -0,0 +1 @@ +Subproject commit dc416d2004edcaadd6bc38592916b8e17852c18d diff --git a/epdc-cloud-gateway-yushan b/epdc-cloud-gateway-yushan new file mode 160000 index 0000000..2930742 --- /dev/null +++ b/epdc-cloud-gateway-yushan @@ -0,0 +1 @@ +Subproject commit 29307425ebc6c065fa5c2559dd4aa1013a8a7a77 diff --git a/epdc-cloud-parent-yushan b/epdc-cloud-parent-yushan new file mode 160000 index 0000000..7d5b870 --- /dev/null +++ b/epdc-cloud-parent-yushan @@ -0,0 +1 @@ +Subproject commit 7d5b8709e3fa8224b3463e120f7b79af1feea28c diff --git a/pom.xml b/pom.xml index c153afe..d72b7ad 100644 --- a/pom.xml +++ b/pom.xml @@ -3,173 +3,22 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - - com.esua.epdc.yushan - epdc-cloud-parent-yushan - 1.0.0 - ../epdc-cloud-parent-yushan - - + com.esua.epdc.yushan epdc-cloud-auth-yushan jar - 市北党群e家微服务身份认证模块 + 榆山党群e家微服务身份认证模块 0.10.4 0.0.9 - - - com.esua.epdc.yushan - epdc-common-clienttoken - ${epdc-cloud-commons.version} - - - - org.springframework.boot - spring-boot-starter-web - - - org.springframework.cloud - spring-cloud-starter-openfeign - - - org.springframework.cloud - spring-cloud-starter-netflix-hystrix - - - com.alibaba.cloud - spring-cloud-starter-alibaba-nacos-discovery - - - io.jsonwebtoken - jjwt - 0.7.0 - - - com.github.axet - kaptcha - ${kaptcha.version} - - - - com.google.guava - guava - - - - org.springframework.cloud - spring-cloud-starter-zipkin - - - - - com.esua.epdc.yushan - epdc-cloud-admin-client - ${epdc-cloud-client.version} - - - - - - ${project.artifactId} - - - org.springframework.boot - spring-boot-maven-plugin - - - org.apache.maven.plugins - maven-surefire-plugin - - true - - - - org.apache.maven.plugins - maven-deploy-plugin - - true - - - - com.spotify - dockerfile-maven-plugin - - - - - - - dev - - true - - - 9091 - dev - dev - - - 2 - 114.215.125.123 - 9603 - epdc!redis@master1405 - - - false - 47.104.224.45:8848 - - 6a3577b4-7b79-43f6-aebb-9c3f31263f6a - - http://localhost:9411 - - - - test - - 10002 - test - test - - - 2 - 114.215.125.123 - 9603 - epdc!redis@master1405 - - - true - 47.104.224.45:8848 - 47.104.85.99 - 6a3577b4-7b79-43f6-aebb-9c3f31263f6a - - http://localhost:9411 - - - - - prod - - 9056 - prod - prod - - - 0 - 172.16.0.54 - 6379 - Elink833066 - - - true - 172.16.0.52:8848 - - + + epdc-cloud-auth + epdc-cloud-client-yushan + epdc-cloud-commons-yushan + epdc-cloud-gateway-yushan + epdc-cloud-parent-yushan + - http://172.31.171.61:9411 - - -