杜凯玲 / huike-eaas-config · Commits

Commit 6f3141c68532fb99f676c351d1e032a8248cfba0

Authored by 多国蒙
1 parent 3d28ca96

修改线上配置

Inline Side-by-side
Showing 2 changed files with 39 additions and 28 deletions
.idea/workspace.xml
  View file @6f3141c
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
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$/user-service.yml" afterPath="$PROJECT_DIR$/user-service.yml" />
  6 + </list>
5 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> 7 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
6 <option name="TRACKING_ENABLED" value="true" /> 8 <option name="TRACKING_ENABLED" value="true" />
7 <option name="SHOW_DIALOG" value="false" /> 9 <option name="SHOW_DIALOG" value="false" />
@@ -10,12 +12,12 @@ @@ -10,12 +12,12 @@
10 <option name="LAST_RESOLUTION" value="IGNORE" /> 12 <option name="LAST_RESOLUTION" value="IGNORE" />
11 </component> 13 </component>
12 <component name="FileEditorManager"> 14 <component name="FileEditorManager">
13 - <leaf> 15 + <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
14 <file leaf-file-name="user-service.yml" pinned="false" current-in-tab="true"> 16 <file leaf-file-name="user-service.yml" pinned="false" current-in-tab="true">
15 <entry file="file://$PROJECT_DIR$/user-service.yml"> 17 <entry file="file://$PROJECT_DIR$/user-service.yml">
16 <provider selected="true" editor-type-id="text-editor"> 18 <provider selected="true" editor-type-id="text-editor">
17 - <state relative-caret-position="344">  
18 - <caret line="183" column="24" lean-forward="false" selection-start-line="183" selection-start-column="20" selection-end-line="183" selection-end-column="24" /> 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" />
19 <folding /> 21 <folding />
20 </state> 22 </state>
21 </provider> 23 </provider>
@@ -64,6 +66,7 @@ @@ -64,6 +66,7 @@
64 <foldersAlwaysOnTop value="true" /> 66 <foldersAlwaysOnTop value="true" />
65 </navigator> 67 </navigator>
66 <panes> 68 <panes>
  69 + <pane id="Scope" />
67 <pane id="ProjectPane"> 70 <pane id="ProjectPane">
68 <subPane> 71 <subPane>
69 <expand> 72 <expand>
@@ -75,10 +78,9 @@ @@ -75,10 +78,9 @@
75 <select /> 78 <select />
76 </subPane> 79 </subPane>
77 </pane> 80 </pane>
  81 + <pane id="Scratches" />
78 <pane id="AndroidView" /> 82 <pane id="AndroidView" />
79 <pane id="PackagesPane" /> 83 <pane id="PackagesPane" />
80 - <pane id="Scope" />  
81 - <pane id="Scratches" />  
82 </panes> 84 </panes>
83 </component> 85 </component>
84 <component name="PropertiesComponent"> 86 <component name="PropertiesComponent">
@@ -197,42 +199,43 @@ @@ -197,42 +199,43 @@
197 <option name="presentableId" value="Default" /> 199 <option name="presentableId" value="Default" />
198 <updated>1539573458792</updated> 200 <updated>1539573458792</updated>
199 <workItem from="1539573460319" duration="348000" /> 201 <workItem from="1539573460319" duration="348000" />
  202 + <workItem from="1540454746462" duration="78000" />
200 </task> 203 </task>
201 <servers /> 204 <servers />
202 </component> 205 </component>
203 <component name="TimeTrackingManager"> 206 <component name="TimeTrackingManager">
204 - <option name="totallyTimeSpent" value="348000" /> 207 + <option name="totallyTimeSpent" value="426000" />
205 </component> 208 </component>
206 <component name="ToolWindowManager"> 209 <component name="ToolWindowManager">
207 - <frame x="6" y="23" width="1431" height="813" extended-state="6" /> 210 + <frame x="0" y="23" width="1431" height="813" extended-state="6" />
208 <editor active="true" /> 211 <editor active="true" />
209 <layout> 212 <layout>
210 - <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="-1" side_tool="false" content_ui="tabs" /> 213 + <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" />
211 <window_info id="TODO" 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="6" side_tool="false" content_ui="tabs" /> 214 <window_info id="TODO" 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="6" side_tool="false" content_ui="tabs" />
212 - <window_info id="Palette&#9;" 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="-1" side_tool="false" content_ui="tabs" />  
213 - <window_info id="Image Layers" 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="-1" side_tool="false" content_ui="tabs" />  
214 - <window_info id="Capture Analysis" 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="-1" side_tool="false" content_ui="tabs" />  
215 - <window_info id="Event Log" 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="true" content_ui="tabs" />  
216 - <window_info id="Maven Projects" 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="-1" side_tool="false" content_ui="tabs" /> 215 + <window_info id="Palette&#9;" 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" />
  216 + <window_info id="Image Layers" 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" />
  217 + <window_info id="Capture Analysis" 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" />
  218 + <window_info id="Event Log" 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="true" content_ui="tabs" />
  219 + <window_info id="Maven Projects" 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" />
217 <window_info id="Run" 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="2" side_tool="false" content_ui="tabs" /> 220 <window_info id="Run" 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="2" side_tool="false" content_ui="tabs" />
218 - <window_info id="Version Control" 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" />  
219 - <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="-1" side_tool="false" content_ui="tabs" />  
220 - <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="-1" side_tool="false" content_ui="tabs" />  
221 - <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="-1" side_tool="false" content_ui="tabs" />  
222 - <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.26061916" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />  
223 - <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="-1" side_tool="false" content_ui="tabs" /> 221 + <window_info id="Version Control" 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" />
  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" />
  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" />
  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" />
  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" />
  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" />
224 <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" /> 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" />
225 <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" /> 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" />
226 - <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="-1" side_tool="false" content_ui="tabs" />  
227 - <window_info id="Theme Preview" 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="-1" side_tool="false" content_ui="tabs" /> 229 + <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" />
  230 + <window_info id="Theme Preview" 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="Debug" 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="3" side_tool="false" content_ui="tabs" /> 231 <window_info id="Debug" 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="3" side_tool="false" content_ui="tabs" />
229 - <window_info id="Favorites" 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="-1" side_tool="true" content_ui="tabs" /> 232 + <window_info id="Favorites" 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="true" content_ui="tabs" />
230 <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" /> 233 <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
231 - <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" />  
232 <window_info id="Message" 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="0" side_tool="false" content_ui="tabs" /> 234 <window_info id="Message" 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="0" side_tool="false" content_ui="tabs" />
233 <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" /> 235 <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" />
234 - <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" /> 236 + <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" />
235 <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" /> 237 <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" />
  238 + <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" />
236 </layout> 239 </layout>
237 </component> 240 </component>
238 <component name="TypeScriptGeneratedFilesManager"> 241 <component name="TypeScriptGeneratedFilesManager">
@@ -248,8 +251,16 @@ @@ -248,8 +251,16 @@
248 <component name="editorHistoryManager"> 251 <component name="editorHistoryManager">
249 <entry file="file://$PROJECT_DIR$/user-service.yml"> 252 <entry file="file://$PROJECT_DIR$/user-service.yml">
250 <provider selected="true" editor-type-id="text-editor"> 253 <provider selected="true" editor-type-id="text-editor">
251 - <state relative-caret-position="344">  
252 - <caret line="183" column="24" lean-forward="false" selection-start-line="183" selection-start-column="20" selection-end-line="183" selection-end-column="24" /> 254 + <state relative-caret-position="0">
  255 + <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  256 + <folding />
  257 + </state>
  258 + </provider>
  259 + </entry>
  260 + <entry file="file://$PROJECT_DIR$/user-service.yml">
  261 + <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" />
253 <folding /> 264 <folding />
254 </state> 265 </state>
255 </provider> 266 </provider>
user-service.yml
  View file @6f3141c
@@ -233,7 +233,7 @@ eureka: @@ -233,7 +233,7 @@ eureka:
233 apiConfig: 233 apiConfig:
234 resourceGaoXiaoBangUrl: https://resource.gaoxiaobang.com 234 resourceGaoXiaoBangUrl: https://resource.gaoxiaobang.com
235 usrLocalTomcatTempLocation: /usr/local/tomcat/temp 235 usrLocalTomcatTempLocation: /usr/local/tomcat/temp
236 - gxbApiUrl: http://api/gxb-api 236 + gxbApiUrl: http://cms-api/cms-api
237 237
238 238
239 239