From de7734b48acd616715ce70803bc8b237c88e417b Mon Sep 17 00:00:00 2001 From: zhizhi wu <2377881365@qq.com> Date: Thu, 25 Nov 2021 10:17:26 +0800 Subject: [PATCH] schedular --- .../src/main/resources/application-prod.yml | 54 ++++++++++++++++++- .../src/main/resources/application-test.yml | 52 ++++++++++++------ scheduler/src/main/resources/application.yml | 2 +- .../vue-element-admin-master/.env.development | 2 +- .../vue-element-admin-master/.env.staging | 2 +- .../src/views/login/index.vue | 2 +- 6 files changed, 93 insertions(+), 21 deletions(-) diff --git a/scheduler/src/main/resources/application-prod.yml b/scheduler/src/main/resources/application-prod.yml index 7da58a9..40663d7 100644 --- a/scheduler/src/main/resources/application-prod.yml +++ b/scheduler/src/main/resources/application-prod.yml @@ -6,6 +6,39 @@ spring: workerId: 1 datasource: type: com.alibaba.druid.pool.DruidDataSource + quartz: + # dataSource: + # default: + # driver: com.mysql.jdbc.Driver + # URL: jdbc:mysql://localhost:3306/jobconfig?useUnicode=true&characterEncoding=utf8 + # user: root + # password: 12345678 + # maxConnections: 5 + #相关属性配置 + properties: + org: + quartz: + scheduler: + instanceName: quartzScheduler + instanceId: AUTO + jobStore: + class: org.quartz.impl.jdbcjobstore.JobStoreTX + driverDelegateClass: org.quartz.impl.jdbcjobstore.StdJDBCDelegate + tablePrefix: QRTZ_ + isClustered: false + clusterCheckinInterval: 10000 + useProperties: false + threadPool: + class: org.quartz.simpl.SimpleThreadPool + threadCount: 10 + threadPriority: 5 + threadsInheritContextClassLoaderOfInitializingThread: true + #数据库方式 + job-store-type: JDBC + #初始化表结构 + jdbc: + #always never + initialize-schema: never redis: database: 0 host: 127.0.0.1 @@ -15,8 +48,25 @@ spring: max-idle: 10 max-wait: -1ms min-idle: 0 - password: + password: '' port: 6379 timeout: 1000ms + rabbitmq: + host: dd.tall.wiki + password: 111111 + port: 5672 + username: admin + redis: + database: 0 + host: 127.0.0.1 + jedis: + pool: + max-active: 200 + max-idle: 10 + max-wait: -1ms + min-idle: 0 + password: '' + port: 6379 + timeout: 1000ms swagger: - enable: false + enable: true \ No newline at end of file diff --git a/scheduler/src/main/resources/application-test.yml b/scheduler/src/main/resources/application-test.yml index b2a300f..40663d7 100644 --- a/scheduler/src/main/resources/application-test.yml +++ b/scheduler/src/main/resources/application-test.yml @@ -6,19 +6,14 @@ spring: workerId: 1 datasource: type: com.alibaba.druid.pool.DruidDataSource - redis: - database: 0 - host: 127.0.0.1 - jedis: - pool: - max-active: 200 - max-idle: 10 - max-wait: -1ms - min-idle: 0 - password: '' - port: 6379 - timeout: 1000ms quartz: + # dataSource: + # default: + # driver: com.mysql.jdbc.Driver + # URL: jdbc:mysql://localhost:3306/jobconfig?useUnicode=true&characterEncoding=utf8 + # user: root + # password: 12345678 + # maxConnections: 5 #相关属性配置 properties: org: @@ -44,7 +39,34 @@ spring: jdbc: #always never initialize-schema: never + redis: + database: 0 + host: 127.0.0.1 + jedis: + pool: + max-active: 200 + max-idle: 10 + max-wait: -1ms + min-idle: 0 + password: '' + port: 6379 + timeout: 1000ms + rabbitmq: + host: dd.tall.wiki + password: 111111 + port: 5672 + username: admin + redis: + database: 0 + host: 127.0.0.1 + jedis: + pool: + max-active: 200 + max-idle: 10 + max-wait: -1ms + min-idle: 0 + password: '' + port: 6379 + timeout: 1000ms swagger: - enable: true - - + enable: true \ No newline at end of file diff --git a/scheduler/src/main/resources/application.yml b/scheduler/src/main/resources/application.yml index 95706ce..0ee65bb 100644 --- a/scheduler/src/main/resources/application.yml +++ b/scheduler/src/main/resources/application.yml @@ -1,4 +1,4 @@ spring: profiles: - active: dev + active: test include: common diff --git a/scheduler/vue-element-admin-master/.env.development b/scheduler/vue-element-admin-master/.env.development index fa98ce4..bbedef0 100644 --- a/scheduler/vue-element-admin-master/.env.development +++ b/scheduler/vue-element-admin-master/.env.development @@ -4,6 +4,6 @@ ENV = 'development' # base api VUE_APP_BASE_API = 'https://test.tall.wiki' VUE_APP_MOCK_API = '/dev-api' -VUE_APP_TALL_API = 'https://test.tall.wiki/gateway/tall/v1.0' +VUE_APP_TALL_API = 'https://test.tall.wiki/gateway/tall3/v3.0' VUE_APP_SCHEDULER_API = 'https://test.tall.wiki/scheduler' PUBLIC_PATH = '/' diff --git a/scheduler/vue-element-admin-master/.env.staging b/scheduler/vue-element-admin-master/.env.staging index 69d0629..b1a6cf9 100644 --- a/scheduler/vue-element-admin-master/.env.staging +++ b/scheduler/vue-element-admin-master/.env.staging @@ -7,6 +7,6 @@ ENV = 'staging' # VUE_APP_BASE_API = '/stage-api' VUE_APP_BASE_API = 'https://test.tall.wiki' VUE_APP_MOCK_API = '/dev-api' -VUE_APP_TALL_API = 'https://test.tall.wiki/gateway/tall/v1.0' +VUE_APP_TALL_API = 'https://test.tall.wiki/gateway/tall3/v3.0' VUE_APP_SCHEDULER_API = 'https://test.tall.wiki/scheduler' PUBLIC_PATH = '/scheduler/static/' diff --git a/scheduler/vue-element-admin-master/src/views/login/index.vue b/scheduler/vue-element-admin-master/src/views/login/index.vue index fa4c50a..b022a60 100644 --- a/scheduler/vue-element-admin-master/src/views/login/index.vue +++ b/scheduler/vue-element-admin-master/src/views/login/index.vue @@ -75,7 +75,7 @@ export default { return { loginForm: { identifier: 'whj', - credential: '1234567' + credential: '123456' }, loginRules: { identifier: [