杜凯玲 / huike-eaas-config · Commits

Commit 527dcc120af015404cbc24a112814e948efcbd2d

Authored by 多国蒙
1 parent 6beabe27

增加xxl-job配置

Inline Side-by-side
Showing 2 changed files with 147 additions and 16 deletions
.idea/workspace.xml
  View file @527dcc1
... ... @@ -3,7 +3,7 @@
3 3 <component name="ChangeListManager">
4 4 <list default="true" id="13dd2828-e36c-4ae2-ae8b-a6404522d93e" name="Default" comment="">
5 5 <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
6   - <change beforePath="$PROJECT_DIR$/user-service.yml" afterPath="$PROJECT_DIR$/user-service.yml" />
  6 + <change beforePath="$PROJECT_DIR$/class-service.yml" afterPath="$PROJECT_DIR$/class-service.yml" />
7 7 </list>
8 8 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
9 9 <option name="TRACKING_ENABLED" value="true" />
... ... @@ -14,11 +14,11 @@
14 14 </component>
15 15 <component name="FileEditorManager">
16 16 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
17   - <file leaf-file-name="user-service.yml" pinned="false" current-in-tab="true">
18   - <entry file="file://$PROJECT_DIR$/user-service.yml">
  17 + <file leaf-file-name="class-service.yml" pinned="false" current-in-tab="true">
  18 + <entry file="file://$PROJECT_DIR$/class-service.yml">
19 19 <provider selected="true" editor-type-id="text-editor">
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" />
  20 + <state relative-caret-position="426">
  21 + <caret line="347" column="9" lean-forward="true" selection-start-line="347" selection-start-column="9" selection-end-line="347" selection-end-column="9" />
22 22 <folding />
23 23 </state>
24 24 </provider>
... ... @@ -26,6 +26,11 @@
26 26 </file>
27 27 </leaf>
28 28 </component>
  29 + <component name="FindInProjectRecents">
  30 + <findStrings>
  31 + <find>index</find>
  32 + </findStrings>
  33 + </component>
29 34 <component name="Git.Settings">
30 35 <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
31 36 </component>
... ... @@ -38,6 +43,7 @@
38 43 <option name="CHANGED_PATHS">
39 44 <list>
40 45 <option value="$PROJECT_DIR$/user-service.yml" />
  46 + <option value="$PROJECT_DIR$/class-service.yml" />
41 47 </list>
42 48 </option>
43 49 </component>
... ... @@ -47,10 +53,10 @@
47 53 <detection-done>true</detection-done>
48 54 <sorting>DEFINITION_ORDER</sorting>
49 55 </component>
50   - <component name="ProjectFrameBounds" extendedState="6">
  56 + <component name="ProjectFrameBounds" extendedState="1">
51 57 <option name="y" value="23" />
52   - <option name="width" value="1431" />
53   - <option name="height" value="813" />
  58 + <option name="width" value="1440" />
  59 + <option name="height" value="809" />
54 60 </component>
55 61 <component name="ProjectView">
56 62 <navigator currentView="ProjectPane" proportions="" version="1">
... ... @@ -67,8 +73,6 @@
67 73 <foldersAlwaysOnTop value="true" />
68 74 </navigator>
69 75 <panes>
70   - <pane id="PackagesPane" />
71   - <pane id="AndroidView" />
72 76 <pane id="Scope" />
73 77 <pane id="ProjectPane">
74 78 <subPane>
... ... @@ -82,6 +86,8 @@
82 86 </subPane>
83 87 </pane>
84 88 <pane id="Scratches" />
  89 + <pane id="AndroidView" />
  90 + <pane id="PackagesPane" />
85 91 </panes>
86 92 </component>
87 93 <component name="PropertiesComponent">
... ... @@ -202,14 +208,16 @@
202 208 <workItem from="1539573460319" duration="348000" />
203 209 <workItem from="1540454746462" duration="260000" />
204 210 <workItem from="1540455884558" duration="35000" />
  211 + <workItem from="1547602295898" duration="2594000" />
  212 + <workItem from="1551924411169" duration="3176000" />
205 213 </task>
206 214 <servers />
207 215 </component>
208 216 <component name="TimeTrackingManager">
209   - <option name="totallyTimeSpent" value="643000" />
  217 + <option name="totallyTimeSpent" value="7332000" />
210 218 </component>
211 219 <component name="ToolWindowManager">
212   - <frame x="0" y="23" width="1431" height="813" extended-state="6" />
  220 + <frame x="0" y="23" width="1440" height="809" extended-state="1" />
213 221 <editor active="true" />
214 222 <layout>
215 223 <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" />
... ... @@ -224,7 +232,7 @@
224 232 <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" />
225 233 <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" />
226 234 <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" />
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" />
  235 + <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.27141827" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
228 236 <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" />
229 237 <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" />
230 238 <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" />
... ... @@ -239,6 +247,34 @@
239 247 <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" />
240 248 <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" />
241 249 </layout>
  250 + <layout-to-restore>
  251 + <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" />
  252 + <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" />
  253 + <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" />
  254 + <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" />
  255 + <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" />
  256 + <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="4" side_tool="false" content_ui="tabs" />
  257 + <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" />
  258 + <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="3" side_tool="false" content_ui="tabs" />
  259 + <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" />
  260 + <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="5" side_tool="false" content_ui="tabs" />
  261 + <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" />
  262 + <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" />
  263 + <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="4" side_tool="false" content_ui="tabs" />
  264 + <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" />
  265 + <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" />
  266 + <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="6" side_tool="false" content_ui="tabs" />
  267 + <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="5" side_tool="false" content_ui="tabs" />
  268 + <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="7" side_tool="false" content_ui="tabs" />
  269 + <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" />
  270 + <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" />
  271 + <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="8" side_tool="false" content_ui="tabs" />
  272 + <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="9" side_tool="false" content_ui="tabs" />
  273 + <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.27141827" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
  274 + <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" />
  275 + <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="8" side_tool="false" content_ui="tabs" />
  276 + <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="6" side_tool="true" content_ui="tabs" />
  277 + </layout-to-restore>
242 278 </component>
243 279 <component name="TypeScriptGeneratedFilesManager">
244 280 <option name="version" value="1" />
... ... @@ -251,7 +287,15 @@
251 287 <watches-manager />
252 288 </component>
253 289 <component name="editorHistoryManager">
254   - <entry file="file://$PROJECT_DIR$/user-service.yml">
  290 + <entry file="file://$PROJECT_DIR$/class-service.yml">
  291 + <provider selected="true" editor-type-id="text-editor">
  292 + <state relative-caret-position="0">
  293 + <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  294 + <folding />
  295 + </state>
  296 + </provider>
  297 + </entry>
  298 + <entry file="file://$PROJECT_DIR$/class-service.yml">
255 299 <provider selected="true" editor-type-id="text-editor">
256 300 <state relative-caret-position="0">
257 301 <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
... ... @@ -263,15 +307,63 @@
263 307 <provider selected="true" editor-type-id="text-editor">
264 308 <state relative-caret-position="0">
265 309 <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  310 + </state>
  311 + </provider>
  312 + </entry>
  313 + <entry file="file://$PROJECT_DIR$/user-service.yml">
  314 + <provider selected="true" editor-type-id="text-editor">
  315 + <state relative-caret-position="0">
  316 + <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  317 + </state>
  318 + </provider>
  319 + </entry>
  320 + <entry file="file://$PROJECT_DIR$/user-service.yml">
  321 + <provider selected="true" editor-type-id="text-editor">
  322 + <state relative-caret-position="0">
  323 + <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  324 + </state>
  325 + </provider>
  326 + </entry>
  327 + <entry file="file://$PROJECT_DIR$/user-service.yml">
  328 + <provider selected="true" editor-type-id="text-editor">
  329 + <state relative-caret-position="0">
  330 + <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  331 + </state>
  332 + </provider>
  333 + </entry>
  334 + <entry file="file://$PROJECT_DIR$/user-service.yml">
  335 + <provider selected="true" editor-type-id="text-editor">
  336 + <state relative-caret-position="227">
  337 + <caret line="11" column="49" lean-forward="false" selection-start-line="11" selection-start-column="41" selection-end-line="11" selection-end-column="49" />
  338 + </state>
  339 + </provider>
  340 + </entry>
  341 + <entry file="file://$PROJECT_DIR$/class-service.yml">
  342 + <provider selected="true" editor-type-id="text-editor">
  343 + <state relative-caret-position="426">
  344 + <caret line="347" column="9" lean-forward="true" selection-start-line="347" selection-start-column="9" selection-end-line="347" selection-end-column="9" />
266 345 <folding />
267 346 </state>
268 347 </provider>
269 348 </entry>
270 349 <entry file="file://$PROJECT_DIR$/user-service.yml">
271 350 <provider selected="true" editor-type-id="text-editor">
  351 + <state relative-caret-position="0">
  352 + <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  353 + </state>
  354 + </provider>
  355 + </entry>
  356 + <entry file="file://$PROJECT_DIR$/user-service.yml">
  357 + <provider selected="true" editor-type-id="text-editor">
  358 + <state relative-caret-position="0">
  359 + <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  360 + </state>
  361 + </provider>
  362 + </entry>
  363 + <entry file="file://$PROJECT_DIR$/user-service.yml">
  364 + <provider selected="true" editor-type-id="text-editor">
272 365 <state relative-caret-position="372">
273 366 <caret line="245" column="0" lean-forward="true" selection-start-line="245" selection-start-column="0" selection-end-line="245" selection-end-column="0" />
274   - <folding />
275 367 </state>
276 368 </provider>
277 369 </entry>
... ...
class-service.yml
  View file @527dcc1
... ... @@ -142,6 +142,19 @@ sendCloud:
142 142 index:
143 143 indexDir: /app/index/
144 144  
  145 +#xxl-job
  146 +xxl:
  147 + job:
  148 + admin:
  149 + addresses: http://192.168.30.250:16888/xxl-job-admin
  150 + executor:
  151 + appname: classes-server
  152 + ip:
  153 + port: 8888
  154 + logpath: /app/logs
  155 + logretentiondays: -1
  156 + accessToken:
  157 +
145 158 ---
146 159 server:
147 160 port: 16200
... ... @@ -267,6 +280,19 @@ apiConfig:
267 280 index:
268 281 indexDir: /app/index/
269 282  
  283 +#xxl-job
  284 +xxl:
  285 + job:
  286 + admin:
  287 + addresses: http://192.168.30.250:16888/xxl-job-admin
  288 + executor:
  289 + appname: classes-server
  290 + ip:
  291 + port: 8888
  292 + logpath: /app/logs
  293 + logretentiondays: -1
  294 + accessToken:
  295 +
270 296 ---
271 297 server:
272 298 port: 16200
... ... @@ -396,4 +422,17 @@ sendCloud:
396 422 from: postmaster@kkb.sendcloud.org
397 423  
398 424 index:
399   - indexDir: /app/users/index/
400 425 \ No newline at end of file
  426 + indexDir: /app/users/index/
  427 +
  428 +#xxl-job
  429 +xxl:
  430 + job:
  431 + admin:
  432 + addresses: http://192.168.30.250:16888/xxl-job-admin
  433 + executor:
  434 + appname: classes-server
  435 + ip:
  436 + port: 8888
  437 + logpath: /app/logs
  438 + logretentiondays: -1
  439 + accessToken:
401 440 \ No newline at end of file
... ...