Merge branch 'cygx_check_table' of http://8.136.199.33:3000/hongze/hongze_open_api into debug

controllers/chart.go

@@ -3,7 +3,7 @@ package controllers
 import (
 	"encoding/json"
 	"hongze/hongze_open_api/models/request/chart"
-	celuePushTable "hongze/hongze_open_api/models/tables/cygx_chart"
+	celuePushTable "hongze/hongze_open_api/models/tables/cygx/cygx_chart"
 	"hongze/hongze_open_api/utils"
 	"time"
 )

controllers/report.go

@@ -6,7 +6,7 @@ import (
 	"hongze/hongze_open_api/logic"
 	"hongze/hongze_open_api/models/request/article"
 	"hongze/hongze_open_api/models/response/report"
-	celuePushTable "hongze/hongze_open_api/models/tables/article"
+	celuePushTable "hongze/hongze_open_api/models/tables/cygx/article"
 	"hongze/hongze_open_api/models/tables/rddp/classify"
 	tables "hongze/hongze_open_api/models/tables/report"
 	"hongze/hongze_open_api/models/tables/wx_user"

controllers/yidong.go

@@ -5,7 +5,8 @@ import (
 	"fmt"
 	"hongze/hongze_open_api/models/request/yidong"
 	"hongze/hongze_open_api/models/tables/company_product"
-	cygxActivity "hongze/hongze_open_api/models/tables/cygx_activity"
+	cygxActivity "hongze/hongze_open_api/models/tables/cygx/cygx_activity"
+	"hongze/hongze_open_api/models/tables/cygx/cygx_three_api_log"
 	"hongze/hongze_open_api/services/alarm_msg"
 	servicesYidong "hongze/hongze_open_api/services/yidong"
 	"hongze/hongze_open_api/utils"
@@ -400,5 +401,18 @@ func (c *YiDongController) UserCheck() {
 	if total > 0 {
 		resp.Haspermission = true
 	}
+	//添加请求日志记录
+	itemApiLog := new(cygx_three_api_log.CygxThreeApiLog)
+	itemApiLog.CreateTime = time.Now()
+	itemApiLog.Source = 2
+	itemApiLog.Url = c.Ctx.Input.URI()
+	data, _ := json.Marshal(req)
+	jsonstr := string(data)
+	itemApiLog.Body = fmt.Sprint(jsonstr, "deMobile=", deMobile)
+	itemApiLog.Result = fmt.Sprint(resp)
+	_, errlog := cygx_three_api_log.AddCygxThreeApiLog(itemApiLog)
+	if errlog != nil {
+		go alarm_msg.SendAlarmMsg("易董校验用户是否有对应权限日志记录失败 AddCygxThreeApiLog："+errlog.Error()+fmt.Sprint(req, "deMobile=", deMobile), 3)
+	}
 	c.OkDetailed(resp, "获取成功")
 }

models/db_init.go

@@ -5,11 +5,12 @@ import (
 	_ "github.com/go-sql-driver/mysql"
 	"hongze/hongze_open_api/models/tables"
 	"hongze/hongze_open_api/models/tables/admin"
-	"hongze/hongze_open_api/models/tables/article"
 	"hongze/hongze_open_api/models/tables/company"
 	"hongze/hongze_open_api/models/tables/company_product"
-	"hongze/hongze_open_api/models/tables/cygx_activity"
-	"hongze/hongze_open_api/models/tables/cygx_chart"
+	"hongze/hongze_open_api/models/tables/cygx/article"
+	"hongze/hongze_open_api/models/tables/cygx/cygx_activity"
+	"hongze/hongze_open_api/models/tables/cygx/cygx_chart"
+	"hongze/hongze_open_api/models/tables/cygx/cygx_three_api_log"
 	"hongze/hongze_open_api/models/tables/day_new"
 	"hongze/hongze_open_api/models/tables/open_api_user"
 	"hongze/hongze_open_api/models/tables/qs_event"
@@ -36,6 +37,13 @@ func init() {
 	report_db, _ := orm.GetDB("rddp")
 	report_db.SetConnMaxLifetime(10 * time.Minute)
 
+	_ = orm.RegisterDataBase("hz_cygx", "mysql", utils.MYSQL_URL_CYGX)
+	orm.SetMaxIdleConns("hz_cygx", 50)
+	orm.SetMaxOpenConns("hz_cygx", 100)
+
+	cygx_db, _ := orm.GetDB("hz_cygx")
+	cygx_db.SetConnMaxLifetime(10 * time.Minute)
+
 	//注册对象
 	orm.RegisterModel(
 		new(open_api_user.OpenApiUser),                     //开放API用户表
@@ -46,6 +54,7 @@ func init() {
 		new(cygx_activity.CygxYidongActivitySignupLog),     //易董报名记录日志
 		new(cygx_activity.CygxYidongActivityExamineStatus), //易董审核记录日志
 		new(cygx_activity.CygxMySchedule),                  //易董审核通过之后添加我的日程
+		new(cygx_three_api_log.CygxThreeApiLog),            //易董审核通过之后添加我的日程
 	)
 	orm.Debug = true
 	orm.DebugLog = orm.NewLog(utils.Binlog)

models/tables/article/cygx_article_celue_push.go → models/tables/cygx/article/cygx_article_celue_push.go

@@ -16,7 +16,7 @@ type CygxArticleCeluePush struct {
 
 // 新增
 func AddCygxArticleCeluePush(item *CygxArticleCeluePush) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	_, err = o.Insert(item)
 	return
 }

models/tables/cygx_activity/cygx_activity.go → models/tables/cygx/cygx_activity/cygx_activity.go

@@ -85,7 +85,7 @@ type CygxYidongActivityExamineStatus struct {
 
 // 通过ID获取活动详情
 func GetAddActivityInfoById(activityIdYiDong string) (item *CygxActivity, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT
 			a.*
 		FROM
@@ -104,7 +104,7 @@ type ExamineStatusReq struct {
 
 // UpdateActivitySignupNumMulti 批量修改易董报名用户审核状态
 func UpdateActivitySignupNumMulti(items []*ExamineStatusReq) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	p, err := o.Raw("UPDATE cygx_activity_signup SET yidong_examine_status = ? WHERE mobile = ? AND activity_id = ? ").Prepare()
 	if err != nil {
 		return
@@ -126,7 +126,7 @@ func UpdateActivitySignupNumMulti(items []*ExamineStatusReq) (err error) {
 
 // AddActivitySignupNumMulti 批量新增易董报名用户审核状态
 func AddActivitySignupNumMulti(items []*CygxActivitySignup) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	if len(items) > 0 {
 		//批量新增易董报名用户审核状态
 		_, err = o.InsertMulti(len(items), items)
@@ -136,7 +136,7 @@ func AddActivitySignupNumMulti(items []*CygxActivitySignup) (err error) {
 
 // GetActivitySignupListByActivity获取已经报名了的用户列表
 func GetActivitySignupListByActivity(activityId int) (items []*CygxActivitySignup, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT * FROM cygx_activity_signup WHERE activity_id = ?`
 	_, err = o.Raw(sql, activityId).QueryRows(&items)
 	return
@@ -174,7 +174,7 @@ type CygxYidongActivitySignupLog struct {
 
 // AddCygxYidongActivitySignup 记录易董传过来的报名信息
 func AddCygxYidongActivitySignupLog(item *CygxYidongActivitySignupLog) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	_, err = o.Insert(item)
 	return
 }
@@ -200,7 +200,7 @@ func GetAddActivityInfoByMobile(mobile string) (item *CygxYidongActivitySignupRe
 
 // AddActivityItemsLogNumMulti 记录审核日志
 func AddActivityItemsLogNumMulti(items []*CygxYidongActivityExamineStatus) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	if len(items) > 0 {
 		//批量添加记录审核日志
 		_, err = o.InsertMulti(len(items), items)
@@ -222,7 +222,7 @@ type CygxMySchedule struct {
 
 // GetCygxMyScheduleList 获取我的日程数据
 func GetCygxMyScheduleList(activityId int) (items []*CygxMySchedule, err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := `SELECT * FROM cygx_my_schedule WHERE activity_id = ?`
 	_, err = o.Raw(sql, activityId).QueryRows(&items)
 	return
@@ -230,7 +230,7 @@ func GetCygxMyScheduleList(activityId int) (items []*CygxMySchedule, err error)
 
 // AddCygxMyScheduleLNumMulti 添加我的日程
 func AddCygxMyScheduleLNumMulti(items []*CygxMySchedule) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	if len(items) > 0 {
 		//添加我的日程
 		_, err = o.InsertMulti(len(items), items)
@@ -240,7 +240,7 @@ func AddCygxMyScheduleLNumMulti(items []*CygxMySchedule) (err error) {
 
 // DelCygxMyScheduleList 删除我的日程
 func DelCygxMyScheduleList(mobile string, activityId int) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := ` DELETE  FROM cygx_my_schedule   WHERE mobile IN (` + mobile + `)  AND activity_id=?`
 	_, err = o.Raw(sql, activityId).Exec()
 	return
@@ -248,7 +248,7 @@ func DelCygxMyScheduleList(mobile string, activityId int) (err error) {
 
 // DelCygxcActivitySignup 删除我的报名信息
 func DelCygxcActivitySignup(mobile string, activityId int) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	sql := ` DELETE  FROM cygx_activity_signup   WHERE mobile IN (` + mobile + `)  AND activity_id=?`
 	_, err = o.Raw(sql, activityId).Exec()
 	return

models/tables/cygx_chart/cygx_chart_celue_push.go → models/tables/cygx/cygx_chart/cygx_chart_celue_push.go

@@ -16,7 +16,7 @@ type CygxChartCeluePush struct {
 
 // 新增
 func AddCygxChartCeluePush(item *CygxChartCeluePush) (err error) {
-	o := orm.NewOrm()
+	o := orm.NewOrmUsingDB("hz_cygx")
 	_, err = o.Insert(item)
 	return
 }

models/tables/cygx/cygx_three_api_log/cygx_three_api_log.go

@@ -0,0 +1,22 @@
+package cygx_three_api_log
+
+import (
+	"github.com/beego/beego/v2/client/orm"
+	"time"
+)
+
+type CygxThreeApiLog struct {
+	Id         int       `orm:"column(id);pk"`
+	Url        string    `description:"链接"`
+	Body       string    `description:"请求参数"`
+	Result     string    `description:"返回参数"`
+	CreateTime time.Time `description:"活动模板，带P标签"`
+	Source     int       `description:"来源1，易董"`
+}
+
+// 添加日志记录
+func AddCygxThreeApiLog(item *CygxThreeApiLog) (lastId int64, err error) {
+	o := orm.NewOrmUsingDB("hz_cygx")
+	lastId, err = o.Insert(item)
+	return
+}

utils/config.go

@@ -12,6 +12,7 @@ var (
 	RunMode        string //运行模式
 	MYSQL_URL      string //数据库连接
 	MYSQL_URL_RDDP string //数据库连接
+	MYSQL_URL_CYGX string // 查研观向
 
 	REDIS_CACHE string       //缓存地址
 	Rc          *cache.Cache //redis缓存
@@ -81,6 +82,7 @@ func init() {
 	logs.Info(RunMode + " 模式")
 	MYSQL_URL = config["mysql_url"]
 	MYSQL_URL_RDDP = config["mysql_url_rddp"]
+	MYSQL_URL_CYGX = config["mysql_url_cygx"]
 
 	// 初始化redis
 	REDIS_CACHE = config["beego_cache"]