Commit 2af2b27b5e9b7234b3f654604957f7fd4678db70
1 parent
b1c0c6f6
no message
Showing
2 changed files
with
67 additions
and
30 deletions
.idea/workspace.xml
| @@ -2,7 +2,8 @@ | @@ -2,7 +2,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$/job-service.yml" afterPath="$PROJECT_DIR$/job-service.yml" /> | 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" /> | ||
| 6 | </list> | 7 | </list> |
| 7 | <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> | 8 | <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> |
| 8 | <option name="TRACKING_ENABLED" value="true" /> | 9 | <option name="TRACKING_ENABLED" value="true" /> |
| @@ -13,21 +14,21 @@ | @@ -13,21 +14,21 @@ | ||
| 13 | </component> | 14 | </component> |
| 14 | <component name="FileEditorManager"> | 15 | <component name="FileEditorManager"> |
| 15 | <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> | 16 | <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> |
| 16 | - <file leaf-file-name="class-service.yml" pinned="false" current-in-tab="false"> | 17 | + <file leaf-file-name="class-service.yml" pinned="false" current-in-tab="true"> |
| 17 | <entry file="file://$PROJECT_DIR$/class-service.yml"> | 18 | <entry file="file://$PROJECT_DIR$/class-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="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" /> | 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" /> | ||
| 21 | <folding /> | 22 | <folding /> |
| 22 | </state> | 23 | </state> |
| 23 | </provider> | 24 | </provider> |
| 24 | </entry> | 25 | </entry> |
| 25 | </file> | 26 | </file> |
| 26 | - <file leaf-file-name="job-service.yml" pinned="false" current-in-tab="true"> | 27 | + <file leaf-file-name="job-service.yml" pinned="false" current-in-tab="false"> |
| 27 | <entry file="file://$PROJECT_DIR$/job-service.yml"> | 28 | <entry file="file://$PROJECT_DIR$/job-service.yml"> |
| 28 | <provider selected="true" editor-type-id="text-editor"> | 29 | <provider selected="true" editor-type-id="text-editor"> |
| 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" /> | 30 | + <state relative-caret-position="1281"> |
| 31 | + <caret line="61" column="10" lean-forward="false" selection-start-line="61" selection-start-column="10" selection-end-line="61" selection-end-column="10" /> | ||
| 31 | <folding> | 32 | <folding> |
| 32 | <element signature="e#1374#2742#0" expanded="false" /> | 33 | <element signature="e#1374#2742#0" expanded="false" /> |
| 33 | <element signature="e#2745#4227#0" expanded="false" /> | 34 | <element signature="e#2745#4227#0" expanded="false" /> |
| @@ -42,6 +43,7 @@ | @@ -42,6 +43,7 @@ | ||
| 42 | <findStrings> | 43 | <findStrings> |
| 43 | <find>index</find> | 44 | <find>index</find> |
| 44 | <find>db-master</find> | 45 | <find>db-master</find> |
| 46 | + <find>failFast</find> | ||
| 45 | <find>redis</find> | 47 | <find>redis</find> |
| 46 | </findStrings> | 48 | </findStrings> |
| 47 | </component> | 49 | </component> |
| @@ -57,8 +59,8 @@ | @@ -57,8 +59,8 @@ | ||
| 57 | <option name="CHANGED_PATHS"> | 59 | <option name="CHANGED_PATHS"> |
| 58 | <list> | 60 | <list> |
| 59 | <option value="$PROJECT_DIR$/user-service.yml" /> | 61 | <option value="$PROJECT_DIR$/user-service.yml" /> |
| 60 | - <option value="$PROJECT_DIR$/class-service.yml" /> | ||
| 61 | <option value="$PROJECT_DIR$/job-service.yml" /> | 62 | <option value="$PROJECT_DIR$/job-service.yml" /> |
| 63 | + <option value="$PROJECT_DIR$/class-service.yml" /> | ||
| 62 | </list> | 64 | </list> |
| 63 | </option> | 65 | </option> |
| 64 | </component> | 66 | </component> |
| @@ -68,10 +70,9 @@ | @@ -68,10 +70,9 @@ | ||
| 68 | <detection-done>true</detection-done> | 70 | <detection-done>true</detection-done> |
| 69 | <sorting>DEFINITION_ORDER</sorting> | 71 | <sorting>DEFINITION_ORDER</sorting> |
| 70 | </component> | 72 | </component> |
| 71 | - <component name="ProjectFrameBounds" extendedState="6"> | ||
| 72 | - <option name="x" value="4" /> | 73 | + <component name="ProjectFrameBounds"> |
| 73 | <option name="y" value="23" /> | 74 | <option name="y" value="23" /> |
| 74 | - <option name="width" value="1431" /> | 75 | + <option name="width" value="1440" /> |
| 75 | <option name="height" value="809" /> | 76 | <option name="height" value="809" /> |
| 76 | </component> | 77 | </component> |
| 77 | <component name="ProjectView"> | 78 | <component name="ProjectView"> |
| @@ -89,9 +90,6 @@ | @@ -89,9 +90,6 @@ | ||
| 89 | <foldersAlwaysOnTop value="true" /> | 90 | <foldersAlwaysOnTop value="true" /> |
| 90 | </navigator> | 91 | </navigator> |
| 91 | <panes> | 92 | <panes> |
| 92 | - <pane id="AndroidView" /> | ||
| 93 | - <pane id="PackagesPane" /> | ||
| 94 | - <pane id="Scope" /> | ||
| 95 | <pane id="Scratches" /> | 93 | <pane id="Scratches" /> |
| 96 | <pane id="ProjectPane"> | 94 | <pane id="ProjectPane"> |
| 97 | <subPane> | 95 | <subPane> |
| @@ -104,6 +102,9 @@ | @@ -104,6 +102,9 @@ | ||
| 104 | <select /> | 102 | <select /> |
| 105 | </subPane> | 103 | </subPane> |
| 106 | </pane> | 104 | </pane> |
| 105 | + <pane id="Scope" /> | ||
| 106 | + <pane id="AndroidView" /> | ||
| 107 | + <pane id="PackagesPane" /> | ||
| 107 | </panes> | 108 | </panes> |
| 108 | </component> | 109 | </component> |
| 109 | <component name="PropertiesComponent"> | 110 | <component name="PropertiesComponent"> |
| @@ -234,16 +235,16 @@ | @@ -234,16 +235,16 @@ | ||
| 234 | <workItem from="1551951691892" duration="12000" /> | 235 | <workItem from="1551951691892" duration="12000" /> |
| 235 | <workItem from="1552008075873" duration="1287000" /> | 236 | <workItem from="1552008075873" duration="1287000" /> |
| 236 | <workItem from="1552274600142" duration="3304000" /> | 237 | <workItem from="1552274600142" duration="3304000" /> |
| 237 | - <workItem from="1552459685523" duration="10068000" /> | 238 | + <workItem from="1552459685523" duration="12044000" /> |
| 239 | + <workItem from="1553766529481" duration="231000" /> | ||
| 238 | </task> | 240 | </task> |
| 239 | <servers /> | 241 | <servers /> |
| 240 | </component> | 242 | </component> |
| 241 | <component name="TimeTrackingManager"> | 243 | <component name="TimeTrackingManager"> |
| 242 | - <option name="totallyTimeSpent" value="22003000" /> | 244 | + <option name="totallyTimeSpent" value="24210000" /> |
| 243 | </component> | 245 | </component> |
| 244 | <component name="ToolWindowManager"> | 246 | <component name="ToolWindowManager"> |
| 245 | - <frame x="0" y="23" width="1440" height="809" extended-state="6" /> | ||
| 246 | - <editor active="true" /> | 247 | + <frame x="0" y="23" width="1440" height="809" extended-state="0" /> |
| 247 | <layout> | 248 | <layout> |
| 248 | <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" /> |
| 249 | <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" /> |
| @@ -257,7 +258,7 @@ | @@ -257,7 +258,7 @@ | ||
| 257 | <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" /> |
| 258 | <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" /> |
| 259 | <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" /> |
| 260 | - <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.18884121" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> | 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="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" /> |
| 262 | <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" /> |
| 263 | <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" /> |
| @@ -320,6 +321,25 @@ | @@ -320,6 +321,25 @@ | ||
| 320 | </state> | 321 | </state> |
| 321 | </provider> | 322 | </provider> |
| 322 | </entry> | 323 | </entry> |
| 324 | + <entry file="file://$PROJECT_DIR$/job-service.yml"> | ||
| 325 | + <provider selected="true" editor-type-id="text-editor"> | ||
| 326 | + <state relative-caret-position="1281"> | ||
| 327 | + <caret line="61" column="10" lean-forward="false" selection-start-line="61" selection-start-column="10" selection-end-line="61" selection-end-column="10" /> | ||
| 328 | + <folding> | ||
| 329 | + <element signature="e#1374#2742#0" expanded="false" /> | ||
| 330 | + <element signature="e#2745#4227#0" expanded="false" /> | ||
| 331 | + </folding> | ||
| 332 | + </state> | ||
| 333 | + </provider> | ||
| 334 | + </entry> | ||
| 335 | + <entry file="file://$PROJECT_DIR$/class-service.yml"> | ||
| 336 | + <provider selected="true" editor-type-id="text-editor"> | ||
| 337 | + <state relative-caret-position="0"> | ||
| 338 | + <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> | ||
| 339 | + <folding /> | ||
| 340 | + </state> | ||
| 341 | + </provider> | ||
| 342 | + </entry> | ||
| 323 | <entry file="file://$PROJECT_DIR$/class-service.yml"> | 343 | <entry file="file://$PROJECT_DIR$/class-service.yml"> |
| 324 | <provider selected="true" editor-type-id="text-editor"> | 344 | <provider selected="true" editor-type-id="text-editor"> |
| 325 | <state relative-caret-position="0"> | 345 | <state relative-caret-position="0"> |
| @@ -416,18 +436,10 @@ | @@ -416,18 +436,10 @@ | ||
| 416 | </state> | 436 | </state> |
| 417 | </provider> | 437 | </provider> |
| 418 | </entry> | 438 | </entry> |
| 419 | - <entry file="file://$PROJECT_DIR$/class-service.yml"> | ||
| 420 | - <provider selected="true" editor-type-id="text-editor"> | ||
| 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" /> | ||
| 423 | - <folding /> | ||
| 424 | - </state> | ||
| 425 | - </provider> | ||
| 426 | - </entry> | ||
| 427 | <entry file="file://$PROJECT_DIR$/job-service.yml"> | 439 | <entry file="file://$PROJECT_DIR$/job-service.yml"> |
| 428 | <provider selected="true" editor-type-id="text-editor"> | 440 | <provider selected="true" editor-type-id="text-editor"> |
| 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" /> | 441 | + <state relative-caret-position="1281"> |
| 442 | + <caret line="61" column="10" lean-forward="false" selection-start-line="61" selection-start-column="10" selection-end-line="61" selection-end-column="10" /> | ||
| 431 | <folding> | 443 | <folding> |
| 432 | <element signature="e#1374#2742#0" expanded="false" /> | 444 | <element signature="e#1374#2742#0" expanded="false" /> |
| 433 | <element signature="e#2745#4227#0" expanded="false" /> | 445 | <element signature="e#2745#4227#0" expanded="false" /> |
| @@ -435,6 +447,21 @@ | @@ -435,6 +447,21 @@ | ||
| 435 | </state> | 447 | </state> |
| 436 | </provider> | 448 | </provider> |
| 437 | </entry> | 449 | </entry> |
| 450 | + <entry file="file://$PROJECT_DIR$/config.yml"> | ||
| 451 | + <provider selected="true" editor-type-id="text-editor"> | ||
| 452 | + <state relative-caret-position="0"> | ||
| 453 | + <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> | ||
| 454 | + </state> | ||
| 455 | + </provider> | ||
| 456 | + </entry> | ||
| 457 | + <entry file="file://$PROJECT_DIR$/class-service.yml"> | ||
| 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" /> | ||
| 461 | + <folding /> | ||
| 462 | + </state> | ||
| 463 | + </provider> | ||
| 464 | + </entry> | ||
| 438 | </component> | 465 | </component> |
| 439 | <component name="masterDetails"> | 466 | <component name="masterDetails"> |
| 440 | <states> | 467 | <states> |
class-service.yml
| @@ -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 | - redis: | 57 | + redis1: |
| 58 | database: 0 | 58 | database: 0 |
| 59 | host: redis-server | 59 | host: redis-server |
| 60 | port: 6379 | 60 | port: 6379 |
| @@ -64,6 +64,16 @@ spring: | @@ -64,6 +64,16 @@ 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 | ||
| 67 | #sentinel: | 77 | #sentinel: |
| 68 | #master: mymaster1 | 78 | #master: mymaster1 |
| 69 | #nodes: redis-server:16379,redis-server:16379 | 79 | #nodes: redis-server:16379,redis-server:16379 |