Browse Source

Merge pull request #540 from flipped-aurora/develop

Develop
main
奇淼(piexlmax 3 years ago
committed by GitHub
parent
commit
a2ac6dbe4f
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 4
      server/utils/directory.go
  2. 2
      web/build.config.js
  3. 17
      web/src/core/config.js
  4. 3
      web/src/core/gin-vue-admin.js

4
server/utils/directory.go

@ -37,9 +37,9 @@ func CreateDir(dirs ...string) (err error) {
} }
if !exist { if !exist {
global.GVA_LOG.Debug("create directory" + v) global.GVA_LOG.Debug("create directory" + v)
err = os.MkdirAll(v, os.ModePerm)
if err != nil {
if err := os.MkdirAll(v, os.ModePerm); err != nil {
global.GVA_LOG.Error("create directory"+v, zap.Any(" error:", err)) global.GVA_LOG.Error("create directory"+v, zap.Any(" error:", err))
return err
} }
} }
} }

2
web/build.config.js

@ -7,7 +7,7 @@ module.exports = {
/** /**
* 如果设置path属性, { name: 'vue', scope: 'Vue', path: '/vue/2.6.9/vue.min.js' } 即编译出来以[baseCdnUrl][path] * 如果设置path属性, { name: 'vue', scope: 'Vue', path: '/vue/2.6.9/vue.min.js' } 即编译出来以[baseCdnUrl][path]
* 否则自动拼写 [baseCdnUrl]/[name]/[version]/[name].min.js * 否则自动拼写 [baseCdnUrl]/[name]/[version]/[name].min.js
* */
*/
{ name: 'vue', scope: 'Vue' }, { name: 'vue', scope: 'Vue' },
{ name: 'vue-router', scope: 'VueRouter' }, { name: 'vue-router', scope: 'VueRouter' },
{ name: 'vuex', scope: 'Vuex' }, { name: 'vuex', scope: 'Vuex' },

17
web/src/core/config.js

@ -1,15 +1,10 @@
/*
* 网站配置文件
* */
const config ={
appName : 'Gin-Vue-Admin',
appLogo : 'https://www.gin-vue-admin.com/img/logo.png'
/**
* 网站配置文件
*/
const config = {
appName: 'Gin-Vue-Admin',
appLogo: 'https://www.gin-vue-admin.com/img/logo.png'
} }
export default config export default config

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

@ -10,10 +10,9 @@ import APlayer from '@moefe/vue-aplayer'
import '../../node_modules/timeline-vuejs/dist/timeline-vuejs.css' import '../../node_modules/timeline-vuejs/dist/timeline-vuejs.css'
// 路由守卫 // 路由守卫
import Bus from '@/utils/bus' import Bus from '@/utils/bus'
//加载网站配置文件夹
// 加载网站配置文件夹
import config from './config' import config from './config'
Vue.prototype.$GIN_VUE_ADMIN = config Vue.prototype.$GIN_VUE_ADMIN = config
console.log(config)
Vue.use(Bus) Vue.use(Bus)
Vue.use(APlayer, { Vue.use(APlayer, {
defaultCover: 'https://github.com/u3u.png', defaultCover: 'https://github.com/u3u.png',

Loading…
Cancel
Save