Commit 230b4b4d2502d088de347511ab285ae3fb209510

Authored by 多国蒙
1 parent 21d5d17b

no message

.idea/workspace.xml
@@ -2,7 +2,6 @@ @@ -2,7 +2,6 @@
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" />  
6 <change beforePath="$PROJECT_DIR$/class-service.yml" afterPath="$PROJECT_DIR$/class-service.yml" /> 5 <change beforePath="$PROJECT_DIR$/class-service.yml" afterPath="$PROJECT_DIR$/class-service.yml" />
7 </list> 6 </list>
8 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> 7 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -17,8 +16,8 @@ @@ -17,8 +16,8 @@
17 <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">
18 <entry file="file://$PROJECT_DIR$/class-service.yml"> 17 <entry file="file://$PROJECT_DIR$/class-service.yml">
19 <provider selected="true" editor-type-id="text-editor"> 18 <provider selected="true" editor-type-id="text-editor">
20 - <state relative-caret-position="-208">  
21 - <caret line="66" column="8" lean-forward="false" selection-start-line="66" selection-start-column="8" selection-end-line="66" selection-end-column="8" /> 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" />
22 <folding /> 21 <folding />
23 </state> 22 </state>
24 </provider> 23 </provider>
@@ -236,15 +235,16 @@ @@ -236,15 +235,16 @@
236 <workItem from="1552008075873" duration="1287000" /> 235 <workItem from="1552008075873" duration="1287000" />
237 <workItem from="1552274600142" duration="3304000" /> 236 <workItem from="1552274600142" duration="3304000" />
238 <workItem from="1552459685523" duration="12044000" /> 237 <workItem from="1552459685523" duration="12044000" />
239 - <workItem from="1553766529481" duration="231000" /> 238 + <workItem from="1553766529481" duration="293000" />
240 </task> 239 </task>
241 <servers /> 240 <servers />
242 </component> 241 </component>
243 <component name="TimeTrackingManager"> 242 <component name="TimeTrackingManager">
244 - <option name="totallyTimeSpent" value="24210000" /> 243 + <option name="totallyTimeSpent" value="24272000" />
245 </component> 244 </component>
246 <component name="ToolWindowManager"> 245 <component name="ToolWindowManager">
247 <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" />
  247 + <editor active="true" />
248 <layout> 248 <layout>
249 <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" /> 249 <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" />
250 <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" /> 250 <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" />
@@ -258,7 +258,7 @@ @@ -258,7 +258,7 @@
258 <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" /> 258 <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 <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" /> 259 <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 <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" /> 260 <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="true" 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" /> 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" />
262 <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" /> 262 <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" /> 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 <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" /> 264 <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" />
@@ -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="-208">  
460 - <caret line="66" column="8" lean-forward="false" selection-start-line="66" selection-start-column="8" selection-end-line="66" selection-end-column="8" /> 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" />
461 <folding /> 461 <folding />
462 </state> 462 </state>
463 </provider> 463 </provider>
class-service.yml
@@ -65,15 +65,15 @@ spring: @@ -65,15 +65,15 @@ spring:
65 max-active: 1000 65 max-active: 1000
66 max-wait: 100000 66 max-wait: 100000
67 redis2: 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 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: 77 #sentinel:
78 #master: mymaster1 78 #master: mymaster1
79 #nodes: redis-server:16379,redis-server:16379 79 #nodes: redis-server:16379,redis-server:16379