Merge branch 'cygx_10.7' of http://8.136.199.33:3000/hongze/hongze_task into debug

go.mod

@@ -23,6 +23,7 @@ require (
 	github.com/baiyubin/aliyun-sts-go-sdk v0.0.0-20180326062324-cfa1a18b161f // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/cespare/xxhash/v2 v2.1.1 // indirect
+	github.com/garyburd/redigo v1.6.3 // indirect
 	github.com/golang/protobuf v1.5.2 // indirect
 	github.com/hashicorp/golang-lru v0.5.4 // indirect
 	github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect

go.sum

@@ -102,6 +102,7 @@ github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5Kwzbycv
 github.com/franela/goblin v0.0.0-20200105215937-c9ffbefa60db/go.mod h1:7dvUGVsVBjqR7JHJk0brhHOZYGmfBYOrK0ZhYMEtBr4=
 github.com/franela/goreq v0.0.0-20171204163338-bcd34c9993f8/go.mod h1:ZhphrRTfi2rbfLwlschooIH4+wKKDR4Pdxhh+TRoA20=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
+github.com/garyburd/redigo v1.6.3 h1:HCeeRluvAgMusMomi1+6Y5dmFOdYV/JzoRrrbFlkGIc=
 github.com/garyburd/redigo v1.6.3/go.mod h1:rTb6epsqigu3kYKBnaF028A7Tf/Aw5s0cqA47doKKqw=
 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
 github.com/glendc/gopher-json v0.0.0-20170414221815-dc4743023d0c/go.mod h1:Gja1A+xZ9BoviGJNA2E9vFkPjjsl+CoJxSXiQM1UXtw=

services/company_product.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"fmt"
 	"hongze/hongze_task/models"
+	"hongze/hongze_task/services/cygx"
 	"hongze/hongze_task/utils"
 	"strconv"
 	"strings"
@@ -139,6 +140,11 @@ func CompanyTryOut(cont context.Context) (err error) {
 				_ = AddCompanyReportPermissionLog(v.CompanyReportPermissionId, v.CompanyId, v.ProductId, utils.AdminId, v.ProductName, utils.RealName, remark, operation, v.Status)
 			}
 		}
+
+		//正式专试用定时任务更新研选扣点
+		{
+			cygx.YanXuanCompanyApproval(v.CompanyId)
+		}
 	}
 	return
 }

services/cygx/activity_points_set.go

@@ -0,0 +1,50 @@
+package cygx
+
+import (
+	"fmt"
+	"hongze/hongze_task/services/alarm_msg"
+	"hongze/hongze_task/utils"
+	"time"
+)
+
+type YanXuanActivityPointsRedis struct {
+	UserId           int       `description:"用户ID"`
+	ComapnyId        int       `description:"公司ID"`
+	ActivityId       int       `description:"活动ID"`
+	PublishStatus    int       `description:"发布状态 1已发布，0未发布"`
+	SourceType       int       `description:"1：报名、 2：取消报名、3：活动编辑、4：活动发布，取消发布、5：活动到会、6 研选审批通过的时候研选扣点更新。"`
+	AdminId          int       `description:"管理员、销售ID"`
+	Source           int       `description:" 来源，1客户端，2后台添加, 3开发人员手动添加、4定时任务"`
+	RegisterPlatform int       `description:"来源 1小程序，2：网页"`
+	CreateTime       time.Time `description:"创建时间"`
+}
+
+//func init(){
+//	log := &YanXuanActivityPointsRedis{ComapnyId: 16, SourceType: 7, Source: 4, CreateTime: time.Now()}
+//	if utils.Re == nil {
+//		err := utils.Rc.LPush(utils.CYGX_YANXUAN_POINTS_KEY, log)
+//		if err != nil {
+//			fmt.Println("YanXuanActivityPointsRedis LPush Err:" + err.Error())
+//		}
+//	}
+//}
+
+// 7 正式专试用定时任务更新研选扣点
+func YanXuanCompanyApproval(comapnyId int) (err error) {
+	defer func() {
+		if err != nil {
+			fmt.Println(err)
+			msg := fmt.Sprint("comapnyId:", comapnyId)
+			go alarm_msg.SendAlarmMsg("正式专试用定时任务更新研选扣点，写入Redis队列消息失败："+err.Error()+msg, 2)
+		}
+	}()
+	//SourceType int       `description:"1：报名、 2：取消报名、3：活动编辑、4：活动发布，取消发布、5：活动到会。6 研选审批通过的时候研选扣点更新。7,正式专试用定时任务更新"`
+	log := &YanXuanActivityPointsRedis{ComapnyId: comapnyId, SourceType: 7, Source: 4, CreateTime: time.Now()}
+	if utils.Re == nil {
+		err := utils.Rc.LPush(utils.CYGX_YANXUAN_POINTS_KEY, log)
+		if err != nil {
+			fmt.Println("YanXuanActivityPointsRedis LPush Err:" + err.Error())
+		}
+	}
+	return
+}

utils/config.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	beego "github.com/beego/beego/v2/adapter"
 	"github.com/beego/beego/v2/server/web"
+	"github.com/rdlucklib/rdluck_tools/cache"
 )
 
 var (
@@ -14,6 +15,10 @@ var (
 	MYSQL_URL_DATA         string
 	MYSQL_URL_GL           string
 	MYSQL_URL_WEEKLY_TRIAL string // ETA试用
+
+	REDIS_CACHE string       //缓存地址
+	Rc          *cache.Cache //redis缓存
+	Re          error        //redis错误
 )
 
 var (
@@ -107,6 +112,16 @@ func init() {
 	MYSQL_URL_GL = config["mysql_url_gl"]
 	MYSQL_URL_WEEKLY_TRIAL = config["mysql_url_weekly_trial"]
 
+	REDIS_CACHE = config["beego_cache"]
+	if len(REDIS_CACHE) <= 0 {
+		panic("redis链接参数没有配置")
+	}
+	Rc, Re = cache.NewCache(REDIS_CACHE) //初始化缓存
+	if Re != nil {
+		fmt.Println(Re)
+		panic(Re)
+	}
+
 	//同花顺公钥
 	THS_PubKey = `-----BEGIN PUBLIC KEY-----
 MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqugglfCboOEfWtHlGBOW

utils/constants.go

@@ -172,3 +172,8 @@ const (
 const (
 	TEMPLATE_MSG_YB_VOICE_BROADCAST = 20 //研报语音播报
 )
+
+
+const (
+	CYGX_YANXUAN_POINTS_KEY          string = "CYGX_YANXUAN_POINTS_KEY"                                       //查研观向研选活动扣点KEY
+)