diff --git a/scheduler/src/main/java/com/ccsens/scheduler/bean/dto/QuartzJob.java b/scheduler/src/main/java/com/ccsens/scheduler/bean/dto/QuartzJobDto.java similarity index 100% rename from scheduler/src/main/java/com/ccsens/scheduler/bean/dto/QuartzJob.java rename to scheduler/src/main/java/com/ccsens/scheduler/bean/dto/QuartzJobDto.java diff --git a/scheduler/vue-element-admin-master/.env.development b/scheduler/vue-element-admin-master/.env.development index 73b41f1..292892d 100644 --- a/scheduler/vue-element-admin-master/.env.development +++ b/scheduler/vue-element-admin-master/.env.development @@ -2,5 +2,7 @@ ENV = 'development' # base api -VUE_APP_BASE_API = 'https://test.tall.wiki/gateway' +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_SCHEDULER_API = 'https://test.tall.wiki/scheduler' \ No newline at end of file diff --git a/scheduler/vue-element-admin-master/src/api/remote-search.js b/scheduler/vue-element-admin-master/src/api/remote-search.js index 02e42b4..5970158 100644 --- a/scheduler/vue-element-admin-master/src/api/remote-search.js +++ b/scheduler/vue-element-admin-master/src/api/remote-search.js @@ -1,8 +1,10 @@ import request from '@/utils/request' +const mock = process.env.VUE_APP_MOCK_API + export function searchUser(name) { return request({ - url: '/vue-element-admin/search/user', + url: `${mock}/vue-element-admin/search/user`, method: 'get', params: { name } }) @@ -10,7 +12,7 @@ export function searchUser(name) { export function transactionList(query) { return request({ - url: '/vue-element-admin/transaction/list', + url: `${mock}/vue-element-admin/transaction/list`, method: 'get', params: query }) diff --git a/scheduler/vue-element-admin-master/src/api/task.js b/scheduler/vue-element-admin-master/src/api/task.js index 7d18da2..992f075 100644 --- a/scheduler/vue-element-admin-master/src/api/task.js +++ b/scheduler/vue-element-admin-master/src/api/task.js @@ -1,9 +1,68 @@ import request from '@/utils/request' +const scheduler = process.env.VUE_APP_SCHEDULER_API + export function fetchList(query) { return request({ - url: '/vue-element-admin/article/list', - method: 'get', - params: query + url: `${scheduler}/job/list`, + method: 'post', + data: { + param: query + } + }) +} +export function fetchPv(query) { + return request({ + url: `${scheduler}/job/get`, + method: 'post', + data: { + param: query + } + }) +} + +export function createJob(query) { + return request({ + url: `${scheduler}/job/add`, + method: 'post', + data: { + param: query + } + }) +} +export function updateJob(query) { + return request({ + url: `${scheduler}/job/modifyTime`, + method: 'post', + data: { + param: query + } + }) +} +export function pauseJob(query) { + return request({ + url: `${scheduler}/job/pause`, + method: 'post', + data: { + param: query + } + }) +} +export function resumeJob(query) { + return request({ + url: `${scheduler}/job/resume`, + method: 'post', + data: { + param: query + } + }) +} +export function removeJob(query) { + return request({ + url: `${scheduler}/job/remove`, + method: 'post', + data: { + param: query + } }) } diff --git a/scheduler/vue-element-admin-master/src/api/user.js b/scheduler/vue-element-admin-master/src/api/user.js index 951e829..d4a5519 100644 --- a/scheduler/vue-element-admin-master/src/api/user.js +++ b/scheduler/vue-element-admin-master/src/api/user.js @@ -1,5 +1,5 @@ import request from '@/utils/request' -const tall = `${process.env.VUE_APP_BASE_API}/tall3/v3.0` +const tall = process.env.VUE_APP_TALL_API export function login(formData) { return request({ diff --git a/scheduler/vue-element-admin-master/src/components/HeaderSearch/index.vue b/scheduler/vue-element-admin-master/src/components/HeaderSearch/index.vue index 6026ebb..8702529 100644 --- a/scheduler/vue-element-admin-master/src/components/HeaderSearch/index.vue +++ b/scheduler/vue-element-admin-master/src/components/HeaderSearch/index.vue @@ -1,6 +1,6 @@ diff --git a/scheduler/vue-element-admin-master/src/components/SizeSelect/index.vue b/scheduler/vue-element-admin-master/src/components/SizeSelect/index.vue index e88065b..e3d24c0 100644 --- a/scheduler/vue-element-admin-master/src/components/SizeSelect/index.vue +++ b/scheduler/vue-element-admin-master/src/components/SizeSelect/index.vue @@ -1,7 +1,7 @@