杜凯玲 / huike-eaas-config · Commits

Commit df545a2d371a4d20c4f8c7036c07c001691a4712

Authored by sunninghai
2 parents e270b93c c62d1b54

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

Inline Side-by-side
Showing 2 changed files with 281 additions and 28 deletions
.idea/workspace.xml
  View file @df545a2
... ... @@ -2,7 +2,8 @@
2 2 <project version="4">
3 3 <component name="ChangeListManager">
4 4 <list default="true" id="13dd2828-e36c-4ae2-ae8b-a6404522d93e" name="Default" comment="">
5   - <change beforePath="$PROJECT_DIR$/class-service.yml" afterPath="$PROJECT_DIR$/class-service.yml" />
  5 + <change beforePath="" afterPath="$PROJECT_DIR$/training-service.yml" />
  6 + <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
6 7 </list>
7 8 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
8 9 <option name="TRACKING_ENABLED" value="true" />
... ... @@ -13,25 +14,32 @@
13 14 </component>
14 15 <component name="FileEditorManager">
15 16 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
16   - <file leaf-file-name="class-service.yml" pinned="false" current-in-tab="true">
  17 + <file leaf-file-name="class-service.yml" pinned="false" current-in-tab="false">
17 18 <entry file="file://$PROJECT_DIR$/class-service.yml">
18 19 <provider selected="true" editor-type-id="text-editor">
19   - <state relative-caret-position="353">
20   - <caret line="65" column="22" lean-forward="true" selection-start-line="65" selection-start-column="22" selection-end-line="65" selection-end-column="22" />
  20 + <state relative-caret-position="-382">
  21 + <caret line="13" column="4" lean-forward="false" selection-start-line="13" selection-start-column="4" selection-end-line="13" selection-end-column="4" />
21 22 <folding />
22 23 </state>
23 24 </provider>
24 25 </entry>
25 26 </file>
26   - <file leaf-file-name="job-service.yml" pinned="false" current-in-tab="false">
27   - <entry file="file://$PROJECT_DIR$/job-service.yml">
  27 + <file leaf-file-name="user-service.yml" pinned="false" current-in-tab="false">
  28 + <entry file="file://$PROJECT_DIR$/user-service.yml">
28 29 <provider selected="true" editor-type-id="text-editor">
29   - <state relative-caret-position="1281">
30   - <caret line="61" column="10" lean-forward="false" selection-start-line="61" selection-start-column="10" selection-end-line="61" selection-end-column="10" />
31   - <folding>
32   - <element signature="e#1374#2742#0" expanded="false" />
33   - <element signature="e#2745#4227#0" expanded="false" />
34   - </folding>
  30 + <state relative-caret-position="402">
  31 + <caret line="73" column="23" lean-forward="true" selection-start-line="73" selection-start-column="23" selection-end-line="73" selection-end-column="23" />
  32 + <folding />
  33 + </state>
  34 + </provider>
  35 + </entry>
  36 + </file>
  37 + <file leaf-file-name="training-service.yml" pinned="false" current-in-tab="true">
  38 + <entry file="file://$PROJECT_DIR$/training-service.yml">
  39 + <provider selected="true" editor-type-id="text-editor">
  40 + <state relative-caret-position="362">
  41 + <caret line="22" column="25" lean-forward="true" selection-start-line="22" selection-start-column="25" selection-end-line="22" selection-end-column="25" />
  42 + <folding />
35 43 </state>
36 44 </provider>
37 45 </entry>
... ... @@ -44,6 +52,7 @@
44 52 <find>db-master</find>
45 53 <find>failFast</find>
46 54 <find>redis</find>
  55 + <find>users</find>
47 56 </findStrings>
48 57 </component>
49 58 <component name="Git.Settings">
... ... @@ -60,6 +69,7 @@
60 69 <option value="$PROJECT_DIR$/user-service.yml" />
61 70 <option value="$PROJECT_DIR$/job-service.yml" />
62 71 <option value="$PROJECT_DIR$/class-service.yml" />
  72 + <option value="$PROJECT_DIR$/training-service.yml" />
63 73 </list>
64 74 </option>
65 75 </component>
... ... @@ -89,7 +99,10 @@
89 99 <foldersAlwaysOnTop value="true" />
90 100 </navigator>
91 101 <panes>
  102 + <pane id="AndroidView" />
  103 + <pane id="PackagesPane" />
92 104 <pane id="Scratches" />
  105 + <pane id="Scope" />
93 106 <pane id="ProjectPane">
94 107 <subPane>
95 108 <expand>
... ... @@ -101,9 +114,6 @@
101 114 <select />
102 115 </subPane>
103 116 </pane>
104   - <pane id="Scope" />
105   - <pane id="AndroidView" />
106   - <pane id="PackagesPane" />
107 117 </panes>
108 118 </component>
109 119 <component name="PropertiesComponent">
... ... @@ -235,12 +245,13 @@
235 245 <workItem from="1552008075873" duration="1287000" />
236 246 <workItem from="1552274600142" duration="3304000" />
237 247 <workItem from="1552459685523" duration="12044000" />
238   - <workItem from="1553766529481" duration="915000" />
  248 + <workItem from="1553766529481" duration="1411000" />
  249 + <workItem from="1554258630770" duration="1010000" />
239 250 </task>
240 251 <servers />
241 252 </component>
242 253 <component name="TimeTrackingManager">
243   - <option name="totallyTimeSpent" value="24894000" />
  254 + <option name="totallyTimeSpent" value="26400000" />
244 255 </component>
245 256 <component name="ToolWindowManager">
246 257 <frame x="0" y="23" width="1440" height="809" extended-state="0" />
... ... @@ -258,9 +269,8 @@
258 269 <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" />
259 270 <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" />
260 271 <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" />
261   - <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" />
  272 + <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" />
262 273 <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" />
263   - <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" />
264 274 <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" />
265 275 <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" />
266 276 <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 @@
272 282 <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" />
273 283 <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" />
274 284 <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" />
  285 + <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" />
275 286 </layout>
276 287 <layout-to-restore>
277 288 <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 @@
340 351 </state>
341 352 </provider>
342 353 </entry>
  354 + <entry file="file://$PROJECT_DIR$/job-service.yml">
  355 + <provider selected="true" editor-type-id="text-editor">
  356 + <state relative-caret-position="1281">
  357 + <caret line="61" column="10" lean-forward="false" selection-start-line="61" selection-start-column="10" selection-end-line="61" selection-end-column="10" />
  358 + <folding>
  359 + <element signature="e#1374#2742#0" expanded="false" />
  360 + <element signature="e#2745#4227#0" expanded="false" />
  361 + </folding>
  362 + </state>
  363 + </provider>
  364 + </entry>
  365 + <entry file="file://$PROJECT_DIR$/class-service.yml">
  366 + <provider selected="true" editor-type-id="text-editor">
  367 + <state relative-caret-position="0">
  368 + <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  369 + <folding />
  370 + </state>
  371 + </provider>
  372 + </entry>
343 373 <entry file="file://$PROJECT_DIR$/class-service.yml">
344 374 <provider selected="true" editor-type-id="text-editor">
345 375 <state relative-caret-position="0">
... ... @@ -429,13 +459,6 @@
429 459 </state>
430 460 </provider>
431 461 </entry>
432   - <entry file="file://$PROJECT_DIR$/user-service.yml">
433   - <provider selected="true" editor-type-id="text-editor">
434   - <state relative-caret-position="372">
435   - <caret line="245" column="0" lean-forward="true" selection-start-line="245" selection-start-column="0" selection-end-line="245" selection-end-column="0" />
436   - </state>
437   - </provider>
438   - </entry>
439 462 <entry file="file://$PROJECT_DIR$/job-service.yml">
440 463 <provider selected="true" editor-type-id="text-editor">
441 464 <state relative-caret-position="1281">
... ... @@ -456,8 +479,24 @@
456 479 </entry>
457 480 <entry file="file://$PROJECT_DIR$/class-service.yml">
458 481 <provider selected="true" editor-type-id="text-editor">
459   - <state relative-caret-position="353">
460   - <caret line="65" column="22" lean-forward="true" selection-start-line="65" selection-start-column="22" selection-end-line="65" selection-end-column="22" />
  482 + <state relative-caret-position="-382">
  483 + <caret line="13" column="4" lean-forward="false" selection-start-line="13" selection-start-column="4" selection-end-line="13" selection-end-column="4" />
  484 + <folding />
  485 + </state>
  486 + </provider>
  487 + </entry>
  488 + <entry file="file://$PROJECT_DIR$/user-service.yml">
  489 + <provider selected="true" editor-type-id="text-editor">
  490 + <state relative-caret-position="402">
  491 + <caret line="73" column="23" lean-forward="true" selection-start-line="73" selection-start-column="23" selection-end-line="73" selection-end-column="23" />
  492 + <folding />
  493 + </state>
  494 + </provider>
  495 + </entry>
  496 + <entry file="file://$PROJECT_DIR$/training-service.yml">
  497 + <provider selected="true" editor-type-id="text-editor">
  498 + <state relative-caret-position="362">
  499 + <caret line="22" column="25" lean-forward="true" selection-start-line="22" selection-start-column="25" selection-end-line="22" selection-end-column="25" />
461 500 <folding />
462 501 </state>
463 502 </provider>
... ...
training-service.yml 0 → 100644
  View file @df545a2
  1 +server:
  2 + port: 16400
  3 +
  4 +spring:
  5 + profiles: development
  6 + cloud:
  7 + config:
  8 + discovery:
  9 + enabled: true
  10 + datasource:
  11 + name: gxb_core
  12 + url: jdbc:mysql://testdb-master:3306/gxb_core?useUnicode=true&characterEncoding=gbk&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true
  13 + username: test
  14 + password: ENC(8aea42e66b0928c44cd8f861a9d558e6)
  15 + driver-class-name: com.mysql.jdbc.Driver
  16 + max-idle: 10
  17 + max-active: 30
  18 + max-wait: 60000
  19 + min-idle: 10
  20 + initial-size: 10
  21 + validation-query: SELECT 1
  22 + test-on-borrow: true
  23 + test-while-idle: true
  24 + redis:
  25 + database: 0
  26 + host: redis-server
  27 + port: 6379
  28 + password: ENC(8aea42e66b0928c44cd8f861a9d558e6)
  29 + pool:
  30 + max-idle: 100
  31 + min-idle: 10
  32 + max-active: 1000
  33 + max-wait: 100000
  34 + #sentinel:
  35 + #master: mymaster1
  36 + #nodes: redis-server:16379,redis-server:16379
  37 +
  38 + activemq:
  39 + 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
  40 + inMemory: true
  41 + pool:
  42 + enabled: true
  43 + max-connections: 5
  44 + idle-timeout: 30000
  45 + expiry-timeout: 0
  46 + jackson:
  47 + time-zone: GMT+8
  48 + date-format: yyyy-MM-dd HH:mm:ss
  49 + deserialization.accept_empty_string_as_null_object: true
  50 +
  51 +
  52 +mybatis:
  53 + mapperLocations: classpath:/mybatis/*.xml
  54 + typeAliasesPackage: com.huike.eaas.microservice.training.domain
  55 + config: classpath:mybatis-config.xml
  56 +
  57 +endpoints:
  58 + restart:
  59 + enabled: true
  60 + shutdown:
  61 + enabled: true
  62 + health:
  63 + sensitive: false
  64 +
  65 +eureka:
  66 + instance:
  67 + hostname: training-service
  68 + perferIpAddress: true
  69 + instance-id: ${spring.cloud.client.ipAddress}:${server.port}
  70 + leaseRenewalIntervalInSeconds: 5
  71 + leaseExpirationDurationInSeconds: 15
  72 + client:
  73 + registerWithEureka: true
  74 + fetchRegistry: true
  75 + serviceUrl:
  76 + defaultZone: http://discovery:15200/eureka/
  77 + healthcheck:
  78 + enabled: true
  79 +
  80 +---
  81 +server:
  82 + port: 16400
  83 +
  84 +spring:
  85 + profiles: test
  86 + cloud:
  87 + config:
  88 + discovery:
  89 + enabled: true
  90 + datasource:
  91 + name: gxb_core
  92 + url: jdbc:mysql://testdb-master:3306/gxb_core?useUnicode=true&characterEncoding=gbk&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true
  93 + username: test
  94 + password: ENC(8aea42e66b0928c44cd8f861a9d558e6)
  95 + driver-class-name: com.mysql.jdbc.Driver
  96 + max-idle: 10
  97 + max-active: 30
  98 + max-wait: 60000
  99 + min-idle: 10
  100 + initial-size: 10
  101 + validation-query: SELECT 1
  102 + test-on-borrow: true
  103 + test-while-idle: true
  104 + redis:
  105 + database: 0
  106 + host: redis-server
  107 + port: 6379
  108 + password: ENC(8aea42e66b0928c44cd8f861a9d558e6)
  109 + pool:
  110 + max-idle: 100
  111 + min-idle: 10
  112 + max-active: 1000
  113 + max-wait: 100000
  114 + #sentinel:
  115 + #master: mymaster1
  116 + #nodes: redis-server:16379,redis-server:16379
  117 +
  118 +mybatis:
  119 + mapperLocations: classpath:/mybatis/*.xml
  120 + typeAliasesPackage: com.huike.eaas.microservice.training.domain
  121 + config: classpath:mybatis-config.xml
  122 +
  123 +endpoints:
  124 + restart:
  125 + enabled: true
  126 + shutdown:
  127 + enabled: true
  128 + health:
  129 + sensitive: false
  130 +
  131 +eureka:
  132 + instance:
  133 + hostname: training-service
  134 + perferIpAddress: true
  135 + client:
  136 + registerWithEureka: true
  137 + fetchRegistry: true
  138 + serviceUrl:
  139 + defaultZone: http://discovery:15200/eureka/
  140 +
  141 +---
  142 +server:
  143 + port: 16400
  144 +
  145 +spring:
  146 + profiles: production
  147 + cloud:
  148 + config:
  149 + discovery:
  150 + enabled: true
  151 + datasource:
  152 + name: gxb_core
  153 + url: jdbc:mysql://db-master.gxb-base:3306/gxb_core?useUnicode=true&characterEncoding=gbk&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true
  154 + username: postgres
  155 + password: ENC(d1b95542f58fbfb0e823af8f3974b1bda84f2dc413e5ec6bc9566bb3aa950a2be59ecaaf2ed5eb3a4b4101fcf299419a)
  156 + driver-class-name: com.mysql.jdbc.Driver
  157 + max-idle: 10
  158 + max-active: 30
  159 + max-wait: 60000
  160 + min-idle: 10
  161 + initial-size: 10
  162 + validation-query: SELECT 1
  163 + test-on-borrow: true
  164 + test-while-idle: true
  165 + redis:
  166 + database: 0
  167 + host: gxb-app-20180706.redis.rds.aliyuncs.com
  168 + port: 6379
  169 + password: ENC(263159d39cfeec890c46a4a51f13906ed438bacccea9fce79961c0b0eceac428)
  170 + pool:
  171 + max-idle: 100
  172 + min-idle: 10
  173 + max-active: 1000
  174 + max-wait: 100000
  175 + #sentinel:
  176 + #master: mymaster1
  177 + #nodes: redis1:16379,redis2:16379
  178 +
  179 + activemq:
  180 + 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
  181 + inMemory: true
  182 + pool:
  183 + enabled: true
  184 + max-connections: 5
  185 + idle-timeout: 30000
  186 + expiry-timeout: 0
  187 +
  188 + jackson:
  189 + time-zone: GMT+8
  190 + date-format: yyyy-MM-dd HH:mm:ss
  191 + deserialization.accept_empty_string_as_null_object: true
  192 +
  193 +
  194 +mybatis:
  195 + mapperLocations: classpath:/mybatis/*.xml
  196 + typeAliasesPackage: com.huike.eaas.microservice.training.domain
  197 + config: classpath:mybatis-config.xml
  198 +
  199 +endpoints:
  200 + restart:
  201 + enabled: true
  202 + shutdown:
  203 + enabled: true
  204 + health:
  205 + sensitive: false
  206 +
  207 +eureka:
  208 + instance:
  209 + perferIpAddress: true
  210 + client:
  211 + registerWithEureka: true
  212 + fetchRegistry: true
  213 + serviceUrl:
  214 + defaultZone: http://discovery:15200/eureka/
0 215 \ No newline at end of file
... ...