Inicio Explorar Axuda
Rexistro Iniciar sesión
lqb
/
nginx-ui
réplica de https://github.com/0xJacky/nginx-ui.git
1
0
Fork 0
Ficheiros Incidencias 0 Wiki
Explorar o código

add acme.sh and login page

Jacky %!s(int64=4) %!d(string=hai) anos
pai
c164cd16d6
achega
02986a4bfd
Modificáronse 34 ficheiros con 791 adicións e 652 borrados
Dividir vista Mostrar estatísticas de Diff
  1. 1 4
      .gitignore
  2. 1 2
      nginx-ui-frontend/.env.development
  3. 0 2
      nginx-ui-frontend/.env.production
  4. 1 1
      nginx-ui-frontend/package.json
  5. 1 1
      nginx-ui-frontend/public/index.html
  6. 20 0
      nginx-ui-frontend/src/api/auth.js
  7. 5 3
      nginx-ui-frontend/src/api/index.js
  8. 83 0
      nginx-ui-frontend/src/components/VueItextarea/VueItextarea.vue
  9. 4 0
      nginx-ui-frontend/src/lib/http/index.js
  10. 5 2
      nginx-ui-frontend/src/lib/store/index.js
  11. 0 38
      nginx-ui-frontend/src/lib/store/mock.js
  12. 0 23
      nginx-ui-frontend/src/lib/store/user.js
  13. 8 15
      nginx-ui-frontend/src/lib/utils/index.js
  14. 1 1
      nginx-ui-frontend/src/lib/utils/scroll-position.js
  15. 13 1
      nginx-ui-frontend/src/router/index.js
  16. 1 0
      nginx-ui-frontend/src/views/About.vue
  17. 1 12
      nginx-ui-frontend/src/views/ConfigEdit.vue
  18. 3 3
      nginx-ui-frontend/src/views/DashBoard.vue
  19. 78 21
      nginx-ui-frontend/src/views/DomainEdit.vue
  20. 106 0
      nginx-ui-frontend/src/views/Login.vue
  21. 1 1
      nginx-ui-frontend/version.json
  22. 14 479
      nginx-ui-frontend/yarn.lock
  23. 0 9
      server/api/analytic.go
  24. 62 0
      server/api/auth.go
  25. 143 0
      server/api/cert.go
  26. 2 1
      server/app.ini
  27. 1 5
      server/go.mod
  28. 20 12
      server/go.sum
  29. 63 0
      server/model/auth.go
  30. 2 0
      server/model/models.go
  31. 40 1
      server/router/routers.go
  32. 16 15
      server/settings/settings.go
  33. 55 0
      server/test/acme_test.go
  34. 40 0
      server/test/cert_test.go

+ 1 - 4
.gitignore
Ver ficheiro 

@@ -1,9 +1,6 @@
 
 .DS_Store
 
 .idea
 
 database.db
 
-
 
-server/tmp/main
 
+tmp
 
 node_modules
 
 dist
 
-nginx-ui-frontend/.env.development
 
-nginx-ui-frontend/.env.production

+ 1 - 2
nginx-ui-frontend/.env.development
Ver ficheiro 

@@ -1,3 +1,2 @@
 
 VUE_APP_API_ROOT = /
 
-VUE_APP_API_WSS_ROOT = 
-VUE_APP_API_WSS_TOKEN =
 
+VUE_APP_API_WSS_ROOT = wss://nginx.jackyu.cn/ws

+ 0 - 2
nginx-ui-frontend/.env.production
Ver ficheiro 

@@ -1,3 +1 @@
 
 VUE_APP_API_ROOT = /api
 
-VUE_APP_API_WSS_ROOT =
 
-VUE_APP_API_WSS_TOKEN =

+ 1 - 1
nginx-ui-frontend/package.json
Ver ficheiro 

@@ -4,7 +4,7 @@
 
     "private": true,
 
     "scripts": {
 
         "serve": "vue-cli-service serve",
 
-        "build": "vue-cli-service build",
 
+        "build": "vue-cli-service build --dest dist --modern",
 
         "lint": "vue-cli-service lint"
 
     },
 
     "dependencies": {

+ 1 - 1
nginx-ui-frontend/public/index.html
Ver ficheiro 

@@ -3,7 +3,7 @@
 
 <head>
 
     <meta charset="utf-8">
 
     <meta content="IE=edge" http-equiv="X-UA-Compatible">
 
-    <meta content="width=device-width,initial-scale=1.0" name="viewport">
 
+    <meta content="width=device-width,initial-scale=1.0,user-scalable=0" name="viewport">
 
     <link href="<%= BASE_URL %>favicon.ico" rel="icon">
 
     <title><%= htmlWebpackPlugin.options.title %></title>
 
 </head>

+ 20 - 0
nginx-ui-frontend/src/api/auth.js
Ver ficheiro 

@@ -0,0 +1,20 @@
 
+import http from '@/lib/http'
 
+import store from '@/lib/store'
 
+
 
+const auth = {
 
+    async login(name, password) {
 
+        return http.post('/login', {
 
+            name: name,
 
+            password: password
 
+        }).then(r => {
 
+            store.dispatch('login', r)
 
+        })
 
+    },
 
+    logout() {
 
+        return http.delete('/logout').then(() => {
 
+            store.dispatch('logout').finally()
 
+        })
 
+    }
 
+}
 
+
 
+export default auth

+ 5 - 3
nginx-ui-frontend/src/api/index.js
Ver ficheiro 

@@ -1,7 +1,9 @@
 
-import domain from "./domain"
 
-import config from "./config"
 
+import domain from './domain'
 
+import config from './config'
 
+import auth from './auth'
 
 
 export default {
 
     domain,
 
-    config
 
+    config,
 
+    auth
 
 }

+ 83 - 0
nginx-ui-frontend/src/components/VueItextarea/VueItextarea.vue
Ver ficheiro 

@@ -0,0 +1,83 @@
 
+<template>
 
+    <a-textarea
 
+        :value="current_value"
 
+        @keydown="updateValue($event)"
 
+        @input="change($event)"
 
+        :rows="36"
 
+    />
 
+</template>
 
+
 
+
 
+<script>
 
+export default {
 
+    name: 'vue-itextarea',
 
+    props: {
 
+        value: {},
 
+        TAB_SIZE: {default: 4},
 
+    },
 
+    model: {
 
+        prop: 'value',
 
+        event: 'changeValue'
 
+    },
 
+    watch: {
 
+        value() {
 
+            this.current_value = this.value ? this.value : ''
 
+        }
 
+    },
 
+    data() {
 
+        return {
 
+            current_value: this.value ? this.value : ''
 
+        };
 
+    },
 
+    methods: {
 
+        /**
 
+         * Keyboard shortcuts support, like <ctrl-v>
 
+         */
 
+        change(event) {
 
+            this.$emit('input', event.target.value);
 
+        },
 
+        updateValue(event) {
 
+            let target = event.target;
 
+            let value = target.value;
 
+            let start = target.selectionStart;
 
+            let end = target.selectionEnd;
 
+            if (event.key === 'Escape') {
 
+                if (event.target.nextElementSibling) event.target.nextElementSibling.focus();
 
+                else (event.target.blur());
 
+                return;
 
+            }
 
+            if (event.key === 'Tab' && !event.metaKey) {
 
+                event.preventDefault();
 
+                value = value.substring(0, start) + ' '.repeat(this.TAB_SIZE) + value.substring(end);
 
+                event.target.value = value;
 
+                setTimeout(() => target.selectionStart = target.selectionEnd = start + this.TAB_SIZE, 0);
 
+            }
 
+            if (event.key === 'Backspace' && !event.metaKey) {
 
+                let chars_before_cursor = value.substr(start - this.TAB_SIZE, this.TAB_SIZE);
 
+                if (chars_before_cursor === ' '.repeat(this.TAB_SIZE)) {
 
+                    event.preventDefault();
 
+                    value = value.substring(0, start - this.TAB_SIZE) + value.substring(end);
 
+                    event.target.value = value;
 
+                    setTimeout(() => target.selectionStart = target.selectionEnd = start - this.TAB_SIZE, 0)
 
+                }
 
+            }
 
+            if (event.key === 'Enter') {
 
+                let current_line = value.substr(0, start).split("\n").pop(); // line, we are currently on
 
+                if (current_line && current_line.startsWith(' '.repeat(this.TAB_SIZE))) { // type tab
 
+                    event.preventDefault();
 
+                    // detect how many tabs in the begining and apply
 
+                    let spaces_count = current_line.search(/\S|$/); // position of first non white-space character
 
+                    let tabs_count = spaces_count ? spaces_count / this.TAB_SIZE : 0;
 
+                    value = value.substring(0, start) + '\n' + ' '.repeat(this.TAB_SIZE).repeat(tabs_count) + this.current_value.substring(end);
 
+                    event.target.value = value;
 
+                    setTimeout(() => target.selectionStart = target.selectionEnd = start + this.TAB_SIZE * tabs_count + 1, 0);
 
+                }
 
+            }
 
+            setTimeout(() => {
 
+                this.current_value = event.target.value;
 
+                this.$emit('input', event.target.value);
 
+            }, 0);
 
+        },
 
+    },
 
+};
 
+</script>

+ 4 - 0
nginx-ui-frontend/src/lib/http/index.js
Ver ficheiro 

@@ -1,4 +1,5 @@
 
 import axios from 'axios'
 
+import store from '../store'
 
 
 /* 创建 axios 实例 */
 
 let http = axios.create({
 
@@ -18,6 +19,9 @@ let http = axios.create({
 
 /* http request 拦截器 */
 
 http.interceptors.request.use(
 
     config => {
 
+        if (store.state.user.token) {
 
+            config.headers.Authorization = `${store.state.user.token}`
 
+        }
 
         return config
 
     },
 
     err => {

+ 5 - 2
nginx-ui-frontend/src/lib/store/index.js
Ver ficheiro 

@@ -1,6 +1,7 @@
 
 import Vue from 'vue'
 
 import Vuex from 'vuex'
 
 import VuexPersistence from 'vuex-persist'
 
+import {user} from './user'
 
 
 Vue.use(Vuex)
 
 
@@ -8,12 +9,14 @@ const debug = process.env.NODE_ENV !== 'production'
 
 
 const vuexLocal = new VuexPersistence({
 
     storage: window.localStorage,
 
-    modules: []
 
+    modules: ['user']
 
 })
 
 
 export default new Vuex.Store({
 
     // 将各组件分别模块化存入 Store
 
-    modules: {},
 
+    modules: {
 
+        user
 
+    },
 
     plugins: [vuexLocal.plugin],
 
     strict: debug
 
 })

+ 0 - 38
nginx-ui-frontend/src/lib/store/mock.js
Ver ficheiro 

@@ -1,38 +0,0 @@
 
-export const mock = {
 
-    namespace: true,
 
-    state: {
 
-        user: {
 
-            name: 'mock 用户',
 
-            school_id: '201904020209',
 
-            superuser: true,
 
-            // 0学生 1企业 2教师 3学院
 
-            power: 2,
 
-            gender: 1,
 
-            phone: "10086",
 
-            email: 'me@jackyu.cn',
 
-            description: '前端、后端、系统架构',
 
-            college_id: 1,
 
-            college_name: "大数据与互联网学院",
 
-            major: 1,
 
-            major_name: "物联网工程",
 
-            position: 'HR'
 
-        }
 
-    },
 
-    mutations: {
 
-        update_mock_user(state, payload) {
 
-            for (const k in payload) {
 
-                state.user[k] = payload[k]
 
-            }
 
-        }
 
-    },
 
-    actions: {
 
-        async update_mock_user({commit}, data) {
 
-            commit('update_mock_user', data)
 
-        }
 
-    },
 
-    getters: {
 
-        user(state) {
 
-            return state.user
 
-        },
 
-    }
 
-}

+ 0 - 23
nginx-ui-frontend/src/lib/store/user.js
Ver ficheiro 

@@ -1,16 +1,6 @@
 
 export const user = {
 
     namespace: true,
 
     state: {
 
-        info: {
 
-            id: null,
 
-            name: null,
 
-            power: null,
 
-            college_id: null,
 
-            college_name: null,
 
-            major_id: null,
 
-            major_name: null,
 
-            position: null
 
-        },
 
         token: null
 
     },
 
     mutations: {
 
@@ -19,11 +9,7 @@ export const user = {
 
         },
 
         logout(state) {
 
             sessionStorage.clear()
 
-            state.info = {}
 
             state.token = null
 
-        },
 
-        update_user(state, payload) {
 
-            state.info = payload
 
         }
 
     },
 
     actions: {
 
@@ -32,20 +18,11 @@ export const user = {
 
         },
 
         async logout({commit}) {
 
             commit('logout')
 
-        },
 
-        async update_user({commit}, data) {
 
-            commit('update_user', data)
 
         }
 
     },
 
     getters: {
 
-        info(state) {
 
-            return state.info
 
-        },
 
         token(state) {
 
             return state.token
 
-        },
 
-        isLogin(state) {
 
-            return !!state.token
 
         }
 
     }
 
 }

+ 8 - 15
nginx-ui-frontend/src/lib/utils/index.js
Ver ficheiro 

@@ -29,22 +29,15 @@ export default {
 
             return (bytes / Math.pow(k, i)).toPrecision(3) + ' ' + sizes[i]
 
         }
 
 
-        Vue.prototype.transformUserType = (power) => {
 
-            const type = ['学生', '企业', '教师', '学院']
 
-            return type[power]
 
-        }
 
+        Vue.prototype.scrollPosition = scrollPosition
 
 
-        Vue.prototype.transformGrade = {
 
-            7: 'A+',
 
-            6: 'A',
 
-            5: 'B+',
 
-            4: 'B',
 
-            3: 'C+',
 
-            2: 'C',
 
-            1: 'D',
 
-            0: 'F'
 
+        Vue.prototype.getWebSocketRoot = () => {
 
+            const protocol = location.protocol === "https:" ? "wss://" : "ws://"
 
+            if (process.env["VUE_APP_API_WSS_ROOT"]) {
 
+                return process.env["VUE_APP_API_WSS_ROOT"]
 
+            }
 
+            console.log(protocol, document.domain)
 
+            return protocol + document.domain + '/ws'
 
         }
 
-
 
-        Vue.prototype.scrollPosition = scrollPosition
 
     }
 
 }

+ 1 - 1
nginx-ui-frontend/src/lib/utils/scroll-position.js
Ver ficheiro 

@@ -21,7 +21,7 @@ const scrollPosition = {
 
         Vue.prototype.$nextTick(() => {
 
             document.documentElement.scrollTop = document.body.scrollTop = 0
 
         })
 
-    }
 
+    },
 
 }
 
 
 export default scrollPosition

+ 13 - 1
nginx-ui-frontend/src/router/index.js
Ver ficheiro 

@@ -1,6 +1,7 @@
 
 import Vue from 'vue'
 
 import VueRouter from 'vue-router'
 
 import axios from 'axios'
 
+import store from '@/lib/store'
 
 
 Vue.use(VueRouter)
 
 
@@ -71,6 +72,12 @@ export const routes = [
 
             },
 
         ]
 
     },
 
+    {
 
+        path: '/login',
 
+        name: '登录',
 
+        component: () => import('@/views/Login'),
 
+        meta: {noAuth: true}
 
+    },
 
     {
 
         path: '/404',
 
         name: '404 Not Found',
 
@@ -108,7 +115,12 @@ router.beforeEach((to, from, next) => {
 
         })
 
     }
 
 
-    next()
 
+    if (to.meta.noAuth || store.getters.token) {
 
+        next()
 
+    } else {
 
+        next({path: '/login', query: {next: to.fullPath}})
 
+    }
 
+
 
 })
 
 
 export {router}

+ 1 - 0
nginx-ui-frontend/src/views/About.vue
Ver ficheiro 

@@ -9,6 +9,7 @@
 
         <p>Go</p>
 
         <p>Gin</p>
 
         <p>Vue</p>
 
+        <p>Websocket</p>
 
         <h3>开源协议</h3>
 
         <p>GNU General Public License v2.0</p>
 
         <p>Copyright © 2020 - {{ this_year }} 0xJacky </p>

+ 1 - 12
nginx-ui-frontend/src/views/ConfigEdit.vue
Ver ficheiro 

@@ -1,6 +1,6 @@
 
 <template>
 
     <a-card title="配置文件实时编辑">
 
-        <a-textarea v-model="configText" :rows="36" @keydown.tab.prevent="pressTab"/>
 
+        <vue-itextarea v-model="configText"/>
 
         <footer-tool-bar>
 
             <a-button type="primary" @click="save">保存</a-button>
 
         </footer-tool-bar>
 
@@ -53,17 +53,6 @@ export default {
 
                 console.log(r)
 
                 this.$message.error("保存错误")
 
             })
 
-        },
 
-        pressTab(event) {
 
-            let target = event.target
 
-            let value = target.value
 
-            let start = target.selectionStart;
 
-            let end = target.selectionEnd;
 
-            if (event) {
 
-                value = value.substring(0, start) + '\t' + value.substring(end);
 
-                event.target.value = value;
 
-                setTimeout(() => target.selectionStart = target.selectionEnd = start + 1, 0);
 
-            }
 
         }
 
     }
 
 }

+ 3 - 3
nginx-ui-frontend/src/views/DashBoard.vue
Ver ficheiro 

@@ -111,8 +111,8 @@ export default {
 
         }
 
     },
 
     created() {
 
-        this.websocket = new WebSocket(process.env["VUE_APP_API_WSS_ROOT"] + "/analytic?token="
 
-            + process.env["VUE_APP_API_WSS_TOKEN"])
 
+        this.websocket = new WebSocket(this.getWebSocketRoot() + "/analytic?token="
 
+            + btoa(this.$store.state.user.token))
 
         this.websocket.onmessage = this.wsOnMessage
 
         this.websocket.onopen = this.wsOpen
 
         this.websocket.onerror = this.wsOnError
 
@@ -128,7 +128,7 @@ export default {
 
             }, 1000)
 
         },
 
         wsOnError() {
 
-            this.websocket = new WebSocket(process.env["VUE_APP_API_WSS_ROOT"] + "/analytic")
 
+            this.websocket = new WebSocket(this.getWebSocketRoot() + "/analytic")
 
         },
 
         wsOnMessage(m) {
 
             const r = JSON.parse(m.data)

+ 78 - 21
nginx-ui-frontend/src/views/DomainEdit.vue
Ver ficheiro 

@@ -2,16 +2,14 @@
 
     <a-row>
 
         <a-col :md="12" :sm="24">
 
             <a-card :title="name ? '编辑站点：' + name : '添加站点'">
 
+                <p>您的配置文件中应当有对应的字段时，下列表单中的设置才能生效。</p>
 
                 <std-data-entry :data-list="columns" v-model="config" @change_support_ssl="change_support_ssl"/>
 
+                <a-button @click="issue_cert" type="primary" v-show="config.support_ssl" ghost>自动申请 Let's Encrypt 证书</a-button>
 
             </a-card>
 
         </a-col>
 
         <a-col :md="12" :sm="24">
 
             <a-card title="配置文件编辑">
 
-                <a-textarea
 
-                    v-model="configText"
 
-                    :rows="36"
 
-                    @keydown.tab.prevent="pressTab"
 
-                />
 
+                <vue-itextarea v-model="configText"/>
 
             </a-card>
 
         </a-col>
 
         <footer-tool-bar>
 
@@ -23,6 +21,7 @@
 
 <script>
 
 import StdDataEntry from "@/components/StdDataEntry/StdDataEntry"
 
 import FooterToolBar from "@/components/FooterToolbar/FooterToolBar"
 
+import VueItextarea from "@/components/VueItextarea/VueItextarea";
 
 
 const columns = [{
 
     title: "配置文件名称",
 
@@ -36,6 +35,18 @@ const columns = [{
 
     edit: {
 
         type: "input"
 
     }
 
+}, {
 
+    title: "网站根目录 (root)",
 
+    dataIndex: "root",
 
+    edit: {
 
+        type: "input"
 
+    }
 
+}, {
 
+    title: "网站首页 (index)",
 
+    dataIndex: "index",
 
+    edit: {
 
+        type: "input"
 
+    }
 
 }, {
 
     title: "http 监听端口",
 
     dataIndex: "http_listen_port",
 
@@ -69,30 +80,18 @@ const columns = [{
 
     edit: {
 
         type: "input"
 
     }
 
-}, {
 
-    title: "网站根目录 (root)",
 
-    dataIndex: "root",
 
-    edit: {
 
-        type: "input"
 
-    }
 
-}, {
 
-    title: "网站首页 (index)",
 
-    dataIndex: "index",
 
-    edit: {
 
-        type: "input"
 
-    }
 
 }]
 
 
 export default {
 
     name: "DomainEdit",
 
-    components: {FooterToolBar, StdDataEntry},
 
+    components: {FooterToolBar, StdDataEntry, VueItextarea},
 
     data() {
 
         return {
 
             name: this.$route.params.name,
 
             columns,
 
             config: {
 
                 http_listen_port: 80,
 
-                https_listen_port: 443,
 
+                https_listen_port: null,
 
                 server_name: "",
 
                 index: "",
 
                 root: "",
 
@@ -100,7 +99,8 @@ export default {
 
                 ssl_certificate_key: "",
 
                 support_ssl: false
 
             },
 
-            configText: ""
 
+            configText: "",
 
+            ws: null
 
         }
 
     },
 
     watch: {
 
@@ -127,7 +127,7 @@ export default {
 
         } else {
 
             this.config = {
 
                 http_listen_port: 80,
 
-                https_listen_port: 443,
 
+                https_listen_port: null,
 
                 server_name: "",
 
                 index: "",
 
                 root: "",
 
@@ -138,6 +138,11 @@ export default {
 
             this.get_template()
 
         }
 
     },
 
+    destroyed() {
 
+        if (this.ws !== null) {
 
+            this.ws.close()
 
+        }
 
+    },
 
     methods: {
 
         parse(r) {
 
             const text = r.config
 
@@ -227,6 +232,38 @@ export default {
 
                 this.$message.error("保存错误" + r.message !== undefined ? " " + r.message : null, 10)
 
             })
 
         },
 
+        issue_cert() {
 
+            this.$message.info("请注意，当前配置中 server_name 必须为需要申请证书的域名，否则无法申请", 5)
 
+            this.$message.info("正在申请，请稍后")
 
+            this.ws = new WebSocket(this.getWebSocketRoot() + "/cert/issue/" + this.config.server_name
 
+                + "?token=" + process.env["VUE_APP_API_WSS_TOKEN"])
 
+
 
+            this.ws.onopen = () => {
 
+                this.ws.send("ping")
 
+            }
 
+
 
+            this.ws.onmessage = m => {
 
+                const r = JSON.parse(m.data)
 
+                console.log(r)
 
+                switch (r.status) {
 
+                    case "success":
 
+                        this.$message.success(r.message, 5)
 
+                        break
 
+                    case "info":
 
+                        this.$message.info(r.message, 5)
 
+                        break
 
+                    case "error":
 
+                        this.$message.error(r.message, 5)
 
+                        break
 
+                }
 
+
 
+                if (r.status === "success" && r.ssl_certificate !== undefined && r.ssl_certificate_key !== undefined) {
 
+                    this.config.ssl_certificate = r.ssl_certificate
 
+                    this.config.ssl_certificate_key = r.ssl_certificate_key
 
+                }
 
+            }
 
+
 
+        },
 
         pressTab(event) {
 
             let target = event.target
 
             let value = target.value
 
@@ -237,6 +274,26 @@ export default {
 
                 event.target.value = value;
 
                 setTimeout(() => target.selectionStart = target.selectionEnd = start + 1, 0);
 
             }
 
+        },
 
+        pressEnter(event) {
 
+            let target = event.target
 
+            let value = target.value
 
+            let start = target.selectionStart
 
+            let end = target.selectionEnd
 
+
 
+            if (event.key === 'Enter') {
 
+                let current_line = value.substr(0, start).split("\n").pop(); // line, we are currently on
 
+                if (current_line && current_line.startsWith('\t')) { // type tab
 
+                    event.preventDefault();
 
+                    // detect how many tabs in the begining and apply
 
+                    let spaces_count = current_line.search(/\S|$/); // position of first non white-space character
 
+                    let tabs_count = spaces_count ? spaces_count / this.TAB_SIZE : 0
 
+                    value = value.substring(0, start) + '\n' + '\t'.repeat(tabs_count) + value.substring(end)
 
+                    event.target.value = value
 
+                    setTimeout(() => target.selectionStart = target.selectionEnd =
 
+                        start + this.TAB_SIZE * tabs_count + 1, 0)
 
+                }
 
+            }
 
         }
 
     }
 
 }

+ 106 - 0
nginx-ui-frontend/src/views/Login.vue
Ver ficheiro 

@@ -0,0 +1,106 @@
 
+<template>
 
+    <div class="login-form">
 
+        <div class="project-title">
 
+            <h1>Nginx UI</h1>
 
+        </div>
 
+        <a-form
 
+            id="components-form-demo-normal-login"
 
+            :form="form"
 
+            class="login-form"
 
+            @submit="handleSubmit"
 
+        >
 
+            <a-form-item>
 
+                <a-input
 
+                    v-decorator="[
 
+          'name',
 
+          { rules: [{ required: true, message: 'Please input your username!' }] },
 
+        ]"
 
+                    placeholder="Username"
 
+                >
 
+                    <a-icon slot="prefix" type="user" style="color: rgba(0,0,0,.25)" />
 
+                </a-input>
 
+            </a-form-item>
 
+            <a-form-item>
 
+                <a-input
 
+                    v-decorator="[
 
+          'password',
 
+          { rules: [{ required: true, message: 'Please input your Password!' }] },
 
+        ]"
 
+                    type="password"
 
+                    placeholder="Password"
 
+                >
 
+                    <a-icon slot="prefix" type="lock" style="color: rgba(0,0,0,.25)" />
 
+                </a-input>
 
+            </a-form-item>
 
+            <a-form-item>
 
+                <a-button type="primary" :block="true" html-type="submit">
 
+                    Log in
 
+                </a-button>
 
+            </a-form-item>
 
+        </a-form>
 
+        <footer>
 
+            Copyright © 2020 - {{ thisYear }} 0xJacky
 
+        </footer>
 
+    </div>
 
+
 
+</template>
 
+
 
+<script>
 
+export default {
 
+    name: 'Login',
 
+    data() {
 
+        return {
 
+            form: {},
 
+            thisYear: new Date().getFullYear()
 
+        }
 
+    },
 
+    created() {
 
+        if (this.$store.state.user.token) {
 
+            this.$router.push('/')
 
+        }
 
+        this.form = this.$form.createForm(this)
 
+    },
 
+    methods: {
 
+        handleSubmit(e) {
 
+            e.preventDefault()
 
+            this.form.validateFields((err, values) => {
 
+                if (!err) {
 
+                    this.$api.auth.login(values.name, values.password).then(async () => {
 
+                        await this.$message.success('登录成功', 1)
 
+                        const next = this.$route.query.next ? this.$route.query.next : '/'
 
+                        await this.$router.push(next)
 
+                    }).catch(r => {
 
+                        console.log(r)
 
+                        this.$message.error(r.message)
 
+                    })
 
+                }
 
+            })
 
+        },
 
+    },
 
+};
 
+</script>
 
+<style lang="less">
 
+.project-title {
 
+    margin: 50px;
 
+
 
+    h1 {
 
+        font-size: 50px;
 
+        font-weight: 100;
 
+        text-align: center;
 
+    }
 
+}
 
+
 
+.login-form {
 
+    max-width: 500px;
 
+    margin: 0 auto;
 
+}
 
+
 
+.login-form-button {
 
+
 
+}
 
+
 
+footer {
 
+    padding: 30px;
 
+    text-align: center;
 
+}
 
+</style>

+ 1 - 1
nginx-ui-frontend/version.json
Ver ficheiro 

@@ -1 +1 @@
 
-{"version":"0.1.0","build_id":9}
 
+{"version":"0.1.0","build_id":16}

+ 14 - 479
nginx-ui-frontend/yarn.lock
Ver ficheiro 

@@ -22,106 +22,6 @@
 
   resolved "https://registry.yarnpkg.com/@ant-design/icons/-/icons-2.1.1.tgz#7b9c08dffd4f5d41db667d9dbe5e0107d0bd9a4a"
 
   integrity sha512-jCH+k2Vjlno4YWl6g535nHR09PwCEmTBKAG6VqF+rhkrSPRLfgpU2maagwbZPLjaHuU5Jd1DFQ2KJpQuI6uG8w==
 
 
-"@antv/adjust@~0.1.0":
 
-  version "0.1.1"
 
-  resolved "https://registry.yarnpkg.com/@antv/adjust/-/adjust-0.1.1.tgz#e263ab0e1a1941a648842fc086cf65a7e3b75e98"
 
-  integrity sha512-9FaMOyBlM4AgoRL0b5o0VhEKAYkexBNUrxV8XmpHU/9NBPJONBOB/NZUlQDqxtLItrt91tCfbAuMQmF529UX2Q==
 
-  dependencies:
 
-    "@antv/util" "~1.3.1"
 
-
 
-"@antv/attr@~0.1.2":
 
-  version "0.1.2"
 
-  resolved "https://registry.yarnpkg.com/@antv/attr/-/attr-0.1.2.tgz#2eeb122fcaaf851a2d8749abc7c60519d3f77e37"
 
-  integrity sha512-QXjP+T2I+pJQcwZx1oCA4tipG43vgeCeKcGGKahlcxb71OBAzjJZm1QbF4frKXcnOqRkxVXtCr70X9TRair3Ew==
 
-  dependencies:
 
-    "@antv/util" "~1.3.1"
 
-
 
-"@antv/component@~0.3.3":
 
-  version "0.3.9"
 
-  resolved "https://registry.yarnpkg.com/@antv/component/-/component-0.3.9.tgz#ed561c639b7738ce03ff63a866f59e251de82a17"
 
-  integrity sha512-Knh/Nq0S8UkTfZj4SL7XizagTfXYqjFAYIqFtOmUaKpRMgccUi7p1oA7fJdNPGktkndljy6fUmCWocEeBXRS2g==
 
-  dependencies:
 
-    "@antv/attr" "~0.1.2"
 
-    "@antv/g" "~3.3.5"
 
-    "@antv/util" "~1.3.1"
 
-    wolfy87-eventemitter "~5.1.0"
 
-
 
-"@antv/coord@~0.1.0":
 
-  version "0.1.0"
 
-  resolved "https://registry.yarnpkg.com/@antv/coord/-/coord-0.1.0.tgz#48a80ae36d07552f96657e7f8095227c63f0c0a9"
 
-  integrity sha512-W1R8h3Jfb3AfMBVfCreFPMVetgEYuwHBIGn0+d3EgYXe2ckOF8XWjkpGF1fZhOMHREMr+Gt27NGiQh8yBdLUgg==
 
-  dependencies:
 
-    "@antv/util" "~1.3.1"
 
-
 
-"@antv/g2-brush@^0.0.2":
 
-  version "0.0.2"
 
-  resolved "https://registry.yarnpkg.com/@antv/g2-brush/-/g2-brush-0.0.2.tgz#0b65f3ebbf82690202913d0b6759ab2900faa841"
 
-  integrity sha512-7O9szwem19nmEgReXhFB8kVLRaz8J5MHvrzDSDY36YaBOaHSWRGHnvYt2KkkPqgWtHtLY1srssk4X/UmP5govA==
 
-
 
-"@antv/g2-plugin-slider@^2.1.0":
 
-  version "2.1.1"
 
-  resolved "https://registry.yarnpkg.com/@antv/g2-plugin-slider/-/g2-plugin-slider-2.1.1.tgz#c20c5f1cf085bea478f8ab1fc84837e45c46a065"
 
-  integrity sha512-nB678VEGG3FkrvkDDFADAKjLQIeXzITEYqey5oeOpbf0vT5jOa55lQDyJDZ79cK8PmU/Hz6VPeSb3CNQBA+/FQ==
 
-
 
-"@antv/g2@~3.5.3":
 
-  version "3.5.17"
 
-  resolved "https://registry.yarnpkg.com/@antv/g2/-/g2-3.5.17.tgz#02c8bac610d21d28b4e23600bc76c48e7f59c919"
 
-  integrity sha512-gOjfA6pwXYEC5mrLbvg1kA3jZI5J5T2kQeGse+iBBsNc1Vje7zs9G+BleUaI4MLXSnqwhsj/ohfkP7d+h4ArNg==
 
-  dependencies:
 
-    "@antv/adjust" "~0.1.0"
 
-    "@antv/attr" "~0.1.2"
 
-    "@antv/component" "~0.3.3"
 
-    "@antv/coord" "~0.1.0"
 
-    "@antv/g" "~3.4.10"
 
-    "@antv/scale" "~0.1.1"
 
-    "@antv/util" "~1.3.1"
 
-    venn.js "~0.2.20"
 
-    wolfy87-eventemitter "~5.1.0"
 
-
 
-"@antv/g@~3.3.5":
 
-  version "3.3.6"
 
-  resolved "https://registry.yarnpkg.com/@antv/g/-/g-3.3.6.tgz#11fed9ddc9ed4e5a2aa244b7c8abb982a003f201"
 
-  integrity sha512-2GtyTz++s0BbN6s0ZL2/nrqGYCkd52pVoNH92YkrTdTOvpO6Z4DNoo6jGVgZdPX6Nzwli6yduC8MinVAhE8X6g==
 
-  dependencies:
 
-    "@antv/gl-matrix" "~2.7.1"
 
-    "@antv/util" "~1.3.1"
 
-    d3-ease "~1.0.3"
 
-    d3-interpolate "~1.1.5"
 
-    d3-timer "~1.0.6"
 
-    wolfy87-eventemitter "~5.1.0"
 
-
 
-"@antv/g@~3.4.10":
 
-  version "3.4.10"
 
-  resolved "https://registry.yarnpkg.com/@antv/g/-/g-3.4.10.tgz#e7b616aa21b17ac51850d033332a5af8de8fe015"
 
-  integrity sha512-pKy/L1SyRBsXuujdkggqrdBA0/ciAgHiArYBdIJsxHRxCneUP01wGwHdGfDayh2+S0gcSBHynjhoEahsaZaLkw==
 
-  dependencies:
 
-    "@antv/gl-matrix" "~2.7.1"
 
-    "@antv/util" "~1.3.1"
 
-    d3-ease "~1.0.3"
 
-    d3-interpolate "~1.1.5"
 
-    d3-timer "~1.0.6"
 
-    detect-browser "^5.1.0"
 
-
 
-"@antv/gl-matrix@^2.7.1", "@antv/gl-matrix@~2.7.1":
 
-  version "2.7.1"
 
-  resolved "https://registry.yarnpkg.com/@antv/gl-matrix/-/gl-matrix-2.7.1.tgz#acb8e37f7ab3df01345aba4372d7942be42eba14"
 
-  integrity sha512-oOWcVNlpELIKi9x+Mm1Vwbz8pXfkbJKykoCIOJ/dNK79hSIANbpXJ5d3Rra9/wZqK6MC961B7sybFhPlLraT3Q==
 
-
 
-"@antv/scale@~0.1.1":
 
-  version "0.1.5"
 
-  resolved "https://registry.yarnpkg.com/@antv/scale/-/scale-0.1.5.tgz#243266e8b9047cf64b2fdfc40f9834cf0846496e"
 
-  integrity sha512-7RAu4iH5+Hk21h6+aBMiDTfmLf4IibK2SWjx/+E4f4AXRpqucO+8u7IbZdFkakAWxvqhJtN3oePJuTKqOMcmlg==
 
-  dependencies:
 
-    "@antv/util" "~1.3.1"
 
-    fecha "~2.3.3"
 
-
 
-"@antv/util@~1.3.1":
 
-  version "1.3.1"
 
-  resolved "https://registry.yarnpkg.com/@antv/util/-/util-1.3.1.tgz#30a34b201ff9126ec0d58c72c8166a9c3e644ccd"
 
-  integrity sha512-cbUta0hIJrKEaW3eKoGarz3Ita+9qUPF2YzTj8A6wds/nNiy20G26ztIWHU+5ThLc13B1n5Ik52LbaCaeg9enA==
 
-  dependencies:
 
-    "@antv/gl-matrix" "^2.7.1"
 
-
 
 "@babel/code-frame@^7.0.0", "@babel/code-frame@^7.12.13":
 
   version "7.12.13"
 
   resolved "https://registry.npm.taobao.org/@babel/code-frame/download/@babel/code-frame-7.12.13.tgz?cache=0&sync_timestamp=1612314620252&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40babel%2Fcode-frame%2Fdownload%2F%40babel%2Fcode-frame-7.12.13.tgz#dcfc826beef65e75c50e21d3837d7d95798dd658"
 
@@ -1091,11 +991,6 @@
 
   dependencies:
 
     "@types/node" "*"
 
 
-"@types/d3-format@*":
 
-  version "2.0.0"
 
-  resolved "https://registry.yarnpkg.com/@types/d3-format/-/d3-format-2.0.0.tgz#607d261cb268f0a027f100575491031539a40ee6"
 
-  integrity sha512-uagdkftxnGkO4pZw5jEYOM5ZnZOEsh7z8j11Qxk85UkB2RzfUUxRl7R9VvvJZHwKn8l+x+rpS77Nusq7FkFmIg==
 
-
 
 "@types/express-serve-static-core@*", "@types/express-serve-static-core@^4.17.18":
 
   version "4.17.18"
 
   resolved "https://registry.npm.taobao.org/@types/express-serve-static-core/download/@types/express-serve-static-core-4.17.18.tgz?cache=0&sync_timestamp=1613378403459&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40types%2Fexpress-serve-static-core%2Fdownload%2F%40types%2Fexpress-serve-static-core-4.17.18.tgz#8371e260f40e0e1ca0c116a9afcd9426fa094c40"
 
@@ -1135,11 +1030,6 @@
 
   resolved "https://registry.npm.taobao.org/@types/json-schema/download/@types/json-schema-7.0.7.tgz?cache=0&sync_timestamp=1613378919536&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40types%2Fjson-schema%2Fdownload%2F%40types%2Fjson-schema-7.0.7.tgz#98a993516c859eb0d5c4c8f098317a9ea68db9ad"
 
   integrity sha1-mKmTUWyFnrDVxMjwmDF6nqaNua0=
 
 
-"@types/lodash@*":
 
-  version "4.14.168"
 
-  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.168.tgz#fe24632e79b7ade3f132891afff86caa5e5ce008"
 
-  integrity sha512-oVfRvqHV/V6D1yifJbVRU3TMp8OT6o6BG+U9MkwuJ3U8/CsDHvalRpsxBqivn71ztOFZBTfJMvETbqHiaNSj7Q==
 
-
 
 "@types/mime@^1":
 
   version "1.3.2"
 
   resolved "https://registry.npm.taobao.org/@types/mime/download/@types/mime-1.3.2.tgz?cache=0&sync_timestamp=1613379359648&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40types%2Fmime%2Fdownload%2F%40types%2Fmime-1.3.2.tgz#93e25bf9ee75fe0fd80b594bc4feb0e862111b5a"
 
@@ -1160,11 +1050,6 @@
 
   resolved "https://registry.npm.taobao.org/@types/node/download/@types/node-14.14.32.tgz?cache=0&sync_timestamp=1615136913533&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40types%2Fnode%2Fdownload%2F%40types%2Fnode-14.14.32.tgz#90c5c4a8d72bbbfe53033f122341343249183448"
 
   integrity sha1-kMXEqNcru/5TAz8SI0E0MkkYNEg=
 
 
-"@types/node@^8.0.53":
 
-  version "8.10.66"
 
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-8.10.66.tgz#dd035d409df322acc83dff62a602f12a5783bbb3"
 
-  integrity sha512-tktOkFUA4kXx2hhhrB8bIFb5TbwzS4uOhKEmwiD+NoiL0qtP2OQ9mFldbgD4dV1djrlBYP6eBuQZiWjuHUpqFw==
 
-
 
 "@types/normalize-package-data@^2.4.0":
 
   version "2.4.0"
 
   resolved "https://registry.npm.taobao.org/@types/normalize-package-data/download/@types/normalize-package-data-2.4.0.tgz?cache=0&sync_timestamp=1613379363960&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40types%2Fnormalize-package-data%2Fdownload%2F%40types%2Fnormalize-package-data-2.4.0.tgz#e486d0d97396d79beedd0a6e33f4534ff6b4973e"
 
@@ -1736,25 +1621,11 @@ ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.3, ajv@^6.12.4:
 
     json-schema-traverse "^0.4.1"
 
     uri-js "^4.2.2"
 
 
-align-text@^0.1.1, align-text@^0.1.3:
 
-  version "0.1.4"
 
-  resolved "https://registry.yarnpkg.com/align-text/-/align-text-0.1.4.tgz#0cd90a561093f35d0a99256c22b7069433fad117"
 
-  integrity sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=
 
-  dependencies:
 
-    kind-of "^3.0.2"
 
-    longest "^1.0.1"
 
-    repeat-string "^1.5.2"
 
-
 
 alphanum-sort@^1.0.0:
 
   version "1.0.2"
 
   resolved "https://registry.npm.taobao.org/alphanum-sort/download/alphanum-sort-1.0.2.tgz#97a1119649b211ad33691d9f9f486a8ec9fbe0a3"
 
   integrity sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM=
 
 
-amdefine@>=0.0.4:
 
-  version "1.0.1"
 
-  resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5"
 
-  integrity sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=
 
-
 
 ansi-colors@^3.0.0:
 
   version "3.2.4"
 
   resolved "https://registry.npm.taobao.org/ansi-colors/download/ansi-colors-3.2.4.tgz#e3a3da4bfbae6c86a9c285625de124a234026fbf"
 
@@ -1792,11 +1663,6 @@ ansi-regex@^5.0.0:
 
   resolved "https://registry.npm.taobao.org/ansi-regex/download/ansi-regex-5.0.0.tgz#388539f55179bf39339c81af30a654d69f87cb75"
 
   integrity sha1-OIU59VF5vzkznIGvMKZU1p+Hy3U=
 
 
-ansi-styles@^2.2.1:
 
-  version "2.2.1"
 
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
 
-  integrity sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=
 
-
 
 ansi-styles@^3.2.0, ansi-styles@^3.2.1:
 
   version "3.2.1"
 
   resolved "https://registry.npm.taobao.org/ansi-styles/download/ansi-styles-3.2.1.tgz?cache=0&sync_timestamp=1611325747047&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fansi-styles%2Fdownload%2Fansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
 
@@ -2497,11 +2363,6 @@ camel-case@3.0.x:
 
     no-case "^2.2.0"
 
     upper-case "^1.1.1"
 
 
-camelcase@^1.0.2:
 
-  version "1.2.1"
 
-  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-1.2.1.tgz#9bb5304d2e0b56698b2c758b08a3eaa9daa58a39"
 
-  integrity sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=
 
-
 
 camelcase@^5.0.0, camelcase@^5.3.1:
 
   version "5.3.1"
 
   resolved "https://registry.npm.taobao.org/camelcase/download/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
 
@@ -2537,25 +2398,6 @@ caseless@~0.12.0:
 
   resolved "https://registry.npm.taobao.org/caseless/download/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
 
   integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=
 
 
-center-align@^0.1.1:
 
-  version "0.1.3"
 
-  resolved "https://registry.yarnpkg.com/center-align/-/center-align-0.1.3.tgz#aa0d32629b6ee972200411cbd4461c907bc2b7ad"
 
-  integrity sha1-qg0yYptu6XIgBBHL1EYckHvCt60=
 
-  dependencies:
 
-    align-text "^0.1.3"
 
-    lazy-cache "^1.0.3"
 
-
 
-chalk@^1.1.1:
 
-  version "1.1.3"
 
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
 
-  integrity sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=
 
-  dependencies:
 
-    ansi-styles "^2.2.1"
 
-    escape-string-regexp "^1.0.2"
 
-    has-ansi "^2.0.0"
 
-    strip-ansi "^3.0.0"
 
-    supports-color "^2.0.0"
 
-
 
 chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.0, chalk@^2.4.1, chalk@^2.4.2:
 
   version "2.4.2"
 
   resolved "https://registry.npm.taobao.org/chalk/download/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
 
@@ -2737,15 +2579,6 @@ clipboardy@^2.3.0:
 
     execa "^1.0.0"
 
     is-wsl "^2.1.1"
 
 
-cliui@^2.1.0:
 
-  version "2.1.0"
 
-  resolved "https://registry.yarnpkg.com/cliui/-/cliui-2.1.0.tgz#4b475760ff80264c762c3a1719032e91c7fea0d1"
 
-  integrity sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=
 
-  dependencies:
 
-    center-align "^0.1.1"
 
-    right-align "^0.1.1"
 
-    wordwrap "0.0.2"
 
-
 
 cliui@^5.0.0:
 
   version "5.0.0"
 
   resolved "https://registry.npm.taobao.org/cliui/download/cliui-5.0.0.tgz?cache=0&sync_timestamp=1604880033053&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcliui%2Fdownload%2Fcliui-5.0.0.tgz#deefcfdb2e800784aa34f46fa08e06851c7bbbc5"
 
@@ -2958,11 +2791,6 @@ content-type@~1.0.4:
 
   resolved "https://registry.npm.taobao.org/content-type/download/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b"
 
   integrity sha1-4TjMdeBAxyexlm/l5fjJruJW/js=
 
 
-contour_plot@^0.0.1:
 
-  version "0.0.1"
 
-  resolved "https://registry.yarnpkg.com/contour_plot/-/contour_plot-0.0.1.tgz#475870f032b8e338412aa5fc507880f0bf495c77"
 
-  integrity sha1-R1hw8DK44zhBKqX8UHiA8L9JXHc=
 
-
 
 convert-source-map@^1.7.0:
 
   version "1.7.0"
 
   resolved "https://registry.npm.taobao.org/convert-source-map/download/convert-source-map-1.7.0.tgz#17a2cb882d7f77d3490585e2ce6c524424a3a442"
 
@@ -3285,62 +3113,6 @@ cyclist@^1.0.1:
 
   resolved "https://registry.npm.taobao.org/cyclist/download/cyclist-1.0.1.tgz#596e9698fd0c80e12038c2b82d6eb1b35b6224d9"
 
   integrity sha1-WW6WmP0MgOEgOMK4LW6xs1tiJNk=
 
 
-d3-color@1:
 
-  version "1.4.1"
 
-  resolved "https://registry.yarnpkg.com/d3-color/-/d3-color-1.4.1.tgz#c52002bf8846ada4424d55d97982fef26eb3bc8a"
 
-  integrity sha512-p2sTHSLCJI2QKunbGb7ocOh7DgTAn8IrLx21QRc/BSnodXM4sv6aLQlnfpvehFMLZEfBc6g9pH9SWQccFYfJ9Q==
 
-
 
-d3-dispatch@1:
 
-  version "1.0.6"
 
-  resolved "https://registry.yarnpkg.com/d3-dispatch/-/d3-dispatch-1.0.6.tgz#00d37bcee4dd8cd97729dd893a0ac29caaba5d58"
 
-  integrity sha512-fVjoElzjhCEy+Hbn8KygnmMS7Or0a9sI2UzGwoB7cCtvI1XpVN9GpoYlnb3xt2YV66oXYb1fLJ8GMvP4hdU1RA==
 
-
 
-d3-ease@1, d3-ease@~1.0.3:
 
-  version "1.0.7"
 
-  resolved "https://registry.yarnpkg.com/d3-ease/-/d3-ease-1.0.7.tgz#9a834890ef8b8ae8c558b2fe55bd57f5993b85e2"
 
-  integrity sha512-lx14ZPYkhNx0s/2HX5sLFUI3mbasHjSSpwO/KaaNACweVwxUruKyWVcb293wMv1RqTPZyZ8kSZ2NogUZNcLOFQ==
 
-
 
-d3-format@^1.3.0:
 
-  version "1.4.5"
 
-  resolved "https://registry.yarnpkg.com/d3-format/-/d3-format-1.4.5.tgz#374f2ba1320e3717eb74a9356c67daee17a7edb4"
 
-  integrity sha512-J0piedu6Z8iB6TbIGfZgDzfXxUFN3qQRMofy2oPdXzQibYGqPB/9iMcxr/TGalU+2RsyDO+U4f33id8tbnSRMQ==
 
-
 
-d3-interpolate@1:
 
-  version "1.4.0"
 
-  resolved "https://registry.yarnpkg.com/d3-interpolate/-/d3-interpolate-1.4.0.tgz#526e79e2d80daa383f9e0c1c1c7dcc0f0583e987"
 
-  integrity sha512-V9znK0zc3jOPV4VD2zZn0sDhZU3WAE2bmlxdIwwQPPzPjvyLkd8B3JUVdS1IDUFDkWZ72c9qnv1GK2ZagTZ8EA==
 
-  dependencies:
 
-    d3-color "1"
 
-
 
-d3-interpolate@~1.1.5:
 
-  version "1.1.6"
 
-  resolved "https://registry.yarnpkg.com/d3-interpolate/-/d3-interpolate-1.1.6.tgz#2cf395ae2381804df08aa1bf766b7f97b5f68fb6"
 
-  integrity sha512-mOnv5a+pZzkNIHtw/V6I+w9Lqm9L5bG3OTXPM5A+QO0yyVMQ4W1uZhR+VOJmazaOZXri2ppbiZ5BUNWT0pFM9A==
 
-  dependencies:
 
-    d3-color "1"
 
-
 
-d3-selection@^1.0.2, d3-selection@^1.1.0:
 
-  version "1.4.2"
 
-  resolved "https://registry.yarnpkg.com/d3-selection/-/d3-selection-1.4.2.tgz#dcaa49522c0dbf32d6c1858afc26b6094555bc5c"
 
-  integrity sha512-SJ0BqYihzOjDnnlfyeHT0e30k0K1+5sR3d5fNueCNeuhZTnGw4M4o8mqJchSwgKMXCNFo+e2VTChiSJ0vYtXkg==
 
-
 
-d3-timer@1, d3-timer@~1.0.6:
 
-  version "1.0.10"
 
-  resolved "https://registry.yarnpkg.com/d3-timer/-/d3-timer-1.0.10.tgz#dfe76b8a91748831b13b6d9c793ffbd508dd9de5"
 
-  integrity sha512-B1JDm0XDaQC+uvo4DT79H0XmBskgS3l6Ve+1SBCfxgmtIb1AVrPIoqd+nPSv+loMX8szQ0sVUhGngL7D5QPiXw==
 
-
 
-d3-transition@^1.0.1:
 
-  version "1.3.2"
 
-  resolved "https://registry.yarnpkg.com/d3-transition/-/d3-transition-1.3.2.tgz#a98ef2151be8d8600543434c1ca80140ae23b398"
 
-  integrity sha512-sc0gRU4PFqZ47lPVHloMn9tlPcv8jxgOQg+0zjhfZXMQuvppjG6YuwdMBE0TuqCZjeJkLecku/l9R0JPcRhaDA==
 
-  dependencies:
 
-    d3-color "1"
 
-    d3-dispatch "1"
 
-    d3-ease "1"
 
-    d3-interpolate "1"
 
-    d3-selection "^1.1.0"
 
-    d3-timer "1"
 
-
 
 dashdash@^1.12.0:
 
   version "1.14.1"
 
   resolved "https://registry.npm.taobao.org/dashdash/download/dashdash-1.14.1.tgz?cache=0&sync_timestamp=1601073454623&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdashdash%2Fdownload%2Fdashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"
 
@@ -3374,7 +3146,7 @@ debug@^4.0.1, debug@^4.1.0, debug@^4.1.1:
 
   dependencies:
 
     ms "2.1.2"
 
 
-decamelize@^1.0.0, decamelize@^1.2.0:
 
+decamelize@^1.2.0:
 
   version "1.2.0"
 
   resolved "https://registry.npm.taobao.org/decamelize/download/decamelize-1.2.0.tgz?cache=0&sync_timestamp=1610348702723&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdecamelize%2Fdownload%2Fdecamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
 
   integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=
 
@@ -3384,7 +3156,7 @@ decode-uri-component@^0.2.0:
 
   resolved "https://registry.npm.taobao.org/decode-uri-component/download/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
 
   integrity sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=
 
 
-deep-equal@^1.0.1, deep-equal@~1.1.1:
 
+deep-equal@^1.0.1:
 
   version "1.1.1"
 
   resolved "https://registry.npm.taobao.org/deep-equal/download/deep-equal-1.1.1.tgz#b5c98c942ceffaf7cb051e24e1434a25a2e6076a"
 
   integrity sha1-tcmMlCzv+vfLBR4k4UNKJaLmB2o=
 
@@ -3462,11 +3234,6 @@ define-property@^2.0.2:
 
     is-descriptor "^1.0.2"
 
     isobject "^3.0.1"
 
 
-defined@~1.0.0:
 
-  version "1.0.0"
 
-  resolved "https://registry.yarnpkg.com/defined/-/defined-1.0.0.tgz#c98d9bcef75674188e110969151199e39b1fa693"
 
-  integrity sha1-yY2bzvdWdBiOEQlpFRGZ45sfppM=
 
-
 
 del@^4.1.1:
 
   version "4.1.1"
 
   resolved "https://registry.npm.taobao.org/del/download/del-4.1.1.tgz?cache=0&sync_timestamp=1612519684117&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdel%2Fdownload%2Fdel-4.1.1.tgz#9e8f117222ea44a31ff3a156c049b99052a9f0b4"
 
@@ -3503,11 +3270,6 @@ destroy@~1.0.4:
 
   resolved "https://registry.npm.taobao.org/destroy/download/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80"
 
   integrity sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=
 
 
-detect-browser@^5.1.0:
 
-  version "5.2.0"
 
-  resolved "https://registry.yarnpkg.com/detect-browser/-/detect-browser-5.2.0.tgz#c9cd5afa96a6a19fda0bbe9e9be48a6b6e1e9c97"
 
-  integrity sha512-tr7XntDAu50BVENgQfajMLzacmSe34D+qZc4zjnniz0ZVuw/TZcLcyxHQjYpJTM36sGEkZZlYLnIM1hH7alTMA==
 
-
 
 detect-node@^2.0.4:
 
   version "2.0.4"
 
   resolved "https://registry.npm.taobao.org/detect-node/download/detect-node-2.0.4.tgz#014ee8f8f669c5c58023da64b8179c083a28c46c"
 
@@ -3640,13 +3402,6 @@ dotenv@^8.2.0:
 
   resolved "https://registry.npm.taobao.org/dotenv/download/dotenv-8.2.0.tgz#97e619259ada750eea3e4ea3e26bceea5424b16a"
 
   integrity sha1-l+YZJZradQ7qPk6j4mvO6lQksWo=
 
 
-dotignore@~0.1.2:
 
-  version "0.1.2"
 
-  resolved "https://registry.yarnpkg.com/dotignore/-/dotignore-0.1.2.tgz#f942f2200d28c3a76fbdd6f0ee9f3257c8a2e905"
 
-  integrity sha512-UGGGWfSauusaVJC+8fgV+NVvBXkCTmVv7sk6nojDZZvuOUNGUy0Zk4UpHQD6EDjS0jpBwcACvH4eofvyzBcRDw==
 
-  dependencies:
 
-    minimatch "^3.0.4"
 
-
 
 duplexer@^0.1.1:
 
   version "0.1.2"
 
   resolved "https://registry.npm.taobao.org/duplexer/download/duplexer-0.1.2.tgz#3abe43aef3835f8ae077d136ddce0f276b0400e6"
 
@@ -3821,7 +3576,7 @@ escape-html@~1.0.3:
 
   resolved "https://registry.npm.taobao.org/escape-html/download/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
 
   integrity sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=
 
 
-escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
 
+escape-string-regexp@^1.0.5:
 
   version "1.0.5"
 
   resolved "https://registry.npm.taobao.org/escape-string-regexp/download/escape-string-regexp-1.0.5.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fescape-string-regexp%2Fdownload%2Fescape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
 
   integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
 
@@ -4173,11 +3928,6 @@ faye-websocket@^0.11.3:
 
   dependencies:
 
     websocket-driver ">=0.5.1"
 
 
-fecha@~2.3.3:
 
-  version "2.3.3"
 
-  resolved "https://registry.yarnpkg.com/fecha/-/fecha-2.3.3.tgz#948e74157df1a32fd1b12c3a3c3cdcb6ec9d96cd"
 
-  integrity sha512-lUGBnIamTAwk4znq5BcqsDaxSmZ9nDVJaij6NvRt/Tg4R69gERA+otPKbS86ROw9nxVMw2/mp1fnaiWqbs6Sdg==
 
-
 
 figgy-pudding@^3.5.1:
 
   version "3.5.2"
 
   resolved "https://registry.npm.taobao.org/figgy-pudding/download/figgy-pudding-3.5.2.tgz#b4eee8148abb01dcf1d1ac34367d59e12fa61d6e"
 
@@ -4322,29 +4072,11 @@ flush-write-stream@^1.0.0:
 
     inherits "^2.0.3"
 
     readable-stream "^2.3.6"
 
 
-fmin@0.0.2:
 
-  version "0.0.2"
 
-  resolved "https://registry.yarnpkg.com/fmin/-/fmin-0.0.2.tgz#59bbb40d43ffdc1c94cd00a568c41f95f1973017"
 
-  integrity sha1-Wbu0DUP/3ByUzQClaMQflfGXMBc=
 
-  dependencies:
 
-    contour_plot "^0.0.1"
 
-    json2module "^0.0.3"
 
-    rollup "^0.25.8"
 
-    tape "^4.5.1"
 
-    uglify-js "^2.6.2"
 
-
 
 follow-redirects@^1.0.0, follow-redirects@^1.10.0:
 
   version "1.13.3"
 
   resolved "https://registry.npm.taobao.org/follow-redirects/download/follow-redirects-1.13.3.tgz#e5598ad50174c1bc4e872301e82ac2cd97f90267"
 
   integrity sha1-5VmK1QF0wbxOhyMB6CrCzZf5Amc=
 
 
-for-each@~0.3.3:
 
-  version "0.3.3"
 
-  resolved "https://registry.yarnpkg.com/for-each/-/for-each-0.3.3.tgz#69b447e88a0a5d32c3e7084f3f1710034b21376e"
 
-  integrity sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==
 
-  dependencies:
 
-    is-callable "^1.1.3"
 
-
 
 for-in@^1.0.2:
 
   version "1.0.2"
 
   resolved "https://registry.npm.taobao.org/for-in/download/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
 
@@ -4433,7 +4165,7 @@ fsevents@~2.3.1:
 
   resolved "https://registry.npm.taobao.org/fsevents/download/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a"
 
   integrity sha1-ilJveLj99GI7cJ4Ll1xSwkwC/Ro=
 
 
-function-bind@^1.1.1, function-bind@~1.1.1:
 
+function-bind@^1.1.1:
 
   version "1.1.1"
 
   resolved "https://registry.npm.taobao.org/function-bind/download/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
 
   integrity sha1-pWiZ0+o8m6uHS7l3O3xe3pL0iV0=
 
@@ -4513,7 +4245,7 @@ glob-to-regexp@^0.3.0:
 
   resolved "https://registry.npm.taobao.org/glob-to-regexp/download/glob-to-regexp-0.3.0.tgz#8c5a1494d2066c570cc3bfe4496175acc4d502ab"
 
   integrity sha1-jFoUlNIGbFcMw7/kSWF1rMTVAqs=
 
 
-glob@^7.0.3, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@~7.1.6:
 
+glob@^7.0.3, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4:
 
   version "7.1.6"
 
   resolved "https://registry.npm.taobao.org/glob/download/glob-7.1.6.tgz?cache=0&sync_timestamp=1599054256752&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fglob%2Fdownload%2Fglob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6"
 
   integrity sha1-FB8zuBp8JJLhJVlDB0gMRmeSeKY=
 
@@ -4605,13 +4337,6 @@ har-validator@~5.1.3:
 
     ajv "^6.12.3"
 
     har-schema "^2.0.0"
 
 
-has-ansi@^2.0.0:
 
-  version "2.0.0"
 
-  resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91"
 
-  integrity sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=
 
-  dependencies:
 
-    ansi-regex "^2.0.0"
 
-
 
 has-bigints@^1.0.0:
 
   version "1.0.0"
 
   resolved "https://registry.npm.taobao.org/has-bigints/download/has-bigints-1.0.0.tgz#d9b2100824195e39a0c343c127f389d66a5e27dc"
 
@@ -4663,7 +4388,7 @@ has-values@^1.0.0:
 
     is-number "^3.0.0"
 
     kind-of "^4.0.0"
 
 
-has@^1.0.0, has@^1.0.3, has@~1.0.3:
 
+has@^1.0.0, has@^1.0.3:
 
   version "1.0.3"
 
   resolved "https://registry.npm.taobao.org/has/download/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796"
 
   integrity sha1-ci18v8H2qoJB8W3YFOAR4fQeh5Y=
 
@@ -5005,7 +4730,7 @@ inflight@^1.0.4:
 
     once "^1.3.0"
 
     wrappy "1"
 
 
-inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.1, inherits@~2.0.3, inherits@~2.0.4:
 
+inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.1, inherits@~2.0.3:
 
   version "2.0.4"
 
   resolved "https://registry.npm.taobao.org/inherits/download/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
 
   integrity sha1-D6LGT5MpF8NDOg3tVTY6rjdBa3w=
 
@@ -5139,7 +4864,7 @@ is-buffer@^1.1.5:
 
   resolved "https://registry.npm.taobao.org/is-buffer/download/is-buffer-1.1.6.tgz?cache=0&sync_timestamp=1604429452232&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fis-buffer%2Fdownload%2Fis-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
 
   integrity sha1-76ouqdqg16suoTqXsritUf776L4=
 
 
-is-callable@^1.1.3, is-callable@^1.1.4, is-callable@^1.2.3:
 
+is-callable@^1.1.4, is-callable@^1.2.3:
 
   version "1.2.3"
 
   resolved "https://registry.npm.taobao.org/is-callable/download/is-callable-1.2.3.tgz?cache=0&sync_timestamp=1612132911724&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fis-callable%2Fdownload%2Fis-callable-1.2.3.tgz#8b1e0500b73a1d76c70487636f368e519de8db8e"
 
   integrity sha1-ix4FALc6HXbHBIdjbzaOUZ3o244=
 
@@ -5329,13 +5054,6 @@ is-regex@^1.0.4, is-regex@^1.1.2:
 
     call-bind "^1.0.2"
 
     has-symbols "^1.0.1"
 
 
-is-regex@~1.0.5:
 
-  version "1.0.5"
 
-  resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.5.tgz#39d589a358bf18967f726967120b8fc1aed74eae"
 
-  integrity sha512-vlKW17SNq44owv5AQR3Cq0bQPEb8+kF3UKZ2fiZNOWtztYE5i0CzCZxFDwO58qAOWtxdBRVO/V5Qin1wjCqFYQ==
 
-  dependencies:
 
-    has "^1.0.3"
 
-
 
 is-resolvable@^1.0.0:
 
   version "1.1.0"
 
   resolved "https://registry.npm.taobao.org/is-resolvable/download/is-resolvable-1.1.0.tgz#fb18f87ce1feb925169c9a407c19318a3206ed88"
 
@@ -5512,13 +5230,6 @@ json-stringify-safe@~5.0.1:
 
   resolved "https://registry.npm.taobao.org/json-stringify-safe/download/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
 
   integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=
 
 
-json2module@^0.0.3:
 
-  version "0.0.3"
 
-  resolved "https://registry.yarnpkg.com/json2module/-/json2module-0.0.3.tgz#00fb5f4a9b7adfc3f0647c29cb17bcd1979be9b2"
 
-  integrity sha1-APtfSpt638PwZHwpyxe80Zeb6bI=
 
-  dependencies:
 
-    rw "^1.3.2"
 
-
 
 json2mq@^0.2.0:
 
   version "0.2.0"
 
   resolved "https://registry.yarnpkg.com/json2mq/-/json2mq-0.2.0.tgz#b637bd3ba9eabe122c83e9720483aeb10d2c904a"
 
@@ -5611,11 +5322,6 @@ launch-editor@^2.2.1:
 
     chalk "^2.3.0"
 
     shell-quote "^1.6.1"
 
 
-lazy-cache@^1.0.3:
 
-  version "1.0.4"
 
-  resolved "https://registry.yarnpkg.com/lazy-cache/-/lazy-cache-1.0.4.tgz#a1d78fc3a50474cb80845d3b3b6e1da49a446e8e"
 
-  integrity sha1-odePw6UEdMuAhF07O24dpJpEbo4=
 
-
 
 less-loader@^5.0.0:
 
   version "5.0.0"
 
   resolved "https://registry.yarnpkg.com/less-loader/-/less-loader-5.0.0.tgz#498dde3a6c6c4f887458ee9ed3f086a12ad1b466"
 
@@ -5750,7 +5456,7 @@ lodash.uniq@^4.5.0:
 
   resolved "https://registry.npm.taobao.org/lodash.uniq/download/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
 
   integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=
 
 
-lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.17.5:
 
+lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.3, lodash@^4.17.5:
 
   version "4.17.21"
 
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
 
   integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
 
@@ -5767,11 +5473,6 @@ loglevel@^1.6.8:
 
   resolved "https://registry.npm.taobao.org/loglevel/download/loglevel-1.7.1.tgz#005fde2f5e6e47068f935ff28573e125ef72f197"
 
   integrity sha1-AF/eL15uRwaPk1/yhXPhJe9y8Zc=
 
 
-longest@^1.0.1:
 
-  version "1.0.1"
 
-  resolved "https://registry.yarnpkg.com/longest/-/longest-1.0.1.tgz#30a0b2da38f73770e8294a0d22e6625ed77d0097"
 
-  integrity sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=
 
-
 
 loose-envify@^1.0.0:
 
   version "1.4.0"
 
   resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf"
 
@@ -5987,7 +5688,7 @@ minimatch@^3.0.4:
 
   dependencies:
 
     brace-expansion "^1.1.7"
 
 
-minimist@^1.2.0, minimist@^1.2.5, minimist@~1.2.5:
 
+minimist@^1.2.0, minimist@^1.2.5:
 
   version "1.2.5"
 
   resolved "https://registry.npm.taobao.org/minimist/download/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
 
   integrity sha1-Z9ZgFLZqaoqqDAg8X9WN9OTpdgI=
 
@@ -6051,11 +5752,6 @@ mkdirp@^0.5.1, mkdirp@^0.5.3, mkdirp@^0.5.5, mkdirp@~0.5.1:
 
   dependencies:
 
     minimist "^1.2.5"
 
 
-moment-duration-format@^2.3.2:
 
-  version "2.3.2"
 
-  resolved "https://registry.yarnpkg.com/moment-duration-format/-/moment-duration-format-2.3.2.tgz#5fa2b19b941b8d277122ff3f87a12895ec0d6212"
 
-  integrity sha512-cBMXjSW+fjOb4tyaVHuaVE/A5TqkukDWiOfxxAjY+PEqmmBQlLwn+8OzwPiG3brouXKY5Un4pBjAeB6UToXHaQ==
 
-
 
 moment@^2.10.2, moment@^2.21.0, moment@^2.24.0:
 
   version "2.29.1"
 
   resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.1.tgz#b2be769fa31940be9eeea6469c075e35006fa3d3"
 
@@ -6346,11 +6042,6 @@ object-inspect@^1.9.0:
 
   resolved "https://registry.npm.taobao.org/object-inspect/download/object-inspect-1.9.0.tgz#c90521d74e1127b67266ded3394ad6116986533a"
 
   integrity sha1-yQUh104RJ7ZyZt7TOUrWEWmGUzo=
 
 
-object-inspect@~1.7.0:
 
-  version "1.7.0"
 
-  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.7.0.tgz#f4f6bd181ad77f006b5ece60bd0b6f398ff74a67"
 
-  integrity sha512-a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw==
 
-
 
 object-is@^1.0.1:
 
   version "1.1.5"
 
   resolved "https://registry.npm.taobao.org/object-is/download/object-is-1.1.5.tgz?cache=0&sync_timestamp=1613857698573&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fobject-is%2Fdownload%2Fobject-is-1.1.5.tgz#b9deeaa5fc7f1846a0faecdceec138e5778f53ac"
 
@@ -7482,7 +7173,7 @@ repeat-element@^1.1.2:
 
   resolved "https://registry.npm.taobao.org/repeat-element/download/repeat-element-1.1.3.tgz#782e0d825c0c5a3bb39731f84efee6b742e6b1ce"
 
   integrity sha1-eC4NglwMWjuzlzH4Tv7mt0Lmsc4=
 
 
-repeat-string@^1.5.2, repeat-string@^1.6.1:
 
+repeat-string@^1.6.1:
 
   version "1.6.1"
 
   resolved "https://registry.npm.taobao.org/repeat-string/download/repeat-string-1.6.1.tgz?cache=0&sync_timestamp=1589682793094&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Frepeat-string%2Fdownload%2Frepeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
 
   integrity sha1-jcrkcOHIirwtYA//Sndihtp15jc=
 
@@ -7563,13 +7254,6 @@ resolve@^1.10.0, resolve@^1.12.0, resolve@^1.14.2:
 
     is-core-module "^2.2.0"
 
     path-parse "^1.0.6"
 
 
-resolve@~1.17.0:
 
-  version "1.17.0"
 
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.17.0.tgz#b25941b54968231cc2d1bb76a79cb7f2c0bf8444"
 
-  integrity sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==
 
-  dependencies:
 
-    path-parse "^1.0.6"
 
-
 
 restore-cursor@^2.0.0:
 
   version "2.0.0"
 
   resolved "https://registry.npm.taobao.org/restore-cursor/download/restore-cursor-2.0.0.tgz#9f7ee287f82fd326d4fd162923d62129eee0dfaf"
 
@@ -7586,13 +7270,6 @@ restore-cursor@^3.1.0:
 
     onetime "^5.1.0"
 
     signal-exit "^3.0.2"
 
 
-resumer@~0.0.0:
 
-  version "0.0.0"
 
-  resolved "https://registry.yarnpkg.com/resumer/-/resumer-0.0.0.tgz#f1e8f461e4064ba39e82af3cdc2a8c893d076759"
 
-  integrity sha1-8ej0YeQGS6Oegq883CqMiT0HZ1k=
 
-  dependencies:
 
-    through "~2.3.4"
 
-
 
 ret@~0.1.10:
 
   version "0.1.15"
 
   resolved "https://registry.npm.taobao.org/ret/download/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"
 
@@ -7613,13 +7290,6 @@ rgba-regex@^1.0.0:
 
   resolved "https://registry.npm.taobao.org/rgba-regex/download/rgba-regex-1.0.0.tgz#43374e2e2ca0968b0ef1523460b7d730ff22eeb3"
 
   integrity sha1-QzdOLiyglosO8VI0YLfXMP8i7rM=
 
 
-right-align@^0.1.1:
 
-  version "0.1.3"
 
-  resolved "https://registry.yarnpkg.com/right-align/-/right-align-0.1.3.tgz#61339b722fe6a3515689210d24e14c96148613ef"
 
-  integrity sha1-YTObci/mo1FWiSENJOFMlhSGE+8=
 
-  dependencies:
 
-    align-text "^0.1.1"
 
-
 
 rimraf@2.6.3:
 
   version "2.6.3"
 
   resolved "https://registry.npm.taobao.org/rimraf/download/rimraf-2.6.3.tgz?cache=0&sync_timestamp=1589682814592&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Frimraf%2Fdownload%2Frimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab"
 
@@ -7642,15 +7312,6 @@ ripemd160@^2.0.0, ripemd160@^2.0.1:
 
     hash-base "^3.0.0"
 
     inherits "^2.0.1"
 
 
-rollup@^0.25.8:
 
-  version "0.25.8"
 
-  resolved "https://registry.yarnpkg.com/rollup/-/rollup-0.25.8.tgz#bf6ce83b87510d163446eeaa577ed6a6fc5835e0"
 
-  integrity sha1-v2zoO4dRDRY0Ru6qV37WpvxYNeA=
 
-  dependencies:
 
-    chalk "^1.1.1"
 
-    minimist "^1.2.0"
 
-    source-map-support "^0.3.2"
 
-
 
 run-async@^2.4.0:
 
   version "2.4.1"
 
   resolved "https://registry.npm.taobao.org/run-async/download/run-async-2.4.1.tgz#8440eccf99ea3e70bd409d49aab88e10c189a455"
 
@@ -7663,11 +7324,6 @@ run-queue@^1.0.0, run-queue@^1.0.3:
 
   dependencies:
 
     aproba "^1.1.1"
 
 
-rw@^1.3.2:
 
-  version "1.3.3"
 
-  resolved "https://registry.yarnpkg.com/rw/-/rw-1.3.3.tgz#3f862dfa91ab766b14885ef4d01124bfda074fb4"
 
-  integrity sha1-P4Yt+pGrdmsUiF700BEkv9oHT7Q=
 
-
 
 rxjs@^6.6.0:
 
   version "6.6.6"
 
   resolved "https://registry.npm.taobao.org/rxjs/download/rxjs-6.6.6.tgz?cache=0&sync_timestamp=1614458618256&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Frxjs%2Fdownload%2Frxjs-6.6.6.tgz#14d8417aa5a07c5e633995b525e1e3c0dec03b70"
 
@@ -7978,13 +7634,6 @@ source-map-resolve@^0.5.0:
 
     source-map-url "^0.4.0"
 
     urix "^0.1.0"
 
 
-source-map-support@^0.3.2:
 
-  version "0.3.3"
 
-  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.3.3.tgz#34900977d5ba3f07c7757ee72e73bb1a9b53754f"
 
-  integrity sha1-NJAJd9W6PwfHdX7nLnO7GptTdU8=
 
-  dependencies:
 
-    source-map "0.1.32"
 
-
 
 source-map-support@~0.5.12:
 
   version "0.5.19"
 
   resolved "https://registry.npm.taobao.org/source-map-support/download/source-map-support-0.5.19.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsource-map-support%2Fdownload%2Fsource-map-support-0.5.19.tgz#a98b62f86dcaf4f67399648c085291ab9e8fed61"
 
@@ -7998,14 +7647,7 @@ source-map-url@^0.4.0:
 
   resolved "https://registry.npm.taobao.org/source-map-url/download/source-map-url-0.4.1.tgz#0af66605a745a5a2f91cf1bbf8a7afbc283dec56"
 
   integrity sha1-CvZmBadFpaL5HPG7+KevvCg97FY=
 
 
-source-map@0.1.32:
 
-  version "0.1.32"
 
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.1.32.tgz#c8b6c167797ba4740a8ea33252162ff08591b266"
 
-  integrity sha1-yLbBZ3l7pHQKjqMyUhYv8IWRsmY=
 
-  dependencies:
 
-    amdefine ">=0.0.4"
 
-
 
-source-map@^0.5.0, source-map@^0.5.6, source-map@~0.5.1:
 
+source-map@^0.5.0, source-map@^0.5.6:
 
   version "0.5.7"
 
   resolved "https://registry.npm.taobao.org/source-map/download/source-map-0.5.7.tgz?cache=0&sync_timestamp=1589682764497&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsource-map%2Fdownload%2Fsource-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
 
   integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=
 
@@ -8202,15 +7844,6 @@ string-width@^4.1.0, string-width@^4.2.0:
 
     is-fullwidth-code-point "^3.0.0"
 
     strip-ansi "^6.0.0"
 
 
-string.prototype.trim@~1.2.1:
 
-  version "1.2.4"
 
-  resolved "https://registry.yarnpkg.com/string.prototype.trim/-/string.prototype.trim-1.2.4.tgz#6014689baf5efaf106ad031a5fa45157666ed1bd"
 
-  integrity sha512-hWCk/iqf7lp0/AgTF7/ddO1IWtSNPASjlzCicV5irAVdE1grjsneK26YG6xACMBEdCvO8fUST0UzDMh/2Qy+9Q==
 
-  dependencies:
 
-    call-bind "^1.0.2"
 
-    define-properties "^1.1.3"
 
-    es-abstract "^1.18.0-next.2"
 
-
 
 string.prototype.trimend@^1.0.4:
 
   version "1.0.4"
 
   resolved "https://registry.npm.taobao.org/string.prototype.trimend/download/string.prototype.trimend-1.0.4.tgz?cache=0&sync_timestamp=1614127461586&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fstring.prototype.trimend%2Fdownload%2Fstring.prototype.trimend-1.0.4.tgz#e75ae90c2942c63504686c18b287b4a0b1a45f80"
 
@@ -8298,11 +7931,6 @@ stylehacks@^4.0.0:
 
     postcss "^7.0.0"
 
     postcss-selector-parser "^3.0.0"
 
 
-supports-color@^2.0.0:
 
-  version "2.0.0"
 
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
 
-  integrity sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=
 
-
 
 supports-color@^5.3.0:
 
   version "5.5.0"
 
   resolved "https://registry.npm.taobao.org/supports-color/download/supports-color-5.5.0.tgz?cache=0&sync_timestamp=1611394878204&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsupports-color%2Fdownload%2Fsupports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
 
@@ -8363,27 +7991,6 @@ tapable@^1.0.0, tapable@^1.1.3:
 
   resolved "https://registry.npm.taobao.org/tapable/download/tapable-1.1.3.tgz#a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2"
 
   integrity sha1-ofzMBrWNth/XpF2i2kT186Pme6I=
 
 
-tape@^4.5.1:
 
-  version "4.13.3"
 
-  resolved "https://registry.yarnpkg.com/tape/-/tape-4.13.3.tgz#51b3d91c83668c7a45b1a594b607dee0a0b46278"
 
-  integrity sha512-0/Y20PwRIUkQcTCSi4AASs+OANZZwqPKaipGCEwp10dQMipVvSZwUUCi01Y/OklIGyHKFhIcjock+DKnBfLAFw==
 
-  dependencies:
 
-    deep-equal "~1.1.1"
 
-    defined "~1.0.0"
 
-    dotignore "~0.1.2"
 
-    for-each "~0.3.3"
 
-    function-bind "~1.1.1"
 
-    glob "~7.1.6"
 
-    has "~1.0.3"
 
-    inherits "~2.0.4"
 
-    is-regex "~1.0.5"
 
-    minimist "~1.2.5"
 
-    object-inspect "~1.7.0"
 
-    resolve "~1.17.0"
 
-    resumer "~0.0.0"
 
-    string.prototype.trim "~1.2.1"
 
-    through "~2.3.8"
 
-
 
 terser-webpack-plugin@^1.4.3:
 
   version "1.4.5"
 
   resolved "https://registry.npm.taobao.org/terser-webpack-plugin/download/terser-webpack-plugin-1.4.5.tgz?cache=0&sync_timestamp=1610196021147&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fterser-webpack-plugin%2Fdownload%2Fterser-webpack-plugin-1.4.5.tgz#a217aefaea330e734ffacb6120ec1fa312d6040b"
 
@@ -8459,7 +8066,7 @@ through2@^2.0.0:
 
     readable-stream "~2.3.6"
 
     xtend "~4.0.1"
 
 
-through@^2.3.6, through@~2.3.4, through@~2.3.8:
 
+through@^2.3.6:
 
   version "2.3.8"
 
   resolved "https://registry.npm.taobao.org/through/download/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
 
   integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=
 
@@ -8628,21 +8235,6 @@ uglify-js@3.4.x:
 
     commander "~2.19.0"
 
     source-map "~0.6.1"
 
 
-uglify-js@^2.6.2:
 
-  version "2.8.29"
 
-  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.29.tgz#29c5733148057bb4e1f75df35b7a9cb72e6a59dd"
 
-  integrity sha1-KcVzMUgFe7Th913zW3qcty5qWd0=
 
-  dependencies:
 
-    source-map "~0.5.1"
 
-    yargs "~3.10.0"
 
-  optionalDependencies:
 
-    uglify-to-browserify "~1.0.0"
 
-
 
-uglify-to-browserify@~1.0.0:
 
-  version "1.0.2"
 
-  resolved "https://registry.yarnpkg.com/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz#6e0924d6bda6b5afe349e39a6d632850a0f882b7"
 
-  integrity sha1-bgkk1r2mta/jSeOabWMoUKD4grc=
 
-
 
 unbox-primitive@^1.0.0:
 
   version "1.0.0"
 
   resolved "https://registry.npm.taobao.org/unbox-primitive/download/unbox-primitive-1.0.0.tgz#eeacbc4affa28e9b3d36b5eaeccc50b3251b1d3f"
 
@@ -8860,15 +8452,6 @@ vendors@^1.0.0:
 
   resolved "https://registry.npm.taobao.org/vendors/download/vendors-1.0.4.tgz?cache=0&sync_timestamp=1615203486079&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fvendors%2Fdownload%2Fvendors-1.0.4.tgz#e2b800a53e7a29b93506c3cf41100d16c4c4ad8e"
 
   integrity sha1-4rgApT56Kbk1BsPPQRANFsTErY4=
 
 
-venn.js@~0.2.20:
 
-  version "0.2.20"
 
-  resolved "https://registry.yarnpkg.com/venn.js/-/venn.js-0.2.20.tgz#3f0e50cc75cba1f58692a8a32f67bd7aaf1aa6fa"
 
-  integrity sha512-bb5SYq/wamY9fvcuErb9a0FJkgIFHJjkLZWonQ+DoKKuDX3WPH2B4ouI1ce4K2iejBklQy6r1ly8nOGIyOCO6w==
 
-  dependencies:
 
-    d3-selection "^1.0.2"
 
-    d3-transition "^1.0.1"
 
-    fmin "0.0.2"
 
-
 
 verror@1.10.0:
 
   version "1.10.0"
 
   resolved "https://registry.npm.taobao.org/verror/download/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400"
 
@@ -8878,29 +8461,6 @@ verror@1.10.0:
 
     core-util-is "1.0.2"
 
     extsprintf "^1.2.0"
 
 
-viser-vue@^2.4.8:
 
-  version "2.4.8"
 
-  resolved "https://registry.yarnpkg.com/viser-vue/-/viser-vue-2.4.8.tgz#3fdb058445cba59c1ccee9cc9c2024bec29926d4"
 
-  integrity sha512-ERAREN+6k/ywrwT+swcMo4CDIAq6dBjnB0+lhmsSfaip06BGHSBfNKg6yl7/4GJ9Nk2kioUw3llNhEboJuIKmQ==
 
-  dependencies:
 
-    "@types/node" "*"
 
-    viser "^2.0.0"
 
-    vue "^2.5.3"
 
-
 
-viser@^2.0.0:
 
-  version "2.4.9"
 
-  resolved "https://registry.yarnpkg.com/viser/-/viser-2.4.9.tgz#57f4c70f5702fb80e38843f29025cea575cbc60a"
 
-  integrity sha512-DKsqtMa3TZYQHEZ7jp4kpNp1Iqomda7d+3IkkIjIdKQvfL8OeksXfy/ECZUY1hTrGoOe7cq85+6PMS+MPn4mgQ==
 
-  dependencies:
 
-    "@antv/g2" "~3.5.3"
 
-    "@antv/g2-brush" "^0.0.2"
 
-    "@antv/g2-plugin-slider" "^2.1.0"
 
-    "@types/d3-format" "*"
 
-    "@types/lodash" "*"
 
-    "@types/node" "^8.0.53"
 
-    d3-format "^1.3.0"
 
-    lodash "^4.17.4"
 
-
 
 vm-browserify@^1.0.1:
 
   version "1.1.2"
 
   resolved "https://registry.npm.taobao.org/vm-browserify/download/vm-browserify-1.1.2.tgz#78641c488b8e6ca91a75f511e7a3b32a86e5dda0"
 
@@ -8991,7 +8551,7 @@ vue-template-es2015-compiler@^1.9.0:
 
   resolved "https://registry.npm.taobao.org/vue-template-es2015-compiler/download/vue-template-es2015-compiler-1.9.1.tgz#1ee3bc9a16ecbf5118be334bb15f9c46f82f5825"
 
   integrity sha1-HuO8mhbsv1EYvjNLsV+cRvgvWCU=
 
 
-vue@^2.5.3, vue@^2.6.11:
 
+vue@^2.6.11:
 
   version "2.6.12"
 
   resolved "https://registry.npm.taobao.org/vue/download/vue-2.6.12.tgz?cache=0&sync_timestamp=1614614707443&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fvue%2Fdownload%2Fvue-2.6.12.tgz#f5ebd4fa6bd2869403e29a896aed4904456c9123"
 
   integrity sha1-9evU+mvShpQD4pqJau1JBEVskSM=
 
@@ -9221,26 +8781,11 @@ which@^2.0.1:
 
   dependencies:
 
     isexe "^2.0.0"
 
 
-window-size@0.1.0:
 
-  version "0.1.0"
 
-  resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.0.tgz#5438cd2ea93b202efa3a19fe8887aee7c94f9c9d"
 
-  integrity sha1-VDjNLqk7IC76Ohn+iIeu58lPnJ0=
 
-
 
-wolfy87-eventemitter@~5.1.0:
 
-  version "5.1.0"
 
-  resolved "https://registry.yarnpkg.com/wolfy87-eventemitter/-/wolfy87-eventemitter-5.1.0.tgz#35c1ac0dd1ac0c15e35d981508fc22084a13a011"
 
-  integrity sha1-NcGsDdGsDBXjXZgVCPwiCEoToBE=
 
-
 
 word-wrap@~1.2.3:
 
   version "1.2.3"
 
   resolved "https://registry.npm.taobao.org/word-wrap/download/word-wrap-1.2.3.tgz?cache=0&sync_timestamp=1589683603678&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fword-wrap%2Fdownload%2Fword-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"
 
   integrity sha1-YQY29rH3A4kb00dxzLF/uTtHB5w=
 
 
-wordwrap@0.0.2:
 
-  version "0.0.2"
 
-  resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.2.tgz#b79669bb42ecb409f83d583cad52ca17eaa1643f"
 
-  integrity sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8=
 
-
 
 worker-farm@^1.7.0:
 
   version "1.7.0"
 
   resolved "https://registry.npm.taobao.org/worker-farm/download/worker-farm-1.7.0.tgz#26a94c5391bbca926152002f69b84a4bf772e5a8"
 
@@ -9366,16 +8911,6 @@ yargs@^16.0.0:
 
     y18n "^5.0.5"
 
     yargs-parser "^20.2.2"
 
 
-yargs@~3.10.0:
 
-  version "3.10.0"
 
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-3.10.0.tgz#f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1"
 
-  integrity sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=
 
-  dependencies:
 
-    camelcase "^1.0.2"
 
-    cliui "^2.1.0"
 
-    decamelize "^1.0.0"
 
-    window-size "0.1.0"
 
-
 
 yorkie@^2.0.0:
 
   version "2.0.0"
 
   resolved "https://registry.npm.taobao.org/yorkie/download/yorkie-2.0.0.tgz#92411912d435214e12c51c2ae1093e54b6bb83d9"

+ 0 - 9
server/api/analytic.go
Ver ficheiro 

@@ -3,7 +3,6 @@ package api
 
 import (
 
     "encoding/json"
 
     "fmt"
 
-    "github.com/0xJacky/Nginx-UI/settings"
 
     "github.com/0xJacky/Nginx-UI/tool"
 
     "github.com/dustin/go-humanize"
 
     "github.com/gin-gonic/gin"
 
@@ -24,14 +23,6 @@ var upGrader = websocket.Upgrader{
 
 }
 
 
 func Analytic(c *gin.Context) {
 
-    token := c.Query("token")
 
-    if token != settings.ServerSettings.WebSocketToken {
 
-        c.JSON(http.StatusForbidden, gin.H{
 
-            "message": "auth fail",
 
-        })
 
-        return
 
-    }
 
-
 
     // upgrade http to websocket
 
     ws, err := upGrader.Upgrade(c.Writer, c.Request, nil)
 
     if err != nil {

+ 62 - 0
server/api/auth.go
Ver ficheiro 

@@ -0,0 +1,62 @@
 
+package api
 
+
 
+import (
 
+    "crypto/md5"
 
+    "fmt"
 
+    "github.com/0xJacky/Nginx-UI/model"
 
+    "github.com/gin-gonic/gin"
 
+    "log"
 
+    "net/http"
 
+)
 
+
 
+type LoginUser struct {
 
+    Name     string `json:"name"`
 
+    Password string `json:"password"`
 
+}
 
+
 
+func Login(c *gin.Context) {
 
+    var user LoginUser
 
+    err := c.BindJSON(&user)
 
+    if err != nil {
 
+        log.Println(err)
 
+    }
 
+    var u model.Auth
 
+    u, err = model.GetUser(user.Name)
 
+    if err != nil {
 
+        log.Println(err)
 
+    }
 
+    data := []byte(user.Password)
 
+    has := md5.Sum(data)
 
+    md5str := fmt.Sprintf("%x", has) // 将[]byte转成16进制
 
+    if u.Password != md5str {
 
+        c.JSON(http.StatusForbidden, gin.H{
 
+            "message": "Incorrect name or password",
 
+        })
 
+        return
 
+    }
 
+    var token string
 
+    token, err = model.GenerateJWT(u.Name)
 
+    if err != nil {
 
+        c.JSON(http.StatusInternalServerError, gin.H{
 
+            "message": err.Error(),
 
+        })
 
+        return
 
+    }
 
+
 
+    c.JSON(http.StatusOK, gin.H{
 
+        "message": "ok",
 
+        "token": token,
 
+    })
 
+}
 
+
 
+func Logout(c *gin.Context) {
 
+    token := c.GetHeader("Authorization")
 
+    err := model.DeleteToken(token)
 
+    if err != nil {
 
+        c.JSON(http.StatusInternalServerError, gin.H{
 
+            "message": err.Error(),
 
+        })
 
+        return
 
+    }
 
+    c.JSON(http.StatusNoContent, gin.H{})
 
+}

+ 143 - 0
server/api/cert.go
Ver ficheiro 

@@ -0,0 +1,143 @@
 
+package api
 
+
 
+import (
 
+    "bytes"
 
+    "encoding/json"
 
+    "github.com/0xJacky/Nginx-UI/tool"
 
+    "github.com/gin-gonic/gin"
 
+    "log"
 
+    "os"
 
+    "os/exec"
 
+)
 
+
 
+func IssueCert(c *gin.Context)  {
 
+    domain := c.Param("domain")
 
+
 
+    // upgrade http to websocket
 
+    ws, err := upGrader.Upgrade(c.Writer, c.Request, nil)
 
+    if err != nil {
 
+        return
 
+    }
 
+
 
+    defer ws.Close()
 
+
 
+    for {
 
+        // read
 
+        mt, message, err := ws.ReadMessage()
 
+        if err != nil {
 
+            break
 
+        }
 
+        if string(message) == "ping" {
 
+            var m []byte
 
+            cmdOutput := bytes.NewBuffer(nil)
 
+            cmd := exec.Command("bash",  "/usr/local/acme.sh/acme.sh",
 
+                "--issue",
 
+                "-d", domain,
 
+                "--nginx", "--force", "--log")
 
+
 
+            cmd.Stdout = cmdOutput
 
+            cmd.Stderr = cmdOutput
 
+
 
+            err := cmd.Run()
 
+
 
+            if err != nil {
 
+                log.Println(err)
 
+                m, err = json.Marshal(gin.H{
 
+                    "status": "error",
 
+                    "message": err.Error(),
 
+                })
 
+
 
+                if err != nil {
 
+                    log.Println(err)
 
+                }
 
+
 
+                err = ws.WriteMessage(mt, m)
 
+
 
+                if err != nil {
 
+                    log.Println(err)
 
+                }
 
+            }
 
+
 
+            m, err = json.Marshal(gin.H{
 
+                "status": "info",
 
+                "message": cmdOutput.String(),
 
+            })
 
+
 
+            if err != nil {
 
+                log.Println(err)
 
+            }
 
+
 
+            err = ws.WriteMessage(mt, m)
 
+
 
+            if err != nil {
 
+                log.Println(err)
 
+            }
 
+
 
+            sslCertificatePath := tool.GetNginxConfPath("ssl/" + domain + "/fullchain.cer")
 
+            _, err = os.Stat(sslCertificatePath)
 
+
 
+            if err != nil {
 
+                log.Println(err)
 
+                return
 
+            }
 
+
 
+            log.Println("[found]", "fullchain.cer")
 
+            m, err = json.Marshal(gin.H{
 
+                "status": "success",
 
+                "message": "[found] fullchain.cer",
 
+            })
 
+
 
+            if err != nil {
 
+                log.Println(err)
 
+            }
 
+
 
+            err = ws.WriteMessage(mt, m)
 
+
 
+            if err != nil {
 
+                log.Println(err)
 
+            }
 
+
 
+            sslCertificateKeyPath := tool.GetNginxConfPath("ssl/" + domain +"/" + domain + ".key")
 
+            _, err = os.Stat(sslCertificateKeyPath)
 
+
 
+            if err != nil {
 
+                log.Println(err)
 
+                return
 
+            }
 
+
 
+            log.Println("[found]", "cert key")
 
+            m, err = json.Marshal(gin.H{
 
+                "status": "success",
 
+                "message": "[found] cert key",
 
+            })
 
+
 
+            if err != nil {
 
+                log.Println(err)
 
+            }
 
+
 
+            err = ws.WriteMessage(mt, m)
 
+
 
+            if err != nil {
 
+                log.Println(err)
 
+            }
 
+
 
+            log.Println("申请成功")
 
+            m, err = json.Marshal(gin.H{
 
+                "status": "success",
 
+                "message": "申请成功",
 
+                "ssl_certificate": sslCertificatePath,
 
+                "ssl_certificate_key": sslCertificateKeyPath,
 
+            })
 
+
 
+            if err != nil {
 
+                log.Println(err)
 
+            }
 
+
 
+            err = ws.WriteMessage(mt, m)
 
+
 
+            if err != nil {
 
+                log.Println(err)
 
+            }
 
+        }
 
+    }
 
+}

+ 2 - 1
server/app.ini
Ver ficheiro 

@@ -1,4 +1,5 @@
 
 [server]
 
 HttpPort = 9000
 
 RunMode = debug
 
-WebSocketToken =
 
+WebSocketToken = f094ec2e-8455-48e1-a5c0-edabe1d79867
 
+JwtSecret = f094ec2e-8455-48e1-a5c0-edabe1d79867

+ 1 - 5
server/go.mod
Ver ficheiro 

@@ -3,17 +3,13 @@ module github.com/0xJacky/Nginx-UI
 
 go 1.15
 
 
 require (
 
+	github.com/appleboy/gin-jwt/v2 v2.6.4
 
 	github.com/dustin/go-humanize v1.0.0
 
-	github.com/gin-contrib/cors v1.3.1
 
 	github.com/gin-gonic/gin v1.6.3
 
 	github.com/gorilla/websocket v1.4.2
 
-	github.com/json-iterator/go v1.1.10 // indirect
 
 	github.com/mackerelio/go-osstat v0.1.0
 
 	github.com/mattn/go-sqlite3 v2.0.3+incompatible // indirect
 
 	github.com/minio/minio v0.0.0-20210316030313-6160188bf32a
 
-	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 
-	github.com/modern-go/reflect2 v1.0.1 // indirect
 
-	github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e // indirect
 
 	github.com/unknwon/com v1.0.1
 
 	golang.org/x/sys v0.0.0-20210217105451-b926d437f341 // indirect
 
 	gopkg.in/ini.v1 v1.62.0

+ 20 - 12
server/go.sum
Ver ficheiro 

@@ -37,6 +37,10 @@ github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRF
 
 github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho=
 
 github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
 
 github.com/apache/thrift v0.13.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
 
+github.com/appleboy/gin-jwt/v2 v2.6.4 h1:4YlMh3AjCFnuIRiL27b7TXns7nLx8tU/TiSgh40RRUI=
 
+github.com/appleboy/gin-jwt/v2 v2.6.4/go.mod h1:CZpq1cRw+kqi0+yD2CwVw7VGXrrx4AqBdeZnwxVmoAs=
 
+github.com/appleboy/gofight/v2 v2.1.2 h1:VOy3jow4vIK8BRQJoC/I9muxyYlJ2yb9ht2hZoS3rf4=
 
+github.com/appleboy/gofight/v2 v2.1.2/go.mod h1:frW+U1QZEdDgixycTj4CygQ48yLTUhplt43+Wczp3rw=
 
 github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o=
 
 github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY=
 
 github.com/armon/go-metrics v0.0.0-20190430140413-ec5e00d3c878/go.mod h1:3AMJUQhVx52RsWOnlkpikZr01T/yAVN2gn0861vByNg=
 
@@ -76,6 +80,7 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs
 
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 
 github.com/dchest/siphash v1.2.1/go.mod h1:q+IRvb2gOSrUnYoPqHiyHXS0FOBBOdl6tONBlVnOnt4=
 
+github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumCAMpl/TFQ4/5kLM=
 
 github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
 
 github.com/djherbis/atime v1.0.0/go.mod h1:5W+KBIuTwVGcqjIfaTwt+KSYX1o6uep8dtevevQP/f8=
 
 github.com/dswarbrick/smart v0.0.0-20190505152634-909a45200d6d/go.mod h1:apXo4PA/BgBPrt66j0N45O2stlBTRowdip2igwcUWVc=
 
@@ -102,11 +107,8 @@ github.com/franela/goreq v0.0.0-20171204163338-bcd34c9993f8/go.mod h1:ZhphrRTfi2
 
 github.com/frankban/quicktest v1.10.2/go.mod h1:K+q6oSqb0W0Ininfk863uOk1lMy69l/P6txr3mVT54s=
 
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
 
 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
 
-github.com/gin-contrib/cors v1.3.1 h1:doAsuITavI4IOcd0Y19U4B+O0dNWihRyX//nn4sEmgA=
 
-github.com/gin-contrib/cors v1.3.1/go.mod h1:jjEJ4268OPZUcU7k9Pm653S7lXUGcqMADzFA61xsmDk=
 
 github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE=
 
 github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI=
 
-github.com/gin-gonic/gin v1.5.0/go.mod h1:Nd6IXA8m5kNZdNEHMBd93KT+mdY3+bewLgRvmCsR2Do=
 
 github.com/gin-gonic/gin v1.6.3 h1:ahKqKTFpO5KTPHxWZjEdPScmYaGtLo8Y4DMHoEsnp14=
 
 github.com/gin-gonic/gin v1.6.3/go.mod h1:75u5sXoLsGZoRN5Sgbi1eraJ4GU3++wFwWzhwvtwp4M=
 
 github.com/go-asn1-ber/asn1-ber v1.5.1/go.mod h1:hEBeB/ic+5LoWskz+yKT7vGhhPYkProFKoKdwZRWMe0=
 
@@ -121,10 +123,8 @@ github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG
 
 github.com/go-ole/go-ole v1.2.4/go.mod h1:XCwSNxSkXRo4vlyPy93sltvi/qJq0jqQhjqQNIwKuxM=
 
 github.com/go-playground/assert/v2 v2.0.1 h1:MsBgLAaY856+nPRTKrp3/OZK38U/wa0CcBYNjji3q3A=
 
 github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
 
-github.com/go-playground/locales v0.12.1/go.mod h1:IUMDtCfWo/w/mtMfIE/IG2K+Ey3ygWanZIBtBW0W2TM=
 
 github.com/go-playground/locales v0.13.0 h1:HyWk6mgj5qFqCT5fjGBuRArbVDfE4hi8+e8ceBS/t7Q=
 
 github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTMfnGwq/HNwmWNS8=
 
-github.com/go-playground/universal-translator v0.16.0/go.mod h1:1AnU7NaIRDWWzGEKwgtJRd2xk99HeFyHw3yid4rvQIY=
 
 github.com/go-playground/universal-translator v0.17.0 h1:icxd5fm+REJzpZx7ZfpaD876Lmtgy7VtROAbHHXk8no=
 
 github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+Scu5vgOQjsIJAF8j9muTVoKLVtA=
 
 github.com/go-playground/validator/v10 v10.2.0 h1:KgJ0snyC2R9VXYN2rneOtQcw5aHQB1Vv0sFl1UcHBOY=
 
@@ -168,6 +168,7 @@ github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMyw
 
 github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 
 github.com/google/go-cmp v0.4.0 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4=
 
 github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 
+github.com/google/go-cmp v0.5.2 h1:X2ev0eStA3AbceY54o37/0PQ/UWqKEiiO2dKL5OPaFM=
 
 github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 
 github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
 
@@ -267,6 +268,7 @@ github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/
 
 github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
 
 github.com/jtolds/gls v4.2.1+incompatible h1:fSuqC+Gmlu6l/ZYAoZzx2pyucC8Xza35fpRVWLVmUEE=
 
 github.com/jtolds/gls v4.2.1+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
 
+github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo=
 
 github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
 
 github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
 
 github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM=
 
@@ -292,8 +294,8 @@ github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfn
 
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 
 github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
 
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 
+github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 
-github.com/leodido/go-urn v1.1.0/go.mod h1:+cyI34gQWZcE1eQU7NVgKkkzdXDQHr1dBMtdAPozLkw=
 
 github.com/leodido/go-urn v1.2.0 h1:hpXL4XnriNwQ/ABnpepYM/1vCLWNDfUNts8dX3xTG6Y=
 
 github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII=
 
 github.com/lib/pq v1.8.0/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
 
@@ -312,7 +314,6 @@ github.com/mattn/go-ieproxy v0.0.1/go.mod h1:pYabZ6IHcRpFh7vIaLfK7rdcWgFEb3SFJ6/
 
 github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
 
 github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
 
 github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
 
-github.com/mattn/go-isatty v0.0.9/go.mod h1:YNRxwqDuOph6SZLI9vUUz6OYw3QyUt7WiY2yME+cCiQ=
 
 github.com/mattn/go-isatty v0.0.10/go.mod h1:qgIWMr58cqv1PHHyhnkY9lrL7etaEgOFcMEpPG5Rm84=
 
 github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE=
 
 github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY=
 
@@ -465,10 +466,12 @@ github.com/sirupsen/logrus v1.8.0/go.mod h1:4GuYW9TZmE769R5STWrRakJc4UqQ3+QQ95fy
 
 github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
 
 github.com/smartystreets/assertions v0.0.0-20190116191733-b6c0e53d7304 h1:Jpy1PXuP99tXNrhbq2BaPz9B+jNAvH1JPQQpG/9GCXY=
 
 github.com/smartystreets/assertions v0.0.0-20190116191733-b6c0e53d7304/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
 
+github.com/smartystreets/assertions v1.1.1 h1:T/YLemO5Yp7KPzS+lVtu+WsHn8yoSwTfItdAd1r3cck=
 
 github.com/smartystreets/assertions v1.1.1/go.mod h1:tcbTF8ujkAEcZ8TElKY+i30BzYlVhC/LOxJk7iOWnoo=
 
 github.com/smartystreets/go-aws-auth v0.0.0-20180515143844-0c1422d1fdb9/go.mod h1:SnhjPscd9TpLiy1LpzGSKh3bXCfxxXuqd9xmQJy3slM=
 
 github.com/smartystreets/goconvey v0.0.0-20181108003508-044398e4856c h1:Ho+uVpkel/udgjbwB5Lktg9BtvJSh2DT0Hi6LPSyI2w=
 
 github.com/smartystreets/goconvey v0.0.0-20181108003508-044398e4856c/go.mod h1:XDJAKZRPZ1CvBcN2aX5YOUTYGHki24fSF0Iv48Ibg0s=
 
+github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIKYqbNC9s=
 
 github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
 
 github.com/smartystreets/gunit v1.4.2/go.mod h1:ZjM1ozSIMJlAz/ay4SG8PeKF00ckUp+zMHZXV9/bvak=
 
 github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM=
 
@@ -487,9 +490,16 @@ github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UV
 
 github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
 
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 
 github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
 
+github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0=
 
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 
+github.com/tidwall/gjson v1.6.0/go.mod h1:P256ACg0Mn+j1RXIDXoss50DeIABTYK1PULOJHhxOls=
 
+github.com/tidwall/gjson v1.6.7 h1:Mb1M9HZCRWEcXQ8ieJo7auYyyiSux6w9XN3AdTpxJrE=
 
 github.com/tidwall/gjson v1.6.7/go.mod h1:zeFuBCIqD4sN/gmqBzZ4j7Jd6UcA2Fc56x7QFsv+8fI=
 
+github.com/tidwall/match v1.0.1/go.mod h1:LujAq0jyVjBy028G1WhWfIzbpQfMO8bBZ6Tyb0+pL9E=
 
+github.com/tidwall/match v1.0.3 h1:FQUVvBImDutD8wJLN6c5eMzWtjgONK9MwIBCOrUJKeE=
 
 github.com/tidwall/match v1.0.3/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM=
 
+github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
 
+github.com/tidwall/pretty v1.0.2 h1:Z7S3cePv9Jwm1KwS0513MRaoUe3S01WPbLNV40pwWZU=
 
 github.com/tidwall/pretty v1.0.2/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
 
 github.com/tidwall/sjson v1.0.4/go.mod h1:bURseu1nuBkFpIES5cz6zBtjmYeOQmEESshn7VpF15Y=
 
 github.com/tinylib/msgp v1.1.3/go.mod h1:+d+yLhGm8mzTaHzB+wgMYrodPfmZrzkirds8fDWklFE=
 
@@ -610,7 +620,6 @@ golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7w
 
 golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 
 golang.org/x/sys v0.0.0-20190523142557-0e01d883c5c5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 
 golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 
-golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 
 golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 
 golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 
 golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 
@@ -667,6 +676,7 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T
 
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
 
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 
+golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
 
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 
 google.golang.org/api v0.3.1/go.mod h1:6wY9I6uQWHQ8EM57III9mq/AjF+i8G65rmVagqKMtkk=
 
 google.golang.org/api v0.5.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE=
 
@@ -705,15 +715,12 @@ gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+
 
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 
-gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU=
 
-gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 
+gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b h1:QRR6H1YWRnHb4Y/HeNFCTJLFVxaq6wH4YuVdsUOr75U=
 
 gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 
 gopkg.in/cheggaaa/pb.v1 v1.0.25/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw=
 
 gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
 
 gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
 
 gopkg.in/gcfg.v1 v1.2.3/go.mod h1:yesOnuUOFQAhST5vPY4nbZsb/huCgGGXlipJsBn0b3o=
 
-gopkg.in/go-playground/assert.v1 v1.2.1/go.mod h1:9RXL0bg/zibRAgZUYszZSwO/z8Y/a8bDuhia5mkpMnE=
 
-gopkg.in/go-playground/validator.v9 v9.29.1/go.mod h1:+c9/zcJMFNgbLvly1L1V+PpxWdVbfP1avr/N00E2vyQ=
 
 gopkg.in/ini.v1 v1.57.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
 
 gopkg.in/ini.v1 v1.62.0 h1:duBzk771uxoUuOlyRLkHsygud9+5lrlGjdFBb4mSKDU=
 
 gopkg.in/ini.v1 v1.62.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
 
@@ -737,6 +744,7 @@ gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 
 gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU=
 
 gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 
+gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 h1:tQIYjPdBoyREyB9XMu+nnTclpTYkz2zFM+lzLJFO4gQ=
 
 gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 
 gorm.io/driver/sqlite v1.1.4 h1:PDzwYE+sI6De2+mxAneV9Xs11+ZyKV6oxD3wDGkaNvM=
 
 gorm.io/driver/sqlite v1.1.4/go.mod h1:mJCeTFr7+crvS+TRnWc5Z3UvwxUN1BGBLMrf5LA9DYw=

+ 63 - 0
server/model/auth.go
Ver ficheiro 

@@ -0,0 +1,63 @@
 
+package model
 
+
 
+import (
 
+    "github.com/0xJacky/Nginx-UI/settings"
 
+    "github.com/dgrijalva/jwt-go"
 
+    "time"
 
+)
 
+
 
+type Auth struct {
 
+    Model
 
+
 
+    Name     string `json:"name"`
 
+    Password string `json:"password"`
 
+}
 
+
 
+type AuthToken struct {
 
+    Token   string `json:"token"`
 
+}
 
+
 
+type JWTClaims struct {
 
+    Name     string `json:"name"`
 
+    jwt.StandardClaims
 
+}
 
+
 
+func GetUser(name string) (user Auth, err error){
 
+    err = db.Where("name = ?", name).First(&user).Error
 
+    if err != nil {
 
+        return Auth{}, err
 
+    }
 
+    return user, err
 
+}
 
+
 
+func DeleteToken(token string) error {
 
+    return db.Where("token = ?", token).Delete(&AuthToken{}).Error
 
+}
 
+
 
+func CheckToken(token string) int64 {
 
+    return db.Where("token = ?", token).Find(&AuthToken{}).RowsAffected
 
+}
 
+
 
+func GenerateJWT(name string) (string, error) {
 
+    claims := JWTClaims{
 
+        Name: name,
 
+        StandardClaims: jwt.StandardClaims{
 
+            ExpiresAt: time.Now().Add(24 * time.Hour).Unix(),
 
+        },
 
+    }
 
+    unsignedToken := jwt.NewWithClaims(jwt.SigningMethodHS256, claims)
 
+    signedToken, err := unsignedToken.SignedString([]byte(settings.ServerSettings.JwtSecret))
 
+    if err != nil {
 
+        return "", err
 
+    }
 
+
 
+    err = db.Create(&AuthToken{
 
+        Token: signedToken,
 
+    }).Error
 
+
 
+    if err != nil {
 
+        return "", err
 
+    }
 
+
 
+    return signedToken, err
 
+}

+ 2 - 0
server/model/models.go
Ver ficheiro 

@@ -23,6 +23,8 @@ func Init() {
 
 
 	// Migrate the schema
 
 	AutoMigrate(&ConfigBackup{})
 
+    AutoMigrate(&Auth{})
 
+    AutoMigrate(&AuthToken{})
 
 }
 
 
 func AutoMigrate(model interface{})  {

+ 40 - 1
server/router/routers.go
Ver ficheiro 

@@ -1,11 +1,44 @@
 
 package router
 
 
 import (
 
+    "encoding/base64"
 
     "github.com/0xJacky/Nginx-UI/api"
 
+    "github.com/0xJacky/Nginx-UI/model"
 
     "github.com/gin-gonic/gin"
 
+    "log"
 
     "net/http"
 
 )
 
 
+func authRequired() gin.HandlerFunc {
 
+    return func(c *gin.Context) {
 
+        token := c.GetHeader("Authorization")
 
+        if token == "" {
 
+            tmp, _ := base64.StdEncoding.DecodeString(c.Query("token"))
 
+            token = string(tmp)
 
+            if token == "" {
 
+                c.JSON(http.StatusForbidden, gin.H{
 
+                    "message": "auth fail",
 
+                })
 
+                c.Abort()
 
+                return
 
+            }
 
+        }
 
+        log.Println(c.Query("token"))
 
+        log.Println(token)
 
+
 
+        n := model.CheckToken(token)
 
+        log.Println(n)
 
+        if n < 1 {
 
+            c.JSON(http.StatusForbidden, gin.H{
 
+                "message": "auth fail",
 
+            })
 
+            c.Abort()
 
+            return
 
+        }
 
+        c.Next()
 
+    }
 
+}
 
+
 
 func InitRouter() *gin.Engine {
 
 	r := gin.New()
 
 	r.Use(gin.Logger())
 
@@ -18,8 +51,12 @@ func InitRouter() *gin.Engine {
 
 		})
 
 	})
 
 
-	endpoint := r.Group("/")
 
+	r.POST("/login", api.Login)
 
+
 
+	endpoint := r.Group("/", authRequired())
 
 	{
 
+        endpoint.DELETE("/logout", api.Logout)
 
+
 
 		endpoint.GET("domains", api.GetDomains)
 
 		endpoint.GET("domain/:name", api.GetDomain)
 
 		endpoint.POST("domain/:name", api.EditDomain)
 
@@ -38,6 +75,8 @@ func InitRouter() *gin.Engine {
 
         endpoint.GET("template/:name", api.GetTemplate)
 
 
         endpoint.GET("analytic", api.Analytic)
 
+
 
+		endpoint.GET("cert/issue/:domain", api.IssueCert)
 
 	}
 
 
 	return r

+ 16 - 15
server/settings/settings.go
Ver ficheiro 

@@ -1,34 +1,35 @@
 
 package settings
 
 
 import (
 
-	"gopkg.in/ini.v1"
 
-	"log"
 
+    "gopkg.in/ini.v1"
 
+    "log"
 
 )
 
 
 var Conf *ini.File
 
 
 type Server struct {
 
-	HttpPort string
 
-	RunMode  string
 
-	WebSocketToken string
 
+    HttpPort       string
 
+    RunMode        string
 
+    WebSocketToken string
 
+    JwtSecret      string
 
 }
 
 
 var ServerSettings = &Server{}
 
 
 func Init() {
 
-	var err error
 
-	Conf, err = ini.Load("app.ini")
 
-	if err != nil {
 
-		log.Fatalf("setting.Setup, fail to parse 'app.ini': %v", err)
 
-	}
 
+    var err error
 
+    Conf, err = ini.Load("app.ini")
 
+    if err != nil {
 
+        log.Fatalf("setting.Setup, fail to parse 'app.ini': %v", err)
 
+    }
 
 
-	mapTo("server", ServerSettings)
 
+    mapTo("server", ServerSettings)
 
 
 }
 
 
 func mapTo(section string, v interface{}) {
 
-	err := Conf.Section(section).MapTo(v)
 
-	if err != nil {
 
-		log.Fatalf("Cfg.MapTo %s err: %v", section, err)
 
-	}
 
+    err := Conf.Section(section).MapTo(v)
 
+    if err != nil {
 
+        log.Fatalf("Cfg.MapTo %s err: %v", section, err)
 
+    }
 
 }

+ 55 - 0
server/test/acme_test.go
Ver ficheiro 

@@ -0,0 +1,55 @@
 
+package test
 
+
 
+import (
 
+    "fmt"
 
+    "github.com/0xJacky/Nginx-UI/tool"
 
+    "io/ioutil"
 
+    "log"
 
+    "os"
 
+    "os/exec"
 
+    "strings"
 
+    "testing"
 
+)
 
+
 
+func TestAcme(t *testing.T) {
 
+    const acmePath = "/usr/local/acme.sh"
 
+    _, err := os.Stat(acmePath)
 
+    log.Println("[found] acme.sh ", acmePath)
 
+    if err != nil {
 
+        log.Println(err)
 
+        if os.IsNotExist(err) {
 
+            log.Println("[not found] acme.sh, installing...")
 
+
 
+            out, err := exec.Command("curl",  "-o", "../tmp/acme.sh", "https://get.acme.sh").
 
+                CombinedOutput()
 
+            if err != nil {
 
+                log.Println(err)
 
+                return
 
+            }
 
+            fmt.Printf("%s\n", out)
 
+
 
+            log.Println("[acme.sh] downloaded")
 
+
 
+            file, _ := ioutil.ReadFile("../tmp/acme.sh")
 
+
 
+            fileString := string(file)
 
+            fileString = strings.Replace(fileString, "https://raw.githubusercontent.com",
 
+                "https://ghproxy.com/https://raw.githubusercontent.com", -1)
 
+
 
+            _ = ioutil.WriteFile("../tmp/acme.sh", []byte(fileString), 0644)
 
+
 
+            out, err = exec.Command("bash",  "../tmp/acme.sh",
 
+                "install",
 
+                "--log",
 
+                "--home", "/usr/local/acme.sh",
 
+                "--cert-home", tool.GetNginxConfPath("ssl")).
 
+                CombinedOutput()
 
+            if err != nil {
 
+                log.Println(err)
 
+                return
 
+            }
 
+            fmt.Printf("%s\n", out)
 
+
 
+        }
 
+    }
 
+}

+ 40 - 0
server/test/cert_test.go
Ver ficheiro 

@@ -0,0 +1,40 @@
 
+package test
 
+
 
+import (
 
+    "fmt"
 
+    "github.com/0xJacky/Nginx-UI/tool"
 
+    "log"
 
+    "os"
 
+    "os/exec"
 
+    "testing"
 
+)
 
+
 
+func TestCert(t *testing.T)  {
 
+    out, err := exec.Command("bash",  "/usr/local/acme.sh/acme.sh",
 
+        "--issue",
 
+        "-d", "test.ojbk.me",
 
+        "--nginx").CombinedOutput()
 
+    if err != nil {
 
+        log.Println(err)
 
+        return
 
+    }
 
+    fmt.Printf("%s\n", out)
 
+
 
+    _, err = os.Stat(tool.GetNginxConfPath("ssl/test.ojbk.me/fullchain.cer"))
 
+
 
+    if err != nil {
 
+        log.Println(err)
 
+        return
 
+    }
 
+    log.Println("[found]", "fullchain.cer")
 
+    _, err = os.Stat(tool.GetNginxConfPath("ssl/test.ojbk.me/test.ojbk.me.key"))
 
+
 
+    if err != nil {
 
+        log.Println(err)
 
+        return
 
+    }
 
+
 
+    log.Println("[found]", "cert key")
 
+
 
+    log.Println("申请成功")
 
+}