杜凯玲 / huike-eaas-config · Commits

Commit bee3a090fd1c1d8112d1517bb0db880b7ae6e0e5

Authored by 多国蒙
1 parent 70b1d944

no message

Inline Side-by-side
Showing 2 changed files with 20 additions and 10 deletions
.idea/workspace.xml
  View file @bee3a09
@@ -2,6 +2,7 @@ @@ -2,6 +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="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
5 <change beforePath="$PROJECT_DIR$/user-service.yml" afterPath="$PROJECT_DIR$/user-service.yml" /> 6 <change beforePath="$PROJECT_DIR$/user-service.yml" afterPath="$PROJECT_DIR$/user-service.yml" />
6 </list> 7 </list>
7 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> 8 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -16,8 +17,8 @@ @@ -16,8 +17,8 @@
16 <file leaf-file-name="user-service.yml" pinned="false" current-in-tab="true"> 17 <file leaf-file-name="user-service.yml" pinned="false" current-in-tab="true">
17 <entry file="file://$PROJECT_DIR$/user-service.yml"> 18 <entry file="file://$PROJECT_DIR$/user-service.yml">
18 <provider selected="true" editor-type-id="text-editor"> 19 <provider selected="true" editor-type-id="text-editor">
19 - <state relative-caret-position="403">  
20 - <caret line="235" column="35" lean-forward="false" selection-start-line="235" selection-start-column="35" selection-end-line="235" selection-end-column="35" /> 20 + <state relative-caret-position="372">
  21 + <caret line="245" column="0" lean-forward="true" selection-start-line="245" selection-start-column="0" selection-end-line="245" selection-end-column="0" />
21 <folding /> 22 <folding />
22 </state> 23 </state>
23 </provider> 24 </provider>
@@ -66,6 +67,8 @@ @@ -66,6 +67,8 @@
66 <foldersAlwaysOnTop value="true" /> 67 <foldersAlwaysOnTop value="true" />
67 </navigator> 68 </navigator>
68 <panes> 69 <panes>
  70 + <pane id="PackagesPane" />
  71 + <pane id="AndroidView" />
69 <pane id="Scope" /> 72 <pane id="Scope" />
70 <pane id="ProjectPane"> 73 <pane id="ProjectPane">
71 <subPane> 74 <subPane>
@@ -79,8 +82,6 @@ @@ -79,8 +82,6 @@
79 </subPane> 82 </subPane>
80 </pane> 83 </pane>
81 <pane id="Scratches" /> 84 <pane id="Scratches" />
82 - <pane id="AndroidView" />  
83 - <pane id="PackagesPane" />  
84 </panes> 85 </panes>
85 </component> 86 </component>
86 <component name="PropertiesComponent"> 87 <component name="PropertiesComponent">
@@ -199,12 +200,13 @@ @@ -199,12 +200,13 @@
199 <option name="presentableId" value="Default" /> 200 <option name="presentableId" value="Default" />
200 <updated>1539573458792</updated> 201 <updated>1539573458792</updated>
201 <workItem from="1539573460319" duration="348000" /> 202 <workItem from="1539573460319" duration="348000" />
202 - <workItem from="1540454746462" duration="78000" /> 203 + <workItem from="1540454746462" duration="260000" />
  204 + <workItem from="1540455884558" duration="35000" />
203 </task> 205 </task>
204 <servers /> 206 <servers />
205 </component> 207 </component>
206 <component name="TimeTrackingManager"> 208 <component name="TimeTrackingManager">
207 - <option name="totallyTimeSpent" value="426000" /> 209 + <option name="totallyTimeSpent" value="643000" />
208 </component> 210 </component>
209 <component name="ToolWindowManager"> 211 <component name="ToolWindowManager">
210 <frame x="0" y="23" width="1431" height="813" extended-state="6" /> 212 <frame x="0" y="23" width="1431" height="813" extended-state="6" />
@@ -222,7 +224,7 @@ @@ -222,7 +224,7 @@
222 <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" /> 224 <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" />
223 <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" /> 225 <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" />
224 <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" /> 226 <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" />
225 - <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.26421887" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> 227 + <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.26781857" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
226 <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" /> 228 <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" />
227 <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" /> 229 <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" />
228 <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" /> 230 <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" />
@@ -259,8 +261,16 @@ @@ -259,8 +261,16 @@
259 </entry> 261 </entry>
260 <entry file="file://$PROJECT_DIR$/user-service.yml"> 262 <entry file="file://$PROJECT_DIR$/user-service.yml">
261 <provider selected="true" editor-type-id="text-editor"> 263 <provider selected="true" editor-type-id="text-editor">
262 - <state relative-caret-position="403">  
263 - <caret line="235" column="35" lean-forward="false" selection-start-line="235" selection-start-column="35" selection-end-line="235" selection-end-column="35" /> 264 + <state relative-caret-position="0">
  265 + <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  266 + <folding />
  267 + </state>
  268 + </provider>
  269 + </entry>
  270 + <entry file="file://$PROJECT_DIR$/user-service.yml">
  271 + <provider selected="true" editor-type-id="text-editor">
  272 + <state relative-caret-position="372">
  273 + <caret line="245" column="0" lean-forward="true" selection-start-line="245" selection-start-column="0" selection-end-line="245" selection-end-column="0" />
264 <folding /> 274 <folding />
265 </state> 275 </state>
266 </provider> 276 </provider>
user-service.yml
  View file @bee3a09
@@ -242,7 +242,7 @@ eureka: @@ -242,7 +242,7 @@ eureka:
242 apiConfig: 242 apiConfig:
243 resourceGaoXiaoBangUrl: https://resource.gaoxiaobang.com 243 resourceGaoXiaoBangUrl: https://resource.gaoxiaobang.com
244 usrLocalTomcatTempLocation: /usr/local/tomcat/temp 244 usrLocalTomcatTempLocation: /usr/local/tomcat/temp
245 - gxbApiUrl: http://cms-api/cms-api 245 + cmsApiUrl: http://cms-api/cms-api
246 246
247 247
248 248