Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop

server/product-template/internal/logic/gettemplatevdetaillogic.go

@@ -161,7 +161,7 @@ func (l *GetTemplatevDetailLogic) GetTemplatevDetail(req *types.GetTemplatevDeta
 		optionModelInfoList := make([]interface{}, 0, len(model3dList))
 		for _, v := range model3dList {
 			info := make(map[string]interface{})
-			if v.ModelInfo != nil {
+			if v.ModelInfo != nil && *v.ModelInfo != "" {
 				if err = json.Unmarshal([]byte(*v.ModelInfo), &info); err != nil {
 					logx.Error(err)
 					return resp.SetStatusWithMessage(basic.CodeServiceErr, "failed to parse model info")

server/product-template/product-template.go

@@ -29,21 +29,3 @@ func main() {
 	fmt.Printf("Starting server at %s:%d...\n", c.Host, c.Port)
 	server.Start()
 }
-
-// var testConfigFile = flag.String("f", "../etc/product-templatev2.yaml", "the config file")
-// var cnf config.Config
-
-// func GetTestServer() *rest.Server {
-// 	flag.Parse()
-
-// 	conf.MustLoad(*testConfigFile, &cnf)
-
-// 	server := rest.MustNewServer(cnf.RestConf)
-// 	defer server.Stop()
-
-// 	ctx := svc.NewServiceContext(cnf)
-// 	handler.RegisterHandlers(server, ctx)
-
-// 	fmt.Printf("Starting server at %s:%d...\n", cnf.Host, cnf.Port)
-// 	return server
-// }