浏览代码

feat:xiugai

wangchuanjin 1 年之前
父节点
当前提交
dc66f367b1
共有 4 个文件被更改,包括 12 次插入6 次删除
  1. 4 4
      api/common/initconfig.go
  2. 2 1
      api/etc/db.yaml
  3. 1 0
      api/internal/config/config.go
  4. 5 1
      api/internal/service/network.go

+ 4 - 4
api/common/initconfig.go

@@ -7,13 +7,11 @@ import (
 	"log"
 	"time"
 
-	"github.com/zeromicro/go-zero/zrpc"
-
-	"app.yhyue.com/moapp/jypkg/middleground"
-
 	. "app.yhyue.com/moapp/jybase/es"
 	"app.yhyue.com/moapp/jybase/mongodb"
 	"app.yhyue.com/moapp/jybase/mysql"
+	"app.yhyue.com/moapp/jybase/redis"
+	"app.yhyue.com/moapp/jypkg/middleground"
 	"bp.jydev.jianyu360.cn/BaseService/fileCenter/rpc/filecenter"
 	"bp.jydev.jianyu360.cn/BaseService/userCenter/rpc/usercenter"
 	"bp.jydev.jianyu360.cn/CRM/application/api/internal/config"
@@ -24,6 +22,7 @@ import (
 	"github.com/ClickHouse/clickhouse-go/v2/lib/driver"
 	"github.com/zeromicro/go-zero/core/conf"
 	"github.com/zeromicro/go-zero/core/logx"
+	"github.com/zeromicro/go-zero/zrpc"
 )
 
 var configFile = flag.String("fs", "etc/crmapplication.yaml", "the config file")
@@ -170,6 +169,7 @@ func InitConf() {
 		log.Println("--初始化 elasticsearch--")
 		NewEs(DB.Es.Version, DB.Es.Addr, DB.Es.Size, DB.Es.UserName, DB.Es.Password)
 	}
+	redis.InitRedis(DB.Redis)
 
 	UserCenterRpc = usercenter.NewUserCenter(zrpc.MustNewClient(C.UserCenterRpc))
 	FileCenterRpc = filecenter.NewFileCenter(zrpc.MustNewClient(C.FileCenterRpc))

+ 2 - 1
api/etc/db.yaml

@@ -71,4 +71,5 @@ clickhouse:
     Password: pwdTopJy123
     DbName: information
     MaxIdleConns: 5
-    MaxOpenConns: 30
+    MaxOpenConns: 30
+redis: newother=192.168.3.149:1712

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

@@ -27,6 +27,7 @@ type Db struct {
 	Mongo      entity.Mongo    `json:"mongo"`
 	Es         entity.EsStruct `json:"es"`
 	Clickhouse *CHouseConfig
+	Redis      string `json:"redis"`
 }
 type CHouseConfig struct {
 	Addr         string

+ 5 - 1
api/internal/service/network.go

@@ -9,6 +9,8 @@ import (
 	"strings"
 	"time"
 
+	"app.yhyue.com/moapp/jybase/redis"
+
 	. "app.yhyue.com/moapp/jybase/common"
 	. "app.yhyue.com/moapp/jybase/date"
 	"app.yhyue.com/moapp/jybase/encrypt"
@@ -770,7 +772,9 @@ func (n *network) List(in *types.NetWorkListReq) *types.Reply {
 					}
 					exportId += v
 				}
-				export_url = "/subscribepay/network/projectExport?export_id=" + encrypt.SE.EncodeStringByCheck(exportId)
+				md5Id := GetMd5String(exportId)
+				redis.Put("newother", fmt.Sprintf("network_export_%s", md5Id), exportId, 259200)
+				export_url = "/subscribepay/network/projectExport?export_id=" + md5Id
 			}
 			url := ""
 			if v.Qyxy_id != "" && (jump_type == "supplier" || jump_type == "adiffb") {