Bladeren bron

物料详情修改

renjiaojiao 3 weken geleden
bovenliggende
commit
75e31c5cff
3 gewijzigde bestanden met toevoegingen van 13 en 1 verwijderingen
  1. 2 1
      rpc/etc/message.yaml
  2. 10 0
      rpc/internal/common/MaterialService.go
  3. 1 0
      rpc/internal/config/config.go

+ 2 - 1
rpc/etc/message.yaml

@@ -5,7 +5,7 @@ Etcd:
   - 127.0.0.1:2379
   - 127.0.0.1:2379
   Key: message.rpc
-Timeout: 300000
+Timeout: 600000
 PushGrpcServer: 192.168.3.206:5566
 #Mysql: root:=PDT49#80Z!RVv52_z@tcp(192.168.3.217:4000)/messageCenter?charset=utf8mb4&parseTime=true&loc=Local
 Mongodb:
@@ -117,5 +117,6 @@ FileCenterRpc:
     Key: filecenter.rpc
 OssBucketName: jytest2022
 OssUrl: https://jytest2022.oss-cn-beijing.aliyuncs.com
+JyWebDomain: "https://jybx2-webtest.jydev.jianyu360.com"
 
 

+ 10 - 0
rpc/internal/common/MaterialService.go

@@ -2,7 +2,10 @@ package common
 
 import (
 	"app.yhyue.com/moapp/MessageCenter/entity"
+	"app.yhyue.com/moapp/MessageCenter/rpc/internal/config"
+	"app.yhyue.com/moapp/jybase/common"
 	"app.yhyue.com/moapp/jybase/date"
+	"app.yhyue.com/moapp/jybase/encrypt"
 	"crypto/rand"
 	"fmt"
 	"github.com/gogf/gf/v2/util/gconv"
@@ -27,6 +30,13 @@ func MaterialDetail(msgId, positionId int64) (dataMap map[string]interface{}) {
 				attArr = append(attArr, gconv.String(v["file_url"]))
 			}
 			dataMap["attUrl"] = strings.Join(attArr, ",")
+			code := ""
+			ch := entity.JyBi.FindOne("dwd_d_userbase_belongto_rulecode", map[string]interface{}{"position_id": positionId}, "code", "")
+			if ch != nil && len(*ch) > 0 {
+				code = common.InterfaceToStr((*ch)["code"])
+			}
+			dataMap["qrcode_url"] = fmt.Sprintf("%s/material/%s/%s", config.ConfigJson.JyWebDomain, encrypt.SE.EncodeString(common.InterfaceToStr(dataMap["mid"])), code)
+
 		} else {
 			dataMap["attUrl"] = ""
 		}

+ 1 - 0
rpc/internal/config/config.go

@@ -46,6 +46,7 @@ type Config struct {
 	ThreadCount       int    `json:"ThreadCount"`      //线程锁,配置15个,用户hash取锁
 	MsgLogLimit       int    `json:"MsgLogLimit"`      //加载消息记录条数
 	MsgTitlePS        string `json:"MsgTitlePS"`       //商情推荐标题前后缀
+	JyWebDomain       string `json:"JyWebDomain"`
 }
 
 type CHouseConfig struct {