改为使用vue-cli打包，修改所有的请求方式，优化页面间的交互，增加数据源分组

zyplayer-doc-ui/db-ui/src/common/api/datasource.js

@@ -1,15 +1,86 @@
 import Qs from 'qs'
-import request from '../lib/common/request'
-
-export function queryExecuteSql(data) {
-	return request({url: '/zyplayer-doc-db/executor/execute', method: 'post', data: Qs.stringify(data)});
-}
-
-export function queryTestDatasource(data) {
-	return request({url: '/zyplayer-doc-db/datasource/test', method: 'post', data: Qs.stringify(data)});
-}
-
-export function queryTableDdl(data) {
-	return request({url: '/zyplayer-doc-db/doc-db/getTableDdl', method: 'post', data: Qs.stringify(data)});
-}
+import request from './request'
 
+export default {
+    queryTestDatasource: data => {
+        return request({url: '/zyplayer-doc-db/datasource/test', method: 'post', data: Qs.stringify(data)});
+    },
+    queryTableDdl: data => {
+        return request({url: '/zyplayer-doc-db/doc-db/getTableDdl', method: 'post', data: Qs.stringify(data)});
+    },
+    getEditorData: data => {
+        return request({url: '/zyplayer-doc-db/doc-db/getEditorData', method: 'post', data: Qs.stringify(data)});
+    },
+    datasourceList: data => {
+        return request({url: '/zyplayer-doc-db/doc-db/getDataSourceList', method: 'post', data: Qs.stringify(data)});
+    },
+    databaseList: data => {
+        return request({url: '/zyplayer-doc-db/doc-db/getDatabaseList', method: 'post', data: Qs.stringify(data)});
+    },
+    tableList: data => {
+        return request({url: '/zyplayer-doc-db/doc-db/getTableList', method: 'post', data: Qs.stringify(data)});
+    },
+    tableColumnList: data => {
+        return request({url: '/zyplayer-doc-db/doc-db/getTableColumnList', method: 'post', data: Qs.stringify(data)});
+    },
+    tableStatus: data => {
+        return request({url: '/zyplayer-doc-db/doc-db/getTableStatus', method: 'post', data: Qs.stringify(data)});
+    },
+    tableAndColumnBySearch: data => {
+        return request({url: '/zyplayer-doc-db/doc-db/getTableAndColumnBySearch', method: 'post', data: Qs.stringify(data)});
+    },
+    updateTableDesc: data => {
+        return request({url: '/zyplayer-doc-db/doc-db/updateTableDesc', method: 'post', data: Qs.stringify(data)});
+    },
+    updateTableColumnDesc: data => {
+        return request({url: '/zyplayer-doc-db/doc-db/updateTableColumnDesc', method: 'post', data: Qs.stringify(data)});
+    },
+    manageDatasourceList: data => {
+        return request({url: '/zyplayer-doc-db/datasource/list', method: 'post', data: Qs.stringify(data)});
+    },
+    manageUpdateDatasource: data => {
+        return request({url: '/zyplayer-doc-db/datasource/update', method: 'post', data: Qs.stringify(data)});
+    },
+    queryExecuteSql: data => {
+        return request({url: '/zyplayer-doc-db/executor/execute', method: 'post', data: Qs.stringify(data)});
+    },
+    executeSqlCancel: data => {
+        return request({url: '/zyplayer-doc-db/executor/cancel', method: 'post', data: Qs.stringify(data)});
+    },
+    updateFavorite: data => {
+        return request({url: '/zyplayer-doc-db/executor/favorite/add', method: 'post', data: Qs.stringify(data)});
+    },
+    favoriteList: data => {
+        return request({url: '/zyplayer-doc-db/executor/favorite/list', method: 'post', data: Qs.stringify(data)});
+    },
+    historyList: data => {
+        return request({url: '/zyplayer-doc-db/executor/history/list', method: 'post', data: Qs.stringify(data)});
+    },
+    transferStart: data => {
+        return request({url: '/zyplayer-doc-db/transfer/start', method: 'post', data: Qs.stringify(data)});
+    },
+    transferCancel: data => {
+        return request({url: '/zyplayer-doc-db/transfer/cancel', method: 'post', data: Qs.stringify(data)});
+    },
+    transferList: data => {
+        return request({url: '/zyplayer-doc-db/transfer/list', method: 'post', data: Qs.stringify(data)});
+    },
+    transferDetail: data => {
+        return request({url: '/zyplayer-doc-db/transfer/detail', method: 'post', data: Qs.stringify(data)});
+    },
+    transferUpdate: data => {
+        return request({url: '/zyplayer-doc-db/transfer/update', method: 'post', data: Qs.stringify(data)});
+    },
+    transferSqlColumns: data => {
+        return request({url: '/zyplayer-doc-db/transfer/sqlColumns', method: 'post', data: Qs.stringify(data)});
+    },
+    assignDbUserAuth: data => {
+        return request({url: '/zyplayer-doc-db/auth/assign', method: 'post', data: Qs.stringify(data)});
+    },
+    dbUserAuthList: data => {
+        return request({url: '/zyplayer-doc-db/auth/list', method: 'post', data: Qs.stringify(data)});
+    },
+    systemUpgradeInfo: data => {
+        return request({url: '/system/info/upgrade', method: 'post', data: Qs.stringify(data)});
+    },
+};

zyplayer-doc-ui/db-ui/src/common/api/request.js

@@ -1,9 +1,8 @@
 import axios from 'axios'
-import global from '../../config/global'
-import apimix from '../../config/apimix'
+import vue from '../../main'
 
 const service = axios.create({
-	baseURL: apimix.host, // url = base url + request url process.env.APP_BASE_API
+	baseURL: process.env.VUE_APP_BASE_API, // url = base url + request url process.env.APP_BASE_API
 	timeout: 10000,
 	headers: {'Content-type': 'application/x-www-form-urlencoded'},
 	withCredentials: true
@@ -32,25 +31,25 @@ service.interceptors.request.use(
 service.interceptors.response.use(
 	response => {
 		if (!!response.message) {
-			global.vue.$message('请求错误：' + response.message);
+			vue.$message.error('请求错误：' + response.message);
 		}else {
 			if (!response.config.needValidateResult || response.data.errCode == 200) {
 				return response.data;
 			} else if (response.data.errCode == 400) {
-				global.vue.$message('请先登录');
+				vue.$message.error('请先登录');
 				var href = encodeURIComponent(window.location.href);
-				window.location = apimix.apilist1.HOST + "#/user/login?redirect=" + href;
+				window.location = process.env.VUE_APP_BASE_API + "#/user/login?redirect=" + href;
 			} else if (response.data.errCode == 402) {
-				global.vue.$router.push("/common/noAuth");
+				vue.$router.push("/common/noAuth");
 			} else if (response.data.errCode !== 200) {
-				global.vue.$message(response.data.errMsg || "未知错误");
+				vue.$message.error(response.data.errMsg || "未知错误");
 			}
 		}
 		return Promise.reject('请求错误');
 	},
 	error => {
 		console.log('err' + error);
-		global.vue.$message.info('请求错误：' + error.message);
+		vue.$message.info('请求错误：' + error.message);
 		return Promise.reject(error)
 	}
 );

zyplayer-doc-ui/db-ui/src/common/api/user.js

@@ -0,0 +1,22 @@
+import Qs from 'qs'
+import request from './request'
+
+export default {
+	userLogin: data => {
+		return request({url: '/login', method: 'post', data: Qs.stringify(data)});
+	},
+	userLogout: () => {
+		return request({url: '/logout', method: 'post', data: Qs.stringify({})});
+	},
+	getSelfUserInfo: () => {
+		return request({url: '/user/info/selfInfo', method: 'post', data: Qs.stringify({})});
+	},
+	getUserBaseInfo: data => {
+		return request({url: '/zyplayer-doc-wiki/common/user/base', method: 'post', data: Qs.stringify(data)});
+	},
+};
+
+// userLogin: '/login',
+// userLogout: '/logout',
+// getSelfUserInfo: '/user/info/selfInfo',
+// getUserBaseInfo: '/zyplayer-doc-wiki/common/user/base',

zyplayer-doc-ui/db-ui/src/common/config/apilist.js

@@ -1,47 +0,0 @@
-var URL = {
-    userLogin: '/login',
-    userLogout: '/logout',
-    getSelfUserInfo: '/user/info/selfInfo',
-    getUserBaseInfo: '/zyplayer-doc-wiki/common/user/base',
-
-    getEditorData: '/zyplayer-doc-db/doc-db/getEditorData',
-    datasourceList: '/zyplayer-doc-db/doc-db/getDataSourceList',
-    databaseList: '/zyplayer-doc-db/doc-db/getDatabaseList',
-    tableList: '/zyplayer-doc-db/doc-db/getTableList',
-    tableColumnList: '/zyplayer-doc-db/doc-db/getTableColumnList',
-    tableStatus: '/zyplayer-doc-db/doc-db/getTableStatus',
-    tableAndColumnBySearch: '/zyplayer-doc-db/doc-db/getTableAndColumnBySearch',
-    updateTableDesc: '/zyplayer-doc-db/doc-db/updateTableDesc',
-    updateTableColumnDesc: '/zyplayer-doc-db/doc-db/updateTableColumnDesc',
-
-    manageDatasourceList: '/zyplayer-doc-db/datasource/list',
-    manageUpdateDatasource: '/zyplayer-doc-db/datasource/update',
-
-    executeSql: '/zyplayer-doc-db/executor/execute',
-    executeSqlCancel: '/zyplayer-doc-db/executor/cancel',
-    updateFavorite: '/zyplayer-doc-db/executor/favorite/add',
-    favoriteList: '/zyplayer-doc-db/executor/favorite/list',
-    historyList: '/zyplayer-doc-db/executor/history/list',
-
-    transferStart: '/zyplayer-doc-db/transfer/start',
-    transferCancel: '/zyplayer-doc-db/transfer/cancel',
-    transferList: '/zyplayer-doc-db/transfer/list',
-    transferDetail: '/zyplayer-doc-db/transfer/detail',
-    transferUpdate: '/zyplayer-doc-db/transfer/update',
-    transferSqlColumns: '/zyplayer-doc-db/transfer/sqlColumns',
-
-    assignDbUserAuth: '/zyplayer-doc-db/auth/assign',
-    dbUserAuthList: '/zyplayer-doc-db/auth/list',
-
-    systemUpgradeInfo: '/system/info/upgrade',
-};
-
-var URL1 = {};
-
-export default {
-    URL, URL1
-};
-
-
-
-

zyplayer-doc-ui/db-ui/src/common/config/apimix.js

@@ -1,52 +0,0 @@
-import apilist from './apilist'
-
-var href = window.location.href;
-
-var _fn = {
-    href: href,
-    // 本地启动时使用本地接口调试
-    // HOST: 'http://local.zyplayer.com:8083/zyplayer-doc-manage',
-    // HOST1: 'http://local.zyplayer.com:8083/zyplayer-doc-manage',
-    // 也可以直接使用线上的服务调试
-    // HOST: 'http://doc.zyplayer.com/zyplayer-doc-manage',
-    // HOST1: 'http://doc.zyplayer.com/zyplayer-doc-manage',
-    // 打包时使用下面这两行，文件就放在根目录下，所以当前路劲就好
-    HOST: './',
-    HOST1: './',
-
-    mixUrl: function (host, url) {
-        var p;
-        if (!host || !url || _fn.isEmptyObject(url)) {
-            return;
-        }
-        url.HOST = host;
-        for (p in url) {
-            if (url[p].indexOf('http') == -1) {
-                url[p] = host + url[p];
-            }
-        }
-        return url;
-    },
-    //判断是否空对象
-    isEmptyObject: function (obj) { //判断空对象
-        if (typeof obj === "object" && !(obj instanceof Array)) {
-            var hasProp = false;
-            for (var prop in obj) {
-                hasProp = true;
-                break;
-            }
-            if (hasProp) {
-                return false;
-            }
-            return true;
-        }
-    }
-};
-
-var apilist1 = _fn.mixUrl(_fn.HOST, apilist.URL);
-var apilist2 = _fn.mixUrl(_fn.HOST1, apilist.URL1);
-
-export default {
-    apilist1, apilist2, host: _fn.HOST
-};
-

zyplayer-doc-ui/db-ui/src/common/config/global.js

@@ -1,12 +0,0 @@
-const user = {
-    isLogin: true,
-};
-const vue = {};
-const fullscreen = false;
-
-export default {
-    vue,
-    user,
-    fullscreen,
-}
-

zyplayer-doc-ui/db-ui/src/common/lib/common/common.js

@@ -1,113 +0,0 @@
-import Qs from 'qs'
-import global from '../../config/global'
-import apimix from '../../config/apimix'
-
-export default {
-	data: {
-		accessToken: '',
-	},
-	setAccessToken: function (token) {
-		this.data.accessToken = token;
-	},
-	getAccessToken: function () {
-		if (!this.data.accessToken) {
-			var arr, reg = new RegExp("(^| )accessToken=([^;]*)(;|$)");
-			if (arr = document.cookie.match(reg)) {
-				this.data.accessToken = unescape(arr[2]);
-			}
-		}
-		return this.data.accessToken;
-	},
-	validateResult: function (res, callback) {
-		if (!!res.message) {
-			global.vue.$message('请求错误：' + res.message);
-		} else if (res.data.errCode == 400) {
-			global.vue.$message('请先登录');
-			var href = encodeURIComponent(window.location.href);
-			// if (global.vue.$router.currentRoute.path != '/user/login') {
-				// global.vue.$router.push({path: '/user/login', query: {redirect: href}});
-			// }
-			window.location = apimix.apilist1.HOST + "#/user/login?redirect=" + href;
-		} else if (res.data.errCode == 402) {
-			global.vue.$router.push("/common/noAuth");
-		} else if (res.data.errCode !== 200) {
-			global.vue.$message(res.data.errMsg || "未知错误");
-		} else {
-			if (typeof callback == 'function') {
-				callback(res.data);
-			}
-		}
-	},
-	post: function (url, param, callback) {
-		param = param || {};
-		param.accessToken = this.getAccessToken();
-		global.vue.axios({
-			method: "post",
-			url: url,
-			headers: {'Content-type': 'application/x-www-form-urlencoded'},
-			data: Qs.stringify(param),
-			withCredentials: true,
-		}).then((res) => {
-			console.log("ok", res);
-			this.validateResult(res, callback);
-		}).catch((res) => {
-			console.log("error", res);
-			this.validateResult(res);
-		});
-	},
-	postNonCheck: function (url, param, callback) {
-		param = param || {};
-		param.accessToken = this.getAccessToken();
-		global.vue.axios({
-			method: "post",
-			url: url,
-			headers: {'Content-type': 'application/x-www-form-urlencoded'},
-			data: Qs.stringify(param),
-			withCredentials: true,
-		}).then((res) => {
-			console.log("ok", res);
-			if (typeof callback == 'function') {
-				callback(res.data);
-			}
-		}).catch((res) => {
-			console.log("error", res);
-			if (typeof callback == 'function') {
-				callback(res.data);
-			}
-		});
-	},
-	/**
-	 * 返回不为空的字符串，为空返回def
-	 */
-	getNotEmptyStr(str, def) {
-		if (isEmpty(str)) {
-			return isEmpty(def) ? "" : def;
-		}
-		return str;
-	},
-	/**
-	 * 是否是空对象
-	 * @param obj
-	 * @returns
-	 */
-	isEmptyObject(obj) {
-		return isEmpty(obj) || $.isEmptyObject(obj);
-	},
-	/**
-	 * 是否是空字符串
-	 * @param str
-	 * @returns
-	 */
-	isEmpty(str) {
-		return (str == "" || str == null || str == undefined);
-	},
-	/**
-	 * 是否不是空字符串
-	 * @param str
-	 * @returns
-	 */
-	isNotEmpty(str) {
-		return !isEmpty(str);
-	},
-}
-

zyplayer-doc-ui/db-ui/src/common/lib/common/toast.js

@@ -1,40 +0,0 @@
-import global from '../../config/global'
-
-/**
- * 提示工具类
- * @author
- * @since 2017年5月7日
- */
-export default {
-	notOpen: function () {
-		global.vue.$message({
-			message: '该功能暂未开放，敬请期待！',
-			type: 'warning',
-			showClose: true
-		});
-	},
-	success: function (msg, time) {
-		global.vue.$message({
-			message: msg,
-			duration: time || 3000,
-			type: 'success',
-			showClose: true
-		});
-	},
-	warn: function (msg, time) {
-		global.vue.$message({
-			message: msg,
-			duration: time || 3000,
-			type: 'warning',
-			showClose: true
-		});
-	},
-	error: function (msg, time) {
-		global.vue.$message({
-			message: msg,
-			duration: time || 3000,
-			type: 'error',
-			showClose: true
-		});
-	},
-};