xingzai 3 tahun lalu
induk
melakukan
d08db800a6
8 mengubah file dengan 47 tambahan dan 47 penghapusan
  1. 1 1
      controllers/base_auth.go
  2. 1 1
      controllers/base_common.go
  3. 11 11
      main.go
  4. 29 29
      routers/router.go
  5. 2 2
      services/task.go
  6. 1 1
      utils/config.go
  7. 1 1
      utils/jwt.go
  8. 1 1
      utils/logs.go

+ 1 - 1
controllers/base_auth.go

@@ -3,7 +3,7 @@ package controllers
 import (
 	"encoding/json"
 	"fmt"
-	"github.com/astaxie/beego"
+	beego "github.com/beego/beego/v2/adapter"
 	"hongze/hongze_cygx/services"
 	"net/http"
 	"net/url"

+ 1 - 1
controllers/base_common.go

@@ -6,7 +6,7 @@ import (
 	"net/url"
 	"strings"
 
-	"github.com/astaxie/beego"
+	beego "github.com/beego/beego/v2/adapter"
 
 	"hongze/hongze_cygx/models"
 	"hongze/hongze_cygx/utils"

+ 11 - 11
main.go

@@ -2,34 +2,34 @@ package main
 
 import (
 	"fmt"
-	"github.com/astaxie/beego/logs"
+	"github.com/beego/beego/v2/adapter/logs"
 	_ "hongze/hongze_cygx/routers"
 	"hongze/hongze_cygx/services"
 	"hongze/hongze_cygx/utils"
 	"runtime"
 	"time"
 
-	"github.com/astaxie/beego"
-	"github.com/astaxie/beego/context"
+	"github.com/beego/beego/v2/server/web"
+	"github.com/beego/beego/v2/server/web/context"
 )
 
 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"
 	}
 	go services.Task()
 
-	beego.BConfig.RecoverFunc = Recover
-	beego.Run()
+	web.BConfig.RecoverFunc = Recover
+	web.Run()
 }
 
-func Recover(ctx *context.Context) {
+func Recover(ctx *context.Context, config *web.Config) {
 	if err := recover(); err != nil {
-		if err == beego.ErrAbort {
+		if err == web.ErrAbort {
 			return
 		}
-		if !beego.BConfig.RecoverPanic {
+		if !web.BConfig.RecoverPanic {
 			panic(err)
 		}
 		stack := ""

+ 29 - 29
routers/router.go

@@ -8,13 +8,13 @@
 package routers
 
 import (
-	"github.com/astaxie/beego"
-	"github.com/astaxie/beego/plugins/cors"
+	"github.com/beego/beego/v2/server/web"
+	"github.com/beego/beego/v2/server/web/filter/cors"
 	"hongze/hongze_cygx/controllers"
 )
 
 func init() {
-	beego.InsertFilter("*", beego.BeforeRouter, cors.Allow(&cors.Options{
+	web.InsertFilter("*", web.BeforeRouter, cors.Allow(&cors.Options{
 		AllowAllOrigins:  true,
 		AllowMethods:     []string{"GET", "POST", "PUT", "DELETE", "OPTIONS"},
 		AllowHeaders:     []string{"Origin", "Account", "Authorization", "Access-Control-Allow-Origin", "Access-Control-Allow-Headers", "Content-Type"},
@@ -22,71 +22,71 @@ func init() {
 		AllowCredentials: true,
 	}))
 
-	ns := beego.NewNamespace("/api",
-		beego.NSNamespace("/home",
-			beego.NSInclude(
+	ns := web.NewNamespace("/api",
+		web.NSNamespace("/home",
+			web.NSInclude(
 				&controllers.HomeController{},
 			),
 		),
-		beego.NSNamespace("/wechat",
-			beego.NSInclude(
+		web.NSNamespace("/wechat",
+			web.NSInclude(
 				&controllers.WechatController{},
 				&controllers.WechatCommonController{},
 			),
 		),
-		beego.NSNamespace("/user",
-			beego.NSInclude(
+		web.NSNamespace("/user",
+			web.NSInclude(
 				&controllers.UserController{},
 			),
 		),
-		beego.NSNamespace("/permission",
-			beego.NSInclude(
+		web.NSNamespace("/permission",
+			web.NSInclude(
 				&controllers.ChartPermissionController{},
 				&controllers.ChartPermissionAuthController{},
 			),
 		),
-		beego.NSNamespace("/article",
-			beego.NSInclude(
+		web.NSNamespace("/article",
+			web.NSInclude(
 				&controllers.ArticleController{},
 				&controllers.ArticleCommonController{},
 			),
 		),
-		beego.NSNamespace("/config",
-			beego.NSInclude(
+		web.NSNamespace("/config",
+			web.NSInclude(
 				&controllers.ConfigController{},
 			),
 		),
-		beego.NSNamespace("/search",
-			beego.NSInclude(
+		web.NSNamespace("/search",
+			web.NSInclude(
 				&controllers.SearchController{},
 			),
 		),
-		beego.NSNamespace("/resource",
-			beego.NSInclude(
+		web.NSNamespace("/resource",
+			web.NSInclude(
 				&controllers.ResourceController{},
 			),
 		),
-		beego.NSNamespace("/advice",
-			beego.NSInclude(
+		web.NSNamespace("/advice",
+			web.NSInclude(
 				&controllers.AdviceController{},
 			),
 		),
-		beego.NSNamespace("/tactics",
-			beego.NSInclude(
+		web.NSNamespace("/tactics",
+			web.NSInclude(
 				&controllers.TacticsController{},
 			),
 		),
-		beego.NSNamespace("/report",
-			beego.NSInclude(
+		web.NSNamespace("/report",
+			web.NSInclude(
 				&controllers.ReportController{},
 			),
 		),
-		beego.NSNamespace("/activity",
-			beego.NSInclude(
+		web.NSNamespace("/activity",
+			web.NSInclude(
 				&controllers.ActivityCoAntroller{},
 				&controllers.ActivityABaseController{},
 			),
 		),
 	)
-	beego.AddNamespace(ns)
+	web.AddNamespace(ns)
 }

+ 2 - 2
services/task.go

@@ -3,14 +3,14 @@ package services
 import (
 	"fmt"
 	"github.com/PuerkitoBio/goquery"
-	"github.com/astaxie/beego/toolbox"
+	"github.com/beego/beego/v2/adapter/toolbox"
 	"hongze/hongze_cygx/models"
 	"hongze/hongze_cygx/utils"
 	"html"
 	"strconv"
 	"strings"
 	"time"
-	//"github.com/astaxie/beego/cache"
+	//"github.com/beego/beego/v2/adapter/cache"
 )
 
 func Task() {

+ 1 - 1
utils/config.go

@@ -2,7 +2,7 @@ package utils
 
 import (
 	"fmt"
-	"github.com/astaxie/beego"
+	beego "github.com/beego/beego/v2/adapter"
 	"rdluck_tools/cache"
 )
 

+ 1 - 1
utils/jwt.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/astaxie/beego/logs"
+	"github.com/beego/beego/v2/adapter/logs"
 	"github.com/dgrijalva/jwt-go"
 )
 

+ 1 - 1
utils/logs.go

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