Skip to content

Commit 04b3125

Browse files
author
奇淼(piexlmax
authored
Merge pull request #540 from flipped-aurora/develop
Develop
2 parents 1772c1c + ebf7a11 commit 04b3125

File tree

4 files changed

+11
-17
lines changed

4 files changed

+11
-17
lines changed

server/utils/directory.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@ func CreateDir(dirs ...string) (err error) {
3737
}
3838
if !exist {
3939
global.GVA_LOG.Debug("create directory" + v)
40-
err = os.MkdirAll(v, os.ModePerm)
41-
if err != nil {
40+
if err := os.MkdirAll(v, os.ModePerm); err != nil {
4241
global.GVA_LOG.Error("create directory"+v, zap.Any(" error:", err))
42+
return err
4343
}
4444
}
4545
}

web/build.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ module.exports = {
77
/**
88
* 如果设置path属性, { name: 'vue', scope: 'Vue', path: '/vue/2.6.9/vue.min.js' } 即编译出来以[baseCdnUrl][path]
99
* 否则自动拼写 [baseCdnUrl]/[name]/[version]/[name].min.js
10-
* */
10+
*/
1111
{ name: 'vue', scope: 'Vue' },
1212
{ name: 'vue-router', scope: 'VueRouter' },
1313
{ name: 'vuex', scope: 'Vuex' },

web/src/core/config.js

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,10 @@
1-
/*
2-
* 网站配置文件
3-
* */
4-
5-
6-
7-
const config ={
8-
9-
appName : 'Gin-Vue-Admin',
10-
11-
appLogo : 'https://www.gin-vue-admin.com/img/logo.png'
1+
/**
2+
* 网站配置文件
3+
*/
124

5+
const config = {
6+
appName: 'Gin-Vue-Admin',
7+
appLogo: 'https://www.gin-vue-admin.com/img/logo.png'
138
}
149

15-
export default config
10+
export default config

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,9 @@ import APlayer from '@moefe/vue-aplayer'
1010
import '../../node_modules/timeline-vuejs/dist/timeline-vuejs.css'
1111
// 路由守卫
1212
import Bus from '@/utils/bus'
13-
//加载网站配置文件夹
13+
// 加载网站配置文件夹
1414
import config from './config'
1515
Vue.prototype.$GIN_VUE_ADMIN = config
16-
console.log(config)
1716
Vue.use(Bus)
1817
Vue.use(APlayer, {
1918
defaultCover: 'https://github.com/u3u.png',

0 commit comments

Comments
 (0)