集成配置中心

api-gateway/pom.xml

@@ -26,34 +26,31 @@
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-zuul</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-actuator</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-feign</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-hystrix</artifactId>
+            <artifactId>spring-cloud-starter-oauth2</artifactId>
         </dependency>
+        <!--config-->
         <dependency>
             <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-ribbon</artifactId>
+            <artifactId>spring-cloud-config-client</artifactId>
         </dependency>
+        <!--zipkin-->
         <dependency>
             <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-security</artifactId>
+            <artifactId>spring-cloud-sleuth-zipkin-stream</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-oauth2</artifactId>
+            <artifactId>spring-cloud-starter-stream-rabbit</artifactId>
         </dependency>
-        <!--RabbitMQ-->
         <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-amqp</artifactId>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-sleuth</artifactId>
         </dependency>
     </dependencies>
 

api-gateway/src/main/resources/bootstrap.yml

@@ -0,0 +1,18 @@
+spring:
+  application:
+    name: api-gateway
+  profiles:
+    active: dev
+  cloud:
+    consul:
+      host: ${CONSUL_HOST:localhost}
+      port: ${CONSUL_PORT:8500}
+      discovery:
+        prefer-ip-address: true
+    config:
+      fail-fast: true
+      discovery:
+        service-id: config-server
+        enabled: true
+      profile: ${spring.profiles.active}
+      label: ${spring.profiles.active}

auth-center/auth-center-provider/pom.xml

@@ -43,11 +43,7 @@
             <artifactId>mysql-connector-java</artifactId>
             <version>5.1.43</version>
         </dependency>
-
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-actuator</artifactId>
-        </dependency>
+        <!--discovery、ribbon-->
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-consul-discovery</artifactId>
@@ -60,21 +56,12 @@
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-hystrix</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-ribbon</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-security</artifactId>
-        </dependency>
+        <!--security、oauth2-->
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-oauth2</artifactId>
         </dependency>
-
-
+        <!--UI-->
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-freemarker</artifactId>
@@ -95,6 +82,25 @@
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
+        <!--config-->
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-config-client</artifactId>
+        </dependency>
+
+        <!--zipkin-->
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-sleuth-zipkin-stream</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-stream-rabbit</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-sleuth</artifactId>
+        </dependency>
 
     </dependencies>
 

auth-center/auth-center-provider/src/main/resources/bootstrap.yml

@@ -0,0 +1,23 @@
+spring:
+  application:
+    name: auth-center
+  profiles:
+    active: dev
+  cloud:
+    consul:
+      host: ${CONSUL_HOST:localhost}
+      port: ${CONSUL_PORT:8500}
+      discovery:
+        prefer-ip-address: true
+        health-check-path: ${server.context-path}/health
+        tags: management.context-path=${server.context-path}
+    config:
+      fail-fast: true
+      discovery:
+        service-id: config-server
+        enabled: true
+      profile: ${spring.profiles.active}
+      label: ${spring.profiles.active}
+
+server:
+  context-path: /auth

config-git/pom.xml

@@ -10,6 +10,27 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>config-git</artifactId>
+    <description>配置中心</description>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-consul-discovery</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-actuator</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-hystrix</artifactId>
+        </dependency>
+        <!--配置中心服务-->
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-config-server</artifactId>
+        </dependency>
+    </dependencies>
 
 
 </project>

config-git/src/main/java/com/peng/config/git/ConfigServerApplication.java

@@ -0,0 +1,17 @@
+package com.peng.config.git;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.cloud.client.SpringCloudApplication;
+import org.springframework.cloud.config.server.EnableConfigServer;
+
+/**
+ * Created by fp295 on 2018/6/29.
+ */
+@EnableConfigServer
+@SpringCloudApplication
+public class ConfigServerApplication {
+
+    public static void main(String[] args) {
+        SpringApplication.run(ConfigServerApplication.class, args);
+    }
+}

config-git/src/main/resources/bootstrap.yml

@@ -0,0 +1,37 @@
+server:
+  port: 18006
+
+spring:
+  application:
+    name: config-server
+  profiles:
+    active: native
+  cloud:
+    consul:
+      host: ${CONSUL_HOST:localhost}
+      port: ${CONSUL_PORT:8500}
+      discovery:
+        prefer-ip-address: true
+
+---
+spring:
+  profiles: native
+  cloud:
+    config:
+      server:
+        native:
+          search-locations: classpath:/config/
+      fail-fast: true
+
+---
+spring:
+  profiles: prd
+  cloud:
+    config:
+      server:
+        git:
+          uri: https://github.com/ityouknow/spring-cloud-starter/     # 配置git仓库的地址
+          search-paths: config-repo                             # git仓库地址下的相对地址，可以配置多个，用,分割。
+          username:                                             # git仓库的账号
+          password:                                             # git仓库的密码
+

api-gateway/src/main/resources/application.yml → config-git/src/main/resources/config/api-gateway-dev.yml

@@ -1,23 +1,24 @@
-spring:
-  cloud:
-    consul:
-      host: ${CONSUL_HOST:localhost}
-      port: ${CONSUL_PORT:8500}
-      discovery:
-        prefer-ip-address: true
-  application:
-    name: api-gateway
 server:
   port: 18000
+
+spring:
+  rabbitmq:
+    host: localhost
+    port: 5672
+    password: '000000'
+    username: fangp
+
 zuul:
   routes:
     main-data:
       path: /api/main-data/**
       serviceId: main-data
+
 proxy:
   auth:
     routes:
       main-data: oauth2
+
 security:
   ignored: |
     /css/**,/js/**,/favicon.ico,/webjars/**,/images/**,
@@ -28,7 +29,4 @@ security:
       jwt:
         key-uri: http://${AUTH_CENTER_HOST:localhost}:${AUTH_CENTER_PORT:18001}/auth/oauth/token_key
       id: ${spring.application.name}
-      serviceId: ${spring.application.name}
-management:
-  security:
-    enabled: false
+      serviceId: ${spring.application.name}

config-git/src/main/resources/config/application-dev.yml

@@ -0,0 +1,20 @@
+server:
+  tomcat:
+    max-threads: 500 # Maximum amount of worker threads.
+    min-spare-threads: 50 # Minimum amount of worker threads
+
+
+#监控短点配置
+management:
+  security:
+    enabled: false
+  info:
+    git:
+      mode: full
+endpoints:
+  actuator:
+    enabled: true
+  shutdown:
+    enabled: false
+info:
+  version: @project.version@

auth-center/auth-center-provider/src/main/resources/application.yml → config-git/src/main/resources/config/auth-center-dev.yml

@@ -5,19 +5,8 @@ security:
     /jolokia,/configprops,/activiti,/logfile,/refresh,/flyway,/liquibase,/loggers,/druid/**,
     /oauth/deleteToken, /backReferer
 server:
-  context-path: /auth
   port: 18001
 spring:
-  cloud:
-    consul:
-      host: ${CONSUL_HOST:localhost}
-      port: ${CONSUL_PORT:8500}
-      discovery:
-        prefer-ip-address: true
-        health-check-path: ${server.context-path}/health
-        tags: management.context-path=${server.context-path}
-  application:
-    name: auth-center
   redis:
     database: 0
     host: ${REDIS_HOST:localhost}
@@ -52,8 +41,10 @@ spring:
         login-password: "000000"
   freemarker:
       request-context-attribute: request
+  rabbitmq:
+      host: localhost
+      port: 5672
+      username: fangp
+      password: '000000'
 logging:
-  file: logs/auth-center.log
-management:
-  security:
-    enabled: false
+  file: logs/auth-center.log

main-data/main-data-provider/src/main/resources/application.yml → config-git/src/main/resources/config/main-data-dev.yml

@@ -1,3 +1,5 @@
+server:
+  port: 18002
 # 数据源配置
 spring:
   datasource:
@@ -28,14 +30,6 @@ spring:
         reset-enable: false
         login-username: sysadmin
         login-password: "000000"
-  cloud:
-      consul:
-        host: ${CONSUL_HOST:localhost}
-        port: ${CONSUL_PORT:8500}
-        discovery:
-          prefer-ip-address: true
-  application:
-      name: main-data
   redis:
       database: 0
       host: ${REDIS_HOST:localhost}
@@ -63,9 +57,4 @@ mybatis:
   type-aliases-package: com.peng.main.api.mapper.model
   mapper-locations: classpath:mybatis/mapper/*.xml
 logging:
-  file: logs/main-data.log
-server:
-  port: 18002
-management:
-  security:
-    enabled: false
+  file: logs/main-data.log

config-git/src/main/resources/config/mc-service-dev.yml

@@ -0,0 +1,12 @@
+server:
+   port: 18004
+
+spring:
+   rabbitmq:
+        host: localhost
+        port: 5672
+        username: fangp
+        password: '000000'
+
+logging:
+  file: logs/mc-service.log