feat:冲突合并

go.sum

@@ -1,3 +1,4 @@
+app.yhyue.com/moapp/esv1 v0.0.0-20220414031211-3da4123e648d h1:WPsYuuptAd3UEgN+jPzpnsDe/OvcshDUUtOTZPYGSJ8=
 app.yhyue.com/moapp/esv1 v0.0.0-20220414031211-3da4123e648d/go.mod h1:91/lSD/hS+ckMVP3WdidRzDhC60lLMdyce9QHy0cSMA=
 app.yhyue.com/moapp/jybase v0.0.0-20220802080941-07f401baab8b h1:7EtDV0o2XsluZI0ftgb2Twa/QlX7HxHP2SKhtyfnJV4=
 app.yhyue.com/moapp/jybase v0.0.0-20220802080941-07f401baab8b/go.mod h1:HelrO6tcD9TcKb/HOP2BLbzppyDz2kpQSFhPMQTUgbQ=
@@ -281,6 +282,7 @@ github.com/jinzhu/now v1.1.1/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/
 github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
 github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U=
 github.com/jmoiron/sqlx v1.2.0/go.mod h1:1FEQNm3xlJgrMD+FBdI9+xvCksHtbpVBBw5dYhBSsks=
+github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY=
 github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
 github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4=
 github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
@@ -314,6 +316,7 @@ github.com/lib/pq v1.10.6/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
 github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
 github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
 github.com/mailru/easyjson v0.7.6/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
+github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0=
 github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
 github.com/mattn/go-colorable v0.1.9 h1:sqDoxXbdeALODt0DAeJCVp38ps9ZogZEAXjus69YV3U=
 github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
@@ -350,6 +353,7 @@ github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI
 github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE=
 github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU=
 github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY=
+github.com/olivere/elastic v6.2.37+incompatible h1:UfSGJem5czY+x/LqxgeCBgjDn6St+z8OnsCuxwD3L0U=
 github.com/olivere/elastic v6.2.37+incompatible/go.mod h1:J+q1zQJTgAz9woqsbVRqGeB5G1iqDKVBWLNSYW8yfJ8=
 github.com/olivere/elastic/v7 v7.0.22/go.mod h1:VDexNy9NjmtAkrjNoI7tImv7FR4tf5zUA3ickqu5Pc8=
 github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=

rpc/medical/internal/config/config.go

@@ -7,15 +7,8 @@ import (
 
 type Config struct {
 	zrpc.RpcServerConf
-<<<<<<< HEAD
-	MysqlMain     entity.MysqlMainStruct
-	BaseMysqlMain entity.MysqlMainStruct
-	Es            entity.EsStruct
-	MysqlCommon   entity.MysqlMainStruct
-=======
 	MysqlMain        entity.MysqlMainStruct
 	BaseMysqlMain    entity.MysqlMainStruct
-	GlobalCommonData entity.MysqlMainStruct
 	Es               entity.EsStruct
->>>>>>> 10627a5dbc739e87e4aa15f75c91adb5de38af2d
+	GlobalCommonData entity.MysqlMainStruct
 }

rpc/medical/internal/logic/getnewmsglogic.go

@@ -30,9 +30,9 @@ func NewGetNewMsgLogic(ctx context.Context, svcCtx *svc.ServiceContext) *GetNewM
 func (l *GetNewMsgLogic) GetNewMsg(in *medical.GetNewMsgReq) (*medical.GetNewMsgResp, error) {
 	resp := &medical.GetNewMsgResp{}
 	portrait := service.NewPortrait(&entity.Conn{
-		Mysql:       entity.Mysql,
-		BaseMysql:   entity.BaseMysql,
-		CommonMysql: entity.CommonMysql,
+		Mysql:            entity.Mysql,
+		BaseMysql:        entity.BaseMysql,
+		GlobalCommonData: entity.GlobalCommonData,
 	})
 	info, count, err := portrait.List(in.CompanyName, in.PageSize, in.PageNum)
 	if err != nil || info == nil {

rpc/medical/internal/logic/portraitlogic.go

@@ -31,9 +31,9 @@ func (l *PortraitLogic) Portrait(in *medical.PortraitReq) (*medical.PortraitResp
 	// todo: add your logic here and delete this line
 	resp := &medical.PortraitResp{}
 	portrait := service.NewPortrait(&entity.Conn{
-		Mysql:       entity.Mysql,
-		BaseMysql:   entity.BaseMysql,
-		CommonMysql: entity.CommonMysql,
+		Mysql:            entity.Mysql,
+		BaseMysql:        entity.BaseMysql,
+		GlobalCommonData: entity.GlobalCommonData,
 	})
 	info, err := portrait.Info(in.CompanyId, in.UserId)
 	if err != nil || info == nil {

rpc/medical/medical.proto

@@ -247,9 +247,7 @@ service Medical {
       // 我认领的经销商列表
       rpc ClaimedDistributorList(ClaimedReq) returns(EntClaimListResp);
       // 我认领的医疗机构列表
-      rpc ClaimedInstitutionList(ClaimedReq) returns(CommonResp);
+      rpc ClaimedInstitutionList(ClaimedReq) returns(EntClaimListResp);
       // 招标动态
       rpc GetNewMsg(GetNewMsgReq) returns (GetNewMsgResp);
-      //
-      rpc ClaimedInstitutionList(ClaimedReq) returns(EntClaimListResp);
 }

rpc/medical/medical/medical.go

@@ -33,13 +33,9 @@ type (
 		//  我认领的经销商列表
 		ClaimedDistributorList(ctx context.Context, in *ClaimedReq, opts ...grpc.CallOption) (*EntClaimListResp, error)
 		//  我认领的医疗机构列表
-<<<<<<< HEAD
-		ClaimedInstitutionList(ctx context.Context, in *ClaimedReq, opts ...grpc.CallOption) (*CommonResp, error)
+		ClaimedInstitutionList(ctx context.Context, in *ClaimedReq, opts ...grpc.CallOption) (*EntClaimListResp, error)
 		//  招标动态
 		GetNewMsg(ctx context.Context, in *GetNewMsgReq, opts ...grpc.CallOption) (*GetNewMsgResp, error)
-=======
-		ClaimedInstitutionList(ctx context.Context, in *ClaimedReq, opts ...grpc.CallOption) (*EntClaimListResp, error)
->>>>>>> 10627a5dbc739e87e4aa15f75c91adb5de38af2d
 	}
 
 	defaultMedical struct {

rpc/medical/medical/medical_grpc.pb.go

@@ -43,13 +43,9 @@ type MedicalClient interface {
 	// 我认领的经销商列表
 	ClaimedDistributorList(ctx context.Context, in *ClaimedReq, opts ...grpc.CallOption) (*EntClaimListResp, error)
 	// 我认领的医疗机构列表
-<<<<<<< HEAD
-	ClaimedInstitutionList(ctx context.Context, in *ClaimedReq, opts ...grpc.CallOption) (*CommonResp, error)
+	ClaimedInstitutionList(ctx context.Context, in *ClaimedReq, opts ...grpc.CallOption) (*EntClaimListResp, error)
 	// 招标动态
 	GetNewMsg(ctx context.Context, in *GetNewMsgReq, opts ...grpc.CallOption) (*GetNewMsgResp, error)
-=======
-	ClaimedInstitutionList(ctx context.Context, in *ClaimedReq, opts ...grpc.CallOption) (*EntClaimListResp, error)
->>>>>>> 10627a5dbc739e87e4aa15f75c91adb5de38af2d
 }
 
 type medicalClient struct {
@@ -193,13 +189,9 @@ type MedicalServer interface {
 	// 我认领的经销商列表
 	ClaimedDistributorList(context.Context, *ClaimedReq) (*EntClaimListResp, error)
 	// 我认领的医疗机构列表
-<<<<<<< HEAD
-	ClaimedInstitutionList(context.Context, *ClaimedReq) (*CommonResp, error)
+	ClaimedInstitutionList(context.Context, *ClaimedReq) (*EntClaimListResp, error)
 	// 招标动态
 	GetNewMsg(context.Context, *GetNewMsgReq) (*GetNewMsgResp, error)
-=======
-	ClaimedInstitutionList(context.Context, *ClaimedReq) (*EntClaimListResp, error)
->>>>>>> 10627a5dbc739e87e4aa15f75c91adb5de38af2d
 	mustEmbedUnimplementedMedicalServer()
 }
 

service/portrait.go

@@ -54,7 +54,7 @@ func (this *PortraitService) Info(companyId string, user_id int64) (*entity.Port
 	//获取area_code 省份,城市,区县
 	area, city, district := "", "", ""
 	rdata := (*data)[0]
-	adata := this.CommonMysql.SelectBySql(fmt.Sprintf(`select area,city,district from %s where code =? limit 1`, entity.Code_area), ObjToString(rdata["area_code"]))
+	adata := this.GlobalCommonData.SelectBySql(fmt.Sprintf(`select area,city,district from %s where code =? limit 1`, entity.Code_area), ObjToString(rdata["area_code"]))
 	if adata != nil && len(*adata) > 0 {
 		area = ObjToString((*adata)[0]["area"])
 		city = ObjToString((*adata)[0]["city"])