Merge branch 'new0219' into 'master'

New0219

See merge request !2

.eslintrc.js

@@ -19,6 +19,7 @@ module.exports = {
     'prettier/prettier': 'error',
     // 防止iview的标签报错
     'vue/no-parsing-error': [2, { 'x-invalid-end-tag': false }],
+    'prettier/prettier': 0,
   },
 }
 

prettierrc.js

+module.exports = {
+  "printWidth": 200,
+  "trailingComma": "es5",
+  "singleQuote": true,
+}
\ No newline at end of file

src/api/mainconfigguration.server.js

-import axios from '../services/http.service'
-import {
-  sapi
-} from '../config'
-import qs from 'qs'
-let comapi = '/heimdallr-config'
+import axios from "../services/http.service";
+import { sapi } from "../config";
+// import qs from "qs";
 // 获取服务列表
-export function getservicelist () {
-  return axios.get(`${sapi}/service/list`)
+export function getservicelist() {
+  return axios.get(`${sapi}/service/list`);
 }
 // 获取文字说明
-export function getkey (key) {
-  return axios.get(`${sapi}/get-key-explain/${key}`)
+export function getkey(key) {
+  return axios.get(`${sapi}/get-key-explain/${key}`);
 }
 // 获取配置列表
-export function getconfigurelist (data) {
-  return axios.get(`${sapi}/config/service/${data.key}/${data.service_name}`)
+export function getconfigurelist(data) {
+  return axios.get(`${sapi}/config/service/${data.key}/${data.service_name}`);
 }
 // 发布
-export function postconfigurelist (data, params) {
-  return axios.post(`${sapi}/config/service/${data.key}/${data.service_name}`, params, {headers: {
-    'Content-Type': 'application/json'
-  }})
+export function postconfigurelist(data, params) {
+  return axios.post(
+    `${sapi}/config/service/${data.key}/${data.service_name}`,
+    params,
+    {
+      headers: {
+        "Content-Type": "application/json"
+      }
+    }
+  );
 }
 // 获取版本
-export function getVersionnumber (data) {
-  return axios.get(`${sapi}/config-version/service/${data.key}/${data.service_name}/list`)
+export function getVersionnumber(data) {
+  return axios.get(
+    `${sapi}/config-version/service/${data.key}/${data.service_name}/list`
+  );
 }
 // 回滚版本
-export function rollbacknum (data) {
-  return axios.get(`${sapi}/config-version/service/${data.key}/${data.service_name}/set/${data.version}`)
+export function rollbacknum(data) {
+  return axios.get(
+    `${sapi}/config-version/service/${data.key}/${data.service_name}/set/${data.version}`
+  );
 }
 // 获取节点列表
-export function getnodelist (data) {
-  return axios.get(`${sapi}/node/list/${data.service_name}`)
+export function getnodelist(data) {
+  return axios.get(`${sapi}/node/list/${data.service_name}`);
 }
 // 获取节点配置
-export function getnodeconfig (data) {
-  return axios.get(`${sapi}/config/node/${data.service_name}/${data.node_id}`)
+export function getnodeconfig(data) {
+  return axios.get(`${sapi}/config/node/${data.service_name}/${data.node_id}`);
 }
 // 设置节点配置
-export function nodeconfig (data, weight) {
-  return axios.post(`${sapi}/config/node/${data.service_name}/${data.node_id}`, weight, {headers: {
-    'Content-Type': 'application/json'
-  }})
+export function nodeconfig(data, weight) {
+  return axios.post(
+    `${sapi}/config/node/${data.service_name}/${data.node_id}`,
+    weight,
+    {
+      headers: {
+        "Content-Type": "application/json"
+      }
+    }
+  );
+}
+// 获取菜单列表
+export function getMenuList() {
+  return axios.get(`${sapi}/key/list`);
+}
+// 获取标签列表
+export function getTypeList() {
+  return axios.get(`${sapi}/filter/list`);
 }

src/config/env.config.js

-const sapi = 'https://kapi-fe.liangkebang.net'
+const sapi = "https://kapi-fe.liangkebang.net";
 // const sapi = 'http://192.168.29.88:5555'
-export {
-  sapi
-}
+export { sapi };

src/config/prod.config.js

-let comapi = '/heimdallr-config'
-const sapi = `//kapi.xyqb.com/heimdallr-config`
-// const sapi = `//kapi.xyqb.com`
-export {
-  sapi
-}
+// let comapi = "/heimdallr-config";
+const sapi = `//kapi.xyqb.com/heimdallr-config`;
+// const sapi = `//kapi.xyqb.com`;
+export { sapi };

src/services/http.service.js

-import axios from 'axios'
-import { Notice } from 'iview'
-import localStorage from './localStorage.service'
+import axios from "axios";
+import { Notice } from "iview";
+import localStorage from "./localStorage.service";
 
 // window.Promise = require('es6-promise').Promise
 
 const config = {
   timeout: 600000
   // withCredentials: true // 允许携带cookie
-}
-const instance = axios.create(Object.assign({}, config))
-instance._extend = {}
+};
+const instance = axios.create(Object.assign({}, config));
+instance._extend = {};
 
-function requestInterceptor (config) {
-  config.headers['x-requested-with'] = 'XMLHttpRequest'
+function requestInterceptor(config) {
+  config.headers["x-requested-with"] = "XMLHttpRequest";
 
   // if (!config.headers['Content-Type']) {
   //   config.headers['Content-Type'] = 'application/x-www-form-urlencoded'
   // }
 
-  if (!config.headers['heimdallr-token']) {
-    config.headers['heimdallr-token'] = localStorage.get('heimdallr-token') || ''
+  if (!config.headers["heimdallr-token"]) {
+    config.headers["heimdallr-token"] =
+      localStorage.get("heimdallr-token") || "";
   }
 
-  return config
+  return config;
 }
 
-function responseInterceptor (response) {
+function responseInterceptor(response) {
   if (response.status < 200 || response.status > 300) {
     Notice.error({
-      title: '请求发生错误',
-      desc: response && response.data && (response.data.errorMsg || '请联系系统管理员')
-    })
-    return Promise.reject(response && response.data)
+      title: "请求发生错误",
+      desc:
+        response &&
+        response.data &&
+        (response.data.errorMsg || "请联系系统管理员")
+    });
+    return Promise.reject(response && response.data);
   }
   // code是0000表示成功
   if (response.data.code === 200 || response.data.code === 400) {
-    return Promise.resolve(response.data || null)
+    return Promise.resolve(response.data || null);
   }
   if (response.data.code === 401) {
-    window.location.href = window.location.origin + '/login'
+    window.location.href = window.location.origin + "/login";
   }
   // Notice.error({
   //   title: '',
   //   desc: response.data.errorMsg || response.data.message || '请联系客服'
   // })
-  return Promise.reject(response && response.data)
+  return Promise.reject(response && response.data);
 }
 
 /**
@@ -52,23 +56,23 @@ function responseInterceptor (response) {
  *    axios.interceptors.request.eject(0)
  *    axios.interceptors.response.eject(0)
  */
-instance.interceptors.request.use(requestInterceptor, (error) => {
-  // return Promise.reject(error)
-})
+instance.interceptors.request.use(requestInterceptor, error => {
+  return Promise.reject(error);
+});
 
 instance.interceptors.response.use(responseInterceptor, error => {
   // const code = response.data
   if (error.response && error.response.status === 401) {
-    window.location.href = window.location.origin + '/login'
+    window.location.href = window.location.origin + "/login";
   }
 
-  if (error.message.indexOf('timeout') !== -1) {
+  if (error.message.indexOf("timeout") !== -1) {
     Notice.error({
-      title: '',
-      desc: '请求超时'
-    })
+      title: "",
+      desc: "请求超时"
+    });
   }
   // return Promise.reject(error)
-})
+});
 
-export default instance
+export default instance;

src/services/init.service.js

-import localStorage from '../services/localStorage.service'
-export default{
-  init (router) {
+import localStorage from "../services/localStorage.service";
+export default {
+  init(router) {
     router.beforeEach((to, form, next) => {
-      const token = localStorage.get('heimdallr-token')
-      if (to.meta && !to.meta.allowBack && window.history && window.history.pushState) { // 登录页面不能后退
-        history.pushState(null, null, document.URL)
+      const token = localStorage.get("heimdallr-token");
+      if (
+        to.meta &&
+        !to.meta.allowBack &&
+        window.history &&
+        window.history.pushState
+      ) {
+        // 登录页面不能后退
+        history.pushState(null, null, document.URL);
       }
-      if (to.name === 'login') {
-        next()
-        return
+      if (to.name === "login") {
+        next();
+        return;
       }
       if (!token) {
-        window.location.href = `${window.location.origin}/login`
-        return
+        window.location.href = `${window.location.origin}/login`;
+        return;
       }
-      next()
-    })
+      next();
+    });
   }
-}
+};

src/services/localStorage.service.js

-export default{
-  get (key) {
-    let result = localStorage.getItem(key)
+export default {
+  get(key) {
+    let result = localStorage.getItem(key);
     try {
-      result = JSON.parse(result)
+      result = JSON.parse(result);
     } catch (e) {}
-    return result
+    return result;
   },
-  set (key, value) {
-    let toString = Object.prototype.toString
-    if (toString.call(value) === '[object Array]' || toString.call(value) === '[object Object]') {
-      value = JSON.stringify(value)
+  set(key, value) {
+    let toString = Object.prototype.toString;
+    if (
+      toString.call(value) === "[object Array]" ||
+      toString.call(value) === "[object Object]"
+    ) {
+      value = JSON.stringify(value);
     }
-    return localStorage.setItem(key, value)
+    return localStorage.setItem(key, value);
   },
-  remove (key) {
-    return localStorage.removeItem(key)
+  remove(key) {
+    return localStorage.removeItem(key);
   },
-  clear () {
-    return localStorage.clear()
+  clear() {
+    return localStorage.clear();
   }
-}
+};