Merge branch 'fix_bug_beegov2' of hongze/hongze_cygx into master

controllers/activity.go

@@ -491,6 +491,31 @@ func (this *ActivityCoAntroller) Detail() {
 			}
 		}
 	}
+	if activityInfo.IsLimitPeople > 0 {
+		var noPower bool
+		if (userType == 1 || userType == 4 || userType == 5) && !strings.Contains(activityInfo.CustomerTypeIds, strconv.Itoa(userType)) {
+			noPower = true
+		}
+		//带有专家权限的 2、大套餐客户（4个行业全开通的正式客户）  3、分行业套餐客户（开通对应行业的正式客户）
+		if userType == 2 && strings.Contains(permissionStr, "专家") && !strings.Contains(activityInfo.CustomerTypeIds, strconv.Itoa(2)) && !strings.Contains(activityInfo.CustomerTypeIds, strconv.Itoa(3)) && !strings.Contains(activityInfo.CustomerTypeIds, strconv.Itoa(4)) {
+			noPower = true
+		}
+		if userType == 2 && !strings.Contains(permissionStr, "专家") && !strings.Contains(activityInfo.CustomerTypeIds, strconv.Itoa(2)) && !strings.Contains(activityInfo.CustomerTypeIds, strconv.Itoa(3)) {
+			noPower = true
+		}
+		if userType == 3 && strings.Contains(permissionStr, "专家") && !strings.Contains(activityInfo.CustomerTypeIds, strconv.Itoa(3)) && !strings.Contains(activityInfo.CustomerTypeIds, strconv.Itoa(4)) {
+			noPower = true
+		}
+		if userType == 3 && !strings.Contains(permissionStr, "专家") && !strings.Contains(activityInfo.CustomerTypeIds, strconv.Itoa(3)) {
+			noPower = true
+		}
+		if noPower {
+			br.Msg = "获取信息失败"
+			br.ErrMsg = "被分享客户不可见，获取信息失败,Err:"
+			return
+		}
+	}
+	fmt.Println("权限可见校验")
 	detail, errDetail := models.GetActivityTypeDetailById(activityInfo.ActivityTypeId)
 	if errDetail != nil {
 		br.Msg = "获取信息失败"

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"

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"

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 := ""

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

services/activity.go

@@ -1,6 +1,7 @@
 package services
 
 import (
+	"context"
 	"fmt"
 	"github.com/tealeg/xlsx"
 	"hongze/hongze_cygx/models"
@@ -13,7 +14,7 @@ import (
 )
 
 //修改活动状态
-func UpdateActivitySattus() (err error) {
+func UpdateActivitySattus(cont context.Context) (err error) {
 	defer func() {
 		if err != nil {
 			fmt.Println("同步失败，Err:", err.Error())
@@ -27,7 +28,7 @@ func UpdateActivitySattus() (err error) {
 }
 
 //推送会议开始消息提醒60分钟前
-func SendActivityBeginMsg() (err error) {
+func SendActivityBeginMsg(cont context.Context) (err error) {
 	defer func() {
 		if err != nil {
 			fmt.Println("发送失败，Err:", err.Error())
@@ -79,7 +80,7 @@ func SendActivityBeginMsg() (err error) {
 }
 
 //推送会议开始消息提醒15分钟前
-func SendActivityBeginMsgMeeting() (err error) {
+func SendActivityBeginMsgMeeting(cont context.Context) (err error) {
 	defer func() {
 		if err != nil {
 			fmt.Println("发送失败，Err:", err.Error())
@@ -124,7 +125,7 @@ func SendActivityBeginMsgMeeting() (err error) {
 }
 
 //预约外呼名单，会前1小时自动发送邮件给专家组
-func SendEmailFileToExpert() (err error) {
+func SendEmailFileToExpert(cont context.Context) (err error) {
 	var msg string
 	var touser string
 	defer func() {

services/industrial_management.go

@@ -1,13 +1,14 @@
 package services
 
 import (
+	"context"
 	"fmt"
 	"hongze/hongze_cygx/models"
 	"strings"
 )
 
 //修改标签状态
-func UpdateIndustrialManagementLabel() (err error) {
+func UpdateIndustrialManagementLabel(cont context.Context) (err error) {
 	defer func() {
 		if err != nil {
 			fmt.Println("修改失败，Err:", err.Error())

services/tactics.go

@@ -1,6 +1,7 @@
 package services
 
 import (
+	"context"
 	"fmt"
 	"github.com/PuerkitoBio/goquery"
 	"hongze/hongze_cygx/models"
@@ -284,7 +285,7 @@ func BodyAnalysis(body string) (expertNumStr, expertContentStr, interviewDateStr
 }
 
 //同步策略,报告文章
-func SyncTacticsListAddreport() (err error) {
+func SyncTacticsListAddreport(cont context.Context) (err error) {
 	defer func() {
 		if err != nil {
 			fmt.Println("同步失败，Err:", err.Error())
@@ -716,7 +717,7 @@ func BodyAnalysis2(body string) (expertNumStr, expertContentStr, interviewDateSt
 	return
 }
 
-func GetSummarytoEs() (err error) {
+func GetSummarytoEs(cont context.Context) (err error) {
 	defer func() {
 		if err != nil {
 			fmt.Println("同步失败，Err:", err.Error())

services/task.go

@@ -3,14 +3,15 @@ package services
 import (
 	"fmt"
 	"github.com/PuerkitoBio/goquery"
-	"github.com/astaxie/beego/toolbox"
+	//"github.com/beego/beego/v2/adapter/toolbox"
+	"github.com/beego/beego/v2/task"
 	"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() {
@@ -20,38 +21,37 @@ func Task() {
 		//syncTacticsList := toolbox.NewTask("syncTacticsList", "0 */5 * * * *", SyncTacticsList)
 		//toolbox.AddTask("syncTacticsList", syncTacticsList)
 		//toolbox.StartTask()
-		syncTacticsListAddreport := toolbox.NewTask("syncTacticsListAddreport", "0 */5 * * * *", SyncTacticsListAddreport)
-		toolbox.AddTask("syncTacticsListAddreport", syncTacticsListAddreport)
+		syncTacticsListAddreport := task.NewTask("syncTacticsListAddreport", "0 */5 * * * *", SyncTacticsListAddreport)
+		task.AddTask("syncTacticsListAddreport", syncTacticsListAddreport)
 
 		//同步纪要库中的Es
 		//syncTacticsListToEs := toolbox.NewTask("syncTacticsListToEs", "0 */30 * * * *", SyncTacticsListToEs)
 		//toolbox.AddTask("syncTacticsListToEs", syncTacticsListToEs)
-		getSummarytoEs := toolbox.NewTask("getSummarytoEs", "0 */30 * * * *", GetSummarytoEs) //同步纪要库内容到Es
-		toolbox.AddTask("getSummarytoEs", getSummarytoEs)
+		getSummarytoEs := task.NewTask("getSummarytoEs", "0 */30 * * * *", GetSummarytoEs) //同步纪要库内容到Es
+		task.AddTask("getSummarytoEs", getSummarytoEs)
 
 		//toolbox.StartTask()
 	}
 
 	//UpdateActivitySattus()
 	//修改任务状态
-	updateActivitySattus := toolbox.NewTask("syncTacticsListAddreport", "0 */1 8-22 * * *", UpdateActivitySattus)
-	toolbox.AddTask("updateActivitySattus", updateActivitySattus)
+	updateActivitySattus := task.NewTask("syncTacticsListAddreport", "0 */1 8-22 * * *", UpdateActivitySattus)
+	task.AddTask("updateActivitySattus", updateActivitySattus)
 	//更新深 和新的标签
-	updateIndustrialManagementLabel := toolbox.NewTask("updateIndustrialManagementLabel", "0 */30 * * * *", UpdateIndustrialManagementLabel)
-	toolbox.AddTask("updateIndustrialManagementLabel", updateIndustrialManagementLabel)
+	updateIndustrialManagementLabel := task.NewTask("updateIndustrialManagementLabel", "0 */30 * * * *", UpdateIndustrialManagementLabel)
+	task.AddTask("updateIndustrialManagementLabel", updateIndustrialManagementLabel)
 	//更新报告的搜索栏内容
 	//UpdateIndustrialManagementSubjectNnames()
 	//会议提醒模板消息推送
-	sendActivityBeginMsg := toolbox.NewTask("sendActivityBeginMsg", "0 */10 8-22 * * *", SendActivityBeginMsg) //会议前60分钟的提醒
-	toolbox.AddTask("sendActivityBeginMsg", sendActivityBeginMsg)
-	sendActivityBeginMsgMeeting := toolbox.NewTask("sendActivityBeginMsgMeeting", "0 */5 8-22 * * *", SendActivityBeginMsgMeeting) //会议前15分钟的提醒
-	toolbox.AddTask("sendActivityBeginMsgMeeting", sendActivityBeginMsgMeeting)
-
+	sendActivityBeginMsg := task.NewTask("sendActivityBeginMsg", "0 */10 8-22 * * *", SendActivityBeginMsg) //会议前60分钟的提醒
+	task.AddTask("sendActivityBeginMsg", sendActivityBeginMsg)
+	sendActivityBeginMsgMeeting := task.NewTask("sendActivityBeginMsgMeeting", "0 */5 8-22 * * *", SendActivityBeginMsgMeeting) //会议前15分钟的提醒
+	task.AddTask("sendActivityBeginMsgMeeting", sendActivityBeginMsgMeeting)
 	//预约外呼名单，会前1小时自动发送邮件给专家组
-	sendEmailFileToExpert := toolbox.NewTask("sendEmailFileToExpert", "0 */5 8-22 * * *", SendEmailFileToExpert) //预约外呼名单，会前1小时自动发送邮件给专家组
-	toolbox.AddTask("sendEmailFileToExpert", sendEmailFileToExpert)
+	sendEmailFileToExpert := task.NewTask("sendEmailFileToExpert", "0 */5 8-22 * * *", SendEmailFileToExpert) //预约外呼名单，会前1小时自动发送邮件给专家组
+	task.AddTask("sendEmailFileToExpert", sendEmailFileToExpert)
 	//UpdateActivitySattus()
-	toolbox.StartTask()
+	task.StartTask()
 	fmt.Println("end")
 }
 

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

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,6 +1,6 @@
 package utils
 
-import "github.com/astaxie/beego/logs"
+import "github.com/beego/beego/v2/adapter/logs"
 
 var FileLog *logs.BeeLogger