杜凯玲 / huike-eaas-config · Commits

Commit 80adb5b0f53bb40f513f87aca3549ecee00a9197

Authored by 多国蒙
1 parent fc7674b9

增加job配置

Inline Side-by-side
Showing 2 changed files with 256 additions and 21 deletions
.idea/workspace.xml
  View file @80adb5b
... ... @@ -2,8 +2,7 @@
2 2 <project version="4">
3 3 <component name="ChangeListManager">
4 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="" afterPath="$PROJECT_DIR$/job-service.yml" />
7 6 </list>
8 7 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
9 8 <option name="TRACKING_ENABLED" value="true" />
... ... @@ -14,11 +13,21 @@
14 13 </component>
15 14 <component name="FileEditorManager">
16 15 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
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="false">
18 17 <entry file="file://$PROJECT_DIR$/class-service.yml">
19 18 <provider selected="true" editor-type-id="text-editor">
20   - <state relative-caret-position="200">
21   - <caret line="422" column="0" lean-forward="true" selection-start-line="422" selection-start-column="0" selection-end-line="422" selection-end-column="0" />
  19 + <state relative-caret-position="5386">
  20 + <caret line="327" column="20" lean-forward="false" selection-start-line="327" selection-start-column="20" selection-end-line="327" selection-end-column="20" />
  21 + <folding />
  22 + </state>
  23 + </provider>
  24 + </entry>
  25 + </file>
  26 + <file leaf-file-name="job-service.yml" pinned="false" current-in-tab="true">
  27 + <entry file="file://$PROJECT_DIR$/job-service.yml">
  28 + <provider selected="true" editor-type-id="text-editor">
  29 + <state relative-caret-position="-1086">
  30 + <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
22 31 <folding />
23 32 </state>
24 33 </provider>
... ... @@ -30,6 +39,7 @@
30 39 <findStrings>
31 40 <find>index</find>
32 41 <find>db-master</find>
  42 + <find>redis</find>
33 43 </findStrings>
34 44 </component>
35 45 <component name="Git.Settings">
... ... @@ -54,13 +64,14 @@
54 64 <detection-done>true</detection-done>
55 65 <sorting>DEFINITION_ORDER</sorting>
56 66 </component>
57   - <component name="ProjectFrameBounds">
  67 + <component name="ProjectFrameBounds" extendedState="6">
  68 + <option name="x" value="4" />
58 69 <option name="y" value="23" />
59   - <option name="width" value="1440" />
  70 + <option name="width" value="1431" />
60 71 <option name="height" value="809" />
61 72 </component>
62 73 <component name="ProjectView">
63   - <navigator proportions="" version="1">
  74 + <navigator currentView="ProjectPane" proportions="" version="1">
64 75 <flattenPackages />
65 76 <showMembers />
66 77 <showModules />
... ... @@ -73,7 +84,23 @@
73 84 <manualOrder />
74 85 <foldersAlwaysOnTop value="true" />
75 86 </navigator>
76   - <panes />
  87 + <panes>
  88 + <pane id="AndroidView" />
  89 + <pane id="PackagesPane" />
  90 + <pane id="Scope" />
  91 + <pane id="Scratches" />
  92 + <pane id="ProjectPane">
  93 + <subPane>
  94 + <expand>
  95 + <path>
  96 + <item name="huike-eaas-config" type="b2602c69:ProjectViewProjectNode" />
  97 + <item name="huike-eaas-config" type="462c0819:PsiDirectoryNode" />
  98 + </path>
  99 + </expand>
  100 + <select />
  101 + </subPane>
  102 + </pane>
  103 + </panes>
77 104 </component>
78 105 <component name="PropertiesComponent">
79 106 <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
... ... @@ -82,6 +109,11 @@
82 109 <property name="aspect.path.notification.shown" value="true" />
83 110 <property name="last_opened_file_path" value="$PROJECT_DIR$" />
84 111 </component>
  112 + <component name="RecentsManager">
  113 + <key name="CopyFile.RECENT_KEYS">
  114 + <recent name="$PROJECT_DIR$" />
  115 + </key>
  116 + </component>
85 117 <component name="RunDashboard">
86 118 <option name="ruleStates">
87 119 <list>
... ... @@ -198,15 +230,15 @@
198 230 <workItem from="1551951691892" duration="12000" />
199 231 <workItem from="1552008075873" duration="1287000" />
200 232 <workItem from="1552274600142" duration="3304000" />
201   - <workItem from="1552459685523" duration="5693000" />
  233 + <workItem from="1552459685523" duration="9676000" />
202 234 </task>
203 235 <servers />
204 236 </component>
205 237 <component name="TimeTrackingManager">
206   - <option name="totallyTimeSpent" value="17628000" />
  238 + <option name="totallyTimeSpent" value="21611000" />
207 239 </component>
208 240 <component name="ToolWindowManager">
209   - <frame x="0" y="23" width="1440" height="809" extended-state="0" />
  241 + <frame x="0" y="23" width="1440" height="809" extended-state="6" />
210 242 <editor active="true" />
211 243 <layout>
212 244 <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" />
... ... @@ -221,7 +253,7 @@
221 253 <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" />
222 254 <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" />
223 255 <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" />
224   - <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" />
  256 + <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" />
225 257 <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" />
226 258 <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" />
227 259 <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" />
... ... @@ -359,14 +391,6 @@
359 391 </state>
360 392 </provider>
361 393 </entry>
362   - <entry file="file://$PROJECT_DIR$/class-service.yml">
363   - <provider selected="true" editor-type-id="text-editor">
364   - <state relative-caret-position="200">
365   - <caret line="422" column="0" lean-forward="true" selection-start-line="422" selection-start-column="0" selection-end-line="422" selection-end-column="0" />
366   - <folding />
367   - </state>
368   - </provider>
369   - </entry>
370 394 <entry file="file://$PROJECT_DIR$/user-service.yml">
371 395 <provider selected="true" editor-type-id="text-editor">
372 396 <state relative-caret-position="0">
... ... @@ -388,6 +412,22 @@
388 412 </state>
389 413 </provider>
390 414 </entry>
  415 + <entry file="file://$PROJECT_DIR$/class-service.yml">
  416 + <provider selected="true" editor-type-id="text-editor">
  417 + <state relative-caret-position="5386">
  418 + <caret line="327" column="20" lean-forward="false" selection-start-line="327" selection-start-column="20" selection-end-line="327" selection-end-column="20" />
  419 + <folding />
  420 + </state>
  421 + </provider>
  422 + </entry>
  423 + <entry file="file://$PROJECT_DIR$/job-service.yml">
  424 + <provider selected="true" editor-type-id="text-editor">
  425 + <state relative-caret-position="-1086">
  426 + <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  427 + <folding />
  428 + </state>
  429 + </provider>
  430 + </entry>
391 431 </component>
392 432 <component name="masterDetails">
393 433 <states>
... ...
job-service.yml 0 → 100644
  View file @80adb5b
  1 +server:
  2 + port: 16300
  3 + context-path: /xxl-job-admin
  4 +
  5 +spring:
  6 + profiles: development
  7 + mvc:
  8 + static-path-pattern: /static/**
  9 + ### resources
  10 + resources:
  11 + static-locations: classpath:/static/
  12 + ### freemarker
  13 + freemarker:
  14 + templateLoaderPath: classpath:/templates/
  15 + suffix: .ftl
  16 + charset: UTF-8
  17 + request-context-attribute: request
  18 + settings:
  19 + number_format: 0.##########
  20 + ### xxl-job, datasource
  21 + datasource:
  22 + name: xxl-job
  23 + url: jdbc:mysql://192.168.30.154:3306/xxl-job?Unicode=true&characterEncoding=UTF-8
  24 + username: test
  25 + password: 123456
  26 + driver-class-name: com.mysql.jdbc.Driver
  27 + type: org.apache.tomcat.jdbc.pool.DataSource
  28 + tomcat:
  29 + max-wait: 10000
  30 + max-active: 30
  31 + test-on-borrow: true
  32 + validation-query: SELECT 1
  33 + validation-interval: 30000
  34 + ### xxl-job email
  35 + mail:
  36 + host: smtp.exmail.qq.com
  37 + port: 995
  38 + username: gmduo@huikedu.com
  39 + password: Dgm=0418
  40 + properties:
  41 + mail:
  42 + smtp:
  43 + auth: true
  44 + starttls:
  45 + enable: true
  46 + required: true
  47 + velocity:
  48 + enabled: false
  49 +
  50 +### mybatis
  51 +mybatis:
  52 + mapper-locations: classpath:/mybatis-mapper/*Mapper.xml
  53 +
  54 +### xxl-job login
  55 +xxl:
  56 + job:
  57 + i18n:
  58 + login:
  59 + username: admin
  60 + password: 123456
  61 + accessToken:
  62 +
  63 +
  64 +---
  65 +server:
  66 + port: 16300
  67 + context-path: /xxl-job-admin
  68 +
  69 +spring:
  70 + profiles: test
  71 + mvc:
  72 + static-path-pattern: /static/**
  73 + ### resources
  74 + resources:
  75 + static-locations: classpath:/static/
  76 + ### freemarker
  77 + freemarker:
  78 + templateLoaderPath: classpath:/templates/
  79 + suffix: .ftl
  80 + charset: UTF-8
  81 + request-context-attribute: request
  82 + settings:
  83 + number_format: 0.##########
  84 + ### xxl-job, datasource
  85 + datasource:
  86 + name: xxl-job
  87 + url: jdbc:mysql://192.168.30.154:3306/xxl-job?Unicode=true&characterEncoding=UTF-8
  88 + username: test
  89 + password: 123456
  90 + driver-class-name: com.mysql.jdbc.Driver
  91 + type: org.apache.tomcat.jdbc.pool.DataSource
  92 + tomcat:
  93 + max-wait: 10000
  94 + max-active: 30
  95 + test-on-borrow: true
  96 + validation-query: SELECT 1
  97 + validation-interval: 30000
  98 + ### xxl-job email
  99 + mail:
  100 + host: smtp.exmail.qq.com
  101 + port: 995
  102 + username: gmduo@huikedu.com
  103 + password: Dgm=0418
  104 + properties:
  105 + mail:
  106 + smtp:
  107 + auth: true
  108 + starttls:
  109 + enable: true
  110 + required: true
  111 + velocity:
  112 + enabled: false
  113 +
  114 +### mybatis
  115 +mybatis:
  116 + mapper-locations: classpath:/mybatis-mapper/*Mapper.xml
  117 +
  118 +### xxl-job login
  119 +xxl:
  120 + job:
  121 + i18n:
  122 + login:
  123 + username: admin
  124 + password: 123456
  125 + accessToken:
  126 +
  127 +
  128 +---
  129 +server:
  130 + port: 16300
  131 + context-path: /xxl-job-admin
  132 +
  133 +spring:
  134 + profiles: production
  135 + mvc:
  136 + static-path-pattern: /static/**
  137 + ### resources
  138 + resources:
  139 + static-locations: classpath:/static/
  140 + ### freemarker
  141 + freemarker:
  142 + templateLoaderPath: classpath:/templates/
  143 + suffix: .ftl
  144 + charset: UTF-8
  145 + request-context-attribute: request
  146 + settings:
  147 + number_format: 0.##########
  148 + ### xxl-job, datasource
  149 + datasource:
  150 + name: xxl-job
  151 + url: jdbc:mysql://db-master.gxb-base:3306/xxl-job?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true
  152 + username: postgres
  153 + password: ENC(d1b95542f58fbfb0e823af8f3974b1bda84f2dc413e5ec6bc9566bb3aa950a2be59ecaaf2ed5eb3a4b4101fcf299419a)
  154 + driver-class-name: com.mysql.jdbc.Driver
  155 + max-idle: 10
  156 + max-active: 30
  157 + max-wait: 60000
  158 + min-idle: 10
  159 + initial-size: 10
  160 + validation-query: SELECT 1
  161 + test-on-borrow: true
  162 + test-while-idle: true
  163 + ### xxl-job email
  164 + mail:
  165 + host: smtp.exmail.qq.com
  166 + port: 995
  167 + username: gmduo@huikedu.com
  168 + password: Dgm=0418
  169 + properties:
  170 + mail:
  171 + smtp:
  172 + auth: true
  173 + starttls:
  174 + enable: true
  175 + required: true
  176 + velocity:
  177 + enabled: false
  178 +
  179 +### mybatis
  180 +mybatis:
  181 + mapper-locations: classpath:/mybatis-mapper/*Mapper.xml
  182 +
  183 +### xxl-job login
  184 +xxl:
  185 + job:
  186 + i18n:
  187 + login:
  188 + username: admin
  189 + password: 123456
  190 + accessToken:
  191 +
  192 +
  193 +
  194 +
  195 +
... ...