杜凯玲 / huike-eaas-config · Commits

Commit b1c0c6f6e5b7eb184fcf1b067a0350d23312a090

Authored by 多国蒙
1 parent 80adb5b0

no message

Inline Side-by-side
Showing 2 changed files with 32 additions and 13 deletions
.idea/workspace.xml
  View file @b1c0c6f
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 <project version="4"> 2 <project version="4">
3 <component name="ChangeListManager"> 3 <component name="ChangeListManager">
4 <list default="true" id="13dd2828-e36c-4ae2-ae8b-a6404522d93e" name="Default" comment=""> 4 <list default="true" id="13dd2828-e36c-4ae2-ae8b-a6404522d93e" name="Default" comment="">
5 - <change beforePath="" afterPath="$PROJECT_DIR$/job-service.yml" /> 5 + <change beforePath="$PROJECT_DIR$/job-service.yml" afterPath="$PROJECT_DIR$/job-service.yml" />
6 </list> 6 </list>
7 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> 7 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
8 <option name="TRACKING_ENABLED" value="true" /> 8 <option name="TRACKING_ENABLED" value="true" />
@@ -16,8 +16,8 @@ @@ -16,8 +16,8 @@
16 <file leaf-file-name="class-service.yml" pinned="false" current-in-tab="false"> 16 <file leaf-file-name="class-service.yml" pinned="false" current-in-tab="false">
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="5386">  
20 - <caret line="327" column="20" lean-forward="false" selection-start-line="327" selection-start-column="20" selection-end-line="327" selection-end-column="20" /> 19 + <state relative-caret-position="336">
  20 + <caret line="16" column="19" lean-forward="false" selection-start-line="16" selection-start-column="19" selection-end-line="16" selection-end-column="19" />
21 <folding /> 21 <folding />
22 </state> 22 </state>
23 </provider> 23 </provider>
@@ -26,9 +26,12 @@ @@ -26,9 +26,12 @@
26 <file leaf-file-name="job-service.yml" pinned="false" current-in-tab="true"> 26 <file leaf-file-name="job-service.yml" pinned="false" current-in-tab="true">
27 <entry file="file://$PROJECT_DIR$/job-service.yml"> 27 <entry file="file://$PROJECT_DIR$/job-service.yml">
28 <provider selected="true" editor-type-id="text-editor"> 28 <provider selected="true" editor-type-id="text-editor">
29 - <state relative-caret-position="-1086">  
30 - <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />  
31 - <folding /> 29 + <state relative-caret-position="532">
  30 + <caret line="135" column="0" lean-forward="false" selection-start-line="135" selection-start-column="0" selection-end-line="135" selection-end-column="0" />
  31 + <folding>
  32 + <element signature="e#1374#2742#0" expanded="false" />
  33 + <element signature="e#2745#4227#0" expanded="false" />
  34 + </folding>
32 </state> 35 </state>
33 </provider> 36 </provider>
34 </entry> 37 </entry>
@@ -55,6 +58,7 @@ @@ -55,6 +58,7 @@
55 <list> 58 <list>
56 <option value="$PROJECT_DIR$/user-service.yml" /> 59 <option value="$PROJECT_DIR$/user-service.yml" />
57 <option value="$PROJECT_DIR$/class-service.yml" /> 60 <option value="$PROJECT_DIR$/class-service.yml" />
  61 + <option value="$PROJECT_DIR$/job-service.yml" />
58 </list> 62 </list>
59 </option> 63 </option>
60 </component> 64 </component>
@@ -230,12 +234,12 @@ @@ -230,12 +234,12 @@
230 <workItem from="1551951691892" duration="12000" /> 234 <workItem from="1551951691892" duration="12000" />
231 <workItem from="1552008075873" duration="1287000" /> 235 <workItem from="1552008075873" duration="1287000" />
232 <workItem from="1552274600142" duration="3304000" /> 236 <workItem from="1552274600142" duration="3304000" />
233 - <workItem from="1552459685523" duration="9676000" /> 237 + <workItem from="1552459685523" duration="10068000" />
234 </task> 238 </task>
235 <servers /> 239 <servers />
236 </component> 240 </component>
237 <component name="TimeTrackingManager"> 241 <component name="TimeTrackingManager">
238 - <option name="totallyTimeSpent" value="21611000" /> 242 + <option name="totallyTimeSpent" value="22003000" />
239 </component> 243 </component>
240 <component name="ToolWindowManager"> 244 <component name="ToolWindowManager">
241 <frame x="0" y="23" width="1440" height="809" extended-state="6" /> 245 <frame x="0" y="23" width="1440" height="809" extended-state="6" />
@@ -414,17 +418,20 @@ @@ -414,17 +418,20 @@
414 </entry> 418 </entry>
415 <entry file="file://$PROJECT_DIR$/class-service.yml"> 419 <entry file="file://$PROJECT_DIR$/class-service.yml">
416 <provider selected="true" editor-type-id="text-editor"> 420 <provider selected="true" editor-type-id="text-editor">
417 - <state relative-caret-position="5386">  
418 - <caret line="327" column="20" lean-forward="false" selection-start-line="327" selection-start-column="20" selection-end-line="327" selection-end-column="20" /> 421 + <state relative-caret-position="336">
  422 + <caret line="16" column="19" lean-forward="false" selection-start-line="16" selection-start-column="19" selection-end-line="16" selection-end-column="19" />
419 <folding /> 423 <folding />
420 </state> 424 </state>
421 </provider> 425 </provider>
422 </entry> 426 </entry>
423 <entry file="file://$PROJECT_DIR$/job-service.yml"> 427 <entry file="file://$PROJECT_DIR$/job-service.yml">
424 <provider selected="true" editor-type-id="text-editor"> 428 <provider selected="true" editor-type-id="text-editor">
425 - <state relative-caret-position="-1086">  
426 - <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />  
427 - <folding /> 429 + <state relative-caret-position="532">
  430 + <caret line="135" column="0" lean-forward="false" selection-start-line="135" selection-start-column="0" selection-end-line="135" selection-end-column="0" />
  431 + <folding>
  432 + <element signature="e#1374#2742#0" expanded="false" />
  433 + <element signature="e#2745#4227#0" expanded="false" />
  434 + </folding>
428 </state> 435 </state>
429 </provider> 436 </provider>
430 </entry> 437 </entry>
job-service.yml
  View file @b1c0c6f
@@ -4,6 +4,10 @@ server: @@ -4,6 +4,10 @@ server:
4 4
5 spring: 5 spring:
6 profiles: development 6 profiles: development
  7 + cloud:
  8 + config:
  9 + discovery:
  10 + enabled: true
7 mvc: 11 mvc:
8 static-path-pattern: /static/** 12 static-path-pattern: /static/**
9 ### resources 13 ### resources
@@ -68,6 +72,10 @@ server: @@ -68,6 +72,10 @@ server:
68 72
69 spring: 73 spring:
70 profiles: test 74 profiles: test
  75 + cloud:
  76 + config:
  77 + discovery:
  78 + enabled: true
71 mvc: 79 mvc:
72 static-path-pattern: /static/** 80 static-path-pattern: /static/**
73 ### resources 81 ### resources
@@ -132,6 +140,10 @@ server: @@ -132,6 +140,10 @@ server:
132 140
133 spring: 141 spring:
134 profiles: production 142 profiles: production
  143 + cloud:
  144 + config:
  145 + discovery:
  146 + enabled: true
135 mvc: 147 mvc:
136 static-path-pattern: /static/** 148 static-path-pattern: /static/**
137 ### resources 149 ### resources