WH01243 пре 3 година
родитељ
комит
8d434591a3

+ 1 - 13
api/messagecenter/internal/config/config.go

@@ -12,17 +12,5 @@ type Config struct {
 		ServerCode string
 		ServerCode string
 		Etcd       []string
 		Etcd       []string
 	}
 	}
-	WebRpcPort       int64
-	IsShunt          bool
-	ShuntProbability int64
-	ZhiCiUrl         struct {
-		Pc  string
-		App string
-		Wx  string
-	}
-	MessageUrl struct {
-		Pc  string
-		App string
-		Wx  string
-	}
+	WebRpcPort int64
 }
 }

+ 31 - 35
api/messagecenter/internal/logic/obtainshuntlogic.go

@@ -1,13 +1,9 @@
 package logic
 package logic
 
 
 import (
 import (
-	"context"
-	"math/rand"
-	"time"
-
-	. "bp.jydev.jianyu360.cn/SocialPlatform/messageCenter/api/messagecenter/common"
 	"bp.jydev.jianyu360.cn/SocialPlatform/messageCenter/api/messagecenter/internal/svc"
 	"bp.jydev.jianyu360.cn/SocialPlatform/messageCenter/api/messagecenter/internal/svc"
 	"bp.jydev.jianyu360.cn/SocialPlatform/messageCenter/api/messagecenter/internal/types"
 	"bp.jydev.jianyu360.cn/SocialPlatform/messageCenter/api/messagecenter/internal/types"
+	"context"
 	"github.com/zeromicro/go-zero/core/logx"
 	"github.com/zeromicro/go-zero/core/logx"
 )
 )
 
 
@@ -28,43 +24,43 @@ func NewObtainShuntLogic(ctx context.Context, svcCtx *svc.ServiceContext) *Obtai
 func (l *ObtainShuntLogic) ObtainShunt(req *types.ShuntReq) (*types.CommonRes, error) {
 func (l *ObtainShuntLogic) ObtainShunt(req *types.ShuntReq) (*types.CommonRes, error) {
 	// todo: add your logic here and delete this line
 	// todo: add your logic here and delete this line
 	data := map[string]interface{}{}
 	data := map[string]interface{}{}
-	if C.IsShunt {
-		data["isShunt"] = C.IsShunt
-		//计算概率,获取分流途径
-		shunt := "智齿"
-		if rand.New(rand.NewSource(time.Now().UnixNano())).Int63n(100) <= C.ShuntProbability {
-			shunt = "智齿"
+	/*	if C.IsShunt {
+			data["isShunt"] = C.IsShunt
+			//计算概率,获取分流途径
+			shunt := "智齿"
+			if rand.New(rand.NewSource(time.Now().UnixNano())).Int63n(100) <= C.ShuntProbability {
+				shunt = "智齿"
+			} else {
+				shunt = "剑鱼"
+			}
+			if shunt == "智齿" {
+				if req.Type == "PC" {
+					data["url"] = C.ZhiCiUrl.Pc
+				} else if req.Type == "APP" {
+					data["url"] = C.ZhiCiUrl.App
+				} else {
+					data["url"] = C.ZhiCiUrl.Wx
+				}
+			} else {
+				if req.Type == "PC" {
+					data["url"] = C.MessageUrl.Pc
+				} else if req.Type == "APP" {
+					data["url"] = C.MessageUrl.App
+				} else {
+					data["url"] = C.MessageUrl.Wx
+				}
+
+			}
 		} else {
 		} else {
-			shunt = "剑鱼"
-		}
-		if shunt == "智齿" {
+			data["isShunt"] = C.IsShunt
 			if req.Type == "PC" {
 			if req.Type == "PC" {
 				data["url"] = C.ZhiCiUrl.Pc
 				data["url"] = C.ZhiCiUrl.Pc
-			} else if req.Type == "APP" {
+			} else if req.Type == "App" {
 				data["url"] = C.ZhiCiUrl.App
 				data["url"] = C.ZhiCiUrl.App
 			} else {
 			} else {
 				data["url"] = C.ZhiCiUrl.Wx
 				data["url"] = C.ZhiCiUrl.Wx
 			}
 			}
-		} else {
-			if req.Type == "PC" {
-				data["url"] = C.MessageUrl.Pc
-			} else if req.Type == "APP" {
-				data["url"] = C.MessageUrl.App
-			} else {
-				data["url"] = C.MessageUrl.Wx
-			}
-
-		}
-	} else {
-		data["isShunt"] = C.IsShunt
-		if req.Type == "PC" {
-			data["url"] = C.ZhiCiUrl.Pc
-		} else if req.Type == "App" {
-			data["url"] = C.ZhiCiUrl.App
-		} else {
-			data["url"] = C.ZhiCiUrl.Wx
-		}
-	}
+		}*/
 	return &types.CommonRes{
 	return &types.CommonRes{
 		Data: data,
 		Data: data,
 	}, nil
 	}, nil

+ 1 - 2
rpc/messagecenter/internal/logic/closechatsessionlogic.go

@@ -1,12 +1,11 @@
 package logic
 package logic
 
 
 import (
 import (
+	util "bp.jydev.jianyu360.cn/SocialPlatform/messageCenter/entity"
 	"bp.jydev.jianyu360.cn/SocialPlatform/messageCenter/rpc/messagecenter/internal/svc"
 	"bp.jydev.jianyu360.cn/SocialPlatform/messageCenter/rpc/messagecenter/internal/svc"
 	"bp.jydev.jianyu360.cn/SocialPlatform/messageCenter/rpc/messagecenter/messagecenter"
 	"bp.jydev.jianyu360.cn/SocialPlatform/messageCenter/rpc/messagecenter/messagecenter"
 	"bp.jydev.jianyu360.cn/SocialPlatform/messageCenter/service"
 	"bp.jydev.jianyu360.cn/SocialPlatform/messageCenter/service"
 	"context"
 	"context"
-
-	util "bp.jydev.jianyu360.cn/SocialPlatform/messageCenter/entity"
 	"github.com/zeromicro/go-zero/core/logx"
 	"github.com/zeromicro/go-zero/core/logx"
 )
 )