Merge remote-tracking branch 'origin/gva_gormv2_dev' into gva_gormv2_dev

# Conflicts:
#	server/go.mod
#	server/initialize/data.go
#	server/model/sys_base_menu.go
#	server/service/sys_db_initialize.go

Author: pixel

server/db/qmplus.sql renamed to .docker-compose/docker-entrypoint-initdb.d/qmplus.sql

@@ -11,6 +11,7 @@ import (
 	"fmt"
 	"gin-vue-admin/global"
 	"gin-vue-admin/initialize"
+	"go.uber.org/zap"
 	"time"
 )
 
@@ -35,10 +36,10 @@ func RunWindowsServer() {
 	// 保证文本顺序输出
 	// In order to ensure that the text order output can be deleted
 	time.Sleep(10 * time.Microsecond)
-	global.GVA_LOG.Debug("server run success on ", address)
+	global.GVA_LOG.Debug("server run success on ", zap.String("address", address))
 
 	fmt.Printf("欢迎使用 Gin-Vue-Admin默认自动化文档地址:http://127.0.0.1%s/swagger/index.html\n 默认前端文件运行地址:http://127.0.0.1:8888/admin\n", address)
-	global.GVA_LOG.Error(s.ListenAndServe())
+	global.GVA_LOG.Error(s.ListenAndServe().Error())
 }
 EOF
 
@@ -63,7 +64,7 @@ mysql:
     password: 'Aa@6447985'
     path: mysql
     db-name: 'qmPlus'
-    config: 'charset=utf8&parseTime=True&loc=Local'
+    config: 'charset=utf8mb4&parseTime=True&loc=Local'
     max-idle-conns: 10
     max-open-conns: 10
     log-mode: true
@@ -76,6 +77,12 @@ sqlite:
 
 # oss configuration
 
+# 切换本地与七牛云上传，分配头像和文件路径
+localupload:
+  local: false
+  avatar-path: uploads/avatar
+  file-path: uploads/file
+
 # 请自行七牛申请对应的 公钥 私钥 bucket 和 域名地址
 qiniu:
     access-key: '25j8dYBZ2wuiy0yhwShytjZDTX662b8xiFguwxzZ'
@@ -102,11 +109,19 @@ captcha:
     img-width: 240
     img-height: 80
 
-# logger configuration
-log:
-    prefix: '[GIN-VUE-ADMIN]'
-    log-file: true
-    stdout: 'DEBUG'
-    file: 'DEBUG'
+# zap logger configuration
+zap:
+  # 可使用 "debug", "info", "warn", "error", "dpanic", "panic", "fatal",
+  level: 'debug'
+  # console: 控制台, json: json格式输出
+  format: 'console'
+  prefix: '[GIN-VUE-ADMIN]'
+  director: 'log'
+  link_name: 'latest_log'
+  show_line: true
+  # LowercaseLevelEncoder:小写, LowercaseColorLevelEncoder:小写带颜色,CapitalLevelEncoder: 大写, CapitalColorLevelEncoder: 大写带颜色,
+  encode_level: 'LowercaseColorLevelEncoder'
+  stacktrace_key: 'stacktrace'
+  log_in_console: true
 EOF
 

docker/server-handle.sh renamed to .docker-compose/shell/server-handle.sh

@@ -13,7 +13,7 @@
 [English](./README.md) | 简体中文
 
 # 项目文档
-[在线文档](https://www.gin-vue-admin.com/)
+[在线文档](https://www.gin-vue-admin.com/) : https://www.gin-vue-admin.com/
 
 [开发教学](https://www.gin-vue-admin.com/docs/help) (贡献者:  <a href="https://github.com/LLemonGreen">LLemonGreen</a> And <a href="https://github.com/fkk0509">Fann</a>)
 - 前端UI框架：[element-ui](https://github.com/ElemeFE/element) 

docker/web-handle.sh renamed to .docker-compose/shell/web-handle.sh

@@ -13,7 +13,9 @@
 English | [简体中文](./README-zh_CN.md)
 
 # Project Guidelines
-[Online Documentation](https://www.gin-vue-admin.com/)
+[Online Documentation](https://www.gin-vue-admin.com/) : https://www.gin-vue-admin.com/
+
+
 
 [Development Steps](https://www.gin-vue-admin.com/docs/help) (Contributor:  <a href="https://github.com/LLemonGreen">LLemonGreen</a> And <a href="https://github.com/fkk0509">Fann</a>)
 - Web UI Framework：[element-ui](https://github.com/ElemeFE/element)  

README-zh_CN.md

@@ -14,14 +14,17 @@ services:
       - redis
 
   mysql:
-    image: registry.cn-shanghai.aliyuncs.com/gva/gva-mysql:1.1
+    image: mysql:8.0.21
     container_name: gva-mysql
     command: mysqld --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci #设置utf8字符集
     restart: always
     ports:
       - "13306:3306"  # host物理直接映射端口为6606
     environment:
-      MYSQL_ROOT_PASSWORD: "Aa@6447985" # root管理员用户密码
+      MYSQL_DATABASE: 'qmPlus' # 初始化启动时要创建的数据库的名称
+      MYSQL_ROOT_PASSWORD: 'Aa@6447985' # root管理员用户密码
+    volumes:
+    - '.docker-compose/docker-entrypoint-initdb.d:/docker-entrypoint-initdb.d'
 
   redis:
     image: redis:6.0.6

README.md

@@ -4,7 +4,8 @@ WORKDIR /gva_web/
 COPY web/ .
 
 RUN cat .env.production
-COPY docker/web-handle.sh .
+COPY .docker-compose/shell/web-handle.sh .
+RUN ls -al
 RUN sh ./web-handle.sh
 RUN cat .env.production
 RUN rm -f web-handle.sh
@@ -22,7 +23,8 @@ COPY server/ ./
 
 RUN cat ./core/server.go
 RUN cat ./config.yaml
-COPY docker/server-handle.sh .
+COPY .docker-compose/shell/server-handle.sh .
+RUN ls -al
 RUN sh ./server-handle.sh
 RUN rm -f server-handle.sh
 RUN cat ./core/server.go

docker-compose.yaml

@@ -64,4 +64,19 @@ log:
   prefix: '[GIN-VUE-ADMIN]'
   log-file: true
   stdout: 'DEBUG'
-  file: 'DEBUG'
+  file: 'DEBUG'
+
+# zap logger configuration
+zap:
+  # 可使用 "debug", "info", "warn", "error", "dpanic", "panic", "fatal",
+  level: 'debug'
+  # console: 控制台, json: json格式输出
+  format: 'console'
+  prefix: '[GIN-VUE-ADMIN]'
+  director: 'log'
+  link_name: 'latest_log'
+  show_line: true
+  # LowercaseLevelEncoder:小写, LowercaseColorLevelEncoder:小写带颜色,CapitalLevelEncoder: 大写, CapitalColorLevelEncoder: 大写带颜色,
+  encode_level: 'LowercaseColorLevelEncoder'
+  stacktrace_key: 'stacktrace'
+  log_in_console: true

dockerfile_server

@@ -1,15 +1,15 @@
 package config
 
 type Server struct {
-	Mysql     Mysql     `mapstructure:"mysql" json:"mysql" yaml:"mysql"`
-	Sqlite    Sqlite    `mapstructure:"sqlite" json:"sqlite" yaml:"sqlite"`
-	Qiniu     Qiniu     `mapstructure:"qiniu" json:"qiniu" yaml:"qiniu"`
-	Casbin    Casbin    `mapstructure:"casbin" json:"casbin" yaml:"casbin"`
-	Redis     Redis     `mapstructure:"redis" json:"redis" yaml:"redis"`
-	System    System    `mapstructure:"system" json:"system" yaml:"system"`
-	JWT       JWT       `mapstructure:"jwt" json:"jwt" yaml:"jwt"`
-	Captcha   Captcha   `mapstructure:"captcha" json:"captcha" yaml:"captcha"`
-	Log       Log       `mapstructure:"log" json:"log" yaml:"log"`
+	Mysql       Mysql       `mapstructure:"mysql" json:"mysql" yaml:"mysql"`
+	Sqlite      Sqlite      `mapstructure:"sqlite" json:"sqlite" yaml:"sqlite"`
+	Qiniu       Qiniu       `mapstructure:"qiniu" json:"qiniu" yaml:"qiniu"`
+	Casbin      Casbin      `mapstructure:"casbin" json:"casbin" yaml:"casbin"`
+	Redis       Redis       `mapstructure:"redis" json:"redis" yaml:"redis"`
+	System      System      `mapstructure:"system" json:"system" yaml:"system"`
+	JWT         JWT         `mapstructure:"jwt" json:"jwt" yaml:"jwt"`
+	Captcha     Captcha     `mapstructure:"captcha" json:"captcha" yaml:"captcha"`
+	Zap         Zap         `mapstructure:"zap" json:"zap" yaml:"zap"`
 	LocalUpload LocalUpload `mapstructure:"localUpload" json:"localUpload" yaml:"localUpload"`
 }
 
@@ -46,9 +46,9 @@ type Redis struct {
 }
 
 type LocalUpload struct {
-	Local bool `mapstructure:"local" json:"local" yaml:"local"`
+	Local      bool   `mapstructure:"local" json:"local" yaml:"local"`
 	AvatarPath string `mapstructure:"avatar-path" json:"avatarPath" yaml:"avatar-path"`
-	FilePath string `mapstructure:"file-path" json:"filePath" yaml:"file-path"`
+	FilePath   string `mapstructure:"file-path" json:"filePath" yaml:"file-path"`
 }
 
 type Qiniu struct {
@@ -64,17 +64,22 @@ type Captcha struct {
 	ImgHeight int `mapstructure:"img-height" json:"imgHeight" yaml:"img-height"`
 }
 
-type Log struct {
-	Prefix  string `mapstructure:"prefix" json:"prefix" yaml:"prefix"`
-	LogFile bool   `mapstructure:"log-file" json:"logFile" yaml:"log-file"`
-	Stdout  string `mapstructure:"stdout" json:"stdout" yaml:"stdout"`
-	File    string `mapstructure:"file" json:"file" yaml:"file"`
-}
-
 type Sqlite struct {
 	Username string `mapstructure:"username" json:"username" yaml:"username"`
 	Password string `mapstructure:"password" json:"password" yaml:"password"`
 	Path     string `mapstructure:"path" json:"path" yaml:"path"`
 	Config   string `mapstructure:"config" json:"config" yaml:"config"`
 	LogMode  bool   `mapstructure:"log-mode" json:"logMode" yaml:"log-mode"`
 }
+
+type Zap struct {
+	Level         string `mapstructure:"level" json:"level" yaml:"level"`
+	Format        string `mapstructure:"format" json:"format" yaml:"format"`
+	Prefix        string `mapstructure:"prefix" json:"prefix" yaml:"prefix"`
+	Director      string `mapstructure:"director" json:"director"  yaml:"director"`
+	LinkName      string `mapstructure:"link_name" json:"linkName" yaml:"link_name"`
+	ShowLine      bool   `mapstructure:"show_line" json:"showLine" yaml:"showLine"`
+	EncodeLevel   string `mapstructure:"encode_level" json:"encodeLevel" yaml:"encode_level"`
+	StacktraceKey string `mapstructure:"stacktrace_key" json:"stacktraceKey" yaml:"stacktrace_key"`
+	LogInConsole  bool   `mapstructure:"log_in_console" json:"logInConsole" yaml:"log_in_console"`
+}