feat:日志

jyBXCore/api/init/db.go

@@ -5,7 +5,7 @@ package init
 
 import (
 	"app.yhyue.com/moapp/jybase/mongodb"
-	"github.com/zeromicro/go-zero/core/logx"
+	"log"
 	"jyBXCore/entity"
 )
 
@@ -13,11 +13,10 @@ var (
 	MgoLog mongodb.MongodbSim
 )
 
-//
 func MongoDBInit(em *entity.Mongo) {
 	//
 	if em.MgoLog.Address != "" {
-		logx.Info("--初始化 mongodb log--")
+		log.Println("--初始化 mongodb log--")
 		MgoLog = mongodb.MongodbSim{
 			MongodbAddr: em.MgoLog.Address,
 			Size:        em.MgoLog.Size,

jyBXCore/api/internal/logic/searchListLogic.go

@@ -3,6 +3,7 @@ package logic
 import (
 	"context"
 	"fmt"
+	"github.com/zeromicro/go-zero/core/logx"
 	IC "jyBXCore/api/init"
 	"jyBXCore/api/internal/svc"
 	"jyBXCore/api/internal/types"
@@ -14,7 +15,6 @@ import (
 	"time"
 
 	"app.yhyue.com/moapp/jybase/common"
-	"github.com/zeromicro/go-zero/core/logx"
 )
 
 type SearchListLogic struct {
@@ -144,7 +144,7 @@ func (l *SearchListLogic) SearchList(req *types.SearchReq) (resp *types.CommonRe
 		"search_publishtime": req.PublishTime,
 	}
 	if logId := IC.MgoLog.Save("jy_search_log", data); logId == "" {
-		logx.Info(fmt.Sprintf("保存搜索日志异常 %s", req.UserId))
+		log.Println(fmt.Sprintf("保存搜索日志异常 %s", req.UserId))
 	}
 	return &types.CommonResp{
 		Err_code: res.ErrCode,

jyBXCore/rpc/bxcore.go

@@ -6,10 +6,6 @@ import (
 	logrusx "app.yhyue.com/moapp/jylogx/logx"
 	"fmt"
 	"github.com/zeromicro/go-zero/core/logx"
-	"jyBXCore/rpc/type/bxcore"
-	"jyBXCore/rpc/util"
-	"log"
-
 	"github.com/zeromicro/go-zero/core/service"
 	"github.com/zeromicro/go-zero/zrpc"
 	"google.golang.org/grpc"
@@ -17,6 +13,9 @@ import (
 	IC "jyBXCore/rpc/init"
 	"jyBXCore/rpc/internal/server"
 	"jyBXCore/rpc/internal/svc"
+	"jyBXCore/rpc/type/bxcore"
+	"jyBXCore/rpc/util"
+	"log"
 )
 
 func main() {

jyBXCore/rpc/entity/search.go

@@ -5,7 +5,7 @@ import (
 	"app.yhyue.com/moapp/jybase/redis"
 	"encoding/json"
 	"fmt"
-	"github.com/zeromicro/go-zero/core/logx"
+	"log"
 	IC "jyBXCore/rpc/init"
 	"jyBXCore/rpc/service"
 	"jyBXCore/rpc/type/bxcore"
@@ -47,14 +47,14 @@ func (kws *KeyWordsSearch) GetBidSearchListByCache(in *bxcore.SearchReq) (list [
 		//缓存数据： SearchGroup-全部；招标信息；超前项目信息；kws.PageNum-当前页 免费用户 or 付费用户
 		redisDataKey := fmt.Sprintf(SearchCacheKey, in.SearchGroup, MC.If(in.IsPay, "v", "f").(string), MC.If(in.BidField != "", in.BidField, "n").(string), in.Platform)
 		sCache, err := redis.GetNewBytes(util.RedisNameNew, redisDataKey)
-		logx.Info("-------------------------redisDataKey--------------------------------:", redisDataKey)
+		log.Println("-------------------------redisDataKey--------------------------------:", redisDataKey)
 		if err == nil {
 			if sCache != nil && len(*sCache) > 0 {
 				err = json.Unmarshal(*sCache, &list)
 				if err == nil {
 					return
 				} else {
-					logx.Info("缓存序列化异常")
+					log.Println("缓存序列化异常")
 				}
 			}
 		}
@@ -70,10 +70,10 @@ func (kws *KeyWordsSearch) GetBidSearchListByCache(in *bxcore.SearchReq) (list [
 			if err == nil {
 				redis.PutBytes(util.RedisNameNew, redisDataKey, &b, MC.If(IC.C.DefaultSearchCacheTime > 0, IC.C.DefaultSearchCacheTime*60*60, 24*60*60).(int))
 			} else {
-				logx.Info("默认搜索查询结果保存redis缓存异常")
+				log.Println("默认搜索查询结果保存redis缓存异常")
 			}
 		} else {
-			logx.Info("默认搜索 暂无数据")
+			log.Println("默认搜索 暂无数据")
 		}
 		return
 	}(in)
@@ -113,7 +113,7 @@ func (kws *KeyWordsSearch) SaveKeyWordsToHistory(in *bxcore.SearchReq) {
 		keys := util.SearchHistory(history, in.KeyWords, in.AdditionalWords)
 		if len(keys) > 0 {
 			if b := redis.Put("other", "s_"+in.UserId, strings.Join(keys, ","), -1); !b {
-				logx.Info("保存搜索记录异常，用户id:", in.UserId)
+				log.Println("保存搜索记录异常，用户id:", in.UserId)
 			}
 		}
 	}

jyBXCore/rpc/init/db.go

@@ -4,11 +4,9 @@
 package init
 
 import (
-	"strings"
-
-	"github.com/zeromicro/go-zero/core/logx"
-
 	"jyBXCore/entity"
+	"log"
+	"strings"
 
 	. "app.yhyue.com/moapp/jybase/es"
 	"app.yhyue.com/moapp/jybase/mongodb"
@@ -23,11 +21,10 @@ var (
 	MgoBidding mongodb.MongodbSim //标讯详情等（第一版没用）
 )
 
-//
 func MongoDBInit(em *entity.Mongo) {
 	//初始化 mongodb
 	if em.Main.Address != "" {
-		logx.Info("--初始化 mongodb--")
+		log.Println("--初始化 mongodb--")
 		Mgo = mongodb.MongodbSim{
 			MongodbAddr: em.Main.Address,
 			Size:        em.Main.Size,
@@ -37,7 +34,7 @@ func MongoDBInit(em *entity.Mongo) {
 	}
 	//
 	if em.Bidding.Address != "" {
-		logx.Info("--初始化 mongodb bidding--")
+		log.Println("--初始化 mongodb bidding--")
 		MgoBidding = mongodb.MongodbSim{
 			MongodbAddr: em.Bidding.Address,
 			Size:        em.Bidding.Size,
@@ -49,11 +46,10 @@ func MongoDBInit(em *entity.Mongo) {
 	}
 }
 
-//
 func MysqlInit(mm *entity.Mysql) {
 	//初始化 mysql-main
 	if mm.Main.Address != "" {
-		logx.Info("--初始化 mysql--")
+		log.Println("--初始化 mysql--")
 		MainMysql = &mysql.Mysql{
 			Address:      mm.Main.Address,
 			UserName:     mm.Main.UserName,
@@ -66,7 +62,7 @@ func MysqlInit(mm *entity.Mysql) {
 	}
 	//初始化 mysql-base
 	if mm.Base.Address != "" {
-		logx.Info("--初始化 tidb--")
+		log.Println("--初始化 tidb--")
 		BaseMysql = &mysql.Mysql{
 			Address:      mm.Base.Address,
 			UserName:     mm.Base.UserName,
@@ -79,20 +75,18 @@ func MysqlInit(mm *entity.Mysql) {
 	}
 }
 
-//
 func RedisInit(rm *entity.RedisStuct) {
 	//初始化 redis
 	if len(rm.Addr) > 0 {
-		logx.Info("--初始化 redis--")
+		log.Println("--初始化 redis--")
 		redis.InitRedisBySize(strings.Join(rm.Addr, ","), 100, 30, 300)
 	}
 }
 
-//
 func EsInit(es *entity.EsStruct) {
 	//初始化 elasticsearch
 	if es.Addr != "" {
-		logx.Info("--初始化 elasticsearch--")
+		log.Println("--初始化 elasticsearch--")
 		NewEs(es.Version, es.Addr, es.Size, es.UserName, es.Password)
 	}
 }

jyBXCore/rpc/internal/logic/getsearchlistlogic.go

@@ -9,10 +9,11 @@ import (
 	"strings"
 	"time"
 
+	"github.com/zeromicro/go-zero/core/logx"
 	"jyBXCore/rpc/internal/svc"
 	"jyBXCore/rpc/type/bxcore"
 
-	"github.com/zeromicro/go-zero/core/logx"
+	"log"
 )
 
 type GetSearchListLogic struct {
@@ -81,20 +82,20 @@ func (l *GetSearchListLogic) GetSearchList(in *bxcore.SearchReq) (*bxcore.Search
 		if b := util.IsOptimize(IC.C, in); b {
 			t1 := time.Now()
 			res.Count, res.Total, res.List = ks.GetBidSearchList(in) // util.GetBidSearchData(in)
-			logx.Info("1查询耗时：", time.Since(t1))
+			log.Println("1查询耗时：", time.Since(t1))
 		}
 		//如果优化查询数据量太少，和配置数据量作比较，不够的话走原始查询
 		if res.Count < IC.C.PaySearchLimit.PageSize {
 			t2 := time.Now()
 			in.PublishTime = publishTime
 			res.Count, res.Total, res.List = ks.GetBidSearchList(in) //util.GetBidSearchData(in)
-			logx.Info("2查询耗时：", time.Since(t2))
+			log.Println("2查询耗时：", time.Since(t2))
 		}
 		res.KeyWords = strings.Join(heightWords, " ")
 		res.InterceptOtherWords = in.InterceptOtherWords
 		res.InterceptKeyWords = in.InterceptKeyWords
 	}
-	logx.Info("关键词 -全部- 查询耗时：", time.Since(t).Seconds())
+	log.Println("关键词 -全部- 查询耗时：", time.Since(t).Seconds())
 	return &bxcore.SearchResp{
 		Data:    res,
 		ErrMsg:  "",

jyBXCore/rpc/internal/logic/participateactionlogic.go

@@ -2,12 +2,11 @@ package logic
 
 import (
 	"context"
+	"github.com/zeromicro/go-zero/core/logx"
 	"jyBXCore/rpc/internal/svc"
 	"jyBXCore/rpc/service"
 	"jyBXCore/rpc/type/bxcore"
 	"jyBXCore/rpc/util"
-
-	"github.com/zeromicro/go-zero/core/logx"
 )
 
 type ParticipateActionLogic struct {

jyBXCore/rpc/model/es/es.go

@@ -6,7 +6,7 @@ import (
 	"strings"
 
 	elastic "app.yhyue.com/moapp/jybase/es"
-	"github.com/zeromicro/go-zero/core/logx"
+	"log"
 )
 
 const (
@@ -80,7 +80,7 @@ func (e *SearchByES) GetAllByNgramWithCount() (int64, *[]map[string]interface{})
 		if e.Start > -1 {
 			queryStr = queryStr[:len(queryStr)-1] + `,"from":` + strconv.Itoa(e.Start) + `,"size":` + strconv.Itoa(e.Limit) + "}"
 		}
-		logx.Info("queryStr:", queryStr)
+		log.Println("queryStr:", queryStr)
 		return elastic.GetWithCount(e.Index, e.IType, e.Query, queryStr)
 	} else {
 		return 0, nil

jyBXCore/rpc/model/es/search.go

@@ -10,7 +10,7 @@ import (
 
 	MC "app.yhyue.com/moapp/jybase/common"
 	elastic "app.yhyue.com/moapp/jybase/es"
-	"github.com/zeromicro/go-zero/core/logx"
+	"log"
 )
 
 // GetSearchQuery  整理关键词等查询条件
@@ -202,7 +202,7 @@ func GetSearchQuery(in *bxcore.SearchReq, mustQuery string) (qstr string) {
 		musts = append(musts, fmt.Sprintf(queryBoolMustTermDomain, in.BidField))
 	}
 	qstr = fmt.Sprintf(query, strings.Join(musts, ","), strings.Join(mustNot, ","))
-	logx.Info("qstr:", qstr)
+	log.Println("qstr:", qstr)
 	return
 }
 
@@ -287,7 +287,7 @@ func GetBidSearchQuery(in *bxcore.SearchReq) string {
 		allType += `]}}`
 	}
 	//信息类型  一级分类
-	logx.Info("topType:", topType)
+	log.Println("topType:", topType)
 	if len(topType) > 0 {
 		if allType != "" {
 			allType += ","

jyBXCore/rpc/model/mysql/participateBid.go

@@ -7,7 +7,6 @@ import (
 	"database/sql"
 	"encoding/json"
 	"fmt"
-	"github.com/zeromicro/go-zero/core/logx"
 	IC "jyBXCore/rpc/init"
 	"jyBXCore/rpc/model/es"
 	"jyBXCore/rpc/type/bxcore"
@@ -59,7 +58,7 @@ func TransferParticipateInfo(projectId string, in *bxcore.ParticipateActionReq)
 		)
 		partInfo := IC.BaseMysql.SelectBySqlByTx(tx, "SELECT id,position_id FROM "+ParticipateUserTable+" WHERE  project_id = ?  AND ent_id = ? AND state > -1", projectId, in.EntId)
 		if partInfo == nil || len(*partInfo) == 0 {
-			logx.Info("当前项目不满足划转条件")
+			log.Println("当前项目不满足划转条件")
 			return false
 		} else {
 			for _, v := range *partInfo {
@@ -72,7 +71,7 @@ func TransferParticipateInfo(projectId string, in *bxcore.ParticipateActionReq)
 			}
 		}
 		if len(fromEntUserNames) == 0 {
-			logx.Info("原参标人信息查询有误")
+			log.Println("原参标人信息查询有误")
 			return false
 		}
 		//是否保留原参标人
@@ -94,7 +93,7 @@ func TransferParticipateInfo(projectId string, in *bxcore.ParticipateActionReq)
 		for _, toEntUserId := range strings.Split(in.ToEntUserId, ",") {
 			toEntUserId = encrypt.SE.Decode4HexByCheck(toEntUserId)
 			if toEntUserId == "" {
-				logx.Info("划转对象不能为空", in.ProjectIds, in.EntId)
+				log.Println("划转对象不能为空", in.ProjectIds, in.EntId)
 				continue
 			}
 			//查询划转人信息
@@ -152,10 +151,10 @@ func TransferParticipateInfo(projectId string, in *bxcore.ParticipateActionReq)
 			"record_content":       fmt.Sprintf(content, strings.Join(fromEntUserNames, "、"), strings.Join(toEntUserNames, "、"), lastNotes),
 			"create_date":          date.FormatDate(&now, date.Date_Full_Layout),
 		}) > 0
-
+		log.Println(b1, "--", b2, "--", b3)
 		return b1 && b2 && b3
 	}) {
-		logx.Info(in.PositionId, "---终止---", projectId)
+		log.Println(in.PositionId, "---终止---", projectId)
 		return fmt.Errorf("终止参标更新信息出错")
 	}
 	return nil
@@ -199,7 +198,7 @@ func CancelParticipateInfo(in *bxcore.ParticipateActionReq, roleId int64) error
 		}) > 0
 		return b1 && b2
 	}) {
-		logx.Info(in.PositionId, "---终止---", in.ProjectIds)
+		log.Println(in.PositionId, "---终止---", in.ProjectIds)
 		return fmt.Errorf("终止参标更新信息出错")
 	}
 	return nil
@@ -261,7 +260,7 @@ func SaveParticipateInfo(in *bxcore.ParticipateActionReq) error {
 		b3 = UpdateProjectInfo(in.ProjectIds, es.GetProjectInfo(in.ProjectIds)) == nil
 		return b1 && b2 && b3
 	}) {
-		logx.Info(in.PositionId, "---保存---", in.ProjectIds)
+		log.Println(in.PositionId, "---保存---", in.ProjectIds)
 		return fmt.Errorf("保存参标信息出错")
 	}
 	return nil
@@ -381,22 +380,22 @@ func GetParticipateSetInfo(in *bxcore.ParticipateSetUpInfoReq) (*bxcore.Particip
 			if (*setInfo)["o_bidtype"] != nil {
 				if sbb, err := json.Marshal((*setInfo)["o_bidtype"]); err == nil {
 					if err := json.Unmarshal(sbb, &bidType); err != nil {
-						logx.Info("bidType json un err:", err.Error())
+						log.Println("bidType json un err:", err.Error())
 						return nil, err
 					}
 				} else {
-					logx.Info("bidType json err:", err.Error())
+					log.Println("bidType json err:", err.Error())
 					return nil, err
 				}
 			}
 			if (*setInfo)["o_remindrule"] != nil {
 				if sbr, err := json.Marshal((*setInfo)["o_remindrule"]); err == nil {
 					if err := json.Unmarshal(sbr, &remindRule); err != nil {
-						logx.Info("remindRule json un err:", err.Error())
+						log.Println("remindRule json un err:", err.Error())
 						return nil, err
 					}
 				} else {
-					logx.Info("remindRule json err:", err.Error())
+					log.Println("remindRule json err:", err.Error())
 					return nil, err
 				}
 			}
@@ -516,7 +515,7 @@ func ParticipateListSql(in *bxcore.ParticipateListReq) string {
 		startTimeInt, _ := strconv.ParseInt(startTime, 10, 64)
 		endTimeInt, _ := strconv.ParseInt(endTime, 10, 64)
 		if startTimeInt > 0 && endTimeInt > 0 && startTimeInt > endTimeInt {
-			logx.Info(fmt.Sprintf("投标截止日期 %d 开始时间 大于 结束时间%d！！！", startTimeInt, endTimeInt))
+			log.Println(fmt.Sprintf("投标截止日期 %d 开始时间 大于 结束时间%d！！！", startTimeInt, endTimeInt))
 		} else {
 			switch in.BidEndStatus {
 			case 0:
@@ -623,7 +622,7 @@ func ParticipateListSql(in *bxcore.ParticipateListReq) string {
 	default:
 		conditionSql += ` ORDER BY pt.bid_end_time ASC,pt.bid_open_time ASC,pbr.create_date DESC`
 	}
-	logx.Info(conditionSql)
+	log.Println(conditionSql)
 	return conditionSql
 }
 

jyBXCore/rpc/service/participate.go

@@ -4,7 +4,6 @@ import (
 	MC "app.yhyue.com/moapp/jybase/common"
 	"app.yhyue.com/moapp/jybase/encrypt"
 	"fmt"
-	"github.com/zeromicro/go-zero/core/logx"
 	"jyBXCore/rpc/model/es"
 	"jyBXCore/rpc/model/mysql"
 	"jyBXCore/rpc/type/bxcore"
@@ -138,7 +137,7 @@ func ParticipateDo(in *bxcore.ParticipateActionReq) error {
 				continue
 			}
 			if err := mysql.TransferParticipateInfo(projectId, in); err != nil {
-				logx.Info(fmt.Sprintf("是否允许多人参标：%v, 项目id：%s，企业id：%d，划转对象entuserid：%s,划转异常：", isAllow, projectId, in.EntId, in.ToEntUserId))
+				log.Println(fmt.Sprintf("是否允许多人参标：%v, 项目id：%s，企业id：%d，划转对象entuserid：%s,划转异常：", isAllow, projectId, in.EntId, in.ToEntUserId))
 				continue
 			}
 			projectNum += 1

jyBXCore/rpc/service/participateBid.go

@@ -7,10 +7,10 @@ import (
 	"encoding/json"
 	"fmt"
 	"github.com/gogf/gf/v2/container/gset"
-	"github.com/zeromicro/go-zero/core/logx"
 	"jyBXCore/rpc/model/mysql"
 	"jyBXCore/rpc/type/bxcore"
 	"jyBXCore/rpc/util"
+	"log"
 	"strings"
 	"time"
 )
@@ -576,11 +576,11 @@ func processRecordStr(oldMap, newMap map[string]interface{}) (recordContent stri
 
 	tmp, err := json.Marshal(recordMap)
 	if err != nil {
-		logx.Error("序列化操作记录失败:", err)
+		log.Println("序列化操作记录失败:", err)
 		return "", err
 	}
 	if len(result) == 0 {
-		logx.Error("没有更新的内容:", recordContent)
+		log.Println("没有更新的内容:", recordContent)
 		err = fmt.Errorf("没有变更的内容,不用更新")
 	}
 	return string(tmp), err

jyBXCore/rpc/service/search.go

@@ -2,11 +2,11 @@ package service
 
 import (
 	MC "app.yhyue.com/moapp/jybase/common"
-	"github.com/zeromicro/go-zero/core/logx"
 	IC "jyBXCore/rpc/init"
 	"jyBXCore/rpc/model/es"
 	"jyBXCore/rpc/type/bxcore"
 	"jyBXCore/rpc/util"
+	"log"
 	"strings"
 	"time"
 )
@@ -45,9 +45,9 @@ func GetBidSearchData(in *bxcore.SearchReq, isCache bool) (count int64, list []*
 			//格式化查询结果
 			list = util.SearchListFormat(in.UserId, in.Industry, repl, strings.Contains(in.SelectType, "detail"))
 		} else {
-			logx.Info("查询数据异常")
+			log.Println("查询数据异常")
 		}
-		logx.Info(in.KeyWords, "关键词 -1- 查询耗时：", time.Since(t).Seconds())
+		log.Println(in.KeyWords, "关键词 -1- 查询耗时：", time.Since(t).Seconds())
 	}
 	return
 }

jyBXCore/rpc/util/participate.go

@@ -52,12 +52,12 @@ func IsAllowedParticipate(appId, userId string, newUserId, accountId, entAccount
 	return
 }
 
-// 5秒内防止重复提交
+// 3秒内防止重复提交
 func IsAllowedAccess(key string) string {
 	redisKey := fmt.Sprintf("participate_isAllowed_%s", key)
 	if b, err := redis.Exists("other", redisKey); err != nil && b {
 		return "访问频次过快，请稍后再试"
 	}
-	redis.Put("other", redisKey, key, 5)
+	redis.Put("other", redisKey, key, 3)
 	return ""
 }

jyBXCore/rpc/util/search.go

@@ -13,7 +13,7 @@ import (
 	MC "app.yhyue.com/moapp/jybase/common"
 	ME "app.yhyue.com/moapp/jybase/encrypt"
 	"app.yhyue.com/moapp/jybase/es"
-	"github.com/zeromicro/go-zero/core/logx"
+	"log"
 )
 
 var (
@@ -121,7 +121,7 @@ func MakeCollection(userId string, list []*bxcore.SearchList) {
 	param := []interface{}{userId}
 	var wh []string
 	for _, v := range list {
-		logx.Info(v.Title, "---v.id---:", v.Id)
+		log.Println(v.Title, "---v.id---:", v.Id)
 		array := ME.DecodeArticleId2ByCheck(v.Id)
 		if len(array) == 1 && array[0] != "" {
 			param = append(param, array[0])