feat:供应信息附件

api/common/initconfig.go

@@ -2,19 +2,16 @@ package common
 
 import (
 	"flag"
-	"github.com/zeromicro/go-zero/core/conf"
 	"jyInfo/api/internal/config"
 	"log"
+
+	"github.com/zeromicro/go-zero/core/conf"
 )
 
 var configFile = flag.String("fff", "etc/info-api.yaml", "the config file")
-var Sysconfig *map[string]interface{}
+var C config.Config
 
 func init() {
-	var c config.Config
-	conf.MustLoad(*configFile, &c)
-	conf := map[string]interface{}{}
-	conf["AppId"] = c.AppId
-	Sysconfig = &conf
+	conf.MustLoad(*configFile, &C)
 	log.Println("初始化配置")
 }

api/etc/info-api.yaml

@@ -21,4 +21,5 @@ Consumer:
     Hosts:
       - 127.0.0.1:2379
     Key: consumer.rpc
-AppId: 10000
+AppId: 10000
+OssUrl: https://jy-datafile.oss-cn-beijing.aliyuncs.com/

api/info.go

@@ -1,50 +1,43 @@
 package main
 
 import (
-	mc "app.yhyue.com/moapp/jybase/common"
-	"app.yhyue.com/moapp/jybase/endless"
-	"bp.jydev.jianyu360.cn/BaseService/gateway/core/node"
 	"flag"
 	"fmt"
-	"github.com/zeromicro/go-zero/core/conf"
-	"github.com/zeromicro/go-zero/rest"
-	_ "jyInfo/api/common"
-	"jyInfo/api/internal/config"
+	c "jyInfo/api/common"
 	"jyInfo/api/internal/handler"
 	"jyInfo/api/internal/svc"
 	"log"
 	"os"
 	"os/signal"
 	"syscall"
-)
 
-var configFile = flag.String("f", "etc/info-api.yaml", "the config file")
+	mc "app.yhyue.com/moapp/jybase/common"
+	"app.yhyue.com/moapp/jybase/endless"
+	"bp.jydev.jianyu360.cn/BaseService/gateway/core/node"
+	"github.com/zeromicro/go-zero/rest"
+)
 
 func main() {
-
 	flag.Parse()
 
-	var c config.Config
-	conf.MustLoad(*configFile, &c)
-
-	closeNotify, err := node.NewNode(c.Gateway.Etcd...).Register(c.Gateway.ServerCode, mc.InterfaceToStr(c.Port))
+	closeNotify, err := node.NewNode(c.C.Gateway.Etcd...).Register(c.C.Gateway.ServerCode, mc.InterfaceToStr(c.C.Port))
 	if err != nil {
 		panic(err)
 	}
 	//
 	go func() {
-		err := endless.ListenAndServe(":"+mc.InterfaceToStr(c.Webrpcport), nil, func() {})
+		err := endless.ListenAndServe(":"+mc.InterfaceToStr(c.C.Webrpcport), nil, func() {})
 		if err != nil {
 			log.Println("ListenAndServe: ", err)
 		}
 	}()
-	ctx := svc.NewServiceContext(c)
-	server := rest.MustNewServer(c.RestConf)
+	ctx := svc.NewServiceContext(c.C)
+	server := rest.MustNewServer(c.C.RestConf)
 	defer server.Stop()
 
 	handler.RegisterHandlers(server, ctx)
 
-	fmt.Printf("Starting server at %s:%d...\n", c.Host, c.Port)
+	fmt.Printf("Starting server at %s:%d...\n", c.C.Host, c.C.Port)
 	server.Start()
 
 	quit := make(chan os.Signal, 1)

api/internal/config/config.go

@@ -16,4 +16,5 @@ type Config struct {
 	Common   zrpc.RpcClientConf
 	Manager  zrpc.RpcClientConf
 	Consumer zrpc.RpcClientConf
+	OssUrl   string
 }

api/internal/logic/mypublishdetaillogic.go

@@ -3,6 +3,7 @@ package logic
 import (
 	"context"
 	"jyInfo/rpc/consumer/consumer"
+	"log"
 
 	"app.yhyue.com/moapp/jybase/common"
 
@@ -40,6 +41,7 @@ func (l *MyPublishDetailLogic) MyPublishDetail(req *types.MyPublishCommonReq) (r
 			Data:     nil,
 		}, nil
 	}
+	log.Println("publishDetial.Results:", publishDetial.Results)
 	return &types.CommonRes{
 		Err_code: common.IntAll(publishDetial.ErrCode),
 		Err_msg:  publishDetial.ErrMsg,

api/internal/logic/supplyinfodetaillogic.go

@@ -6,6 +6,7 @@ import (
 
 	"app.yhyue.com/moapp/jybase/common"
 
+	cf "jyInfo/api/common"
 	"jyInfo/api/internal/svc"
 	"jyInfo/api/internal/types"
 
@@ -38,9 +39,22 @@ func (l *SupplyInfoDetailLogic) SupplyInfoDetail(req *types.SupplyInfoDetailReq)
 			Data:     nil,
 		}, nil
 	}
+	var attchMap map[string]interface{}
+	if supply.Data != nil && supply.Data.Attach != "" {
+		attchMap = common.StringToMap(supply.Data.Attach)
+		for _, v := range attchMap {
+			attch := common.ObjToMap(v)
+			if attch != nil {
+				(*attch)["ossUrl"] = cf.C.OssUrl
+			}
+		}
+	}
 	return &types.CommonRes{
 		Err_code: common.IntAll(supply.ErrCode),
 		Err_msg:  supply.ErrMsg,
-		Data:     supply.Data,
+		Data: map[string]interface{}{
+			"info":   supply.Data,
+			"attchs": attchMap,
+		},
 	}, nil
 }

rpc/consumer/consumer.go

@@ -21,7 +21,7 @@ import (
 	"google.golang.org/grpc/reflection"
 )
 
-var configFile = flag.String("f", "etc/information.yaml", "the config file")
+var configFile = flag.String("f", "etc/consumer.yaml", "the config file")
 
 func init() {
 	conf.MustLoad(*configFile, &config.CommonConfig)

rpc/consumer/etc/consumer.yaml

@@ -1,6 +1,30 @@
 Name: consumer.rpc
-ListenOn: 127.0.0.1:8080
+ListenOn: 0.0.0.0:8003
+Nsq:
+  ip: 192.168.3.207:4150
+  topic: jyinfo
 Etcd:
   Hosts:
-  - 127.0.0.1:2379
+    - 127.0.0.1:2379
   Key: consumer.rpc
+Webrpcport: 8013
+MysqlMain:
+  dbName: base_service
+  address: 192.168.3.11:3366
+  userName: root
+  passWord: Topnet123
+  maxOpenConns: 5
+  maxIdleConns: 5
+Redis:
+  Host: 192.168.3.206
+  addr: 192.168.3.206:1712
+  modules: other
+SupplyTotal: 30
+Es:
+  addr: http://192.168.3.206:9800
+  size: 5
+Oss:
+  ossEndpoint: oss-cn-beijing.aliyuncs.com
+  ossAccessKeyId: LTAI4G5x9aoZx8dDamQ7vfZi
+  ossAccessKeySecret: Bk98FsbPYXcJe72n1bG3Ssf73acuNh
+  ossBucketName: jy-datafile

rpc/consumer/etc/information.yaml

@@ -1,30 +0,0 @@
-Name: consumer.rpc
-ListenOn: 0.0.0.0:8003
-Nsq:
-  ip: 192.168.3.207:4150
-  topic: jyinfo
-Etcd:
-  Hosts:
-  - 127.0.0.1:2379
-  Key: consumer.rpc
-Webrpcport: 8013
-MysqlMain:
-  dbName: base_service
-  address: 192.168.3.11:3366
-  userName: root
-  passWord: Topnet123
-  maxOpenConns: 5
-  maxIdleConns: 5
-Redis:
-  Host: 192.168.3.206
-  addr: 192.168.3.206:1712
-  modules: other
-SupplyTotal: 30
-Es:
-  addr: http://192.168.3.206:9800
-  size: 5
-Oss:
-  ossEndpoint: oss-cn-beijing.aliyuncs.com
-  ossAccessKeyId: LTAI4G5x9aoZx8dDamQ7vfZi
-  ossAccessKeySecret: Bk98FsbPYXcJe72n1bG3Ssf73acuNh
-  ossBucketName: jy-datafile