form-generator

From 58ab5c93af76755c93fe9f7e23c09ca16bce5b3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=92=8B=E5=90=89=E5=85=86?= <303176530@qq.com> Date: Sun, 8 Sep 2019 20:55:11 +0800 Subject: [PATCH 001/409] Update README.md --- README.md | Bin 2106 -> 2178 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/README.md b/README.md index bc38e8a20c0b2fce2d05ac35390037538708c545..3176b031a87bfb57e757cea042eff96dfd133ff5 100644 GIT binary patch literal 2178 zcmY*aTW=ay5PrAh|FDuDn{4V!oF;EkQ$>~9x~iJIR+hk+$Oad%E%#|L1{TcC^&NvT zzCq)#5cvknV*X2W=Irj1|3c>MY=~oFX?M?DzM1*HIrrWEh&1h)_Xi#?EqWjO`~eC7 zzr$xR6s{Mbe_<;XyV@}iG+wXra({SeWJH3*K9uT^%G%}Q;UNkCcJ7yz=KS)=sSdR)|ZJp@}zSF@UyXzxj*2}W?d#3By3dCwDaq0#y zG@z?fwNTN`s)C(?!}WV3!}Oe}+_A@wP{+jgPKDyLF7_fPVBCI$d{exp{zKTTtuXxn z)G{ws$Q|2+@Zj`f&|gcx5W!Pf^P&k!9bYjrPbnfuvxBKIG9IBLVZ)I@Z=0(-h@2nZ z@WVCCi1k7=4}}ei!Hg>_UYwXhF%NfEQ$>R{9OTE%J|!)Xn) z8-F-VsKC(8m@d_)a{j1FOCwSG6P3eH1(Pb6q_|VIg!}uDKm;-Y$LLe z*W(YfUJ1u-8k^AA8@RDvAJ6X%74G7o74MA{A)1isB)mNB^LaxAU_eyjEm=NwEoZ`k zV8lPO0{>=~{0rU?Xoo1Ici~_FD+MEO$FpWnLr>PdAgj0@?VX{Wm30bbv{i3C-({2YQ->u$NQxMnn?Nxnh7#_D!aHVDCXR|!DVN-n6c9 zgVCPBQ0%U3UGL!Drc~otiCY1R($X|4)=B80JQ5`H(AvO#Xm8<-BK8|sYUDogjn)G} zkC&p@7kgOk+aKgf`FpZN-l(mIi-C5h0O(XB1s3KdzXVzeZxaGcP{|$TMZleN8kc!+ zg%{rg_t0WM@_3gZdxsMcdXM>CX`2QMx{(RyQ f|8Q*ebHX2Wlhi>gTUXcUAe8iRb&wTv4-b6?)xs)W literal 2106 zcmZ8iZ)_8F7=9}Z8LQx8#4tm4Kq8HlwJ3-TJ`7P|asAzTEvuumH`-mV8(W!cdoULF z#~iYyquXL|14YmTnIR#3BEc`}2k=h zC$w1N-pH)7I?y=KIB-sRGHlPLUVJ33Y1g!G<)uNN{Id8)ka{OjF^qaPcjP0;H6Lm? zx~?l5a#}gzi9_zzQK!>V1?=a<%HX|`zuub<%!y8=N|5+etW|1tXqv`3WmBs?qFcX| z^Td71{IR_MQqE~LMCZigaE^VH&+Ltzqb9spws%W z^)tOv|4!@^-q1CTrbothXtPS~!S&-CTd#&Yxj!kg$E#O=>~%(7)LkJ|Xc~2quQ^Aj z)o}>1kh3e36ArmXTpYv~(?H(vfUDTY;iyNioXm#oez#B^A?F{aTp67XGdB)0Cv7yO~jqWx2k>K2a(1fZrDG{aXc(PRrEu5%|f> zl=JCTw&~T9v5zCL@KHZUd7mRVEnrt8Kd-tnh~2@QO;MX%FPuS+E#L@QK9mz(jD4C+qcrt)J>XQ*TOz`JQ^GWWB{l%6 zUT)F!?U+wNO-1=jCm#hWt;HDwL!7E3VBGH$Uq$|I_bQmJ1I@U*3401N;fa@a1UP*m zhHd4v#>3A>VF_ePo27_0*z+K}GH%ZrXxk@6Vs7;^KP2ul_+=FC5_cpgpjXFTJXoR&F_2QP>-$O%Fa4z1Zu^M=oc9&i_$6 z2=OHP#b4c)_pdpHx!u@q&l~J1?FGyiSOh=6oymz7dYz?Ugtv^_;F4D Date: Sun, 8 Sep 2019 23:22:49 +0800 Subject: [PATCH 002/409] =?UTF-8?q?=E5=8A=A8=E6=80=81=E8=B7=AF=E7=94=B1?= =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E5=89=8D=E7=AB=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- QMPlusVuePage/package-lock.json | 5 ++ QMPlusVuePage/package.json | 87 ++++++++++++----------- QMPlusVuePage/src/App.vue | 6 +- QMPlusVuePage/src/main.js | 7 +- QMPlusVuePage/src/permission.js | 26 +++++++ QMPlusVuePage/src/router/index.js | 47 ++++++++++++ QMPlusVuePage/src/utils/_import.js | 3 + QMPlusVuePage/src/utils/asyncRouter.js | 9 +++ QMPlusVuePage/src/view/dashbord/index.vue | 16 +++++ QMPlusVuePage/src/view/error/index.vue | 16 +++++ QMPlusVuePage/src/view/layout/index.vue | 16 +++++ QMPlusVuePage/src/view/login/login.vue | 15 ++++ QMPlusVuePage/src/view/login/regist.vue | 16 +++++ QMPlusVuePage/src/view/test/index.vue | 16 +++++ 14 files changed, 236 insertions(+), 49 deletions(-) create mode 100644 QMPlusVuePage/src/permission.js create mode 100644 QMPlusVuePage/src/router/index.js create mode 100644 QMPlusVuePage/src/utils/_import.js create mode 100644 QMPlusVuePage/src/utils/asyncRouter.js create mode 100644 QMPlusVuePage/src/view/dashbord/index.vue create mode 100644 QMPlusVuePage/src/view/error/index.vue create mode 100644 QMPlusVuePage/src/view/layout/index.vue create mode 100644 QMPlusVuePage/src/view/login/login.vue create mode 100644 QMPlusVuePage/src/view/login/regist.vue create mode 100644 QMPlusVuePage/src/view/test/index.vue diff --git a/QMPlusVuePage/package-lock.json b/QMPlusVuePage/package-lock.json index 966e8a3287..4779043196 100644 --- a/QMPlusVuePage/package-lock.json +++ b/QMPlusVuePage/package-lock.json @@ -10913,6 +10913,11 @@ "vue-style-loader": "^4.1.0" } }, + "vue-router": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.1.3.tgz", + "integrity": "sha512-8iSa4mGNXBjyuSZFCCO4fiKfvzqk+mhL0lnKuGcQtO1eoj8nq3CmbEG8FwK5QqoqwDgsjsf1GDuisDX4cdb/aQ==" + }, "vue-style-loader": { "version": "4.1.2", "resolved": "https://registry.npm.taobao.org/vue-style-loader/download/vue-style-loader-4.1.2.tgz", diff --git a/QMPlusVuePage/package.json b/QMPlusVuePage/package.json index 8f4f33d2b1..560c863d3c 100644 --- a/QMPlusVuePage/package.json +++ b/QMPlusVuePage/package.json @@ -1,46 +1,47 @@ { - "name": "qm-plus-vue-page", - "version": "0.1.0", - "private": true, - "scripts": { - "serve": "vue-cli-service serve", - "build": "vue-cli-service build", - "lint": "vue-cli-service lint" - }, - "dependencies": { - "core-js": "^2.6.5", - "vue": "^2.6.10" - }, - "devDependencies": { - "@vue/cli-plugin-babel": "^3.11.0", - "@vue/cli-plugin-eslint": "^3.11.0", - "@vue/cli-service": "^3.11.0", - "babel-eslint": "^10.0.1", - "eslint": "^5.16.0", - "eslint-plugin-vue": "^5.0.0", - "vue-template-compiler": "^2.6.10" - }, - "eslintConfig": { - "root": true, - "env": { - "node": true + "name": "qm-plus-vue-page", + "version": "0.1.0", + "private": true, + "scripts": { + "serve": "vue-cli-service serve", + "build": "vue-cli-service build", + "lint": "vue-cli-service lint" }, - "extends": [ - "plugin:vue/essential", - "eslint:recommended" - ], - "rules": {}, - "parserOptions": { - "parser": "babel-eslint" - } - }, - "postcss": { - "plugins": { - "autoprefixer": {} - } - }, - "browserslist": [ - "> 1%", - "last 2 versions" - ] + "dependencies": { + "core-js": "^2.6.5", + "vue": "^2.6.10", + "vue-router": "^3.1.3" + }, + "devDependencies": { + "@vue/cli-plugin-babel": "^3.11.0", + "@vue/cli-plugin-eslint": "^3.11.0", + "@vue/cli-service": "^3.11.0", + "babel-eslint": "^10.0.1", + "eslint": "^5.16.0", + "eslint-plugin-vue": "^5.0.0", + "vue-template-compiler": "^2.6.10" + }, + "eslintConfig": { + "root": true, + "env": { + "node": true + }, + "extends": [ + "plugin:vue/essential", + "eslint:recommended" + ], + "rules": {}, + "parserOptions": { + "parser": "babel-eslint" + } + }, + "postcss": { + "plugins": { + "autoprefixer": {} + } + }, + "browserslist": [ + "> 1%", + "last 2 versions" + ] } diff --git a/QMPlusVuePage/src/App.vue b/QMPlusVuePage/src/App.vue index fcc566279a..96cdbcfb1d 100644 --- a/QMPlusVuePage/src/App.vue +++ b/QMPlusVuePage/src/App.vue @@ -1,17 +1,15 @@ diff --git a/QMPlusVuePage/src/main.js b/QMPlusVuePage/src/main.js index 63eb05f711..25161480b7 100644 --- a/QMPlusVuePage/src/main.js +++ b/QMPlusVuePage/src/main.js @@ -1,8 +1,11 @@ import Vue from 'vue' import App from './App.vue' +import router from '@/router/index' + Vue.config.productionTip = false new Vue({ - render: h => h(App), -}).$mount('#app') + render: h => h(App), + router +}).$mount('#app') \ No newline at end of file diff --git a/QMPlusVuePage/src/permission.js b/QMPlusVuePage/src/permission.js new file mode 100644 index 0000000000..2e4a9cff33 --- /dev/null +++ b/QMPlusVuePage/src/permission.js @@ -0,0 +1,26 @@ +import router from './router' +import { asyncRouterHandle } from '@/utils/asyncRouter'; + +router.beforeEach((to, from, next) => { + next() + // asyncRouterHandle(asyncRouter) // 等待动态使用 VUEX持久化会将其放入 vuex并且动态生成左侧列表 + // router.addRoutes(asyncRouter) +}) + +const asyncRouter = [{ + path: '/layout', + name: 'layout', + component: 'view/layout/index.vue', + meta: { + title: '首页', + }, + children: [{ + path: 'dashbord', + name: 'dashbord', + component: 'view/dashbord/index.vue' + }, { + path: "test", + name: "test", + component: "view/test/index.vue" + }] +}] \ No newline at end of file diff --git a/QMPlusVuePage/src/router/index.js b/QMPlusVuePage/src/router/index.js new file mode 100644 index 0000000000..91fe539eca --- /dev/null +++ b/QMPlusVuePage/src/router/index.js @@ -0,0 +1,47 @@ +import Vue from 'vue' +import Router from 'vue-router' + +Vue.use(Router) + +const baseRouters = [{ + path: '/', + redirect: '/login' + }, + { + path: '/login', + name: 'login', + component: () => + import ('@/view/login/login.vue') + }, + { + path: '/regist', + name: 'regist', + component: () => + import ('@/view/login/regist.vue') + }, + { + path: "/error", + name: "error", + component: () => + import ('@/view/error/index.vue') + }, + { + path: '*', + redirect: '/error' + + } +] + +// 需要通过后台数据来生成的组件 + +const createRouter = () => new Router({ + routes: baseRouters +}) + +const router = createRouter() + +export function resetRouter() { + const newRouter = createRouter() + router.matcher = newRouter.matcher +} +export default router \ No newline at end of file diff --git a/QMPlusVuePage/src/utils/_import.js b/QMPlusVuePage/src/utils/_import.js new file mode 100644 index 0000000000..43755d1710 --- /dev/null +++ b/QMPlusVuePage/src/utils/_import.js @@ -0,0 +1,3 @@ +module.exports = file => () => { + return import ('@/' + file) +} \ No newline at end of file diff --git a/QMPlusVuePage/src/utils/asyncRouter.js b/QMPlusVuePage/src/utils/asyncRouter.js new file mode 100644 index 0000000000..fbefeb05f5 --- /dev/null +++ b/QMPlusVuePage/src/utils/asyncRouter.js @@ -0,0 +1,9 @@ +const _import = require('./_import') //获取组件的方法 +export const asyncRouterHandle = (asyncRouter) => { + asyncRouter.map(item => { + item.component = _import(item.component) + if (item.children) { + asyncRouterHandle(item.children) + } + }) +} \ No newline at end of file diff --git a/QMPlusVuePage/src/view/dashbord/index.vue b/QMPlusVuePage/src/view/dashbord/index.vue new file mode 100644 index 0000000000..4a94bda44c --- /dev/null +++ b/QMPlusVuePage/src/view/dashbord/index.vue @@ -0,0 +1,16 @@ + + + + + \ No newline at end of file diff --git a/QMPlusVuePage/src/view/error/index.vue b/QMPlusVuePage/src/view/error/index.vue new file mode 100644 index 0000000000..f2eff74b25 --- /dev/null +++ b/QMPlusVuePage/src/view/error/index.vue @@ -0,0 +1,16 @@ + + + + + \ No newline at end of file diff --git a/QMPlusVuePage/src/view/layout/index.vue b/QMPlusVuePage/src/view/layout/index.vue new file mode 100644 index 0000000000..cd4f27b37e --- /dev/null +++ b/QMPlusVuePage/src/view/layout/index.vue @@ -0,0 +1,16 @@ + + + + + \ No newline at end of file diff --git a/QMPlusVuePage/src/view/login/login.vue b/QMPlusVuePage/src/view/login/login.vue new file mode 100644 index 0000000000..3b99f318fa --- /dev/null +++ b/QMPlusVuePage/src/view/login/login.vue @@ -0,0 +1,15 @@ + + + + + \ No newline at end of file diff --git a/QMPlusVuePage/src/view/login/regist.vue b/QMPlusVuePage/src/view/login/regist.vue new file mode 100644 index 0000000000..7945e4ed70 --- /dev/null +++ b/QMPlusVuePage/src/view/login/regist.vue @@ -0,0 +1,16 @@ + + + + + \ No newline at end of file diff --git a/QMPlusVuePage/src/view/test/index.vue b/QMPlusVuePage/src/view/test/index.vue new file mode 100644 index 0000000000..a856d1570a --- /dev/null +++ b/QMPlusVuePage/src/view/test/index.vue @@ -0,0 +1,16 @@ + + + + + \ No newline at end of file From 72549b49b406b9834f9b12c968566a487d904e26 Mon Sep 17 00:00:00 2001 From: pixelqm <303176530@qq.com> Date: Sun, 8 Sep 2019 23:37:11 +0800 Subject: [PATCH 003/409] =?UTF-8?q?=E5=BC=95=E5=85=A5=20element=E3=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- QMPlusVuePage/package-lock.json | 1107 +++++++++++++++++++----- QMPlusVuePage/package.json | 3 + QMPlusVuePage/src/App.vue | 12 +- QMPlusVuePage/src/main.js | 6 +- QMPlusVuePage/src/style/main.scss | 532 ++++++++++++ QMPlusVuePage/src/view/login/login.vue | 17 +- 6 files changed, 1439 insertions(+), 238 deletions(-) create mode 100644 QMPlusVuePage/src/style/main.scss diff --git a/QMPlusVuePage/package-lock.json b/QMPlusVuePage/package-lock.json index 4779043196..8cbf3f07ba 100644 --- a/QMPlusVuePage/package-lock.json +++ b/QMPlusVuePage/package-lock.json @@ -1608,6 +1608,11 @@ "integrity": "sha1-0pHGpOl5ibXGHZrPOWrk/hM6cY0=", "dev": true }, + "abbrev": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", + "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==" + }, "accepts": { "version": "1.3.7", "resolved": "https://registry.npm.taobao.org/accepts/download/accepts-1.3.7.tgz", @@ -1659,7 +1664,6 @@ "version": "6.10.2", "resolved": "https://registry.npm.taobao.org/ajv/download/ajv-6.10.2.tgz?cache=0&sync_timestamp=1563113786760&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fajv%2Fdownload%2Fajv-6.10.2.tgz", "integrity": "sha1-086gTWsBeyiUrWkED+yLYj60vVI=", - "dev": true, "requires": { "fast-deep-equal": "^2.0.1", "fast-json-stable-stringify": "^2.0.0", @@ -1676,8 +1680,7 @@ "ajv-keywords": { "version": "3.4.1", "resolved": "https://registry.npm.taobao.org/ajv-keywords/download/ajv-keywords-3.4.1.tgz", - "integrity": "sha1-75FuJxxkrBIXH9g4TqrmsjRYVNo=", - "dev": true + "integrity": "sha1-75FuJxxkrBIXH9g4TqrmsjRYVNo=" }, "alphanum-sort": { "version": "1.0.2", @@ -1685,6 +1688,11 @@ "integrity": "sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM=", "dev": true }, + "amdefine": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz", + "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=" + }, "ansi-colors": { "version": "3.2.4", "resolved": "https://registry.npm.taobao.org/ansi-colors/download/ansi-colors-3.2.4.tgz", @@ -1748,8 +1756,7 @@ "aproba": { "version": "1.2.0", "resolved": "https://registry.npm.taobao.org/aproba/download/aproba-1.2.0.tgz", - "integrity": "sha1-aALmJk79GMeQobDVF/DyYnvyyUo=", - "dev": true + "integrity": "sha1-aALmJk79GMeQobDVF/DyYnvyyUo=" }, "arch": { "version": "2.1.1", @@ -1757,6 +1764,15 @@ "integrity": "sha1-j1wnMao1owkpIhuwZA7tZRdeyE4=", "dev": true }, + "are-we-there-yet": { + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz", + "integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==", + "requires": { + "delegates": "^1.0.0", + "readable-stream": "^2.0.6" + } + }, "argparse": { "version": "1.0.10", "resolved": "https://registry.npm.taobao.org/argparse/download/argparse-1.0.10.tgz", @@ -1784,6 +1800,11 @@ "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=", "dev": true }, + "array-find-index": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz", + "integrity": "sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=" + }, "array-flatten": { "version": "1.1.1", "resolved": "https://registry.npm.taobao.org/array-flatten/download/array-flatten-1.1.1.tgz", @@ -1815,7 +1836,6 @@ "version": "0.2.4", "resolved": "https://registry.npm.taobao.org/asn1/download/asn1-0.2.4.tgz", "integrity": "sha1-jSR136tVO7M+d7VOWeiAu4ziMTY=", - "dev": true, "requires": { "safer-buffer": "~2.1.0" } @@ -1861,8 +1881,7 @@ "assert-plus": { "version": "1.0.0", "resolved": "https://registry.npm.taobao.org/assert-plus/download/assert-plus-1.0.0.tgz", - "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=", - "dev": true + "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=" }, "assign-symbols": { "version": "1.0.0", @@ -1888,17 +1907,29 @@ "integrity": "sha1-tyfb+H12UWAvBvTUrDh/R9kbDL8=", "dev": true }, + "async-foreach": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/async-foreach/-/async-foreach-0.1.3.tgz", + "integrity": "sha1-NhIfhFwFeBct5Bmpfb6x0W7DRUI=" + }, "async-limiter": { "version": "1.0.1", "resolved": "https://registry.npm.taobao.org/async-limiter/download/async-limiter-1.0.1.tgz", "integrity": "sha1-3TeelPDbgxCwgpH51kwyCXZmF/0=", "dev": true }, + "async-validator": { + "version": "1.8.5", + "resolved": "https://registry.npmjs.org/async-validator/-/async-validator-1.8.5.tgz", + "integrity": "sha512-tXBM+1m056MAX0E8TL2iCjg8WvSyXu0Zc8LNtYqrVeyoL3+esHRZ4SieE9fKQyyU09uONjnMEjrNBMqT0mbvmA==", + "requires": { + "babel-runtime": "6.x" + } + }, "asynckit": { "version": "0.4.0", "resolved": "https://registry.npm.taobao.org/asynckit/download/asynckit-0.4.0.tgz", - "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=", - "dev": true + "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=" }, "atob": { "version": "2.1.2", @@ -1932,14 +1963,12 @@ "aws-sign2": { "version": "0.7.0", "resolved": "https://registry.npm.taobao.org/aws-sign2/download/aws-sign2-0.7.0.tgz", - "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=", - "dev": true + "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=" }, "aws4": { "version": "1.8.0", "resolved": "https://registry.npm.taobao.org/aws4/download/aws4-1.8.0.tgz", - "integrity": "sha1-8OAD2cqef1nHpQiUXXsu+aBKVC8=", - "dev": true + "integrity": "sha1-8OAD2cqef1nHpQiUXXsu+aBKVC8=" }, "babel-code-frame": { "version": "6.26.0", @@ -2014,6 +2043,11 @@ "resolve": "^1.12.0" } }, + "babel-helper-vue-jsx-merge-props": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/babel-helper-vue-jsx-merge-props/-/babel-helper-vue-jsx-merge-props-2.0.3.tgz", + "integrity": "sha512-gsLiKK7Qrb7zYJNgiXKpXblxbV5ffSwR0f5whkPAaBAR4fhi6bwRZxX9wBlIc5M/v8CCkXUbXZL4N/nSE97cqg==" + }, "babel-loader": { "version": "8.0.6", "resolved": "https://registry.npm.taobao.org/babel-loader/download/babel-loader-8.0.6.tgz", @@ -2048,11 +2082,26 @@ "resolve": "^1.4.0" } }, + "babel-runtime": { + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz", + "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=", + "requires": { + "core-js": "^2.4.0", + "regenerator-runtime": "^0.11.0" + }, + "dependencies": { + "regenerator-runtime": { + "version": "0.11.1", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz", + "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==" + } + } + }, "balanced-match": { "version": "1.0.0", "resolved": "https://registry.npm.taobao.org/balanced-match/download/balanced-match-1.0.0.tgz", - "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=", - "dev": true + "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=" }, "base": { "version": "0.11.2", @@ -2125,7 +2174,6 @@ "version": "1.0.2", "resolved": "https://registry.npm.taobao.org/bcrypt-pbkdf/download/bcrypt-pbkdf-1.0.2.tgz", "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=", - "dev": true, "requires": { "tweetnacl": "^0.14.3" } @@ -2145,8 +2193,7 @@ "big.js": { "version": "5.2.2", "resolved": "https://registry.npm.taobao.org/big.js/download/big.js-5.2.2.tgz", - "integrity": "sha1-ZfCvOC9Xi83HQr2cKB6cstd2gyg=", - "dev": true + "integrity": "sha1-ZfCvOC9Xi83HQr2cKB6cstd2gyg=" }, "binary-extensions": { "version": "1.13.1", @@ -2154,6 +2201,14 @@ "integrity": "sha1-WYr+VHVbKGilMw0q/51Ou1Mgm2U=", "dev": true }, + "block-stream": { + "version": "0.0.9", + "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz", + "integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=", + "requires": { + "inherits": "~2.0.0" + } + }, "bluebird": { "version": "3.5.5", "resolved": "https://registry.npm.taobao.org/bluebird/download/bluebird-3.5.5.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fbluebird%2Fdownload%2Fbluebird-3.5.5.tgz", @@ -2239,7 +2294,6 @@ "version": "1.1.11", "resolved": "https://registry.npm.taobao.org/brace-expansion/download/brace-expansion-1.1.11.tgz", "integrity": "sha1-PH/L9SnYcibz0vUrlm/1Jx60Qd0=", - "dev": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -2512,6 +2566,22 @@ "integrity": "sha1-48mzFWnhBoEd8kL3FXJaH0xJQyA=", "dev": true }, + "camelcase-keys": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz", + "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=", + "requires": { + "camelcase": "^2.0.0", + "map-obj": "^1.0.0" + }, + "dependencies": { + "camelcase": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz", + "integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=" + } + } + }, "caniuse-api": { "version": "3.0.0", "resolved": "https://registry.npm.taobao.org/caniuse-api/download/caniuse-api-3.0.0.tgz", @@ -2539,8 +2609,7 @@ "caseless": { "version": "0.12.0", "resolved": "https://registry.npm.taobao.org/caseless/download/caseless-0.12.0.tgz", - "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=", - "dev": true + "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=" }, "chalk": { "version": "2.4.2", @@ -2738,6 +2807,16 @@ "integrity": "sha1-2jCcwmPfFZlMaIypAheco8fNfH4=", "dev": true }, + "clone-deep": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz", + "integrity": "sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==", + "requires": { + "is-plain-object": "^2.0.4", + "kind-of": "^6.0.2", + "shallow-clone": "^3.0.0" + } + }, "co": { "version": "4.6.0", "resolved": "https://registry.npm.taobao.org/co/download/co-4.6.0.tgz", @@ -2759,8 +2838,7 @@ "code-point-at": { "version": "1.1.0", "resolved": "https://registry.npm.taobao.org/code-point-at/download/code-point-at-1.1.0.tgz", - "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=", - "dev": true + "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=" }, "collection-visit": { "version": "1.0.0", @@ -2811,7 +2889,6 @@ "version": "1.0.8", "resolved": "https://registry.npm.taobao.org/combined-stream/download/combined-stream-1.0.8.tgz", "integrity": "sha1-w9RaizT9cwYxoRCoolIGgrMdWn8=", - "dev": true, "requires": { "delayed-stream": "~1.0.0" } @@ -2884,8 +2961,7 @@ "concat-map": { "version": "0.0.1", "resolved": "https://registry.npm.taobao.org/concat-map/download/concat-map-0.0.1.tgz", - "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", - "dev": true + "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=" }, "concat-stream": { "version": "1.6.2", @@ -2914,6 +2990,11 @@ "date-now": "^0.1.4" } }, + "console-control-strings": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz", + "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=" + }, "consolidate": { "version": "0.15.1", "resolved": "https://registry.npm.taobao.org/consolidate/download/consolidate-0.15.1.tgz", @@ -3140,8 +3221,7 @@ "core-util-is": { "version": "1.0.2", "resolved": "https://registry.npm.taobao.org/core-util-is/download/core-util-is-1.0.2.tgz", - "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=", - "dev": true + "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=" }, "cosmiconfig": { "version": "5.2.1", @@ -3486,6 +3566,14 @@ "integrity": "sha1-8xz35PPiGLBybnOMqSoC00iO9hU=", "dev": true }, + "currently-unhandled": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz", + "integrity": "sha1-mI3zP+qxke95mmE2nddsF635V+o=", + "requires": { + "array-find-index": "^1.0.1" + } + }, "cyclist": { "version": "0.2.2", "resolved": "https://registry.npm.taobao.org/cyclist/download/cyclist-0.2.2.tgz", @@ -3496,7 +3584,6 @@ "version": "1.14.1", "resolved": "https://registry.npm.taobao.org/dashdash/download/dashdash-1.14.1.tgz", "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=", - "dev": true, "requires": { "assert-plus": "^1.0.0" } @@ -3525,8 +3612,7 @@ "decamelize": { "version": "1.2.0", "resolved": "https://registry.npm.taobao.org/decamelize/download/decamelize-1.2.0.tgz", - "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=", - "dev": true + "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=" }, "decode-uri-component": { "version": "0.2.0", @@ -3557,8 +3643,7 @@ "deepmerge": { "version": "1.5.2", "resolved": "https://registry.npm.taobao.org/deepmerge/download/deepmerge-1.5.2.tgz", - "integrity": "sha1-EEmdhohEza1P7ghC34x/bwyVp1M=", - "dev": true + "integrity": "sha1-EEmdhohEza1P7ghC34x/bwyVp1M=" }, "default-gateway": { "version": "5.0.3", @@ -3739,8 +3824,12 @@ "delayed-stream": { "version": "1.0.0", "resolved": "https://registry.npm.taobao.org/delayed-stream/download/delayed-stream-1.0.0.tgz", - "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=", - "dev": true + "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=" + }, + "delegates": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz", + "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=" }, "depd": { "version": "1.1.2", @@ -3932,7 +4021,6 @@ "version": "0.1.2", "resolved": "https://registry.npm.taobao.org/ecc-jsbn/download/ecc-jsbn-0.1.2.tgz", "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=", - "dev": true, "requires": { "jsbn": "~0.1.0", "safer-buffer": "^2.1.0" @@ -3956,6 +4044,19 @@ "integrity": "sha1-Hzg8Fq63XnvdvWoEkSN+yoGyyx8=", "dev": true }, + "element-ui": { + "version": "2.12.0", + "resolved": "https://registry.npmjs.org/element-ui/-/element-ui-2.12.0.tgz", + "integrity": "sha512-DapyT0PW4i/1ETPHk8K8Qbe8B6hj10+dXsRTrOTFryV9wAs6e9mCxbV65awokyR2/v/KuIHJmqX+mH3wUa4rOQ==", + "requires": { + "async-validator": "~1.8.1", + "babel-helper-vue-jsx-merge-props": "^2.0.0", + "deepmerge": "^1.2.0", + "normalize-wheel": "^1.0.1", + "resize-observer-polyfill": "^1.5.0", + "throttle-debounce": "^1.0.1" + } + }, "elliptic": { "version": "6.5.0", "resolved": "https://registry.npm.taobao.org/elliptic/download/elliptic-6.5.0.tgz", @@ -3980,8 +4081,7 @@ "emojis-list": { "version": "2.1.0", "resolved": "https://registry.npm.taobao.org/emojis-list/download/emojis-list-2.1.0.tgz", - "integrity": "sha1-TapNnbAPmBmIDHn6RXrlsJof04k=", - "dev": true + "integrity": "sha1-TapNnbAPmBmIDHn6RXrlsJof04k=" }, "encodeurl": { "version": "1.0.2", @@ -4028,7 +4128,6 @@ "version": "1.3.2", "resolved": "https://registry.npm.taobao.org/error-ex/download/error-ex-1.3.2.tgz", "integrity": "sha1-tKxAZIEH/c3PriQvQovqihTU8b8=", - "dev": true, "requires": { "is-arrayish": "^0.2.1" } @@ -4076,8 +4175,7 @@ "escape-string-regexp": { "version": "1.0.5", "resolved": "https://registry.npm.taobao.org/escape-string-regexp/download/escape-string-regexp-1.0.5.tgz", - "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=", - "dev": true + "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=" }, "eslint": { "version": "5.16.0", @@ -4636,8 +4734,7 @@ "extend": { "version": "3.0.2", "resolved": "https://registry.npm.taobao.org/extend/download/extend-3.0.2.tgz", - "integrity": "sha1-+LETa0Bx+9jrFAr/hYsQGewpFfo=", - "dev": true + "integrity": "sha1-+LETa0Bx+9jrFAr/hYsQGewpFfo=" }, "extend-shallow": { "version": "3.0.2", @@ -4740,14 +4837,12 @@ "extsprintf": { "version": "1.3.0", "resolved": "https://registry.npm.taobao.org/extsprintf/download/extsprintf-1.3.0.tgz", - "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=", - "dev": true + "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=" }, "fast-deep-equal": { "version": "2.0.1", "resolved": "https://registry.npm.taobao.org/fast-deep-equal/download/fast-deep-equal-2.0.1.tgz", - "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=", - "dev": true + "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=" }, "fast-glob": { "version": "2.2.7", @@ -4766,8 +4861,7 @@ "fast-json-stable-stringify": { "version": "2.0.0", "resolved": "https://registry.npm.taobao.org/fast-json-stable-stringify/download/fast-json-stable-stringify-2.0.0.tgz", - "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I=", - "dev": true + "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I=" }, "fast-levenshtein": { "version": "2.0.6", @@ -4995,14 +5089,12 @@ "forever-agent": { "version": "0.6.1", "resolved": "https://registry.npm.taobao.org/forever-agent/download/forever-agent-0.6.1.tgz", - "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=", - "dev": true + "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=" }, "form-data": { "version": "2.3.3", "resolved": "https://registry.npm.taobao.org/form-data/download/form-data-2.3.3.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fform-data%2Fdownload%2Fform-data-2.3.3.tgz", "integrity": "sha1-3M5SwF9kTymManq5Nr1yTO/786Y=", - "dev": true, "requires": { "asynckit": "^0.4.0", "combined-stream": "^1.0.6", @@ -5066,8 +5158,7 @@ "fs.realpath": { "version": "1.0.0", "resolved": "https://registry.npm.taobao.org/fs.realpath/download/fs.realpath-1.0.0.tgz", - "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=", - "dev": true + "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" }, "fsevents": { "version": "1.2.9", @@ -5617,6 +5708,17 @@ } } }, + "fstream": { + "version": "1.0.12", + "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.12.tgz", + "integrity": "sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg==", + "requires": { + "graceful-fs": "^4.1.2", + "inherits": "~2.0.0", + "mkdirp": ">=0.5 0", + "rimraf": "2" + } + }, "function-bind": { "version": "1.1.1", "resolved": "https://registry.npm.taobao.org/function-bind/download/function-bind-1.1.1.tgz", @@ -5629,12 +5731,73 @@ "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=", "dev": true }, + "gauge": { + "version": "2.7.4", + "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz", + "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=", + "requires": { + "aproba": "^1.0.3", + "console-control-strings": "^1.0.0", + "has-unicode": "^2.0.0", + "object-assign": "^4.1.0", + "signal-exit": "^3.0.0", + "string-width": "^1.0.1", + "strip-ansi": "^3.0.1", + "wide-align": "^1.1.0" + }, + "dependencies": { + "ansi-regex": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", + "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=" + }, + "is-fullwidth-code-point": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", + "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", + "requires": { + "number-is-nan": "^1.0.0" + } + }, + "string-width": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", + "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", + "requires": { + "code-point-at": "^1.0.0", + "is-fullwidth-code-point": "^1.0.0", + "strip-ansi": "^3.0.0" + } + }, + "strip-ansi": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", + "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", + "requires": { + "ansi-regex": "^2.0.0" + } + } + } + }, + "gaze": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/gaze/-/gaze-1.1.3.tgz", + "integrity": "sha512-BRdNm8hbWzFzWHERTrejLqwHDfS4GibPoq5wjTPIoJHoBtKGPg3xAFfxmM+9ztbXelxcf2hwQcaz1PtmFeue8g==", + "requires": { + "globule": "^1.0.0" + } + }, "get-caller-file": { "version": "2.0.5", "resolved": "https://registry.npm.taobao.org/get-caller-file/download/get-caller-file-2.0.5.tgz", "integrity": "sha1-T5RBKoLbMvNuOwuXQfipf+sDH34=", "dev": true }, + "get-stdin": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz", + "integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=" + }, "get-stream": { "version": "4.1.0", "resolved": "https://registry.npm.taobao.org/get-stream/download/get-stream-4.1.0.tgz", @@ -5654,7 +5817,6 @@ "version": "0.1.7", "resolved": "https://registry.npm.taobao.org/getpass/download/getpass-0.1.7.tgz", "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=", - "dev": true, "requires": { "assert-plus": "^1.0.0" } @@ -5663,7 +5825,6 @@ "version": "7.1.4", "resolved": "https://registry.npm.taobao.org/glob/download/glob-7.1.4.tgz", "integrity": "sha1-qmCKL2xXetNX4a5aXCbZqNGWklU=", - "dev": true, "requires": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", @@ -5730,11 +5891,20 @@ } } }, + "globule": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/globule/-/globule-1.2.1.tgz", + "integrity": "sha512-g7QtgWF4uYSL5/dn71WxubOrS7JVGCnFPEnoeChJmBnyR9Mw8nGoEwOgJL/RC2Te0WhbsEUCejfH8SZNJ+adYQ==", + "requires": { + "glob": "~7.1.1", + "lodash": "~4.17.10", + "minimatch": "~3.0.2" + } + }, "graceful-fs": { "version": "4.2.2", "resolved": "https://registry.npm.taobao.org/graceful-fs/download/graceful-fs-4.2.2.tgz", - "integrity": "sha1-bwlSYF0BQMHP2xOO0AV3W5LWewI=", - "dev": true + "integrity": "sha1-bwlSYF0BQMHP2xOO0AV3W5LWewI=" }, "gzip-size": { "version": "5.1.1", @@ -5755,14 +5925,12 @@ "har-schema": { "version": "2.0.0", "resolved": "https://registry.npm.taobao.org/har-schema/download/har-schema-2.0.0.tgz", - "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=", - "dev": true + "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=" }, "har-validator": { "version": "5.1.3", "resolved": "https://registry.npm.taobao.org/har-validator/download/har-validator-5.1.3.tgz", "integrity": "sha1-HvievT5JllV2de7ZiTEQ3DUPoIA=", - "dev": true, "requires": { "ajv": "^6.5.5", "har-schema": "^2.0.0" @@ -5781,7 +5949,6 @@ "version": "2.0.0", "resolved": "https://registry.npm.taobao.org/has-ansi/download/has-ansi-2.0.0.tgz", "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=", - "dev": true, "requires": { "ansi-regex": "^2.0.0" }, @@ -5789,8 +5956,7 @@ "ansi-regex": { "version": "2.1.1", "resolved": "https://registry.npm.taobao.org/ansi-regex/download/ansi-regex-2.1.1.tgz", - "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", - "dev": true + "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=" } } }, @@ -5806,6 +5972,11 @@ "integrity": "sha1-uhqPGvKg/DllD1yFA2dwQSIGO0Q=", "dev": true }, + "has-unicode": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz", + "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=" + }, "has-value": { "version": "1.0.0", "resolved": "https://registry.npm.taobao.org/has-value/download/has-value-1.0.0.tgz", @@ -5902,8 +6073,7 @@ "hosted-git-info": { "version": "2.8.4", "resolved": "https://registry.npm.taobao.org/hosted-git-info/download/hosted-git-info-2.8.4.tgz", - "integrity": "sha1-RBGauvS8ZGkqFqzjRwD+2cA+JUY=", - "dev": true + "integrity": "sha1-RBGauvS8ZGkqFqzjRwD+2cA+JUY=" }, "hpack.js": { "version": "2.1.6", @@ -6104,7 +6274,6 @@ "version": "1.2.0", "resolved": "https://registry.npm.taobao.org/http-signature/download/http-signature-1.2.0.tgz", "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=", - "dev": true, "requires": { "assert-plus": "^1.0.0", "jsprim": "^1.2.2", @@ -6247,6 +6416,19 @@ "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=", "dev": true }, + "in-publish": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/in-publish/-/in-publish-2.0.0.tgz", + "integrity": "sha1-4g/146KvwmkDILbcVSaCqcf631E=" + }, + "indent-string": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz", + "integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=", + "requires": { + "repeating": "^2.0.0" + } + }, "indexes-of": { "version": "1.0.1", "resolved": "https://registry.npm.taobao.org/indexes-of/download/indexes-of-1.0.1.tgz", @@ -6263,7 +6445,6 @@ "version": "1.0.6", "resolved": "https://registry.npm.taobao.org/inflight/download/inflight-1.0.6.tgz", "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", - "dev": true, "requires": { "once": "^1.3.0", "wrappy": "1" @@ -6272,8 +6453,7 @@ "inherits": { "version": "2.0.4", "resolved": "https://registry.npm.taobao.org/inherits/download/inherits-2.0.4.tgz?cache=0&sync_timestamp=1560975547815&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Finherits%2Fdownload%2Finherits-2.0.4.tgz", - "integrity": "sha1-D6LGT5MpF8NDOg3tVTY6rjdBa3w=", - "dev": true + "integrity": "sha1-D6LGT5MpF8NDOg3tVTY6rjdBa3w=" }, "inquirer": { "version": "3.3.0", @@ -6407,8 +6587,7 @@ "is-arrayish": { "version": "0.2.1", "resolved": "https://registry.npm.taobao.org/is-arrayish/download/is-arrayish-0.2.1.tgz", - "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=", - "dev": true + "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=" }, "is-binary-path": { "version": "1.0.1", @@ -6517,11 +6696,18 @@ "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=", "dev": true }, + "is-finite": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz", + "integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=", + "requires": { + "number-is-nan": "^1.0.0" + } + }, "is-fullwidth-code-point": { "version": "2.0.0", "resolved": "https://registry.npm.taobao.org/is-fullwidth-code-point/download/is-fullwidth-code-point-2.0.0.tgz", - "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", - "dev": true + "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=" }, "is-glob": { "version": "4.0.1", @@ -6592,7 +6778,6 @@ "version": "2.0.4", "resolved": "https://registry.npm.taobao.org/is-plain-object/download/is-plain-object-2.0.4.tgz", "integrity": "sha1-LBY7P6+xtgbZ0Xko8FwqHDjgdnc=", - "dev": true, "requires": { "isobject": "^3.0.1" } @@ -6645,8 +6830,12 @@ "is-typedarray": { "version": "1.0.0", "resolved": "https://registry.npm.taobao.org/is-typedarray/download/is-typedarray-1.0.0.tgz", - "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=", - "dev": true + "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=" + }, + "is-utf8": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz", + "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=" }, "is-windows": { "version": "1.0.2", @@ -6663,26 +6852,22 @@ "isarray": { "version": "1.0.0", "resolved": "https://registry.npm.taobao.org/isarray/download/isarray-1.0.0.tgz", - "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", - "dev": true + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" }, "isexe": { "version": "2.0.0", "resolved": "https://registry.npm.taobao.org/isexe/download/isexe-2.0.0.tgz", - "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=", - "dev": true + "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=" }, "isobject": { "version": "3.0.1", "resolved": "https://registry.npm.taobao.org/isobject/download/isobject-3.0.1.tgz", - "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", - "dev": true + "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=" }, "isstream": { "version": "0.1.2", "resolved": "https://registry.npm.taobao.org/isstream/download/isstream-0.1.2.tgz", - "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=", - "dev": true + "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=" }, "javascript-stringify": { "version": "1.6.0", @@ -6690,6 +6875,11 @@ "integrity": "sha1-FC0RHzpuPa6PSpr9d9RYVbWpzOM=", "dev": true }, + "js-base64": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.5.1.tgz", + "integrity": "sha512-M7kLczedRMYX4L8Mdh4MzyAMM9O5osx+4FcOQuTvr3A9F2D9S5JXheN0ewNbrvK2UatkTRhL5ejGmGSjNMiZuw==" + }, "js-levenshtein": { "version": "1.1.6", "resolved": "https://registry.npm.taobao.org/js-levenshtein/download/js-levenshtein-1.1.6.tgz", @@ -6730,8 +6920,7 @@ "jsbn": { "version": "0.1.1", "resolved": "https://registry.npm.taobao.org/jsbn/download/jsbn-0.1.1.tgz", - "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=", - "dev": true + "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=" }, "jsesc": { "version": "2.5.2", @@ -6748,14 +6937,12 @@ "json-schema": { "version": "0.2.3", "resolved": "https://registry.npm.taobao.org/json-schema/download/json-schema-0.2.3.tgz", - "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=", - "dev": true + "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=" }, "json-schema-traverse": { "version": "0.4.1", "resolved": "https://registry.npm.taobao.org/json-schema-traverse/download/json-schema-traverse-0.4.1.tgz", - "integrity": "sha1-afaofZUTq4u4/mO9sJecRI5oRmA=", - "dev": true + "integrity": "sha1-afaofZUTq4u4/mO9sJecRI5oRmA=" }, "json-stable-stringify-without-jsonify": { "version": "1.0.1", @@ -6766,8 +6953,7 @@ "json-stringify-safe": { "version": "5.0.1", "resolved": "https://registry.npm.taobao.org/json-stringify-safe/download/json-stringify-safe-5.0.1.tgz", - "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=", - "dev": true + "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=" }, "json3": { "version": "3.3.3", @@ -6797,7 +6983,6 @@ "version": "1.4.1", "resolved": "https://registry.npm.taobao.org/jsprim/download/jsprim-1.4.1.tgz", "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=", - "dev": true, "requires": { "assert-plus": "1.0.0", "extsprintf": "1.3.0", @@ -6814,8 +6999,7 @@ "kind-of": { "version": "6.0.2", "resolved": "https://registry.npm.taobao.org/kind-of/download/kind-of-6.0.2.tgz", - "integrity": "sha1-ARRrNqYhjmTljzqNZt5df8b20FE=", - "dev": true + "integrity": "sha1-ARRrNqYhjmTljzqNZt5df8b20FE=" }, "launch-editor": { "version": "2.2.1", @@ -6861,6 +7045,33 @@ "integrity": "sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA=", "dev": true }, + "load-json-file": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz", + "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=", + "requires": { + "graceful-fs": "^4.1.2", + "parse-json": "^2.2.0", + "pify": "^2.0.0", + "pinkie-promise": "^2.0.0", + "strip-bom": "^2.0.0" + }, + "dependencies": { + "parse-json": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz", + "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=", + "requires": { + "error-ex": "^1.2.0" + } + }, + "pify": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", + "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=" + } + } + }, "loader-fs-cache": { "version": "1.0.2", "resolved": "https://registry.npm.taobao.org/loader-fs-cache/download/loader-fs-cache-1.0.2.tgz", @@ -6922,7 +7133,6 @@ "version": "1.2.3", "resolved": "https://registry.npm.taobao.org/loader-utils/download/loader-utils-1.2.3.tgz", "integrity": "sha1-H/XcaRHJ8KBiUxpMBLYJQGEIwsc=", - "dev": true, "requires": { "big.js": "^5.2.2", "emojis-list": "^2.0.0", @@ -6933,7 +7143,6 @@ "version": "1.0.1", "resolved": "https://registry.npm.taobao.org/json5/download/json5-1.0.1.tgz", "integrity": "sha1-d5+wAYYE+oVOrL9iUhgNg1Q+Pb4=", - "dev": true, "requires": { "minimist": "^1.2.0" } @@ -6953,8 +7162,7 @@ "lodash": { "version": "4.17.15", "resolved": "https://registry.npm.taobao.org/lodash/download/lodash-4.17.15.tgz?cache=0&sync_timestamp=1563508077056&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Flodash%2Fdownload%2Flodash-4.17.15.tgz", - "integrity": "sha1-tEf2ZwoEVbv+7dETku/zMOoJdUg=", - "dev": true + "integrity": "sha1-tEf2ZwoEVbv+7dETku/zMOoJdUg=" }, "lodash.defaultsdeep": { "version": "4.6.1", @@ -7016,6 +7224,15 @@ "js-tokens": "^3.0.0 || ^4.0.0" } }, + "loud-rejection": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz", + "integrity": "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=", + "requires": { + "currently-unhandled": "^0.4.1", + "signal-exit": "^3.0.0" + } + }, "lower-case": { "version": "1.1.4", "resolved": "https://registry.npm.taobao.org/lower-case/download/lower-case-1.1.4.tgz", @@ -7062,6 +7279,11 @@ "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=", "dev": true }, + "map-obj": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz", + "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=" + }, "map-visit": { "version": "1.0.0", "resolved": "https://registry.npm.taobao.org/map-visit/download/map-visit-1.0.0.tgz", @@ -7123,6 +7345,23 @@ "readable-stream": "^2.0.1" } }, + "meow": { + "version": "3.7.0", + "resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz", + "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=", + "requires": { + "camelcase-keys": "^2.0.0", + "decamelize": "^1.1.2", + "loud-rejection": "^1.0.0", + "map-obj": "^1.0.1", + "minimist": "^1.1.3", + "normalize-package-data": "^2.3.4", + "object-assign": "^4.0.1", + "read-pkg-up": "^1.0.1", + "redent": "^1.0.0", + "trim-newlines": "^1.0.0" + } + }, "merge-descriptors": { "version": "1.0.1", "resolved": "https://registry.npm.taobao.org/merge-descriptors/download/merge-descriptors-1.0.1.tgz", @@ -7204,14 +7443,12 @@ "mime-db": { "version": "1.40.0", "resolved": "https://registry.npm.taobao.org/mime-db/download/mime-db-1.40.0.tgz", - "integrity": "sha1-plBX6ZjbCQ9zKmj2wnbTh9QSbDI=", - "dev": true + "integrity": "sha1-plBX6ZjbCQ9zKmj2wnbTh9QSbDI=" }, "mime-types": { "version": "2.1.24", "resolved": "https://registry.npm.taobao.org/mime-types/download/mime-types-2.1.24.tgz", "integrity": "sha1-tvjQs+lR77d97eyhlM/20W9nb4E=", - "dev": true, "requires": { "mime-db": "1.40.0" } @@ -7263,7 +7500,6 @@ "version": "3.0.4", "resolved": "https://registry.npm.taobao.org/minimatch/download/minimatch-3.0.4.tgz", "integrity": "sha1-UWbihkV/AzBgZL5Ul+jbsMPTIIM=", - "dev": true, "requires": { "brace-expansion": "^1.1.7" } @@ -7271,8 +7507,7 @@ "minimist": { "version": "1.2.0", "resolved": "https://registry.npm.taobao.org/minimist/download/minimist-1.2.0.tgz", - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", - "dev": true + "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=" }, "mississippi": { "version": "3.0.0", @@ -7317,7 +7552,6 @@ "version": "0.5.1", "resolved": "https://registry.npm.taobao.org/mkdirp/download/mkdirp-0.5.1.tgz", "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", - "dev": true, "requires": { "minimist": "0.0.8" }, @@ -7325,8 +7559,7 @@ "minimist": { "version": "0.0.8", "resolved": "https://registry.npm.taobao.org/minimist/download/minimist-0.0.8.tgz", - "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=", - "dev": true + "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=" } } }, @@ -7386,9 +7619,7 @@ "nan": { "version": "2.14.0", "resolved": "https://registry.npm.taobao.org/nan/download/nan-2.14.0.tgz", - "integrity": "sha1-eBj3IgJ7JFmobwKV1DTR/CM2xSw=", - "dev": true, - "optional": true + "integrity": "sha1-eBj3IgJ7JFmobwKV1DTR/CM2xSw=" }, "nanomatch": { "version": "1.2.13", @@ -7424,8 +7655,7 @@ "neo-async": { "version": "2.6.1", "resolved": "https://registry.npm.taobao.org/neo-async/download/neo-async-2.6.1.tgz", - "integrity": "sha1-rCetpmFn+ohJpq3dg39rGJrSCBw=", - "dev": true + "integrity": "sha1-rCetpmFn+ohJpq3dg39rGJrSCBw=" }, "nice-try": { "version": "1.0.5", @@ -7448,6 +7678,32 @@ "integrity": "sha1-bBUsNFzhHFL0ZcKr2VfoY5zWdN8=", "dev": true }, + "node-gyp": { + "version": "3.8.0", + "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.8.0.tgz", + "integrity": "sha512-3g8lYefrRRzvGeSowdJKAKyks8oUpLEd/DyPV4eMhVlhJ0aNaZqIrNUIPuEWWTAoPqyFkfGrM67MC69baqn6vA==", + "requires": { + "fstream": "^1.0.0", + "glob": "^7.0.3", + "graceful-fs": "^4.1.2", + "mkdirp": "^0.5.0", + "nopt": "2 || 3", + "npmlog": "0 || 1 || 2 || 3 || 4", + "osenv": "0", + "request": "^2.87.0", + "rimraf": "2", + "semver": "~5.3.0", + "tar": "^2.0.0", + "which": "1" + }, + "dependencies": { + "semver": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz", + "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8=" + } + } + }, "node-ipc": { "version": "9.1.1", "resolved": "https://registry.npm.taobao.org/node-ipc/download/node-ipc-9.1.1.tgz", @@ -7507,43 +7763,150 @@ "semver": "^5.3.0" } }, - "normalize-package-data": { - "version": "2.5.0", - "resolved": "https://registry.npm.taobao.org/normalize-package-data/download/normalize-package-data-2.5.0.tgz", - "integrity": "sha1-5m2xg4sgDB38IzIl0SyzZSDiNKg=", - "dev": true, - "requires": { - "hosted-git-info": "^2.1.4", - "resolve": "^1.10.0", - "semver": "2 || 3 || 4 || 5", - "validate-npm-package-license": "^3.0.1" - } - }, - "normalize-path": { - "version": "3.0.0", - "resolved": "https://registry.npm.taobao.org/normalize-path/download/normalize-path-3.0.0.tgz", - "integrity": "sha1-Dc1p/yOhybEf0JeDFmRKA4ghamU=", - "dev": true - }, - "normalize-range": { - "version": "0.1.2", - "resolved": "https://registry.npm.taobao.org/normalize-range/download/normalize-range-0.1.2.tgz", - "integrity": "sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=", - "dev": true - }, - "normalize-url": { - "version": "3.3.0", - "resolved": "https://registry.npm.taobao.org/normalize-url/download/normalize-url-3.3.0.tgz", - "integrity": "sha1-suHE3E98bVd0PfczpPWXjRhlBVk=", - "dev": true - }, - "npm-run-path": { - "version": "2.0.2", - "resolved": "https://registry.npm.taobao.org/npm-run-path/download/npm-run-path-2.0.2.tgz", - "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=", - "dev": true, + "node-sass": { + "version": "4.12.0", + "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.12.0.tgz", + "integrity": "sha512-A1Iv4oN+Iel6EPv77/HddXErL2a+gZ4uBeZUy+a8O35CFYTXhgA8MgLCWBtwpGZdCvTvQ9d+bQxX/QC36GDPpQ==", "requires": { - "path-key": "^2.0.0" + "async-foreach": "^0.1.3", + "chalk": "^1.1.1", + "cross-spawn": "^3.0.0", + "gaze": "^1.0.0", + "get-stdin": "^4.0.1", + "glob": "^7.0.3", + "in-publish": "^2.0.0", + "lodash": "^4.17.11", + "meow": "^3.7.0", + "mkdirp": "^0.5.1", + "nan": "^2.13.2", + "node-gyp": "^3.8.0", + "npmlog": "^4.0.0", + "request": "^2.88.0", + "sass-graph": "^2.2.4", + "stdout-stream": "^1.4.0", + "true-case-path": "^1.0.2" + }, + "dependencies": { + "ansi-regex": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", + "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=" + }, + "ansi-styles": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", + "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=" + }, + "chalk": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", + "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", + "requires": { + "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" + } + }, + "cross-spawn": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-3.0.1.tgz", + "integrity": "sha1-ElYDfsufDF9549bvE14wdwGEuYI=", + "requires": { + "lru-cache": "^4.0.1", + "which": "^1.2.9" + } + }, + "lru-cache": { + "version": "4.1.5", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz", + "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==", + "requires": { + "pseudomap": "^1.0.2", + "yallist": "^2.1.2" + } + }, + "strip-ansi": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", + "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", + "requires": { + "ansi-regex": "^2.0.0" + } + }, + "supports-color": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", + "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=" + }, + "yallist": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz", + "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=" + } + } + }, + "nopt": { + "version": "3.0.6", + "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz", + "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=", + "requires": { + "abbrev": "1" + } + }, + "normalize-package-data": { + "version": "2.5.0", + "resolved": "https://registry.npm.taobao.org/normalize-package-data/download/normalize-package-data-2.5.0.tgz", + "integrity": "sha1-5m2xg4sgDB38IzIl0SyzZSDiNKg=", + "requires": { + "hosted-git-info": "^2.1.4", + "resolve": "^1.10.0", + "semver": "2 || 3 || 4 || 5", + "validate-npm-package-license": "^3.0.1" + } + }, + "normalize-path": { + "version": "3.0.0", + "resolved": "https://registry.npm.taobao.org/normalize-path/download/normalize-path-3.0.0.tgz", + "integrity": "sha1-Dc1p/yOhybEf0JeDFmRKA4ghamU=", + "dev": true + }, + "normalize-range": { + "version": "0.1.2", + "resolved": "https://registry.npm.taobao.org/normalize-range/download/normalize-range-0.1.2.tgz", + "integrity": "sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=", + "dev": true + }, + "normalize-url": { + "version": "3.3.0", + "resolved": "https://registry.npm.taobao.org/normalize-url/download/normalize-url-3.3.0.tgz", + "integrity": "sha1-suHE3E98bVd0PfczpPWXjRhlBVk=", + "dev": true + }, + "normalize-wheel": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/normalize-wheel/-/normalize-wheel-1.0.1.tgz", + "integrity": "sha1-rsiGr/2wRQcNhWRH32Ls+GFG7EU=" + }, + "npm-run-path": { + "version": "2.0.2", + "resolved": "https://registry.npm.taobao.org/npm-run-path/download/npm-run-path-2.0.2.tgz", + "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=", + "dev": true, + "requires": { + "path-key": "^2.0.0" + } + }, + "npmlog": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz", + "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==", + "requires": { + "are-we-there-yet": "~1.1.2", + "console-control-strings": "~1.1.0", + "gauge": "~2.7.3", + "set-blocking": "~2.0.0" } }, "nth-check": { @@ -7564,20 +7927,17 @@ "number-is-nan": { "version": "1.0.1", "resolved": "https://registry.npm.taobao.org/number-is-nan/download/number-is-nan-1.0.1.tgz", - "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=", - "dev": true + "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=" }, "oauth-sign": { "version": "0.9.0", "resolved": "https://registry.npm.taobao.org/oauth-sign/download/oauth-sign-0.9.0.tgz", - "integrity": "sha1-R6ewFrqmi1+g7PPe4IqFxnmsZFU=", - "dev": true + "integrity": "sha1-R6ewFrqmi1+g7PPe4IqFxnmsZFU=" }, "object-assign": { "version": "4.1.1", "resolved": "https://registry.npm.taobao.org/object-assign/download/object-assign-4.1.1.tgz", - "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=", - "dev": true + "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=" }, "object-copy": { "version": "0.1.0", @@ -7705,7 +8065,6 @@ "version": "1.4.0", "resolved": "https://registry.npm.taobao.org/once/download/once-1.4.0.tgz", "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", - "dev": true, "requires": { "wrappy": "1" } @@ -7786,6 +8145,11 @@ "integrity": "sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc=", "dev": true }, + "os-homedir": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz", + "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=" + }, "os-locale": { "version": "3.1.0", "resolved": "https://registry.npm.taobao.org/os-locale/download/os-locale-3.1.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fos-locale%2Fdownload%2Fos-locale-3.1.0.tgz", @@ -7800,8 +8164,16 @@ "os-tmpdir": { "version": "1.0.2", "resolved": "https://registry.npm.taobao.org/os-tmpdir/download/os-tmpdir-1.0.2.tgz", - "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=", - "dev": true + "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=" + }, + "osenv": { + "version": "0.1.5", + "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz", + "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==", + "requires": { + "os-homedir": "^1.0.0", + "os-tmpdir": "^1.0.0" + } }, "p-defer": { "version": "1.0.0", @@ -7966,8 +8338,7 @@ "path-is-absolute": { "version": "1.0.1", "resolved": "https://registry.npm.taobao.org/path-is-absolute/download/path-is-absolute-1.0.1.tgz", - "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=", - "dev": true + "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=" }, "path-is-inside": { "version": "1.0.2", @@ -7984,8 +8355,7 @@ "path-parse": { "version": "1.0.6", "resolved": "https://registry.npm.taobao.org/path-parse/download/path-parse-1.0.6.tgz", - "integrity": "sha1-1i27VnlAXXLEc37FhgDp3c8G0kw=", - "dev": true + "integrity": "sha1-1i27VnlAXXLEc37FhgDp3c8G0kw=" }, "path-to-regexp": { "version": "0.1.7", @@ -8026,8 +8396,7 @@ "performance-now": { "version": "2.1.0", "resolved": "https://registry.npm.taobao.org/performance-now/download/performance-now-2.1.0.tgz", - "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=", - "dev": true + "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=" }, "pify": { "version": "4.0.1", @@ -8038,14 +8407,12 @@ "pinkie": { "version": "2.0.4", "resolved": "https://registry.npm.taobao.org/pinkie/download/pinkie-2.0.4.tgz", - "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=", - "dev": true + "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=" }, "pinkie-promise": { "version": "2.0.1", "resolved": "https://registry.npm.taobao.org/pinkie-promise/download/pinkie-promise-2.0.1.tgz", "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=", - "dev": true, "requires": { "pinkie": "^2.0.0" } @@ -8707,8 +9074,7 @@ "process-nextick-args": { "version": "2.0.1", "resolved": "https://registry.npm.taobao.org/process-nextick-args/download/process-nextick-args-2.0.1.tgz", - "integrity": "sha1-eCDZsWEgzFXKmud5JoCufbptf+I=", - "dev": true + "integrity": "sha1-eCDZsWEgzFXKmud5JoCufbptf+I=" }, "progress": { "version": "2.0.3", @@ -8741,14 +9107,12 @@ "pseudomap": { "version": "1.0.2", "resolved": "https://registry.npm.taobao.org/pseudomap/download/pseudomap-1.0.2.tgz", - "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=", - "dev": true + "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=" }, "psl": { "version": "1.3.0", "resolved": "https://registry.npm.taobao.org/psl/download/psl-1.3.0.tgz", - "integrity": "sha1-4ev2o7VWT6g3bz2iJ12nbYdcob0=", - "dev": true + "integrity": "sha1-4ev2o7VWT6g3bz2iJ12nbYdcob0=" }, "public-encrypt": { "version": "4.0.3", @@ -8800,8 +9164,7 @@ "punycode": { "version": "2.1.1", "resolved": "https://registry.npm.taobao.org/punycode/download/punycode-2.1.1.tgz", - "integrity": "sha1-tYsBCsQMIsVldhbI0sLALHv0eew=", - "dev": true + "integrity": "sha1-tYsBCsQMIsVldhbI0sLALHv0eew=" }, "q": { "version": "1.5.1", @@ -8812,8 +9175,7 @@ "qs": { "version": "6.5.2", "resolved": "https://registry.npm.taobao.org/qs/download/qs-6.5.2.tgz?cache=0&sync_timestamp=1566009952956&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fqs%2Fdownload%2Fqs-6.5.2.tgz", - "integrity": "sha1-yzroBuh0BERYTvFUzo7pjUA/PjY=", - "dev": true + "integrity": "sha1-yzroBuh0BERYTvFUzo7pjUA/PjY=" }, "query-string": { "version": "5.1.1", @@ -8907,11 +9269,63 @@ } } }, + "read-pkg-up": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz", + "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=", + "requires": { + "find-up": "^1.0.0", + "read-pkg": "^1.0.0" + }, + "dependencies": { + "find-up": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz", + "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=", + "requires": { + "path-exists": "^2.0.0", + "pinkie-promise": "^2.0.0" + } + }, + "path-exists": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz", + "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=", + "requires": { + "pinkie-promise": "^2.0.0" + } + }, + "path-type": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz", + "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=", + "requires": { + "graceful-fs": "^4.1.2", + "pify": "^2.0.0", + "pinkie-promise": "^2.0.0" + } + }, + "pify": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", + "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=" + }, + "read-pkg": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz", + "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=", + "requires": { + "load-json-file": "^1.0.0", + "normalize-package-data": "^2.3.2", + "path-type": "^1.0.0" + } + } + } + }, "readable-stream": { "version": "2.3.6", "resolved": "https://registry.npm.taobao.org/readable-stream/download/readable-stream-2.3.6.tgz", "integrity": "sha1-sRwn2IuP8fvgcGQ8+UsMea4bCq8=", - "dev": true, "requires": { "core-util-is": "~1.0.0", "inherits": "~2.0.3", @@ -8933,6 +9347,25 @@ "readable-stream": "^2.0.2" } }, + "redent": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz", + "integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=", + "requires": { + "indent-string": "^2.1.0", + "strip-indent": "^1.0.1" + }, + "dependencies": { + "strip-indent": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz", + "integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=", + "requires": { + "get-stdin": "^4.0.1" + } + } + } + }, "regenerate": { "version": "1.4.0", "resolved": "https://registry.npm.taobao.org/regenerate/download/regenerate-1.4.0.tgz", @@ -9108,11 +9541,18 @@ "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=", "dev": true }, + "repeating": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz", + "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=", + "requires": { + "is-finite": "^1.0.0" + } + }, "request": { "version": "2.88.0", "resolved": "https://registry.npm.taobao.org/request/download/request-2.88.0.tgz", "integrity": "sha1-nC/KT301tZLv5Xx/ClXoEFIST+8=", - "dev": true, "requires": { "aws-sign2": "~0.7.0", "aws4": "^1.8.0", @@ -9159,8 +9599,7 @@ "require-directory": { "version": "2.1.1", "resolved": "https://registry.npm.taobao.org/require-directory/download/require-directory-2.1.1.tgz", - "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=", - "dev": true + "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=" }, "require-main-filename": { "version": "2.0.0", @@ -9191,11 +9630,15 @@ "integrity": "sha1-79qpjqdFEyTQkrKyFjpqHXqaIUc=", "dev": true }, + "resize-observer-polyfill": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz", + "integrity": "sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg==" + }, "resolve": { "version": "1.12.0", "resolved": "https://registry.npm.taobao.org/resolve/download/resolve-1.12.0.tgz?cache=0&sync_timestamp=1564641434608&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fresolve%2Fdownload%2Fresolve-1.12.0.tgz", "integrity": "sha1-P8ZEo1yEpIVUYJ/ybsUrZvpXffY=", - "dev": true, "requires": { "path-parse": "^1.0.6" } @@ -9268,7 +9711,6 @@ "version": "2.7.1", "resolved": "https://registry.npm.taobao.org/rimraf/download/rimraf-2.7.1.tgz", "integrity": "sha1-NXl/E6f9rcVmFCwp1PB8ytSD4+w=", - "dev": true, "requires": { "glob": "^7.1.3" } @@ -9330,8 +9772,7 @@ "safe-buffer": { "version": "5.1.2", "resolved": "https://registry.npm.taobao.org/safe-buffer/download/safe-buffer-5.1.2.tgz", - "integrity": "sha1-mR7GnSluAxN0fVm9/St0XDX4go0=", - "dev": true + "integrity": "sha1-mR7GnSluAxN0fVm9/St0XDX4go0=" }, "safe-regex": { "version": "1.1.0", @@ -9345,8 +9786,172 @@ "safer-buffer": { "version": "2.1.2", "resolved": "https://registry.npm.taobao.org/safer-buffer/download/safer-buffer-2.1.2.tgz", - "integrity": "sha1-RPoWGwGHuVSd2Eu5GAL5vYOFzWo=", - "dev": true + "integrity": "sha1-RPoWGwGHuVSd2Eu5GAL5vYOFzWo=" + }, + "sass-graph": { + "version": "2.2.4", + "resolved": "https://registry.npmjs.org/sass-graph/-/sass-graph-2.2.4.tgz", + "integrity": "sha1-E/vWPNHK8JCLn9k0dq1DpR0eC0k=", + "requires": { + "glob": "^7.0.0", + "lodash": "^4.0.0", + "scss-tokenizer": "^0.2.3", + "yargs": "^7.0.0" + }, + "dependencies": { + "ansi-regex": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", + "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=" + }, + "camelcase": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz", + "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=" + }, + "cliui": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz", + "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=", + "requires": { + "string-width": "^1.0.1", + "strip-ansi": "^3.0.1", + "wrap-ansi": "^2.0.0" + } + }, + "get-caller-file": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz", + "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==" + }, + "invert-kv": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz", + "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY=" + }, + "is-fullwidth-code-point": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", + "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", + "requires": { + "number-is-nan": "^1.0.0" + } + }, + "lcid": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz", + "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=", + "requires": { + "invert-kv": "^1.0.0" + } + }, + "os-locale": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz", + "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=", + "requires": { + "lcid": "^1.0.0" + } + }, + "require-main-filename": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz", + "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=" + }, + "string-width": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", + "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", + "requires": { + "code-point-at": "^1.0.0", + "is-fullwidth-code-point": "^1.0.0", + "strip-ansi": "^3.0.0" + } + }, + "strip-ansi": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", + "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", + "requires": { + "ansi-regex": "^2.0.0" + } + }, + "which-module": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz", + "integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=" + }, + "wrap-ansi": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz", + "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=", + "requires": { + "string-width": "^1.0.1", + "strip-ansi": "^3.0.1" + } + }, + "y18n": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz", + "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=" + }, + "yargs": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-7.1.0.tgz", + "integrity": "sha1-a6MY6xaWFyf10oT46gA+jWFU0Mg=", + "requires": { + "camelcase": "^3.0.0", + "cliui": "^3.2.0", + "decamelize": "^1.1.1", + "get-caller-file": "^1.0.1", + "os-locale": "^1.4.0", + "read-pkg-up": "^1.0.1", + "require-directory": "^2.1.1", + "require-main-filename": "^1.0.1", + "set-blocking": "^2.0.0", + "string-width": "^1.0.2", + "which-module": "^1.0.0", + "y18n": "^3.2.1", + "yargs-parser": "^5.0.0" + } + }, + "yargs-parser": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-5.0.0.tgz", + "integrity": "sha1-J17PDX/+Bcd+ZOfIbkzZS/DhIoo=", + "requires": { + "camelcase": "^3.0.0" + } + } + } + }, + "sass-loader": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-8.0.0.tgz", + "integrity": "sha512-+qeMu563PN7rPdit2+n5uuYVR0SSVwm0JsOUsaJXzgYcClWSlmX0iHDnmeOobPkf5kUglVot3QS6SyLyaQoJ4w==", + "requires": { + "clone-deep": "^4.0.1", + "loader-utils": "^1.2.3", + "neo-async": "^2.6.1", + "schema-utils": "^2.1.0", + "semver": "^6.3.0" + }, + "dependencies": { + "schema-utils": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.2.0.tgz", + "integrity": "sha512-5EwsCNhfFTZvUreQhx/4vVQpJ/lnCAkgoIHLhSpp4ZirE+4hzFvdJi0FMub6hxbFVBJYSpeVVmon+2e7uEGRrA==", + "requires": { + "ajv": "^6.10.2", + "ajv-keywords": "^3.4.1" + } + }, + "semver": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" + } + } }, "sax": { "version": "1.2.4", @@ -9365,6 +9970,25 @@ "ajv-keywords": "^3.1.0" } }, + "scss-tokenizer": { + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz", + "integrity": "sha1-jrBtualyMzOCTT9VMGQRSYR85dE=", + "requires": { + "js-base64": "^2.1.8", + "source-map": "^0.4.2" + }, + "dependencies": { + "source-map": { + "version": "0.4.4", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz", + "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=", + "requires": { + "amdefine": ">=0.0.4" + } + } + } + }, "select-hose": { "version": "2.0.0", "resolved": "https://registry.npm.taobao.org/select-hose/download/select-hose-2.0.0.tgz", @@ -9383,8 +10007,7 @@ "semver": { "version": "5.7.1", "resolved": "https://registry.npm.taobao.org/semver/download/semver-5.7.1.tgz", - "integrity": "sha1-qVT5Ma66UI0we78Gnv8MAclhFvc=", - "dev": true + "integrity": "sha1-qVT5Ma66UI0we78Gnv8MAclhFvc=" }, "send": { "version": "0.17.1", @@ -9515,8 +10138,7 @@ "set-blocking": { "version": "2.0.0", "resolved": "https://registry.npm.taobao.org/set-blocking/download/set-blocking-2.0.0.tgz", - "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=", - "dev": true + "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=" }, "set-value": { "version": "2.0.1", @@ -9563,6 +10185,14 @@ "safe-buffer": "^5.0.1" } }, + "shallow-clone": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz", + "integrity": "sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==", + "requires": { + "kind-of": "^6.0.2" + } + }, "shebang-command": { "version": "1.2.0", "resolved": "https://registry.npm.taobao.org/shebang-command/download/shebang-command-1.2.0.tgz", @@ -9587,8 +10217,7 @@ "signal-exit": { "version": "3.0.2", "resolved": "https://registry.npm.taobao.org/signal-exit/download/signal-exit-3.0.2.tgz", - "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=", - "dev": true + "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=" }, "simple-swizzle": { "version": "0.2.2", @@ -9851,7 +10480,6 @@ "version": "3.1.0", "resolved": "https://registry.npm.taobao.org/spdx-correct/download/spdx-correct-3.1.0.tgz", "integrity": "sha1-+4PlBERSaPFUsHTiGMh8ADzTHfQ=", - "dev": true, "requires": { "spdx-expression-parse": "^3.0.0", "spdx-license-ids": "^3.0.0" @@ -9860,14 +10488,12 @@ "spdx-exceptions": { "version": "2.2.0", "resolved": "https://registry.npm.taobao.org/spdx-exceptions/download/spdx-exceptions-2.2.0.tgz", - "integrity": "sha1-LqRQrudPKom/uUUZwH/Nb0EyKXc=", - "dev": true + "integrity": "sha1-LqRQrudPKom/uUUZwH/Nb0EyKXc=" }, "spdx-expression-parse": { "version": "3.0.0", "resolved": "https://registry.npm.taobao.org/spdx-expression-parse/download/spdx-expression-parse-3.0.0.tgz", "integrity": "sha1-meEZt6XaAOBUkcn6M4t5BII7QdA=", - "dev": true, "requires": { "spdx-exceptions": "^2.1.0", "spdx-license-ids": "^3.0.0" @@ -9876,8 +10502,7 @@ "spdx-license-ids": { "version": "3.0.5", "resolved": "https://registry.npm.taobao.org/spdx-license-ids/download/spdx-license-ids-3.0.5.tgz", - "integrity": "sha1-NpS1gEVnpFjTyARYQqY1hjL2JlQ=", - "dev": true + "integrity": "sha1-NpS1gEVnpFjTyARYQqY1hjL2JlQ=" }, "spdy": { "version": "4.0.1", @@ -9938,7 +10563,6 @@ "version": "1.16.1", "resolved": "https://registry.npm.taobao.org/sshpk/download/sshpk-1.16.1.tgz", "integrity": "sha1-+2YcC+8ps520B2nuOfpwCT1vaHc=", - "dev": true, "requires": { "asn1": "~0.2.3", "assert-plus": "^1.0.0", @@ -9999,6 +10623,14 @@ "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=", "dev": true }, + "stdout-stream": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/stdout-stream/-/stdout-stream-1.4.1.tgz", + "integrity": "sha512-j4emi03KXqJWcIeF8eIXkjMFN1Cmb8gUlDYGeBALLPo5qdyTfA9bOtl8m33lRoC+vFMkP3gl0WsDr6+gzxbbTA==", + "requires": { + "readable-stream": "^2.0.1" + } + }, "stealthy-require": { "version": "1.1.1", "resolved": "https://registry.npm.taobao.org/stealthy-require/download/stealthy-require-1.1.1.tgz", @@ -10054,7 +10686,6 @@ "version": "2.1.1", "resolved": "https://registry.npm.taobao.org/string-width/download/string-width-2.1.1.tgz", "integrity": "sha1-q5Pyeo3BPSjKyBXEYhQ6bZASrp4=", - "dev": true, "requires": { "is-fullwidth-code-point": "^2.0.0", "strip-ansi": "^4.0.0" @@ -10063,14 +10694,12 @@ "ansi-regex": { "version": "3.0.0", "resolved": "https://registry.npm.taobao.org/ansi-regex/download/ansi-regex-3.0.0.tgz", - "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", - "dev": true + "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=" }, "strip-ansi": { "version": "4.0.0", "resolved": "https://registry.npm.taobao.org/strip-ansi/download/strip-ansi-4.0.0.tgz", "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", - "dev": true, "requires": { "ansi-regex": "^3.0.0" } @@ -10103,7 +10732,6 @@ "version": "1.1.1", "resolved": "https://registry.npm.taobao.org/string_decoder/download/string_decoder-1.1.1.tgz?cache=0&sync_timestamp=1565170823020&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fstring_decoder%2Fdownload%2Fstring_decoder-1.1.1.tgz", "integrity": "sha1-nPFhG6YmhdcDCunkujQUnDrwP8g=", - "dev": true, "requires": { "safe-buffer": "~5.1.0" } @@ -10117,6 +10745,14 @@ "ansi-regex": "^4.1.0" } }, + "strip-bom": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz", + "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=", + "requires": { + "is-utf8": "^0.2.0" + } + }, "strip-eof": { "version": "1.0.0", "resolved": "https://registry.npm.taobao.org/strip-eof/download/strip-eof-1.0.0.tgz", @@ -10258,6 +10894,16 @@ "integrity": "sha1-ofzMBrWNth/XpF2i2kT186Pme6I=", "dev": true }, + "tar": { + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.2.tgz", + "integrity": "sha512-FCEhQ/4rE1zYv9rYXJw/msRqsnmlje5jHP6huWeBZ704jUTy02c5AZyWujpMR1ax6mVw9NyJMfuK2CMDWVIfgA==", + "requires": { + "block-stream": "*", + "fstream": "^1.0.12", + "inherits": "2" + } + }, "terser": { "version": "4.2.1", "resolved": "https://registry.npm.taobao.org/terser/download/terser-4.2.1.tgz", @@ -10337,6 +10983,11 @@ "neo-async": "^2.6.0" } }, + "throttle-debounce": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/throttle-debounce/-/throttle-debounce-1.1.0.tgz", + "integrity": "sha512-XH8UiPCQcWNuk2LYePibW/4qL97+ZQ1AN3FNXwZRBNPPowo/NRU5fAlDCSNBJIYCKbioZfuYtMhG4quqoJhVzg==" + }, "through": { "version": "2.3.8", "resolved": "https://registry.npm.taobao.org/through/download/through-2.3.8.tgz", @@ -10453,7 +11104,6 @@ "version": "2.4.3", "resolved": "https://registry.npm.taobao.org/tough-cookie/download/tough-cookie-2.4.3.tgz", "integrity": "sha1-U/Nto/R3g7CSWvoG/587FlKA94E=", - "dev": true, "requires": { "psl": "^1.1.24", "punycode": "^1.4.1" @@ -10462,17 +11112,29 @@ "punycode": { "version": "1.4.1", "resolved": "https://registry.npm.taobao.org/punycode/download/punycode-1.4.1.tgz", - "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=", - "dev": true + "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=" } } }, + "trim-newlines": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz", + "integrity": "sha1-WIeWa7WCpFA6QetST301ARgVphM=" + }, "trim-right": { "version": "1.0.1", "resolved": "https://registry.npm.taobao.org/trim-right/download/trim-right-1.0.1.tgz?cache=0&sync_timestamp=1562845044600&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ftrim-right%2Fdownload%2Ftrim-right-1.0.1.tgz", "integrity": "sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=", "dev": true }, + "true-case-path": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/true-case-path/-/true-case-path-1.0.3.tgz", + "integrity": "sha512-m6s2OdQe5wgpFMC+pAJ+q9djG82O2jcHPOI6RNg1yy9rCYR+WD6Nbpl32fDpfC56nirdRy+opFa/Vk7HYhqaew==", + "requires": { + "glob": "^7.1.2" + } + }, "tryer": { "version": "1.0.1", "resolved": "https://registry.npm.taobao.org/tryer/download/tryer-1.0.1.tgz", @@ -10495,7 +11157,6 @@ "version": "0.6.0", "resolved": "https://registry.npm.taobao.org/tunnel-agent/download/tunnel-agent-0.6.0.tgz", "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=", - "dev": true, "requires": { "safe-buffer": "^5.0.1" } @@ -10503,8 +11164,7 @@ "tweetnacl": { "version": "0.14.5", "resolved": "https://registry.npm.taobao.org/tweetnacl/download/tweetnacl-0.14.5.tgz", - "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=", - "dev": true + "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=" }, "type-check": { "version": "0.3.2", @@ -10705,7 +11365,6 @@ "version": "4.2.2", "resolved": "https://registry.npm.taobao.org/uri-js/download/uri-js-4.2.2.tgz", "integrity": "sha1-lMVA4f93KVbiKZUHwBCupsiDjrA=", - "dev": true, "requires": { "punycode": "^2.1.0" } @@ -10781,8 +11440,7 @@ "util-deprecate": { "version": "1.0.2", "resolved": "https://registry.npm.taobao.org/util-deprecate/download/util-deprecate-1.0.2.tgz", - "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=", - "dev": true + "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=" }, "util.promisify": { "version": "1.0.0", @@ -10809,14 +11467,12 @@ "uuid": { "version": "3.3.3", "resolved": "https://registry.npm.taobao.org/uuid/download/uuid-3.3.3.tgz", - "integrity": "sha1-RWjwIW54dg7h2/Ok0s9T4iQRKGY=", - "dev": true + "integrity": "sha1-RWjwIW54dg7h2/Ok0s9T4iQRKGY=" }, "validate-npm-package-license": { "version": "3.0.4", "resolved": "https://registry.npm.taobao.org/validate-npm-package-license/download/validate-npm-package-license-3.0.4.tgz", "integrity": "sha1-/JH2uce6FchX9MssXe/uw51PQQo=", - "dev": true, "requires": { "spdx-correct": "^3.0.0", "spdx-expression-parse": "^3.0.0" @@ -10838,7 +11494,6 @@ "version": "1.10.0", "resolved": "https://registry.npm.taobao.org/verror/download/verror-1.10.0.tgz", "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=", - "dev": true, "requires": { "assert-plus": "^1.0.0", "core-util-is": "1.0.2", @@ -11329,7 +11984,6 @@ "version": "1.3.1", "resolved": "https://registry.npm.taobao.org/which/download/which-1.3.1.tgz", "integrity": "sha1-pFBD1U9YBTFtqNYvn1CRjT2nCwo=", - "dev": true, "requires": { "isexe": "^2.0.0" } @@ -11340,6 +11994,14 @@ "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=", "dev": true }, + "wide-align": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz", + "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==", + "requires": { + "string-width": "^1.0.2 || 2" + } + }, "wordwrap": { "version": "1.0.0", "resolved": "https://registry.npm.taobao.org/wordwrap/download/wordwrap-1.0.0.tgz", @@ -11382,8 +12044,7 @@ "wrappy": { "version": "1.0.2", "resolved": "https://registry.npm.taobao.org/wrappy/download/wrappy-1.0.2.tgz", - "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", - "dev": true + "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=" }, "write": { "version": "0.2.1", diff --git a/QMPlusVuePage/package.json b/QMPlusVuePage/package.json index 560c863d3c..5e6880e06c 100644 --- a/QMPlusVuePage/package.json +++ b/QMPlusVuePage/package.json @@ -9,6 +9,9 @@ }, "dependencies": { "core-js": "^2.6.5", + "element-ui": "^2.12.0", + "node-sass": "^4.12.0", + "sass-loader": "^8.0.0", "vue": "^2.6.10", "vue-router": "^3.1.3" }, diff --git a/QMPlusVuePage/src/App.vue b/QMPlusVuePage/src/App.vue index 96cdbcfb1d..0b1bb0c800 100644 --- a/QMPlusVuePage/src/App.vue +++ b/QMPlusVuePage/src/App.vue @@ -14,13 +14,7 @@ export default { } - diff --git a/QMPlusVuePage/src/main.js b/QMPlusVuePage/src/main.js index 25161480b7..2c24f91490 100644 --- a/QMPlusVuePage/src/main.js +++ b/QMPlusVuePage/src/main.js @@ -1,6 +1,10 @@ import Vue from 'vue' import App from './App.vue' - +// 引入element +import ElementUI from 'element-ui'; +import 'element-ui/lib/theme-chalk/index.css'; +Vue.use(ElementUI); +// 引入封装的router import router from '@/router/index' Vue.config.productionTip = false diff --git a/QMPlusVuePage/src/style/main.scss b/QMPlusVuePage/src/style/main.scss new file mode 100644 index 0000000000..90dc559cb8 --- /dev/null +++ b/QMPlusVuePage/src/style/main.scss @@ -0,0 +1,532 @@ +/* Document + ========================================================================== */ + + +/** + * 1. Correct the line height in all browsers. + * 2. Prevent adjustments of font size after orientation changes in iOS. + */ + +html { + line-height: 1.15; + /* 1 */ + -webkit-text-size-adjust: 100%; + /* 2 */ +} + + +/* Sections + ========================================================================== */ + + +/** + * Remove the margin in all browsers. + */ + +body { + margin: 0; +} + + +/** + * Render the `main` element consistently in IE. + */ + +main { + display: block; +} + + +/** + * Correct the font size and margin on `h1` elements within `section` and + * `article` contexts in Chrome, Firefox, and Safari. + */ + +h1 { + font-size: 2em; + margin: 0.67em 0; +} + + +/* Grouping content + ========================================================================== */ + + +/** + * 1. Add the correct box sizing in Firefox. + * 2. Show the overflow in Edge and IE. + */ + +hr { + box-sizing: content-box; + /* 1 */ + height: 0; + /* 1 */ + overflow: visible; + /* 2 */ +} + + +/** + * 1. Correct the inheritance and scaling of font size in all browsers. + * 2. Correct the odd `em` font sizing in all browsers. + */ + +pre { + font-family: monospace, monospace; + /* 1 */ + font-size: 1em; + /* 2 */ +} + + +/* Text-level semantics + ========================================================================== */ + + +/** + * Remove the gray background on active links in IE 10. + */ + +a { + background-color: transparent; +} + + +/** + * 1. Remove the bottom border in Chrome 57- + * 2. Add the correct text decoration in Chrome, Edge, IE, Opera, and Safari. + */ + +abbr[title] { + border-bottom: none; + /* 1 */ + text-decoration: underline; + /* 2 */ + text-decoration: underline dotted; + /* 2 */ +} + + +/** + * Add the correct font weight in Chrome, Edge, and Safari. + */ + +b, +strong { + font-weight: bolder; +} + + +/** + * 1. Correct the inheritance and scaling of font size in all browsers. + * 2. Correct the odd `em` font sizing in all browsers. + */ + +code, +kbd, +samp { + font-family: monospace, monospace; + /* 1 */ + font-size: 1em; + /* 2 */ +} + + +/** + * Add the correct font size in all browsers. + */ + +small { + font-size: 80%; +} + + +/** + * Prevent `sub` and `sup` elements from affecting the line height in + * all browsers. + */ + +sub, +sup { + font-size: 75%; + line-height: 0; + position: relative; + vertical-align: baseline; +} + +sub { + bottom: -0.25em; +} + +sup { + top: -0.5em; +} + + +/* Embedded content + ========================================================================== */ + + +/** + * Remove the border on images inside links in IE 10. + */ + +img { + border-style: none; +} + + +/* Forms + ========================================================================== */ + + +/** + * 1. Change the font styles in all browsers. + * 2. Remove the margin in Firefox and Safari. + */ + +button, +input, +optgroup, +select, +textarea { + font-family: inherit; + /* 1 */ + font-size: 100%; + /* 1 */ + line-height: 1.15; + /* 1 */ + margin: 0; + /* 2 */ +} + + +/** + * Show the overflow in IE. + * 1. Show the overflow in Edge. + */ + +button, +input { + /* 1 */ + overflow: visible; +} + + +/** + * Remove the inheritance of text transform in Edge, Firefox, and IE. + * 1. Remove the inheritance of text transform in Firefox. + */ + +button, +select { + /* 1 */ + text-transform: none; +} + + +/** + * Correct the inability to style clickable types in iOS and Safari. + */ + +button, +[type="button"], +[type="reset"], +[type="submit"] { + -webkit-appearance: button; +} + + +/** + * Remove the inner border and padding in Firefox. + */ + +button::-moz-focus-inner, +[type="button"]::-moz-focus-inner, +[type="reset"]::-moz-focus-inner, +[type="submit"]::-moz-focus-inner { + border-style: none; + padding: 0; +} + + +/** + * Restore the focus styles unset by the previous rule. + */ + +button:-moz-focusring, +[type="button"]:-moz-focusring, +[type="reset"]:-moz-focusring, +[type="submit"]:-moz-focusring { + outline: 1px dotted ButtonText; +} + + +/** + * Correct the padding in Firefox. + */ + +fieldset { + padding: 0.35em 0.75em 0.625em; +} + + +/** + * 1. Correct the text wrapping in Edge and IE. + * 2. Correct the color inheritance from `fieldset` elements in IE. + * 3. Remove the padding so developers are not caught out when they zero out + * `fieldset` elements in all browsers. + */ + +legend { + box-sizing: border-box; + /* 1 */ + color: inherit; + /* 2 */ + display: table; + /* 1 */ + max-width: 100%; + /* 1 */ + padding: 0; + /* 3 */ + white-space: normal; + /* 1 */ +} + + +/** + * Add the correct vertical alignment in Chrome, Firefox, and Opera. + */ + +progress { + vertical-align: baseline; +} + + +/** + * Remove the default vertical scrollbar in IE 10+. + */ + +textarea { + overflow: auto; +} + + +/** + * 1. Add the correct box sizing in IE 10. + * 2. Remove the padding in IE 10. + */ + +[type="checkbox"], +[type="radio"] { + box-sizing: border-box; + /* 1 */ + padding: 0; + /* 2 */ +} + + +/** + * Correct the cursor style of increment and decrement buttons in Chrome. + */ + +[type="number"]::-webkit-inner-spin-button, +[type="number"]::-webkit-outer-spin-button { + height: auto; +} + + +/** + * 1. Correct the odd appearance in Chrome and Safari. + * 2. Correct the outline style in Safari. + */ + +[type="search"] { + -webkit-appearance: textfield; + /* 1 */ + outline-offset: -2px; + /* 2 */ +} + + +/** + * Remove the inner padding in Chrome and Safari on macOS. + */ + +[type="search"]::-webkit-search-decoration { + -webkit-appearance: none; +} + + +/** + * 1. Correct the inability to style clickable types in iOS and Safari. + * 2. Change font properties to `inherit` in Safari. + */ + + ::-webkit-file-upload-button { + -webkit-appearance: button; + /* 1 */ + font: inherit; + /* 2 */ +} + + +/* Interactive + ========================================================================== */ + + +/* + * Add the correct display in Edge, IE 10+, and Firefox. + */ + +details { + display: block; +} + + +/* + * Add the correct display in all browsers. + */ + +summary { + display: list-item; +} + + +/* Misc + ========================================================================== */ + + +/** + * Add the correct display in IE 10+. + */ + +template { + display: none; +} + + +/** + * Add the correct display in IE 10. + */ + +[hidden] { + display: none; +} + +HTML, +body, +div, +h1, +h2, +h3, +h4, +h5, +h6, +ul, +ol, +dl, +li, +dt, +dd, +p, +blockquote, +pre, +form, +fieldset, +table, +th, +td { + border: none; + font-family: "Helvetica Neue", Helvetica, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", "微软雅黑", Arial, sans-serif; + font-size: 14px; + margin: 0px; + padding: 0px; +} + +html, +body { + height: 100%; + width: 100%; +} + +address, +caption, +cite, +code, +dfn, +em, +strong, +th, +var { + font-style: normal; + font-weight: normal; +} + +a { + text-decoration: none; +} + +a:link { + color: #fff; +} + +a:visited { + color: #fff; +} + +a:hover { + color: #fff; +} + +a:active { + color: #fff; +} + +input::-ms-clear { + display: none; +} + +input::-ms-reveal { + display: none; +} + +input { + -webkit-appearance: none; + margin: 0; + outline: none; + padding: 0; +} + +input::-webkit-input-placeholder { + color: #ccc; +} + +input::-ms-input-placeholder { + color: #ccc; +} + +input::-moz-placeholder { + color: #ccc; +} + +input[type=submit], +input[type=button] { + cursor: pointer; +} + +button[disabled], +input[disabled] { + cursor: default; +} + +img { + border: none; +} + +ul, +ol, +li { + list-style-type: none; +} \ No newline at end of file diff --git a/QMPlusVuePage/src/view/login/login.vue b/QMPlusVuePage/src/view/login/login.vue index 3b99f318fa..ecff8e3029 100644 --- a/QMPlusVuePage/src/view/login/login.vue +++ b/QMPlusVuePage/src/view/login/login.vue @@ -1,7 +1,12 @@ - \ No newline at end of file From 0e19cd4d98f1c93ae86e1be5c9bc832decef2fee Mon Sep 17 00:00:00 2001 From: pixelqm <303176530@qq.com> Date: Mon, 9 Sep 2019 23:02:24 +0800 Subject: [PATCH 004/409] =?UTF-8?q?=E5=BC=95=E5=85=A5vuex=20=E5=92=8Cvuex?= =?UTF-8?q?=E6=8C=81=E4=B9=85=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- QMPlusVuePage/package-lock.json | 22 ++++++++++++++++++++-- QMPlusVuePage/package.json | 4 +++- QMPlusVuePage/src/App.vue | 5 ++++- QMPlusVuePage/src/main.js | 4 +++- QMPlusVuePage/src/store/index.js | 18 ++++++++++++++++++ QMPlusVuePage/src/store/module/user.js | 22 ++++++++++++++++++++++ QMPlusVuePage/src/view/login/login.vue | 9 +++++++++ 7 files changed, 79 insertions(+), 5 deletions(-) create mode 100644 QMPlusVuePage/src/store/index.js create mode 100644 QMPlusVuePage/src/store/module/user.js diff --git a/QMPlusVuePage/package-lock.json b/QMPlusVuePage/package-lock.json index 8cbf3f07ba..112f9a2950 100644 --- a/QMPlusVuePage/package-lock.json +++ b/QMPlusVuePage/package-lock.json @@ -5047,8 +5047,7 @@ "flatted": { "version": "2.0.1", "resolved": "https://registry.npm.taobao.org/flatted/download/flatted-2.0.1.tgz?cache=0&sync_timestamp=1561466276595&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fflatted%2Fdownload%2Fflatted-2.0.1.tgz", - "integrity": "sha1-aeV8qo8OrLwoHS4stFjUb9tEngg=", - "dev": true + "integrity": "sha1-aeV8qo8OrLwoHS4stFjUb9tEngg=" }, "flush-write-stream": { "version": "1.1.1", @@ -7188,6 +7187,11 @@ "integrity": "sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=", "dev": true }, + "lodash.merge": { + "version": "4.6.2", + "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", + "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==" + }, "lodash.transform": { "version": "4.6.0", "resolved": "https://registry.npm.taobao.org/lodash.transform/download/lodash.transform-4.6.0.tgz", @@ -11599,6 +11603,20 @@ "integrity": "sha1-HuO8mhbsv1EYvjNLsV+cRvgvWCU=", "dev": true }, + "vuex": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/vuex/-/vuex-3.1.1.tgz", + "integrity": "sha512-ER5moSbLZuNSMBFnEBVGhQ1uCBNJslH9W/Dw2W7GZN23UQA69uapP5GTT9Vm8Trc0PzBSVt6LzF3hGjmv41xcg==" + }, + "vuex-persist": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/vuex-persist/-/vuex-persist-2.1.0.tgz", + "integrity": "sha512-H9RqXHeynBQG60rUrsinYNLoRFXkSxh2Xx8kTVFuvLRQ9jZd3HLMvm713m2r1dN/pVZBUgiIzTu6uj5hBsAOqg==", + "requires": { + "flatted": "^2.0.0", + "lodash.merge": "^4.6.2" + } + }, "watchpack": { "version": "1.6.0", "resolved": "https://registry.npm.taobao.org/watchpack/download/watchpack-1.6.0.tgz", diff --git a/QMPlusVuePage/package.json b/QMPlusVuePage/package.json index 5e6880e06c..cd1fcdc75b 100644 --- a/QMPlusVuePage/package.json +++ b/QMPlusVuePage/package.json @@ -13,7 +13,9 @@ "node-sass": "^4.12.0", "sass-loader": "^8.0.0", "vue": "^2.6.10", - "vue-router": "^3.1.3" + "vue-router": "^3.1.3", + "vuex": "^3.1.1", + "vuex-persist": "^2.1.0" }, "devDependencies": { "@vue/cli-plugin-babel": "^3.11.0", diff --git a/QMPlusVuePage/src/App.vue b/QMPlusVuePage/src/App.vue index 0b1bb0c800..7fbd56c5d7 100644 --- a/QMPlusVuePage/src/App.vue +++ b/QMPlusVuePage/src/App.vue @@ -10,11 +10,14 @@ export default { name: 'app', components: { - } + }, } + + diff --git a/QMPlusVuePage/src/main.js b/QMPlusVuePage/src/main.js index 2c24f91490..14ad568f46 100644 --- a/QMPlusVuePage/src/main.js +++ b/QMPlusVuePage/src/main.js @@ -7,9 +7,11 @@ Vue.use(ElementUI); // 引入封装的router import router from '@/router/index' +import { store } from '@/store/index' Vue.config.productionTip = false new Vue({ render: h => h(App), - router + router, + store }).$mount('#app') \ No newline at end of file diff --git a/QMPlusVuePage/src/store/index.js b/QMPlusVuePage/src/store/index.js new file mode 100644 index 0000000000..44c2126282 --- /dev/null +++ b/QMPlusVuePage/src/store/index.js @@ -0,0 +1,18 @@ +import Vue from 'vue' +import Vuex from 'vuex' +import VuexPersistence from 'vuex-persist' + +import { User } from "@/store/module/user" +Vue.use(Vuex) + + + +const vuexLocal = new VuexPersistence({ + storage: window.localStorage +}) +export const store = new Vuex.Store({ + modules: { + User + }, + plugins: [vuexLocal.plugin] +}) \ No newline at end of file diff --git a/QMPlusVuePage/src/store/module/user.js b/QMPlusVuePage/src/store/module/user.js new file mode 100644 index 0000000000..2af5c63d06 --- /dev/null +++ b/QMPlusVuePage/src/store/module/user.js @@ -0,0 +1,22 @@ +export const User = { + namespaced: true, + state: { userName: "QM" }, + mutations: { + setUserName(state, name) { + // 这里的 `state` 对象是模块的局部状态 + state.userName = name + } + }, + actions: { + AsyncSetUserName({ commit }, name) { + setTimeout(() => { + commit("setUserName", name) + }, 2000); + } + }, + getters: { + userName(state) { + return state.userName + } + } +} \ No newline at end of file diff --git a/QMPlusVuePage/src/view/login/login.vue b/QMPlusVuePage/src/view/login/login.vue index ecff8e3029..8a1e0c6ee0 100644 --- a/QMPlusVuePage/src/view/login/login.vue +++ b/QMPlusVuePage/src/view/login/login.vue @@ -10,8 +10,17 @@ From e521cd906802b7b54989571d6f24a290810c4a03 Mon Sep 17 00:00:00 2001 From: pixelqm <303176530@qq.com> Date: Wed, 11 Sep 2019 23:12:09 +0800 Subject: [PATCH 005/409] =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=90=9C=E7=B4=A2?= =?UTF-8?q?=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- QMPlusServer/controller/api/user.go | 2 +- QMPlusServer/model/dbModel/user.go | 6 +- QMPlusVuePage/package-lock.json | 77 ++++++++++++++++++++++++-- QMPlusVuePage/package.json | 3 + QMPlusVuePage/src/store/module/user.js | 24 +++++--- 5 files changed, 95 insertions(+), 17 deletions(-) diff --git a/QMPlusServer/controller/api/user.go b/QMPlusServer/controller/api/user.go index 0a98758073..e49c1a7137 100644 --- a/QMPlusServer/controller/api/user.go +++ b/QMPlusServer/controller/api/user.go @@ -56,7 +56,7 @@ func Login(c *gin.Context) { _ = c.BindJSON(&L) U := &dbModel.User{UserName: L.UserName, PassWord: L.PassWord} if err, user := U.Login(); err != nil { - servers.ReportFormat(c, false, "用户名密码错误", gin.H{"user": user}) + servers.ReportFormat(c, false, fmt.Sprintf("用户名密码错误或%v", err), gin.H{"user": user}) } else { tokenNext(c, *user) } diff --git a/QMPlusServer/model/dbModel/user.go b/QMPlusServer/model/dbModel/user.go index ae551799f0..37d80a826d 100644 --- a/QMPlusServer/model/dbModel/user.go +++ b/QMPlusServer/model/dbModel/user.go @@ -17,8 +17,8 @@ type User struct { PassWord string `json:"passWord"` NickName string `json:"nickName" gorm:"default:'QMPlusUser'"` HeaderImg string `json:"headerImg" gorm:"default:'http://www.henrongyi.top/avatar/lufu.jpg'"` - Authority Authority `json:"authority" form:"ForeignKey:AuthorityId;AssociationForeignKey:AuthorityId"` - AuthorityId float64 `json:"authorityId" gorm:"default:888"` + Authority Authority `json:"authority" form:"ForeignKey:authority_id;AssociationForeignKey:authority_id"` + AuthorityId float64 `json:"-" gorm:"default:888"` //Propertie // 多余属性自行添加 //PropertieId uint // 自动关联 Propertie 的Id 附加属性过多建议创建一对一关系 } @@ -64,7 +64,7 @@ func (u *User) Login() (err error, userInter *User) { var user User u.PassWord = tools.MD5V(u.PassWord) err = qmsql.DEFAULTDB.Where("user_name = ? AND pass_word = ?", u.UserName, u.PassWord).First(&user).Error - err = qmsql.DEFAULTDB.Model(&user).Related(&user.Authority).Error + err = qmsql.DEFAULTDB.Where("authority_id = ?", user.AuthorityId).First(&user.Authority).Error return err, &user } diff --git a/QMPlusVuePage/package-lock.json b/QMPlusVuePage/package-lock.json index 112f9a2950..3c51e9f180 100644 --- a/QMPlusVuePage/package-lock.json +++ b/QMPlusVuePage/package-lock.json @@ -1970,6 +1970,43 @@ "resolved": "https://registry.npm.taobao.org/aws4/download/aws4-1.8.0.tgz", "integrity": "sha1-8OAD2cqef1nHpQiUXXsu+aBKVC8=" }, + "axios": { + "version": "0.19.0", + "resolved": "https://registry.npmjs.org/axios/-/axios-0.19.0.tgz", + "integrity": "sha512-1uvKqKQta3KBxIz14F2v06AEHZ/dIoeKfbTRkK1E5oqjDnuEerLmYTgJB5AiQZHJcljpg1TuRzdjDR06qNk0DQ==", + "requires": { + "follow-redirects": "1.5.10", + "is-buffer": "^2.0.2" + }, + "dependencies": { + "debug": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", + "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", + "requires": { + "ms": "2.0.0" + } + }, + "follow-redirects": { + "version": "1.5.10", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.10.tgz", + "integrity": "sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ==", + "requires": { + "debug": "=3.1.0" + } + }, + "is-buffer": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.3.tgz", + "integrity": "sha512-U15Q7MXTuZlrbymiz95PJpZxu8IlipAp4dtS3wOdgPXx3mqBnslrWU14kxfHB+Py/+2PVKSr37dMAgM2A4uArw==" + }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" + } + } + }, "babel-code-frame": { "version": "6.26.0", "resolved": "https://registry.npm.taobao.org/babel-code-frame/download/babel-code-frame-6.26.0.tgz", @@ -8321,6 +8358,30 @@ "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=", "dev": true }, + "path": { + "version": "0.12.7", + "resolved": "https://registry.npmjs.org/path/-/path-0.12.7.tgz", + "integrity": "sha1-1NwqUGxM4hl+tIHr/NWzbAFAsQ8=", + "requires": { + "process": "^0.11.1", + "util": "^0.10.3" + }, + "dependencies": { + "inherits": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", + "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=" + }, + "util": { + "version": "0.10.4", + "resolved": "https://registry.npmjs.org/util/-/util-0.10.4.tgz", + "integrity": "sha512-0Pm9hTQ3se5ll1XihRic3FDIku70C+iHUdT/W926rSgHV5QgXsYbKZN8MSC3tJtSkhuROzvsQjAaFENRXr+19A==", + "requires": { + "inherits": "2.0.3" + } + } + } + }, "path-browserify": { "version": "0.0.1", "resolved": "https://registry.npm.taobao.org/path-browserify/download/path-browserify-0.0.1.tgz", @@ -9072,8 +9133,7 @@ "process": { "version": "0.11.10", "resolved": "https://registry.npm.taobao.org/process/download/process-0.11.10.tgz", - "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=", - "dev": true + "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=" }, "process-nextick-args": { "version": "2.0.1", @@ -9177,9 +9237,9 @@ "dev": true }, "qs": { - "version": "6.5.2", - "resolved": "https://registry.npm.taobao.org/qs/download/qs-6.5.2.tgz?cache=0&sync_timestamp=1566009952956&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fqs%2Fdownload%2Fqs-6.5.2.tgz", - "integrity": "sha1-yzroBuh0BERYTvFUzo7pjUA/PjY=" + "version": "6.8.0", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.8.0.tgz", + "integrity": "sha512-tPSkj8y92PfZVbinY1n84i1Qdx75lZjMQYx9WZhnkofyxzw2r7Ho39G3/aEvSUdebxpnnM4LZJCtvE/Aq3+s9w==" }, "query-string": { "version": "5.1.1", @@ -9578,6 +9638,13 @@ "tough-cookie": "~2.4.3", "tunnel-agent": "^0.6.0", "uuid": "^3.3.2" + }, + "dependencies": { + "qs": { + "version": "6.5.2", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz", + "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==" + } } }, "request-promise-core": { diff --git a/QMPlusVuePage/package.json b/QMPlusVuePage/package.json index cd1fcdc75b..a826959188 100644 --- a/QMPlusVuePage/package.json +++ b/QMPlusVuePage/package.json @@ -8,9 +8,12 @@ "lint": "vue-cli-service lint" }, "dependencies": { + "axios": "^0.19.0", "core-js": "^2.6.5", "element-ui": "^2.12.0", "node-sass": "^4.12.0", + "path": "^0.12.7", + "qs": "^6.8.0", "sass-loader": "^8.0.0", "vue": "^2.6.10", "vue-router": "^3.1.3", diff --git a/QMPlusVuePage/src/store/module/user.js b/QMPlusVuePage/src/store/module/user.js index 2af5c63d06..56efd64b53 100644 --- a/QMPlusVuePage/src/store/module/user.js +++ b/QMPlusVuePage/src/store/module/user.js @@ -1,17 +1,25 @@ -export const User = { +export const user = { namespaced: true, - state: { userName: "QM" }, + state: { + userInfo: { + uuid: "", + nickName: "" + }, + token: "" + }, mutations: { - setUserName(state, name) { + setUserInfo(state, userInfo) { + // 这里的 `state` 对象是模块的局部状态 + state.userInfo = userInfo + }, + setToken(state, token) { // 这里的 `state` 对象是模块的局部状态 - state.userName = name + state.token = token } }, actions: { - AsyncSetUserName({ commit }, name) { - setTimeout(() => { - commit("setUserName", name) - }, 2000); + AsyncSetUserInfo({ commit }, loginInfo) { + } }, getters: { From 8cb68612a27639477a614a4b561235b7b796c5e1 Mon Sep 17 00:00:00 2001 From: pixelqm <303176530@qq.com> Date: Wed, 11 Sep 2019 23:13:50 +0800 Subject: [PATCH 006/409] =?UTF-8?q?axios=E5=B0=81=E8=A3=85=E5=92=8Cconfig?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- QMPlusVuePage/.env.development | 2 + QMPlusVuePage/.env.production | 2 + QMPlusVuePage/src/api/user.js | 13 +++ QMPlusVuePage/src/store/index.js | 4 +- QMPlusVuePage/src/store/module/user.js | 4 +- QMPlusVuePage/src/utils/request.js | 56 +++++++++++++ QMPlusVuePage/src/view/login/login.vue | 14 ++-- QMPlusVuePage/vue.config.js | 105 +++++++++++++++++++++++++ 8 files changed, 191 insertions(+), 9 deletions(-) create mode 100644 QMPlusVuePage/.env.development create mode 100644 QMPlusVuePage/.env.production create mode 100644 QMPlusVuePage/src/api/user.js create mode 100644 QMPlusVuePage/src/utils/request.js create mode 100644 QMPlusVuePage/vue.config.js diff --git a/QMPlusVuePage/.env.development b/QMPlusVuePage/.env.development new file mode 100644 index 0000000000..1411c73242 --- /dev/null +++ b/QMPlusVuePage/.env.development @@ -0,0 +1,2 @@ +ENV = 'development' +VUE_APP_BASE_API = '/api' \ No newline at end of file diff --git a/QMPlusVuePage/.env.production b/QMPlusVuePage/.env.production new file mode 100644 index 0000000000..043537b4dc --- /dev/null +++ b/QMPlusVuePage/.env.production @@ -0,0 +1,2 @@ +ENV = 'production' +VUE_APP_BASE_API = '/' \ No newline at end of file diff --git a/QMPlusVuePage/src/api/user.js b/QMPlusVuePage/src/api/user.js new file mode 100644 index 0000000000..823bd5baff --- /dev/null +++ b/QMPlusVuePage/src/api/user.js @@ -0,0 +1,13 @@ +import service from '@/utils/request' + +// @Summary 用户登录 +// @Produce application/json +// @Param data body {userName:"string",passWord:"string"} +// @Router /base/login [post] +export const login = (data) => { + service({ + url: "/base/login", + method: 'post', + data: data + }) +} \ No newline at end of file diff --git a/QMPlusVuePage/src/store/index.js b/QMPlusVuePage/src/store/index.js index 44c2126282..6efab797d3 100644 --- a/QMPlusVuePage/src/store/index.js +++ b/QMPlusVuePage/src/store/index.js @@ -2,7 +2,7 @@ import Vue from 'vue' import Vuex from 'vuex' import VuexPersistence from 'vuex-persist' -import { User } from "@/store/module/user" +import { user } from "@/store/module/user" Vue.use(Vuex) @@ -12,7 +12,7 @@ const vuexLocal = new VuexPersistence({ }) export const store = new Vuex.Store({ modules: { - User + user }, plugins: [vuexLocal.plugin] }) \ No newline at end of file diff --git a/QMPlusVuePage/src/store/module/user.js b/QMPlusVuePage/src/store/module/user.js index 56efd64b53..5558682709 100644 --- a/QMPlusVuePage/src/store/module/user.js +++ b/QMPlusVuePage/src/store/module/user.js @@ -18,9 +18,9 @@ export const user = { } }, actions: { - AsyncSetUserInfo({ commit }, loginInfo) { + // AsyncSetUserInfo({ commit }, loginInfo) { - } + // } }, getters: { userName(state) { diff --git a/QMPlusVuePage/src/utils/request.js b/QMPlusVuePage/src/utils/request.js new file mode 100644 index 0000000000..59e00c3c78 --- /dev/null +++ b/QMPlusVuePage/src/utils/request.js @@ -0,0 +1,56 @@ +import axios from 'axios'; // 引入axios +import { Message } from 'element-ui'; +import { store } from '@/store/index' + +const service = axios.create({ + baseURL: process.env.VUE_APP_BASE_API, + timeout: 5000 +}) + +//http request 拦截器 +service.interceptors.request.use( + config => { + const token = store.getters['user/token'] + config.data = JSON.stringify(config.data); + config.headers = { + 'Content-Type': 'application/json', + 'x-token': token + } + return config; + }, + error => { + Message({ + showClose: true, + message: error, + type: 'error' + }) + return Promise.reject(error); + } +); + + +//http response 拦截器 +service.interceptors.response.use( + response => { + if (response.data.success) { + return response.data + } else { + Message({ + showClose: true, + message: response.data.msg, + type: 'error' + }) + return Promise.reject(response.data.msg) + } + }, + error => { + Message({ + showClose: true, + message: error, + type: 'error' + }) + return Promise.reject(error) + } +) + +export default service \ No newline at end of file diff --git a/QMPlusVuePage/src/view/login/login.vue b/QMPlusVuePage/src/view/login/login.vue index 8a1e0c6ee0..c09765492a 100644 --- a/QMPlusVuePage/src/view/login/login.vue +++ b/QMPlusVuePage/src/view/login/login.vue @@ -2,7 +2,7 @@

登录

输入框在这里 - + 登录 @@ -11,15 +11,19 @@ diff --git a/QMPlusVuePage/vue.config.js b/QMPlusVuePage/vue.config.js new file mode 100644 index 0000000000..893e63dec0 --- /dev/null +++ b/QMPlusVuePage/vue.config.js @@ -0,0 +1,105 @@ +'use strict' + +const path = require('path') + +function resolve(dir) { + return path.join(__dirname, dir) +} +module.exports = { + /** + * You will need to set publicPath if you plan to deploy your site under a sub path, + * for example GitHub Pages. If you plan to deploy your site to https://foo.github.io/bar/, + * then publicPath should be set to "/bar/". + * In most cases please use '/' !!! + * Detail: https://cli.vuejs.org/config/#publicpath + */ + publicPath: '/', + outputDir: 'dist', + assetsDir: 'static', + lintOnSave: process.env.NODE_ENV === 'development', + productionSourceMap: false, + devServer: { + port: 8080, + open: true, + overlay: { + warnings: false, + errors: true + }, + proxy: { + // change xxx-api/login => mock/login + // detail: https://cli.vuejs.org/config/#devserver-proxy + [process.env.VUE_APP_BASE_API]: { + target: `http://127.0.0.1:8888`, + changeOrigin: true, + pathRewrite: { + ['^' + process.env.VUE_APP_BASE_API]: '' + } + } + }, + }, + configureWebpack: { + // provide the app's title in webpack's name field, so that + // it can be accessed in index.html to inject the correct title. + resolve: { + alias: { + '@': resolve('src') + } + } + }, + chainWebpack(config) { + // set preserveWhitespace + config.module + .rule('vue') + .use('vue-loader') + .loader('vue-loader') + .tap(options => { + options.compilerOptions.preserveWhitespace = true + return options + }) + .end() + config + // https://webpack.js.org/configuration/devtool/#development + .when(process.env.NODE_ENV === 'development', + config => config.devtool('cheap-source-map') + ) + + config + .when(process.env.NODE_ENV !== 'development', + config => { + config + .plugin('ScriptExtHtmlWebpackPlugin') + .after('html') + .use('script-ext-html-webpack-plugin', [{ + // `runtime` must same as runtimeChunk name. default is `runtime` + inline: /runtime\..*\.js$/ + }]) + .end() + config + .optimization.splitChunks({ + chunks: 'all', + cacheGroups: { + libs: { + name: 'chunk-libs', + test: /[\\/]node_modules[\\/]/, + priority: 10, + chunks: 'initial' // only package third parties that are initially dependent + }, + elementUI: { + name: 'chunk-elementUI', // split elementUI into a single package + priority: 20, // the weight needs to be larger than libs and app or it will be packaged into libs or app + test: /[\\/]node_modules[\\/]_?element-ui(.*)/ // in order to adapt to cnpm + }, + commons: { + name: 'chunk-commons', + test: resolve('src/components'), // can customize your rules + minChunks: 3, // minimum common number + priority: 5, + reuseExistingChunk: true + } + } + }) + config.optimization.runtimeChunk('single') + } + ) + } +} \ No newline at end of file From 0acb0298ca0ab1886de29b1008c7ee2b5f33817c Mon Sep 17 00:00:00 2001 From: pixelqm <303176530@qq.com> Date: Fri, 13 Sep 2019 16:58:36 +0800 Subject: [PATCH 007/409] username password --- QMPlusServer/config/config.go | 2 +- QMPlusServer/config/dbconfig/config.json | 2 +- QMPlusServer/controller/api/user.go | 36 ++++++++++++------------ QMPlusServer/docs/docs.go | 18 ++++++------ QMPlusServer/docs/swagger.json | 18 ++++++------ QMPlusServer/docs/swagger.yaml | 18 ++++++------ QMPlusServer/init/qmsql/initMysql.go | 2 +- QMPlusServer/model/dbModel/user.go | 22 +++++++-------- QMPlusServer/router/user.go | 2 +- QMPlusVuePage/src/store/module/user.js | 23 +++++++++++---- 10 files changed, 77 insertions(+), 66 deletions(-) diff --git a/QMPlusServer/config/config.go b/QMPlusServer/config/config.go index 0a21b08c7e..e0607ab4a7 100644 --- a/QMPlusServer/config/config.go +++ b/QMPlusServer/config/config.go @@ -10,7 +10,7 @@ type Config struct { Admin Admin } type Admin struct { - UserName string + Username string Password string Path string Dbname string diff --git a/QMPlusServer/config/dbconfig/config.json b/QMPlusServer/config/dbconfig/config.json index 86082d37e7..72860b6a34 100644 --- a/QMPlusServer/config/dbconfig/config.json +++ b/QMPlusServer/config/dbconfig/config.json @@ -1,6 +1,6 @@ { "admin": { - "userName": "root", + "username": "root", "password": "Aa@6447985", "path": "127.0.0.1:3306", "dbname": "QMPlus", diff --git a/QMPlusServer/controller/api/user.go b/QMPlusServer/controller/api/user.go index e49c1a7137..835fa370f2 100644 --- a/QMPlusServer/controller/api/user.go +++ b/QMPlusServer/controller/api/user.go @@ -18,8 +18,8 @@ var ( ) type RegistAndLoginStuct struct { - UserName string `json:"userName"` - PassWord string `json:"passWord"` + Username string `json:"username"` + Password string `json:"password"` } // @Tags Base @@ -32,7 +32,7 @@ func Regist(c *gin.Context) { var R RegistAndLoginStuct _ = c.BindJSON(&R) - U := &dbModel.User{UserName: R.UserName, PassWord: R.PassWord} + U := &dbModel.User{Username: R.Username, Password: R.Password} err, user := U.Regist() if err != nil { servers.ReportFormat(c, false, fmt.Sprintf("%v", err), gin.H{ @@ -54,9 +54,9 @@ func Regist(c *gin.Context) { func Login(c *gin.Context) { var L RegistAndLoginStuct _ = c.BindJSON(&L) - U := &dbModel.User{UserName: L.UserName, PassWord: L.PassWord} + U := &dbModel.User{Username: L.Username, Password: L.Password} if err, user := U.Login(); err != nil { - servers.ReportFormat(c, false, fmt.Sprintf("用户名密码错误或%v", err), gin.H{"user": user}) + servers.ReportFormat(c, false, fmt.Sprintf("用户名密码错误或%v", err), gin.H{}) } else { tokenNext(c, *user) } @@ -86,24 +86,24 @@ func tokenNext(c *gin.Context, user dbModel.User) { } } -type ChangePassWordStutrc struct { - UserName string `json:"userName"` - PassWord string `json:"passWord"` - NewPassWord string `json:"newPassWord"` +type ChangePasswordStutrc struct { + Username string `json:"username"` + Password string `json:"password"` + NewPassword string `json:"newPassword"` } // @Tags User // @Summary 用户修改密码 // @Security ApiKeyAuth // @Produce application/json -// @Param data body api.ChangePassWordStutrc true "用户修改密码" +// @Param data body api.ChangePasswordStutrc true "用户修改密码" // @Success 200 {string} json "{"success":true,"data":{},"msg":"修改成功"}" -// @Router /user/changePassWord [post] -func ChangePassWord(c *gin.Context) { - var params ChangePassWordStutrc +// @Router /user/changePassword [post] +func ChangePassword(c *gin.Context) { + var params ChangePasswordStutrc _ = c.BindJSON(¶ms) - U := &dbModel.User{UserName: params.UserName, PassWord: params.PassWord} - if err, _ := U.ChangePassWord(params.NewPassWord); err != nil { + U := &dbModel.User{Username: params.Username, Password: params.Password} + if err, _ := U.ChangePassword(params.NewPassword); err != nil { servers.ReportFormat(c, false, "修改失败，请检查用户名密码", gin.H{}) } else { servers.ReportFormat(c, true, "修改成功", gin.H{}) @@ -120,7 +120,7 @@ type UserHeaderImg struct { // @accept multipart/form-data // @Produce application/json // @Param headerImg formData file true "用户上传头像" -// @Param userName formData string true "用户上传头像" +// @Param username formData string true "用户上传头像" // @Success 200 {string} json "{"success":true,"data":{},"msg":"上传成功"}" // @Router /user/uploadHeaderImg [post] func UploadHeaderImg(c *gin.Context) { @@ -131,7 +131,7 @@ func UploadHeaderImg(c *gin.Context) { fmt.Println(waitUse.NickName) _, header, err := c.Request.FormFile("headerImg") //便于找到用户以后从jwt中取 - userName := c.PostForm("userName") + username := c.PostForm("username") if err != nil { servers.ReportFormat(c, false, fmt.Sprintf("上传文件失败，%v", err), gin.H{}) } else { @@ -141,7 +141,7 @@ func UploadHeaderImg(c *gin.Context) { servers.ReportFormat(c, false, fmt.Sprintf("接收返回值失败，%v", err), gin.H{}) } else { //修改数据库后得到修改后的user并且返回供前端使用 - err, user := new(dbModel.User).UploadHeaderImg(userName, filePath) + err, user := new(dbModel.User).UploadHeaderImg(username, filePath) if err != nil { servers.ReportFormat(c, false, fmt.Sprintf("修改数据库链接失败，%v", err), gin.H{}) diff --git a/QMPlusServer/docs/docs.go b/QMPlusServer/docs/docs.go index 2078f2546c..cc0fa4c988 100644 --- a/QMPlusServer/docs/docs.go +++ b/QMPlusServer/docs/docs.go @@ -244,7 +244,7 @@ var doc = `{ } } }, - "/user/changePassWord": { + "/user/changePassword": { "post": { "security": [ { @@ -266,7 +266,7 @@ var doc = `{ "required": true, "schema": { "type": "object", - "$ref": "#/definitions/api.ChangePassWordStutrc" + "$ref": "#/definitions/api.ChangePasswordStutrc" } } ], @@ -347,7 +347,7 @@ var doc = `{ { "type": "string", "description": "用户上传头像", - "name": "userName", + "name": "username", "in": "formData", "required": true } @@ -364,16 +364,16 @@ var doc = `{ } }, "definitions": { - "api.ChangePassWordStutrc": { + "api.ChangePasswordStutrc": { "type": "object", "properties": { - "newPassWord": { + "newPassword": { "type": "string" }, - "passWord": { + "password": { "type": "string" }, - "userName": { + "username": { "type": "string" } } @@ -414,10 +414,10 @@ var doc = `{ "api.RegistAndLoginStuct": { "type": "object", "properties": { - "passWord": { + "password": { "type": "string" }, - "userName": { + "username": { "type": "string" } } diff --git a/QMPlusServer/docs/swagger.json b/QMPlusServer/docs/swagger.json index b8d8acffc5..0b0d627cd7 100644 --- a/QMPlusServer/docs/swagger.json +++ b/QMPlusServer/docs/swagger.json @@ -227,7 +227,7 @@ } } }, - "/user/changePassWord": { + "/user/changePassword": { "post": { "security": [ { @@ -249,7 +249,7 @@ "required": true, "schema": { "type": "object", - "$ref": "#/definitions/api.ChangePassWordStutrc" + "$ref": "#/definitions/api.ChangePasswordStutrc" } } ], @@ -330,7 +330,7 @@ { "type": "string", "description": "用户上传头像", - "name": "userName", + "name": "username", "in": "formData", "required": true } @@ -347,16 +347,16 @@ } }, "definitions": { - "api.ChangePassWordStutrc": { + "api.ChangePasswordStutrc": { "type": "object", "properties": { - "newPassWord": { + "newPassword": { "type": "string" }, - "passWord": { + "password": { "type": "string" }, - "userName": { + "username": { "type": "string" } } @@ -397,10 +397,10 @@ "api.RegistAndLoginStuct": { "type": "object", "properties": { - "passWord": { + "password": { "type": "string" }, - "userName": { + "username": { "type": "string" } } diff --git a/QMPlusServer/docs/swagger.yaml b/QMPlusServer/docs/swagger.yaml index ff17ba4e96..c24a745be8 100644 --- a/QMPlusServer/docs/swagger.yaml +++ b/QMPlusServer/docs/swagger.yaml @@ -1,12 +1,12 @@ basePath: / definitions: - api.ChangePassWordStutrc: + api.ChangePasswordStutrc: properties: - newPassWord: + newPassword: type: string - passWord: + password: type: string - userName: + username: type: string type: object api.CreateApiParams: @@ -32,9 +32,9 @@ definitions: type: object api.RegistAndLoginStuct: properties: - passWord: + password: type: string - userName: + username: type: string type: object modelInterface.PageInfo: @@ -187,7 +187,7 @@ paths: summary: 用户注册账号 tags: - Base - /user/changePassWord: + /user/changePassword: post: parameters: - description: 用户修改密码 @@ -195,7 +195,7 @@ paths: name: data required: true schema: - $ref: '#/definitions/api.ChangePassWordStutrc' + $ref: '#/definitions/api.ChangePasswordStutrc' type: object produces: - application/json @@ -245,7 +245,7 @@ paths: type: file - description: 用户上传头像 in: formData - name: userName + name: username required: true type: string produces: diff --git a/QMPlusServer/init/qmsql/initMysql.go b/QMPlusServer/init/qmsql/initMysql.go index 05d85febd7..e4addc3094 100644 --- a/QMPlusServer/init/qmsql/initMysql.go +++ b/QMPlusServer/init/qmsql/initMysql.go @@ -11,7 +11,7 @@ var DEFAULTDB *gorm.DB //初始化数据库并产生数据库全局变量 func InitMysql(admin config.Admin) *gorm.DB { - if db, err := gorm.Open("mysql", admin.UserName+":"+admin.Password+"@("+admin.Path+")/"+admin.Dbname+"?"+admin.Config); err != nil { + if db, err := gorm.Open("mysql", admin.Username+":"+admin.Password+"@("+admin.Path+")/"+admin.Dbname+"?"+admin.Config); err != nil { log.Printf("DEFAULTDB数据库启动异常%S", err) } else { DEFAULTDB = db diff --git a/QMPlusServer/model/dbModel/user.go b/QMPlusServer/model/dbModel/user.go index 37d80a826d..e61f0e2eb1 100644 --- a/QMPlusServer/model/dbModel/user.go +++ b/QMPlusServer/model/dbModel/user.go @@ -13,8 +13,8 @@ import ( type User struct { gorm.Model `json:"-"` UUID uuid.UUID `json:"uuid"` - UserName string `json:"userName"` - PassWord string `json:"passWord"` + Username string `json:"-"` + Password string `json:"-"` NickName string `json:"nickName" gorm:"default:'QMPlusUser'"` HeaderImg string `json:"headerImg" gorm:"default:'http://www.henrongyi.top/avatar/lufu.jpg'"` Authority Authority `json:"authority" form:"ForeignKey:authority_id;AssociationForeignKey:authority_id"` @@ -31,13 +31,13 @@ type User struct { func (u *User) Regist() (err error, userInter *User) { var user User //判断用户名是否注册 - findErr := qmsql.DEFAULTDB.Where("user_name = ?", u.UserName).First(&user).Error + findErr := qmsql.DEFAULTDB.Where("user_name = ?", u.Username).First(&user).Error //err为nil表明读取到了不能注册 if findErr == nil { return errors.New("用户名已注册"), nil } else { // 否则附加uuid 密码md5简单加密注册 - u.PassWord = tools.MD5V(u.PassWord) + u.Password = tools.MD5V(u.Password) u.UUID = uuid.NewV4() err = qmsql.DEFAULTDB.Create(u).Error } @@ -45,11 +45,11 @@ func (u *User) Regist() (err error, userInter *User) { } //修改用户密码 -func (u *User) ChangePassWord(newPassWord string) (err error, userInter *User) { +func (u *User) ChangePassword(newPassword string) (err error, userInter *User) { var user User //后期修改jwt+password模式 - u.PassWord = tools.MD5V(u.PassWord) - err = qmsql.DEFAULTDB.Where("user_name = ? AND pass_word = ?", u.UserName, u.PassWord).First(&user).Update("pass_word", tools.MD5V(newPassWord)).Error + u.Password = tools.MD5V(u.Password) + err = qmsql.DEFAULTDB.Where("user_name = ? AND pass_word = ?", u.Username, u.Password).First(&user).Update("pass_word", tools.MD5V(newPassword)).Error return err, u } @@ -62,16 +62,16 @@ func (u *User) UpdataUser() (err error, userInter *User) { //用户登录 func (u *User) Login() (err error, userInter *User) { var user User - u.PassWord = tools.MD5V(u.PassWord) - err = qmsql.DEFAULTDB.Where("user_name = ? AND pass_word = ?", u.UserName, u.PassWord).First(&user).Error + u.Password = tools.MD5V(u.Password) + err = qmsql.DEFAULTDB.Where("user_name = ? AND pass_word = ?", u.Username, u.Password).First(&user).Error err = qmsql.DEFAULTDB.Where("authority_id = ?", user.AuthorityId).First(&user.Authority).Error return err, &user } // 用户头像上传更新地址 -func (u *User) UploadHeaderImg(userName string, filePath string) (err error, userInter *User) { +func (u *User) UploadHeaderImg(username string, filePath string) (err error, userInter *User) { var user User - err = qmsql.DEFAULTDB.Where("user_name = ?", userName).First(&user).Update("header_img", filePath).First(&user).Error + err = qmsql.DEFAULTDB.Where("user_name = ?", username).First(&user).Update("header_img", filePath).First(&user).Error return err, &user } diff --git a/QMPlusServer/router/user.go b/QMPlusServer/router/user.go index d1c5c23cd4..1cce93e645 100644 --- a/QMPlusServer/router/user.go +++ b/QMPlusServer/router/user.go @@ -9,7 +9,7 @@ import ( func InitUserRouter(Router *gin.Engine) { UserRouter := Router.Group("user").Use(middleware.JWTAuth()) { - UserRouter.POST("changePassWord", api.ChangePassWord) + UserRouter.POST("changePassword", api.ChangePassword) UserRouter.POST("uploadHeaderImg", api.UploadHeaderImg) UserRouter.POST("getInfoList", api.GetInfoList) } diff --git a/QMPlusVuePage/src/store/module/user.js b/QMPlusVuePage/src/store/module/user.js index 5558682709..a482a40e5b 100644 --- a/QMPlusVuePage/src/store/module/user.js +++ b/QMPlusVuePage/src/store/module/user.js @@ -1,9 +1,13 @@ +import { login } from '@/api/user' + export const user = { namespaced: true, state: { userInfo: { uuid: "", - nickName: "" + nickName: "", + headerImg: "", + authority: "", }, token: "" }, @@ -18,13 +22,20 @@ export const user = { } }, actions: { - // AsyncSetUserInfo({ commit }, loginInfo) { - - // } + LoginIn({ commit }, loginInfo) { + login(loginInfo).then(res => { + commit('setUserInfo', res.data.user) + commit('setToken', res.data.token) + return res + }).catch(err => { + console.error(err) + return Promise.reject(err) + }) + } }, getters: { - userName(state) { - return state.userName + userInfo(state) { + return state.userInfo } } } \ No newline at end of file From 60521295b38cac24ddfaf166b18a28371bb6fd6a Mon Sep 17 00:00:00 2001 From: pixelqm <303176530@qq.com> Date: Sat, 14 Sep 2019 22:30:04 +0800 Subject: [PATCH 008/409] =?UTF-8?q?=E5=8A=A8=E6=80=81=E8=B7=AF=E7=94=B1?= =?UTF-8?q?=E5=A4=A7=E4=BD=93=E5=AE=9E=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- QMPlusVuePage/src/api/menu.js | 12 +++ QMPlusVuePage/src/api/user.js | 16 +++- QMPlusVuePage/src/main.js | 2 +- QMPlusVuePage/src/permission.js | 60 ++++++++------ QMPlusVuePage/src/router/index.js | 9 +-- QMPlusVuePage/src/store/index.js | 8 +- QMPlusVuePage/src/store/module/router.js | 36 +++++++++ QMPlusVuePage/src/store/module/user.js | 38 +++++++-- QMPlusVuePage/src/view/login/login.vue | 90 +++++++++++++++------ QMPlusVuePage/src/view/login/regist.vue | 99 ++++++++++++++++++++++-- 10 files changed, 298 insertions(+), 72 deletions(-) create mode 100644 QMPlusVuePage/src/api/menu.js create mode 100644 QMPlusVuePage/src/store/module/router.js diff --git a/QMPlusVuePage/src/api/menu.js b/QMPlusVuePage/src/api/menu.js new file mode 100644 index 0000000000..04c02a7d9a --- /dev/null +++ b/QMPlusVuePage/src/api/menu.js @@ -0,0 +1,12 @@ +import service from '@/utils/request' + +// @Summary 用户登录 +// @Produce application/json +// @Param 可以什么都不填调一下即可 +// @Router /menu/getMenu [post] +export const asyncMenu = () => { + return service({ + url: "/menu/getMenu", + method: 'post', + }) +} \ No newline at end of file diff --git a/QMPlusVuePage/src/api/user.js b/QMPlusVuePage/src/api/user.js index 823bd5baff..c5aadf5f88 100644 --- a/QMPlusVuePage/src/api/user.js +++ b/QMPlusVuePage/src/api/user.js @@ -2,12 +2,24 @@ import service from '@/utils/request' // @Summary 用户登录 // @Produce application/json -// @Param data body {userName:"string",passWord:"string"} +// @Param data body {username:"string",password:"string"} // @Router /base/login [post] export const login = (data) => { - service({ + return service({ url: "/base/login", method: 'post', data: data }) +} + +// @Summary 用户注册 +// @Produce application/json +// @Param data body {username:"string",password:"string"} +// @Router /base/resige [post] +export const regist = (data) => { + return service({ + url: "/base/regist", + method: 'post', + data: data + }) } \ No newline at end of file diff --git a/QMPlusVuePage/src/main.js b/QMPlusVuePage/src/main.js index 14ad568f46..2a532b0c8f 100644 --- a/QMPlusVuePage/src/main.js +++ b/QMPlusVuePage/src/main.js @@ -6,7 +6,7 @@ import 'element-ui/lib/theme-chalk/index.css'; Vue.use(ElementUI); // 引入封装的router import router from '@/router/index' - +import '@/permission' import { store } from '@/store/index' Vue.config.productionTip = false diff --git a/QMPlusVuePage/src/permission.js b/QMPlusVuePage/src/permission.js index 2e4a9cff33..7436485b85 100644 --- a/QMPlusVuePage/src/permission.js +++ b/QMPlusVuePage/src/permission.js @@ -1,26 +1,40 @@ import router from './router' -import { asyncRouterHandle } from '@/utils/asyncRouter'; +import { store } from '@/store/index' -router.beforeEach((to, from, next) => { - next() - // asyncRouterHandle(asyncRouter) // 等待动态使用 VUEX持久化会将其放入 vuex并且动态生成左侧列表 - // router.addRoutes(asyncRouter) -}) +let asyncRouterFlag = 0 -const asyncRouter = [{ - path: '/layout', - name: 'layout', - component: 'view/layout/index.vue', - meta: { - title: '首页', - }, - children: [{ - path: 'dashbord', - name: 'dashbord', - component: 'view/dashbord/index.vue' - }, { - path: "test", - name: "test", - component: "view/test/index.vue" - }] -}] \ No newline at end of file +const whiteList = ['login', 'regist'] +router.beforeEach(async(to, from, next) => { + const token = store.getters['user/token'] + // 在白名单中的判断情况 + if (whiteList.indexOf(to.name) > -1) { + if (token) { + next({ name: 'dashbord' }) + } else { + next() + } + } else { + // 不在白名单中并且已经登陆的时候 + if (token) { + // 添加flag防止多次获取动态路由和栈溢出 + if (!asyncRouterFlag) { + asyncRouterFlag++ + await store.dispatch('router/SetAsyncRouter') + const asyncRouters = store.getters['router/asyncRouters'] + router.addRoutes(asyncRouters) + next({...to, replace: true }) + } else { + next() + } + } + // 不在白名单中并且未登陆的时候 + if (!token) { + next({ + name: "login", + query: { + redirect: document.location.hash + } + }) + } + } +}) \ No newline at end of file diff --git a/QMPlusVuePage/src/router/index.js b/QMPlusVuePage/src/router/index.js index 91fe539eca..6a639b5c31 100644 --- a/QMPlusVuePage/src/router/index.js +++ b/QMPlusVuePage/src/router/index.js @@ -20,15 +20,10 @@ const baseRouters = [{ import ('@/view/login/regist.vue') }, { - path: "/error", - name: "error", + path: "/404", + name: "404", component: () => import ('@/view/error/index.vue') - }, - { - path: '*', - redirect: '/error' - } ] diff --git a/QMPlusVuePage/src/store/index.js b/QMPlusVuePage/src/store/index.js index 6efab797d3..c3014ce7ec 100644 --- a/QMPlusVuePage/src/store/index.js +++ b/QMPlusVuePage/src/store/index.js @@ -3,16 +3,20 @@ import Vuex from 'vuex' import VuexPersistence from 'vuex-persist' import { user } from "@/store/module/user" +import { router } from "@/store/module/router" + Vue.use(Vuex) const vuexLocal = new VuexPersistence({ - storage: window.localStorage + storage: window.localStorage, + modules: ['user'] }) export const store = new Vuex.Store({ modules: { - user + user, + router }, plugins: [vuexLocal.plugin] }) \ No newline at end of file diff --git a/QMPlusVuePage/src/store/module/router.js b/QMPlusVuePage/src/store/module/router.js new file mode 100644 index 0000000000..f95a83eaf9 --- /dev/null +++ b/QMPlusVuePage/src/store/module/router.js @@ -0,0 +1,36 @@ +import { asyncRouterHandle } from '@/utils/asyncRouter'; + +import { asyncMenu } from '@/api/menu' + +export const router = { + namespaced: true, + state: { + asyncRouters: [] + }, + mutations: { + // 设置动态路由 + setAsyncRouter(state, asyncRouters) { + state.asyncRouters = asyncRouters + } + }, + actions: { + // 从后台获取动态路由 + async SetAsyncRouter({ commit }) { + const asyncRouterRes = await asyncMenu() + const asyncRouter = asyncRouterRes.data.menus + asyncRouter.push({ + path: '*', + redirect: '/404' + + }) + asyncRouterHandle(asyncRouter) // 等待动态使用 VUEX持久化会将其放入 vuex并且动态生成左侧列表 + commit('setAsyncRouter', asyncRouter) + } + }, + getters: { + // 获取动态路由 + asyncRouters(state) { + return state.asyncRouters + } + } +} \ No newline at end of file diff --git a/QMPlusVuePage/src/store/module/user.js b/QMPlusVuePage/src/store/module/user.js index a482a40e5b..24b720d119 100644 --- a/QMPlusVuePage/src/store/module/user.js +++ b/QMPlusVuePage/src/store/module/user.js @@ -1,5 +1,6 @@ import { login } from '@/api/user' - +import router from '@/router/index' +import { Message } from 'element-ui' export const user = { namespaced: true, state: { @@ -9,7 +10,8 @@ export const user = { headerImg: "", authority: "", }, - token: "" + token: "", + expiresAt: "" }, mutations: { setUserInfo(state, userInfo) { @@ -19,23 +21,43 @@ export const user = { setToken(state, token) { // 这里的 `state` 对象是模块的局部状态 state.token = token + }, + setExpiresAt(state, expiresAt) { + // 这里的 `state` 对象是模块的局部状态 + state.expiresAt = expiresAt } }, actions: { - LoginIn({ commit }, loginInfo) { - login(loginInfo).then(res => { + async LoginIn({ commit }, loginInfo) { + try { + const res = await login(loginInfo) commit('setUserInfo', res.data.user) commit('setToken', res.data.token) - return res - }).catch(err => { - console.error(err) + commit('setExpiresAt', res.data.expiresAt) + if (res.success) { + const redirect = router.history.current.query.redirect + if (redirect) { + router.push({ path: redirect }) + } else { + router.push({ path: '/layout/dashboard' }) + } + } + } catch (err) { + Message({ + type: 'error', + message: err, + showClose: true + }) return Promise.reject(err) - }) + } } }, getters: { userInfo(state) { return state.userInfo + }, + token(state) { + return state.token } } } \ No newline at end of file diff --git a/QMPlusVuePage/src/view/login/login.vue b/QMPlusVuePage/src/view/login/login.vue index c09765492a..31291f8a76 100644 --- a/QMPlusVuePage/src/view/login/login.vue +++ b/QMPlusVuePage/src/view/login/login.vue @@ -1,35 +1,81 @@ \ No newline at end of file diff --git a/QMPlusVuePage/src/view/login/regist.vue b/QMPlusVuePage/src/view/login/regist.vue index 7945e4ed70..604ab31ff7 100644 --- a/QMPlusVuePage/src/view/login/regist.vue +++ b/QMPlusVuePage/src/view/login/regist.vue @@ -1,16 +1,101 @@ - \ No newline at end of file From 176ff03324cc98266b843141e79157d30f791f9e Mon Sep 17 00:00:00 2001 From: pixelqm <303176530@qq.com> Date: Sat, 14 Sep 2019 22:30:28 +0800 Subject: [PATCH 009/409] =?UTF-8?q?username=20password=20bug=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- QMPlusServer/controller/api/user.go | 10 +++++----- QMPlusServer/model/dbModel/user.go | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/QMPlusServer/controller/api/user.go b/QMPlusServer/controller/api/user.go index 835fa370f2..b1e27fa5ea 100644 --- a/QMPlusServer/controller/api/user.go +++ b/QMPlusServer/controller/api/user.go @@ -39,7 +39,7 @@ func Regist(c *gin.Context) { "user": user, }) } else { - servers.ReportFormat(c, false, "创建成功", gin.H{ + servers.ReportFormat(c, true, "创建成功", gin.H{ "user": user, }) } @@ -73,16 +73,16 @@ func tokenNext(c *gin.Context, user dbModel.User) { NickName: user.NickName, AuthorityId: user.AuthorityId, StandardClaims: jwt.StandardClaims{ - NotBefore: int64(time.Now().Unix() - 1000), // 签名生效时间 - ExpiresAt: int64(time.Now().Unix() + 3600*7), // 过期时间一周 - Issuer: "qmPlus", //签名的发行者 + NotBefore: int64(time.Now().Unix() - 1000), // 签名生效时间 + ExpiresAt: int64(time.Now().Unix() + 60*60*24*7), // 过期时间一周 + Issuer: "qmPlus", //签名的发行者 }, } token, err := j.CreateToken(clams) if err != nil { servers.ReportFormat(c, false, "获取token失败", gin.H{}) } else { - servers.ReportFormat(c, true, "登录成功", gin.H{"user": user, "token": token}) + servers.ReportFormat(c, true, "登录成功", gin.H{"user": user, "token": token, "expiresAt": clams.StandardClaims.ExpiresAt * 1000}) } } diff --git a/QMPlusServer/model/dbModel/user.go b/QMPlusServer/model/dbModel/user.go index e61f0e2eb1..c73aa4a537 100644 --- a/QMPlusServer/model/dbModel/user.go +++ b/QMPlusServer/model/dbModel/user.go @@ -31,7 +31,7 @@ type User struct { func (u *User) Regist() (err error, userInter *User) { var user User //判断用户名是否注册 - findErr := qmsql.DEFAULTDB.Where("user_name = ?", u.Username).First(&user).Error + findErr := qmsql.DEFAULTDB.Where("username = ?", u.Username).First(&user).Error //err为nil表明读取到了不能注册 if findErr == nil { return errors.New("用户名已注册"), nil @@ -49,7 +49,7 @@ func (u *User) ChangePassword(newPassword string) (err error, userInter *User) { var user User //后期修改jwt+password模式 u.Password = tools.MD5V(u.Password) - err = qmsql.DEFAULTDB.Where("user_name = ? AND pass_word = ?", u.Username, u.Password).First(&user).Update("pass_word", tools.MD5V(newPassword)).Error + err = qmsql.DEFAULTDB.Where("username = ? AND password = ?", u.Username, u.Password).First(&user).Update("password", tools.MD5V(newPassword)).Error return err, u } @@ -63,7 +63,7 @@ func (u *User) UpdataUser() (err error, userInter *User) { func (u *User) Login() (err error, userInter *User) { var user User u.Password = tools.MD5V(u.Password) - err = qmsql.DEFAULTDB.Where("user_name = ? AND pass_word = ?", u.Username, u.Password).First(&user).Error + err = qmsql.DEFAULTDB.Where("username = ? AND password = ?", u.Username, u.Password).First(&user).Error err = qmsql.DEFAULTDB.Where("authority_id = ?", user.AuthorityId).First(&user.Authority).Error return err, &user } @@ -71,7 +71,7 @@ func (u *User) Login() (err error, userInter *User) { // 用户头像上传更新地址 func (u *User) UploadHeaderImg(username string, filePath string) (err error, userInter *User) { var user User - err = qmsql.DEFAULTDB.Where("user_name = ?", username).First(&user).Update("header_img", filePath).First(&user).Error + err = qmsql.DEFAULTDB.Where("username = ?", username).First(&user).Update("header_img", filePath).First(&user).Error return err, &user } From 650da4f85ec52e8315c254686b8e35b056298976 Mon Sep 17 00:00:00 2001 From: pixelqm <303176530@qq.com> Date: Sun, 15 Sep 2019 20:24:56 +0800 Subject: [PATCH 010/409] =?UTF-8?q?=E5=8A=A8=E6=80=81=E5=B7=A6=E4=BE=A7?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- QMPlusVuePage/src/store/module/router.js | 2 +- .../layout/aside/asideComponent/index.vue | 39 +++++++++++++++ .../layout/aside/asideComponent/menuItem.vue | 19 ++++++++ .../layout/aside/asideComponent/submenu.vue | 25 ++++++++++ QMPlusVuePage/src/view/layout/aside/index.vue | 39 +++++++++++++++ QMPlusVuePage/src/view/layout/index.vue | 47 ++++++++++++++++--- 6 files changed, 163 insertions(+), 8 deletions(-) create mode 100644 QMPlusVuePage/src/view/layout/aside/asideComponent/index.vue create mode 100644 QMPlusVuePage/src/view/layout/aside/asideComponent/menuItem.vue create mode 100644 QMPlusVuePage/src/view/layout/aside/asideComponent/submenu.vue create mode 100644 QMPlusVuePage/src/view/layout/aside/index.vue diff --git a/QMPlusVuePage/src/store/module/router.js b/QMPlusVuePage/src/store/module/router.js index f95a83eaf9..2b2129ef79 100644 --- a/QMPlusVuePage/src/store/module/router.js +++ b/QMPlusVuePage/src/store/module/router.js @@ -23,7 +23,7 @@ export const router = { redirect: '/404' }) - asyncRouterHandle(asyncRouter) // 等待动态使用 VUEX持久化会将其放入 vuex并且动态生成左侧列表 + asyncRouterHandle(asyncRouter) commit('setAsyncRouter', asyncRouter) } }, diff --git a/QMPlusVuePage/src/view/layout/aside/asideComponent/index.vue b/QMPlusVuePage/src/view/layout/aside/asideComponent/index.vue new file mode 100644 index 0000000000..4f18814c75 --- /dev/null +++ b/QMPlusVuePage/src/view/layout/aside/asideComponent/index.vue @@ -0,0 +1,39 @@ + + + + \ No newline at end of file diff --git a/QMPlusVuePage/src/view/layout/aside/asideComponent/menuItem.vue b/QMPlusVuePage/src/view/layout/aside/asideComponent/menuItem.vue new file mode 100644 index 0000000000..dbbf3ddba5 --- /dev/null +++ b/QMPlusVuePage/src/view/layout/aside/asideComponent/menuItem.vue @@ -0,0 +1,19 @@ + + + + \ No newline at end of file diff --git a/QMPlusVuePage/src/view/layout/aside/asideComponent/submenu.vue b/QMPlusVuePage/src/view/layout/aside/asideComponent/submenu.vue new file mode 100644 index 0000000000..623b9a7985 --- /dev/null +++ b/QMPlusVuePage/src/view/layout/aside/asideComponent/submenu.vue @@ -0,0 +1,25 @@ + + + + \ No newline at end of file diff --git a/QMPlusVuePage/src/view/layout/aside/index.vue b/QMPlusVuePage/src/view/layout/aside/index.vue new file mode 100644 index 0000000000..6816b19d39 --- /dev/null +++ b/QMPlusVuePage/src/view/layout/aside/index.vue @@ -0,0 +1,39 @@ + + + diff --git a/QMPlusVuePage/src/view/layout/index.vue b/QMPlusVuePage/src/view/layout/index.vue index cd4f27b37e..8c754b4042 100644 --- a/QMPlusVuePage/src/view/layout/index.vue +++ b/QMPlusVuePage/src/view/layout/index.vue @@ -1,16 +1,49 @@ - \ No newline at end of file From 4857cff30741ed009906b32c83518c4e5b7461d0 Mon Sep 17 00:00:00 2001 From: pixelqm <303176530@qq.com> Date: Sun, 15 Sep 2019 21:17:08 +0800 Subject: [PATCH 011/409] =?UTF-8?q?=E9=80=9A=E8=BF=87=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E5=B5=8C=E5=A5=97=E7=94=9F=E6=88=90=E5=B7=A6=E4=BE=A7=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E7=95=A5=E7=BC=A9=E5=9B=BE=E6=97=B6=E4=BC=9A=E4=BA=A7?= =?UTF-8?q?=E7=94=9F=E5=86=85=E5=AD=98=E6=BA=A2=E5=87=BAbug=20=E7=AD=89?= =?UTF-8?q?=E5=BE=85=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- QMPlusVuePage/src/permission.js | 9 +++++++++ QMPlusVuePage/src/store/module/user.js | 9 +++++++++ .../view/layout/aside/asideComponent/index.vue | 2 +- .../view/layout/aside/asideComponent/menuItem.vue | 7 +++++-- QMPlusVuePage/src/view/layout/aside/index.vue | 15 ++++++++------- QMPlusVuePage/src/view/layout/index.vue | 4 ++++ 6 files changed, 36 insertions(+), 10 deletions(-) diff --git a/QMPlusVuePage/src/permission.js b/QMPlusVuePage/src/permission.js index 7436485b85..27bc8e2158 100644 --- a/QMPlusVuePage/src/permission.js +++ b/QMPlusVuePage/src/permission.js @@ -4,8 +4,17 @@ import { store } from '@/store/index' let asyncRouterFlag = 0 const whiteList = ['login', 'regist'] + router.beforeEach(async(to, from, next) => { const token = store.getters['user/token'] + // if (token) { + // const expiresAt = store.getters['user/expiresAt'] + // const nowUnix = new Date().getTime() + // const hasExpires = (expiresAt - nowUnix) < 0 + // if (hasExpires) { + // store.dispatch['user/claerAll'] + // } + // } // 在白名单中的判断情况 if (whiteList.indexOf(to.name) > -1) { if (token) { diff --git a/QMPlusVuePage/src/store/module/user.js b/QMPlusVuePage/src/store/module/user.js index 24b720d119..a94baa0f87 100644 --- a/QMPlusVuePage/src/store/module/user.js +++ b/QMPlusVuePage/src/store/module/user.js @@ -25,7 +25,13 @@ export const user = { setExpiresAt(state, expiresAt) { // 这里的 `state` 对象是模块的局部状态 state.expiresAt = expiresAt + }, + clearAll(state) { + state.userInfo = {} + state.token = "" + state.expiresAt = "" } + }, actions: { async LoginIn({ commit }, loginInfo) { @@ -58,6 +64,9 @@ export const user = { }, token(state) { return state.token + }, + expiresAt(state) { + return state.expiresAt } } } \ No newline at end of file diff --git a/QMPlusVuePage/src/view/layout/aside/asideComponent/index.vue b/QMPlusVuePage/src/view/layout/aside/asideComponent/index.vue index 4f18814c75..21bed1bb3a 100644 --- a/QMPlusVuePage/src/view/layout/aside/asideComponent/index.vue +++ b/QMPlusVuePage/src/view/layout/aside/asideComponent/index.vue @@ -17,7 +17,7 @@ export default { if(this.routerInfo.children.length){ return 'SubMenu' }else{ - return 'menuItem' + return 'MenuItem' } } }, diff --git a/QMPlusVuePage/src/view/layout/aside/asideComponent/menuItem.vue b/QMPlusVuePage/src/view/layout/aside/asideComponent/menuItem.vue index dbbf3ddba5..6a97091dcd 100644 --- a/QMPlusVuePage/src/view/layout/aside/asideComponent/menuItem.vue +++ b/QMPlusVuePage/src/view/layout/aside/asideComponent/menuItem.vue @@ -1,5 +1,8 @@ \ No newline at end of file diff --git a/QMPlusVuePage/src/view/login/regist.vue b/QMPlusVuePage/src/view/login/regist.vue index 604ab31ff7..e20b4e3812 100644 --- a/QMPlusVuePage/src/view/login/regist.vue +++ b/QMPlusVuePage/src/view/login/regist.vue @@ -1,6 +1,8 @@ @@ -94,8 +96,16 @@ export default { } - \ No newline at end of file From 2ff92fdd66674ad103ff657a06e6e727dbd3940d Mon Sep 17 00:00:00 2001 From: pixelqm <303176530@qq.com> Date: Mon, 16 Sep 2019 18:46:23 +0800 Subject: [PATCH 014/409] =?UTF-8?q?css=20=E6=A0=B7=E5=BC=8F=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- QMPlusVuePage/src/view/login/login.vue | 1 - QMPlusVuePage/src/view/login/regist.vue | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/QMPlusVuePage/src/view/login/login.vue b/QMPlusVuePage/src/view/login/login.vue index ec71594312..19bd526293 100644 --- a/QMPlusVuePage/src/view/login/login.vue +++ b/QMPlusVuePage/src/view/login/login.vue @@ -1,5 +1,4 @@ @@ -96,7 +96,7 @@ export default { } - diff --git a/QMPlusVuePage/src/api/authority.js b/QMPlusVuePage/src/api/authority.js new file mode 100644 index 0000000000..fa3b6538d8 --- /dev/null +++ b/QMPlusVuePage/src/api/authority.js @@ -0,0 +1,47 @@ +import service from '@/utils/request' + +// @Summary 用户登录 +// @Produce application/json +// @Param { +// page int +// pageSize int +// } +// @Router /authority/getAuthorityList [post] +export const getAuthorityList = (data) => { + return service({ + url: "/authority/getAuthorityList", + method: 'post', + data + }) +} + + +// @Summary 删除角色 +// @Security ApiKeyAuth +// @accept application/json +// @Produce application/json +// @Param data body {authorityId uint} true "删除角色" +// @Success 200 {string} json "{"success":true,"data":{},"msg":"获取成功"}" +// @Router /authority/deleteAuthority [post] +export const deleteAuthority = (data) => { + return service({ + url: "/authority/deleteAuthority", + method: 'post', + data + }) +} + +// @Summary 创建角色 +// @Security ApiKeyAuth +// @accept application/json +// @Produce application/json +// @Param data body api.CreateAuthorityPatams true "创建角色" +// @Success 200 {string} json "{"success":true,"data":{},"msg":"获取成功"}" +// @Router /authority/createAuthority [post] +export const createAuthority = (data) => { + return service({ + url: "/authority/createAuthority", + method: 'post', + data + }) +} \ No newline at end of file diff --git a/QMPlusVuePage/src/main.js b/QMPlusVuePage/src/main.js index c213a3e4f8..c898a5e4d7 100644 --- a/QMPlusVuePage/src/main.js +++ b/QMPlusVuePage/src/main.js @@ -16,6 +16,9 @@ import '@/permission' import { store } from '@/store/index' Vue.config.productionTip = false + +import Bus from '@/utils/bus.js' +Vue.use(Bus) new Vue({ render: h => h(App), router, diff --git a/QMPlusVuePage/src/store/module/user.js b/QMPlusVuePage/src/store/module/user.js index a94baa0f87..d0851883bf 100644 --- a/QMPlusVuePage/src/store/module/user.js +++ b/QMPlusVuePage/src/store/module/user.js @@ -45,7 +45,7 @@ export const user = { if (redirect) { router.push({ path: redirect }) } else { - router.push({ path: '/layout/dashboard' }) + router.push({ name: 'dashboard' }) } } } catch (err) { diff --git a/QMPlusVuePage/src/style/base.scss b/QMPlusVuePage/src/style/base.scss new file mode 100644 index 0000000000..d9415a558b --- /dev/null +++ b/QMPlusVuePage/src/style/base.scss @@ -0,0 +1,35 @@ +.clearflex { + *zoom: 1; +} + +.clearflex:after { + content: ''; + display: block; + height: 0; + visibility: hidden; + clear: both; +} + +.fl-left { + float: left; +} + +.fl-right { + float: right; +} + +.left-mg-xs { + margin-left: 6px; +} + +.left-mg-sm { + margin-left: 10px; +} + +.left-mg-md { + margin-left: 14px; +} + +.left-mg-lg { + margin-left: 18px; +} \ No newline at end of file diff --git a/QMPlusVuePage/src/utils/asyncRouter.js b/QMPlusVuePage/src/utils/asyncRouter.js index fbefeb05f5..dfaa4e41ed 100644 --- a/QMPlusVuePage/src/utils/asyncRouter.js +++ b/QMPlusVuePage/src/utils/asyncRouter.js @@ -1,7 +1,11 @@ const _import = require('./_import') //获取组件的方法 export const asyncRouterHandle = (asyncRouter) => { asyncRouter.map(item => { - item.component = _import(item.component) + if (item.component) { + item.component = _import(item.component) + } else { + delete item['component'] + } if (item.children) { asyncRouterHandle(item.children) } diff --git a/QMPlusVuePage/src/utils/bus.js b/QMPlusVuePage/src/utils/bus.js new file mode 100644 index 0000000000..4e49e218ee --- /dev/null +++ b/QMPlusVuePage/src/utils/bus.js @@ -0,0 +1,18 @@ +const install = (Vue) => { + const Bus = new Vue({ + methods: { + emit(event, ...args) { + this.$emit(event, ...args) + }, + on(event, cb) { + this.$on(event, cb) + }, + off(event, cb) { + this.$off(event, cb) + } + }, + }) + Vue.prototype.$bus = Bus +} + +export default install \ No newline at end of file diff --git a/QMPlusVuePage/src/view/dashbord/index.vue b/QMPlusVuePage/src/view/dashbord/index.vue index 4a94bda44c..607a062a6e 100644 --- a/QMPlusVuePage/src/view/dashbord/index.vue +++ b/QMPlusVuePage/src/view/dashbord/index.vue @@ -1,16 +1,33 @@ \ No newline at end of file diff --git a/QMPlusVuePage/src/view/layout/aside/asideComponent/asyncSubmenu.vue b/QMPlusVuePage/src/view/layout/aside/asideComponent/asyncSubmenu.vue index 0ac6a53922..dea43c83d4 100644 --- a/QMPlusVuePage/src/view/layout/aside/asideComponent/asyncSubmenu.vue +++ b/QMPlusVuePage/src/view/layout/aside/asideComponent/asyncSubmenu.vue @@ -1,7 +1,7 @@ - \ No newline at end of file diff --git a/QMPlusVuePage/src/view/superAdmin/authority/authority.vue b/QMPlusVuePage/src/view/superAdmin/authority/authority.vue index c8cf200cf8..37af7c619e 100644 --- a/QMPlusVuePage/src/view/superAdmin/authority/authority.vue +++ b/QMPlusVuePage/src/view/superAdmin/authority/authority.vue @@ -67,15 +67,15 @@ import { createAuthority } from '@/api/authority' import { getBaseMenuTree, addMenuAuthority, getMenuAuthority } from '@/api/menu' +import infoList from '@/view/superAdmin/mixins/infoList' export default { name: 'Authority', + mixins:[infoList], data() { return { + listApi: getAuthorityList, + listKey:'list', activeUserId: 0, - page: 1, - total: 10, - pageSize: 10, - tableData: [], treeData: [], treeIds: [], defaultProps: { @@ -91,16 +91,6 @@ export default { } }, methods: { - // 条数 - handleSizeChange(val) { - this.pageSize = val - this.getAuthList() - }, - // 页码 - handleCurrentChange(val) { - this.page = val - this.getAuthList() - }, // 删除角色 deleteAuth(row) { this.$confirm('此操作将永久删除该角色, 是否继续?', '提示', { @@ -115,7 +105,7 @@ export default { type: 'success', message: '删除成功!' }) - this.getAuthList() + this.getTableData() } }) .catch(() => { @@ -145,7 +135,7 @@ export default { type: 'success', message: '添加成功!' }) - this.getAuthList() + this.getTableData() this.closeDialog() } this.initForm() @@ -155,11 +145,7 @@ export default { addAuthority() { this.dialogFormVisible = true }, - // 获取用户列表 - async getAuthList(page = this.page, pageSize = this.pageSize) { - const table = await getAuthorityList({ page, pageSize }) - this.tableData = table.data.authList - }, + // 关联用户列表关系 async addAuthMenu(row) { const res1 = await getMenuAuthority({ authorityId: row.authorityId }) @@ -194,11 +180,11 @@ export default { // 获取基础menu树 }, created() { - this.getAuthList() + this.getTableData() } } - \ No newline at end of file From 089aeb4291070107f3e79e6bef0f024719a80bb7 Mon Sep 17 00:00:00 2001 From: pixel <303176530@qq.com> Date: Wed, 9 Oct 2019 23:09:24 +0800 Subject: [PATCH 041/409] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=86=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E6=9D=83=E9=99=90=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- QMPlusServer/controller/api/user.go | 25 +++++++++++ QMPlusServer/db/qmplus.sql | 69 ++++++++++++++++------------- QMPlusServer/middleware/jwt.go | 8 +++- QMPlusServer/model/dbModel/user.go | 6 +-- QMPlusServer/router/user.go | 7 +-- 5 files changed, 76 insertions(+), 39 deletions(-) diff --git a/QMPlusServer/controller/api/user.go b/QMPlusServer/controller/api/user.go index fea4ff5470..4eb9e6663b 100644 --- a/QMPlusServer/controller/api/user.go +++ b/QMPlusServer/controller/api/user.go @@ -4,6 +4,7 @@ import ( "fmt" "github.com/dgrijalva/jwt-go" "github.com/gin-gonic/gin" + uuid "github.com/satori/go.uuid" "main/controller/servers" "main/middleware" "main/model/dbModel" @@ -175,3 +176,27 @@ func GetUserList(c *gin.Context) { }) } } + +type SetUserAuth struct { + UUID uuid.UUID `json:"uuid"` + AuthorityId string `json:"authorityId"` +} + +// @Tags User +// @Summary 设置用户权限 +// @Security ApiKeyAuth +// @accept application/json +// @Produce application/json +// @Param data body api.SetUserAuth true "设置用户权限" +// @Success 200 {string} json "{"success":true,"data":{},"msg":"修改成功"}" +// @Router /user/setUserAuthority [post] +func SetUserAuthority(c *gin.Context) { + var sua SetUserAuth + _ = c.BindJSON(&sua) + err := new(dbModel.User).SetUserAuthority(sua.UUID, sua.AuthorityId) + if err != nil { + servers.ReportFormat(c, false, fmt.Sprintf("修改失败，%v", err), gin.H{}) + } else { + servers.ReportFormat(c, true, "修改成功", gin.H{}) + } +} diff --git a/QMPlusServer/db/qmplus.sql b/QMPlusServer/db/qmplus.sql index 1163a92fa5..b29fe47360 100644 --- a/QMPlusServer/db/qmplus.sql +++ b/QMPlusServer/db/qmplus.sql @@ -11,7 +11,7 @@ Target Server Version : 50644 File Encoding : 65001 - Date: 09/10/2019 18:28:48 + Date: 09/10/2019 23:08:15 */ SET NAMES utf8mb4; @@ -30,7 +30,7 @@ CREATE TABLE `api_authorities` ( `api_id` int(10) UNSIGNED NULL DEFAULT NULL, PRIMARY KEY (`id`) USING BTREE, INDEX `idx_api_authorities_deleted_at`(`deleted_at`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 185 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact; +) ENGINE = InnoDB AUTO_INCREMENT = 212 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact; -- ---------------------------- -- Records of api_authorities @@ -44,31 +44,34 @@ INSERT INTO `api_authorities` VALUES (77, '2019-09-30 15:34:19', '2019-09-30 15: INSERT INTO `api_authorities` VALUES (78, '2019-09-30 15:34:19', '2019-09-30 15:34:19', NULL, 9528, 17); INSERT INTO `api_authorities` VALUES (79, '2019-09-30 15:34:19', '2019-09-30 15:34:19', NULL, 9528, 23); INSERT INTO `api_authorities` VALUES (80, '2019-09-30 15:34:19', '2019-09-30 15:34:19', NULL, 9528, 24); -INSERT INTO `api_authorities` VALUES (159, '2019-10-09 15:15:27', '2019-10-09 15:15:27', NULL, 888, 1); -INSERT INTO `api_authorities` VALUES (160, '2019-10-09 15:15:27', '2019-10-09 15:15:27', NULL, 888, 2); -INSERT INTO `api_authorities` VALUES (161, '2019-10-09 15:15:27', '2019-10-09 15:15:27', NULL, 888, 3); -INSERT INTO `api_authorities` VALUES (162, '2019-10-09 15:15:27', '2019-10-09 15:15:27', NULL, 888, 4); -INSERT INTO `api_authorities` VALUES (163, '2019-10-09 15:15:27', '2019-10-09 15:15:27', NULL, 888, 5); -INSERT INTO `api_authorities` VALUES (164, '2019-10-09 15:15:27', '2019-10-09 15:15:27', NULL, 888, 6); -INSERT INTO `api_authorities` VALUES (165, '2019-10-09 15:15:27', '2019-10-09 15:15:27', NULL, 888, 7); -INSERT INTO `api_authorities` VALUES (166, '2019-10-09 15:15:27', '2019-10-09 15:15:27', NULL, 888, 8); -INSERT INTO `api_authorities` VALUES (167, '2019-10-09 15:15:27', '2019-10-09 15:15:27', NULL, 888, 9); -INSERT INTO `api_authorities` VALUES (168, '2019-10-09 15:15:27', '2019-10-09 15:15:27', NULL, 888, 10); -INSERT INTO `api_authorities` VALUES (169, '2019-10-09 15:15:27', '2019-10-09 15:15:27', NULL, 888, 28); -INSERT INTO `api_authorities` VALUES (170, '2019-10-09 15:15:27', '2019-10-09 15:15:27', NULL, 888, 11); -INSERT INTO `api_authorities` VALUES (171, '2019-10-09 15:15:27', '2019-10-09 15:15:27', NULL, 888, 12); -INSERT INTO `api_authorities` VALUES (172, '2019-10-09 15:15:27', '2019-10-09 15:15:27', NULL, 888, 13); -INSERT INTO `api_authorities` VALUES (173, '2019-10-09 15:15:27', '2019-10-09 15:15:27', NULL, 888, 14); -INSERT INTO `api_authorities` VALUES (174, '2019-10-09 15:15:27', '2019-10-09 15:15:27', NULL, 888, 15); -INSERT INTO `api_authorities` VALUES (175, '2019-10-09 15:15:27', '2019-10-09 15:15:27', NULL, 888, 16); -INSERT INTO `api_authorities` VALUES (176, '2019-10-09 15:15:27', '2019-10-09 15:15:27', NULL, 888, 17); -INSERT INTO `api_authorities` VALUES (177, '2019-10-09 15:15:27', '2019-10-09 15:15:27', NULL, 888, 18); -INSERT INTO `api_authorities` VALUES (178, '2019-10-09 15:15:27', '2019-10-09 15:15:27', NULL, 888, 19); -INSERT INTO `api_authorities` VALUES (179, '2019-10-09 15:15:27', '2019-10-09 15:15:27', NULL, 888, 20); -INSERT INTO `api_authorities` VALUES (180, '2019-10-09 15:15:27', '2019-10-09 15:15:27', NULL, 888, 21); -INSERT INTO `api_authorities` VALUES (181, '2019-10-09 15:15:27', '2019-10-09 15:15:27', NULL, 888, 22); -INSERT INTO `api_authorities` VALUES (182, '2019-10-09 15:15:27', '2019-10-09 15:15:27', NULL, 888, 23); -INSERT INTO `api_authorities` VALUES (183, '2019-10-09 15:15:27', '2019-10-09 15:15:27', NULL, 888, 24); +INSERT INTO `api_authorities` VALUES (184, '2019-10-09 23:01:52', '2019-10-09 23:01:52', NULL, 888, 1); +INSERT INTO `api_authorities` VALUES (185, '2019-10-09 23:01:52', '2019-10-09 23:01:52', NULL, 888, 2); +INSERT INTO `api_authorities` VALUES (186, '2019-10-09 23:01:52', '2019-10-09 23:01:52', NULL, 888, 3); +INSERT INTO `api_authorities` VALUES (187, '2019-10-09 23:01:52', '2019-10-09 23:01:52', NULL, 888, 4); +INSERT INTO `api_authorities` VALUES (188, '2019-10-09 23:01:52', '2019-10-09 23:01:52', NULL, 888, 5); +INSERT INTO `api_authorities` VALUES (189, '2019-10-09 23:01:52', '2019-10-09 23:01:52', NULL, 888, 6); +INSERT INTO `api_authorities` VALUES (190, '2019-10-09 23:01:52', '2019-10-09 23:01:52', NULL, 888, 7); +INSERT INTO `api_authorities` VALUES (191, '2019-10-09 23:01:52', '2019-10-09 23:01:52', NULL, 888, 8); +INSERT INTO `api_authorities` VALUES (192, '2019-10-09 23:01:52', '2019-10-09 23:01:52', NULL, 888, 9); +INSERT INTO `api_authorities` VALUES (193, '2019-10-09 23:01:52', '2019-10-09 23:01:52', NULL, 888, 10); +INSERT INTO `api_authorities` VALUES (194, '2019-10-09 23:01:52', '2019-10-09 23:01:52', NULL, 888, 11); +INSERT INTO `api_authorities` VALUES (195, '2019-10-09 23:01:52', '2019-10-09 23:01:52', NULL, 888, 12); +INSERT INTO `api_authorities` VALUES (196, '2019-10-09 23:01:52', '2019-10-09 23:01:52', NULL, 888, 13); +INSERT INTO `api_authorities` VALUES (197, '2019-10-09 23:01:52', '2019-10-09 23:01:52', NULL, 888, 14); +INSERT INTO `api_authorities` VALUES (198, '2019-10-09 23:01:52', '2019-10-09 23:01:52', NULL, 888, 15); +INSERT INTO `api_authorities` VALUES (199, '2019-10-09 23:01:52', '2019-10-09 23:01:52', NULL, 888, 16); +INSERT INTO `api_authorities` VALUES (200, '2019-10-09 23:01:52', '2019-10-09 23:01:52', NULL, 888, 17); +INSERT INTO `api_authorities` VALUES (201, '2019-10-09 23:01:52', '2019-10-09 23:01:52', NULL, 888, 18); +INSERT INTO `api_authorities` VALUES (202, '2019-10-09 23:01:52', '2019-10-09 23:01:52', NULL, 888, 19); +INSERT INTO `api_authorities` VALUES (203, '2019-10-09 23:01:52', '2019-10-09 23:01:52', NULL, 888, 20); +INSERT INTO `api_authorities` VALUES (204, '2019-10-09 23:01:52', '2019-10-09 23:01:52', NULL, 888, 21); +INSERT INTO `api_authorities` VALUES (205, '2019-10-09 23:01:52', '2019-10-09 23:01:52', NULL, 888, 22); +INSERT INTO `api_authorities` VALUES (206, '2019-10-09 23:01:52', '2019-10-09 23:01:52', NULL, 888, 23); +INSERT INTO `api_authorities` VALUES (207, '2019-10-09 23:01:52', '2019-10-09 23:01:52', NULL, 888, 24); +INSERT INTO `api_authorities` VALUES (208, '2019-10-09 23:01:52', '2019-10-09 23:01:52', NULL, 888, 28); +INSERT INTO `api_authorities` VALUES (209, '2019-10-09 23:01:52', '2019-10-09 23:01:52', NULL, 888, 29); +INSERT INTO `api_authorities` VALUES (210, '2019-10-09 23:04:56', '2019-10-09 23:04:56', NULL, 999, 1); +INSERT INTO `api_authorities` VALUES (211, '2019-10-09 23:04:56', '2019-10-09 23:04:56', NULL, 999, 2); -- ---------------------------- -- Table structure for apis @@ -85,7 +88,7 @@ CREATE TABLE `apis` ( `group` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, PRIMARY KEY (`id`) USING BTREE, INDEX `idx_apis_deleted_at`(`deleted_at`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 29 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact; +) ENGINE = InnoDB AUTO_INCREMENT = 30 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact; -- ---------------------------- -- Records of apis @@ -116,6 +119,7 @@ INSERT INTO `apis` VALUES (23, '2019-09-30 15:29:19', '2019-09-30 15:29:19', NUL INSERT INTO `apis` VALUES (24, '2019-09-30 15:29:33', '2019-09-30 15:29:33', NULL, NULL, '/user/uploadHeaderImg', '上传头像', 'user'); INSERT INTO `apis` VALUES (25, '2019-09-30 15:30:00', '2019-09-30 15:30:00', '2019-10-09 15:26:37', NULL, '/user/getInfoList', '分页获取用户列表', 'user'); INSERT INTO `apis` VALUES (28, '2019-10-09 15:15:17', '2019-10-09 15:17:07', NULL, NULL, '/user/getUserList', '获取用户列表', 'user'); +INSERT INTO `apis` VALUES (29, '2019-10-09 23:01:40', '2019-10-09 23:01:40', NULL, NULL, '/user/setUserAuthority', '修改用户角色', 'user'); -- ---------------------------- -- Table structure for authorities @@ -131,7 +135,7 @@ CREATE TABLE `authorities` ( PRIMARY KEY (`id`) USING BTREE, UNIQUE INDEX `authority_id`(`authority_id`) USING BTREE, INDEX `idx_authorities_deleted_at`(`deleted_at`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 10 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact; +) ENGINE = InnoDB AUTO_INCREMENT = 13 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact; -- ---------------------------- -- Records of authorities @@ -142,6 +146,7 @@ INSERT INTO `authorities` VALUES (3, '2019-09-18 22:20:28', '2019-09-18 22:20:28 INSERT INTO `authorities` VALUES (6, '2019-09-18 22:23:33', '2019-09-18 22:23:33', NULL, 9528, '测试角色'); INSERT INTO `authorities` VALUES (7, '2019-09-18 22:24:39', '2019-09-18 22:24:39', '2019-09-18 22:25:19', 9529, '测试角色'); INSERT INTO `authorities` VALUES (8, '2019-09-18 22:25:13', '2019-09-18 22:25:13', '2019-09-18 22:25:17', 9522, '测试角色'); +INSERT INTO `authorities` VALUES (12, '2019-10-09 23:04:18', '2019-10-09 23:04:18', NULL, 999, '封禁'); -- ---------------------------- -- Table structure for base_menus @@ -208,7 +213,7 @@ CREATE TABLE `menus` ( `nick_name` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, PRIMARY KEY (`id`) USING BTREE, INDEX `idx_menus_deleted_at`(`deleted_at`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 231 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact; +) ENGINE = InnoDB AUTO_INCREMENT = 233 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Compact; -- ---------------------------- -- Records of menus @@ -225,6 +230,8 @@ INSERT INTO `menus` VALUES (227, '2019-09-19 22:11:53', '2019-09-19 22:11:53', N INSERT INTO `menus` VALUES (228, '2019-09-19 22:13:18', '2019-09-19 22:13:18', NULL, 0, 888, 'menu', 'menu', 0, 'view/superAdmin/menu/menu.vue', '菜单管理', 's-order', 3, '5', '菜单管理'); INSERT INTO `menus` VALUES (229, '2019-09-19 22:13:36', '2019-09-19 22:13:36', NULL, 0, 888, 'api', 'api', 0, 'view/superAdmin/api/api.vue', 'api管理', 's-platform', 3, '6', 'api管理'); INSERT INTO `menus` VALUES (230, '2019-10-09 15:12:29', '2019-10-09 15:14:44', NULL, 0, 888, 'user', 'user', 0, 'view/superAdmin/user/user.vue', '用户管理', 'coordinate', 3, '17', '用户管理'); +INSERT INTO `menus` VALUES (231, '2019-09-19 22:05:18', '2019-09-19 22:05:18', NULL, 0, 999, 'dashbord', 'dashbord', 0, 'view/dashbord/index.vue', '仪表盘', 'setting', 0, '1', '仪表盘'); +INSERT INTO `menus` VALUES (232, '2019-09-19 22:06:17', '2019-09-30 15:44:50', NULL, 0, 999, 'test', 'test', 0, 'view/test/index.vue', '测试菜单', 'info', 0, '2', '测试菜单'); -- ---------------------------- -- Table structure for users @@ -256,6 +263,6 @@ INSERT INTO `users` VALUES (11, '2019-09-13 17:27:29', '2019-09-13 17:27:29', NU INSERT INTO `users` VALUES (12, '2019-09-13 17:28:56', '2019-09-13 17:28:56', NULL, 0x65373939636563362D346337662D343338632D383634372D376435633333393734353165, NULL, NULL, 'QMPlusUser', 'http://www.henrongyi.top/avatar/lufu.jpg', 888, NULL, 'a30317465', '3ec063004a6f31642261936a379fde3d'); INSERT INTO `users` VALUES (13, '2019-09-13 17:29:26', '2019-09-13 17:29:26', NULL, 0x65653764353932322D323333312D343162632D393363322D613665366461306465343230, NULL, NULL, 'QMPlusUser', 'http://www.henrongyi.top/avatar/lufu.jpg', 888, NULL, 'a30317465', '3ec063004a6f31642261936a379fde3d'); INSERT INTO `users` VALUES (14, '2019-09-13 17:29:28', '2019-09-13 17:29:28', NULL, 0x35623464333461322D343266352D343763352D613932642D613637616536643461643334, NULL, NULL, 'QMPlusUser', 'http://www.henrongyi.top/avatar/lufu.jpg', 888, NULL, 'a30317465', '3ec063004a6f31642261936a379fde3d'); -INSERT INTO `users` VALUES (15, '2019-09-13 17:31:16', '2019-09-13 17:31:16', NULL, 0x34306437393436612D363732382D346536662D396434302D313432356566653831363032, NULL, NULL, 'QMPlusUser', 'http://www.henrongyi.top/avatar/lufu.jpg', 888, NULL, 'a303146523', 'e10adc3949ba59abbe56e057f20f883e'); +INSERT INTO `users` VALUES (15, '2019-09-13 17:31:16', '2019-10-09 23:04:28', NULL, 0x34306437393436612D363732382D346536662D396434302D313432356566653831363032, NULL, NULL, 'QMPlusUser', 'http://www.henrongyi.top/avatar/lufu.jpg', 999, NULL, 'a303146523', 'e10adc3949ba59abbe56e057f20f883e'); SET FOREIGN_KEY_CHECKS = 1; diff --git a/QMPlusServer/middleware/jwt.go b/QMPlusServer/middleware/jwt.go index 4977b977d2..7bc4d76af3 100644 --- a/QMPlusServer/middleware/jwt.go +++ b/QMPlusServer/middleware/jwt.go @@ -23,7 +23,9 @@ func JWTAuth() gin.HandlerFunc { // 我们这里jwt鉴权取头部信息 x-token 登录时回返回token信息这里前端需要把token存储到cookie或者本地localSstorage中不过需要跟后端协商过期时间可以约定刷新令牌或者重新登录 token := c.Request.Header.Get("x-token") if token == "" { - servers.ReportFormat(c, false, "未登录或非法访问", gin.H{}) + servers.ReportFormat(c, false, "未登录或非法访问", gin.H{ + "reload": true, + }) c.Abort() return } @@ -38,7 +40,9 @@ func JWTAuth() gin.HandlerFunc { c.Abort() return } - servers.ReportFormat(c, false, err.Error(), gin.H{}) + servers.ReportFormat(c, false, err.Error(), gin.H{ + "reload": true, + }) c.Abort() return } diff --git a/QMPlusServer/model/dbModel/user.go b/QMPlusServer/model/dbModel/user.go index 5f6ccf6ac0..675246b5e2 100644 --- a/QMPlusServer/model/dbModel/user.go +++ b/QMPlusServer/model/dbModel/user.go @@ -54,9 +54,9 @@ func (u *User) ChangePassword(newPassword string) (err error, userInter *User) { } //用户更新接口 -func (u *User) UpdataUser() (err error, userInter *User) { - err = qmsql.DEFAULTDB.Create(u).Error - return err, u +func (u *User) SetUserAuthority(uuid uuid.UUID, AuthorityId string) (err error) { + err = qmsql.DEFAULTDB.Where("uuid = ?", uuid).First(&User{}).Update("authority_id", AuthorityId).Error + return err } //用户登录 diff --git a/QMPlusServer/router/user.go b/QMPlusServer/router/user.go index 4d0b9b103c..b163660e99 100644 --- a/QMPlusServer/router/user.go +++ b/QMPlusServer/router/user.go @@ -9,8 +9,9 @@ import ( func InitUserRouter(Router *gin.Engine) { UserRouter := Router.Group("user").Use(middleware.JWTAuth()) { - UserRouter.POST("changePassword", api.ChangePassword) // 修改密码 - UserRouter.POST("uploadHeaderImg", api.UploadHeaderImg) //上传头像 - UserRouter.POST("getUserList", api.GetUserList) // 分页获取用户列表 + UserRouter.POST("changePassword", api.ChangePassword) // 修改密码 + UserRouter.POST("uploadHeaderImg", api.UploadHeaderImg) //上传头像 + UserRouter.POST("getUserList", api.GetUserList) // 分页获取用户列表 + UserRouter.POST("setUserAuthority", api.SetUserAuthority) //设置用户权限 } } From 45c10e85809c33f142233483b170a6bad7ca4d96 Mon Sep 17 00:00:00 2001 From: pixel <303176530@qq.com> Date: Wed, 9 Oct 2019 23:11:10 +0800 Subject: [PATCH 042/409] =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=9D=83=E9=99=90?= =?UTF-8?q?=E6=9B=B4=E6=94=B9=E7=AE=80=E5=8D=95=E5=AE=9E=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- QMPlusVuePage/src/api/user.js | 17 +++++++++ .../src/view/superAdmin/user/user.vue | 36 ++++++++++++++++--- 2 files changed, 48 insertions(+), 5 deletions(-) diff --git a/QMPlusVuePage/src/api/user.js b/QMPlusVuePage/src/api/user.js index 41e4bad8ba..8bd45341e7 100644 --- a/QMPlusVuePage/src/api/user.js +++ b/QMPlusVuePage/src/api/user.js @@ -38,4 +38,21 @@ export const getUserList = (data) => { method: 'post', data: data }) +} + + +// @Tags User +// @Summary 设置用户权限 +// @Security ApiKeyAuth +// @accept application/json +// @Produce application/json +// @Param data body api.SetUserAuth true "设置用户权限" +// @Success 200 {string} json "{"success":true,"data":{},"msg":"修改成功"}" +// @Router /user/setUserAuthority [post] +export const setUserAuthority = (data) => { + return service({ + url: "/user/setUserAuthority", + method: 'post', + data: data + }) } \ No newline at end of file diff --git a/QMPlusVuePage/src/view/superAdmin/user/user.vue b/QMPlusVuePage/src/view/superAdmin/user/user.vue index 2feb7ee423..96f7ca7a29 100644 --- a/QMPlusVuePage/src/view/superAdmin/user/user.vue +++ b/QMPlusVuePage/src/view/superAdmin/user/user.vue @@ -4,10 +4,12 @@ - +

@@ -17,8 +19,7 @@

@@ -39,7 +40,7 @@ \ No newline at end of file diff --git a/QMPlusVuePage/src/view/login/regist.vue b/QMPlusVuePage/src/view/login/regist.vue index 2770d6ac23..b3de9a5478 100644 --- a/QMPlusVuePage/src/view/login/regist.vue +++ b/QMPlusVuePage/src/view/login/regist.vue @@ -1,14 +1,18 @@ @@ -37,7 +43,7 @@ export default { } } const checkUsername = (rule, value, callback) => { - if (value.length < 6 || value.length > 12) { + if (value.length < 5 || value.length > 12) { return callback(new Error('请输入正确的用户名')) } else { callback() @@ -98,14 +104,14 @@ export default { \ No newline at end of file From af8678585407559800f306c305e336c2f8933cb1 Mon Sep 17 00:00:00 2001 From: pixel <303176530@qq.com> Date: Thu, 10 Oct 2019 23:37:03 +0800 Subject: [PATCH 047/409] =?UTF-8?q?css=20=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- QMPlusVuePage/src/view/layout/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/QMPlusVuePage/src/view/layout/index.vue b/QMPlusVuePage/src/view/layout/index.vue index 6da8b4a238..c0008ad815 100644 --- a/QMPlusVuePage/src/view/layout/index.vue +++ b/QMPlusVuePage/src/view/layout/index.vue @@ -15,7 +15,7 @@ - 登出 + 登出 From 59ecff35a2c7165aee6a983bf9ebff6b6a87b843 Mon Sep 17 00:00:00 2001 From: pixel <303176530@qq.com> Date: Thu, 10 Oct 2019 23:57:04 +0800 Subject: [PATCH 048/409] =?UTF-8?q?dashbord=20=E5=A2=9E=E5=8A=A0c3?= =?UTF-8?q?=E5=8A=A8=E7=94=BB=20=E5=8F=96=E6=B6=88card=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- QMPlusVuePage/src/style/animition.scss | 1044 +++++++++++++++++ .../src/view/dashbord/component/animition.vue | 93 ++ QMPlusVuePage/src/view/dashbord/index.vue | 45 +- 3 files changed, 1166 insertions(+), 16 deletions(-) create mode 100644 QMPlusVuePage/src/style/animition.scss create mode 100644 QMPlusVuePage/src/view/dashbord/component/animition.vue diff --git a/QMPlusVuePage/src/style/animition.scss b/QMPlusVuePage/src/style/animition.scss new file mode 100644 index 0000000000..3fe81da7f8 --- /dev/null +++ b/QMPlusVuePage/src/style/animition.scss @@ -0,0 +1,1044 @@ +body { + background-color: #fffaf0; +} + +ul { + padding: 0; +} + +li { + list-style: none; +} + +.container { + background-image: linear-gradient(to top, #fcf3d8 30%, #eaafc8, #654ea3); + background-image: -webkit-linear-gradient(to bottom, #fcf3d8 30%, #eaafc8, #654ea3); + background-color: #654ea3; + height: 450px; + width: 450px; + border-radius: 100%; + position: absolute; + transform: translate(-50%, -50%); + left: 50%; + top: 50%; + overflow: hidden; +} + +.mountain-range { + position: absolute; + width: 100%; + height: 100px; + top: 50%; + display: flex; + justify-content: center; + padding: 0; +} + +.mountain-range .mountain:nth-child(1) { + width: 0; + height: 0; + margin-top: 32px; + margin-left: -60%; + border-left: 183px solid transparent; + border-right: 183px solid transparent; + border-bottom: 91.5px solid #75bbff; +} + +.mountain-range .mountain:nth-child(2) { + width: 0; + height: 0; + margin-top: 27px; + margin-left: -60%; + border-left: 195px solid transparent; + border-right: 195px solid transparent; + border-bottom: 97.5px solid #75bbff; +} + +.mountain-range .mountain:nth-child(3) { + width: 0; + height: 0; + margin-top: 24px; + margin-left: -60%; + border-left: 198px solid transparent; + border-right: 198px solid transparent; + border-bottom: 99px solid #75bbff; +} + +.mountain-range .mountain:nth-child(4) { + width: 0; + height: 0; + margin-top: 35px; + margin-left: -60%; + border-left: 154px solid transparent; + border-right: 154px solid transparent; + border-bottom: 77px solid #75bbff; +} + +.mountain-range .mountain:nth-child(5) { + width: 0; + height: 0; + margin-top: 20px; + margin-left: -60%; + border-left: 150px solid transparent; + border-right: 150px solid transparent; + border-bottom: 75px solid #75bbff; +} + +.mountain-range .mountain:nth-child(6) { + width: 0; + height: 0; + margin-top: 33px; + margin-left: -60%; + border-left: 198px solid transparent; + border-right: 198px solid transparent; + border-bottom: 99px solid #75bbff; +} + +.mountain-range .mountain:nth-child(7) { + width: 0; + height: 0; + margin-top: 37px; + margin-left: -60%; + border-left: 152px solid transparent; + border-right: 152px solid transparent; + border-bottom: 76px solid #75bbff; +} + +.mountain-range .mountain:nth-child(8) { + width: 0; + height: 0; + margin-top: 27px; + margin-left: -60%; + border-left: 166px solid transparent; + border-right: 166px solid transparent; + border-bottom: 83px solid #75bbff; +} + +.forest { + position: absolute; + width: 100%; + height: 100px; + top: 65%; +} + +.forest .hill { + position: absolute; + background-color: #82d9a2; +} + +.forest .hill:nth-child(1) { + width: 600px; + height: 300px; + top: -10px; + left: -150px; + border-top-left-radius: 300px 150px; + border-top-right-radius: 300px 150px; + border-bottom-left-radius: 300px 150px; + border-bottom-right-radius: 300px 150px; + box-shadow: inset 20px 30px 50px #2d79a0; +} + +.forest .hill:nth-child(2) { + width: 500px; + height: 250px; + top: -5px; + left: 100px; + border-top-left-radius: 250px 125px; + border-top-right-radius: 250px 125px; + border-bottom-left-radius: 250px 125px; + border-bottom-right-radius: 250px 125px; + box-shadow: inset 20px 30px 50px #2d79a0; +} + +.forest .hill:nth-child(3) { + width: 500px; + height: 250px; + top: 17px; + left: -180px; + border-top-left-radius: 250px 125px; + border-top-right-radius: 250px 125px; + border-bottom-left-radius: 250px 125px; + border-bottom-right-radius: 250px 125px; + box-shadow: inset 20px 30px 50px #2d79a0; +} + +.grass { + position: absolute; + width: 600px; + height: 300px; + border-radius: 300px / 150px; + top: 75%; + left: -100px; + background: #82d9a2; + box-shadow: inset 20px 30px 60px #2d79a0; +} + +.pokemon { + position: absolute; + width: 300px; + height: 110px; + left: calc(53% - 150px); +} + +.poke { + position: absolute; + width: 100px; + height: 100px; +} + +#bulbasaur:before { + content: ''; + position: absolute; + width: 100px; + height: 50px; + background: rgba(0, 0, 0, 0.2); + border-radius: 100%; + top: 50px; + left: 15px; + transform: rotate(-15deg); +} + +#bulbasaur .head { + position: absolute; + width: 60px; + height: 45px; + background-color: #00efd0; + border-top-left-radius: 50% 25px; + border-top-right-radius: 50% 25px; + border-bottom-left-radius: 18px; + border-bottom-right-radius: 18px; + left: 55px; +} + +#bulbasaur .ear { + position: absolute; + height: 20px; + width: 23px; + background-color: #00efd0; + border-top-left-radius: 50px 90px; + border-top-right-radius: 50px 90px; + transform-origin: center bottom; +} + +#bulbasaur .ear:nth-child(1) { + transform: rotate(-45deg); + left: 52px; + top: -5px; + animation: rotateLeftBulbEar 2s alternate infinite; +} + +#bulbasaur .ear:nth-child(2) { + transform: rotate(45deg); + left: 87px; + top: -5px; + animation: rotateRightBulbEar 2s alternate infinite; +} + +#bulbasaur .bulba-body { + position: relative; + width: 65px; + height: 55px; + background-color: #00efd0; + left: 42px; + top: 20px; + border-radius: 100%; + box-shadow: inset 10px -10px #00dbbe; + animation: bodyBreathe 2s alternate infinite; +} + +#bulbasaur .bulba-body:before, +#bulbasaur .bulba-body:after { + content: ''; + position: absolute; +} + +#bulbasaur .bulba-body:before { + width: 10px; + height: 13px; + top: 33px; + left: 8px; + background-color: #00c6ac; + border-bottom-left-radius: 100%; + border-bottom-right-radius: 30%; + border-top-right-radius: 30%; + border-top-left-radius: 50%; + transform: rotate(-45deg); +} + +#bulbasaur .bulba-body:after { + width: 8px; + height: 8px; + top: 30px; + left: 53px; + background-color: #00dbbe; + border-bottom-left-radius: 100%; + border-bottom-right-radius: 30%; + border-top-right-radius: 30%; + border-top-left-radius: 50%; + transform: rotate(65deg); +} + +#bulbasaur .leg { + position: absolute; + width: 20px; + height: 40px; + background-color: #00efd0; + border-bottom-left-radius: 35px 110%; + border-bottom-right-radius: 35px 110%; + box-shadow: inset 10px -20px #00d6ba; + left: 90px; + top: 30px; +} + +#bulbasaur .bulbs { + position: absolute; + top: -1px; + width: 55px; + height: 55px; + left: 50px; + transform-origin: center; + transform: rotate(45deg); + z-index: 3; + animation: bulbaBreathe 2s alternate infinite; +} + +#bulbasaur .bulbs:before, +#bulbasaur .bulbs:after { + content: ''; + position: absolute; + height: 45px; + width: 45px; + border-radius: 0 50% 50% 50%; +} + +#bulbasaur .bulbs:before { + transform: translate(-5px, 10px) rotate(7deg); + background-color: #007061; +} + +#bulbasaur .bulbs:after { + transform: translate(10px, -5px) rotate(-7deg); + background-color: #008a78; +} + +#bulbasaur .bulb { + position: absolute; + top: 10px; + right: 2px; + left: 3px; + width: 90%; + height: 90%; + border-radius: 0 50% 100% 50%; + background-color: #00a38e; + z-index: 4; + box-shadow: inset 1px -5px #009480; +} + +#pikachu { + left: -.1em; +} + +#pikachu:before { + content: ''; + position: absolute; + width: 60px; + height: 80px; + background: rgba(0, 0, 0, 0.2); + border-radius: 100%; + top: 50px; + left: 115px; + transform: rotate(40deg); +} + +#pikachu .ear { + position: absolute; + height: 40px; + width: 18px; + background-color: #fff069; + border-top-left-radius: 60px 150px; + border-top-right-radius: 60px 150px; + transform-origin: center bottom; + overflow: hidden; +} + +#pikachu .ear:nth-child(1) { + transform: rotate(-35deg); + left: 125px; + top: -35px; + animation: rotateLeftEar 1s alternate infinite; +} + +#pikachu .ear:nth-child(1):after { + content: ''; + position: absolute; + background-color: #444; + width: 150%; + height: 15px; + left: -8px; + transform: rotate(-30deg); +} + +#pikachu .ear:nth-child(2) { + transform: rotate(50deg); + left: 157px; + top: -30px; + animation: rotateRightEar 1s alternate infinite; +} + +#pikachu .ear:nth-child(2):after { + content: ''; + position: absolute; + background-color: #444; + width: 150%; + height: 15px; + left: 2px; + transform: rotate(30deg); +} + +#pikachu .hand { + position: absolute; + height: 38px; + width: 15px; + background-color: #fff069; + border-top-left-radius: 60px 150px; + border-top-right-radius: 60px 150px; + transform-origin: center bottom; + left: 123px; + top: 5px; + z-index: 5; + transform: rotate(-40deg); + animation: pikaPat .7s alternate infinite; +} + +#pikachu .head { + position: absolute; + width: 60px; + height: 45px; + background-color: #fff069; + border-top-left-radius: 50% 25px; + border-top-right-radius: 50% 25px; + border-bottom-left-radius: 18px; + border-bottom-right-radius: 18px; + left: 120px; + width: 60px; + height: 55px; + top: -12px; +} + +#pikachu .pika-body { + position: absolute; + width: 55px; + height: 55px; + background-color: #fff069; + left: 122px; + top: 20px; + border-radius: 22px; +} + +#pikachu .pika-body:before, +#pikachu .pika-body:after { + content: ''; + position: absolute; + background-color: #9c5200; + width: 70%; + height: 7px; + left: 13px; + border-radius: 100%; +} + +#pikachu .pika-body:before { + top: 15px; + z-index: 2; +} + +#pikachu .pika-body:after { + top: 30px; +} + +#pikachu .pika-tail { + position: absolute; + height: 25px; + width: 16px; + background: #9c5200; + border-radius: 5px; + left: 150px; + top: 40px; + transform-origin: bottom center; + transform: rotate(55deg); + box-shadow: -2px 2px 1px rgba(68, 68, 68, 0.2); + z-index: 2; + animation: rotateTail 2s alternate infinite; +} + +#pikachu .pika-tail:before, +#pikachu .pika-tail:after { + content: ''; + transform-origin: bottom center; + position: absolute; + background-color: #fff069; +} + +#pikachu .pika-tail:before { + height: 1.45rem; + width: 1.4rem; + top: -2rem; + left: 0.25rem; + transform: rotate(-90deg); + border: 1px solid #9c5200; + border-bottom-right-radius: 5px; + z-index: 4; + border-top: 1px solid #fff069; +} + +#pikachu .pika-tail:after { + background: #fff069; + height: 3rem; + width: 2rem; + top: -2.8rem; + left: -2.5rem; + border-radius: 5px 5px 0 5px; + border: 1px solid #9c5200; +} + +.moon { + position: absolute; + width: 75px; + height: 75px; + background: #FFEFBA; + background: -webkit-linear-gradient(135deg, #FFFFFF, #FFEFBA); + background: linear-gradient(135deg, #FFFFFF, #FFEFBA); + border: 5px solid #fffaf0; + top: 10%; + left: calc(50% - 45px); + padding: 0; + border-radius: 100%; +} + +.moon li { + position: absolute; + border-radius: 100%; +} + +.moon li:nth-child(1) { + background: #ffe691; + background: -webkit-linear-gradient(45deg, rgba(255, 250, 240, 0.1), #ffe691); + background: linear-gradient(45deg, rgba(255, 250, 240, 0.1), #ffe691); + width: 20px; + height: 20px; + left: 5px; + top: 30px; +} + +.moon li:nth-child(2) { + background: #ffe691; + background: -webkit-linear-gradient(to left, rgba(255, 250, 240, 0.1), #ffe691); + background: linear-gradient(to left, rgba(255, 250, 240, 0.1), #ffe691); + width: 35px; + height: 35px; + left: 35px; + top: 35px; +} + +.moon li:nth-child(3) { + background: #ffe691; + background: -webkit-linear-gradient(-120deg, rgba(255, 250, 240, 0.1), #ffe691); + background: linear-gradient(-120deg, rgba(255, 250, 240, 0.1), #ffe691); + width: 25px; + height: 25px; + left: 25px; + top: 5px; +} + +.sparkles { + position: absolute; + width: 120%; + height: 190px; + top: 30%; + left: -45px; +} + +.sparkles .sparkle { + position: absolute; + width: 11px; + height: 11px; + border-radius: 100%; +} + +.sparkles .sparkle:nth-child(1) { + background-color: #e9fbff; + box-shadow: 0px 0px 10px #e9fbff; +} + +.sparkles .sparkle:nth-child(2) { + background-color: #e9fbff; + box-shadow: 0px 0px 10px #e9fbff; +} + +.sparkles .sparkle:nth-child(3) { + background-color: #fffce6; + box-shadow: 0px 0px 10px #fffce6; +} + +.sparkles .sparkle:nth-child(4) { + background-color: #e9fbff; + box-shadow: 0px 0px 10px #e9fbff; +} + +.sparkles .sparkle:nth-child(5) { + background-color: #f3ffe4; + box-shadow: 0px 0px 10px #f3ffe4; +} + +.sparkles .sparkle:nth-child(6) { + background-color: #fffce6; + box-shadow: 0px 0px 10px #fffce6; +} + +.sparkles .sparkle:nth-child(7) { + background-color: #f3ffe4; + box-shadow: 0px 0px 10px #f3ffe4; +} + +.sparkles .sparkle:nth-child(8) { + background-color: #f3ffe4; + box-shadow: 0px 0px 10px #f3ffe4; +} + +.sparkles .sparkle:nth-child(9) { + background-color: #ffeefc; + box-shadow: 0px 0px 10px #ffeefc; +} + +.sparkles .sparkle:nth-child(10) { + background-color: #fffce6; + box-shadow: 0px 0px 10px #fffce6; +} + +.sparkles .sparkle:nth-child(11) { + background-color: #ffeefc; + box-shadow: 0px 0px 10px #ffeefc; +} + +.sparkles .sparkle:nth-child(12) { + background-color: #f3ffe4; + box-shadow: 0px 0px 10px #f3ffe4; +} + +.sparkles .sparkle:nth-child(13) { + background-color: #e9fbff; + box-shadow: 0px 0px 10px #e9fbff; +} + +.sparkles .sparkle:nth-child(14) { + background-color: #f3ffe4; + box-shadow: 0px 0px 10px #f3ffe4; +} + +.sparkles .sparkle:nth-child(15) { + background-color: #ffeefc; + box-shadow: 0px 0px 10px #ffeefc; +} + +.sparkles .sparkle:nth-child(16) { + background-color: #f3ffe4; + box-shadow: 0px 0px 10px #f3ffe4; +} + +.sparkles .sparkle:nth-child(17) { + background-color: #f3ffe4; + box-shadow: 0px 0px 10px #f3ffe4; +} + +.sparkles .sparkle:nth-child(18) { + background-color: #ffeefc; + box-shadow: 0px 0px 10px #ffeefc; +} + +.sparkles .sparkle:nth-child(19) { + background-color: #f3ffe4; + box-shadow: 0px 0px 10px #f3ffe4; +} + +.sparkles .sparkle:nth-child(20) { + background-color: #ffeefc; + box-shadow: 0px 0px 10px #ffeefc; +} + +.sparkles .sparkle:nth-child(21) { + background-color: #fffce6; + box-shadow: 0px 0px 10px #fffce6; +} + +.sparkles .sparkle:nth-child(22) { + background-color: #f3ffe4; + box-shadow: 0px 0px 10px #f3ffe4; +} + +.sparkles .sparkle:nth-child(23) { + background-color: #e9fbff; + box-shadow: 0px 0px 10px #e9fbff; +} + +.sparkles .sparkle:nth-child(24) { + background-color: #fffce6; + box-shadow: 0px 0px 10px #fffce6; +} + +.sparkles .sparkle:nth-child(25) { + background-color: #e9fbff; + box-shadow: 0px 0px 10px #e9fbff; +} + +.sparkles .sparkle:nth-child(26) { + background-color: #ffeefc; + box-shadow: 0px 0px 10px #ffeefc; +} + +.sparkles .sparkle:nth-child(27) { + background-color: #fffce6; + box-shadow: 0px 0px 10px #fffce6; +} + +.sparkles .sparkle:nth-child(28) { + background-color: #e9fbff; + box-shadow: 0px 0px 10px #e9fbff; +} + +.sparkles .sparkle:nth-child(29) { + background-color: #e9fbff; + box-shadow: 0px 0px 10px #e9fbff; +} + +.sparkles .sparkle:nth-child(30) { + background-color: #ffeefc; + box-shadow: 0px 0px 10px #ffeefc; +} + +.sparkles .sparkle:nth-child(31) { + background-color: #f3ffe4; + box-shadow: 0px 0px 10px #f3ffe4; +} + +.sparkles .sparkle:nth-child(32) { + background-color: #f3ffe4; + box-shadow: 0px 0px 10px #f3ffe4; +} + +.one { + left: 0; + top: 0; +} + +@keyframes flyOne { + 95% { + opacity: 1; + } + 100% { + transform: translate(270px, 75px) scale(0); + opacity: 0; + } +} + +.one:nth-child(1) { + animation: flyOne 15s 0s infinite; +} + +.one:nth-child(2) { + animation: flyOne 15s 6.44s infinite; +} + +.one:nth-child(3) { + animation: flyOne 15s 12.88s infinite; +} + +.one:nth-child(4) { + animation: flyOne 15s 19.32s infinite; +} + +.two { + right: 0; +} + +@keyframes flyTwo { + 95% { + opacity: 1; + } + 100% { + transform: translate(-270px, 75px) scale(0); + opacity: 0; + } +} + +.two:nth-child(5) { + animation: flyTwo 21s 2.7s infinite; +} + +.two:nth-child(6) { + animation: flyTwo 21s 8s infinite; +} + +.two:nth-child(7) { + animation: flyTwo 21s 13.3s infinite; +} + +.two:nth-child(8) { + animation: flyTwo 21s 18.6s infinite; +} + +.three { + left: 0; + top: 100%; +} + +@keyframes flyThree { + 95% { + opacity: 1; + } + 100% { + transform: translate(270px, -75px) scale(0); + opacity: 0; + } +} + +.three:nth-child(9) { + animation: flyThree 17s 1.4s infinite; +} + +.three:nth-child(10) { + animation: flyThree 17s 9.9s infinite; +} + +.three:nth-child(11) { + animation: flyThree 17s 18.4s infinite; +} + +.three:nth-child(12) { + animation: flyThree 17s 26.9s infinite; +} + +.four { + right: 0; + top: 100%; +} + +@keyframes flyFour { + 95% { + opacity: 1; + } + 100% { + transform: translate(-270px, -75px) scale(0); + opacity: 0; + } +} + +.four:nth-child(13) { + animation: flyFour 25s 5.8s infinite; +} + +.four:nth-child(14) { + animation: flyFour 25s 10.4s infinite; +} + +.four:nth-child(15) { + animation: flyFour 25s 15s infinite; +} + +.four:nth-child(16) { + animation: flyFour 25s 19.6s infinite; +} + +.five { + left: 0; + top: 50%; +} + +@keyframes flyFive { + 95% { + opacity: 1; + } + 100% { + transform: translate(270px, 0px) scale(0); + opacity: 0; + } +} + +.five:nth-child(17) { + animation: flyFive 35s 8.7s infinite; +} + +.five:nth-child(18) { + animation: flyFive 35s 14.4s infinite; +} + +.five:nth-child(19) { + animation: flyFive 35s 20.1s infinite; +} + +.five:nth-child(20) { + animation: flyFive 35s 25.8s infinite; +} + +.six { + right: 0; + top: 50%; +} + +@keyframes flySix { + 95% { + opacity: 1; + } + 100% { + transform: translate(-270px, 0px) scale(0); + opacity: 0; + } +} + +.six:nth-child(21) { + animation: flySix 23.5s 10.6s infinite; +} + +.six:nth-child(22) { + animation: flySix 23.5s 15s infinite; +} + +.six:nth-child(23) { + animation: flySix 23.5s 19.4s infinite; +} + +.six:nth-child(24) { + animation: flySix 23.5s 23.8s infinite; +} + +.seven { + left: 0; + top: 25%; +} + +@keyframes flySeven { + 95% { + opacity: 1; + } + 100% { + transform: translate(270px, 37px) scale(0); + opacity: 0; + } +} + +.seven:nth-child(25) { + animation: flySeven 29s 5s infinite; +} + +.seven:nth-child(26) { + animation: flySeven 29s 12.67s infinite; +} + +.seven:nth-child(27) { + animation: flySeven 29s 20.34s infinite; +} + +.seven:nth-child(28) { + animation: flySeven 29s 28.01s infinite; +} + +.eight { + right: 0; + top: 25%; +} + +@keyframes flyEight { + 95% { + opacity: 1; + } + 100% { + transform: translate(-270px, 37px) scale(0); + opacity: 0; + } +} + +.eight:nth-child(29) { + animation: flyEight 28.5s 1.6s infinite; +} + +.eight:nth-child(30) { + animation: flyEight 28.5s 5.34s infinite; +} + +.eight:nth-child(31) { + animation: flyEight 28.5s 9.08s infinite; +} + +.eight:nth-child(32) { + animation: flyEight 28.5s 12.82s infinite; +} + +@keyframes pikaPat { + from { + transform: rotate(-40deg); + } + to { + transform: rotate(-50deg); + } +} + +@keyframes rotateTail { + from { + transform: rotate(55deg); + } + to { + transform: rotate(65deg); + } +} + +@keyframes rotateLeftEar { + from { + transform: rotate(-35deg); + } + to { + transform: rotate(-40deg); + } +} + +@keyframes rotateRightEar { + from { + transform: rotate(50deg); + } + to { + transform: rotate(60deg); + } +} + +@keyframes bulbaBreathe { + from { + transform: rotate(45deg) scale(1); + } + to { + transform: rotate(45deg) scale(1.01); + } +} + +@keyframes bodyBreathe { + from { + transform: scale(1); + } + to { + transform: scale(1.05); + } +} + +@keyframes rotateLeftBulbEar { + from { + transform: rotate(-45deg); + } + to { + transform: rotate(-55deg); + } +} + +@keyframes rotateRightBulbEar { + from { + transform: rotate(45deg); + } + to { + transform: rotate(55deg); + } +} \ No newline at end of file diff --git a/QMPlusVuePage/src/view/dashbord/component/animition.vue b/QMPlusVuePage/src/view/dashbord/component/animition.vue new file mode 100644 index 0000000000..c794062eba --- /dev/null +++ b/QMPlusVuePage/src/view/dashbord/component/animition.vue @@ -0,0 +1,93 @@ + + + \ No newline at end of file diff --git a/QMPlusVuePage/src/view/dashbord/index.vue b/QMPlusVuePage/src/view/dashbord/index.vue index 33e89b6f56..f80c61341a 100644 --- a/QMPlusVuePage/src/view/dashbord/index.vue +++ b/QMPlusVuePage/src/view/dashbord/index.vue @@ -1,33 +1,46 @@ \ No newline at end of file From e5350ec931ecd511c4e6927fdab7e5c59f9a610e Mon Sep 17 00:00:00 2001 From: pixel <303176530@qq.com> Date: Sun, 13 Oct 2019 19:52:37 +0800 Subject: [PATCH 049/409] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E7=94=A8=E6=88=B7=20=E6=B7=BB=E5=8A=A0=E5=B1=95=E7=A4=BA?= =?UTF-8?q?=E8=A7=86=E9=A2=91=E4=BB=A5=E5=8F=8A=E6=95=99=E5=AD=A6=E8=A7=86?= =?UTF-8?q?=E9=A2=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- QMPlusServer/db/qmplus.sql | 4 ++-- QMPlusVuePage/src/view/layout/aside/index.vue | 2 +- QMPlusVuePage/src/view/layout/index.vue | 2 +- README.md | 7 +++++++ 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/QMPlusServer/db/qmplus.sql b/QMPlusServer/db/qmplus.sql index b29fe47360..55d1e307c5 100644 --- a/QMPlusServer/db/qmplus.sql +++ b/QMPlusServer/db/qmplus.sql @@ -11,7 +11,7 @@ Target Server Version : 50644 File Encoding : 65001 - Date: 09/10/2019 23:08:15 + Date: 13/10/2019 19:51:33 */ SET NAMES utf8mb4; @@ -258,7 +258,7 @@ CREATE TABLE `users` ( -- ---------------------------- -- Records of users -- ---------------------------- -INSERT INTO `users` VALUES (10, '2019-09-13 17:23:46', '2019-09-13 17:23:46', NULL, 0x63653064363638352D633135662D343132362D613562342D383930626339643233353664, NULL, NULL, 'QMPlusUser', 'http://www.henrongyi.top/avatar/lufu.jpg', 888, NULL, '303176530', '3ec063004a6f31642261936a379fde3d'); +INSERT INTO `users` VALUES (10, '2019-09-13 17:23:46', '2019-09-13 17:23:46', NULL, 0x63653064363638352D633135662D343132362D613562342D383930626339643233353664, NULL, NULL, '超级管理员', 'http://www.henrongyi.top/avatar/lufu.jpg', 888, NULL, 'admin', 'e10adc3949ba59abbe56e057f20f883e'); INSERT INTO `users` VALUES (11, '2019-09-13 17:27:29', '2019-09-13 17:27:29', NULL, 0x66643665663739622D393434632D343838382D383337372D616265326432363038383538, NULL, NULL, 'QMPlusUser', 'http://www.henrongyi.top/avatar/lufu.jpg', 888, NULL, 'a303176530', '3ec063004a6f31642261936a379fde3d'); INSERT INTO `users` VALUES (12, '2019-09-13 17:28:56', '2019-09-13 17:28:56', NULL, 0x65373939636563362D346337662D343338632D383634372D376435633333393734353165, NULL, NULL, 'QMPlusUser', 'http://www.henrongyi.top/avatar/lufu.jpg', 888, NULL, 'a30317465', '3ec063004a6f31642261936a379fde3d'); INSERT INTO `users` VALUES (13, '2019-09-13 17:29:26', '2019-09-13 17:29:26', NULL, 0x65653764353932322D323333312D343162632D393363322D613665366461306465343230, NULL, NULL, 'QMPlusUser', 'http://www.henrongyi.top/avatar/lufu.jpg', 888, NULL, 'a30317465', '3ec063004a6f31642261936a379fde3d'); diff --git a/QMPlusVuePage/src/view/layout/aside/index.vue b/QMPlusVuePage/src/view/layout/aside/index.vue index 8f45f1562d..b91768d0f7 100644 --- a/QMPlusVuePage/src/view/layout/aside/index.vue +++ b/QMPlusVuePage/src/view/layout/aside/index.vue @@ -4,7 +4,7 @@ - +

Date: Tue, 15 Oct 2019 22:56:03 +0800 Subject: [PATCH 050/409] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=A4=B4=E5=83=8F?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=EF=BC=88=E6=98=8E=E5=A4=A9=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF=E6=9B=B4=E6=96=B0=E6=96=B9?= =?UTF-8?q?=E6=B3=95=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- QMPlusServer/controller/api/user.go | 6 +- QMPlusServer/model/dbModel/user.go | 4 +- QMPlusVuePage/src/view/dashbord/index.vue | 22 +------ QMPlusVuePage/src/view/layout/aside/index.vue | 36 +++++------ QMPlusVuePage/src/view/layout/index.vue | 4 ++ QMPlusVuePage/src/view/person/person.vue | 63 +++++++++++++++++++ 6 files changed, 91 insertions(+), 44 deletions(-) create mode 100644 QMPlusVuePage/src/view/person/person.vue diff --git a/QMPlusServer/controller/api/user.go b/QMPlusServer/controller/api/user.go index 4eb9e6663b..400183abbc 100644 --- a/QMPlusServer/controller/api/user.go +++ b/QMPlusServer/controller/api/user.go @@ -129,10 +129,9 @@ func UploadHeaderImg(c *gin.Context) { //获取头像文件 // 这里我们通过断言获取 claims内的所有内容 waitUse := claims.(*middleware.CustomClaims) - fmt.Println(waitUse.NickName) + uuid := waitUse.UUID _, header, err := c.Request.FormFile("headerImg") //便于找到用户以后从jwt中取 - username := c.PostForm("username") if err != nil { servers.ReportFormat(c, false, fmt.Sprintf("上传文件失败，%v", err), gin.H{}) } else { @@ -142,8 +141,7 @@ func UploadHeaderImg(c *gin.Context) { servers.ReportFormat(c, false, fmt.Sprintf("接收返回值失败，%v", err), gin.H{}) } else { //修改数据库后得到修改后的user并且返回供前端使用 - err, user := new(dbModel.User).UploadHeaderImg(username, filePath) - + err, user := new(dbModel.User).UploadHeaderImg(uuid, filePath) if err != nil { servers.ReportFormat(c, false, fmt.Sprintf("修改数据库链接失败，%v", err), gin.H{}) } else { diff --git a/QMPlusServer/model/dbModel/user.go b/QMPlusServer/model/dbModel/user.go index 675246b5e2..8c870c42e8 100644 --- a/QMPlusServer/model/dbModel/user.go +++ b/QMPlusServer/model/dbModel/user.go @@ -69,9 +69,9 @@ func (u *User) Login() (err error, userInter *User) { } // 用户头像上传更新地址 -func (u *User) UploadHeaderImg(username string, filePath string) (err error, userInter *User) { +func (u *User) UploadHeaderImg(uuid uuid.UUID, filePath string) (err error, userInter *User) { var user User - err = qmsql.DEFAULTDB.Where("username = ?", username).First(&user).Update("header_img", filePath).First(&user).Error + err = qmsql.DEFAULTDB.Where("uuid = ?", uuid).First(&user).Update("header_img", filePath).First(&user).Error return err, &user } diff --git a/QMPlusVuePage/src/view/dashbord/index.vue b/QMPlusVuePage/src/view/dashbord/index.vue index f80c61341a..dddefe9e10 100644 --- a/QMPlusVuePage/src/view/dashbord/index.vue +++ b/QMPlusVuePage/src/view/dashbord/index.vue @@ -6,21 +6,7 @@

微信：shouzi_1994

- + @@ -39,8 +25,6 @@ export default { } - \ No newline at end of file diff --git a/QMPlusVuePage/src/view/layout/aside/index.vue b/QMPlusVuePage/src/view/layout/aside/index.vue index b91768d0f7..c9a8e2e95d 100644 --- a/QMPlusVuePage/src/view/layout/aside/index.vue +++ b/QMPlusVuePage/src/view/layout/aside/index.vue @@ -1,26 +1,24 @@ @@ -32,7 +30,7 @@ export default { data() { return { active: '', - isCollapse: false, + isCollapse: false } }, methods: { diff --git a/QMPlusVuePage/src/view/layout/index.vue b/QMPlusVuePage/src/view/layout/index.vue index cc5bce8c76..2f5d472eee 100644 --- a/QMPlusVuePage/src/view/layout/index.vue +++ b/QMPlusVuePage/src/view/layout/index.vue @@ -15,6 +15,7 @@ + 个人信息登出 @@ -54,6 +55,9 @@ export default { ...mapMutations('user', ['LoginOut']), totalCollapse() { this.$bus.emit('totalCollapse') + }, + toPerson(){ + this.$router.push({name:"person"}) } }, computed: { diff --git a/QMPlusVuePage/src/view/person/person.vue b/QMPlusVuePage/src/view/person/person.vue new file mode 100644 index 0000000000..4289f0b5c5 --- /dev/null +++ b/QMPlusVuePage/src/view/person/person.vue @@ -0,0 +1,63 @@ + + + \ No newline at end of file From ceb48da8498433088e7585898f4f95abcb4cc057 Mon Sep 17 00:00:00 2001 From: pixel <303176530@qq.com> Date: Thu, 17 Oct 2019 22:15:22 +0800 Subject: [PATCH 051/409] =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- QMPlusVuePage/src/store/module/user.js | 6 +++++- QMPlusVuePage/src/view/person/person.vue | 7 ++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/QMPlusVuePage/src/store/module/user.js b/QMPlusVuePage/src/store/module/user.js index d9ebe034c1..34e8e6de8b 100644 --- a/QMPlusVuePage/src/store/module/user.js +++ b/QMPlusVuePage/src/store/module/user.js @@ -30,8 +30,12 @@ export const user = { state.token = "" state.expiresAt = "" router.push({ name: 'login', replace: true }) + }, + ResetUserInfo(state, userInfo = {}) { + state.userInfo = {...state.userInfo, + ...userInfo + } } - }, actions: { async LoginIn({ commit }, loginInfo) { diff --git a/QMPlusVuePage/src/view/person/person.vue b/QMPlusVuePage/src/view/person/person.vue index 4289f0b5c5..9343906f4a 100644 --- a/QMPlusVuePage/src/view/person/person.vue +++ b/QMPlusVuePage/src/view/person/person.vue @@ -23,15 +23,16 @@ \ No newline at end of file diff --git a/QMPlusVuePage/src/view/example/form/form.vue b/QMPlusVuePage/src/view/example/form/form.vue new file mode 100644 index 0000000000..ec76a25084 --- /dev/null +++ b/QMPlusVuePage/src/view/example/form/form.vue @@ -0,0 +1,10 @@ + + \ No newline at end of file diff --git a/QMPlusVuePage/src/view/example/index.vue b/QMPlusVuePage/src/view/example/index.vue new file mode 100644 index 0000000000..5b1352915c --- /dev/null +++ b/QMPlusVuePage/src/view/example/index.vue @@ -0,0 +1,12 @@ + + + + \ No newline at end of file diff --git a/QMPlusVuePage/src/view/example/rte/rte.vue b/QMPlusVuePage/src/view/example/rte/rte.vue new file mode 100644 index 0000000000..dcedb06039 --- /dev/null +++ b/QMPlusVuePage/src/view/example/rte/rte.vue @@ -0,0 +1,10 @@ + + \ No newline at end of file diff --git a/QMPlusVuePage/src/view/example/table/table.vue b/QMPlusVuePage/src/view/example/table/table.vue new file mode 100644 index 0000000000..ba12be1a2f --- /dev/null +++ b/QMPlusVuePage/src/view/example/table/table.vue @@ -0,0 +1,10 @@ + + \ No newline at end of file diff --git a/QMPlusVuePage/src/view/example/upload/upload.vue b/QMPlusVuePage/src/view/example/upload/upload.vue new file mode 100644 index 0000000000..2f1bf80031 --- /dev/null +++ b/QMPlusVuePage/src/view/example/upload/upload.vue @@ -0,0 +1,10 @@ + + \ No newline at end of file diff --git a/QMPlusVuePage/src/view/superAdmin/index.vue b/QMPlusVuePage/src/view/superAdmin/index.vue index d3d6b3daea..fd90ecdf2c 100644 --- a/QMPlusVuePage/src/view/superAdmin/index.vue +++ b/QMPlusVuePage/src/view/superAdmin/index.vue @@ -4,7 +4,7 @@ \ No newline at end of file From 5d0be589f034231f1daef11e2626164ff17cb166 Mon Sep 17 00:00:00 2001 From: klausY Date: Wed, 30 Oct 2019 17:10:11 +0800 Subject: [PATCH 075/409] =?UTF-8?q?form=E8=A1=A8=E5=8D=95=E7=A4=BA?= =?UTF-8?q?=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- QMPlusServer/config/dbconfig/config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/QMPlusServer/config/dbconfig/config.json b/QMPlusServer/config/dbconfig/config.json index 72860b6a34..e0d9bc1acf 100644 --- a/QMPlusServer/config/dbconfig/config.json +++ b/QMPlusServer/config/dbconfig/config.json @@ -3,7 +3,7 @@ "username": "root", "password": "Aa@6447985", "path": "127.0.0.1:3306", - "dbname": "QMPlus", + "dbname": "yx", "config": "charset=utf8&parseTime=True&loc=Local" } } \ No newline at end of file From 3c8112a6fb56bf539a4f54036fdf8ec689e6f760 Mon Sep 17 00:00:00 2001 From: klausY Date: Wed, 30 Oct 2019 17:10:40 +0800 Subject: [PATCH 076/409] =?UTF-8?q?form=E8=A1=A8=E5=8D=95=E7=A4=BA?= =?UTF-8?q?=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- QMPlusServer/config/dbconfig/config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/QMPlusServer/config/dbconfig/config.json b/QMPlusServer/config/dbconfig/config.json index e0d9bc1acf..b1ae2d0969 100644 --- a/QMPlusServer/config/dbconfig/config.json +++ b/QMPlusServer/config/dbconfig/config.json @@ -3,7 +3,7 @@ "username": "root", "password": "Aa@6447985", "path": "127.0.0.1:3306", - "dbname": "yx", + "dbname": "qmplus", "config": "charset=utf8&parseTime=True&loc=Local" } } \ No newline at end of file From 0ed01877e0973e9b42382ebf328a8d4906dc1737 Mon Sep 17 00:00:00 2001 From: pixel <303176530@qq.com> Date: Wed, 30 Oct 2019 17:21:11 +0800 Subject: [PATCH 077/409] =?UTF-8?q?warning=E6=B8=85=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- QMPlusVuePage/src/view/example/rte/rte.vue | 80 ++++++++++--------- .../src/view/example/upload/upload.vue | 9 ++- 2 files changed, 46 insertions(+), 43 deletions(-) diff --git a/QMPlusVuePage/src/view/example/rte/rte.vue b/QMPlusVuePage/src/view/example/rte/rte.vue index bcf870e256..fbcf6704e0 100644 --- a/QMPlusVuePage/src/view/example/rte/rte.vue +++ b/QMPlusVuePage/src/view/example/rte/rte.vue @@ -1,48 +1,50 @@ \ No newline at end of file diff --git a/QMPlusVuePage/src/view/example/upload/upload.vue b/QMPlusVuePage/src/view/example/upload/upload.vue index c4148420ba..013b3ead33 100644 --- a/QMPlusVuePage/src/view/example/upload/upload.vue +++ b/QMPlusVuePage/src/view/example/upload/upload.vue @@ -91,15 +91,16 @@ export default { } return (isPng || isJPG) && isLt2M }, - uploadSuccess(res, file) { - console.log(res, file) + uploadSuccess(res) { this.$message({ type: 'success', message: '上传成功' }) - this.getTableData() + if(res.success){ + this.getTableData() + } }, - uploadError(err) { + uploadError() { this.$message({ type: 'error', message: '上传失败' From 0a27fa1c7b0a09202899ac716b5383233dca6c20 Mon Sep 17 00:00:00 2001 From: pixel <303176530@qq.com> Date: Wed, 30 Oct 2019 17:25:03 +0800 Subject: [PATCH 078/409] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- QMPlusVuePage/package-lock.json | 47 ++++++++++++++++++++++++--------- 1 file changed, 34 insertions(+), 13 deletions(-) diff --git a/QMPlusVuePage/package-lock.json b/QMPlusVuePage/package-lock.json index ceb60f8e27..cf04cff582 100644 --- a/QMPlusVuePage/package-lock.json +++ b/QMPlusVuePage/package-lock.json @@ -2858,7 +2858,8 @@ "version": "4.6.0", "resolved": "https://registry.npm.taobao.org/co/download/co-4.6.0.tgz", "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=", - "dev": true + "dev": true, + "optional": true }, "coa": { "version": "2.0.2", @@ -5217,7 +5218,8 @@ "ansi-regex": { "version": "2.1.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "aproba": { "version": "1.2.0", @@ -5238,12 +5240,14 @@ "balanced-match": { "version": "1.0.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, "dev": true, + "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -5258,17 +5262,20 @@ "code-point-at": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "concat-map": { "version": "0.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "console-control-strings": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "core-util-is": { "version": "1.0.2", @@ -5385,7 +5392,8 @@ "inherits": { "version": "2.0.3", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "ini": { "version": "1.3.5", @@ -5397,6 +5405,7 @@ "version": "1.0.0", "bundled": true, "dev": true, + "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -5411,6 +5420,7 @@ "version": "3.0.4", "bundled": true, "dev": true, + "optional": true, "requires": { "brace-expansion": "^1.1.7" } @@ -5418,12 +5428,14 @@ "minimist": { "version": "0.0.8", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "minipass": { "version": "2.3.5", "bundled": true, "dev": true, + "optional": true, "requires": { "safe-buffer": "^5.1.2", "yallist": "^3.0.0" @@ -5442,6 +5454,7 @@ "version": "0.5.1", "bundled": true, "dev": true, + "optional": true, "requires": { "minimist": "0.0.8" } @@ -5522,7 +5535,8 @@ "number-is-nan": { "version": "1.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "object-assign": { "version": "4.1.1", @@ -5534,6 +5548,7 @@ "version": "1.4.0", "bundled": true, "dev": true, + "optional": true, "requires": { "wrappy": "1" } @@ -5619,7 +5634,8 @@ "safe-buffer": { "version": "5.1.2", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "safer-buffer": { "version": "2.1.2", @@ -5655,6 +5671,7 @@ "version": "1.0.2", "bundled": true, "dev": true, + "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -5674,6 +5691,7 @@ "version": "3.0.1", "bundled": true, "dev": true, + "optional": true, "requires": { "ansi-regex": "^2.0.0" } @@ -5717,12 +5735,14 @@ "wrappy": { "version": "1.0.2", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "yallist": { "version": "3.0.3", "bundled": true, - "dev": true + "dev": true, + "optional": true } } }, @@ -9831,7 +9851,8 @@ "version": "4.0.8", "resolved": "https://registry.npm.taobao.org/rx-lite/download/rx-lite-4.0.8.tgz", "integrity": "sha1-Cx4Rr4vESDbwSmQH6S2kJGe3lEQ=", - "dev": true + "dev": true, + "optional": true }, "rx-lite-aggregates": { "version": "4.0.8", From 20156cb5a016b4c0ffb4b5c77bdea5e43d84342e Mon Sep 17 00:00:00 2001 From: klausY Date: Wed, 30 Oct 2019 17:40:33 +0800 Subject: [PATCH 079/409] =?UTF-8?q?css=E6=A0=B7=E5=BC=8Fbug=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- QMPlusVuePage/src/view/example/rte/rte.vue | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/QMPlusVuePage/src/view/example/rte/rte.vue b/QMPlusVuePage/src/view/example/rte/rte.vue index bcf870e256..68264bdcec 100644 --- a/QMPlusVuePage/src/view/example/rte/rte.vue +++ b/QMPlusVuePage/src/view/example/rte/rte.vue @@ -37,12 +37,5 @@ \ No newline at end of file From 6612e792bb10c0e2c3f552949d100004beb5b751 Mon Sep 17 00:00:00 2001 From: pixel <303176530@qq.com> Date: Fri, 1 Nov 2019 13:56:40 +0800 Subject: [PATCH 080/409] =?UTF-8?q?=E5=BC=80=E5=90=AF=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/servers/reportformat.go | 18 ++++++++++++++++++ QMPlusServer/init/initRouter/initRouter.go | 2 ++ QMPlusServer/main.go | 10 +++++----- 3 files changed, 25 insertions(+), 5 deletions(-) diff --git a/QMPlusServer/controller/servers/reportformat.go b/QMPlusServer/controller/servers/reportformat.go index 2b935fea5d..a28c0fb262 100644 --- a/QMPlusServer/controller/servers/reportformat.go +++ b/QMPlusServer/controller/servers/reportformat.go @@ -2,10 +2,28 @@ package servers import ( "github.com/gin-gonic/gin" + "main/init/qmlog" "net/http" + "time" ) func ReportFormat(c *gin.Context, success bool, msg string, json gin.H) { + // 开始时间 + start := time.Now() + path := c.Request.URL.Path + clientIP := c.ClientIP() + method := c.Request.Method + statusCode := c.Writer.Status() + qmlog.QMLog.Infof("| %3d | %13v | %15s | %s %s |%s|", + statusCode, + start, + clientIP, + method, path, gin.H{ + "success": success, + "msg": msg, + "data": json, + }, + ) c.JSON(http.StatusOK, gin.H{ "success": success, "msg": msg, diff --git a/QMPlusServer/init/initRouter/initRouter.go b/QMPlusServer/init/initRouter/initRouter.go index bac9e650ea..fd3ba87487 100644 --- a/QMPlusServer/init/initRouter/initRouter.go +++ b/QMPlusServer/init/initRouter/initRouter.go @@ -5,12 +5,14 @@ import ( "github.com/swaggo/gin-swagger" "github.com/swaggo/gin-swagger/swaggerFiles" _ "main/docs" + "main/middleware" "main/router" ) //初始化总路由 func InitRouter() *gin.Engine { var Router = gin.Default() + Router.Use(middleware.Logger()) // 如果不需要日志请关闭这里 Router.GET("/swagger/*any", ginSwagger.WrapHandler(swaggerFiles.Handler)) //Router.Use(middleware.Logger()) router.InitUserRouter(Router) // 注册用户路由 diff --git a/QMPlusServer/main.go b/QMPlusServer/main.go index e40d290f7b..7d3f0f0d22 100644 --- a/QMPlusServer/main.go +++ b/QMPlusServer/main.go @@ -23,7 +23,7 @@ func main() { registTable.RegistTable(qmsql.InitMysql(config.Dbconfig.Admin)) defer qmsql.DEFAULTDB.Close() Router := initRouter.InitRouter() - //qmlog.QMLog.Info("服务器开启") // 日志测试代码 + qmlog.QMLog.Info("服务器开启") // 日志测试代码 s := &http.Server{ Addr: ":8888", @@ -32,16 +32,16 @@ func main() { WriteTimeout: 10 * time.Second, MaxHeaderBytes: 1 << 20, } - time.Sleep(10*time.Microsecond) + time.Sleep(10 * time.Microsecond) fmt.Printf(`欢迎使用 Gin-Vue-Admin 作者：奇淼 And Spike666 微信：shouzi_1994 默认自动化文档地址:http://127.0.0.1%s/swagger/index.html 默认前端文件运行地址:http://127.0.0.1:8080 -`,s.Addr) +`, s.Addr) _ = s.ListenAndServe() } -func run(server *http.Server){ +func run(server *http.Server) { -} \ No newline at end of file +} From 260b1c11adad26d3f78ff231bac03ab4cec54f78 Mon Sep 17 00:00:00 2001 From: pixel <303176530@qq.com> Date: Fri, 1 Nov 2019 14:04:48 +0800 Subject: [PATCH 081/409] =?UTF-8?q?=E5=88=9B=E5=BB=BAlog=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E5=A4=B9=20=E5=B9=B6=E4=B8=94=E6=B1=82=E6=94=B9=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E7=9B=AE=E5=BD=95=E4=B8=BAlog=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E5=A4=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- QMPlusServer/init/qmlog/qmlog.go | 2 +- QMPlusServer/log/api.log.2019-11-01-08-00.log | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 QMPlusServer/log/api.log.2019-11-01-08-00.log diff --git a/QMPlusServer/init/qmlog/qmlog.go b/QMPlusServer/init/qmlog/qmlog.go index c5dcb84e92..d066a2f4e7 100644 --- a/QMPlusServer/init/qmlog/qmlog.go +++ b/QMPlusServer/init/qmlog/qmlog.go @@ -20,7 +20,7 @@ func InitLog() { } QMLog.Out = src QMLog.SetLevel(logrus.DebugLevel) - apiLogPath := "api.log" + apiLogPath := "./log/api.log" logWriter, err := rotatelogs.New( apiLogPath+".%Y-%m-%d-%H-%M.log", rotatelogs.WithLinkName(apiLogPath), // 生成软链，指向最新日志文件 diff --git a/QMPlusServer/log/api.log.2019-11-01-08-00.log b/QMPlusServer/log/api.log.2019-11-01-08-00.log new file mode 100644 index 0000000000..251d498065 --- /dev/null +++ b/QMPlusServer/log/api.log.2019-11-01-08-00.log @@ -0,0 +1,6 @@ +{"level":"info","msg":"| 200 | 960.2µs | ::1 | GET /swagger/index.html ||","time":"2019-11-01T14:04:16+08:00"} +{"level":"info","msg":"| 304 | 0s | ::1 | GET /swagger/swagger-ui.css ||","time":"2019-11-01T14:04:16+08:00"} +{"level":"info","msg":"| 304 | 0s | ::1 | GET /swagger/swagger-ui-bundle.js ||","time":"2019-11-01T14:04:16+08:00"} +{"level":"info","msg":"| 304 | 0s | ::1 | GET /swagger/swagger-ui-standalone-preset.js ||","time":"2019-11-01T14:04:16+08:00"} +{"level":"info","msg":"| 200 | 998.3µs | ::1 | GET /swagger/doc.json ||","time":"2019-11-01T14:04:17+08:00"} +{"level":"info","msg":"| 200 | 0s | ::1 | GET /swagger/favicon-32x32.png ||","time":"2019-11-01T14:04:17+08:00"} From ab18bddf4067f48cc518a761d777fe6166b6fa6d Mon Sep 17 00:00:00 2001 From: pixel <303176530@qq.com> Date: Fri, 1 Nov 2019 14:48:28 +0800 Subject: [PATCH 082/409] =?UTF-8?q?=E5=88=9B=E5=BB=BAlog=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E5=A4=B9=20=E5=B9=B6=E4=B8=94=E6=B1=82=E6=94=B9=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E7=9B=AE=E5=BD=95=E4=B8=BAlog=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E5=A4=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- QMPlusServer/.gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/QMPlusServer/.gitignore b/QMPlusServer/.gitignore index 37891631e9..2333fcfd26 100644 --- a/QMPlusServer/.gitignore +++ b/QMPlusServer/.gitignore @@ -1,2 +1,3 @@ go.sum .idea/ +log/ From 7d549c33eb500611206b02b184fa03a75834e752 Mon Sep 17 00:00:00 2001 From: pixel <303176530@qq.com> Date: Mon, 4 Nov 2019 16:42:09 +0800 Subject: [PATCH 083/409] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=86=E5=89=8D?= =?UTF-8?q?=E7=AB=AFui=E6=A1=86=E6=9E=B6=E8=AF=B4=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 1d14d7d0c6..d3ae6bdcae 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ # gin-vue-admin gin+vue开源快速项目模板 - +本模板使用前端ui框架为 element-ui https://element.eleme.cn/#/zh-CN 前端组件可查看elementUi文档使用 ## 写在前面本项目主要是小弟在接各种私活的时候发现频繁得书写CURD、权限管理、用户管理、列表、分页、上传下载、日志包封装、文档自动化等等功能为了方方便各位个人开发者快速搭建项目基础模型，于是开发本模板，也为了以后自己可以剩下一些初期开发的功夫 From d051f8b1b27d9e8710d656849754e38483b00db5 Mon Sep 17 00:00:00 2001 From: pixel <303176530@qq.com> Date: Thu, 7 Nov 2019 22:05:41 +0800 Subject: [PATCH 084/409] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=E7=AC=AC?= =?UTF-8?q?=E4=B8=80=E6=AC=A1=E7=99=BB=E5=BD=95=E7=99=BD=E9=A1=B5=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98=20=E5=88=A0=E9=99=A4=E4=BA=86=E5=87=A0?= =?UTF-8?q?=E4=B8=AA=E7=A9=BA=E7=99=BD=E7=9A=84=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- QMPlusServer/model/dbModel/exampleForm.go | 6 - QMPlusServer/model/dbModel/exampleTable.go | 1 - QMPlusVuePage/src/store/module/user.js | 3 +- QMPlusVuePage/src/view/example/form/form.vue | 199 ++++++++++--------- 4 files changed, 105 insertions(+), 104 deletions(-) delete mode 100644 QMPlusServer/model/dbModel/exampleForm.go delete mode 100644 QMPlusServer/model/dbModel/exampleTable.go diff --git a/QMPlusServer/model/dbModel/exampleForm.go b/QMPlusServer/model/dbModel/exampleForm.go deleted file mode 100644 index 8ac9dfb261..0000000000 --- a/QMPlusServer/model/dbModel/exampleForm.go +++ /dev/null @@ -1,6 +0,0 @@ -package dbModel - -type ExampleForm struct { - Name string `json:"name"` -} - diff --git a/QMPlusServer/model/dbModel/exampleTable.go b/QMPlusServer/model/dbModel/exampleTable.go deleted file mode 100644 index 9a3a2dc2de..0000000000 --- a/QMPlusServer/model/dbModel/exampleTable.go +++ /dev/null @@ -1 +0,0 @@ -package dbModel diff --git a/QMPlusVuePage/src/store/module/user.js b/QMPlusVuePage/src/store/module/user.js index 34e8e6de8b..e862868d06 100644 --- a/QMPlusVuePage/src/store/module/user.js +++ b/QMPlusVuePage/src/store/module/user.js @@ -38,12 +38,13 @@ export const user = { } }, actions: { - async LoginIn({ commit }, loginInfo) { + async LoginIn({ commit, dispatch }, loginInfo) { const res = await login(loginInfo) commit('setUserInfo', res.data.user) commit('setToken', res.data.token) commit('setExpiresAt', res.data.expiresAt) if (res.success) { + await dispatch("SetAsyncRouter") const redirect = router.history.current.query.redirect if (redirect) { router.push({ path: redirect, replace: true }) diff --git a/QMPlusVuePage/src/view/example/form/form.vue b/QMPlusVuePage/src/view/example/form/form.vue index b8d935c85c..d01629d9fa 100644 --- a/QMPlusVuePage/src/view/example/form/form.vue +++ b/QMPlusVuePage/src/view/example/form/form.vue @@ -1,103 +1,110 @@ \ No newline at end of file From 58cf2717972417d77d382284963ea21bdbfe4a83 Mon Sep 17 00:00:00 2001 From: pixel <303176530@qq.com> Date: Sat, 9 Nov 2019 19:07:00 +0800 Subject: [PATCH 085/409] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=A6=96=E6=AC=A1?= =?UTF-8?q?=E7=99=BB=E9=99=86=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98=20?= =?UTF-8?q?=E7=99=BD=E5=B1=8F=E9=97=AE=E9=A2=98=E5=A6=82=E6=9E=9C=E5=87=BA?= =?UTF-8?q?=E7=8E=B0=E8=AF=B7=E5=8F=8A=E6=97=B6iss=20=E6=84=9F=E8=B0=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- QMPlusVuePage/src/store/module/router.js | 1 + QMPlusVuePage/src/store/module/user.js | 7 +++---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/QMPlusVuePage/src/store/module/router.js b/QMPlusVuePage/src/store/module/router.js index 8025e84199..212a27a316 100644 --- a/QMPlusVuePage/src/store/module/router.js +++ b/QMPlusVuePage/src/store/module/router.js @@ -35,6 +35,7 @@ export const router = { }) asyncRouterHandle(baseRouter) commit('setAsyncRouter', baseRouter) + return true } }, getters: { diff --git a/QMPlusVuePage/src/store/module/user.js b/QMPlusVuePage/src/store/module/user.js index e862868d06..9cc3395f42 100644 --- a/QMPlusVuePage/src/store/module/user.js +++ b/QMPlusVuePage/src/store/module/user.js @@ -38,18 +38,17 @@ export const user = { } }, actions: { - async LoginIn({ commit, dispatch }, loginInfo) { + async LoginIn({ commit }, loginInfo) { const res = await login(loginInfo) commit('setUserInfo', res.data.user) commit('setToken', res.data.token) commit('setExpiresAt', res.data.expiresAt) if (res.success) { - await dispatch("SetAsyncRouter") const redirect = router.history.current.query.redirect if (redirect) { - router.push({ path: redirect, replace: true }) + router.push({ path: redirect }) } else { - router.push({ path: '/layout/dashbord', replace: true }) + router.push({ path: '/layout/dashbord' }) } } } From e60487bb1763024b783a4a48e3abfab7e0a430cf Mon Sep 17 00:00:00 2001 From: pixel <303176530@qq.com> Date: Sat, 9 Nov 2019 23:18:29 +0800 Subject: [PATCH 086/409] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=E6=90=9C=E7=B4=A2=E7=A4=BA=E4=BE=8B=20=E5=89=8D=E7=AB=AF?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=8F=82=E8=80=83src\view\superAdmin\api\api?= =?UTF-8?q?.vue=20=E5=90=8E=E5=8F=B0=E6=96=87=E4=BB=B6=E5=8F=82=E8=80=83?= =?UTF-8?q?=20model\dnModel\api.go?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- QMPlusServer/controller/api/api.go | 17 ++++++++++++----- QMPlusServer/model/dbModel/api.go | 2 +- .../src/components/mixins/infoList.js | 3 ++- QMPlusVuePage/src/view/superAdmin/api/api.vue | 19 ++++++++++++++++++- 4 files changed, 33 insertions(+), 8 deletions(-) diff --git a/QMPlusServer/controller/api/api.go b/QMPlusServer/controller/api/api.go index 3c35194994..929f5283dc 100644 --- a/QMPlusServer/controller/api/api.go +++ b/QMPlusServer/controller/api/api.go @@ -79,6 +79,8 @@ func SetAuthAndApi(c *gin.Context) { } } +//条件搜索后端看此api + // @Tags Api // @Summary 分页获取API列表 // @Security ApiKeyAuth @@ -88,17 +90,22 @@ func SetAuthAndApi(c *gin.Context) { // @Success 200 {string} json "{"success":true,"data":{},"msg":"获取成功"}" // @Router /api/getApiList [post] func GetApiList(c *gin.Context) { - var pageInfo modelInterface.PageInfo - _ = c.BindJSON(&pageInfo) - err, list, total := new(dbModel.Api).GetInfoList(pageInfo) + // 此结构体仅本方法使用 + type searchParams struct { + dbModel.Api + modelInterface.PageInfo + } + var sp searchParams + _ = c.ShouldBindJSON(&sp) + err, list, total := sp.Api.GetInfoList(sp.PageInfo) if err != nil { servers.ReportFormat(c, false, fmt.Sprintf("获取数据失败，%v", err), gin.H{}) } else { servers.ReportFormat(c, true, "获取数据成功", gin.H{ "list": list, "total": total, - "page": pageInfo.Page, - "pageSize": pageInfo.PageSize, + "page": sp.PageInfo.Page, + "pageSize": sp.PageInfo.PageSize, }) } diff --git a/QMPlusServer/model/dbModel/api.go b/QMPlusServer/model/dbModel/api.go index 048bb297b0..ed50dba0f8 100644 --- a/QMPlusServer/model/dbModel/api.go +++ b/QMPlusServer/model/dbModel/api.go @@ -55,7 +55,7 @@ func (a *Api) GetInfoList(info modelInterface.PageInfo) (err error, list interfa return } else { var apiList []Api - err = db.Order("group", true).Find(&apiList).Error + err = db.Order("group", true).Where("path LIKE ?", "%"+a.Path+"%").Find(&apiList).Error return err, apiList, total } } diff --git a/QMPlusVuePage/src/components/mixins/infoList.js b/QMPlusVuePage/src/components/mixins/infoList.js index d15b96366b..65da7dc613 100644 --- a/QMPlusVuePage/src/components/mixins/infoList.js +++ b/QMPlusVuePage/src/components/mixins/infoList.js @@ -5,6 +5,7 @@ export default { total: 10, pageSize: 10, tableData: [], + searchInfo: {} } }, methods: { @@ -17,7 +18,7 @@ export default { this.getTableData() }, async getTableData(page = this.page, pageSize = this.pageSize) { - const table = await this.listApi({ page, pageSize }) + const table = await this.listApi({ page, pageSize, ...this.searchInfo }) this.tableData = table.data[this.listKey] this.total = table.data.total this.page = table.data.page diff --git a/QMPlusVuePage/src/view/superAdmin/api/api.vue b/QMPlusVuePage/src/view/superAdmin/api/api.vue index d355cc063d..c2c6471c10 100644 --- a/QMPlusVuePage/src/view/superAdmin/api/api.vue +++ b/QMPlusVuePage/src/view/superAdmin/api/api.vue @@ -3,6 +3,17 @@

新增api

+

+ + + + + + + 查询 + + +

@@ -48,7 +59,7 @@ From 486265bf2c8759f04e095b52e283d21759856433 Mon Sep 17 00:00:00 2001 From: pixel <303176530@qq.com> Date: Fri, 15 Nov 2019 18:10:06 +0800 Subject: [PATCH 089/409] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=E5=AD=90?= =?UTF-8?q?=E8=8F=9C=E5=8D=95=E5=88=97=E8=A1=A8=E4=B8=8D=E9=9A=90=E8=97=8F?= =?UTF-8?q?=E7=9A=84bug=20=E5=B7=A5=E4=BD=9C=E6=B5=81=E5=BC=80=E5=9D=91=20?= =?UTF-8?q?=E5=B7=B2=E7=BB=8F=E9=83=A8=E7=BD=B2=E6=BC=94=E7=A4=BA=E7=8E=AF?= =?UTF-8?q?=E5=A2=83=E6=9C=8D=E5=8A=A1=20=E6=AD=A3=E5=9C=A8=E5=86=99?= =?UTF-8?q?=E5=AE=9A=E6=97=B6=E6=81=A2=E5=A4=8Dsql=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- QMPlusServer/model/dbModel/worfFlow.go | 44 +++++++++++++++++ QMPlusVuePage/package-lock.json | 47 ++++++++++++++----- QMPlusVuePage/package.json | 2 +- .../layout/aside/asideComponent/index.vue | 2 +- QMPlusVuePage/vue.config.js | 2 +- 5 files changed, 81 insertions(+), 16 deletions(-) create mode 100644 QMPlusServer/model/dbModel/worfFlow.go diff --git a/QMPlusServer/model/dbModel/worfFlow.go b/QMPlusServer/model/dbModel/worfFlow.go new file mode 100644 index 0000000000..bdebe9b74c --- /dev/null +++ b/QMPlusServer/model/dbModel/worfFlow.go @@ -0,0 +1,44 @@ +package dbModel + +import ( + "github.com/jinzhu/gorm" + "time" +) + +type Application struct { + gorm.Model + WorkFlowID string // 所属工作流 + WorkFlowStepInfoID string // 当前节点ID + ApplicationName string // 申请人姓名 + ApplicationCause string // 请假原因 + ApplicationStartData time.Time // 请假开始日期 + ApplicationEndData time.Time // 请假开始日期 + +} + +type ApplicationWorkFlowProcess struct { + gorm.Model + ApplicationId uint // 当前工作流所属申请的ID + CurrentNode string // 当前进度节点 + HistoricalNode string //上一个进度节点 + CurrentUser string // 当前进度操作人 + HistoricalUser string // 上一个进度的操作人 + State bool // 状态是否是正在进行的状态 +} + +type Workflow struct { + gorm.Model + WorkflowName string // 工作流名称 + WorkflowDescription string //工作流描述 + WorkflowStep []WorkflowStepInfo //工作流步骤 +} + +type WorkflowStepInfo struct { + gorm.Model + WorkflowID uint + IsStrat bool + StepName string + StepNo float64 + StepAuthorityId string + IsEnd bool +} \ No newline at end of file diff --git a/QMPlusVuePage/package-lock.json b/QMPlusVuePage/package-lock.json index 0385458bd5..f4c43c11c9 100644 --- a/QMPlusVuePage/package-lock.json +++ b/QMPlusVuePage/package-lock.json @@ -2858,7 +2858,8 @@ "version": "4.6.0", "resolved": "https://registry.npm.taobao.org/co/download/co-4.6.0.tgz", "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=", - "dev": true + "dev": true, + "optional": true }, "coa": { "version": "2.0.2", @@ -5217,7 +5218,8 @@ "ansi-regex": { "version": "2.1.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "aproba": { "version": "1.2.0", @@ -5238,12 +5240,14 @@ "balanced-match": { "version": "1.0.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, "dev": true, + "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -5258,17 +5262,20 @@ "code-point-at": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "concat-map": { "version": "0.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "console-control-strings": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "core-util-is": { "version": "1.0.2", @@ -5385,7 +5392,8 @@ "inherits": { "version": "2.0.3", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "ini": { "version": "1.3.5", @@ -5397,6 +5405,7 @@ "version": "1.0.0", "bundled": true, "dev": true, + "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -5411,6 +5420,7 @@ "version": "3.0.4", "bundled": true, "dev": true, + "optional": true, "requires": { "brace-expansion": "^1.1.7" } @@ -5418,12 +5428,14 @@ "minimist": { "version": "0.0.8", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "minipass": { "version": "2.3.5", "bundled": true, "dev": true, + "optional": true, "requires": { "safe-buffer": "^5.1.2", "yallist": "^3.0.0" @@ -5442,6 +5454,7 @@ "version": "0.5.1", "bundled": true, "dev": true, + "optional": true, "requires": { "minimist": "0.0.8" } @@ -5522,7 +5535,8 @@ "number-is-nan": { "version": "1.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "object-assign": { "version": "4.1.1", @@ -5534,6 +5548,7 @@ "version": "1.4.0", "bundled": true, "dev": true, + "optional": true, "requires": { "wrappy": "1" } @@ -5619,7 +5634,8 @@ "safe-buffer": { "version": "5.1.2", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "safer-buffer": { "version": "2.1.2", @@ -5655,6 +5671,7 @@ "version": "1.0.2", "bundled": true, "dev": true, + "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -5674,6 +5691,7 @@ "version": "3.0.1", "bundled": true, "dev": true, + "optional": true, "requires": { "ansi-regex": "^2.0.0" } @@ -5717,12 +5735,14 @@ "wrappy": { "version": "1.0.2", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "yallist": { "version": "3.0.3", "bundled": true, - "dev": true + "dev": true, + "optional": true } } }, @@ -9844,7 +9864,8 @@ "version": "4.0.8", "resolved": "https://registry.npm.taobao.org/rx-lite/download/rx-lite-4.0.8.tgz", "integrity": "sha1-Cx4Rr4vESDbwSmQH6S2kJGe3lEQ=", - "dev": true + "dev": true, + "optional": true }, "rx-lite-aggregates": { "version": "4.0.8", diff --git a/QMPlusVuePage/package.json b/QMPlusVuePage/package.json index c018d7db1e..1491b14260 100644 --- a/QMPlusVuePage/package.json +++ b/QMPlusVuePage/package.json @@ -58,4 +58,4 @@ "> 1%", "last 2 versions" ] -} +} \ No newline at end of file diff --git a/QMPlusVuePage/src/view/layout/aside/asideComponent/index.vue b/QMPlusVuePage/src/view/layout/aside/asideComponent/index.vue index 6949d3e603..dc3227f7f0 100644 --- a/QMPlusVuePage/src/view/layout/aside/asideComponent/index.vue +++ b/QMPlusVuePage/src/view/layout/aside/asideComponent/index.vue @@ -1,5 +1,5 @@

GIN-VUE-ADMIN

+ gin-vue-admin by 奇淼 And Spike +

+ 微信：shouzi_1994 +

微信：shouzi_1994

- gin-vue-admin by 奇淼 And Spike -

- 微信：shouzi_1994 -

gin-vue-admin by 奇淼 And krank666

点击动画获取联系方式

krank666微信

Mr.奇淼微信

krank666微信

Mr.奇淼

krank666微信

Mr.奇淼

Mr.奇淼

krank666微信

Mr.奇淼

点击动画获取联系方式

- - Gin-Vue-Admin -

qq交流群:622360840

微信交流群可以添加任意一位开发者备注"加入gin-vue-admin交流群"

GIN-VUE-ADMIN

GIN-VUE-ADMIN

{{ msg }}

Installed CLI Plugins

Essential Links

Ecosystem

qq交流群:622360840

微信交流群可以添加任意一位开发者备注"加入gin-vue-admin交流群"

系统配置

jwt签名

casbin配置

mysql admin数据库配置

Redis admin数据库配置

七牛密钥配置

jwt签名

系统配置

此版本为先行体验功能测试版，样式美化和性能优化正在进行中，上传切片文件和合成的完整文件分别再QMPlusserver目录的breakpointDir文件夹和fileDir文件夹

系统配置

jwt签名

casbin配置

mysql admin数据库配置

Redis admin数据库配置

七牛密钥配置

系统配置

jwt签名

casbin配置

mysql admin数据库配置

Redis admin数据库配置

七牛密钥配置

qq交流群:622360840

微信交流群可以添加任意一位开发者备注"加入gin-vue-admin交流群"

qq交流群:622360840

微信交流群可以添加任意一位开发者备注"加入gin-vue-admin交流群"

此版本为先行体验功能测试版，样式美化和性能优化正在进行中，上传切片文件和合成的完整文件分别再QMPlusserver目录的breakpointDir文件夹和fileDir文件夹

gin-vue-admin by 奇淼 And krank666

点击动画获取联系方式

krank666微信

Mr.奇淼微信

- 当前版本号：v0.1.0 -

- +