Merge branch 'master' of http://gitlab.gaoxiaobang.com/zygj/huike-eaas-config

sunninghai
2 parents e270b93c c62d1b54
Showing 2 changed files with 281 additions and 28 deletions
.idea/workspace.xml
training-service.yml
@@ -2,7 +2,8 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="13dd2828-e36c-4ae2-ae8b-a6404522d93e" name="Default" comment="">
-      <change beforePath="$PROJECT_DIR$/class-service.yml" afterPath="$PROJECT_DIR$/class-service.yml" />
+      <change beforePath="" afterPath="$PROJECT_DIR$/training-service.yml" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="TRACKING_ENABLED" value="true" />
@@ -13,25 +14,32 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="class-service.yml" pinned="false" current-in-tab="true">
+      <file leaf-file-name="class-service.yml" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/class-service.yml">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="353">
-              <caret line="65" column="22" lean-forward="true" selection-start-line="65" selection-start-column="22" selection-end-line="65" selection-end-column="22" />
+            <state relative-caret-position="-382">
+              <caret line="13" column="4" lean-forward="false" selection-start-line="13" selection-start-column="4" selection-end-line="13" selection-end-column="4" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="job-service.yml" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/job-service.yml">
+      <file leaf-file-name="user-service.yml" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/user-service.yml">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1281">
-              <caret line="61" column="10" lean-forward="false" selection-start-line="61" selection-start-column="10" selection-end-line="61" selection-end-column="10" />
-              <folding>
-                <element signature="e#1374#2742#0" expanded="false" />
-                <element signature="e#2745#4227#0" expanded="false" />
-              </folding>
+            <state relative-caret-position="402">
+              <caret line="73" column="23" lean-forward="true" selection-start-line="73" selection-start-column="23" selection-end-line="73" selection-end-column="23" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="training-service.yml" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/training-service.yml">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="362">
+              <caret line="22" column="25" lean-forward="true" selection-start-line="22" selection-start-column="25" selection-end-line="22" selection-end-column="25" />
+              <folding />
             </state>
           </provider>
         </entry>
@@ -44,6 +52,7 @@
       <find>db-master</find>
       <find>failFast</find>
       <find>redis</find>
+      <find>users</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -60,6 +69,7 @@
         <option value="$PROJECT_DIR$/user-service.yml" />
         <option value="$PROJECT_DIR$/job-service.yml" />
         <option value="$PROJECT_DIR$/class-service.yml" />
+        <option value="$PROJECT_DIR$/training-service.yml" />
       </list>
     </option>
   </component>
@@ -89,7 +99,10 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="AndroidView" />
+      <pane id="PackagesPane" />
       <pane id="Scratches" />
+      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -101,9 +114,6 @@
           <select />
         </subPane>
       </pane>
-      <pane id="Scope" />
-      <pane id="AndroidView" />
-      <pane id="PackagesPane" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -235,12 +245,13 @@
       <workItem from="1552008075873" duration="1287000" />
       <workItem from="1552274600142" duration="3304000" />
       <workItem from="1552459685523" duration="12044000" />
-      <workItem from="1553766529481" duration="915000" />
+      <workItem from="1553766529481" duration="1411000" />
+      <workItem from="1554258630770" duration="1010000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="24894000" />
+    <option name="totallyTimeSpent" value="26400000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="0" y="23" width="1440" height="809" extended-state="0" />
@@ -258,9 +269,8 @@
       <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.19098713" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.19384836" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
       <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
-      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
@@ -272,6 +282,7 @@
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
+      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
     </layout>
     <layout-to-restore>
       <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
@@ -340,6 +351,25 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/job-service.yml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1281">
+          <caret line="61" column="10" lean-forward="false" selection-start-line="61" selection-start-column="10" selection-end-line="61" selection-end-column="10" />
+          <folding>
+            <element signature="e#1374#2742#0" expanded="false" />
+            <element signature="e#2745#4227#0" expanded="false" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/class-service.yml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/class-service.yml">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="0">
@@ -429,13 +459,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/user-service.yml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="372">
-          <caret line="245" column="0" lean-forward="true" selection-start-line="245" selection-start-column="0" selection-end-line="245" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/job-service.yml">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="1281">
@@ -456,8 +479,24 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/class-service.yml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="353">
-          <caret line="65" column="22" lean-forward="true" selection-start-line="65" selection-start-column="22" selection-end-line="65" selection-end-column="22" />
+        <state relative-caret-position="-382">
+          <caret line="13" column="4" lean-forward="false" selection-start-line="13" selection-start-column="4" selection-end-line="13" selection-end-column="4" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/user-service.yml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="402">
+          <caret line="73" column="23" lean-forward="true" selection-start-line="73" selection-start-column="23" selection-end-line="73" selection-end-column="23" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/training-service.yml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="362">
+          <caret line="22" column="25" lean-forward="true" selection-start-line="22" selection-start-column="25" selection-end-line="22" selection-end-column="25" />
           <folding />
         </state>
       </provider>
+server:
+  port: 16400
+
+spring:
+  profiles: development
+  cloud:
+    config:
+      discovery:
+        enabled: true
+  datasource:
+    name: gxb_core
+    url: jdbc:mysql://testdb-master:3306/gxb_core?useUnicode=true&characterEncoding=gbk&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true
+    username: test
+    password: ENC(8aea42e66b0928c44cd8f861a9d558e6)
+    driver-class-name: com.mysql.jdbc.Driver
+    max-idle: 10
+    max-active: 30
+    max-wait: 60000
+    min-idle: 10
+    initial-size: 10
+    validation-query: SELECT 1
+    test-on-borrow: true
+    test-while-idle: true
+  redis:
+    database: 0
+    host: redis-server
+    port: 6379
+    password: ENC(8aea42e66b0928c44cd8f861a9d558e6)
+    pool:
+      max-idle: 100
+      min-idle: 10
+      max-active: 1000
+      max-wait: 100000
+    #sentinel:
+      #master: mymaster1
+      #nodes: redis-server:16379,redis-server:16379
+
+  activemq:
+    broker-url: failover:(tcp://mqserver:61616)?initialReconnectDelay=100 #ActiveMQ use static transport for broker clusters. multicast discovery for broker clusters, JmsListener cannot auto receive messages from some ActiveMQ servers
+    inMemory: true
+    pool:
+      enabled: true
+      max-connections: 5
+      idle-timeout: 30000
+      expiry-timeout: 0
+  jackson:
+    time-zone: GMT+8
+    date-format: yyyy-MM-dd HH:mm:ss
+    deserialization.accept_empty_string_as_null_object: true
+
+
+mybatis:
+  mapperLocations: classpath:/mybatis/*.xml
+  typeAliasesPackage: com.huike.eaas.microservice.training.domain
+  config: classpath:mybatis-config.xml
+
+endpoints:
+  restart:
+    enabled: true
+  shutdown:
+    enabled: true
+  health:
+    sensitive: false
+
+eureka:
+  instance:
+    hostname: training-service
+    perferIpAddress: true
+    instance-id: ${spring.cloud.client.ipAddress}:${server.port}
+    leaseRenewalIntervalInSeconds: 5
+    leaseExpirationDurationInSeconds: 15
+  client:
+    registerWithEureka: true
+    fetchRegistry: true
+    serviceUrl:
+      defaultZone: http://discovery:15200/eureka/
+    healthcheck:
+      enabled: true
+
+---
+server:
+  port: 16400
+
+spring:
+  profiles: test
+  cloud:
+    config:
+      discovery:
+        enabled: true
+  datasource:
+    name: gxb_core
+    url: jdbc:mysql://testdb-master:3306/gxb_core?useUnicode=true&characterEncoding=gbk&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true
+    username: test
+    password: ENC(8aea42e66b0928c44cd8f861a9d558e6)
+    driver-class-name: com.mysql.jdbc.Driver
+    max-idle: 10
+    max-active: 30
+    max-wait: 60000
+    min-idle: 10
+    initial-size: 10
+    validation-query: SELECT 1
+    test-on-borrow: true
+    test-while-idle: true
+  redis:
+    database: 0
+    host: redis-server
+    port: 6379
+    password: ENC(8aea42e66b0928c44cd8f861a9d558e6)
+    pool:
+      max-idle: 100
+      min-idle: 10
+      max-active: 1000
+      max-wait: 100000
+    #sentinel:
+      #master: mymaster1
+      #nodes: redis-server:16379,redis-server:16379
+
+mybatis:
+  mapperLocations: classpath:/mybatis/*.xml
+  typeAliasesPackage: com.huike.eaas.microservice.training.domain
+  config: classpath:mybatis-config.xml
+
+endpoints:
+  restart:
+    enabled: true
+  shutdown:
+    enabled: true
+  health:
+    sensitive: false
+
+eureka:
+  instance:
+    hostname: training-service
+    perferIpAddress: true
+  client:
+    registerWithEureka: true
+    fetchRegistry: true
+    serviceUrl:
+      defaultZone: http://discovery:15200/eureka/
+
+---
+server:
+  port: 16400
+
+spring:
+  profiles: production
+  cloud:
+    config:
+      discovery:
+        enabled: true
+  datasource:
+    name: gxb_core
+    url: jdbc:mysql://db-master.gxb-base:3306/gxb_core?useUnicode=true&characterEncoding=gbk&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true
+    username: postgres
+    password: ENC(d1b95542f58fbfb0e823af8f3974b1bda84f2dc413e5ec6bc9566bb3aa950a2be59ecaaf2ed5eb3a4b4101fcf299419a)
+    driver-class-name: com.mysql.jdbc.Driver
+    max-idle: 10
+    max-active: 30
+    max-wait: 60000
+    min-idle: 10
+    initial-size: 10
+    validation-query: SELECT 1
+    test-on-borrow: true
+    test-while-idle: true
+  redis:
+    database: 0
+    host: gxb-app-20180706.redis.rds.aliyuncs.com
+    port: 6379
+    password: ENC(263159d39cfeec890c46a4a51f13906ed438bacccea9fce79961c0b0eceac428)
+    pool:
+      max-idle: 100
+      min-idle: 10
+      max-active: 1000
+      max-wait: 100000
+    #sentinel:
+      #master: mymaster1
+      #nodes: redis1:16379,redis2:16379
+
+  activemq:
+    broker-url: failover:(tcp://mq-server.gxb-base:61616)?initialReconnectDelay=100 #ActiveMQ use static transport for broker clusters. multicast discovery for broker clusters, JmsListener cannot auto receive messages from some ActiveMQ servers
+    inMemory: true
+    pool:
+      enabled: true
+      max-connections: 5
+      idle-timeout: 30000
+      expiry-timeout: 0
+
+  jackson:
+    time-zone: GMT+8
+    date-format: yyyy-MM-dd HH:mm:ss
+    deserialization.accept_empty_string_as_null_object: true
+
+
+mybatis:
+  mapperLocations: classpath:/mybatis/*.xml
+  typeAliasesPackage: com.huike.eaas.microservice.training.domain
+  config: classpath:mybatis-config.xml
+
+endpoints:
+  restart:
+    enabled: true
+  shutdown:
+    enabled: true
+  health:
+    sensitive: false
+
+eureka:
+  instance:
+    perferIpAddress: true
+  client:
+    registerWithEureka: true
+    fetchRegistry: true
+    serviceUrl:
+      defaultZone: http://discovery:15200/eureka/
 \ No newline at end of file