Merge branch 'update_bee' of hongze/hongze_api into master

controllers/base_auth.go

@@ -3,11 +3,11 @@ package controllers
 import (
 	"encoding/json"
 	"fmt"
+	"github.com/beego/beego/v2/server/web"
 	"hongze/hongze_api/services"
 	"net/http"
 	"net/url"
 	"strconv"
-	"github.com/astaxie/beego"
 
 	"hongze/hongze_api/models"
 	"hongze/hongze_api/utils"
@@ -27,8 +27,8 @@ func init() {
 }
 
 type BaseAuthController struct {
-	beego.Controller
-	User *models.WxUserItem
+	web.Controller
+	User  *models.WxUserItem
 	Token string
 }
 
@@ -45,7 +45,7 @@ func (this *BaseAuthController) Prepare() {
 				utils.FileLog.Info("authorization:%s,cookie:%s", authorization, cookie)
 				authorization = cookie
 			}
-			this.Token=authorization
+			this.Token = authorization
 			if authorization == "" {
 				this.JSON(models.BaseResponse{Ret: 408, Msg: "请重新授权！", ErrMsg: "请重新授权:Token is empty or account is empty"}, false, false)
 				this.StopRun()
@@ -68,15 +68,15 @@ func (this *BaseAuthController) Prepare() {
 				return
 			}
 			var wxUser *models.WxUserItem
-			if session.OpenId != ""{
+			if session.OpenId != "" {
 				tmpWxUser, tmpErr := services.GetWxUserItemByOpenId(session.OpenId)
 				wxUser = tmpWxUser
 				err = tmpErr
-			}else if session.UserId > 0{
-				tmpWxUser, tmpErr := services.GetWxUserItemByUserId(session.UserId,utils.WxPcPlatform)
+			} else if session.UserId > 0 {
+				tmpWxUser, tmpErr := services.GetWxUserItemByUserId(session.UserId, utils.WxPcPlatform)
 				wxUser = tmpWxUser
 				err = tmpErr
-			}else {
+			} else {
 				this.JSON(models.BaseResponse{Ret: 408, Msg: "数据异常!", ErrMsg: "sesson is empty "}, false, false)
 				this.StopRun()
 				return
@@ -85,7 +85,7 @@ func (this *BaseAuthController) Prepare() {
 			//wxUser, err := services.GetWxUserItemByOpenId(session.OpenId)
 			if err != nil {
 				//用户openid查询出来发现没有绑定用户
-				if err == services.ERR_USER_NOT_BIND{
+				if err == services.ERR_USER_NOT_BIND {
 					this.JSON(models.BaseResponse{Ret: 408, Msg: "信息已变更,请重新登陆！", ErrMsg: "获取admin 信息失败 " + strconv.Itoa(session.UserId)}, false, false)
 					//this.StopRun()
 					this.User = wxUser
@@ -121,7 +121,7 @@ func (c *BaseAuthController) ServeJSON(encoding ...bool) {
 		hasIndent   = false
 		hasEncoding = false
 	)
-	if beego.BConfig.RunMode == beego.PROD {
+	if web.BConfig.RunMode == web.PROD {
 		hasIndent = false
 	}
 	if len(encoding) > 0 && encoding[0] == true {

controllers/base_common.go

@@ -8,14 +8,14 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/astaxie/beego"
+	"github.com/beego/beego/v2/server/web"
 
 	"hongze/hongze_api/models"
 	"hongze/hongze_api/utils"
 )
 
 type BaseCommonController struct {
-	beego.Controller
+	web.Controller
 	User  *models.WxUserItem
 	Token string
 }
@@ -61,15 +61,15 @@ func (this *BaseCommonController) Prepare() {
 		}
 
 		var wxUser *models.WxUserItem
-		if session.UserId > 0{
-			tmpWxUser, tmpErr := services.GetWxUserItemByUserId(session.UserId,utils.WxPcPlatform)
+		if session.UserId > 0 {
+			tmpWxUser, tmpErr := services.GetWxUserItemByUserId(session.UserId, utils.WxPcPlatform)
 			wxUser = tmpWxUser
 			err = tmpErr
-		}else if session.OpenId != ""{
+		} else if session.OpenId != "" {
 			tmpWxUser, tmpErr := services.GetWxUserItemByOpenId(session.OpenId)
 			wxUser = tmpWxUser
 			err = tmpErr
-		}else{
+		} else {
 			this.JSON(models.BaseResponse{Ret: 408, Msg: "数据异常!", ErrMsg: "sesson is empty "}, false, false)
 			this.StopRun()
 			return
@@ -102,7 +102,7 @@ func (c *BaseCommonController) ServeJSON(encoding ...bool) {
 		hasIndent   = false
 		hasEncoding = false
 	)
-	if beego.BConfig.RunMode == beego.PROD {
+	if web.BConfig.RunMode == web.PROD {
 		hasIndent = false
 	}
 	if len(encoding) > 0 && encoding[0] == true {

controllers/base_not_auth.go

@@ -8,14 +8,14 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/astaxie/beego"
+	"github.com/beego/beego/v2/server/web"
 
 	"hongze/hongze_api/models"
 	"hongze/hongze_api/utils"
 )
 
 type BaseNotAuthController struct {
-	beego.Controller
+	web.Controller
 	User  *models.WxUserItem
 	Token string
 }
@@ -70,7 +70,7 @@ func (this *BaseNotAuthController) Prepare() {
 			}
 
 			//用户openid没有绑定用户
-			if err != services.ERR_USER_NOT_BIND{
+			if err != services.ERR_USER_NOT_BIND {
 				this.JSON(models.BaseResponse{Ret: 408, Msg: "信息已变更,请重新登陆！", ErrMsg: "获取admin 信息失败 " + strconv.Itoa(session.UserId)}, false, false)
 				this.StopRun()
 				return
@@ -91,7 +91,7 @@ func (c *BaseNotAuthController) ServeJSON(encoding ...bool) {
 		hasIndent   = false
 		hasEncoding = false
 	)
-	if beego.BConfig.RunMode == beego.PROD {
+	if web.BConfig.RunMode == web.PROD {
 		hasIndent = false
 	}
 	if len(encoding) > 0 && encoding[0] == true {

controllers/base_pc_not_auth.go

@@ -8,14 +8,14 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/astaxie/beego"
+	"github.com/beego/beego/v2/server/web"
 
 	"hongze/hongze_api/models"
 	"hongze/hongze_api/utils"
 )
 
 type BasePcNotAuthController struct {
-	beego.Controller
+	web.Controller
 	User  *models.WxUserItem
 	Token string
 }
@@ -61,15 +61,15 @@ func (this *BasePcNotAuthController) Prepare() {
 		}
 
 		var wxUser *models.WxUserItem
-		if session.UserId > 0{
-			tmpWxUser, tmpErr := services.GetWxUserItemByUserId(session.UserId,utils.WxPcPlatform)
+		if session.UserId > 0 {
+			tmpWxUser, tmpErr := services.GetWxUserItemByUserId(session.UserId, utils.WxPcPlatform)
 			wxUser = tmpWxUser
 			err = tmpErr
-		}else if session.OpenId != ""{
+		} else if session.OpenId != "" {
 			tmpWxUser, tmpErr := services.GetWxUserItemByOpenId(session.OpenId)
 			wxUser = tmpWxUser
 			err = tmpErr
-		}else{
+		} else {
 			this.JSON(models.BaseResponse{Ret: 408, Msg: "数据异常!", ErrMsg: "sesson is empty "}, false, false)
 			this.StopRun()
 			return
@@ -84,7 +84,7 @@ func (this *BasePcNotAuthController) Prepare() {
 			}
 
 			//用户openid没有绑定用户
-			if err != services.ERR_USER_NOT_BIND{
+			if err != services.ERR_USER_NOT_BIND {
 				this.JSON(models.BaseResponse{Ret: 408, Msg: "信息已变更,请重新登陆！", ErrMsg: "获取admin 信息失败 " + strconv.Itoa(session.UserId)}, false, false)
 				this.StopRun()
 				return
@@ -105,7 +105,7 @@ func (c *BasePcNotAuthController) ServeJSON(encoding ...bool) {
 		hasIndent   = false
 		hasEncoding = false
 	)
-	if beego.BConfig.RunMode == beego.PROD {
+	if web.BConfig.RunMode == web.PROD {
 		hasIndent = false
 	}
 	if len(encoding) > 0 && encoding[0] == true {

controllers/classify.go

@@ -108,4 +108,4 @@ func (this *ClassifyCommonController) SecondList() {
 	br.Success = true
 	br.Msg = "获取数据成功"
 	br.Data = item
-}
+}

controllers/report_share.go

@@ -45,4 +45,4 @@ func (this *ReportShareController) Detail() {
 	br.Success = true
 	br.Msg = "获取成功"
 	br.Data = resp
-}
+}

main.go

@@ -9,27 +9,27 @@ import (
 	_ "hongze/hongze_api/routers"
 	"hongze/hongze_api/utils"
 
-	"github.com/astaxie/beego"
-	"github.com/astaxie/beego/context"
-	"github.com/astaxie/beego/logs"
+	"github.com/beego/beego/v2/core/logs"
+	"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 := ""

models/annual_report.go

@@ -42,4 +42,4 @@ func AddAnnualReport(item *AnnualReport) (lastId int64, err error) {
 	o := orm.NewOrm()
 	lastId, err = o.Insert(item)
 	return
-}
+}

models/base.go

@@ -32,4 +32,4 @@ func (r *BaseResponse) Init() *BaseResponse {
 
 type RunLogReq struct {
 	RunMsg string
-}
+}

models/bill.go

@@ -535,4 +535,4 @@ func GetAnnualReportCount(userId int)(count int,err error)  {
 	sql := `SELECT COUNT(1) AS count FROM annual_report WHERE user_id=? `
 	err = o.Raw(sql, userId).QueryRow(&count)
 	return
-}
+}

models/customer_comment.go

@@ -17,4 +17,4 @@ func GetCustomerComment() (item []*CustomerComment, err error) {
 	o.Using("rddp")
 	_, err = o.Raw(sql).QueryRows(&item)
 	return
-}
+}

models/db.go

@@ -47,4 +47,4 @@ func init() {
 		new(WxUserCode),
 		new(UserRecord),
 	)
-}
+}

models/paging.go

@@ -63,4 +63,4 @@ func GetPaging(currentIndex,pageSize,total int)(item *PagingItem)  {
 	item.PreviousIndex=currentIndex-1
 	item.NextIndex=currentIndex+1
 	return
-}
+}

models/report_pc.go

@@ -65,4 +65,4 @@ func GetSearchReportList(condition string) (items []*ReportList, err error) {
 type PcSearchReportListResp struct {
 	List []*ReportList
 	Paging *paging.PagingItem
-}
+}

models/report_view_log.go

@@ -18,4 +18,4 @@ func AddReportViewLog(item *ReportViewLog) (err error) {
 	o.Using("rddp")
 	_, err = o.Insert(item)
 	return
-}
+}

models/session.go

@@ -63,4 +63,4 @@ func UpdateSession(sessionId,userId int,expireTime time.Time) (err error) {
 	o.Using("rddp")
 	_,err = o.Raw(sql, userId,expireTime,sessionId).Exec()
 	return
-}
+}

models/wx_token_pc.go

@@ -21,4 +21,4 @@ func PcUpdateWxToken(token string, expiresIn int64,id int) (err error) {
 	o := orm.NewOrm()
 	_, err = o.Raw(sql, token, expiresIn,id).Exec()
 	return
-}
+}

models/wx_user_code.go

@@ -28,4 +28,4 @@ func GetWxUserCode(wxCode string)(item *WxUserCode,err error)  {
 	sql:=`SELECT * FROM wx_user_code WHERE wx_code=? `
 	err=o.Raw(sql,wxCode).QueryRow(&item)
 	return
-}
+}

routers/router.go

@@ -8,85 +8,85 @@
 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_api/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", "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"},
 		AllowCredentials: true,
 	}))
-	ns := beego.NewNamespace("/api",
-		beego.NSNamespace("/home",
-			beego.NSInclude(
+	ns := web.NewNamespace("/api",
+		web.NSNamespace("/home",
+			web.NSInclude(
 				&controllers.HomeController{},
 			),
-			beego.NSInclude(
+			web.NSInclude(
 				&controllers.HomeCommonController{},
 			),
 		),
-		beego.NSNamespace("/report",
-			beego.NSInclude(
+		web.NSNamespace("/report",
+			web.NSInclude(
 				&controllers.ReportController{},
 			),
-			beego.NSInclude(
+			web.NSInclude(
 				&controllers.ReportShareController{},
 			),
-			beego.NSInclude(
+			web.NSInclude(
 				&controllers.ReportCommonController{},
 			),
 		),
-		beego.NSNamespace("/classify",
-			beego.NSInclude(
+		web.NSNamespace("/classify",
+			web.NSInclude(
 				&controllers.ClassifyController{},
 			),
-			beego.NSInclude(
+			web.NSInclude(
 				&controllers.ClassifyCommonController{},
 			),
 		),
-		beego.NSNamespace("/wechat",
-			beego.NSInclude(
+		web.NSNamespace("/wechat",
+			web.NSInclude(
 				&controllers.WechatController{},
 			),
-			beego.NSInclude(
+			web.NSInclude(
 				&controllers.WechatCommonController{},
 			),
 		),
-		beego.NSNamespace("/user",
-			beego.NSInclude(
+		web.NSNamespace("/user",
+			web.NSInclude(
 				&controllers.UserController{},
 			),
-			beego.NSInclude(
+			web.NSInclude(
 				&controllers.UserCommonController{},
 			),
-			beego.NSInclude(
+			web.NSInclude(
 				&controllers.UserNotAuthController{},
 			),
-			beego.NSInclude(
+			web.NSInclude(
 				&controllers.UserPcNotAuthController{},
 			),
 		),
-		beego.NSNamespace("/video",
-			beego.NSInclude(
+		web.NSNamespace("/video",
+			web.NSInclude(
 				&controllers.VideoController{},
 			),
 		),
-		beego.NSNamespace("/bill",
-			beego.NSInclude(
+		web.NSNamespace("/bill",
+			web.NSInclude(
 				&controllers.BillController{},
 			),
 		),
-		beego.NSNamespace("/runlog",
-			beego.NSInclude(
+		web.NSNamespace("/runlog",
+			web.NSInclude(
 				&controllers.RunLogController{},
 			),
 		),
 	)
-	beego.AddNamespace(ns)
+	web.AddNamespace(ns)
 }

services/oss.go

@@ -64,4 +64,4 @@ func UploadAudioAliyun(filename, filepath string) (string,error) {
 	}
 	path = utils.Imghost + path
 	return path,err
-}
+}

utils/config.go

@@ -2,7 +2,8 @@ package utils
 
 import (
 	"fmt"
-	"github.com/astaxie/beego"
+	"github.com/beego/beego/v2/core/logs"
+	"github.com/beego/beego/v2/server/web"
 	"rdluck_tools/cache"
 )
 
@@ -42,12 +43,16 @@ var (
 )
 
 func init() {
-	RunMode = beego.AppConfig.String("run_mode")
-	config, err := beego.AppConfig.GetSection(RunMode)
+	tmpRunMode, err := web.AppConfig.String("run_mode")
+	if err != nil {
+		panic("配置文件读取run_mode错误 " + err.Error())
+	}
+	RunMode = tmpRunMode
+	config, err := web.AppConfig.GetSection(RunMode)
 	if err != nil {
 		panic("配置文件读取错误 " + err.Error())
 	}
-	beego.Info(RunMode + " 模式")
+	logs.Info(RunMode + " 模式")
 	MYSQL_URL = config["mysql_url"]
 	MYSQL_URL_RDDP = config["mysql_url_rddp"]
 	MYSQL_URL_EDB = config["mysql_url_edb"]

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"
 )
 

utils/logs.go

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