diff --git a/doc/docs/index.html b/doc/docs/index.html index aaa84ba4..80152d93 100644 --- a/doc/docs/index.html +++ b/doc/docs/index.html @@ -11,9 +11,6 @@ - - - diff --git a/sop-admin/sop-admin-vue/src/components/Hamburger/index.vue b/sop-admin/sop-admin-vue/src/components/Hamburger/index.vue new file mode 100644 index 00000000..368b0021 --- /dev/null +++ b/sop-admin/sop-admin-vue/src/components/Hamburger/index.vue @@ -0,0 +1,44 @@ + + + + + diff --git a/sop-admin/sop-admin-vue/src/components/SvgIcon/index.vue b/sop-admin/sop-admin-vue/src/components/SvgIcon/index.vue new file mode 100644 index 00000000..27da76cf --- /dev/null +++ b/sop-admin/sop-admin-vue/src/components/SvgIcon/index.vue @@ -0,0 +1,43 @@ + + + + + diff --git a/sop-admin/sop-admin-vue/src/icons/index.js b/sop-admin/sop-admin-vue/src/icons/index.js new file mode 100644 index 00000000..2c6b309c --- /dev/null +++ b/sop-admin/sop-admin-vue/src/icons/index.js @@ -0,0 +1,9 @@ +import Vue from 'vue' +import SvgIcon from '@/components/SvgIcon'// svg component + +// register globally +Vue.component('svg-icon', SvgIcon) + +const req = require.context('./svg', false, /\.svg$/) +const requireAll = requireContext => requireContext.keys().map(requireContext) +requireAll(req) diff --git a/sop-admin/sop-admin-vue/src/icons/svg/dashboard.svg b/sop-admin/sop-admin-vue/src/icons/svg/dashboard.svg new file mode 100644 index 00000000..5317d370 --- /dev/null +++ b/sop-admin/sop-admin-vue/src/icons/svg/dashboard.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/sop-admin/sop-admin-vue/src/icons/svg/example.svg b/sop-admin/sop-admin-vue/src/icons/svg/example.svg new file mode 100644 index 00000000..46f42b53 --- /dev/null +++ b/sop-admin/sop-admin-vue/src/icons/svg/example.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/sop-admin/sop-admin-vue/src/icons/svg/eye-open.svg b/sop-admin/sop-admin-vue/src/icons/svg/eye-open.svg new file mode 100644 index 00000000..88dcc98e --- /dev/null +++ b/sop-admin/sop-admin-vue/src/icons/svg/eye-open.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/sop-admin/sop-admin-vue/src/icons/svg/eye.svg b/sop-admin/sop-admin-vue/src/icons/svg/eye.svg new file mode 100644 index 00000000..16ed2d87 --- /dev/null +++ b/sop-admin/sop-admin-vue/src/icons/svg/eye.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/sop-admin/sop-admin-vue/src/icons/svg/form.svg b/sop-admin/sop-admin-vue/src/icons/svg/form.svg new file mode 100644 index 00000000..dcbaa185 --- /dev/null +++ b/sop-admin/sop-admin-vue/src/icons/svg/form.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/sop-admin/sop-admin-vue/src/icons/svg/link.svg b/sop-admin/sop-admin-vue/src/icons/svg/link.svg new file mode 100644 index 00000000..48197ba4 --- /dev/null +++ b/sop-admin/sop-admin-vue/src/icons/svg/link.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/sop-admin/sop-admin-vue/src/icons/svg/nested.svg b/sop-admin/sop-admin-vue/src/icons/svg/nested.svg new file mode 100644 index 00000000..06713a86 --- /dev/null +++ b/sop-admin/sop-admin-vue/src/icons/svg/nested.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/sop-admin/sop-admin-vue/src/icons/svg/password.svg b/sop-admin/sop-admin-vue/src/icons/svg/password.svg new file mode 100644 index 00000000..e291d85d --- /dev/null +++ b/sop-admin/sop-admin-vue/src/icons/svg/password.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/sop-admin/sop-admin-vue/src/icons/svg/table.svg b/sop-admin/sop-admin-vue/src/icons/svg/table.svg new file mode 100644 index 00000000..0e3dc9de --- /dev/null +++ b/sop-admin/sop-admin-vue/src/icons/svg/table.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/sop-admin/sop-admin-vue/src/icons/svg/tree.svg b/sop-admin/sop-admin-vue/src/icons/svg/tree.svg new file mode 100644 index 00000000..dd4b7dd2 --- /dev/null +++ b/sop-admin/sop-admin-vue/src/icons/svg/tree.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/sop-admin/sop-admin-vue/src/icons/svg/user.svg b/sop-admin/sop-admin-vue/src/icons/svg/user.svg new file mode 100644 index 00000000..0ba0716a --- /dev/null +++ b/sop-admin/sop-admin-vue/src/icons/svg/user.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/sop-admin/sop-admin-vue/src/icons/svgo.yml b/sop-admin/sop-admin-vue/src/icons/svgo.yml new file mode 100644 index 00000000..d11906ae --- /dev/null +++ b/sop-admin/sop-admin-vue/src/icons/svgo.yml @@ -0,0 +1,22 @@ +# replace default config + +# multipass: true +# full: true + +plugins: + + # - name + # + # or: + # - name: false + # - name: true + # + # or: + # - name: + # param1: 1 + # param2: 2 + +- removeAttrs: + attrs: + - 'fill' + - 'fill-rule' diff --git a/sop-admin/sop-admin-vue/src/layout/components/AppMain.vue b/sop-admin/sop-admin-vue/src/layout/components/AppMain.vue new file mode 100644 index 00000000..e01ec98d --- /dev/null +++ b/sop-admin/sop-admin-vue/src/layout/components/AppMain.vue @@ -0,0 +1,31 @@ + + + + + diff --git a/sop-admin/sop-admin-vue/src/layout/components/Navbar.vue b/sop-admin/sop-admin-vue/src/layout/components/Navbar.vue new file mode 100644 index 00000000..b5d8e8a6 --- /dev/null +++ b/sop-admin/sop-admin-vue/src/layout/components/Navbar.vue @@ -0,0 +1,129 @@ + + + + + diff --git a/sop-admin/sop-admin-vue/src/layout/components/Sidebar/FixiOSBug.js b/sop-admin/sop-admin-vue/src/layout/components/Sidebar/FixiOSBug.js new file mode 100644 index 00000000..bc14856f --- /dev/null +++ b/sop-admin/sop-admin-vue/src/layout/components/Sidebar/FixiOSBug.js @@ -0,0 +1,26 @@ +export default { + computed: { + device() { + return this.$store.state.app.device + } + }, + mounted() { + // In order to fix the click on menu on the ios device will trigger the mouseleave bug + // https://github.com/PanJiaChen/vue-element-admin/issues/1135 + this.fixBugIniOS() + }, + methods: { + fixBugIniOS() { + const $subMenu = this.$refs.subMenu + if ($subMenu) { + const handleMouseleave = $subMenu.handleMouseleave + $subMenu.handleMouseleave = (e) => { + if (this.device === 'mobile') { + return + } + handleMouseleave(e) + } + } + } + } +} diff --git a/sop-admin/sop-admin-vue/src/layout/components/Sidebar/Item.vue b/sop-admin/sop-admin-vue/src/layout/components/Sidebar/Item.vue new file mode 100644 index 00000000..b515f615 --- /dev/null +++ b/sop-admin/sop-admin-vue/src/layout/components/Sidebar/Item.vue @@ -0,0 +1,29 @@ + diff --git a/sop-admin/sop-admin-vue/src/layout/components/Sidebar/Link.vue b/sop-admin/sop-admin-vue/src/layout/components/Sidebar/Link.vue new file mode 100644 index 00000000..eb4dd107 --- /dev/null +++ b/sop-admin/sop-admin-vue/src/layout/components/Sidebar/Link.vue @@ -0,0 +1,36 @@ + + + + diff --git a/sop-admin/sop-admin-vue/src/layout/components/Sidebar/Logo.vue b/sop-admin/sop-admin-vue/src/layout/components/Sidebar/Logo.vue new file mode 100644 index 00000000..38dcac11 --- /dev/null +++ b/sop-admin/sop-admin-vue/src/layout/components/Sidebar/Logo.vue @@ -0,0 +1,83 @@ + + + + + diff --git a/sop-admin/sop-admin-vue/src/layout/components/Sidebar/SidebarItem.vue b/sop-admin/sop-admin-vue/src/layout/components/Sidebar/SidebarItem.vue new file mode 100644 index 00000000..2d49dd87 --- /dev/null +++ b/sop-admin/sop-admin-vue/src/layout/components/Sidebar/SidebarItem.vue @@ -0,0 +1,95 @@ + + + diff --git a/sop-admin/sop-admin-vue/src/layout/components/Sidebar/index.vue b/sop-admin/sop-admin-vue/src/layout/components/Sidebar/index.vue new file mode 100644 index 00000000..da39034f --- /dev/null +++ b/sop-admin/sop-admin-vue/src/layout/components/Sidebar/index.vue @@ -0,0 +1,56 @@ + + + diff --git a/sop-admin/sop-admin-vue/src/layout/components/index.js b/sop-admin/sop-admin-vue/src/layout/components/index.js new file mode 100644 index 00000000..97ee3cd1 --- /dev/null +++ b/sop-admin/sop-admin-vue/src/layout/components/index.js @@ -0,0 +1,3 @@ +export { default as Navbar } from './Navbar' +export { default as Sidebar } from './Sidebar' +export { default as AppMain } from './AppMain' diff --git a/sop-admin/sop-admin-vue/src/layout/index.vue b/sop-admin/sop-admin-vue/src/layout/index.vue new file mode 100644 index 00000000..db22a7bc --- /dev/null +++ b/sop-admin/sop-admin-vue/src/layout/index.vue @@ -0,0 +1,93 @@ + + + + + diff --git a/sop-admin/sop-admin-vue/src/layout/mixin/ResizeHandler.js b/sop-admin/sop-admin-vue/src/layout/mixin/ResizeHandler.js new file mode 100644 index 00000000..e8d0df8c --- /dev/null +++ b/sop-admin/sop-admin-vue/src/layout/mixin/ResizeHandler.js @@ -0,0 +1,45 @@ +import store from '@/store' + +const { body } = document +const WIDTH = 992 // refer to Bootstrap's responsive design + +export default { + watch: { + $route(route) { + if (this.device === 'mobile' && this.sidebar.opened) { + store.dispatch('app/closeSideBar', { withoutAnimation: false }) + } + } + }, + beforeMount() { + window.addEventListener('resize', this.$_resizeHandler) + }, + beforeDestroy() { + window.removeEventListener('resize', this.$_resizeHandler) + }, + mounted() { + const isMobile = this.$_isMobile() + if (isMobile) { + store.dispatch('app/toggleDevice', 'mobile') + store.dispatch('app/closeSideBar', { withoutAnimation: true }) + } + }, + methods: { + // use $_ for mixins properties + // https://vuejs.org/v2/style-guide/index.html#Private-property-names-essential + $_isMobile() { + const rect = body.getBoundingClientRect() + return rect.width - 1 < WIDTH + }, + $_resizeHandler() { + if (!document.hidden) { + const isMobile = this.$_isMobile() + store.dispatch('app/toggleDevice', isMobile ? 'mobile' : 'desktop') + + if (isMobile) { + store.dispatch('app/closeSideBar', { withoutAnimation: true }) + } + } + } + } +} diff --git a/sop-admin/sop-admin-vue/src/main.js b/sop-admin/sop-admin-vue/src/main.js new file mode 100644 index 00000000..56086ccb --- /dev/null +++ b/sop-admin/sop-admin-vue/src/main.js @@ -0,0 +1,38 @@ +import Vue from 'vue' + +import 'normalize.css/normalize.css' // A modern alternative to CSS resets + +import ElementUI from 'element-ui' +import 'element-ui/lib/theme-chalk/index.css' +import locale from 'element-ui/lib/locale/lang/zh-CN' // lang i18n + +import '@/styles/index.scss' // global css + +import App from './App' +import store from './store' +import router from './router' + +import '@/icons' // icon +import '@/permission' // permission control +import '@/utils/global' // 自定义全局js + +/** + * If you don't want to use mock-server + * you want to use mockjs for request interception + * you can execute: + * + * import { mockXHR } from '../mock' + * mockXHR() + */ + +// set ElementUI lang to EN +Vue.use(ElementUI, { locale }) + +Vue.config.productionTip = false + +new Vue({ + el: '#app', + router, + store, + render: h => h(App) +}) diff --git a/sop-admin/sop-admin-vue/src/permission.js b/sop-admin/sop-admin-vue/src/permission.js new file mode 100644 index 00000000..39fae8aa --- /dev/null +++ b/sop-admin/sop-admin-vue/src/permission.js @@ -0,0 +1,65 @@ +import router from './router' +// import store from './store' +// import { Message } from 'element-ui' +import NProgress from 'nprogress' // progress bar +import 'nprogress/nprogress.css' // progress bar style +import { getToken } from '@/utils/auth' // get token from cookie +import getPageTitle from '@/utils/get-page-title' + +NProgress.configure({ showSpinner: false }) // NProgress Configuration + +const whiteList = ['/login'] // no redirect whitelist + +router.beforeEach(async(to, from, next) => { + // start progress bar + NProgress.start() + + // set page title + document.title = getPageTitle(to.meta.title) + + // determine whether the user has logged in + const hasToken = getToken() + + if (hasToken) { + if (to.path === '/login') { + // if is logged in, redirect to the home page + next({ path: '/' }) + NProgress.done() + } else { + next() + // const hasGetUserInfo = store.getters.name + // if (hasGetUserInfo) { + // next() + // } else { + // try { + // // get user info + // await store.dispatch('user/getInfo') + // + // next() + // } catch (error) { + // // remove token and go to login page to re-login + // await store.dispatch('user/resetToken') + // Message.error(error || 'Has Error') + // next(`/login?redirect=${to.path}`) + // NProgress.done() + // } + // } + } + } else { + /* has no token*/ + + if (whiteList.indexOf(to.path) !== -1) { + // in the free login whitelist, go directly + next() + } else { + // other pages that do not have permission to access are redirected to the login page. + next(`/login?redirect=${to.path}`) + NProgress.done() + } + } +}) + +router.afterEach(() => { + // finish progress bar + NProgress.done() +}) diff --git a/sop-admin/sop-admin-vue/src/router/index.js b/sop-admin/sop-admin-vue/src/router/index.js new file mode 100644 index 00000000..3085492e --- /dev/null +++ b/sop-admin/sop-admin-vue/src/router/index.js @@ -0,0 +1,116 @@ +import Vue from 'vue' +import Router from 'vue-router' + +Vue.use(Router) + +/* Layout */ +import Layout from '@/layout' + +/** + * Note: sub-menu only appear when route children.length >= 1 + * Detail see: https://panjiachen.github.io/vue-element-admin-site/guide/essentials/router-and-nav.html + * + * hidden: true if set true, item will not show in the sidebar(default is false) + * alwaysShow: true if set true, will always show the root menu + * if not set alwaysShow, when item has more than one children route, + * it will becomes nested mode, otherwise not show the root menu + * redirect: noRedirect if set noRedirect will no redirect in the breadcrumb + * name:'router-name' the name is used by (must set!!!) + * meta : { + roles: ['admin','editor'] control the page roles (you can set multiple roles) + title: 'title' the name show in sidebar and breadcrumb (recommend set) + icon: 'svg-name' the icon show in the sidebar + breadcrumb: false if set false, the item will hidden in breadcrumb(default is true) + activeMenu: '/example/list' if set path, the sidebar will highlight the path you set + } + */ + +/** + * constantRoutes + * a base page that does not have permission requirements + * all roles can be accessed + */ +export const constantRoutes = [ + { + path: '/login', + component: () => import('@/views/login/index'), + hidden: true + }, + + { + path: '/404', + component: () => import('@/views/404'), + hidden: true + }, + + { + path: '/', + component: Layout, + redirect: '/dashboard', + children: [{ + path: 'dashboard', + name: 'Dashboard', + component: () => import('@/views/dashboard/index'), + meta: { title: '首页', icon: 'dashboard' } + }] + }, + + { + path: '/service', + component: Layout, + name: 'Service', + meta: { title: '服务管理', icon: 'example' }, + children: [ + { + path: 'list', + name: 'ServiceList', + component: () => import('@/views/service/list/index'), + meta: { title: '服务列表' } + }, + { + path: 'route', + name: 'Route', + component: () => import('@/views/service/route/index'), + meta: { title: '路由管理' } + }, + { + path: 'limit', + name: 'Limit', + component: () => import('@/views/service/limit/index'), + meta: { title: '限流管理' } + } + ] + }, + + { + path: '/isv', + component: Layout, + meta: { title: 'ISV管理', icon: 'user' }, + children: [ + { + path: 'list', + name: 'IsvList', + component: () => import('@/views/isv/index'), + meta: { title: 'ISV列表' } + } + ] + }, + // 404 page must be placed at the end !!! + { path: '*', redirect: '/404', hidden: true } +] + +const createRouter = () => new Router({ + // mode: 'history', // require service support + scrollBehavior: () => ({ y: 0 }), + routes: constantRoutes +}) + +const router = createRouter() + +// Detail see: https://github.com/vuejs/vue-router/issues/1234#issuecomment-357941465 +export function resetRouter() { + const newRouter = createRouter() + router.matcher = newRouter.matcher // reset router +} + +export default router diff --git a/sop-admin/sop-admin-vue/src/settings.js b/sop-admin/sop-admin-vue/src/settings.js new file mode 100644 index 00000000..40ab056a --- /dev/null +++ b/sop-admin/sop-admin-vue/src/settings.js @@ -0,0 +1,16 @@ +module.exports = { + + title: 'SOP Admin', + + /** + * @type {boolean} true | false + * @description Whether fix the header + */ + fixedHeader: false, + + /** + * @type {boolean} true | false + * @description Whether show the logo in sidebar + */ + sidebarLogo: true +} diff --git a/sop-admin/sop-admin-vue/src/store/getters.js b/sop-admin/sop-admin-vue/src/store/getters.js new file mode 100644 index 00000000..5ab7b4c8 --- /dev/null +++ b/sop-admin/sop-admin-vue/src/store/getters.js @@ -0,0 +1,8 @@ +const getters = { + sidebar: state => state.app.sidebar, + device: state => state.app.device, + token: state => state.user.token, + avatar: state => state.user.avatar, + name: state => state.user.name +} +export default getters diff --git a/sop-admin/sop-admin-vue/src/store/index.js b/sop-admin/sop-admin-vue/src/store/index.js new file mode 100644 index 00000000..6be466a5 --- /dev/null +++ b/sop-admin/sop-admin-vue/src/store/index.js @@ -0,0 +1,19 @@ +import Vue from 'vue' +import Vuex from 'vuex' +import getters from './getters' +import app from './modules/app' +import settings from './modules/settings' +import user from './modules/user' + +Vue.use(Vuex) + +const store = new Vuex.Store({ + modules: { + app, + settings, + user + }, + getters +}) + +export default store diff --git a/sop-admin/sop-admin-vue/src/store/modules/app.js b/sop-admin/sop-admin-vue/src/store/modules/app.js new file mode 100644 index 00000000..7ea7e332 --- /dev/null +++ b/sop-admin/sop-admin-vue/src/store/modules/app.js @@ -0,0 +1,48 @@ +import Cookies from 'js-cookie' + +const state = { + sidebar: { + opened: Cookies.get('sidebarStatus') ? !!+Cookies.get('sidebarStatus') : true, + withoutAnimation: false + }, + device: 'desktop' +} + +const mutations = { + TOGGLE_SIDEBAR: state => { + state.sidebar.opened = !state.sidebar.opened + state.sidebar.withoutAnimation = false + if (state.sidebar.opened) { + Cookies.set('sidebarStatus', 1) + } else { + Cookies.set('sidebarStatus', 0) + } + }, + CLOSE_SIDEBAR: (state, withoutAnimation) => { + Cookies.set('sidebarStatus', 0) + state.sidebar.opened = false + state.sidebar.withoutAnimation = withoutAnimation + }, + TOGGLE_DEVICE: (state, device) => { + state.device = device + } +} + +const actions = { + toggleSideBar({ commit }) { + commit('TOGGLE_SIDEBAR') + }, + closeSideBar({ commit }, { withoutAnimation }) { + commit('CLOSE_SIDEBAR', withoutAnimation) + }, + toggleDevice({ commit }, device) { + commit('TOGGLE_DEVICE', device) + } +} + +export default { + namespaced: true, + state, + mutations, + actions +} diff --git a/sop-admin/sop-admin-vue/src/store/modules/settings.js b/sop-admin/sop-admin-vue/src/store/modules/settings.js new file mode 100644 index 00000000..aab31a28 --- /dev/null +++ b/sop-admin/sop-admin-vue/src/store/modules/settings.js @@ -0,0 +1,31 @@ +import defaultSettings from '@/settings' + +const { showSettings, fixedHeader, sidebarLogo } = defaultSettings + +const state = { + showSettings: showSettings, + fixedHeader: fixedHeader, + sidebarLogo: sidebarLogo +} + +const mutations = { + CHANGE_SETTING: (state, { key, value }) => { + if (state.hasOwnProperty(key)) { + state[key] = value + } + } +} + +const actions = { + changeSetting({ commit }, data) { + commit('CHANGE_SETTING', data) + } +} + +export default { + namespaced: true, + state, + mutations, + actions +} + diff --git a/sop-admin/sop-admin-vue/src/store/modules/user.js b/sop-admin/sop-admin-vue/src/store/modules/user.js new file mode 100644 index 00000000..cbb75a03 --- /dev/null +++ b/sop-admin/sop-admin-vue/src/store/modules/user.js @@ -0,0 +1,90 @@ +import { login, logout, getInfo } from '@/api/user' +import { getToken, setToken, removeToken } from '@/utils/auth' +import { resetRouter } from '@/router' + +const state = { + token: getToken(), + name: '', + avatar: '' +} + +const mutations = { + SET_TOKEN: (state, token) => { + state.token = token + }, + SET_NAME: (state, name) => { + state.name = name + }, + SET_AVATAR: (state, avatar) => { + state.avatar = avatar + } +} + +const actions = { + // user login + login({ commit }, userInfo) { + const { username, password } = userInfo + return new Promise((resolve, reject) => { + login({ username: username.trim(), password: password }).then(response => { + const { data } = response + commit('SET_TOKEN', data.token) + setToken(data.token) + resolve() + }).catch(error => { + reject(error) + }) + }) + }, + + // get user info + getInfo({ commit, state }) { + return new Promise((resolve, reject) => { + getInfo(state.token).then(response => { + const { data } = response + + if (!data) { + reject('Verification failed, please Login again.') + } + + const { name, avatar } = data + + commit('SET_NAME', name) + commit('SET_AVATAR', avatar) + resolve(data) + }).catch(error => { + reject(error) + }) + }) + }, + + // user logout + logout({ commit, state }) { + return new Promise((resolve, reject) => { + logout(state.token).then(() => { + commit('SET_TOKEN', '') + removeToken() + resetRouter() + resolve() + }).catch(error => { + reject(error) + }) + }) + }, + + // remove token + resetToken({ commit }) { + return new Promise(resolve => { + commit('SET_TOKEN', '') + removeToken() + resolve() + }) + } +} + +export default { + namespaced: true, + state, + mutations, + actions +} + diff --git a/sop-admin/sop-admin-vue/src/styles/element-ui.scss b/sop-admin/sop-admin-vue/src/styles/element-ui.scss new file mode 100644 index 00000000..6af3bfde --- /dev/null +++ b/sop-admin/sop-admin-vue/src/styles/element-ui.scss @@ -0,0 +1,44 @@ +// cover some element-ui styles + +.el-breadcrumb__inner, +.el-breadcrumb__inner a { + font-weight: 400 !important; +} + +.el-upload { + input[type="file"] { + display: none !important; + } +} + +.el-upload__input { + display: none; +} + + +// to fixed https://github.com/ElemeFE/element/issues/2461 +.el-dialog { + transform: none; + left: 0; + position: relative; + margin: 0 auto; +} + +// refine element ui upload +.upload-container { + .el-upload { + width: 100%; + + .el-upload-dragger { + width: 100%; + height: 200px; + } + } +} + +// dropdown +.el-dropdown-menu { + a { + display: block + } +} diff --git a/sop-admin/sop-admin-vue/src/styles/index.scss b/sop-admin/sop-admin-vue/src/styles/index.scss new file mode 100644 index 00000000..3b4da517 --- /dev/null +++ b/sop-admin/sop-admin-vue/src/styles/index.scss @@ -0,0 +1,65 @@ +@import './variables.scss'; +@import './mixin.scss'; +@import './transition.scss'; +@import './element-ui.scss'; +@import './sidebar.scss'; + +body { + height: 100%; + -moz-osx-font-smoothing: grayscale; + -webkit-font-smoothing: antialiased; + text-rendering: optimizeLegibility; + font-family: Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, Arial, sans-serif; +} + +label { + font-weight: 700; +} + +html { + height: 100%; + box-sizing: border-box; +} + +#app { + height: 100%; +} + +*, +*:before, +*:after { + box-sizing: inherit; +} + +a:focus, +a:active { + outline: none; +} + +a, +a:focus, +a:hover { + cursor: pointer; + color: inherit; + text-decoration: none; +} + +div:focus { + outline: none; +} + +.clearfix { + &:after { + visibility: hidden; + display: block; + font-size: 0; + content: " "; + clear: both; + height: 0; + } +} + +// main-container global css +.app-container { + padding: 20px; +} diff --git a/sop-admin/sop-admin-vue/src/styles/mixin.scss b/sop-admin/sop-admin-vue/src/styles/mixin.scss new file mode 100644 index 00000000..36b74bbd --- /dev/null +++ b/sop-admin/sop-admin-vue/src/styles/mixin.scss @@ -0,0 +1,28 @@ +@mixin clearfix { + &:after { + content: ""; + display: table; + clear: both; + } +} + +@mixin scrollBar { + &::-webkit-scrollbar-track-piece { + background: #d3dce6; + } + + &::-webkit-scrollbar { + width: 6px; + } + + &::-webkit-scrollbar-thumb { + background: #99a9bf; + border-radius: 20px; + } +} + +@mixin relative { + position: relative; + width: 100%; + height: 100%; +} diff --git a/sop-admin/sop-admin-vue/src/styles/sidebar.scss b/sop-admin/sop-admin-vue/src/styles/sidebar.scss new file mode 100644 index 00000000..e55f8656 --- /dev/null +++ b/sop-admin/sop-admin-vue/src/styles/sidebar.scss @@ -0,0 +1,213 @@ +#app { + + .main-container { + min-height: 100%; + transition: margin-left .28s; + margin-left: $sideBarWidth; + position: relative; + } + + .sidebar-container { + transition: width 0.28s; + width: $sideBarWidth !important; + background-color: $menuBg; + height: 100%; + position: fixed; + font-size: 0px; + top: 0; + bottom: 0; + left: 0; + z-index: 1001; + overflow: hidden; + + // reset element-ui css + .horizontal-collapse-transition { + transition: 0s width ease-in-out, 0s padding-left ease-in-out, 0s padding-right ease-in-out; + } + + .scrollbar-wrapper { + overflow-x: hidden !important; + } + + .el-scrollbar__bar.is-vertical { + right: 0px; + } + + .el-scrollbar { + height: 100%; + } + + &.has-logo { + .el-scrollbar { + height: calc(100% - 50px); + } + } + + .is-horizontal { + display: none; + } + + a { + display: inline-block; + width: 100%; + overflow: hidden; + } + + .svg-icon { + margin-right: 16px; + } + + .el-menu { + border: none; + height: 100%; + width: 100% !important; + } + + // menu hover + .submenu-title-noDropdown, + .el-submenu__title { + &:hover { + background-color: $menuHover !important; + } + } + + .is-active>.el-submenu__title { + color: $subMenuActiveText !important; + } + + & .nest-menu .el-submenu>.el-submenu__title, + & .el-submenu .el-menu-item { + min-width: $sideBarWidth !important; + background-color: $subMenuBg !important; + + &:hover { + background-color: $subMenuHover !important; + } + } + } + + .hideSidebar { + .sidebar-container { + width: 54px !important; + } + + .main-container { + margin-left: 54px; + } + + .svg-icon { + margin-right: 0px; + } + + .submenu-title-noDropdown { + padding: 0 !important; + position: relative; + + .el-tooltip { + padding: 0 !important; + + .svg-icon { + margin-left: 20px; + } + } + } + + .el-submenu { + overflow: hidden; + + &>.el-submenu__title { + padding: 0 !important; + + .svg-icon { + margin-left: 20px; + } + + .el-submenu__icon-arrow { + display: none; + } + } + } + + .el-menu--collapse { + .el-submenu { + &>.el-submenu__title { + &>span { + height: 0; + width: 0; + overflow: hidden; + visibility: hidden; + display: inline-block; + } + } + } + } + } + + .el-menu--collapse .el-menu .el-submenu { + min-width: $sideBarWidth !important; + } + + // mobile responsive + .mobile { + .main-container { + margin-left: 0px; + } + + .sidebar-container { + transition: transform .28s; + width: $sideBarWidth !important; + } + + &.hideSidebar { + .sidebar-container { + pointer-events: none; + transition-duration: 0.3s; + transform: translate3d(-$sideBarWidth, 0, 0); + } + } + } + + .withoutAnimation { + + .main-container, + .sidebar-container { + transition: none; + } + } +} + +// when menu collapsed +.el-menu--vertical { + &>.el-menu { + .svg-icon { + margin-right: 16px; + } + } + + .nest-menu .el-submenu>.el-submenu__title, + .el-menu-item { + &:hover { + // you can use $subMenuHover + background-color: $menuHover !important; + } + } + + // the scroll bar appears when the subMenu is too long + >.el-menu--popup { + max-height: 100vh; + overflow-y: auto; + + &::-webkit-scrollbar-track-piece { + background: #d3dce6; + } + + &::-webkit-scrollbar { + width: 6px; + } + + &::-webkit-scrollbar-thumb { + background: #99a9bf; + border-radius: 20px; + } + } +} diff --git a/sop-admin/sop-admin-vue/src/styles/transition.scss b/sop-admin/sop-admin-vue/src/styles/transition.scss new file mode 100644 index 00000000..4cb27cc8 --- /dev/null +++ b/sop-admin/sop-admin-vue/src/styles/transition.scss @@ -0,0 +1,48 @@ +// global transition css + +/* fade */ +.fade-enter-active, +.fade-leave-active { + transition: opacity 0.28s; +} + +.fade-enter, +.fade-leave-active { + opacity: 0; +} + +/* fade-transform */ +.fade-transform-leave-active, +.fade-transform-enter-active { + transition: all .5s; +} + +.fade-transform-enter { + opacity: 0; + transform: translateX(-30px); +} + +.fade-transform-leave-to { + opacity: 0; + transform: translateX(30px); +} + +/* breadcrumb transition */ +.breadcrumb-enter-active, +.breadcrumb-leave-active { + transition: all .5s; +} + +.breadcrumb-enter, +.breadcrumb-leave-active { + opacity: 0; + transform: translateX(20px); +} + +.breadcrumb-move { + transition: all .5s; +} + +.breadcrumb-leave-active { + position: absolute; +} diff --git a/sop-admin/sop-admin-vue/src/styles/variables.scss b/sop-admin/sop-admin-vue/src/styles/variables.scss new file mode 100644 index 00000000..be557726 --- /dev/null +++ b/sop-admin/sop-admin-vue/src/styles/variables.scss @@ -0,0 +1,25 @@ +// sidebar +$menuText:#bfcbd9; +$menuActiveText:#409EFF; +$subMenuActiveText:#f4f4f5; //https://github.com/ElemeFE/element/issues/12951 + +$menuBg:#304156; +$menuHover:#263445; + +$subMenuBg:#1f2d3d; +$subMenuHover:#001528; + +$sideBarWidth: 210px; + +// the :export directive is the magic sauce for webpack +// https://www.bluematador.com/blog/how-to-share-variables-between-js-and-sass +:export { + menuText: $menuText; + menuActiveText: $menuActiveText; + subMenuActiveText: $subMenuActiveText; + menuBg: $menuBg; + menuHover: $menuHover; + subMenuBg: $subMenuBg; + subMenuHover: $subMenuHover; + sideBarWidth: $sideBarWidth; +} diff --git a/sop-admin/sop-admin-vue/src/utils/auth.js b/sop-admin/sop-admin-vue/src/utils/auth.js new file mode 100644 index 00000000..7e922953 --- /dev/null +++ b/sop-admin/sop-admin-vue/src/utils/auth.js @@ -0,0 +1,15 @@ +import Cookies from 'js-cookie' + +const TokenKey = 'sop-admin-token' + +export function getToken() { + return Cookies.get(TokenKey) +} + +export function setToken(token) { + return Cookies.set(TokenKey, token) +} + +export function removeToken() { + return Cookies.remove(TokenKey) +} diff --git a/sop-admin/sop-admin-vue/src/utils/get-page-title.js b/sop-admin/sop-admin-vue/src/utils/get-page-title.js new file mode 100644 index 00000000..a6de99dd --- /dev/null +++ b/sop-admin/sop-admin-vue/src/utils/get-page-title.js @@ -0,0 +1,10 @@ +import defaultSettings from '@/settings' + +const title = defaultSettings.title || 'Vue Admin Template' + +export default function getPageTitle(pageTitle) { + if (pageTitle) { + return `${pageTitle} - ${title}` + } + return `${title}` +} diff --git a/sop-admin/sop-admin-vue/src/utils/global.js b/sop-admin/sop-admin-vue/src/utils/global.js new file mode 100644 index 00000000..35646766 --- /dev/null +++ b/sop-admin/sop-admin-vue/src/utils/global.js @@ -0,0 +1,101 @@ +/* +注册全局方法 + */ +import Vue from 'vue' +import axios from 'axios' +import { getToken, removeToken } from './auth' + +// 创建axios实例 +const client = axios.create({ + baseURL: process.env.VUE_APP_BASE_API, // api 的 base_url + timeout: 5000 // 请求超时时间 +}) + +Object.assign(Vue.prototype, { + /** + * 请求接口 + * @param uri uri,如:goods.get,goods.get/1.0 + * @param data 请求数据 + * @param callback 成功时回调 + * @param errorCallback 错误时回调 + */ + post: function(uri, data, callback, errorCallback) { + const that = this + const paramStr = JSON.stringify(data) + if (!uri.endsWith('/')) { + uri = uri + '/' + } + if (!uri.startsWith('/')) { + uri = '/' + uri + } + client.post(uri, { + data: encodeURIComponent(paramStr), + access_token: getToken() + }).then(function(response) { + const resp = response.data + const code = resp.code + if (!code || code === '-9') { + that.$message.error('系统错误') + return + } + if (code === '-100' || code === '18' || code === '21') { // 未登录 + that.logout() + return + } + if (code === '0') { // 成功 + callback && callback.call(that, resp) + } else { + that.$message.error(resp.msg) + } + }).catch(function(error) { + console.error('err' + error) // for debug + errorCallback && errorCallback(error) + that.$message.error(error.message) + }) + }, + /** + * tip,使用方式:this.tip('操作成功'),this.tip('错误', 'error') + * @param msg 内容 + * @param type success / info / warning / error + * @param stay 停留几秒,默认3秒 + */ + tip: function(msg, type, stay) { + stay = parseInt(stay) || 3 + this.$message({ + message: msg, + type: type || 'success', + duration: stay * 1000 + }) + }, + /** + * 提醒框 + * @param msg 消息 + * @param okHandler 成功回调 + * @param cancelHandler + */ + confirm: function(msg, okHandler, cancelHandler) { + const that = this + this.$confirm(msg, '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning', + beforeClose: (action, instance, done) => { + if (action === 'confirm') { + okHandler.call(that, done) + } else if (action === 'cancel') { + if (cancelHandler) { + cancelHandler.call(that, done) + } else { + done() + } + } else { + done() + } + } + }).catch(function() {}) + }, + logout: function() { + removeToken() + this.$router.push({ path: `/login?redirect=${this.$route.fullPath}` }) + } +}) diff --git a/sop-admin/sop-admin-vue/src/utils/index.js b/sop-admin/sop-admin-vue/src/utils/index.js new file mode 100644 index 00000000..cd14bd5e --- /dev/null +++ b/sop-admin/sop-admin-vue/src/utils/index.js @@ -0,0 +1,110 @@ +/** + * Created by PanJiaChen on 16/11/18. + */ + +/** + * Parse the time to string + * @param {(Object|string|number)} time + * @param {string} cFormat + * @returns {string} + */ +export function parseTime(time, cFormat) { + if (arguments.length === 0) { + return null + } + const format = cFormat || '{y}-{m}-{d} {h}:{i}:{s}' + let date + if (typeof time === 'object') { + date = time + } else { + if ((typeof time === 'string') && (/^[0-9]+$/.test(time))) { + time = parseInt(time) + } + if ((typeof time === 'number') && (time.toString().length === 10)) { + time = time * 1000 + } + date = new Date(time) + } + const formatObj = { + y: date.getFullYear(), + m: date.getMonth() + 1, + d: date.getDate(), + h: date.getHours(), + i: date.getMinutes(), + s: date.getSeconds(), + a: date.getDay() + } + const time_str = format.replace(/{(y|m|d|h|i|s|a)+}/g, (result, key) => { + let value = formatObj[key] + // Note: getDay() returns 0 on Sunday + if (key === 'a') { return ['日', '一', '二', '三', '四', '五', '六'][value ] } + if (result.length > 0 && value < 10) { + value = '0' + value + } + return value || 0 + }) + return time_str +} + +/** + * @param {number} time + * @param {string} option + * @returns {string} + */ +export function formatTime(time, option) { + if (('' + time).length === 10) { + time = parseInt(time) * 1000 + } else { + time = +time + } + const d = new Date(time) + const now = Date.now() + + const diff = (now - d) / 1000 + + if (diff < 30) { + return '刚刚' + } else if (diff < 3600) { + // less 1 hour + return Math.ceil(diff / 60) + '分钟前' + } else if (diff < 3600 * 24) { + return Math.ceil(diff / 3600) + '小时前' + } else if (diff < 3600 * 24 * 2) { + return '1天前' + } + if (option) { + return parseTime(time, option) + } else { + return ( + d.getMonth() + + 1 + + '月' + + d.getDate() + + '日' + + d.getHours() + + '时' + + d.getMinutes() + + '分' + ) + } +} + +/** + * @param {string} url + * @returns {Object} + */ +export function param2Obj(url) { + const search = url.split('?')[1] + if (!search) { + return {} + } + return JSON.parse( + '{"' + + decodeURIComponent(search) + .replace(/"/g, '\\"') + .replace(/&/g, '","') + .replace(/=/g, '":"') + .replace(/\+/g, ' ') + + '"}' + ) +} diff --git a/sop-admin/sop-admin-vue/src/utils/request.js b/sop-admin/sop-admin-vue/src/utils/request.js new file mode 100644 index 00000000..bc346a8c --- /dev/null +++ b/sop-admin/sop-admin-vue/src/utils/request.js @@ -0,0 +1,85 @@ +import axios from 'axios' +import { MessageBox, Message } from 'element-ui' +import store from '@/store' +import { getToken } from '@/utils/auth' + +// create an axios instance +const service = axios.create({ + baseURL: process.env.VUE_APP_BASE_API, // url = base url + request url + withCredentials: true, // send cookies when cross-domain requests + timeout: 5000 // request timeout +}) + +// request interceptor +service.interceptors.request.use( + config => { + // do something before request is sent + + if (store.getters.token) { + // let each request carry token + // ['X-Token'] is a custom headers key + // please modify it according to the actual situation + config.headers['X-Token'] = getToken() + } + return config + }, + error => { + // do something with request error + console.log(error) // for debug + return Promise.reject(error) + } +) + +// response interceptor +service.interceptors.response.use( + /** + * If you want to get http information such as headers or status + * Please return response => response + */ + + /** + * Determine the request status by custom code + * Here is just an example + * You can also judge the status by HTTP Status Code + */ + response => { + const res = response.data + + // if the custom code is not 20000, it is judged as an error. + if (res.code !== 20000) { + Message({ + message: res.message || 'error', + type: 'error', + duration: 5 * 1000 + }) + + // 50008: Illegal token; 50012: Other clients logged in; 50014: Token expired; + if (res.code === 50008 || res.code === 50012 || res.code === 50014) { + // to re-login + MessageBox.confirm('You have been logged out, you can cancel to stay on this page, or log in again', 'Confirm logout', { + confirmButtonText: 'Re-Login', + cancelButtonText: 'Cancel', + type: 'warning' + }).then(() => { + store.dispatch('user/resetToken').then(() => { + location.reload() + }) + }) + } + return Promise.reject(res.message || 'error') + } else { + return res + } + }, + error => { + console.log('err' + error) // for debug + Message({ + message: error.message, + type: 'error', + duration: 5 * 1000 + }) + return Promise.reject(error) + } +) + +export default service diff --git a/sop-admin/sop-admin-vue/src/utils/validate.js b/sop-admin/sop-admin-vue/src/utils/validate.js new file mode 100644 index 00000000..8d962ad4 --- /dev/null +++ b/sop-admin/sop-admin-vue/src/utils/validate.js @@ -0,0 +1,20 @@ +/** + * Created by PanJiaChen on 16/11/18. + */ + +/** + * @param {string} path + * @returns {Boolean} + */ +export function isExternal(path) { + return /^(https?:|mailto:|tel:)/.test(path) +} + +/** + * @param {string} str + * @returns {Boolean} + */ +export function validUsername(str) { + const valid_map = ['admin', 'editor'] + return valid_map.indexOf(str.trim()) >= 0 +} diff --git a/sop-admin/sop-admin-vue/src/views/404.vue b/sop-admin/sop-admin-vue/src/views/404.vue new file mode 100644 index 00000000..1791f55a --- /dev/null +++ b/sop-admin/sop-admin-vue/src/views/404.vue @@ -0,0 +1,228 @@ + + + + + diff --git a/sop-admin/sop-admin-vue/src/views/dashboard/index.vue b/sop-admin/sop-admin-vue/src/views/dashboard/index.vue new file mode 100644 index 00000000..c1de84dc --- /dev/null +++ b/sop-admin/sop-admin-vue/src/views/dashboard/index.vue @@ -0,0 +1,26 @@ + + + + + diff --git a/sop-admin/sop-admin-vue/src/views/isv/index.vue b/sop-admin/sop-admin-vue/src/views/isv/index.vue new file mode 100644 index 00000000..56164b2a --- /dev/null +++ b/sop-admin/sop-admin-vue/src/views/isv/index.vue @@ -0,0 +1,328 @@ + + + diff --git a/sop-admin/sop-admin-vue/src/views/login/index.vue b/sop-admin/sop-admin-vue/src/views/login/index.vue new file mode 100644 index 00000000..07f5c54e --- /dev/null +++ b/sop-admin/sop-admin-vue/src/views/login/index.vue @@ -0,0 +1,249 @@ + + + + + + + diff --git a/sop-admin/sop-admin-vue/src/views/service/limit/index.vue b/sop-admin/sop-admin-vue/src/views/service/limit/index.vue new file mode 100644 index 00000000..d2505c23 --- /dev/null +++ b/sop-admin/sop-admin-vue/src/views/service/limit/index.vue @@ -0,0 +1,347 @@ + + + diff --git a/sop-admin/sop-admin-vue/src/views/service/list/index.vue b/sop-admin/sop-admin-vue/src/views/service/list/index.vue new file mode 100644 index 00000000..ebf01479 --- /dev/null +++ b/sop-admin/sop-admin-vue/src/views/service/list/index.vue @@ -0,0 +1,136 @@ + + + diff --git a/sop-admin/sop-admin-vue/src/views/service/route/index.vue b/sop-admin/sop-admin-vue/src/views/service/route/index.vue new file mode 100644 index 00000000..fc94f902 --- /dev/null +++ b/sop-admin/sop-admin-vue/src/views/service/route/index.vue @@ -0,0 +1,314 @@ + + + diff --git a/sop-admin/sop-admin-vue/tests/unit/.eslintrc.js b/sop-admin/sop-admin-vue/tests/unit/.eslintrc.js new file mode 100644 index 00000000..958d51ba --- /dev/null +++ b/sop-admin/sop-admin-vue/tests/unit/.eslintrc.js @@ -0,0 +1,5 @@ +module.exports = { + env: { + jest: true + } +} diff --git a/sop-admin/sop-admin-vue/tests/unit/components/Breadcrumb.spec.js b/sop-admin/sop-admin-vue/tests/unit/components/Breadcrumb.spec.js new file mode 100644 index 00000000..1d94c8fc --- /dev/null +++ b/sop-admin/sop-admin-vue/tests/unit/components/Breadcrumb.spec.js @@ -0,0 +1,98 @@ +import { mount, createLocalVue } from '@vue/test-utils' +import VueRouter from 'vue-router' +import ElementUI from 'element-ui' +import Breadcrumb from '@/components/Breadcrumb/index.vue' + +const localVue = createLocalVue() +localVue.use(VueRouter) +localVue.use(ElementUI) + +const routes = [ + { + path: '/', + name: 'home', + children: [{ + path: 'dashboard', + name: 'dashboard' + }] + }, + { + path: '/menu', + name: 'menu', + children: [{ + path: 'menu1', + name: 'menu1', + meta: { title: 'menu1' }, + children: [{ + path: 'menu1-1', + name: 'menu1-1', + meta: { title: 'menu1-1' } + }, + { + path: 'menu1-2', + name: 'menu1-2', + redirect: 'noredirect', + meta: { title: 'menu1-2' }, + children: [{ + path: 'menu1-2-1', + name: 'menu1-2-1', + meta: { title: 'menu1-2-1' } + }, + { + path: 'menu1-2-2', + name: 'menu1-2-2' + }] + }] + }] + }] + +const router = new VueRouter({ + routes +}) + +describe('Breadcrumb.vue', () => { + const wrapper = mount(Breadcrumb, { + localVue, + router + }) + it('dashboard', () => { + router.push('/dashboard') + const len = wrapper.findAll('.el-breadcrumb__inner').length + expect(len).toBe(1) + }) + it('normal route', () => { + router.push('/menu/menu1') + const len = wrapper.findAll('.el-breadcrumb__inner').length + expect(len).toBe(2) + }) + it('nested route', () => { + router.push('/menu/menu1/menu1-2/menu1-2-1') + const len = wrapper.findAll('.el-breadcrumb__inner').length + expect(len).toBe(4) + }) + it('no meta.title', () => { + router.push('/menu/menu1/menu1-2/menu1-2-2') + const len = wrapper.findAll('.el-breadcrumb__inner').length + expect(len).toBe(3) + }) + // it('click link', () => { + // router.push('/menu/menu1/menu1-2/menu1-2-2') + // const breadcrumbArray = wrapper.findAll('.el-breadcrumb__inner') + // const second = breadcrumbArray.at(1) + // console.log(breadcrumbArray) + // const href = second.find('a').attributes().href + // expect(href).toBe('#/menu/menu1') + // }) + // it('noRedirect', () => { + // router.push('/menu/menu1/menu1-2/menu1-2-1') + // const breadcrumbArray = wrapper.findAll('.el-breadcrumb__inner') + // const redirectBreadcrumb = breadcrumbArray.at(2) + // expect(redirectBreadcrumb.contains('a')).toBe(false) + // }) + it('last breadcrumb', () => { + router.push('/menu/menu1/menu1-2/menu1-2-1') + const breadcrumbArray = wrapper.findAll('.el-breadcrumb__inner') + const redirectBreadcrumb = breadcrumbArray.at(3) + expect(redirectBreadcrumb.contains('a')).toBe(false) + }) +}) diff --git a/sop-admin/sop-admin-vue/tests/unit/components/Hamburger.spec.js b/sop-admin/sop-admin-vue/tests/unit/components/Hamburger.spec.js new file mode 100644 index 00000000..01ea303a --- /dev/null +++ b/sop-admin/sop-admin-vue/tests/unit/components/Hamburger.spec.js @@ -0,0 +1,18 @@ +import { shallowMount } from '@vue/test-utils' +import Hamburger from '@/components/Hamburger/index.vue' +describe('Hamburger.vue', () => { + it('toggle click', () => { + const wrapper = shallowMount(Hamburger) + const mockFn = jest.fn() + wrapper.vm.$on('toggleClick', mockFn) + wrapper.find('.hamburger').trigger('click') + expect(mockFn).toBeCalled() + }) + it('prop isActive', () => { + const wrapper = shallowMount(Hamburger) + wrapper.setProps({ isActive: true }) + expect(wrapper.contains('.is-active')).toBe(true) + wrapper.setProps({ isActive: false }) + expect(wrapper.contains('.is-active')).toBe(false) + }) +}) diff --git a/sop-admin/sop-admin-vue/tests/unit/components/SvgIcon.spec.js b/sop-admin/sop-admin-vue/tests/unit/components/SvgIcon.spec.js new file mode 100644 index 00000000..31467a9f --- /dev/null +++ b/sop-admin/sop-admin-vue/tests/unit/components/SvgIcon.spec.js @@ -0,0 +1,22 @@ +import { shallowMount } from '@vue/test-utils' +import SvgIcon from '@/components/SvgIcon/index.vue' +describe('SvgIcon.vue', () => { + it('iconClass', () => { + const wrapper = shallowMount(SvgIcon, { + propsData: { + iconClass: 'test' + } + }) + expect(wrapper.find('use').attributes().href).toBe('#icon-test') + }) + it('className', () => { + const wrapper = shallowMount(SvgIcon, { + propsData: { + iconClass: 'test' + } + }) + expect(wrapper.classes().length).toBe(1) + wrapper.setProps({ className: 'test' }) + expect(wrapper.classes().includes('test')).toBe(true) + }) +}) diff --git a/sop-admin/sop-admin-vue/tests/unit/utils/formatTime.spec.js b/sop-admin/sop-admin-vue/tests/unit/utils/formatTime.spec.js new file mode 100644 index 00000000..24e165b4 --- /dev/null +++ b/sop-admin/sop-admin-vue/tests/unit/utils/formatTime.spec.js @@ -0,0 +1,30 @@ +import { formatTime } from '@/utils/index.js' + +describe('Utils:formatTime', () => { + const d = new Date('2018-07-13 17:54:01') // "2018-07-13 17:54:01" + const retrofit = 5 * 1000 + + it('ten digits timestamp', () => { + expect(formatTime((d / 1000).toFixed(0))).toBe('7月13日17时54分') + }) + it('test now', () => { + expect(formatTime(+new Date() - 1)).toBe('刚刚') + }) + it('less two minute', () => { + expect(formatTime(+new Date() - 60 * 2 * 1000 + retrofit)).toBe('2分钟前') + }) + it('less two hour', () => { + expect(formatTime(+new Date() - 60 * 60 * 2 * 1000 + retrofit)).toBe('2小时前') + }) + it('less one day', () => { + expect(formatTime(+new Date() - 60 * 60 * 24 * 1 * 1000)).toBe('1天前') + }) + it('more than one day', () => { + expect(formatTime(d)).toBe('7月13日17时54分') + }) + it('format', () => { + expect(formatTime(d, '{y}-{m}-{d} {h}:{i}')).toBe('2018-07-13 17:54') + expect(formatTime(d, '{y}-{m}-{d}')).toBe('2018-07-13') + expect(formatTime(d, '{y}/{m}/{d} {h}-{i}')).toBe('2018/07/13 17-54') + }) +}) diff --git a/sop-admin/sop-admin-vue/tests/unit/utils/parseTime.spec.js b/sop-admin/sop-admin-vue/tests/unit/utils/parseTime.spec.js new file mode 100644 index 00000000..41d1b028 --- /dev/null +++ b/sop-admin/sop-admin-vue/tests/unit/utils/parseTime.spec.js @@ -0,0 +1,28 @@ +import { parseTime } from '@/utils/index.js' + +describe('Utils:parseTime', () => { + const d = new Date('2018-07-13 17:54:01') // "2018-07-13 17:54:01" + it('timestamp', () => { + expect(parseTime(d)).toBe('2018-07-13 17:54:01') + }) + it('ten digits timestamp', () => { + expect(parseTime((d / 1000).toFixed(0))).toBe('2018-07-13 17:54:01') + }) + it('new Date', () => { + expect(parseTime(new Date(d))).toBe('2018-07-13 17:54:01') + }) + it('format', () => { + expect(parseTime(d, '{y}-{m}-{d} {h}:{i}')).toBe('2018-07-13 17:54') + expect(parseTime(d, '{y}-{m}-{d}')).toBe('2018-07-13') + expect(parseTime(d, '{y}/{m}/{d} {h}-{i}')).toBe('2018/07/13 17-54') + }) + it('get the day of the week', () => { + expect(parseTime(d, '{a}')).toBe('五') // 星期五 + }) + it('get the day of the week', () => { + expect(parseTime(+d + 1000 * 60 * 60 * 24 * 2, '{a}')).toBe('日') // 星期日 + }) + it('empty argument', () => { + expect(parseTime()).toBeNull() + }) +}) diff --git a/sop-admin/sop-admin-vue/tests/unit/utils/validate.spec.js b/sop-admin/sop-admin-vue/tests/unit/utils/validate.spec.js new file mode 100644 index 00000000..f774905b --- /dev/null +++ b/sop-admin/sop-admin-vue/tests/unit/utils/validate.spec.js @@ -0,0 +1,17 @@ +import { validUsername, isExternal } from '@/utils/validate.js' + +describe('Utils:validate', () => { + it('validUsername', () => { + expect(validUsername('admin')).toBe(true) + expect(validUsername('editor')).toBe(true) + expect(validUsername('xxxx')).toBe(false) + }) + it('isExternal', () => { + expect(isExternal('https://github.com/PanJiaChen/vue-element-admin')).toBe(true) + expect(isExternal('http://github.com/PanJiaChen/vue-element-admin')).toBe(true) + expect(isExternal('github.com/PanJiaChen/vue-element-admin')).toBe(false) + expect(isExternal('/dashboard')).toBe(false) + expect(isExternal('./dashboard')).toBe(false) + expect(isExternal('dashboard')).toBe(false) + }) +}) diff --git a/sop-admin/sop-admin-vue/vue.config.js b/sop-admin/sop-admin-vue/vue.config.js new file mode 100644 index 00000000..be1b518f --- /dev/null +++ b/sop-admin/sop-admin-vue/vue.config.js @@ -0,0 +1,133 @@ +'use strict' +const path = require('path') +const defaultSettings = require('./src/settings.js') + +function resolve(dir) { + return path.join(__dirname, dir) +} + +const name = defaultSettings.title || 'vue Admin Template' // page title +const port = 9528 // dev port + +// All configuration item explanations can be find in https://cli.vuejs.org/config/ +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: port, + 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://localhost:${port}/mock`, + changeOrigin: true, + pathRewrite: { + ['^' + process.env.VUE_APP_BASE_API]: '' + } + } + }, + after: require('./mock/mock-server.js') + }, + 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. + name: name, + resolve: { + alias: { + '@': resolve('src') + } + } + }, + chainWebpack(config) { + config.plugins.delete('preload') // TODO: need test + config.plugins.delete('prefetch') // TODO: need test + + // set svg-sprite-loader + config.module + .rule('svg') + .exclude.add(resolve('src/icons')) + .end() + config.module + .rule('icons') + .test(/\.svg$/) + .include.add(resolve('src/icons')) + .end() + .use('svg-sprite-loader') + .loader('svg-sprite-loader') + .options({ + symbolId: 'icon-[name]' + }) + .end() + + // 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') + } + ) + } +} diff --git a/sop-common/sop-service-common/src/main/java/com/gitee/sop/servercommon/param/ApiArgumentResolver.java b/sop-common/sop-service-common/src/main/java/com/gitee/sop/servercommon/param/ApiArgumentResolver.java index c459abcd..413b9c93 100644 --- a/sop-common/sop-service-common/src/main/java/com/gitee/sop/servercommon/param/ApiArgumentResolver.java +++ b/sop-common/sop-service-common/src/main/java/com/gitee/sop/servercommon/param/ApiArgumentResolver.java @@ -1,6 +1,7 @@ package com.gitee.sop.servercommon.param; import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; import com.gitee.sop.servercommon.annotation.ApiAbility; import com.gitee.sop.servercommon.annotation.ApiMapping; import com.gitee.sop.servercommon.bean.ParamNames; @@ -11,6 +12,8 @@ import org.springframework.web.context.request.NativeWebRequest; import org.springframework.web.method.support.HandlerMethodArgumentResolver; import org.springframework.web.method.support.ModelAndViewContainer; +import java.util.Map; + /** * 解析request参数中的业务参数,绑定到方法参数上 * @@ -31,13 +34,34 @@ public class ApiArgumentResolver implements HandlerMethodArgumentResolver { @Override public Object resolveArgument(MethodParameter methodParameter, ModelAndViewContainer modelAndViewContainer, NativeWebRequest nativeWebRequest, WebDataBinderFactory webDataBinderFactory) throws Exception { + Object paramObj = this.getParamObject(methodParameter, nativeWebRequest); + // JSR-303验证 + paramValidator.validateBizParam(paramObj); + return paramObj; + } + + /** + * 获取参数对象,将request中的参数绑定到实体对象中去 + * @param methodParameter + * @param nativeWebRequest + * @return + */ + protected Object getParamObject(MethodParameter methodParameter, NativeWebRequest nativeWebRequest) { String bizContent = nativeWebRequest.getParameter(ParamNames.BIZ_CONTENT_NAME); + Class parameterType = methodParameter.getParameterType(); if (bizContent != null) { - Class parameterType = methodParameter.getParameterType(); - Object paramObj = JSON.parseObject(bizContent, parameterType); - // JSR-303验证 - paramValidator.validateBizParam(paramObj); - return paramObj; + return JSON.parseObject(bizContent, parameterType); + } else { + Map parameterMap = nativeWebRequest.getParameterMap(); + JSONObject result = new JSONObject(); + parameterMap.forEach((key, values) -> { + if (values.length > 0) { + result.put(key, values[0]); + } + }); + if (result.size() > 0) { + return result.toJavaObject(parameterType); + } } return null; } diff --git a/sop-example/sop-book/sop-book-web/src/main/java/com/gitee/sop/bookweb/config/OpenServiceConfig.java b/sop-example/sop-book/sop-book-web/src/main/java/com/gitee/sop/bookweb/config/OpenServiceConfig.java index 9f201238..2a4ce64a 100644 --- a/sop-example/sop-book/sop-book-web/src/main/java/com/gitee/sop/bookweb/config/OpenServiceConfig.java +++ b/sop-example/sop-book/sop-book-web/src/main/java/com/gitee/sop/bookweb/config/OpenServiceConfig.java @@ -3,6 +3,7 @@ package com.gitee.sop.bookweb.config; import com.gitee.sop.servercommon.configuration.AlipayServiceConfiguration; import com.gitee.sop.servercommon.swagger.SwaggerSupport; import org.springframework.context.annotation.Configuration; +import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; import springfox.documentation.swagger2.annotations.EnableSwagger2; /** @@ -11,6 +12,16 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2; */ @Configuration public class OpenServiceConfig extends AlipayServiceConfiguration { + + @Override + protected void addResourceHandlers(ResourceHandlerRegistry registry) { + super.addResourceHandlers(registry); + registry.addResourceHandler("swagger-ui.html") + .addResourceLocations("classpath:/META-INF/resources/"); + registry.addResourceHandler("/webjars/**") + .addResourceLocations("classpath:/META-INF/resources/webjars/"); + } + // 开启文档 @Configuration @EnableSwagger2 diff --git a/sop-example/sop-book/sop-book-web/src/main/java/com/gitee/sop/bookweb/controller/AlipayBookController.java b/sop-example/sop-book/sop-book-web/src/main/java/com/gitee/sop/bookweb/controller/AlipayBookController.java index 828581ec..1897b84e 100644 --- a/sop-example/sop-book/sop-book-web/src/main/java/com/gitee/sop/bookweb/controller/AlipayBookController.java +++ b/sop-example/sop-book/sop-book-web/src/main/java/com/gitee/sop/bookweb/controller/AlipayBookController.java @@ -6,6 +6,7 @@ import com.gitee.sop.bookweb.param.BookParam; import com.gitee.sop.bookweb.vo.BookVO; import com.gitee.sop.servercommon.annotation.ApiMapping; import com.gitee.sop.story.api.domain.Story; +import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RestController; @@ -16,6 +17,7 @@ import java.util.Arrays; * 这里演示如何接受业务参数。 * @author tanghc */ +@Api(tags = "图书接口") @RestController public class AlipayBookController { diff --git a/sop.sql b/sop.sql index d3f07bfb..7ca86e94 100644 --- a/sop.sql +++ b/sop.sql @@ -48,7 +48,7 @@ CREATE TABLE `config_route_limit` ( `service_id` varchar(64) NOT NULL DEFAULT '', `limit_type` tinyint(4) NOT NULL DEFAULT '1' COMMENT '限流策略,1:漏桶策略,2:令牌桶策略', `exec_count_per_second` int(11) DEFAULT NULL COMMENT '每秒可处理请求数', - `limit_code` varchar(20) DEFAULT NULL COMMENT '返回的错误码', + `limit_code` varchar(64) DEFAULT NULL COMMENT '返回的错误码', `limit_msg` varchar(100) DEFAULT NULL COMMENT '返回的错误信息', `token_bucket_count` int(11) DEFAULT NULL COMMENT '令牌桶容量', `limit_status` tinyint(4) NOT NULL DEFAULT '0' COMMENT '限流开启状态,1:开启,0关闭',