添加eslint

.eslintignore

-/build/
-/config/
-/dist/
-/*.js
-/test/unit/coverage/
+node_modules/*
+build/*
+config/*
+dist/*
+lib/*
+static/*
\ No newline at end of file

.eslintrc.js

-// https://eslint.org/docs/user-guide/configuring
-
 module.exports = {
   root: true,
   parserOptions: {
-    parser: 'babel-eslint'
+    parser: 'babel-eslint',
   },
   env: {
     browser: true,
   },
   extends: [
-    // https://github.com/vuejs/eslint-plugin-vue#priority-a-essential-error-prevention
-    // consider switching to `plugin:vue/strongly-recommended` or `plugin:vue/recommended` for stricter rules.
     'plugin:vue/essential',
-    // https://github.com/standard/standard/blob/master/docs/RULES-en.md
-    'standard'
+    'standard',
   ],
-  // required to lint *.vue files
   plugins: [
-    'vue'
+    'vue',
   ],
-  // add your custom rules here
   rules: {
-    // allow async-await
-    'generator-star-spacing': 'off',
-    // allow debugger during development
-    'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off'
-  }
+    // 防止iview的标签报错
+    "vue/no-parsing-error": [2, { "x-invalid-end-tag": false }],
+  },
 }
+

package.json

@@ -10,7 +10,7 @@
     "unit": "jest --config test/unit/jest.conf.js --coverage",
     "e2e": "node test/e2e/runner.js",
     "test": "npm run unit && npm run e2e",
-    "lint": "eslint --ext .js,.vue src test/unit test/e2e/specs",
+    "lint": "eslint --fix --cache --ext .js,.vue src",
     "build": "node build/build.js"
   },
   "dependencies": {
@@ -23,7 +23,7 @@
   "devDependencies": {
     "autoprefixer": "^7.1.2",
     "babel-core": "^6.22.1",
-    "babel-eslint": "^8.2.1",
+    "babel-eslint": "^8.2.6",
     "babel-helper-vue-jsx-merge-props": "^2.0.3",
     "babel-jest": "^21.0.2",
     "babel-loader": "^7.1.1",
@@ -40,15 +40,15 @@
     "copy-webpack-plugin": "^4.0.1",
     "cross-spawn": "^5.0.1",
     "css-loader": "^0.28.0",
-    "eslint": "^4.15.0",
+    "eslint": "^5.16.0",
     "eslint-config-standard": "^10.2.1",
     "eslint-friendly-formatter": "^3.0.0",
-    "eslint-loader": "^1.7.1",
-    "eslint-plugin-import": "^2.7.0",
-    "eslint-plugin-node": "^5.2.0",
-    "eslint-plugin-promise": "^3.4.0",
-    "eslint-plugin-standard": "^3.0.1",
-    "eslint-plugin-vue": "^4.0.0",
+    "eslint-loader": "^1.9.0",
+    "eslint-plugin-import": "^2.19.1",
+    "eslint-plugin-node": "^5.2.1",
+    "eslint-plugin-promise": "^3.8.0",
+    "eslint-plugin-standard": "^3.1.0",
+    "eslint-plugin-vue": "^6.0.1",
     "extract-text-webpack-plugin": "^3.0.0",
     "file-loader": "^1.1.4",
     "friendly-errors-webpack-plugin": "^1.6.1",
@@ -76,7 +76,8 @@
     "webpack": "^3.6.0",
     "webpack-bundle-analyzer": "^2.9.0",
     "webpack-dev-server": "^2.9.1",
-    "webpack-merge": "^4.1.0"
+    "webpack-merge": "^4.1.0",
+    "husky": "^3.1.0"
   },
   "engines": {
     "node": ">= 6.0.0",
@@ -86,5 +87,10 @@
     "> 1%",
     "last 2 versions",
     "not ie <= 8"
-  ]
+  ],
+  "husky": {
+    "hooks": {
+      "pre-commit": "npm run lint"
+    }
+  }
 }
\ No newline at end of file

src/api/mainconfigguration.server.js

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

src/api/user.api.js

@@ -3,7 +3,7 @@ import {
   sapi
 } from '../config'
 export function login (data) {
-  return axios.get(`/heimdallr/login`,{headers: {
+  return axios.get(`/heimdallr/login`, {headers: {
     'heimdallr-user': data
   }})
 }

src/components/home.vue

@@ -34,13 +34,13 @@
 </template>
 <script>
 import {logout} from '../api/user.api'
-  export default {
+export default {
   data () {
     return {
       isCollapsed: false
     }
   },
-    computed : {
+  computed: {
     menuitemClasses: function () {
       return [
         'menu-item',
@@ -58,7 +58,7 @@ import {logout} from '../api/user.api'
       })
     }
   }
-  }
+}
 </script>
 <style scoped>
 .layout{

src/components/login.vue

@@ -27,14 +27,14 @@ import {login} from '../api/user.api'
 import localStorage from '../services/localStorage.service.js'
 export default {
   data () {
-    var that=this
-    const validateMenuClassifyId = (rule, value, callback) => {
-      if (this.status) {  
-        callback(new Error('用户名或密码错误'))
+    var that = this
+    const validateMenuClassifyId = (rule, value, callback) => {
+      if (this.status) {
+        callback(new Error('用户名或密码错误'))
         this.status = false
-      } else {
-        callback()
-      }
+      } else {
+        callback()
+      }
     }
     return {
       loginForm: {
@@ -49,7 +49,7 @@ export default {
         ],
         password: [
           {required: true, message: '请输入密码', trigger: 'blur'},
-          { required: true,validator: validateMenuClassifyId , trigger: 'blur'}
+          { required: true, validator: validateMenuClassifyId, trigger: 'blur'}
         ]
       }
     }
@@ -60,11 +60,10 @@ export default {
         if (valid) {
           let data = btoa(`${this.loginForm.loginName}:${this.loginForm.password}`)
           login(data).then((data) => {
-            if(data.code === 400) {
+            if (data.code === 400) {
               this.error = data.body
               this.status = true
               this.$refs['loginForm'].validate()
-              return
             } else {
               this.status = false
               localStorage.set('heimdallr-token', data.body['heimdallr-token'])

src/config/env.config.js

-const sapi = "http://heimdallr-arch.liangkebang.net"
+const sapi = 'http://heimdallr-arch.liangkebang.net'
 // const sapi = 'http://192.168.29.88:5555'
 export {
   sapi

src/pages/mainconfiguration/mainconfiguration.vue

@@ -141,7 +141,7 @@
   </div>
 </template>
 <script>
-import {getservicelist,getkey,getconfigurelist,postconfigurelist,getVersionnumber,rollbacknum,getnodelist,nodeconfig} from '../../api/mainconfigguration.server'
+import {getservicelist, getkey, getconfigurelist, postconfigurelist, getVersionnumber, rollbacknum, getnodelist, nodeconfig} from '../../api/mainconfigguration.server'
 export default {
   data () {
     return {
@@ -237,15 +237,15 @@ export default {
           title: '状态',
           key: 'Status',
           align: 'center',
-          render: (h, params) =>{
-            return h('div', params.row.Status == 'passing' ? 'up': 'down')
-          },
+          render: (h, params) => {
+            return h('div', params.row.Status == 'passing' ? 'up' : 'down')
+          }
         },
         {
           title: '权重',
           key: 'weight',
           align: 'center',
-          render: (h, params) =>{
+          render: (h, params) => {
             return h('div', params.row.Meta.weight || 100)
           }
         },
@@ -265,7 +265,7 @@ export default {
               },
               on: {
                 click: () => {
-                  this.updatenode (params.row)
+                  this.updatenode(params.row)
                 }
               }
             }, '修改'),
@@ -295,22 +295,22 @@ export default {
       this.isShowList = false
       this.key = key
       this.getkeytext(key)
-      let data ={
+      let data = {
         key: key,
         service_name: this.server
       }
-       getconfigurelist(data).then(data =>{
+      getconfigurelist(data).then(data => {
         this.testmostatus = data.body
         this.testmostatus == 'false' ? '关闭' : '开启'
         data.body == false ? this.closetest = true : this.opentest = false
       })
     },
     opentestradio (data) {
-      this.closetest = ! this.closetest
+      this.closetest = !this.closetest
       this.aftertestmostatus = true
     },
     closetestradio (data) {
-      this.opentest = ! this.opentest
+      this.opentest = !this.opentest
       this.aftertestmostatus = false
     },
     confireupdaterido () {
@@ -323,42 +323,42 @@ export default {
       this.key = key
       this.logData = []
       this.getkeytext(key)
-      this.getconfigurlist(key,this.server)
+      this.getconfigurlist(key, this.server)
     },
     domainnameprefixlist (key) {
       this.isShowList = true
       this.key = key
       this.logData = []
       this.getkeytext(key)
-      this.getconfigurlist(key,this.server)
+      this.getconfigurlist(key, this.server)
     },
     internallylist (key) {
       this.isShowList = true
       this.key = key
       this.logData = []
       this.getkeytext(key)
-      this.getconfigurlist(key,this.server)
+      this.getconfigurlist(key, this.server)
     },
     foreignlist (key) {
       this.isShowList = true
       this.key = key
       this.logData = []
       this.getkeytext(key)
-      this.getconfigurlist(key,this.server)
+      this.getconfigurlist(key, this.server)
     },
     authenticationlist (key) {
       this.isShowList = true
       this.key = key
       this.logData = []
       this.getkeytext(key)
-      this.getconfigurlist(key,this.server)
+      this.getconfigurlist(key, this.server)
     },
     oneadd () {
       if (this.singlebaraddition == '') {
         this.$Message.error('请先输入要添加的内容')
         return
       }
-      this.logData.push({sort:this.singlebaraddition})
+      this.logData.push({sort: this.singlebaraddition})
       this.logparamsarr.push(this.singlebaraddition)
       this.singlebaraddition = ''
     },
@@ -370,14 +370,14 @@ export default {
         this.$Message.error('请先输入要添加的内容')
         return
       }
-      let str = this.formInline.alladdcontent.replace(/\[|]/g,'')
-      str = str.replace(/\n/g,'')
-      str = str.replace(/\"/g,'')
-      str = str.replace(/\'/g,'')
+      let str = this.formInline.alladdcontent.replace(/\[|]/g, '')
+      str = str.replace(/\n/g, '')
+      str = str.replace(/\"/g, '')
+      str = str.replace(/\'/g, '')
       let arr = str.split(',')
       this.logparamsarr = arr
-      arr.map(item =>{
-        this.logData.push({sort:item})
+      arr.map(item => {
+        this.logData.push({sort: item})
       })
       this.alladdModal = false
     },
@@ -393,16 +393,16 @@ export default {
     rollback () {
       this.rollbackModal = true
       let data = {
-        service_name : this.versionNumber,
+        service_name: this.versionNumber,
         key: this.key
       }
-      getVersionnumber(data).then(data =>{
+      getVersionnumber(data).then(data => {
         this.rollbacklist = data.body
         this.content = data.body.length == 0 ? '' : data.body[0].value
         this.version = data.body.length == 0 ? '' : data.body[0].key
       })
     },
-    selectlist (value,key) {
+    selectlist (value, key) {
       this.content = value
       this.version = key
     },
@@ -411,12 +411,12 @@ export default {
         this.$Message.error('没有要回滚的内容')
         return
       }
-      let data ={
+      let data = {
         key: this.key,
         service_name: this.server,
         version: this.version
       }
-      rollbacknum(data).then(data =>{
+      rollbacknum(data).then(data => {
         if (data.code === 200) {
           this.rollbackModal = false
           this.$Message.success('回滚成功')
@@ -452,7 +452,7 @@ export default {
     },
     getserlist () {
       return getservicelist().then((data) => {
-        let k=''
+        let k = ''
         for (k in data.body) {
           this.serviceList.push(k)
           this.server = this.serviceList[0]
@@ -462,18 +462,18 @@ export default {
     },
     getkeytext (key) {
       getkey(key).then((data) => {
-        this.textExplain = data.body.replace(/\n/g,"<br/>")
+        this.textExplain = data.body.replace(/\n/g, '<br/>')
       })
     },
-    getconfigurlist (key,service_name) {
-      let data ={
+    getconfigurlist (key, service_name) {
+      let data = {
         key: key,
         service_name: service_name
       }
-       getconfigurelist(data).then(data =>{
-        data.body.map(item =>{
+      getconfigurelist(data).then(data => {
+        data.body.map(item => {
           this.logData.push({
-            sort:item
+            sort: item
           })
         })
       })
@@ -483,12 +483,12 @@ export default {
         this.$Message.error('请先添加要发布的内容')
         return
       }
-      let data ={
+      let data = {
         key: this.key,
         service_name: this.server
       }
       let params = this.logparamsarr
-      postconfigurelist(data,params).then(data => {
+      postconfigurelist(data, params).then(data => {
         if (data.code === 200) {
           this.$Message.success('发布成功')
         }
@@ -514,7 +514,7 @@ export default {
         service_name: this.server
       }
       let weight = { weight: data.Meta.weight ? data.Meta.weight : 100}
-      nodeconfig(params,weight).then(data => {
+      nodeconfig(params, weight).then(data => {
         if (data.code === 200) {
           this.$Message.success('发布成功')
         } else {

src/services/http.service.js

@@ -38,7 +38,6 @@ function responseInterceptor (response) {
     return Promise.resolve(response.data || null)
   }
 
-
   // Notice.error({
   //   title: '',
   //   desc: response.data.errorMsg || response.data.message || '请联系客服'

src/services/localStorage.service.js

-export default{
+export default {
   get (key) {
     let result = localStorage.getItem(key)
     try {