diff --git a/cool/index.js b/cool/index.js index 62d43c8..793cbff 100644 --- a/cool/index.js +++ b/cool/index.js @@ -1,4 +1,5 @@ import Base from "./modules/base"; +import Task from "./modules/task"; import Upload from "./modules/upload"; import Copy from "./modules/copy"; import Demo from "./modules/demo"; @@ -9,6 +10,7 @@ import Export from "cl-admin-export"; export default { modules: [ ["base", Base], + ["task", Task], [ "upload", Upload, diff --git a/cool/modules/base/package.json b/cool/modules/base/package.json index 89252ad..d02ff9a 100644 --- a/cool/modules/base/package.json +++ b/cool/modules/base/package.json @@ -4,7 +4,6 @@ "main": "index.js", "license": "MIT", "dependencies": { - "vuedraggable": "^2.24.3", "quill": "^1.3.7", "codemirror": "^5.59.2", "js-beautify": "^1.13.5", diff --git a/cool/modules/base/service/common.js b/cool/modules/base/service/common.js index ce733a7..71ed25f 100644 --- a/cool/modules/base/service/common.js +++ b/cool/modules/base/service/common.js @@ -1,6 +1,6 @@ import { BaseService, Service } from "cl-admin"; -@Service("comm") +@Service("base/comm") class Common extends BaseService { /** * 文件上传模式 diff --git a/cool/modules/base/service/index.js b/cool/modules/base/service/index.js index 91d0c6f..9cec05a 100644 --- a/cool/modules/base/service/index.js +++ b/cool/modules/base/service/index.js @@ -4,7 +4,6 @@ import SysUser from "./system/user"; import SysMenu from "./system/menu"; import SysRole from "./system/role"; import SysDept from "./system/dept"; -import SysTask from "./system/task"; import SysInfo from "./system/info"; import SysParam from "./system/param"; import SysLog from "./system/log"; @@ -18,7 +17,6 @@ export default { menu: new SysMenu(), role: new SysRole(), dept: new SysDept(), - task: new SysTask(), info: new SysInfo(), param: new SysParam(), log: new SysLog() diff --git a/cool/modules/base/service/open.js b/cool/modules/base/service/open.js index 4dddacb..e582075 100644 --- a/cool/modules/base/service/open.js +++ b/cool/modules/base/service/open.js @@ -1,6 +1,6 @@ import { BaseService, Service } from "cl-admin"; -@Service("open") +@Service("base/open") class Open extends BaseService { /** * 用户登录 diff --git a/cool/modules/base/service/plugin/info.js b/cool/modules/base/service/plugin/info.js index d3bef7d..caadeca 100644 --- a/cool/modules/base/service/plugin/info.js +++ b/cool/modules/base/service/plugin/info.js @@ -1,6 +1,6 @@ import { BaseService, Service, Permission } from "cl-admin"; -@Service("plugin/info") +@Service("base/plugin/info") class PluginInfo extends BaseService { @Permission("config") config(data) { diff --git a/cool/modules/base/service/system/dept.js b/cool/modules/base/service/system/dept.js index fb77c36..670b2d8 100644 --- a/cool/modules/base/service/system/dept.js +++ b/cool/modules/base/service/system/dept.js @@ -1,6 +1,6 @@ import { BaseService, Service, Permission } from "cl-admin"; -@Service("sys/department") +@Service("base/sys/department") class SysDepartment extends BaseService { @Permission("order") order(data) { diff --git a/cool/modules/base/service/system/info.js b/cool/modules/base/service/system/info.js index 06f5aa1..93e185b 100644 --- a/cool/modules/base/service/system/info.js +++ b/cool/modules/base/service/system/info.js @@ -1,6 +1,6 @@ import { BaseService, Service, Permission } from "cl-admin"; -@Service("sys/info") +@Service("base/sys/info") class SysInfo extends BaseService { @Permission("record") record() { diff --git a/cool/modules/base/service/system/log.js b/cool/modules/base/service/system/log.js index 03b3776..2e4943c 100644 --- a/cool/modules/base/service/system/log.js +++ b/cool/modules/base/service/system/log.js @@ -1,6 +1,6 @@ import { BaseService, Service, Permission } from "cl-admin"; -@Service("sys/log") +@Service("base/sys/log") class SysLog extends BaseService { @Permission("clear") clear() { diff --git a/cool/modules/base/service/system/menu.js b/cool/modules/base/service/system/menu.js index e866c19..36f4a22 100644 --- a/cool/modules/base/service/system/menu.js +++ b/cool/modules/base/service/system/menu.js @@ -1,6 +1,6 @@ import { BaseService, Service } from "cl-admin"; -@Service("sys/menu") +@Service("base/sys/menu") class SysMenu extends BaseService {} export default SysMenu; diff --git a/cool/modules/base/service/system/param.js b/cool/modules/base/service/system/param.js index bc0be39..25e7752 100644 --- a/cool/modules/base/service/system/param.js +++ b/cool/modules/base/service/system/param.js @@ -1,6 +1,6 @@ import { BaseService, Service } from "cl-admin"; -@Service("sys/param") +@Service("base/sys/param") class SysParam extends BaseService {} export default SysParam; diff --git a/cool/modules/base/service/system/role.js b/cool/modules/base/service/system/role.js index 05d8de0..45bbf45 100644 --- a/cool/modules/base/service/system/role.js +++ b/cool/modules/base/service/system/role.js @@ -1,6 +1,6 @@ import { BaseService, Service } from "cl-admin"; -@Service("sys/role") +@Service("base/sys/role") class SysRole extends BaseService {} export default SysRole; diff --git a/cool/modules/base/service/system/user.js b/cool/modules/base/service/system/user.js index 9819a95..5d5574e 100644 --- a/cool/modules/base/service/system/user.js +++ b/cool/modules/base/service/system/user.js @@ -1,6 +1,6 @@ import { BaseService, Service, Permission } from "cl-admin"; -@Service("sys/user") +@Service("base/sys/user") class SysUser extends BaseService { @Permission("move") move(data) { diff --git a/cool/modules/base/views/index.js b/cool/modules/base/views/index.js index 61e96bd..fc42c00 100644 --- a/cool/modules/base/views/index.js +++ b/cool/modules/base/views/index.js @@ -25,13 +25,6 @@ export default [ icon: "icon-common", component: () => import("./role") }, - { - moduleName: "sys.task", - label: "任务列表", - path: "/sys/task", - icon: "icon-menu", - component: () => import("./task") - }, { moduleName: "sys.perf", label: "状态监控", diff --git a/cool/modules/task/index.js b/cool/modules/task/index.js new file mode 100644 index 0000000..b70c3ca --- /dev/null +++ b/cool/modules/task/index.js @@ -0,0 +1,4 @@ +import views from './views' +import service from './service' + +export default { views, service } \ No newline at end of file diff --git a/cool/modules/task/package.json b/cool/modules/task/package.json new file mode 100644 index 0000000..50af67e --- /dev/null +++ b/cool/modules/task/package.json @@ -0,0 +1,9 @@ +{ + "name": "task", + "version": "1.0.0", + "main": "index.js", + "license": "MIT", + "dependencies": { + "vuedraggable": "^2.24.3" + } +} diff --git a/cool/modules/task/service/index.js b/cool/modules/task/service/index.js new file mode 100644 index 0000000..b1e0687 --- /dev/null +++ b/cool/modules/task/service/index.js @@ -0,0 +1,7 @@ +import Info from './info' + +export default { + task: { + info: new Info() + } +} \ No newline at end of file diff --git a/cool/modules/base/service/system/task.js b/cool/modules/task/service/info.js similarity index 96% rename from cool/modules/base/service/system/task.js rename to cool/modules/task/service/info.js index 2126402..46a62e7 100644 --- a/cool/modules/base/service/system/task.js +++ b/cool/modules/task/service/info.js @@ -1,6 +1,6 @@ import { BaseService, Service, Permission } from "cl-admin"; -@Service("sys/task") +@Service("task/info") class SysTask extends BaseService { @Permission("stop") stop(data) { diff --git a/cool/modules/task/views/index.js b/cool/modules/task/views/index.js new file mode 100644 index 0000000..0cf9e35 --- /dev/null +++ b/cool/modules/task/views/index.js @@ -0,0 +1,9 @@ +export default [ + { + moduleName: "task", + label: "任务列表", + path: "/task", + icon: "icon-menu", + component: () => import("./task") + }, +] \ No newline at end of file diff --git a/cool/modules/base/views/task.vue b/cool/modules/task/views/task.vue similarity index 97% rename from cool/modules/base/views/task.vue rename to cool/modules/task/views/task.vue index 4b2cb02..e8f9e6c 100644 --- a/cool/modules/base/views/task.vue +++ b/cool/modules/task/views/task.vue @@ -296,7 +296,7 @@ export default { computed: { perm() { - return this.$service.system.task.permission; + return this.$service.task.info.permission; } }, @@ -323,7 +323,7 @@ export default { label: "立即执行", perm: ["once"], "suffix-icon": "el-icon-video-play", - callback: (e, close) => { + callback: (_, close) => { this.once({ id }); close(); } @@ -332,7 +332,7 @@ export default { label: "编辑", perm: ["update", "info"], "suffix-icon": "el-icon-edit", - callback: (e, close) => { + callback: (_, close) => { this.edit({ id, type }); close(); } @@ -341,7 +341,7 @@ export default { label: "删除", perm: ["delete"], "suffix-icon": "el-icon-delete", - callback: (e, close) => { + callback: (_, close) => { this.delete({ id }); close(); } @@ -350,7 +350,7 @@ export default { label: "查看日志", perm: ["log"], "suffix-icon": "el-icon-tickets", - callback: (e, close) => { + callback: (_, close) => { this.findLog({ id, name }); close(); } @@ -362,7 +362,7 @@ export default { label: "暂停", perm: ["stop"], "suffix-icon": "el-icon-video-pause", - callback: (e, close) => { + callback: (_, close) => { this.stop({ id, type }); close(); } @@ -372,7 +372,7 @@ export default { label: "开始", perm: ["start"], "suffix-icon": "el-icon-video-play", - callback: (e, close) => { + callback: (_, close) => { this.start({ id, type }); close(); } @@ -399,7 +399,7 @@ export default { }; if (id) { - info = await this.$service.system.task.info({ id }); + info = await this.$service.task.info.info({ id }); } if (info.every) { @@ -581,7 +581,7 @@ export default { data.limit = null; } - this.$service.system.task[id ? "update" : "add"]({ + this.$service.task.info[id ? "update" : "add"]({ ...info, ...data, every: data.every * 1000 @@ -607,7 +607,7 @@ export default { type: "warning" }) .then(() => { - this.$service.system.task.delete({ ids: id }).then(() => { + this.$service.task.info.delete({ ids: id }).then(() => { this.refreshTask(); }); }) @@ -616,7 +616,7 @@ export default { // 开始任务 start({ id, type }) { - this.$service.system.task + this.$service.task.info .start({ id, type }) .then(() => { this.refreshTask(); @@ -628,7 +628,7 @@ export default { // 停止任务 stop({ id }) { - this.$service.system.task + this.$service.task.info .stop({ id }) .then(() => { this.refreshTask(); @@ -640,7 +640,7 @@ export default { // 任务执行一次 once({ id }) { - this.$service.system.task + this.$service.task.info .once({ id }) .then(() => { this.refreshTask(); @@ -670,7 +670,7 @@ export default { this.$set(item, "loading", true); - let res = await this.$service.system.task.page(item.params); + let res = await this.$service.task.info.page(item.params); this.moreList(res, item); @@ -707,7 +707,7 @@ export default { this.logs.loading = true; - let res = await this.$service.system.task.log(params); + let res = await this.$service.task.info.log(params); this.moreList(res, this.logs); diff --git a/cool/modules/upload/service/info.js b/cool/modules/upload/service/info.js index a83958b..22be4b6 100644 --- a/cool/modules/upload/service/info.js +++ b/cool/modules/upload/service/info.js @@ -1,6 +1,6 @@ import { BaseService, Service } from "cl-admin"; -@Service("app/space/info") -class SpaceInfo extends BaseService {} +@Service("space/info") +class SpaceInfo extends BaseService { } export default SpaceInfo; diff --git a/cool/modules/upload/service/type.js b/cool/modules/upload/service/type.js index 5e17bc4..081ef3b 100644 --- a/cool/modules/upload/service/type.js +++ b/cool/modules/upload/service/type.js @@ -1,6 +1,6 @@ import { BaseService, Service } from "cl-admin"; -@Service("app/space/type") +@Service("space/type") class SpaceType extends BaseService { } export default SpaceType; diff --git a/vue.config.js b/vue.config.js index 1048f8a..fe4264e 100644 --- a/vue.config.js +++ b/vue.config.js @@ -40,14 +40,6 @@ module.exports = { } }, - "/test": { - target: "https://admin.cn.utools.club", - changeOrigin: true, - pathRewrite: { - "^/test": "" - } - }, - "/oss-upload": { target: "https://cool-admin-pro.oss-cn-shanghai.aliyuncs.com", changeOrigin: true,