From ac0158605c0d5a01570c4a21fb7625ec0d9caf67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E7=AC=91?= <huangxiao@citycloud.com.cn>
Date: Thu, 17 Jun 2021 16:47:22 +0800
Subject: [PATCH 1/2] directory.go: fix os.MkdirAll return error
---
server/utils/directory.go | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/server/utils/directory.go b/server/utils/directory.go
index 46e89aa3..27ff1d2e 100644
--- a/server/utils/directory.go
+++ b/server/utils/directory.go
@@ -37,9 +37,9 @@ func CreateDir(dirs ...string) (err error) {
}
if !exist {
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))
+ return err
}
}
}
From 3af12113b20c117f454ced19470de602ec99c72a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BD=95=E7=A7=80=E9=92=A2?= <xiugang.he@skyee360.com>
Date: Wed, 23 Jun 2021 11:36:22 +0800
Subject: [PATCH 2/2] =?UTF-8?q?modified=20=E7=BB=9F=E4=B8=80=E4=BB=A3?=
=?UTF-8?q?=E7=A0=81=E9=A3=8E=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
web/build.config.js | 2 +-
web/src/core/config.js | 19 +++++++------------
web/src/core/gin-vue-admin.js | 3 +--
3 files changed, 9 insertions(+), 15 deletions(-)
diff --git a/web/build.config.js b/web/build.config.js
index 8bf7c89e..617cbf52 100644
--- a/web/build.config.js
+++ b/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]
* 否则自动拼写 [baseCdnUrl]/[name]/[version]/[name].min.js
- * */
+ */
{ name: 'vue', scope: 'Vue' },
{ name: 'vue-router', scope: 'VueRouter' },
{ name: 'vuex', scope: 'Vuex' },
diff --git a/web/src/core/config.js b/web/src/core/config.js
index 08d58028..920dc908 100644
--- a/web/src/core/config.js
+++ b/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
\ No newline at end of file
+export default config
diff --git a/web/src/core/gin-vue-admin.js b/web/src/core/gin-vue-admin.js
index 5163ebfd..6d8aa1a5 100644
--- a/web/src/core/gin-vue-admin.js
+++ b/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 Bus from '@/utils/bus'
-//加载网站配置文件夹
+// 加载网站配置文件夹
import config from './config'
Vue.prototype.$GIN_VUE_ADMIN = config
-console.log(config)
Vue.use(Bus)
Vue.use(APlayer, {
defaultCover: 'https://github.com/u3u.png',