添加任务模块，调整service结构

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,

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",

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 {
 	/**
 	 * 文件上传模式

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()

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 {
 	/**
 	 * 用户登录

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) {

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) {

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() {

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() {

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;

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;

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;

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) {

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: "状态监控",

cool/modules/task/index.js

@@ -0,0 +1,4 @@
+import views from './views'
+import service from './service'
+
+export default { views, service }

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"
+  }
+}

cool/modules/task/service/index.js

@@ -0,0 +1,7 @@
+import Info from './info'
+
+export default {
+    task: {
+        info: new Info()
+    }
+}

cool/modules/base/service/system/task.js → 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) {

cool/modules/task/views/index.js

@@ -0,0 +1,9 @@
+export default [
+    {
+        moduleName: "task",
+        label: "任务列表",
+        path: "/task",
+        icon: "icon-menu",
+        component: () => import("./task")
+    },
+]

cool/modules/base/views/task.vue → 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);
 

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;

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;

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,