Browse Source

feat:更新beego版本

Roc 3 years ago
parent
commit
da2bcf8ca5
7 changed files with 36 additions and 32 deletions
  1. 2 2
      controllers/base_common.go
  2. 11 11
      main.go
  3. 12 12
      routers/router.go
  4. 8 4
      utils/config.go
  5. 1 1
      utils/email.go
  6. 1 1
      utils/logs.go
  7. 1 1
      utils/validator.go

+ 2 - 2
controllers/base_common.go

@@ -3,7 +3,7 @@ package controllers
 import (
 import (
 	"encoding/json"
 	"encoding/json"
 	"fmt"
 	"fmt"
-	"github.com/astaxie/beego"
+	"github.com/beego/beego/v2/server/web"
 	"hongze/hongze_mobile_admin/utils"
 	"hongze/hongze_mobile_admin/utils"
 	"net/url"
 	"net/url"
 	"rdluck_tools/log"
 	"rdluck_tools/log"
@@ -22,7 +22,7 @@ func init() {
 
 
 //不需要授权的基类
 //不需要授权的基类
 type BaseCommon struct {
 type BaseCommon struct {
-	beego.Controller
+	web.Controller
 	Response
 	Response
 }
 }
 
 

+ 11 - 11
main.go

@@ -2,36 +2,36 @@ package main
 
 
 import (
 import (
 	"fmt"
 	"fmt"
-	"github.com/astaxie/beego/context"
-	"github.com/astaxie/beego/logs"
+	"github.com/beego/beego/v2/adapter/logs"
+	"github.com/beego/beego/v2/server/web/context"
 	"hongze/hongze_mobile_admin/models"
 	"hongze/hongze_mobile_admin/models"
 	_ "hongze/hongze_mobile_admin/routers"
 	_ "hongze/hongze_mobile_admin/routers"
 	"hongze/hongze_mobile_admin/utils"
 	"hongze/hongze_mobile_admin/utils"
 	"runtime"
 	"runtime"
 	"time"
 	"time"
 
 
-	"github.com/astaxie/beego"
+	"github.com/beego/beego/v2/server/web"
 )
 )
 
 
 func main() {
 func main() {
-	if beego.BConfig.RunMode == "dev" {
-		beego.BConfig.WebConfig.DirectoryIndex = true
-		beego.BConfig.WebConfig.StaticDir["/swagger"] = "swagger"
+	if web.BConfig.RunMode == "dev" {
+		web.BConfig.WebConfig.DirectoryIndex = true
+		web.BConfig.WebConfig.StaticDir["/swagger"] = "swagger"
 	}
 	}
 
 
-	beego.BConfig.RecoverFunc = Recover
+	web.BConfig.RecoverFunc = Recover
 	//数据库初始化
 	//数据库初始化
 	models.InitDb()
 	models.InitDb()
-	beego.Run()
+	web.Run()
 }
 }
 
 
 //异常处理
 //异常处理
-func Recover(ctx *context.Context) {
+func Recover(ctx *context.Context, config *web.Config) {
 	if err := recover(); err != nil {
 	if err := recover(); err != nil {
-		if err == beego.ErrAbort {
+		if err == web.ErrAbort {
 			return
 			return
 		}
 		}
-		if !beego.BConfig.RecoverPanic {
+		if !web.BConfig.RecoverPanic {
 			panic(err)
 			panic(err)
 		}
 		}
 		stack := ""
 		stack := ""

+ 12 - 12
routers/router.go

@@ -9,40 +9,40 @@
 package routers
 package routers
 
 
 import (
 import (
-	"github.com/astaxie/beego/plugins/cors"
+	"github.com/beego/beego/v2/server/web/filter/cors"
 	"hongze/hongze_mobile_admin/controllers"
 	"hongze/hongze_mobile_admin/controllers"
 
 
-	"github.com/astaxie/beego"
+	"github.com/beego/beego/v2/server/web"
 )
 )
 
 
 func init() {
 func init() {
 	//解决跨域问题
 	//解决跨域问题
-	beego.InsertFilter("*", beego.BeforeRouter, cors.Allow(&cors.Options{
+	web.InsertFilter("*", web.BeforeRouter, cors.Allow(&cors.Options{
 		AllowAllOrigins:  true,
 		AllowAllOrigins:  true,
 		AllowMethods:     []string{"GET", "POST", "PUT", "DELETE", "OPTIONS"},
 		AllowMethods:     []string{"GET", "POST", "PUT", "DELETE", "OPTIONS"},
 		AllowHeaders:     []string{"Origin", "Authorization", "Access-Control-Allow-Origin", "Access-Control-Allow-Headers", "Content-Type"},
 		AllowHeaders:     []string{"Origin", "Authorization", "Access-Control-Allow-Origin", "Access-Control-Allow-Headers", "Content-Type"},
 		ExposeHeaders:    []string{"Content-Length", "Access-Control-Allow-Origin", "Access-Control-Allow-Headers", "Content-Type"},
 		ExposeHeaders:    []string{"Content-Length", "Access-Control-Allow-Origin", "Access-Control-Allow-Headers", "Content-Type"},
 		AllowCredentials: true,
 		AllowCredentials: true,
 	}))
 	}))
-	ns := beego.NewNamespace("/h5adminapi",
-		beego.NSNamespace("/wechat",
-			beego.NSInclude(
+	ns := web.NewNamespace("/h5adminapi",
+		web.NSNamespace("/wechat",
+			web.NSInclude(
 				&controllers.WeChatCommon{},
 				&controllers.WeChatCommon{},
 			),
 			),
 		),
 		),
-		beego.NSNamespace("/admin",
-			beego.NSInclude(
+		web.NSNamespace("/admin",
+			web.NSInclude(
 				&controllers.AdminCommon{},
 				&controllers.AdminCommon{},
 			),
 			),
 		),
 		),
-		beego.NSNamespace("/approval",
-			beego.NSInclude(
+		web.NSNamespace("/approval",
+			web.NSInclude(
 				&controllers.ApprovalCommon{},
 				&controllers.ApprovalCommon{},
 			),
 			),
 		),
 		),
-		beego.NSInclude(
+		web.NSInclude(
 			&controllers.ContractCommon{},
 			&controllers.ContractCommon{},
 		),
 		),
 	)
 	)
-	beego.AddNamespace(ns)
+	web.AddNamespace(ns)
 }
 }

+ 8 - 4
utils/config.go

@@ -2,8 +2,8 @@ package utils
 
 
 import (
 import (
 	"fmt"
 	"fmt"
-	"github.com/astaxie/beego"
-	"github.com/astaxie/beego/logs"
+	"github.com/beego/beego/v2/core/logs"
+	"github.com/beego/beego/v2/server/web"
 )
 )
 
 
 var (
 var (
@@ -24,9 +24,13 @@ var (
 )
 )
 
 
 func init() {
 func init() {
-	RunMode = beego.AppConfig.String("run_mode")
+	tmpRunMode, err := web.AppConfig.String("run_mode")
+	if err != nil {
+		panic("配置文件读取run_mode错误 " + err.Error())
+	}
+	RunMode = tmpRunMode
 	fmt.Println(RunMode, "模式")
 	fmt.Println(RunMode, "模式")
-	config, err := beego.AppConfig.GetSection(RunMode)
+	config, err := web.AppConfig.GetSection(RunMode)
 	if err != nil {
 	if err != nil {
 		panic("配置文件读取错误 " + err.Error())
 		panic("配置文件读取错误 " + err.Error())
 	}
 	}

+ 1 - 1
utils/email.go

@@ -30,4 +30,4 @@ func SendEmail(title, content string, touser string)bool {
 		return false
 		return false
 	}
 	}
 	return true
 	return true
-}
+}

+ 1 - 1
utils/logs.go

@@ -1,7 +1,7 @@
 package utils
 package utils
 
 
 import (
 import (
-	"github.com/astaxie/beego/logs"
+	"github.com/beego/beego/v2/adapter/logs"
 )
 )
 
 
 var FileLog *logs.BeeLogger
 var FileLog *logs.BeeLogger

+ 1 - 1
utils/validator.go

@@ -241,4 +241,4 @@ func getVerifyErrInfo(errType string,lang string) (errInfo string) {
 		}
 		}
 	}
 	}
 	return
 	return
-}
+}