合并更新至主干

合并更新至主干

package-lock.json

@@ -1,3 +1,6 @@
 {
-  "lockfileVersion": 1
+  "name": "gin-vue-admin",
+  "lockfileVersion": 2,
+  "requires": true,
+  "packages": {}
 }

package.json

@@ -0,0 +1 @@
+{}

server/config.yaml

@@ -43,7 +43,7 @@ system:
   env: 'public'  # Change to "develop" to skip authentication for development mode
   addr: 8888
   db-type: 'mysql'
-  oss-type: 'local'    # 控制oss选择走本地还是 七牛等其他仓 自行增加其他oss仓可以在 server/utils/upload/upload.go 中 NewOss函数配置
+  oss-type: 'local'    # 控制oss选择走本期还是 七牛等其他仓 自行增加其他oss仓可以在 server/utils/upload/upload.go 中 NewOss函数配置
   use-multipoint: false
 
 # captcha configuration
@@ -85,7 +85,7 @@ autocode:
   web-form: /view
   web-table: /view
 
-# qiniu configuration (请自行申请七牛对应的 公钥 私钥 bucket 和 域名地址)
+# qiniu configuration (请自行七牛申请对应的 公钥 私钥 bucket 和 域名地址)
 qiniu:
   zone: 'ZoneHuaDong'
   bucket: ''

web/src/core/element_lazy.js

@@ -0,0 +1,119 @@
+/*
+*
+* 按需加载element
+*
+*
+* */
+
+import Vue from 'vue'
+//  按需引入element
+import {
+  Button,
+  Select,
+  Dialog,
+  Form,
+  Input,
+  FormItem,
+  Option,
+  Loading,
+  Message,
+  Container,
+  Card,
+  Dropdown,
+  DropdownMenu,
+  DropdownItem,
+  Row,
+  Col,
+  Menu,
+  Submenu,
+  MenuItem,
+  Aside,
+  Main,
+  Badge,
+  Header,
+  Tabs,
+  Breadcrumb,
+  BreadcrumbItem,
+  Scrollbar,
+  Avatar,
+  TabPane,
+  Divider,
+  Table,
+  TableColumn,
+  Cascader,
+  Checkbox,
+  CheckboxGroup,
+  Pagination,
+  Tag,
+  Drawer,
+  Tree,
+  Popover,
+  Switch,
+  Collapse,
+  CollapseItem,
+  Tooltip,
+  DatePicker,
+  InputNumber,
+  Steps,
+  Upload,
+  Progress,
+  MessageBox,
+  Image
+} from 'element-ui'
+
+Vue.use(Button)
+Vue.use(Select)
+Vue.use(Dialog)
+Vue.use(Form)
+Vue.use(FormItem)
+Vue.use(Input)
+Vue.use(Option)
+Vue.use(Container)
+Vue.use(Card)
+Vue.use(Dropdown)
+Vue.use(DropdownMenu)
+Vue.use(DropdownItem)
+Vue.use(Row)
+Vue.use(Col)
+Vue.use(Menu)
+Vue.use(Submenu)
+Vue.use(MenuItem)
+Vue.use(Aside)
+Vue.use(Main)
+Vue.use(Badge)
+Vue.use(Header)
+Vue.use(Tabs)
+Vue.use(Breadcrumb)
+Vue.use(BreadcrumbItem)
+Vue.use(Avatar)
+Vue.use(TabPane)
+Vue.use(Divider)
+Vue.use(Table)
+Vue.use(TableColumn)
+Vue.use(Checkbox)
+Vue.use(Cascader)
+Vue.use(Tag)
+Vue.use(Pagination)
+Vue.use(Drawer)
+Vue.use(Tree)
+Vue.use(CheckboxGroup)
+Vue.use(Popover)
+Vue.use(InputNumber)
+Vue.use(Switch)
+Vue.use(Collapse)
+Vue.use(CollapseItem)
+Vue.use(Tooltip)
+Vue.use(DatePicker)
+Vue.use(Steps)
+Vue.use(Upload)
+Vue.use(Progress)
+Vue.use(Scrollbar)
+Vue.use(Loading.directive)
+Vue.use(Image)
+
+Vue.prototype.$loading = Loading.service
+Vue.prototype.$message = Message
+Vue.prototype.$confirm = MessageBox.confirm
+Dialog.props.closeOnClickModal.default = false
+
+console.warn('[GIN-VUE-ADMIN]--按需加载elementUI成功,如出现element-ui组件无法使用问题，请至/src/core/element_lazy 下引入对应组件即可')

web/src/core/gin-vue-admin.js

@@ -0,0 +1,27 @@
+/*
+* gin-vue-admin web框架组
+*
+* */
+import Vue from 'vue'
+import './element_lazy' // 按需加载element
+import uploader from 'vue-simple-uploader'
+import APlayer from '@moefe/vue-aplayer'
+// time line css
+import '../../node_modules/timeline-vuejs/dist/timeline-vuejs.css'
+// 路由守卫
+import Bus from '@/utils/bus'
+Vue.use(Bus)
+Vue.use(APlayer, {
+  defaultCover: 'https://github.com/u3u.png',
+  productionTip: true
+})
+Vue.use(uploader)
+
+console.log(`
+   欢迎使用 Gin-Vue-Admin
+   当前版本:V2.4.2
+   加群方式:微信：shouzi_1994 QQ群：622360840
+   默认自动化文档地址:http://127.0.0.1:${process.env.VUE_APP_SERVER_PORT}/swagger/index.html
+   默认前端文件运行地址:http://127.0.0.1:${process.env.VUE_APP_CLI_PORT}
+   如果项目让您获得了收益，希望您能请团队喝杯可乐:https://www.gin-vue-admin.com/docs/coffee
+`)

web/src/main.js

@@ -1,155 +1,20 @@
 import Vue from 'vue'
 import App from './App.vue'
-
-//  按需引入element
-import {
-  Button,
-  Select,
-  Dialog,
-  Form,
-  Input,
-  FormItem,
-  Option,
-  Loading,
-  Message,
-  Container,
-  Card,
-  Dropdown,
-  DropdownMenu,
-  DropdownItem,
-  Row,
-  Col,
-  Menu,
-  Submenu,
-  MenuItem,
-  Aside,
-  Main,
-  Badge,
-  Header,
-  Tabs,
-  Breadcrumb,
-  BreadcrumbItem,
-  Scrollbar,
-  Avatar,
-  TabPane,
-  Divider,
-  Table,
-  TableColumn,
-  Cascader,
-  Checkbox,
-  CheckboxGroup,
-  Pagination,
-  Tag,
-  Drawer,
-  Tree,
-  Popover,
-  Switch,
-  Collapse,
-  CollapseItem,
-  Tooltip,
-  DatePicker,
-  InputNumber,
-  Steps,
-  Upload,
-  Progress,
-  MessageBox,
-  Image
-} from 'element-ui'
-
-Vue.use(Button)
-Vue.use(Select)
-Vue.use(Dialog)
-Vue.use(Form)
-Vue.use(FormItem)
-Vue.use(Input)
-Vue.use(Option)
-Vue.use(Container)
-Vue.use(Card)
-Vue.use(Dropdown)
-Vue.use(DropdownMenu)
-Vue.use(DropdownItem)
-Vue.use(Row)
-Vue.use(Col)
-Vue.use(Menu)
-Vue.use(Submenu)
-Vue.use(MenuItem)
-Vue.use(Aside)
-Vue.use(Main)
-Vue.use(Badge)
-Vue.use(Header)
-Vue.use(Tabs)
-Vue.use(Breadcrumb)
-Vue.use(BreadcrumbItem)
-Vue.use(Avatar)
-Vue.use(TabPane)
-Vue.use(Divider)
-Vue.use(Table)
-Vue.use(TableColumn)
-Vue.use(Checkbox)
-Vue.use(Cascader)
-Vue.use(Tag)
-Vue.use(Pagination)
-Vue.use(Drawer)
-Vue.use(Tree)
-Vue.use(CheckboxGroup)
-Vue.use(Popover)
-Vue.use(InputNumber)
-Vue.use(Switch)
-Vue.use(Collapse)
-Vue.use(CollapseItem)
-Vue.use(Tooltip)
-Vue.use(DatePicker)
-Vue.use(Steps)
-Vue.use(Upload)
-Vue.use(Progress)
-Vue.use(Scrollbar)
-Vue.use(Loading.directive)
-Vue.use(Image)
-
-Vue.prototype.$loading = Loading.service
-Vue.prototype.$message = Message
-Vue.prototype.$confirm = MessageBox.confirm
-Dialog.props.closeOnClickModal.default = false
-
+// 引入gin-vue-admin前端初始化相关内容
+import './core/gin-vue-admin'
 // 引入封装的router
 import router from '@/router/index'
-
-// time line css
-import '../node_modules/timeline-vuejs/dist/timeline-vuejs.css'
-
 import '@/permission'
 import { store } from '@/store'
 Vue.config.productionTip = false
 
-// 路由守卫
-import Bus from '@/utils/bus'
-Vue.use(Bus)
-
-import APlayer from '@moefe/vue-aplayer'
-
-Vue.use(APlayer, {
-  defaultCover: 'https://github.com/u3u.png',
-  productionTip: true
-})
-
 import { auth } from '@/directive/auth'
 // 按钮权限指令
 auth(Vue)
 
-import uploader from 'vue-simple-uploader'
-Vue.use(uploader)
-
 export default new Vue({
   render: h => h(App),
   router,
   store
 }).$mount('#app')
 
-console.log(`
-       欢迎使用 Gin-Vue-Admin
-       当前版本:V2.4.2
-       加群方式:微信：shouzi_1994 QQ群：622360840
-       默认自动化文档地址:http://127.0.0.1:${process.env.VUE_APP_SERVER_PORT}/swagger/index.html
-       默认前端文件运行地址:http://127.0.0.1:${process.env.VUE_APP_CLI_PORT}
-       如果项目让您获得了收益，希望您能请团队喝杯可乐:https://www.gin-vue-admin.com/docs/coffee
-`)