杜凯玲 / huike-eaas-config · Commits

Commit e093393df3f243abe02fe193539dd3e6cb61bbd5

Authored by 多国蒙
1 parent 230b4b4d

no message

Inline Side-by-side
Showing 2 changed files with 7 additions and 17 deletions
.idea/workspace.xml
  View file @e093393
@@ -16,8 +16,8 @@ @@ -16,8 +16,8 @@
16 <file leaf-file-name="class-service.yml" pinned="false" current-in-tab="true"> 16 <file leaf-file-name="class-service.yml" pinned="false" current-in-tab="true">
17 <entry file="file://$PROJECT_DIR$/class-service.yml"> 17 <entry file="file://$PROJECT_DIR$/class-service.yml">
18 <provider selected="true" editor-type-id="text-editor"> 18 <provider selected="true" editor-type-id="text-editor">
19 - <state relative-caret-position="596">  
20 - <caret line="79" column="6" lean-forward="false" selection-start-line="79" selection-start-column="6" selection-end-line="79" selection-end-column="6" /> 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" />
21 <folding /> 21 <folding />
22 </state> 22 </state>
23 </provider> 23 </provider>
@@ -235,12 +235,12 @@ @@ -235,12 +235,12 @@
235 <workItem from="1552008075873" duration="1287000" /> 235 <workItem from="1552008075873" duration="1287000" />
236 <workItem from="1552274600142" duration="3304000" /> 236 <workItem from="1552274600142" duration="3304000" />
237 <workItem from="1552459685523" duration="12044000" /> 237 <workItem from="1552459685523" duration="12044000" />
238 - <workItem from="1553766529481" duration="293000" /> 238 + <workItem from="1553766529481" duration="915000" />
239 </task> 239 </task>
240 <servers /> 240 <servers />
241 </component> 241 </component>
242 <component name="TimeTrackingManager"> 242 <component name="TimeTrackingManager">
243 - <option name="totallyTimeSpent" value="24272000" /> 243 + <option name="totallyTimeSpent" value="24894000" />
244 </component> 244 </component>
245 <component name="ToolWindowManager"> 245 <component name="ToolWindowManager">
246 <frame x="0" y="23" width="1440" height="809" extended-state="0" /> 246 <frame x="0" y="23" width="1440" height="809" extended-state="0" />
@@ -456,8 +456,8 @@ @@ -456,8 +456,8 @@
456 </entry> 456 </entry>
457 <entry file="file://$PROJECT_DIR$/class-service.yml"> 457 <entry file="file://$PROJECT_DIR$/class-service.yml">
458 <provider selected="true" editor-type-id="text-editor"> 458 <provider selected="true" editor-type-id="text-editor">
459 - <state relative-caret-position="596">  
460 - <caret line="79" column="6" lean-forward="false" selection-start-line="79" selection-start-column="6" selection-end-line="79" selection-end-column="6" /> 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" />
461 <folding /> 461 <folding />
462 </state> 462 </state>
463 </provider> 463 </provider>
class-service.yml
  View file @e093393
@@ -54,7 +54,7 @@ spring: @@ -54,7 +54,7 @@ spring:
54 validation-query: SELECT 1 54 validation-query: SELECT 1
55 test-on-borrow: true 55 test-on-borrow: true
56 test-while-idle: true 56 test-while-idle: true
57 - redis1: 57 + redis:
58 database: 0 58 database: 0
59 host: redis-server 59 host: redis-server
60 port: 6379 60 port: 6379
@@ -64,16 +64,6 @@ spring: @@ -64,16 +64,6 @@ spring:
64 min-idle: 10 64 min-idle: 10
65 max-active: 1000 65 max-active: 1000
66 max-wait: 100000 66 max-wait: 100000
67 - redis2:  
68 - database: 0  
69 - host: redis-server  
70 - port: 6380  
71 - password: ENC(8aea42e66b0928c44cd8f861a9d558e6)  
72 - pool:  
73 - max-idle: 100  
74 - min-idle: 10  
75 - max-active: 1000  
76 - max-wait: 100000  
77 #sentinel: 67 #sentinel:
78 #master: mymaster1 68 #master: mymaster1
79 #nodes: redis-server:16379,redis-server:16379 69 #nodes: redis-server:16379,redis-server:16379