mxs пре 11 месеци
родитељ
комит
d66e3427bd
4 измењених фајлова са 63 додато и 8 уклоњено
  1. 44 5
      src/service/repair_service.go
  2. 3 1
      src/util/config.go
  3. 15 0
      src/util/redis.go
  4. 1 2
      src/web/templates/repair/jy_create_new.html

+ 44 - 5
src/service/repair_service.go

@@ -2,6 +2,7 @@ package service
 
 import (
 	"bytes"
+	"context"
 	"encoding/json"
 	"fmt"
 	"github.com/go-xweb/xweb"
@@ -244,8 +245,9 @@ func (jy *RepairRule) RepairPub() {
 	qu.Debug(*jsdata)
 	save := make(map[string]interface{})
 	save["_id"] = primitive.NewObjectID()
+	modifyinfo := map[string]interface{}{}
 	for k, v := range *jsdata {
-		if v == "" {
+		if v == "" || v == nil {
 			continue
 		}
 		if k == "publishtime" {
@@ -260,13 +262,18 @@ func (jy *RepairRule) RepairPub() {
 			save[k] = v
 		} else if k == "budget" || k == "bidamount" {
 			save[k] = qu.Float64All(v)
+			modifyinfo[k] = "剑鱼维护"
 		} else if k == "winner" {
 			save["s_winner"] = qu.ObjToString(v)
+			modifyinfo["s_winner"] = "剑鱼维护"
 			cid := companyFun(save)
 			if len(cid) > 0 {
 				save["entidlist"] = cid
 			}
 		} else {
+			if k == "buyer" {
+				modifyinfo[k] = "剑鱼维护"
+			}
 			save[k] = v
 		}
 	}
@@ -281,7 +288,11 @@ func (jy *RepairRule) RepairPub() {
 	save["infoformat"] = 1
 	save["extracttype"] = 0
 	save["detail_isvalidity"] = 1 // 正文有效
-
+	//剑鱼维护
+	if len(modifyinfo) > 0 {
+		save["mpdifyinfo"] = modifyinfo
+	}
+	qu.Debug("save:", save)
 	b := JYMgo.SaveByOriID(JyCollNameOne, save)
 	if b {
 		// 保存服务
@@ -684,9 +695,10 @@ func (jy *RepairRule) RepairSave() {
 			//删除redis 指定key
 			delName1 := RedisDelKey1 + "*_" + "*_" + id
 			redis.DelByCodePattern(RedisJYName, delName1)
-			if updata["href"] != nil {
-
-			}
+			go delDetailRedis(id) //清除三级页缓存redis
+			//if updata["href"] != nil {//王江含你这写的啥?
+			//
+			//}
 			//jyredis := redis.RedisPool[RedisJYName].Get()
 			//defer jyredis.Close()
 			//if _, err := jyredis.Do("SELECT", 0); err != nil {
@@ -742,6 +754,33 @@ func (jy *RepairRule) RepairSave() {
 	}
 }
 
+// 删除详情页缓存
+func delDetailRedis(id string) {
+	// 使用Keys命令查找所有匹配模式的键
+	var cursor uint64
+	ctx := context.Background()
+	for {
+		var keys []string
+		var err error
+		keys, cursor, err = RedisClient.Scan(ctx, cursor, "*"+id+"*", 10).Result() // 一次扫描10个键
+		if err != nil {
+			panic(err)
+		}
+		// 打印找到的键
+		if len(keys) > 0 {
+			qu.Debug("keys---", keys)
+			if err := RedisClient.Del(ctx, keys...).Err(); err != nil {
+				qu.Debug("清除缓存失败", id, keys)
+			}
+		}
+		// 检查是否还有更多的键
+		if cursor == 0 { // 如果游标为0,表示扫描完成
+			break
+		}
+	}
+	qu.Debug("缓存清理完毕:", id)
+}
+
 // @Description entidlist
 // @Author J 2022/6/7 2:36 PM
 func companyFun(tmp map[string]interface{}) (cid []string) {

+ 3 - 1
src/util/config.go

@@ -5,6 +5,7 @@ import (
 	qu "qfw/util"
 	"qfw/util/redis"
 	"spiderutil"
+	"strings"
 )
 
 var (
@@ -127,13 +128,14 @@ func initJYMgo() {
 
 func initJYRedis() {
 	jyredis := *qu.ObjToMap(Sysconfig["jyredis"])
-	redis.InitRedisBySize(qu.ObjToString(jyredis["redis_jy"]), 50, 30, 240)
+	redis.InitRedisBySize(qu.ObjToString(jyredis["redis_jy"]), 50, 30, 240) //老工具的redis,该换了
 	RedisJYName = qu.ObjToString(jyredis["redis_jy_name"])
 	RedisDelKey1 = qu.ObjToString(jyredis["redisdelkey1"])
 	RedisDelKey2 = qu.ObjToString(jyredis["redisdelkey2"])
 	RedisDelKey3 = qu.ObjToString(jyredis["redisdelkey3"])
 	RedisDelKey4 = qu.ObjToString(jyredis["redisdelkey4"])
 	RedisDelKey5 = qu.ObjToString(jyredis["redisdelkey5"])
+	NewRedisClient(strings.Split(qu.ObjToString(jyredis["redis_jy"]), "=")[1], "", 0)
 	InitRedis(qu.ObjToString(jyredis["redis_jy_save"]))
 
 	//adds := qu.ObjArrToStringArr(Sysconfig["redis_cluster"].([]interface{}))

+ 15 - 0
src/util/redis.go

@@ -0,0 +1,15 @@
+package util
+
+import (
+	"github.com/go-redis/redis"
+)
+
+var RedisClient *redis.Client
+
+func NewRedisClient(addr, password string, db int) {
+	RedisClient = redis.NewClient(&redis.Options{
+		Addr:     addr,     // Redis地址
+		Password: password, // Redis密码,如果没有则留空
+		DB:       db,       // 使用默认DB
+	})
+}

+ 1 - 2
src/web/templates/repair/jy_create_new.html

@@ -97,7 +97,7 @@
                             <select class="form-control selectpicker" id="buyerClassSelect"></select>
                             <script>
                                 $('#buyerClassSelect').on('hide.bs.select', function () {
-                                    dataMap["buyerClass"] = $(this).val();
+                                    dataMap["buyerclass"] = $(this).val();
                                 })
                             </script>
                         </div>
@@ -335,7 +335,6 @@
         dataMap["agency"] = $('#agency').val()
         dataMap["buyer"] = $('#buyer').val()
         dataMap["winner"] = $('#winner').val()
-
         showConfirm("确定发布该信息到剑鱼网站?", function() {
             $.ajax({
                 url: "/service/jy/repair/pubSave",