Merge branch 'zokeeper-config' into 'DEV'

接入配置服务中心







See merge request !654

mooctest-site-server/pom.xml

@@ -190,6 +190,16 @@
             </exclusions>
         </dependency>
         <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-zookeeper-config</artifactId>
+        </dependency>
+        <!-- zookeeper 依赖的健康检查的jar，所以需要引入actuator这个依赖 -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-actuator</artifactId>
+            <version>${spring.boot.version}</version>
+        </dependency>
+        <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
             <version>5.1.38</version>

mooctest-site-server/src/main/java/cn/iselab/mooctest/site/Application.java

@@ -1,11 +1,11 @@
 package cn.iselab.mooctest.site;
 
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.MessageSourceAutoConfiguration;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.aop.AopAutoConfiguration;
 import org.springframework.boot.autoconfigure.batch.BatchAutoConfiguration;
-import org.springframework.boot.autoconfigure.cloud.CloudAutoConfiguration;
 import org.springframework.boot.autoconfigure.dao.PersistenceExceptionTranslationAutoConfiguration;
 import org.springframework.boot.autoconfigure.data.elasticsearch.ElasticsearchRepositoriesAutoConfiguration;
 import org.springframework.boot.autoconfigure.data.mongo.MongoRepositoriesAutoConfiguration;
@@ -45,6 +45,7 @@ import org.springframework.boot.autoconfigure.velocity.VelocityAutoConfiguration
 import org.springframework.boot.autoconfigure.websocket.WebSocketAutoConfiguration;
 import org.springframework.boot.web.servlet.ServletComponentScan;
 import org.springframework.cache.annotation.EnableCaching;
+import org.springframework.core.env.Environment;
 import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.scheduling.annotation.EnableScheduling;
 
@@ -55,7 +56,6 @@ import org.springframework.scheduling.annotation.EnableScheduling;
         ActiveMQAutoConfiguration.class,
         AopAutoConfiguration.class,
         BatchAutoConfiguration.class,
-        CloudAutoConfiguration.class,
         DeviceDelegatingViewResolverAutoConfiguration.class,
         DeviceResolverAutoConfiguration.class,
         ElasticsearchRepositoriesAutoConfiguration.class,
@@ -99,10 +99,8 @@ import org.springframework.scheduling.annotation.EnableScheduling;
 @EnableCaching
 @EnableAsync
 public class Application {
-
     public static void main(String[] args) {
         SpringApplication application = new SpringApplication(Application.class);
-
         // To disabled web environment, change `true` to `false`
         application.setWebEnvironment(true);
         application.run(args);

mooctest-site-server/src/main/resources/application.yaml

@@ -1,5 +1,3 @@
-spring.profiles.active: dev
-
 spring:
     cache:
         guava:
@@ -21,277 +19,6 @@ spring:
     # The SQL dialect makes Hibernate generate better SQL for the chosen database
     properties.hibernate.dialect: org.hibernate.dialect.MySQL5Dialect
 
-oss:
-    endPoint: http://oss-cn-shanghai.aliyuncs.com
-    accessKeyId: IvS323TIcWUT57MG
-    accessKeySecret: dYml7rvT8stQkoSjMYlfRTxNj9dEsI
-    region: oss-cn-shanghai
-    expireTime: 600
-    roleArn: acs:ram::1525065817051996:role/oss-archive
-
----
-# 开发环境
-spring:
-    profiles: dev
-    datasource:
-        url: jdbc:mysql://101.37.175.111:3306/mooctest_main_dev?useUnicode=yes&characterEncoding=UTF-8
-        username: mooctest
-        password: secr3t!
-    dubbo:
-        application.name: local-dubbo-main-site-provider-consumer3
-        registry.address: zookeeper://118.178.131.206:2181
-        protocol.name: dubbo
-        protocol.port: 20884
-        scan: cn.iselab.mooctest.site.rpc
-        monitor.protocol: registry
-        timeout: 120000
-    rabbitmq:
-        host: 106.14.81.62
-        port: 5672
-        username: test
-        password: test
-        virtual-host: dev
-    redis:
-        host: 106.14.81.62
-        port: 6379
-        password:
-        pool:
-            max-active: 8
-            max-wait: -1
-            max-idle: 8
-            min-idle: 0
-
-featureSwitch:
-    default:
-        role: worker
-    client:
-        sms: true
-        email: true
-        oss: true
-        webide: true
-    server:
-        rpcDevService: true
-        mongoServer: true
-        UserService: true
-        enableRabbitListener: false
-        initExamScheduler: false
-
-mongodb:
-      host: 114.55.91.27
-      port: 80
-      db: testGraph
-      reportCollection: report
-      mutationCollection: mutation
-      caseGraghCollection: caseGraph
-      caughtNodeCollection: caughtNode
-      userCatchCollection: userCatch
-      catchCollection: catch
-      sumCatchCollection: sumCatch
-      competeAnalysisCollection: competeAnalysisResult
-      difficultAnalysisCollection: difficultAnalysisResult
-      timeAnalysisCollection: timeAnalysisResult
-      targetGraphCollection: targetGraph
-      base64Auth: Basic YWRtaW46Y2hhbmdlaXQ=
-
-oss:
-    bucketName:
-        dev: mooctest-dev
-        static: mooctest-mutation
-        main: mooctest-site-dev
-        target: kikbug-public
-    bucket: mooctest-site-dev
-
-server:
-    port: 8080
-
-logging.config: classpath:log4j2.yaml
-#logging.access.enabled: false
-
-host: http://local.mooctest.net
-
-webIDE:
-    address: 47.97.4.113:8000
-
-celeryServer:
-    host: 106.14.81.62
-    port: 5000
----
-# 测试服务环境
-spring:
-    profiles: pre
-    datasource:
-        url: jdbc:mysql://106.14.81.62:3306/mooctest_main_dev?useUnicode=yes&characterEncoding=UTF-8
-        username: root
-        password: secr3t!0525
-    dubbo:
-        application.name: pre-dubbo-main-site-provider-consumer
-        registry.address: zookeeper://118.178.131.206:2181
-        protocol.name: dubbo
-        protocol.port: 20883
-        protocol.host: 106.14.81.62
-        scan: cn.iselab.mooctest.site.rpc
-        monitor.protocal: registry
-    rabbitmq:
-        host: 121.199.32.102
-        port: 5672
-        username: mooctest
-        password: mooctestPassword
-        virtual-host: testhost
-    redis:
-        host: 106.14.81.62
-        port: 6379
-        password:
-        pool:
-            max-active: 8
-            max-wait: -1
-            max-idle: 8
-            min-idle: 0
-
-featureSwitch:
-    default:
-        role: worker
-    client:
-        sms: true
-        email: true
-        oss: true
-        webide: true
-    server:
-        rpcDevService: true
-        mongoServer: true
-        UserService: true
-        enableRabbitListener: true
-        initExamScheduler: true
-
-mongodb:
-      host: 114.55.91.27
-      port: 80
-      db: testGraph
-      reportCollection: report
-      mutationCollection: mutation
-      caseGraghCollection: caseGraph
-      caughtNodeCollection: caughtNode
-      userCatchCollection: userCatch
-      catchCollection: catch
-      sumCatchCollection: sumCatch
-      competeAnalysisCollection: competeAnalysisResult
-      difficultAnalysisCollection: difficultAnalysisResult
-      timeAnalysisCollection: timeAnalysisResult
-      targetGraphCollection: targetGraph
-      base64Auth: Basic YWRtaW46Y2hhbmdlaXQ=
-
-oss:
-    bucketName:
-        dev: mooctest-dev
-        static: mooctest-mutation
-        main: mooctest-site-test
-        target: kikbug-public
-    bucket: mooctest-site-test
-
-server:
-    port: 9001
-
-logging.config: classpath:log4j2.online.yaml
-logging.access.directory: /home/shared/log
-
-spring.jpa.show-sql: false
-
-host: http://test.mooctest.net
-
-webIDE:
-    address: 47.97.4.113:8000
-
-celeryServer:
-    host: 121.199.32.102
-    port: 5001
-
----
-# 线上服务环境
-spring:
-    profiles: online
-    datasource:
-        url: jdbc:mysql://10.24.153.13/mooctest_main?useUnicode=yes&characterEncoding=UTF-8
-        username: liuzicong
-        password: secr3t!
-    dubbo:
-        application.name: dubbo-consumer-online
-        registry.address: zookeeper://118.178.131.206:2181
-        protocol.name: dubbo
-        protocol.port: 20880
-        protocol.host: 114.55.91.83
-        scan: cn.iselab.mooctest.site.rpc
-    rabbitmq:
-        host: 121.199.32.102
-        port: 5672
-        username: mooctest
-        password: mooctestPassword
-        virtual-host: proj
-    redis:
-        host: 106.14.81.62
-        port: 6379
-        password:
-        pool:
-            max-active: 8
-            max-wait: -1
-            max-idle: 8
-            min-idle: 0
-
-featureSwitch:
-    default:
-        role: worker
-    client:
-        sms: true
-        email: true
-        oss: true
-        webide: true
-    server:
-        rpcDevService: true
-        mongoServer: true
-        UserService: true
-        enableRabbitListener: true
-        initExamScheduler: true
-
-mongodb:
-      host: 114.55.91.27
-      port: 80
-      db: testdb
-      reportCollection: report
-      mutationCollection: mutation
-      caseGraghCollection: caseGraph
-      caughtNodeCollection: caughtNode
-      userCatchCollection: userCatch
-      catchCollection: catch
-      sumCatchCollection: sumCatch
-      competeAnalysisCollection: competeAnalysisResult
-      difficultAnalysisCollection: difficultAnalysisResult
-      timeAnalysisCollection: timeAnalysisResult
-      targetGraphCollection: targetGraph
-      base64Auth: Basic YWRtaW46Y2hhbmdlaXQ=
-
-oss:
-    bucketName:
-        dev: mooctest-dev
-        static: mooctest-mutation
-        main: mooctest-site
-        target: kikbug-public
-    bucket: mooctest-site
-
-server:
-    port: 8088
-
-logging.config: classpath:log4j2.online.yaml
-logging.access.directory: /home/shared/log
-
-spring.jpa.show-sql: false
-
-host: http://www.mooctest.net
-
-webIDE:
-    address: 47.97.4.113:8081
-
-celeryServer:
-    host: 121.199.32.102
-    port: 5000
-
 ---
 # 私有云服务环境
 spring:
@@ -314,23 +41,6 @@ featureSwitch:
         enableRabbitListener: true
         initExamScheduler: true
 
-mongodb:
-      host: 114.55.91.27
-      port: 80
-      db: testdb
-      reportCollection: report
-      mutationCollection: mutation
-      caseGraghCollection: caseGraph
-      caughtNodeCollection: caughtNode
-      userCatchCollection: userCatch
-      catchCollection: catch
-      sumCatchCollection: sumCatch
-      competeAnalysisCollection: competeAnalysisResult
-      difficultAnalysisCollection: difficultAnalysisResult
-      timeAnalysisCollection: timeAnalysisResult
-      targetGraphCollection: targetGraph
-      base64Auth:
-
 server:
     port: 9001
 
@@ -340,10 +50,3 @@ logging.access.directory: /home/shared/log
 spring.jpa.show-sql: false
 
 host: http://www.mooctest.net
-
-
-dubbo:
-    reference.id: UserService
-    interface: cn.iselab.mooctest.rpc.user.api.UserService
-    version: 1.0.15
-    timeout: 12000

mooctest-site-server/src/main/resources/bootstrap.yaml

@@ -0,0 +1,13 @@
+spring.profiles.active: dev
+spring:
+    application:
+        name: mooctest-site-server
+    cloud:
+        zookeeper:
+            enabled: true  # true:开启zookeeper外部化配置, false:读取本地配置;
+            connect-string: 101.37.175.111:2181
+            config:
+                root: /config
+                enabled: true
+                watcher:
+                    enabled: true

pom.xml

@@ -17,6 +17,18 @@
         <version>1.0.1</version>
     </parent>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.springframework.cloud</groupId>
+                <artifactId>spring-cloud-dependencies</artifactId>
+                <version>Brixton.RELEASE</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
     <dependencies>
         <dependency>
             <groupId>cn.iselab</groupId>