diff --git a/monitor/src/main/resources/application.yml b/monitor/src/main/resources/application.yml deleted file mode 100644 index 4302ed8fcc99d1344975077030d7a2e7425f2946..0000000000000000000000000000000000000000 --- a/monitor/src/main/resources/application.yml +++ /dev/null @@ -1,28 +0,0 @@ -server: - port: 9050 -spring: - application: - name: micro-service-monitor -eureka: - instance: - prefer-ip-address: true #使用IP注册 - instance-id: ${spring.cloud.client.ipAddress}:${server.port} - lease-renewal-interval-in-seconds: 5 ##为了能够快速删除 - lease-expiration-duration-in-seconds: 10 ##为了能够快速删除 - client: - service-url: - defaultZone: http://register1:9010/eureka/,http://register2:9011/eureka/ - -###actuator监控点 start#### -endpoints: - health: - sensitive: false - enabled: true -##默认情况下很多端点是不允许访问的，会返回401:Unauthorized -management: - security: - enabled: false -###actuator监控点 end#### -turbine: - app-config-list: micro-a-service - cluster-name-expression: "'default'" \ No newline at end of file diff --git a/auth-center/.gitignore b/mss-eureka/.gitignore similarity index 100% rename from auth-center/.gitignore rename to mss-eureka/.gitignore diff --git a/register/node-1.bat b/mss-eureka/node-1.bat similarity index 100% rename from register/node-1.bat rename to mss-eureka/node-1.bat diff --git a/register/node-2.bat b/mss-eureka/node-2.bat similarity index 100% rename from register/node-2.bat rename to mss-eureka/node-2.bat diff --git a/register/pom.xml b/mss-eureka/pom.xml similarity index 92% rename from register/pom.xml rename to mss-eureka/pom.xml index d3dc20125735d4457adf14b769a03bba2a71dde8..539b9ca6de1a35f6ca500077d97802e99fd85b0d 100644 --- a/register/pom.xml +++ b/mss-eureka/pom.xml @@ -12,13 +12,13 @@ 0.0.1-SNAPSHOT jar - register + mss-eureka Demo project for Spring Boot org.springframework.cloud - spring-cloud-starter-eureka-server + spring-cloud-starter-netflix-eureka-server org.springframework.boot diff --git a/register/src/main/java/com/microservice/skeleton/register/RegisterApplication.java b/mss-eureka/src/main/java/com/microservice/skeleton/register/RegisterApplication.java similarity index 100% rename from register/src/main/java/com/microservice/skeleton/register/RegisterApplication.java rename to mss-eureka/src/main/java/com/microservice/skeleton/register/RegisterApplication.java diff --git a/register/src/main/java/com/microservice/skeleton/register/listener/InstanceCancelListener.java b/mss-eureka/src/main/java/com/microservice/skeleton/register/listener/InstanceCancelListener.java similarity index 100% rename from register/src/main/java/com/microservice/skeleton/register/listener/InstanceCancelListener.java rename to mss-eureka/src/main/java/com/microservice/skeleton/register/listener/InstanceCancelListener.java diff --git a/register/src/main/java/com/microservice/skeleton/register/listener/InstanceRegisterListener.java b/mss-eureka/src/main/java/com/microservice/skeleton/register/listener/InstanceRegisterListener.java similarity index 100% rename from register/src/main/java/com/microservice/skeleton/register/listener/InstanceRegisterListener.java rename to mss-eureka/src/main/java/com/microservice/skeleton/register/listener/InstanceRegisterListener.java diff --git a/register/src/main/java/com/microservice/skeleton/register/listener/InstanceRenewListener.java b/mss-eureka/src/main/java/com/microservice/skeleton/register/listener/InstanceRenewListener.java similarity index 100% rename from register/src/main/java/com/microservice/skeleton/register/listener/InstanceRenewListener.java rename to mss-eureka/src/main/java/com/microservice/skeleton/register/listener/InstanceRenewListener.java diff --git a/mss-eureka/src/main/resources/application-node-1.yml b/mss-eureka/src/main/resources/application-node-1.yml new file mode 100644 index 0000000000000000000000000000000000000000..2ebcb2a987a084261750bca8aea602296de25ad7 --- /dev/null +++ b/mss-eureka/src/main/resources/application-node-1.yml @@ -0,0 +1,15 @@ +server: + port: 9010 +spring: + application: + ##name蹇呴』涓鏍凤紝涓嶇劧楂樺彲鐢ㄤ細瀵艰嚧unavailable-replicas + name: mss-eureka +eureka: + instance: + hostname: mss-eureka1 + client: + ##杩欓噷瑕佽鐩朼pplication鐨勮缃紝涓嶇劧浼氳鍙朼pplication鏂囦欢瀵艰嚧unavailable-replicas + register-with-eureka: true + fetch-registry: true + service-url: + defaultZone: http://mss-eureka2:9011/eureka/ \ No newline at end of file diff --git a/mss-eureka/src/main/resources/application-node-2.yml b/mss-eureka/src/main/resources/application-node-2.yml new file mode 100644 index 0000000000000000000000000000000000000000..5d6ab915286e4b2dec2458c63ee65c9d81075b6e --- /dev/null +++ b/mss-eureka/src/main/resources/application-node-2.yml @@ -0,0 +1,14 @@ +server: + port: 9011 +spring: + application: + name: mss-eureka +eureka: + instance: + hostname: mss-eureka2 + client: + ##杩欓噷瑕佽鐩朼pplication鐨勮缃紝涓嶇劧浼氳鍙朼pplication鏂囦欢瀵艰嚧unavailable-replicas + register-with-eureka: true + fetch-registry: true + service-url: + defaultZone: http://mss-eureka1:9010/eureka/ \ No newline at end of file diff --git a/register/src/main/resources/application.yml b/mss-eureka/src/main/resources/application.yml similarity index 56% rename from register/src/main/resources/application.yml rename to mss-eureka/src/main/resources/application.yml index 9794638a2ac22f91a67291545bb512a6927cd332..b01afc875225234a6a0a052a6391c4bd3c523de1 100644 --- a/register/src/main/resources/application.yml +++ b/mss-eureka/src/main/resources/application.yml @@ -2,17 +2,19 @@ server: port: 9010 spring: application: - name: register + name: mss-eureka eureka: instance: - hostname: register + hostname: mss-eureka client: register-with-eureka: false fetch-registry: false service-url: defaultZone: http://${eureka.instance.hostname}:${server.port}/eureka/ -# server: -# eviction-interval-timer-in-ms: 5000 #### 娓呯悊闂撮殧锛堝崟浣嶆绉掞紝榛樿鏄60*1000锛夛紝寮鍙戠幆澧冭缃涓嬪彲蹇熺Щ闄や笉鍙敤鐨勬湇鍔 + server: + #### 娓呯悊闂撮殧锛堝崟浣嶆绉掞紝榛樿鏄60*1000锛夛紝寮鍙戠幆澧冭缃涓嬪彲蹇熺Щ闄や笉鍙敤鐨勬湇鍔 + eviction-interval-timer-in-ms: 5000 + enable-self-preservation: false ###actuator鐩戞帶鐐 start#### endpoints: health: @@ -22,10 +24,4 @@ endpoints: management: security: enabled: false -###actuator鐩戞帶鐐 end#### -logging: - config: classpath:logback.xml - level: - org: - springframework: - web: info \ No newline at end of file +###actuator鐩戞帶鐐 end#### \ No newline at end of file diff --git a/register/src/main/resources/logback.xml b/mss-eureka/src/main/resources/logback.xml similarity index 99% rename from register/src/main/resources/logback.xml rename to mss-eureka/src/main/resources/logback.xml index a299391dc69f6dfe57874709ad9e7ba43f6cbc37..741125924750b7fbbc6f4d8125ef786a2962e23d 100644 --- a/register/src/main/resources/logback.xml +++ b/mss-eureka/src/main/resources/logback.xml @@ -54,7 +54,7 @@ - + diff --git a/register/src/test/java/com/microservice/skeleton/register/RegisterApplicationTests.java b/mss-eureka/src/test/java/com/microservice/skeleton/register/RegisterApplicationTests.java similarity index 100% rename from register/src/test/java/com/microservice/skeleton/register/RegisterApplicationTests.java rename to mss-eureka/src/test/java/com/microservice/skeleton/register/RegisterApplicationTests.java diff --git a/gateway/.gitignore b/mss-gateway/.gitignore similarity index 100% rename from gateway/.gitignore rename to mss-gateway/.gitignore diff --git a/gateway/node-1.bat b/mss-gateway/node-1.bat similarity index 100% rename from gateway/node-1.bat rename to mss-gateway/node-1.bat diff --git a/gateway/pom.xml b/mss-gateway/pom.xml similarity index 98% rename from gateway/pom.xml rename to mss-gateway/pom.xml index 5d9d4517eb18211f0288b8a35cdbd583a8feac01..acf3c67b5de7ba4de82e97d4325e09cfd0e81184 100644 --- a/gateway/pom.xml +++ b/mss-gateway/pom.xml @@ -12,7 +12,7 @@ 0.0.1-SNAPSHOT jar - gateway + mss-gateway Demo project for Spring Boot diff --git a/gateway/src/main/java/com/microservice/skeleton/gateway/GatewayApplication.java b/mss-gateway/src/main/java/com/microservice/skeleton/gateway/GatewayApplication.java similarity index 100% rename from gateway/src/main/java/com/microservice/skeleton/gateway/GatewayApplication.java rename to mss-gateway/src/main/java/com/microservice/skeleton/gateway/GatewayApplication.java diff --git a/gateway/src/main/java/com/microservice/skeleton/gateway/config/SecurityConfig.java b/mss-gateway/src/main/java/com/microservice/skeleton/gateway/config/SecurityConfig.java similarity index 100% rename from gateway/src/main/java/com/microservice/skeleton/gateway/config/SecurityConfig.java rename to mss-gateway/src/main/java/com/microservice/skeleton/gateway/config/SecurityConfig.java diff --git a/gateway/src/main/java/com/microservice/skeleton/gateway/fallback/ServiceFallbackProvider.java b/mss-gateway/src/main/java/com/microservice/skeleton/gateway/fallback/ServiceFallbackProvider.java similarity index 100% rename from gateway/src/main/java/com/microservice/skeleton/gateway/fallback/ServiceFallbackProvider.java rename to mss-gateway/src/main/java/com/microservice/skeleton/gateway/fallback/ServiceFallbackProvider.java diff --git a/gateway/src/main/java/com/microservice/skeleton/gateway/filter/PreRequestFilter.java b/mss-gateway/src/main/java/com/microservice/skeleton/gateway/filter/PreRequestFilter.java similarity index 100% rename from gateway/src/main/java/com/microservice/skeleton/gateway/filter/PreRequestFilter.java rename to mss-gateway/src/main/java/com/microservice/skeleton/gateway/filter/PreRequestFilter.java diff --git a/gateway/src/main/java/com/microservice/skeleton/gateway/model/ErrorCode.java b/mss-gateway/src/main/java/com/microservice/skeleton/gateway/model/ErrorCode.java similarity index 100% rename from gateway/src/main/java/com/microservice/skeleton/gateway/model/ErrorCode.java rename to mss-gateway/src/main/java/com/microservice/skeleton/gateway/model/ErrorCode.java diff --git a/gateway/src/main/java/com/microservice/skeleton/gateway/model/Msg.java b/mss-gateway/src/main/java/com/microservice/skeleton/gateway/model/Msg.java similarity index 100% rename from gateway/src/main/java/com/microservice/skeleton/gateway/model/Msg.java rename to mss-gateway/src/main/java/com/microservice/skeleton/gateway/model/Msg.java diff --git a/gateway/src/main/java/com/microservice/skeleton/gateway/util/ObjectByteUtil.java b/mss-gateway/src/main/java/com/microservice/skeleton/gateway/util/ObjectByteUtil.java similarity index 100% rename from gateway/src/main/java/com/microservice/skeleton/gateway/util/ObjectByteUtil.java rename to mss-gateway/src/main/java/com/microservice/skeleton/gateway/util/ObjectByteUtil.java diff --git a/gateway/src/main/resources/application.yml b/mss-gateway/src/main/resources/application.yml similarity index 73% rename from gateway/src/main/resources/application.yml rename to mss-gateway/src/main/resources/application.yml index a4e82c15cd10f2a9fa64a52a5195c8a002ccfb55..0bf9fd2b2a7fa1d3f0ffeeb1f4236b3a72c56ba9 100644 --- a/gateway/src/main/resources/application.yml +++ b/mss-gateway/src/main/resources/application.yml @@ -1,17 +1,21 @@ spring: application: - name: Gateway + name: mss-gateway zipkin: - base-url: http://10.10.8.2:9050 + base-url: http://localhost:9050 server: port: 9030 eureka: instance: prefer-ip-address: true #浣跨敤IP娉ㄥ唽 instance-id: ${spring.cloud.client.ipAddress}:${server.port} + ##缁害鏇存柊鏃堕棿闂撮殧璁剧疆5绉掞紝m榛樿30s + lease-renewal-interval-in-seconds: 5 + ##缁害鍒版湡鏃堕棿10绉掞紝榛樿鏄90绉 + lease-expiration-duration-in-seconds: 10 client: service-url: - defaultZone: http://register1:9010/eureka/,http://register2:9011/eureka/ + defaultZone: http://mss-eureka1:9010/eureka/,http://mss-eureka2:9011/eureka/ ###actuator鐩戞帶鐐 start#### endpoints: health: @@ -43,10 +47,10 @@ security: enabled: false oauth2: client: - access-token-uri: http://10.10.8.2:9030/uaa/oauth/token ##缃戝叧鐨勫湴鍧 - user-authorization-uri: http://10.10.8.2:9030/uaa/oauth/authorize + access-token-uri: http://localhost:9030/uaa/oauth/token ##缃戝叧鐨勫湴鍧 + user-authorization-uri: http://localhost:9030/uaa/oauth/authorize resource: - user-info-uri: http://10.10.8.2:9030/uaa/user + user-info-uri: http://localhost:9030/uaa/user prefer-token-info: false ##############end##################### ####瓒呮椂閰嶇疆#### diff --git a/gateway/src/test/java/com/microservice/skeleton/gateway/GatewayApplicationTests.java b/mss-gateway/src/test/java/com/microservice/skeleton/gateway/GatewayApplicationTests.java similarity index 100% rename from gateway/src/test/java/com/microservice/skeleton/gateway/GatewayApplicationTests.java rename to mss-gateway/src/test/java/com/microservice/skeleton/gateway/GatewayApplicationTests.java diff --git a/monitor/.gitignore b/mss-monitor/.gitignore similarity index 100% rename from monitor/.gitignore rename to mss-monitor/.gitignore diff --git a/monitor/pom.xml b/mss-monitor/pom.xml similarity index 98% rename from monitor/pom.xml rename to mss-monitor/pom.xml index 0707f3231e09a565492dc6590d612115cef3baf1..d187d7b32e9997d86fcdcda3bc54d96e9b887286 100644 --- a/monitor/pom.xml +++ b/mss-monitor/pom.xml @@ -12,7 +12,7 @@ 0.0.1-SNAPSHOT jar - monitor + mss-monitor Demo project for Spring Boot diff --git a/monitor/src/main/java/com/microservice/skeleton/monitor/MonitorApplication.java b/mss-monitor/src/main/java/com/microservice/skeleton/monitor/MonitorApplication.java similarity index 100% rename from monitor/src/main/java/com/microservice/skeleton/monitor/MonitorApplication.java rename to mss-monitor/src/main/java/com/microservice/skeleton/monitor/MonitorApplication.java diff --git a/mss-monitor/src/main/resources/application.yml b/mss-monitor/src/main/resources/application.yml new file mode 100644 index 0000000000000000000000000000000000000000..21b0eb31e2c345264b34ce169e47fa9d5a998176 --- /dev/null +++ b/mss-monitor/src/main/resources/application.yml @@ -0,0 +1,24 @@ +server: + port: 9050 +spring: + application: + name: micro-service-monitor +eureka: + instance: + prefer-ip-address: true + instance-id: ${spring.cloud.client.ipAddress}:${server.port} + lease-renewal-interval-in-seconds: 5 + lease-expiration-duration-in-seconds: 10 + client: + service-url: + defaultZone: http://mss-eureka1:9010/eureka/,http://mss-eureka2:9011/eureka/ +endpoints: + health: + sensitive: false + enabled: true +management: + security: + enabled: false +turbine: + app-config-list: micro-a-service + cluster-name-expression: "'default'" \ No newline at end of file diff --git a/monitor/src/test/java/com/microservice/skeleton/monitor/MonitorApplicationTests.java b/mss-monitor/src/test/java/com/microservice/skeleton/monitor/MonitorApplicationTests.java similarity index 100% rename from monitor/src/test/java/com/microservice/skeleton/monitor/MonitorApplicationTests.java rename to mss-monitor/src/test/java/com/microservice/skeleton/monitor/MonitorApplicationTests.java diff --git a/order-service/.gitignore b/mss-oauth/.gitignore similarity index 100% rename from order-service/.gitignore rename to mss-oauth/.gitignore diff --git a/auth-center/node-1.bat b/mss-oauth/node-1.bat similarity index 100% rename from auth-center/node-1.bat rename to mss-oauth/node-1.bat diff --git a/auth-center/pom.xml b/mss-oauth/pom.xml similarity index 98% rename from auth-center/pom.xml rename to mss-oauth/pom.xml index e83f8b6ead15feb31dc94534c00a172c76cd2684..61fe4ad08d05a89cdee8f218461d0c1513a69354 100644 --- a/auth-center/pom.xml +++ b/mss-oauth/pom.xml @@ -12,7 +12,7 @@ 0.0.1-SNAPSHOT jar - auth-center + mss-oauth Demo project for Spring Boot diff --git a/auth-center/src/main/java/com/microservice/skeleton/auth/AuthCenterApplication.java b/mss-oauth/src/main/java/com/microservice/skeleton/auth/AuthCenterApplication.java similarity index 100% rename from auth-center/src/main/java/com/microservice/skeleton/auth/AuthCenterApplication.java rename to mss-oauth/src/main/java/com/microservice/skeleton/auth/AuthCenterApplication.java diff --git a/auth-center/src/main/java/com/microservice/skeleton/auth/config/AuthorizationServerConfig.java b/mss-oauth/src/main/java/com/microservice/skeleton/auth/config/AuthorizationServerConfig.java similarity index 100% rename from auth-center/src/main/java/com/microservice/skeleton/auth/config/AuthorizationServerConfig.java rename to mss-oauth/src/main/java/com/microservice/skeleton/auth/config/AuthorizationServerConfig.java diff --git a/auth-center/src/main/java/com/microservice/skeleton/auth/config/ResourceServerConfig.java b/mss-oauth/src/main/java/com/microservice/skeleton/auth/config/ResourceServerConfig.java similarity index 100% rename from auth-center/src/main/java/com/microservice/skeleton/auth/config/ResourceServerConfig.java rename to mss-oauth/src/main/java/com/microservice/skeleton/auth/config/ResourceServerConfig.java diff --git a/auth-center/src/main/java/com/microservice/skeleton/auth/config/WebSecurityConfig.java b/mss-oauth/src/main/java/com/microservice/skeleton/auth/config/WebSecurityConfig.java similarity index 100% rename from auth-center/src/main/java/com/microservice/skeleton/auth/config/WebSecurityConfig.java rename to mss-oauth/src/main/java/com/microservice/skeleton/auth/config/WebSecurityConfig.java diff --git a/auth-center/src/main/java/com/microservice/skeleton/auth/controller/HelloController.java b/mss-oauth/src/main/java/com/microservice/skeleton/auth/controller/HelloController.java similarity index 100% rename from auth-center/src/main/java/com/microservice/skeleton/auth/controller/HelloController.java rename to mss-oauth/src/main/java/com/microservice/skeleton/auth/controller/HelloController.java diff --git a/auth-center/src/main/java/com/microservice/skeleton/auth/controller/UserController.java b/mss-oauth/src/main/java/com/microservice/skeleton/auth/controller/UserController.java similarity index 100% rename from auth-center/src/main/java/com/microservice/skeleton/auth/controller/UserController.java rename to mss-oauth/src/main/java/com/microservice/skeleton/auth/controller/UserController.java diff --git a/auth-center/src/main/java/com/microservice/skeleton/auth/endpoint/RevokeTokenEndpoint.java b/mss-oauth/src/main/java/com/microservice/skeleton/auth/endpoint/RevokeTokenEndpoint.java similarity index 100% rename from auth-center/src/main/java/com/microservice/skeleton/auth/endpoint/RevokeTokenEndpoint.java rename to mss-oauth/src/main/java/com/microservice/skeleton/auth/endpoint/RevokeTokenEndpoint.java diff --git a/auth-center/src/main/java/com/microservice/skeleton/auth/entity/RcMenuEntity.java b/mss-oauth/src/main/java/com/microservice/skeleton/auth/entity/RcMenuEntity.java similarity index 100% rename from auth-center/src/main/java/com/microservice/skeleton/auth/entity/RcMenuEntity.java rename to mss-oauth/src/main/java/com/microservice/skeleton/auth/entity/RcMenuEntity.java diff --git a/auth-center/src/main/java/com/microservice/skeleton/auth/entity/RcPrivilegeEntity.java b/mss-oauth/src/main/java/com/microservice/skeleton/auth/entity/RcPrivilegeEntity.java similarity index 100% rename from auth-center/src/main/java/com/microservice/skeleton/auth/entity/RcPrivilegeEntity.java rename to mss-oauth/src/main/java/com/microservice/skeleton/auth/entity/RcPrivilegeEntity.java diff --git a/auth-center/src/main/java/com/microservice/skeleton/auth/entity/RcRoleEntity.java b/mss-oauth/src/main/java/com/microservice/skeleton/auth/entity/RcRoleEntity.java similarity index 100% rename from auth-center/src/main/java/com/microservice/skeleton/auth/entity/RcRoleEntity.java rename to mss-oauth/src/main/java/com/microservice/skeleton/auth/entity/RcRoleEntity.java diff --git a/auth-center/src/main/java/com/microservice/skeleton/auth/entity/RcUserEntity.java b/mss-oauth/src/main/java/com/microservice/skeleton/auth/entity/RcUserEntity.java similarity index 100% rename from auth-center/src/main/java/com/microservice/skeleton/auth/entity/RcUserEntity.java rename to mss-oauth/src/main/java/com/microservice/skeleton/auth/entity/RcUserEntity.java diff --git a/auth-center/src/main/java/com/microservice/skeleton/auth/entity/RcUserRoleEntity.java b/mss-oauth/src/main/java/com/microservice/skeleton/auth/entity/RcUserRoleEntity.java similarity index 100% rename from auth-center/src/main/java/com/microservice/skeleton/auth/entity/RcUserRoleEntity.java rename to mss-oauth/src/main/java/com/microservice/skeleton/auth/entity/RcUserRoleEntity.java diff --git a/auth-center/src/main/java/com/microservice/skeleton/auth/model/Msg.java b/mss-oauth/src/main/java/com/microservice/skeleton/auth/model/Msg.java similarity index 100% rename from auth-center/src/main/java/com/microservice/skeleton/auth/model/Msg.java rename to mss-oauth/src/main/java/com/microservice/skeleton/auth/model/Msg.java diff --git a/auth-center/src/main/java/com/microservice/skeleton/auth/repository/PermissionRepository.java b/mss-oauth/src/main/java/com/microservice/skeleton/auth/repository/PermissionRepository.java similarity index 100% rename from auth-center/src/main/java/com/microservice/skeleton/auth/repository/PermissionRepository.java rename to mss-oauth/src/main/java/com/microservice/skeleton/auth/repository/PermissionRepository.java diff --git a/auth-center/src/main/java/com/microservice/skeleton/auth/repository/RoleRepository.java b/mss-oauth/src/main/java/com/microservice/skeleton/auth/repository/RoleRepository.java similarity index 100% rename from auth-center/src/main/java/com/microservice/skeleton/auth/repository/RoleRepository.java rename to mss-oauth/src/main/java/com/microservice/skeleton/auth/repository/RoleRepository.java diff --git a/auth-center/src/main/java/com/microservice/skeleton/auth/repository/UserRepository.java b/mss-oauth/src/main/java/com/microservice/skeleton/auth/repository/UserRepository.java similarity index 100% rename from auth-center/src/main/java/com/microservice/skeleton/auth/repository/UserRepository.java rename to mss-oauth/src/main/java/com/microservice/skeleton/auth/repository/UserRepository.java diff --git a/auth-center/src/main/java/com/microservice/skeleton/auth/service/PermissionService.java b/mss-oauth/src/main/java/com/microservice/skeleton/auth/service/PermissionService.java similarity index 100% rename from auth-center/src/main/java/com/microservice/skeleton/auth/service/PermissionService.java rename to mss-oauth/src/main/java/com/microservice/skeleton/auth/service/PermissionService.java diff --git a/auth-center/src/main/java/com/microservice/skeleton/auth/service/RoleService.java b/mss-oauth/src/main/java/com/microservice/skeleton/auth/service/RoleService.java similarity index 100% rename from auth-center/src/main/java/com/microservice/skeleton/auth/service/RoleService.java rename to mss-oauth/src/main/java/com/microservice/skeleton/auth/service/RoleService.java diff --git a/auth-center/src/main/java/com/microservice/skeleton/auth/service/UserService.java b/mss-oauth/src/main/java/com/microservice/skeleton/auth/service/UserService.java similarity index 100% rename from auth-center/src/main/java/com/microservice/skeleton/auth/service/UserService.java rename to mss-oauth/src/main/java/com/microservice/skeleton/auth/service/UserService.java diff --git a/auth-center/src/main/java/com/microservice/skeleton/auth/service/impl/PermissionServiceImpl.java b/mss-oauth/src/main/java/com/microservice/skeleton/auth/service/impl/PermissionServiceImpl.java similarity index 100% rename from auth-center/src/main/java/com/microservice/skeleton/auth/service/impl/PermissionServiceImpl.java rename to mss-oauth/src/main/java/com/microservice/skeleton/auth/service/impl/PermissionServiceImpl.java diff --git a/auth-center/src/main/java/com/microservice/skeleton/auth/service/impl/RoleServiceImpl.java b/mss-oauth/src/main/java/com/microservice/skeleton/auth/service/impl/RoleServiceImpl.java similarity index 100% rename from auth-center/src/main/java/com/microservice/skeleton/auth/service/impl/RoleServiceImpl.java rename to mss-oauth/src/main/java/com/microservice/skeleton/auth/service/impl/RoleServiceImpl.java diff --git a/auth-center/src/main/java/com/microservice/skeleton/auth/service/impl/UserDetailsServiceImpl.java b/mss-oauth/src/main/java/com/microservice/skeleton/auth/service/impl/UserDetailsServiceImpl.java similarity index 100% rename from auth-center/src/main/java/com/microservice/skeleton/auth/service/impl/UserDetailsServiceImpl.java rename to mss-oauth/src/main/java/com/microservice/skeleton/auth/service/impl/UserDetailsServiceImpl.java diff --git a/auth-center/src/main/java/com/microservice/skeleton/auth/service/impl/UserServiceImpl.java b/mss-oauth/src/main/java/com/microservice/skeleton/auth/service/impl/UserServiceImpl.java similarity index 100% rename from auth-center/src/main/java/com/microservice/skeleton/auth/service/impl/UserServiceImpl.java rename to mss-oauth/src/main/java/com/microservice/skeleton/auth/service/impl/UserServiceImpl.java diff --git a/auth-center/src/main/resources/application.yml b/mss-oauth/src/main/resources/application.yml similarity index 71% rename from auth-center/src/main/resources/application.yml rename to mss-oauth/src/main/resources/application.yml index 3bd31d438fc763441c4f9369d69c691e13c5fde9..5ba23477ee7d2e509e57b5816e108632fe88a379 100644 --- a/auth-center/src/main/resources/application.yml +++ b/mss-oauth/src/main/resources/application.yml @@ -5,7 +5,7 @@ spring: application: name: auth2.0-center zipkin: - base-url: http://10.10.8.2:9050 + base-url: http://localhost:9050 jpa: show-sql: true datasource: @@ -22,19 +22,20 @@ eureka: instance: prefer-ip-address: true #使锟斤拷IP注锟斤拷 instance-id: ${spring.cloud.client.ipAddress}:${server.port} + ##缁害鏇存柊鏃堕棿闂撮殧璁剧疆5绉掞紝m榛樿30s + lease-renewal-interval-in-seconds: 5 + ##缁害鍒版湡鏃堕棿10绉掞紝榛樿鏄90绉 + lease-expiration-duration-in-seconds: 10 client: service-url: - defaultZone: http://register1:9010/eureka/,http://register2:9011/eureka/ -###actuator锟斤拷氐锟 start#### + defaultZone: http://mss-eureka1:9010/eureka/,http://mss-eureka2:9011/eureka/ endpoints: health: sensitive: false enabled: true -##默锟斤拷锟斤拷锟斤拷潞芏锟剿碉拷锟角诧拷锟斤拷锟斤拷锟斤拷实模锟斤拷岱碉拷锟401:Unauthorized management: security: enabled: false -###actuator锟斤拷氐锟 end#### security: oauth2: resource: diff --git a/auth-center/src/main/resources/logback.xml b/mss-oauth/src/main/resources/logback.xml similarity index 99% rename from auth-center/src/main/resources/logback.xml rename to mss-oauth/src/main/resources/logback.xml index 95cb90ca3f4d3886a6697a6d40c3e85475756762..230c2dcaa3974fb7ee540874971ab6dab4681dc3 100644 --- a/auth-center/src/main/resources/logback.xml +++ b/mss-oauth/src/main/resources/logback.xml @@ -54,7 +54,7 @@ - + diff --git a/auth-center/src/main/resources/templates/hello.html b/mss-oauth/src/main/resources/templates/hello.html similarity index 100% rename from auth-center/src/main/resources/templates/hello.html rename to mss-oauth/src/main/resources/templates/hello.html diff --git a/auth-center/src/main/resources/templates/index.html b/mss-oauth/src/main/resources/templates/index.html similarity index 100% rename from auth-center/src/main/resources/templates/index.html rename to mss-oauth/src/main/resources/templates/index.html diff --git a/auth-center/src/main/resources/templates/login.html b/mss-oauth/src/main/resources/templates/login.html similarity index 100% rename from auth-center/src/main/resources/templates/login.html rename to mss-oauth/src/main/resources/templates/login.html diff --git a/auth-center/src/test/java/com/microservice/skeleton/auth/AuthCenterApplicationTests.java b/mss-oauth/src/test/java/com/microservice/skeleton/auth/AuthCenterApplicationTests.java similarity index 100% rename from auth-center/src/test/java/com/microservice/skeleton/auth/AuthCenterApplicationTests.java rename to mss-oauth/src/test/java/com/microservice/skeleton/auth/AuthCenterApplicationTests.java diff --git a/register/.gitignore b/mss-resource/.gitignore similarity index 100% rename from register/.gitignore rename to mss-resource/.gitignore diff --git a/resource/pom.xml b/mss-resource/pom.xml similarity index 100% rename from resource/pom.xml rename to mss-resource/pom.xml diff --git a/resource/src/main/java/com/microservice/skeleton/resource/ResourceApplication.java b/mss-resource/src/main/java/com/microservice/skeleton/resource/ResourceApplication.java similarity index 100% rename from resource/src/main/java/com/microservice/skeleton/resource/ResourceApplication.java rename to mss-resource/src/main/java/com/microservice/skeleton/resource/ResourceApplication.java diff --git a/resource/src/main/java/com/microservice/skeleton/resource/config/ResourceServerConfig.java b/mss-resource/src/main/java/com/microservice/skeleton/resource/config/ResourceServerConfig.java similarity index 100% rename from resource/src/main/java/com/microservice/skeleton/resource/config/ResourceServerConfig.java rename to mss-resource/src/main/java/com/microservice/skeleton/resource/config/ResourceServerConfig.java diff --git a/resource/src/main/java/com/microservice/skeleton/resource/controller/UserController.java b/mss-resource/src/main/java/com/microservice/skeleton/resource/controller/UserController.java similarity index 100% rename from resource/src/main/java/com/microservice/skeleton/resource/controller/UserController.java rename to mss-resource/src/main/java/com/microservice/skeleton/resource/controller/UserController.java diff --git a/mss-resource/src/main/resources/application.yml b/mss-resource/src/main/resources/application.yml new file mode 100644 index 0000000000000000000000000000000000000000..f973ef4c558889b5b01cda3dc1fb177468cd6600 --- /dev/null +++ b/mss-resource/src/main/resources/application.yml @@ -0,0 +1,31 @@ +server: + port: 9023 +spring: + application: + name: resource + zipkin: + base-url: http://localhost:9050 +eureka: + instance: + prefer-ip-address: true + instance-id: ${spring.cloud.client.ipAddress}:${server.port} + ##缁害鏇存柊鏃堕棿闂撮殧璁剧疆5绉掞紝m榛樿30s + lease-renewal-interval-in-seconds: 5 + ##缁害鍒版湡鏃堕棿10绉掞紝榛樿鏄90绉 + lease-expiration-duration-in-seconds: 10 + client: + service-url: + defaultZone: http://mss-eureka1:9010/eureka/,http://mss-eureka2:9011/eureka/ +endpoints: + health: + sensitive: false + enabled: true +management: + security: + enabled: false +security: + oauth2: + resource: + id: resource + user-info-uri: http://localhost:9030/uaa/user + prefer-token-info: false \ No newline at end of file diff --git a/resource/src/test/java/com/microservice/skeleton/resource/ResourceApplicationTests.java b/mss-resource/src/test/java/com/microservice/skeleton/resource/ResourceApplicationTests.java similarity index 100% rename from resource/src/test/java/com/microservice/skeleton/resource/ResourceApplicationTests.java rename to mss-resource/src/test/java/com/microservice/skeleton/resource/ResourceApplicationTests.java diff --git a/order-service/.mvn/wrapper/maven-wrapper.jar b/order-service/.mvn/wrapper/maven-wrapper.jar deleted file mode 100644 index 9cc84ea9b4d95453115d0c26488d6a78694e0bc6..0000000000000000000000000000000000000000 Binary files a/order-service/.mvn/wrapper/maven-wrapper.jar and /dev/null differ diff --git a/order-service/.mvn/wrapper/maven-wrapper.properties b/order-service/.mvn/wrapper/maven-wrapper.properties deleted file mode 100644 index 9dda3b659b46d7920f90046b0e3f106d2a59c68c..0000000000000000000000000000000000000000 --- a/order-service/.mvn/wrapper/maven-wrapper.properties +++ /dev/null @@ -1 +0,0 @@ -distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.5.2/apache-maven-3.5.2-bin.zip diff --git a/order-service/mvnw b/order-service/mvnw deleted file mode 100644 index 5bf251c0774593ca4f5335acf0f7483eaa162e8f..0000000000000000000000000000000000000000 --- a/order-service/mvnw +++ /dev/null @@ -1,225 +0,0 @@ -#!/bin/sh -# ---------------------------------------------------------------------------- -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# ---------------------------------------------------------------------------- - -# ---------------------------------------------------------------------------- -# Maven2 Start Up Batch script -# -# Required ENV vars: -# ------------------ -# JAVA_HOME - location of a JDK home dir -# -# Optional ENV vars -# ----------------- -# M2_HOME - location of maven2's installed home dir -# MAVEN_OPTS - parameters passed to the Java VM when running Maven -# e.g. to debug Maven itself, use -# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 -# MAVEN_SKIP_RC - flag to disable loading of mavenrc files -# ---------------------------------------------------------------------------- - -if [ -z "$MAVEN_SKIP_RC" ] ; then - - if [ -f /etc/mavenrc ] ; then - . /etc/mavenrc - fi - - if [ -f "$HOME/.mavenrc" ] ; then - . "$HOME/.mavenrc" - fi - -fi - -# OS specific support. $var _must_ be set to either true or false. -cygwin=false; -darwin=false; -mingw=false -case "`uname`" in - CYGWIN*) cygwin=true ;; - MINGW*) mingw=true;; - Darwin*) darwin=true - # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home - # See https://developer.apple.com/library/mac/qa/qa1170/_index.html - if [ -z "$JAVA_HOME" ]; then - if [ -x "/usr/libexec/java_home" ]; then - export JAVA_HOME="`/usr/libexec/java_home`" - else - export JAVA_HOME="/Library/Java/Home" - fi - fi - ;; -esac - -if [ -z "$JAVA_HOME" ] ; then - if [ -r /etc/gentoo-release ] ; then - JAVA_HOME=`java-config --jre-home` - fi -fi - -if [ -z "$M2_HOME" ] ; then - ## resolve links - $0 may be a link to maven's home - PRG="$0" - - # need this for relative symlinks - while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG="`dirname "$PRG"`/$link" - fi - done - - saveddir=`pwd` - - M2_HOME=`dirname "$PRG"`/.. - - # make it fully qualified - M2_HOME=`cd "$M2_HOME" && pwd` - - cd "$saveddir" - # echo Using m2 at $M2_HOME -fi - -# For Cygwin, ensure paths are in UNIX format before anything is touched -if $cygwin ; then - [ -n "$M2_HOME" ] && - M2_HOME=`cygpath --unix "$M2_HOME"` - [ -n "$JAVA_HOME" ] && - JAVA_HOME=`cygpath --unix "$JAVA_HOME"` - [ -n "$CLASSPATH" ] && - CLASSPATH=`cygpath --path --unix "$CLASSPATH"` -fi - -# For Migwn, ensure paths are in UNIX format before anything is touched -if $mingw ; then - [ -n "$M2_HOME" ] && - M2_HOME="`(cd "$M2_HOME"; pwd)`" - [ -n "$JAVA_HOME" ] && - JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`" - # TODO classpath? -fi - -if [ -z "$JAVA_HOME" ]; then - javaExecutable="`which javac`" - if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then - # readlink(1) is not available as standard on Solaris 10. - readLink=`which readlink` - if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then - if $darwin ; then - javaHome="`dirname \"$javaExecutable\"`" - javaExecutable="`cd \"$javaHome\" && pwd -P`/javac" - else - javaExecutable="`readlink -f \"$javaExecutable\"`" - fi - javaHome="`dirname \"$javaExecutable\"`" - javaHome=`expr "$javaHome" : '\(.*\)/bin'` - JAVA_HOME="$javaHome" - export JAVA_HOME - fi - fi -fi - -if [ -z "$JAVACMD" ] ; then - if [ -n "$JAVA_HOME" ] ; then - if [ -x "$JAVA_HOME/jre/sh/java" ] ; then - # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" - else - JAVACMD="$JAVA_HOME/bin/java" - fi - else - JAVACMD="`which java`" - fi -fi - -if [ ! -x "$JAVACMD" ] ; then - echo "Error: JAVA_HOME is not defined correctly." >&2 - echo " We cannot execute $JAVACMD" >&2 - exit 1 -fi - -if [ -z "$JAVA_HOME" ] ; then - echo "Warning: JAVA_HOME environment variable is not set." -fi - -CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher - -# traverses directory structure from process work directory to filesystem root -# first directory with .mvn subdirectory is considered project base directory -find_maven_basedir() { - - if [ -z "$1" ] - then - echo "Path not specified to find_maven_basedir" - return 1 - fi - - basedir="$1" - wdir="$1" - while [ "$wdir" != '/' ] ; do - if [ -d "$wdir"/.mvn ] ; then - basedir=$wdir - break - fi - # workaround for JBEAP-8937 (on Solaris 10/Sparc) - if [ -d "${wdir}" ]; then - wdir=`cd "$wdir/.."; pwd` - fi - # end of workaround - done - echo "${basedir}" -} - -# concatenates all lines of a file -concat_lines() { - if [ -f "$1" ]; then - echo "$(tr -s '\n' ' ' < "$1")" - fi -} - -BASE_DIR=`find_maven_basedir "$(pwd)"` -if [ -z "$BASE_DIR" ]; then - exit 1; -fi - -export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"} -echo $MAVEN_PROJECTBASEDIR -MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" - -# For Cygwin, switch paths to Windows format before running java -if $cygwin; then - [ -n "$M2_HOME" ] && - M2_HOME=`cygpath --path --windows "$M2_HOME"` - [ -n "$JAVA_HOME" ] && - JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` - [ -n "$CLASSPATH" ] && - CLASSPATH=`cygpath --path --windows "$CLASSPATH"` - [ -n "$MAVEN_PROJECTBASEDIR" ] && - MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"` -fi - -WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain - -exec "$JAVACMD" \ - $MAVEN_OPTS \ - -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ - "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ - ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@" diff --git a/order-service/mvnw.cmd b/order-service/mvnw.cmd deleted file mode 100644 index 019bd74d766ebd4c033528112148d866555b5c9e..0000000000000000000000000000000000000000 --- a/order-service/mvnw.cmd +++ /dev/null @@ -1,143 +0,0 @@ -@REM ---------------------------------------------------------------------------- -@REM Licensed to the Apache Software Foundation (ASF) under one -@REM or more contributor license agreements. See the NOTICE file -@REM distributed with this work for additional information -@REM regarding copyright ownership. The ASF licenses this file -@REM to you under the Apache License, Version 2.0 (the -@REM "License"); you may not use this file except in compliance -@REM with the License. You may obtain a copy of the License at -@REM -@REM http://www.apache.org/licenses/LICENSE-2.0 -@REM -@REM Unless required by applicable law or agreed to in writing, -@REM software distributed under the License is distributed on an -@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -@REM KIND, either express or implied. See the License for the -@REM specific language governing permissions and limitations -@REM under the License. -@REM ---------------------------------------------------------------------------- - -@REM ---------------------------------------------------------------------------- -@REM Maven2 Start Up Batch script -@REM -@REM Required ENV vars: -@REM JAVA_HOME - location of a JDK home dir -@REM -@REM Optional ENV vars -@REM M2_HOME - location of maven2's installed home dir -@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands -@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a key stroke before ending -@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven -@REM e.g. to debug Maven itself, use -@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 -@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files -@REM ---------------------------------------------------------------------------- - -@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' -@echo off -@REM enable echoing my setting MAVEN_BATCH_ECHO to 'on' -@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% - -@REM set %HOME% to equivalent of $HOME -if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%") - -@REM Execute a user defined script before this one -if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre -@REM check for pre script, once with legacy .bat ending and once with .cmd ending -if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat" -if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd" -:skipRcPre - -@setlocal - -set ERROR_CODE=0 - -@REM To isolate internal variables from possible post scripts, we use another setlocal -@setlocal - -@REM ==== START VALIDATION ==== -if not "%JAVA_HOME%" == "" goto OkJHome - -echo. -echo Error: JAVA_HOME not found in your environment. >&2 -echo Please set the JAVA_HOME variable in your environment to match the >&2 -echo location of your Java installation. >&2 -echo. -goto error - -:OkJHome -if exist "%JAVA_HOME%\bin\java.exe" goto init - -echo. -echo Error: JAVA_HOME is set to an invalid directory. >&2 -echo JAVA_HOME = "%JAVA_HOME%" >&2 -echo Please set the JAVA_HOME variable in your environment to match the >&2 -echo location of your Java installation. >&2 -echo. -goto error - -@REM ==== END VALIDATION ==== - -:init - -@REM Find the project base dir, i.e. the directory that contains the folder ".mvn". -@REM Fallback to current working directory if not found. - -set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR% -IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir - -set EXEC_DIR=%CD% -set WDIR=%EXEC_DIR% -:findBaseDir -IF EXIST "%WDIR%"\.mvn goto baseDirFound -cd .. -IF "%WDIR%"=="%CD%" goto baseDirNotFound -set WDIR=%CD% -goto findBaseDir - -:baseDirFound -set MAVEN_PROJECTBASEDIR=%WDIR% -cd "%EXEC_DIR%" -goto endDetectBaseDir - -:baseDirNotFound -set MAVEN_PROJECTBASEDIR=%EXEC_DIR% -cd "%EXEC_DIR%" - -:endDetectBaseDir - -IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig - -@setlocal EnableExtensions EnableDelayedExpansion -for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a -@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS% - -:endReadAdditionalConfig - -SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" - -set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar" -set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain - -%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %* -if ERRORLEVEL 1 goto error -goto end - -:error -set ERROR_CODE=1 - -:end -@endlocal & set ERROR_CODE=%ERROR_CODE% - -if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost -@REM check for post script, once with legacy .bat ending and once with .cmd ending -if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat" -if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd" -:skipRcPost - -@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on' -if "%MAVEN_BATCH_PAUSE%" == "on" pause - -if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE% - -exit /B %ERROR_CODE% diff --git a/order-service/node-1.bat b/order-service/node-1.bat deleted file mode 100644 index ce7f070394f8bc9fd92423512f7ba75f8eb3dd47..0000000000000000000000000000000000000000 --- a/order-service/node-1.bat +++ /dev/null @@ -1 +0,0 @@ -java -jar .\target\Micro-Service-Skeleton-Order-Service-0.0.1-SNAPSHOT.jar --spring.profiles.active=node1 \ No newline at end of file diff --git a/order-service/node-2.bat b/order-service/node-2.bat deleted file mode 100644 index 4a2388730b8b3c1c54c390f59369db903e62322b..0000000000000000000000000000000000000000 --- a/order-service/node-2.bat +++ /dev/null @@ -1 +0,0 @@ -java -jar .\target\Micro-Service-Skeleton-Order-Service-0.0.1-SNAPSHOT.jar --spring.profiles.active=node2 \ No newline at end of file diff --git a/order-service/pom.xml b/order-service/pom.xml deleted file mode 100644 index 874cf152e4e4bf433617f0a1874f74b24ea1e81d..0000000000000000000000000000000000000000 --- a/order-service/pom.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - 4.0.0 - - com.microservice.skeleton - Micro-Service-Skeleton-Parent - 0.0.1-SNAPSHOT - - com.example - Micro-Service-Skeleton-Order-Service - 0.0.1-SNAPSHOT - jar - - order-service - Demo project for Spring Boot - - - - - org.springframework.cloud - spring-cloud-starter-eureka - - - org.springframework.boot - spring-boot-starter-actuator - - - org.springframework.boot - spring-boot-starter-test - test - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - - - - diff --git a/order-service/src/main/java/com/microservice/skeleton/order/OrderServiceApplication.java b/order-service/src/main/java/com/microservice/skeleton/order/OrderServiceApplication.java deleted file mode 100644 index cff0b228fb9d0601fd7e60e59239b7d60188e43c..0000000000000000000000000000000000000000 --- a/order-service/src/main/java/com/microservice/skeleton/order/OrderServiceApplication.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.microservice.skeleton.order; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.cloud.client.discovery.EnableDiscoveryClient; - -@SpringBootApplication -@EnableDiscoveryClient -public class OrderServiceApplication { - - public static void main(String[] args) { - SpringApplication.run(OrderServiceApplication.class, args); - } -} diff --git a/order-service/src/main/java/com/microservice/skeleton/order/controller/OrderController.java b/order-service/src/main/java/com/microservice/skeleton/order/controller/OrderController.java deleted file mode 100644 index 212ecfd54015d899c77911b1bdec9cd4ecb63b9b..0000000000000000000000000000000000000000 --- a/order-service/src/main/java/com/microservice/skeleton/order/controller/OrderController.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.microservice.skeleton.order.controller; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.cloud.client.ServiceInstance; -import org.springframework.cloud.client.discovery.DiscoveryClient; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RestController; - -/** - * Created by Mr.Yangxiufeng on 2017/12/9. - * Time:16:44 - * ProjectName:Mirco-Service-Skeleton - */ -@RestController -public class OrderController { - - private static final Logger LOGGER = LoggerFactory.getLogger(OrderController.class); - - @Autowired - private DiscoveryClient client; - @RequestMapping(value = "/hello",method = RequestMethod.GET) - public String index(){ - ServiceInstance instance = client.getLocalServiceInstance(); - LOGGER.info("here...................."); - return "Hello World : "+ instance.getServiceId()+",port:" + instance.getPort(); - } - -} diff --git a/order-service/src/main/resources/application-node1.yml b/order-service/src/main/resources/application-node1.yml deleted file mode 100644 index 7664837fb94688d5173fc891a769ad0b41432d65..0000000000000000000000000000000000000000 --- a/order-service/src/main/resources/application-node1.yml +++ /dev/null @@ -1,20 +0,0 @@ -server: - port: 9020 -spring: - application: - name: order-service -eureka: - instance: - prefer-ip-address: true - instance-id: ${spring.cloud.client.ipAddress}:${server.port} - client: - service-url: - defaultZone: http://register1:9010/eureka/,http://register2:9011/eureka/ -endpoints: - health: - sensitive: false -management: - security: - enabled: false - - diff --git a/order-service/src/main/resources/application-node2.yml b/order-service/src/main/resources/application-node2.yml deleted file mode 100644 index f2acf596f99e461486e05c42785d1cac84c55c36..0000000000000000000000000000000000000000 --- a/order-service/src/main/resources/application-node2.yml +++ /dev/null @@ -1,21 +0,0 @@ -server: - port: 9022 -spring: - application: - name: order-service -eureka: - instance: - prefer-ip-address: true - instance-id: ${spring.cloud.client.ipAddress}:${server.port} - client: - service-url: - defaultZone: http://register1:9010/eureka/,http://register2:9011/eureka/ - -endpoints: - health: - sensitive: false -management: - security: - enabled: false - - diff --git a/order-service/src/main/resources/application.yml b/order-service/src/main/resources/application.yml deleted file mode 100644 index 716068f57492de7c2ae058ae1696971bd9a525cc..0000000000000000000000000000000000000000 --- a/order-service/src/main/resources/application.yml +++ /dev/null @@ -1,23 +0,0 @@ -server: - port: 9020 -spring: - application: - name: order-service - zipkin: - base-url: http://10.10.8.2:9050 -eureka: - instance: - prefer-ip-address: true - instance-id: ${spring.cloud.client.ipAddress}:${server.port} - client: - service-url: - defaultZone: http://register1:9010/eureka/,http://register2:9011/eureka/ - -endpoints: - health: - sensitive: false -management: - security: - enabled: false - - diff --git a/order-service/src/test/java/com/microservice/skeleton/order/HelloServiceApplicationTests.java b/order-service/src/test/java/com/microservice/skeleton/order/HelloServiceApplicationTests.java deleted file mode 100644 index e5240fc3008250bd58e09b83209276925fc50008..0000000000000000000000000000000000000000 --- a/order-service/src/test/java/com/microservice/skeleton/order/HelloServiceApplicationTests.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.microservice.skeleton.order; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; - -@RunWith(SpringRunner.class) -@SpringBootTest -public class HelloServiceApplicationTests { - - @Test - public void contextLoads() { - } - -} diff --git a/pom.xml b/pom.xml index 9d9e9e1be0eb2a94be34b83b902cf6d03422b3f6..a8729012d665ef087b0c1c2eed33934f94f705e2 100644 --- a/pom.xml +++ b/pom.xml @@ -24,14 +24,11 @@ 1.5.9.RELEASE - register - gateway - user-service - order-service - auth-center - resource - upload-service - monitor + mss-eureka + mss-oauth + mss-gateway + mss-monitor + mss-resource diff --git a/register/src/main/resources/application-node-1.yml b/register/src/main/resources/application-node-1.yml deleted file mode 100644 index 4ef49fd282dce457cf88e0d7a824d8452960d339..0000000000000000000000000000000000000000 --- a/register/src/main/resources/application-node-1.yml +++ /dev/null @@ -1,13 +0,0 @@ -server: - port: 9010 -spring: - application: - name: register ##name蹇呴』涓鏍凤紝涓嶇劧楂樺彲鐢ㄤ細瀵艰嚧unavailable-replicas -eureka: - instance: - hostname: register1 - client: - register-with-eureka: true ##杩欓噷瑕佽鐩朼pplication鐨勮缃紝涓嶇劧浼氳鍙朼pplication鏂囦欢瀵艰嚧unavailable-replicas - fetch-registry: true ##杩欓噷瑕佽鐩朼pplication鐨勮缃紝涓嶇劧浼氳鍙朼pplication鏂囦欢瀵艰嚧unavailable-replicas - service-url: - defaultZone: http://register2:9011/eureka/ \ No newline at end of file diff --git a/register/src/main/resources/application-node-2.yml b/register/src/main/resources/application-node-2.yml deleted file mode 100644 index 9962374cae11b10f2f10a547198c1aa3dd3f1756..0000000000000000000000000000000000000000 --- a/register/src/main/resources/application-node-2.yml +++ /dev/null @@ -1,13 +0,0 @@ -server: - port: 9011 -spring: - application: - name: register ##name蹇呴』涓鏍凤紝涓嶇劧楂樺彲鐢ㄤ細瀵艰嚧unavailable-replicas -eureka: - instance: - hostname: register2 - client: - register-with-eureka: true ##杩欓噷瑕佽鐩朼pplication鐨勮缃紝涓嶇劧浼氳鍙朼pplication鏂囦欢瀵艰嚧unavailable-replicas - fetch-registry: true ##杩欓噷瑕佽鐩朼pplication鐨勮缃紝涓嶇劧浼氳鍙朼pplication鏂囦欢瀵艰嚧unavailable-replicas - service-url: - defaultZone: http://register1:9010/eureka/ \ No newline at end of file diff --git a/resource/.gitignore b/resource/.gitignore deleted file mode 100644 index 2af7cefb0a3f1e7df2fc27b8421f0e16b460e680..0000000000000000000000000000000000000000 --- a/resource/.gitignore +++ /dev/null @@ -1,24 +0,0 @@ -target/ -!.mvn/wrapper/maven-wrapper.jar - -### STS ### -.apt_generated -.classpath -.factorypath -.project -.settings -.springBeans - -### IntelliJ IDEA ### -.idea -*.iws -*.iml -*.ipr - -### NetBeans ### -nbproject/private/ -build/ -nbbuild/ -dist/ -nbdist/ -.nb-gradle/ \ No newline at end of file diff --git a/resource/src/main/resources/application.yml b/resource/src/main/resources/application.yml deleted file mode 100644 index 54e6de2e744e227f52388d33461042d79dfff729..0000000000000000000000000000000000000000 --- a/resource/src/main/resources/application.yml +++ /dev/null @@ -1,30 +0,0 @@ -server: - port: 9023 -spring: - application: - name: resource - zipkin: - base-url: http://10.10.8.2:9050 -eureka: - instance: - prefer-ip-address: true # - instance-id: ${spring.cloud.client.ipAddress}:${server.port} - client: - service-url: - defaultZone: http://register1:9010/eureka/,http://register2:9011/eureka/ -###actuator锟斤拷氐锟 start#### -endpoints: - health: - sensitive: false - enabled: true -##默锟斤拷锟斤拷锟斤拷潞芏锟剿碉拷锟角诧拷锟斤拷锟斤拷锟斤拷实模锟斤拷岱碉拷锟401:Unauthorized -management: - security: - enabled: false -###actuator锟斤拷氐锟 end#### -security: - oauth2: - resource: - id: resource - user-info-uri: http://10.10.8.2:9030/uaa/user - prefer-token-info: false \ No newline at end of file diff --git a/upload-service/.gitignore b/upload-service/.gitignore deleted file mode 100644 index 2af7cefb0a3f1e7df2fc27b8421f0e16b460e680..0000000000000000000000000000000000000000 --- a/upload-service/.gitignore +++ /dev/null @@ -1,24 +0,0 @@ -target/ -!.mvn/wrapper/maven-wrapper.jar - -### STS ### -.apt_generated -.classpath -.factorypath -.project -.settings -.springBeans - -### IntelliJ IDEA ### -.idea -*.iws -*.iml -*.ipr - -### NetBeans ### -nbproject/private/ -build/ -nbbuild/ -dist/ -nbdist/ -.nb-gradle/ \ No newline at end of file diff --git a/upload-service/pom.xml b/upload-service/pom.xml deleted file mode 100644 index 4a574c1104e39de5af66488d48d25af008d22f55..0000000000000000000000000000000000000000 --- a/upload-service/pom.xml +++ /dev/null @@ -1,52 +0,0 @@ - - - 4.0.0 - - - com.microservice.skeleton - Micro-Service-Skeleton-Parent - 0.0.1-SNAPSHOT - - Micro-Service-Skeleton-upload - 0.0.1-SNAPSHOT - jar - - upload-service - Demo project for Spring Boot - - - - - - org.springframework.cloud - spring-cloud-starter-eureka - - - org.springframework.boot - spring-boot-starter-web - - - - org.springframework.boot - spring-boot-starter-test - test - - - org.springframework.boot - spring-boot-starter-actuator - - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - - - - diff --git a/upload-service/src/main/java/com/microservice/skeleton/upload/UploadServiceApplication.java b/upload-service/src/main/java/com/microservice/skeleton/upload/UploadServiceApplication.java deleted file mode 100644 index 511514b442340bc7aa859c465450052a21f14d2a..0000000000000000000000000000000000000000 --- a/upload-service/src/main/java/com/microservice/skeleton/upload/UploadServiceApplication.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.microservice.skeleton.upload; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.cloud.client.discovery.EnableDiscoveryClient; - -@SpringBootApplication -@EnableDiscoveryClient -public class UploadServiceApplication { - - public static void main(String[] args) { - SpringApplication.run(UploadServiceApplication.class, args); - } -} diff --git a/upload-service/src/main/java/com/microservice/skeleton/upload/controller/FileUploadController.java b/upload-service/src/main/java/com/microservice/skeleton/upload/controller/FileUploadController.java deleted file mode 100644 index 57ddbea9bfb1fe81a4f46cf3d4c2be68a00bd788..0000000000000000000000000000000000000000 --- a/upload-service/src/main/java/com/microservice/skeleton/upload/controller/FileUploadController.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.microservice.skeleton.upload.controller; - -import org.springframework.stereotype.Controller; - -/** - * Created by Mr.Yangxiufeng on 2017/12/25. - * Time:16:59 - * ProjectName:Mirco-Service-Skeleton - */ -@Controller -public class FileUploadController { - - - -} diff --git a/upload-service/src/main/resources/application.yml b/upload-service/src/main/resources/application.yml deleted file mode 100644 index 19772b394b75182d6ddd90b9e95529c1dc6ca01b..0000000000000000000000000000000000000000 --- a/upload-service/src/main/resources/application.yml +++ /dev/null @@ -1,27 +0,0 @@ -spring: - application: - name: upload-service - http: - multipart: - max-file-size: 2000MB - max-request-size: 2500MB -server: - port: 9040 -eureka: - instance: - prefer-ip-address: true #使锟斤拷IP注锟斤拷 - instance-id: ${spring.cloud.client.ipAddress}:${server.port} - client: - service-url: - defaultZone: http://register1:9010/eureka/,http://register2:9011/eureka/ - -###actuator锟斤拷氐锟 start#### -endpoints: - health: - sensitive: false - enabled: true -##默锟斤拷锟斤拷锟斤拷潞芏锟剿碉拷锟角诧拷锟斤拷锟斤拷锟斤拷实模锟斤拷岱碉拷锟401:Unauthorized -management: - security: - enabled: false -###actuator锟斤拷氐锟 end#### diff --git a/upload-service/src/test/java/com/microservice/skeleton/upload/UploadServiceApplicationTests.java b/upload-service/src/test/java/com/microservice/skeleton/upload/UploadServiceApplicationTests.java deleted file mode 100644 index 9e7ff50d0d27d9ce60e33a363b5a306eeeec3970..0000000000000000000000000000000000000000 --- a/upload-service/src/test/java/com/microservice/skeleton/upload/UploadServiceApplicationTests.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.microservice.skeleton.upload; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; - -@RunWith(SpringRunner.class) -@SpringBootTest -public class UploadServiceApplicationTests { - - @Test - public void contextLoads() { - } - -} diff --git a/user-service/.gitignore b/user-service/.gitignore deleted file mode 100644 index 2af7cefb0a3f1e7df2fc27b8421f0e16b460e680..0000000000000000000000000000000000000000 --- a/user-service/.gitignore +++ /dev/null @@ -1,24 +0,0 @@ -target/ -!.mvn/wrapper/maven-wrapper.jar - -### STS ### -.apt_generated -.classpath -.factorypath -.project -.settings -.springBeans - -### IntelliJ IDEA ### -.idea -*.iws -*.iml -*.ipr - -### NetBeans ### -nbproject/private/ -build/ -nbbuild/ -dist/ -nbdist/ -.nb-gradle/ \ No newline at end of file diff --git a/user-service/.mvn/wrapper/maven-wrapper.jar b/user-service/.mvn/wrapper/maven-wrapper.jar deleted file mode 100644 index 9cc84ea9b4d95453115d0c26488d6a78694e0bc6..0000000000000000000000000000000000000000 Binary files a/user-service/.mvn/wrapper/maven-wrapper.jar and /dev/null differ diff --git a/user-service/.mvn/wrapper/maven-wrapper.properties b/user-service/.mvn/wrapper/maven-wrapper.properties deleted file mode 100644 index 9dda3b659b46d7920f90046b0e3f106d2a59c68c..0000000000000000000000000000000000000000 --- a/user-service/.mvn/wrapper/maven-wrapper.properties +++ /dev/null @@ -1 +0,0 @@ -distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.5.2/apache-maven-3.5.2-bin.zip diff --git a/user-service/mvnw b/user-service/mvnw deleted file mode 100644 index 5bf251c0774593ca4f5335acf0f7483eaa162e8f..0000000000000000000000000000000000000000 --- a/user-service/mvnw +++ /dev/null @@ -1,225 +0,0 @@ -#!/bin/sh -# ---------------------------------------------------------------------------- -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# ---------------------------------------------------------------------------- - -# ---------------------------------------------------------------------------- -# Maven2 Start Up Batch script -# -# Required ENV vars: -# ------------------ -# JAVA_HOME - location of a JDK home dir -# -# Optional ENV vars -# ----------------- -# M2_HOME - location of maven2's installed home dir -# MAVEN_OPTS - parameters passed to the Java VM when running Maven -# e.g. to debug Maven itself, use -# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 -# MAVEN_SKIP_RC - flag to disable loading of mavenrc files -# ---------------------------------------------------------------------------- - -if [ -z "$MAVEN_SKIP_RC" ] ; then - - if [ -f /etc/mavenrc ] ; then - . /etc/mavenrc - fi - - if [ -f "$HOME/.mavenrc" ] ; then - . "$HOME/.mavenrc" - fi - -fi - -# OS specific support. $var _must_ be set to either true or false. -cygwin=false; -darwin=false; -mingw=false -case "`uname`" in - CYGWIN*) cygwin=true ;; - MINGW*) mingw=true;; - Darwin*) darwin=true - # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home - # See https://developer.apple.com/library/mac/qa/qa1170/_index.html - if [ -z "$JAVA_HOME" ]; then - if [ -x "/usr/libexec/java_home" ]; then - export JAVA_HOME="`/usr/libexec/java_home`" - else - export JAVA_HOME="/Library/Java/Home" - fi - fi - ;; -esac - -if [ -z "$JAVA_HOME" ] ; then - if [ -r /etc/gentoo-release ] ; then - JAVA_HOME=`java-config --jre-home` - fi -fi - -if [ -z "$M2_HOME" ] ; then - ## resolve links - $0 may be a link to maven's home - PRG="$0" - - # need this for relative symlinks - while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG="`dirname "$PRG"`/$link" - fi - done - - saveddir=`pwd` - - M2_HOME=`dirname "$PRG"`/.. - - # make it fully qualified - M2_HOME=`cd "$M2_HOME" && pwd` - - cd "$saveddir" - # echo Using m2 at $M2_HOME -fi - -# For Cygwin, ensure paths are in UNIX format before anything is touched -if $cygwin ; then - [ -n "$M2_HOME" ] && - M2_HOME=`cygpath --unix "$M2_HOME"` - [ -n "$JAVA_HOME" ] && - JAVA_HOME=`cygpath --unix "$JAVA_HOME"` - [ -n "$CLASSPATH" ] && - CLASSPATH=`cygpath --path --unix "$CLASSPATH"` -fi - -# For Migwn, ensure paths are in UNIX format before anything is touched -if $mingw ; then - [ -n "$M2_HOME" ] && - M2_HOME="`(cd "$M2_HOME"; pwd)`" - [ -n "$JAVA_HOME" ] && - JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`" - # TODO classpath? -fi - -if [ -z "$JAVA_HOME" ]; then - javaExecutable="`which javac`" - if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then - # readlink(1) is not available as standard on Solaris 10. - readLink=`which readlink` - if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then - if $darwin ; then - javaHome="`dirname \"$javaExecutable\"`" - javaExecutable="`cd \"$javaHome\" && pwd -P`/javac" - else - javaExecutable="`readlink -f \"$javaExecutable\"`" - fi - javaHome="`dirname \"$javaExecutable\"`" - javaHome=`expr "$javaHome" : '\(.*\)/bin'` - JAVA_HOME="$javaHome" - export JAVA_HOME - fi - fi -fi - -if [ -z "$JAVACMD" ] ; then - if [ -n "$JAVA_HOME" ] ; then - if [ -x "$JAVA_HOME/jre/sh/java" ] ; then - # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" - else - JAVACMD="$JAVA_HOME/bin/java" - fi - else - JAVACMD="`which java`" - fi -fi - -if [ ! -x "$JAVACMD" ] ; then - echo "Error: JAVA_HOME is not defined correctly." >&2 - echo " We cannot execute $JAVACMD" >&2 - exit 1 -fi - -if [ -z "$JAVA_HOME" ] ; then - echo "Warning: JAVA_HOME environment variable is not set." -fi - -CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher - -# traverses directory structure from process work directory to filesystem root -# first directory with .mvn subdirectory is considered project base directory -find_maven_basedir() { - - if [ -z "$1" ] - then - echo "Path not specified to find_maven_basedir" - return 1 - fi - - basedir="$1" - wdir="$1" - while [ "$wdir" != '/' ] ; do - if [ -d "$wdir"/.mvn ] ; then - basedir=$wdir - break - fi - # workaround for JBEAP-8937 (on Solaris 10/Sparc) - if [ -d "${wdir}" ]; then - wdir=`cd "$wdir/.."; pwd` - fi - # end of workaround - done - echo "${basedir}" -} - -# concatenates all lines of a file -concat_lines() { - if [ -f "$1" ]; then - echo "$(tr -s '\n' ' ' < "$1")" - fi -} - -BASE_DIR=`find_maven_basedir "$(pwd)"` -if [ -z "$BASE_DIR" ]; then - exit 1; -fi - -export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"} -echo $MAVEN_PROJECTBASEDIR -MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" - -# For Cygwin, switch paths to Windows format before running java -if $cygwin; then - [ -n "$M2_HOME" ] && - M2_HOME=`cygpath --path --windows "$M2_HOME"` - [ -n "$JAVA_HOME" ] && - JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` - [ -n "$CLASSPATH" ] && - CLASSPATH=`cygpath --path --windows "$CLASSPATH"` - [ -n "$MAVEN_PROJECTBASEDIR" ] && - MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"` -fi - -WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain - -exec "$JAVACMD" \ - $MAVEN_OPTS \ - -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ - "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ - ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@" diff --git a/user-service/mvnw.cmd b/user-service/mvnw.cmd deleted file mode 100644 index 019bd74d766ebd4c033528112148d866555b5c9e..0000000000000000000000000000000000000000 --- a/user-service/mvnw.cmd +++ /dev/null @@ -1,143 +0,0 @@ -@REM ---------------------------------------------------------------------------- -@REM Licensed to the Apache Software Foundation (ASF) under one -@REM or more contributor license agreements. See the NOTICE file -@REM distributed with this work for additional information -@REM regarding copyright ownership. The ASF licenses this file -@REM to you under the Apache License, Version 2.0 (the -@REM "License"); you may not use this file except in compliance -@REM with the License. You may obtain a copy of the License at -@REM -@REM http://www.apache.org/licenses/LICENSE-2.0 -@REM -@REM Unless required by applicable law or agreed to in writing, -@REM software distributed under the License is distributed on an -@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -@REM KIND, either express or implied. See the License for the -@REM specific language governing permissions and limitations -@REM under the License. -@REM ---------------------------------------------------------------------------- - -@REM ---------------------------------------------------------------------------- -@REM Maven2 Start Up Batch script -@REM -@REM Required ENV vars: -@REM JAVA_HOME - location of a JDK home dir -@REM -@REM Optional ENV vars -@REM M2_HOME - location of maven2's installed home dir -@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands -@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a key stroke before ending -@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven -@REM e.g. to debug Maven itself, use -@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 -@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files -@REM ---------------------------------------------------------------------------- - -@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' -@echo off -@REM enable echoing my setting MAVEN_BATCH_ECHO to 'on' -@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% - -@REM set %HOME% to equivalent of $HOME -if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%") - -@REM Execute a user defined script before this one -if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre -@REM check for pre script, once with legacy .bat ending and once with .cmd ending -if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat" -if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd" -:skipRcPre - -@setlocal - -set ERROR_CODE=0 - -@REM To isolate internal variables from possible post scripts, we use another setlocal -@setlocal - -@REM ==== START VALIDATION ==== -if not "%JAVA_HOME%" == "" goto OkJHome - -echo. -echo Error: JAVA_HOME not found in your environment. >&2 -echo Please set the JAVA_HOME variable in your environment to match the >&2 -echo location of your Java installation. >&2 -echo. -goto error - -:OkJHome -if exist "%JAVA_HOME%\bin\java.exe" goto init - -echo. -echo Error: JAVA_HOME is set to an invalid directory. >&2 -echo JAVA_HOME = "%JAVA_HOME%" >&2 -echo Please set the JAVA_HOME variable in your environment to match the >&2 -echo location of your Java installation. >&2 -echo. -goto error - -@REM ==== END VALIDATION ==== - -:init - -@REM Find the project base dir, i.e. the directory that contains the folder ".mvn". -@REM Fallback to current working directory if not found. - -set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR% -IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir - -set EXEC_DIR=%CD% -set WDIR=%EXEC_DIR% -:findBaseDir -IF EXIST "%WDIR%"\.mvn goto baseDirFound -cd .. -IF "%WDIR%"=="%CD%" goto baseDirNotFound -set WDIR=%CD% -goto findBaseDir - -:baseDirFound -set MAVEN_PROJECTBASEDIR=%WDIR% -cd "%EXEC_DIR%" -goto endDetectBaseDir - -:baseDirNotFound -set MAVEN_PROJECTBASEDIR=%EXEC_DIR% -cd "%EXEC_DIR%" - -:endDetectBaseDir - -IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig - -@setlocal EnableExtensions EnableDelayedExpansion -for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a -@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS% - -:endReadAdditionalConfig - -SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" - -set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar" -set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain - -%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %* -if ERRORLEVEL 1 goto error -goto end - -:error -set ERROR_CODE=1 - -:end -@endlocal & set ERROR_CODE=%ERROR_CODE% - -if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost -@REM check for post script, once with legacy .bat ending and once with .cmd ending -if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat" -if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd" -:skipRcPost - -@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on' -if "%MAVEN_BATCH_PAUSE%" == "on" pause - -if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE% - -exit /B %ERROR_CODE% diff --git a/user-service/pom.xml b/user-service/pom.xml deleted file mode 100644 index 44a44040277965d85a50dc65ffaf5e41754b8a5f..0000000000000000000000000000000000000000 --- a/user-service/pom.xml +++ /dev/null @@ -1,57 +0,0 @@ - - - 4.0.0 - - - - com.microservice.skeleton - Micro-Service-Skeleton-Parent - 0.0.1-SNAPSHOT - - Micro-Service-Skeleton-User-Service - 0.0.1-SNAPSHOT - jar - - user-service - Demo project for Spring Boot - - - UTF-8 - UTF-8 - 1.8 - Edgware.RELEASE - - - - - org.springframework.cloud - spring-cloud-starter-eureka - - - - org.springframework.boot - spring-boot-starter-test - test - - - org.springframework.boot - spring-boot-starter-actuator - - - org.springframework.cloud - spring-cloud-starter-hystrix - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - - - - diff --git a/user-service/src/main/java/com/mircoservice/skeleton/user/service/UserServiceApplication.java b/user-service/src/main/java/com/mircoservice/skeleton/user/service/UserServiceApplication.java deleted file mode 100644 index d3efa4061ef097e3f92cf2667e9d2e3fe6a90b95..0000000000000000000000000000000000000000 --- a/user-service/src/main/java/com/mircoservice/skeleton/user/service/UserServiceApplication.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.mircoservice.skeleton.user.service; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.cloud.client.circuitbreaker.EnableCircuitBreaker; -import org.springframework.cloud.client.discovery.EnableDiscoveryClient; -import org.springframework.cloud.client.loadbalancer.LoadBalanced; -import org.springframework.context.annotation.Bean; -import org.springframework.web.client.RestTemplate; - -@SpringBootApplication -@EnableDiscoveryClient -@EnableCircuitBreaker -public class UserServiceApplication { - - public static void main(String[] args) { - SpringApplication.run(UserServiceApplication.class, args); - } - @Bean - @LoadBalanced - RestTemplate restTemplate(){ - return new RestTemplate(); - } -} diff --git a/user-service/src/main/java/com/mircoservice/skeleton/user/service/config/WebConfig.java b/user-service/src/main/java/com/mircoservice/skeleton/user/service/config/WebConfig.java deleted file mode 100644 index 84550918f5d04f7c9e3b5aee4d625c866385dab0..0000000000000000000000000000000000000000 --- a/user-service/src/main/java/com/mircoservice/skeleton/user/service/config/WebConfig.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.mircoservice.skeleton.user.service.config; - -import org.springframework.context.annotation.Configuration; - -/** - * Created by Mr.Yangxiufeng on 2017/12/25. - * Time:14:27 - * ProjectName:Mirco-Service-Skeleton - */ -@Configuration -public class WebConfig { -} diff --git a/user-service/src/main/java/com/mircoservice/skeleton/user/service/controller/SimpleController.java b/user-service/src/main/java/com/mircoservice/skeleton/user/service/controller/SimpleController.java deleted file mode 100644 index 43a87d98428b5533cdbcdbf84a27d4197acc5e22..0000000000000000000000000000000000000000 --- a/user-service/src/main/java/com/mircoservice/skeleton/user/service/controller/SimpleController.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.mircoservice.skeleton.user.service.controller; - -import com.netflix.hystrix.contrib.javanica.annotation.HystrixCommand; -import com.netflix.hystrix.contrib.javanica.cache.annotation.CacheResult; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -import org.springframework.web.client.RestTemplate; - -/** - * Created by Mr.Yangxiufeng on 2017/12/9. - * Time:15:58 - * ProjectName:Mirco-Service-Skeleton - */ -@RestController -public class SimpleController { - @Autowired - RestTemplate restTemplate; - - @RequestMapping(value = "getWord") - @HystrixCommand(fallbackMethod = "helloFallback",commandKey = "getWord",groupKey = "SimpleController",threadPoolKey = "SimplePool") -// @CacheResult(cacheKeyMethod = "getKey") - public String getWord(){ - return restTemplate.getForEntity("http://order-service/hello",String.class).getBody(); - } - private String helloFallback(){ - return "error"; - } - private String getKey(){ - return "word"; - } -} diff --git a/user-service/src/main/java/com/mircoservice/skeleton/user/service/filter/HystrixRequestContextServletFilter.java b/user-service/src/main/java/com/mircoservice/skeleton/user/service/filter/HystrixRequestContextServletFilter.java deleted file mode 100644 index 0fefbca0dd2108c9920c372de48898b3111d34a7..0000000000000000000000000000000000000000 --- a/user-service/src/main/java/com/mircoservice/skeleton/user/service/filter/HystrixRequestContextServletFilter.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.mircoservice.skeleton.user.service.filter; - -import com.netflix.hystrix.strategy.concurrency.HystrixRequestContext; -import org.springframework.stereotype.Component; - -import javax.servlet.*; -import javax.servlet.annotation.WebFilter; -import java.io.IOException; - -/** - * Created by Mr.Yangxiufeng on 2017/12/25. - * Time:14:20 - * ProjectName:Mirco-Service-Skeleton - */ -@Component -@WebFilter(filterName = "HystrixRequestContextServletFilter",urlPatterns = "/*",asyncSupported = true) -public class HystrixRequestContextServletFilter implements Filter { - @Override - public void init(FilterConfig filterConfig) throws ServletException { - - } - - @Override - public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException { - HystrixRequestContext context = HystrixRequestContext.initializeContext(); - chain.doFilter(request,response); - } - - @Override - public void destroy() { - - } -} diff --git a/user-service/src/main/resources/application.yml b/user-service/src/main/resources/application.yml deleted file mode 100644 index f60286eab2f5b0bc1a6ad4cec94ca3cb03cbf838..0000000000000000000000000000000000000000 --- a/user-service/src/main/resources/application.yml +++ /dev/null @@ -1,48 +0,0 @@ -server: - port: 9021 -spring: - application: - name: user-service - zipkin: - base-url: http://10.10.8.2:9050 - cloud: - loadbalancer: - retry: - enabled: true -eureka: - instance: - prefer-ip-address: true #浣跨敤IP娉ㄥ唽 - instance-id: ${spring.cloud.client.ipAddress}:${server.port} - client: - service-url: - defaultZone: http://register1:9010/eureka/,http://register2:9011/eureka/ - -###actuator鐩戞帶鐐 start#### -endpoints: - health: - sensitive: false - enabled: true -##榛樿鎯呭喌涓嬪緢澶氱鐐规槸涓嶅厑璁歌闂殑锛屼細杩斿洖401:Unauthorized -management: - security: - enabled: false -###actuator鐩戞帶鐐 end#### - -ribbon: - ConnectTimeout: 3000 - ReadTimeout: 3000 - #鍚屼竴瀹炰緥鏈澶ч噸璇曟鏁帮紝涓嶅寘鎷娆¤皟鐢 - maxAutoRetries: 1 - # 閲嶈瘯鍏朵粬瀹炰緥鐨勬渶澶ч噸璇曟鏁帮紝涓嶅寘鎷娆℃墍閫夌殑server - MaxAutoRetriesNextServer: 2 - # 鏄惁鎵鏈夋搷浣滈兘杩涜閲嶈瘯 - OkToRetryOnAllOperations: true -hystrix: - command: - default: - execution: - timeout: - enabled: true - isolation: - thread: - timeoutInMilliseconds: 600000 \ No newline at end of file diff --git a/user-service/src/test/java/com/mircoservice/skeleton/user/service/MicroAServiceApplicationTests.java b/user-service/src/test/java/com/mircoservice/skeleton/user/service/MicroAServiceApplicationTests.java deleted file mode 100644 index d5d913a5a6fbc08f8d6b90a64c1b461aa8cd16b8..0000000000000000000000000000000000000000 --- a/user-service/src/test/java/com/mircoservice/skeleton/user/service/MicroAServiceApplicationTests.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.mircoservice.skeleton.user.service; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; - -@RunWith(SpringRunner.class) -@SpringBootTest -public class MicroAServiceApplicationTests { - - @Test - public void contextLoads() { - } - -}