From a9e0f6b98e94ebc2f3916819eaf10f6dabed0973 Mon Sep 17 00:00:00 2001
From: laodaming <11058467+laudamine@user.noreply.gitee.com>
Date: Thu, 8 Jun 2023 11:03:20 +0800
Subject: [PATCH] fix

---
 .../data-transfer}/data-transfer.go                | 13 ++++++-------
 .../data-transfer}/etc/data-transfer.yaml          |  0
 .../data-transfer}/internal/config/config.go       |  4 ++--
 .../internal/handler/getstandardlogolisthandler.go |  9 ++++-----
 .../data-transfer}/internal/handler/routes.go      |  5 ++---
 .../internal/logic/getstandardlogolistlogic.go     | 14 +++++++-------
 .../data-transfer}/internal/svc/servicecontext.go  |  6 +++---
 .../data-transfer}/internal/types/types.go         |  0
 server/product/internal/config/config.go           |  2 +-
 .../internal/handler/getproductlisthandler.go      |  6 +++---
 .../internal/handler/getsizebyproducthandler.go    |  4 ++--
 .../internal/handler/getsuccessrecommandhandler.go |  6 +++---
 server/product/internal/handler/routes.go          |  2 +-
 .../product/internal/logic/getproductlistlogic.go  |  4 ++--
 .../internal/logic/getsizebyproductlogic.go        |  4 ++--
 .../internal/logic/getsuccessrecommandlogic.go     |  4 ++--
 server/product/internal/svc/servicecontext.go      |  2 +-
 server/product/product.go                          |  6 +++---
 18 files changed, 44 insertions(+), 47 deletions(-)
 rename {data-transfer => server/data-transfer}/data-transfer.go (60%)
 rename {data-transfer => server/data-transfer}/etc/data-transfer.yaml (100%)
 rename {data-transfer => server/data-transfer}/internal/config/config.go (60%)
 rename {data-transfer => server/data-transfer}/internal/handler/getstandardlogolisthandler.go (63%)
 rename {data-transfer => server/data-transfer}/internal/handler/routes.go (72%)
 rename {data-transfer => server/data-transfer}/internal/logic/getstandardlogolistlogic.go (73%)
 rename {data-transfer => server/data-transfer}/internal/svc/servicecontext.go (61%)
 rename {data-transfer => server/data-transfer}/internal/types/types.go (100%)

diff --git a/data-transfer/data-transfer.go b/server/data-transfer/data-transfer.go
similarity index 60%
rename from data-transfer/data-transfer.go
rename to server/data-transfer/data-transfer.go
index 396cd2b2..b4508d2d 100644
--- a/data-transfer/data-transfer.go
+++ b/server/data-transfer/data-transfer.go
@@ -3,10 +3,9 @@ package main
 import (
 	"flag"
 	"fmt"
-
-	"fusenapi/data-transfer/internal/config"
-	"fusenapi/data-transfer/internal/handler"
-	"fusenapi/data-transfer/internal/svc"
+	config2 "fusenapi/server/data-transfer/internal/config"
+	handler2 "fusenapi/server/data-transfer/internal/handler"
+	svc2 "fusenapi/server/data-transfer/internal/svc"
 
 	"github.com/zeromicro/go-zero/core/conf"
 	"github.com/zeromicro/go-zero/rest"
@@ -17,14 +16,14 @@ var configFile = flag.String("f", "etc/data-transfer.yaml", "the config file")
 func main() {
 	flag.Parse()
 
-	var c config.Config
+	var c config2.Config
 	conf.MustLoad(*configFile, &c)
 
 	server := rest.MustNewServer(c.RestConf)
 	defer server.Stop()
 
-	ctx := svc.NewServiceContext(c)
-	handler.RegisterHandlers(server, ctx)
+	ctx := svc2.NewServiceContext(c)
+	handler2.RegisterHandlers(server, ctx)
 
 	fmt.Printf("Starting server at %s:%d...\n", c.Host, c.Port)
 	server.Start()
diff --git a/data-transfer/etc/data-transfer.yaml b/server/data-transfer/etc/data-transfer.yaml
similarity index 100%
rename from data-transfer/etc/data-transfer.yaml
rename to server/data-transfer/etc/data-transfer.yaml
diff --git a/data-transfer/internal/config/config.go b/server/data-transfer/internal/config/config.go
similarity index 60%
rename from data-transfer/internal/config/config.go
rename to server/data-transfer/internal/config/config.go
index b96d5f2f..cd024e85 100644
--- a/data-transfer/internal/config/config.go
+++ b/server/data-transfer/internal/config/config.go
@@ -1,12 +1,12 @@
 package config
 
 import (
-	"fusenapi/data-transfer/internal/types"
+	types2 "fusenapi/server/data-transfer/internal/types"
 	"github.com/zeromicro/go-zero/rest"
 )
 
 type Config struct {
 	rest.RestConf
 	SourceMysql string
-	Auth        types.Auth
+	Auth        types2.Auth
 }
diff --git a/data-transfer/internal/handler/getstandardlogolisthandler.go b/server/data-transfer/internal/handler/getstandardlogolisthandler.go
similarity index 63%
rename from data-transfer/internal/handler/getstandardlogolisthandler.go
rename to server/data-transfer/internal/handler/getstandardlogolisthandler.go
index 8c9741c3..946e846d 100644
--- a/data-transfer/internal/handler/getstandardlogolisthandler.go
+++ b/server/data-transfer/internal/handler/getstandardlogolisthandler.go
@@ -2,18 +2,17 @@ package handler
 
 import (
 	"errors"
+	logic2 "fusenapi/server/data-transfer/internal/logic"
+	svc2 "fusenapi/server/data-transfer/internal/svc"
 	"net/http"
 
 	"github.com/zeromicro/go-zero/core/logx"
 	"github.com/zeromicro/go-zero/rest/httpx"
-
-	"fusenapi/data-transfer/internal/logic"
-	"fusenapi/data-transfer/internal/svc"
 )
 
-func GetStandardLogoListHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
+func GetStandardLogoListHandler(svcCtx *svc2.ServiceContext) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
-		l := logic.NewGetStandardLogoListLogic(r.Context(), svcCtx)
+		l := logic2.NewGetStandardLogoListLogic(r.Context(), svcCtx)
 		resp := l.GetStandardLogoList()
 		if resp != nil {
 			httpx.OkJsonCtx(r.Context(), w, resp)
diff --git a/data-transfer/internal/handler/routes.go b/server/data-transfer/internal/handler/routes.go
similarity index 72%
rename from data-transfer/internal/handler/routes.go
rename to server/data-transfer/internal/handler/routes.go
index 260df581..f06f5e4b 100644
--- a/data-transfer/internal/handler/routes.go
+++ b/server/data-transfer/internal/handler/routes.go
@@ -2,14 +2,13 @@
 package handler
 
 import (
+	svc2 "fusenapi/server/data-transfer/internal/svc"
 	"net/http"
 
-	"fusenapi/data-transfer/internal/svc"
-
 	"github.com/zeromicro/go-zero/rest"
 )
 
-func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) {
+func RegisterHandlers(server *rest.Server, serverCtx *svc2.ServiceContext) {
 	server.AddRoutes(
 		[]rest.Route{
 			{
diff --git a/data-transfer/internal/logic/getstandardlogolistlogic.go b/server/data-transfer/internal/logic/getstandardlogolistlogic.go
similarity index 73%
rename from data-transfer/internal/logic/getstandardlogolistlogic.go
rename to server/data-transfer/internal/logic/getstandardlogolistlogic.go
index 89e7ad32..e6edf9bc 100644
--- a/data-transfer/internal/logic/getstandardlogolistlogic.go
+++ b/server/data-transfer/internal/logic/getstandardlogolistlogic.go
@@ -2,9 +2,9 @@ package logic
 
 import (
 	"context"
-	"fusenapi/data-transfer/internal/svc"
-	"fusenapi/data-transfer/internal/types"
 	"fusenapi/model"
+	svc2 "fusenapi/server/data-transfer/internal/svc"
+	types2 "fusenapi/server/data-transfer/internal/types"
 	"fusenapi/utils/basic"
 
 	"github.com/zeromicro/go-zero/core/logx"
@@ -13,10 +13,10 @@ import (
 type GetStandardLogoListLogic struct {
 	logx.Logger
 	ctx    context.Context
-	svcCtx *svc.ServiceContext
+	svcCtx *svc2.ServiceContext
 }
 
-func NewGetStandardLogoListLogic(ctx context.Context, svcCtx *svc.ServiceContext) *GetStandardLogoListLogic {
+func NewGetStandardLogoListLogic(ctx context.Context, svcCtx *svc2.ServiceContext) *GetStandardLogoListLogic {
 	return &GetStandardLogoListLogic{
 		Logger: logx.WithContext(ctx),
 		ctx:    ctx,
@@ -25,16 +25,16 @@ func NewGetStandardLogoListLogic(ctx context.Context, svcCtx *svc.ServiceContext
 }
 
 // 获取标准logo列表
-func (l *GetStandardLogoListLogic) GetStandardLogoList() (resp *types.Response) {
+func (l *GetStandardLogoListLogic) GetStandardLogoList() (resp *types2.Response) {
 	standardLogoModel := model.NewFsStandardLogoModel(l.svcCtx.MysqlConn)
 	logoList, err := standardLogoModel.GetAll(l.ctx)
 	if err != nil {
 		logx.Error(err)
 		return resp.SetStatusWithMessage(basic.CodeServiceErr, "failed to get standard logo list")
 	}
-	list := make([]types.GetStandardLogoListRsp, 0, len(logoList))
+	list := make([]types2.GetStandardLogoListRsp, 0, len(logoList))
 	for _, v := range logoList {
-		list = append(list, types.GetStandardLogoListRsp{
+		list = append(list, types2.GetStandardLogoListRsp{
 			Id:   v.Id,
 			Name: v.Name,
 			Url:  v.Image,
diff --git a/data-transfer/internal/svc/servicecontext.go b/server/data-transfer/internal/svc/servicecontext.go
similarity index 61%
rename from data-transfer/internal/svc/servicecontext.go
rename to server/data-transfer/internal/svc/servicecontext.go
index db1b3062..0ca940d3 100644
--- a/data-transfer/internal/svc/servicecontext.go
+++ b/server/data-transfer/internal/svc/servicecontext.go
@@ -1,17 +1,17 @@
 package svc
 
 import (
-	"fusenapi/data-transfer/internal/config"
+	config2 "fusenapi/server/data-transfer/internal/config"
 	"github.com/zeromicro/go-zero/core/stores/sqlx"
 )
 
 type ServiceContext struct {
-	Config config.Config
+	Config config2.Config
 
 	MysqlConn sqlx.SqlConn
 }
 
-func NewServiceContext(c config.Config) *ServiceContext {
+func NewServiceContext(c config2.Config) *ServiceContext {
 	return &ServiceContext{
 		Config:    c,
 		MysqlConn: sqlx.NewMysql(c.SourceMysql),
diff --git a/data-transfer/internal/types/types.go b/server/data-transfer/internal/types/types.go
similarity index 100%
rename from data-transfer/internal/types/types.go
rename to server/data-transfer/internal/types/types.go
diff --git a/server/product/internal/config/config.go b/server/product/internal/config/config.go
index 999479a4..926fad3e 100644
--- a/server/product/internal/config/config.go
+++ b/server/product/internal/config/config.go
@@ -1,7 +1,7 @@
 package config
 
 import (
-	"fusenapi/product/internal/types"
+	"fusenapi/server/product/internal/types"
 	"github.com/zeromicro/go-zero/rest"
 )
 
diff --git a/server/product/internal/handler/getproductlisthandler.go b/server/product/internal/handler/getproductlisthandler.go
index 5e6e94ce..9bc86240 100644
--- a/server/product/internal/handler/getproductlisthandler.go
+++ b/server/product/internal/handler/getproductlisthandler.go
@@ -7,9 +7,9 @@ import (
 	"github.com/zeromicro/go-zero/core/logx"
 	"github.com/zeromicro/go-zero/rest/httpx"
 
-	"fusenapi/product/internal/logic"
-	"fusenapi/product/internal/svc"
-	"fusenapi/product/internal/types"
+	"fusenapi/server/product/internal/logic"
+	"fusenapi/server/product/internal/svc"
+	"fusenapi/server/product/internal/types"
 )
 
 func GetProductListHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
diff --git a/server/product/internal/handler/getsizebyproducthandler.go b/server/product/internal/handler/getsizebyproducthandler.go
index e52ebe9f..1c4561de 100644
--- a/server/product/internal/handler/getsizebyproducthandler.go
+++ b/server/product/internal/handler/getsizebyproducthandler.go
@@ -7,8 +7,8 @@ import (
 	"github.com/zeromicro/go-zero/core/logx"
 	"github.com/zeromicro/go-zero/rest/httpx"
 
-	"fusenapi/product/internal/logic"
-	"fusenapi/product/internal/svc"
+	"fusenapi/server/product/internal/logic"
+	"fusenapi/server/product/internal/svc"
 )
 
 func GetSizeByProductHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
diff --git a/server/product/internal/handler/getsuccessrecommandhandler.go b/server/product/internal/handler/getsuccessrecommandhandler.go
index 0f154866..0a8146e1 100644
--- a/server/product/internal/handler/getsuccessrecommandhandler.go
+++ b/server/product/internal/handler/getsuccessrecommandhandler.go
@@ -7,9 +7,9 @@ import (
 	"github.com/zeromicro/go-zero/core/logx"
 	"github.com/zeromicro/go-zero/rest/httpx"
 
-	"fusenapi/product/internal/logic"
-	"fusenapi/product/internal/svc"
-	"fusenapi/product/internal/types"
+	"fusenapi/server/product/internal/logic"
+	"fusenapi/server/product/internal/svc"
+	"fusenapi/server/product/internal/types"
 )
 
 func GetSuccessRecommandHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
diff --git a/server/product/internal/handler/routes.go b/server/product/internal/handler/routes.go
index 5d55deee..94658c78 100644
--- a/server/product/internal/handler/routes.go
+++ b/server/product/internal/handler/routes.go
@@ -4,7 +4,7 @@ package handler
 import (
 	"net/http"
 
-	"fusenapi/product/internal/svc"
+	"fusenapi/server/product/internal/svc"
 
 	"github.com/zeromicro/go-zero/rest"
 )
diff --git a/server/product/internal/logic/getproductlistlogic.go b/server/product/internal/logic/getproductlistlogic.go
index 74a2331d..15569b02 100644
--- a/server/product/internal/logic/getproductlistlogic.go
+++ b/server/product/internal/logic/getproductlistlogic.go
@@ -7,8 +7,8 @@ import (
 	"fmt"
 	"fusenapi/constants"
 	"fusenapi/model"
-	"fusenapi/product/internal/svc"
-	"fusenapi/product/internal/types"
+	"fusenapi/server/product/internal/svc"
+	"fusenapi/server/product/internal/types"
 	"fusenapi/utils/auth"
 	"fusenapi/utils/basic"
 	"fusenapi/utils/format"
diff --git a/server/product/internal/logic/getsizebyproductlogic.go b/server/product/internal/logic/getsizebyproductlogic.go
index 9ec5193d..8cb2d767 100644
--- a/server/product/internal/logic/getsizebyproductlogic.go
+++ b/server/product/internal/logic/getsizebyproductlogic.go
@@ -10,8 +10,8 @@ import (
 	"fusenapi/utils/format"
 	"strings"
 
-	"fusenapi/product/internal/svc"
-	"fusenapi/product/internal/types"
+	"fusenapi/server/product/internal/svc"
+	"fusenapi/server/product/internal/types"
 
 	"github.com/zeromicro/go-zero/core/logx"
 )
diff --git a/server/product/internal/logic/getsuccessrecommandlogic.go b/server/product/internal/logic/getsuccessrecommandlogic.go
index 43d27f3c..295e85ef 100644
--- a/server/product/internal/logic/getsuccessrecommandlogic.go
+++ b/server/product/internal/logic/getsuccessrecommandlogic.go
@@ -4,8 +4,8 @@ import (
 	"context"
 	"errors"
 	"fusenapi/model"
-	"fusenapi/product/internal/svc"
-	"fusenapi/product/internal/types"
+	"fusenapi/server/product/internal/svc"
+	"fusenapi/server/product/internal/types"
 	"fusenapi/utils/auth"
 	"fusenapi/utils/basic"
 	"fusenapi/utils/image"
diff --git a/server/product/internal/svc/servicecontext.go b/server/product/internal/svc/servicecontext.go
index 0f1c06b7..aaf1bc69 100644
--- a/server/product/internal/svc/servicecontext.go
+++ b/server/product/internal/svc/servicecontext.go
@@ -1,7 +1,7 @@
 package svc
 
 import (
-	"fusenapi/product/internal/config"
+	"fusenapi/server/product/internal/config"
 	"github.com/zeromicro/go-zero/core/stores/sqlx"
 )
 
diff --git a/server/product/product.go b/server/product/product.go
index 99047491..0c583a1c 100644
--- a/server/product/product.go
+++ b/server/product/product.go
@@ -4,9 +4,9 @@ import (
 	"flag"
 	"fmt"
 
-	"fusenapi/product/internal/config"
-	"fusenapi/product/internal/handler"
-	"fusenapi/product/internal/svc"
+	"fusenapi/server/product/internal/config"
+	"fusenapi/server/product/internal/handler"
+	"fusenapi/server/product/internal/svc"
 
 	"github.com/zeromicro/go-zero/core/conf"
 	"github.com/zeromicro/go-zero/rest"