Selaa lähdekoodia

feat:初始化

wangchuanjin 9 kuukautta sitten
vanhempi
commit
9c86b60ead
41 muutettua tiedostoa jossa 98 lisäystä ja 141 poistoa
  1. 3 3
      api/common/initconfig.go
  2. 1 46
      api/internal/config/config.go
  3. 3 3
      api/internal/handler/addorupdatehandler.go
  4. 3 3
      api/internal/handler/allprojecthandler.go
  5. 3 3
      api/internal/handler/associatehandler.go
  6. 3 3
      api/internal/handler/coophistorylisthandler.go
  7. 3 3
      api/internal/handler/infodetailhandler.go
  8. 3 3
      api/internal/handler/networklisthandler.go
  9. 3 3
      api/internal/handler/ownercooperatehandler.go
  10. 3 3
      api/internal/handler/ownerlisthandler.go
  11. 3 3
      api/internal/handler/ownerroutehandler.go
  12. 3 3
      api/internal/handler/projecthistoryhandler.go
  13. 3 3
      api/internal/handler/projectlisthandler.go
  14. 3 3
      api/internal/handler/prpnameasshandler.go
  15. 1 1
      api/internal/handler/routes.go
  16. 3 3
      api/internal/logic/addorupdatelogic.go
  17. 3 3
      api/internal/logic/allprojectlogic.go
  18. 3 3
      api/internal/logic/associatelogic.go
  19. 3 3
      api/internal/logic/coophistorylistlogic.go
  20. 3 3
      api/internal/logic/infodetaillogic.go
  21. 3 3
      api/internal/logic/networklistlogic.go
  22. 3 3
      api/internal/logic/ownercooperatelogic.go
  23. 3 3
      api/internal/logic/ownerlistlogic.go
  24. 3 3
      api/internal/logic/ownerroutelogic.go
  25. 3 3
      api/internal/logic/projecthistorylogic.go
  26. 3 3
      api/internal/logic/projectlistlogic.go
  27. 2 2
      api/internal/logic/prpnameasslogic.go
  28. 2 2
      api/internal/service/CoopHistoryService.go
  29. 2 2
      api/internal/service/network.go
  30. 3 3
      api/internal/service/network_test.go
  31. 2 2
      api/internal/service/owner.go
  32. 2 2
      api/internal/service/plistService.go
  33. 1 1
      api/internal/svc/servicecontext.go
  34. 6 0
      api/logs/access.log
  35. 0 0
      api/logs/error.log
  36. 0 0
      api/logs/severe.log
  37. 0 0
      api/logs/slow.log
  38. 0 0
      api/logs/stat.log
  39. 3 3
      api/networkmanage.go
  40. 0 4
      entity/db.go
  41. 1 1
      go.mod

+ 3 - 3
api/common/initconfig.go

@@ -11,15 +11,15 @@ import (
 	"app.yhyue.com/moapp/jybase/mongodb"
 	"app.yhyue.com/moapp/jybase/mysql"
 	"app.yhyue.com/moapp/jybase/redis"
-	"bp.jydev.jianyu360.cn/CRM/application/api/internal/config"
-	"bp.jydev.jianyu360.cn/CRM/application/entity"
+	"bp.jydev.jianyu360.cn/CRM/networkManage/api/internal/config"
+	"bp.jydev.jianyu360.cn/CRM/networkManage/entity"
 	"github.com/ClickHouse/clickhouse-go/v2"
 	"github.com/ClickHouse/clickhouse-go/v2/lib/driver"
 	"github.com/zeromicro/go-zero/core/conf"
 	"github.com/zeromicro/go-zero/core/logx"
 )
 
-var configFile = flag.String("fs", "etc/crmapplication.yaml", "the config file")
+var configFile = flag.String("fs", "etc/networkmanage.yaml", "the config file")
 var C config.Config
 
 var logFile = flag.String("lf", "etc/logs.yaml", "the config file")

+ 1 - 46
api/internal/config/config.go

@@ -1,9 +1,8 @@
 package config
 
 import (
-	"bp.jydev.jianyu360.cn/CRM/application/entity"
+	"bp.jydev.jianyu360.cn/CRM/networkManage/entity"
 	"github.com/zeromicro/go-zero/rest"
-	"github.com/zeromicro/go-zero/zrpc"
 )
 
 type Config struct {
@@ -12,14 +11,6 @@ type Config struct {
 		ServerCode string
 		Etcd       []string
 	}
-	UserCenterRpc     zrpc.RpcClientConf
-	FileCenterRpc     zrpc.RpcClientConf
-	OssBucketName     string
-	OssUrl            string
-	BaseCenterRpc     zrpc.RpcClientConf
-	NextFollowUpTime  int
-	SocialPlatformRpc zrpc.RpcClientConf
-	ResourceCenterKey string
 }
 
 type Db struct {
@@ -37,39 +28,3 @@ type CHouseConfig struct {
 	MaxIdleConns int
 	MaxOpenConns int
 }
-type Push struct {
-	TimeTaskSwitch    bool
-	StationMailHref   string
-	StationMailAction string
-	TestId            string
-	SaleClue          struct {
-		Create Create
-		Due    Due
-	}
-	SaleChance struct {
-		Create Create
-		Due    Due
-	}
-	Custom struct {
-		Create Create
-		Due    Due
-	}
-	PushTime string
-	DueDay   int
-}
-
-type Create struct {
-	Title           string
-	MySelfContent   string
-	TransferContent string
-	MyselfPcHref    string
-	TransferPcHref  string
-	MobileHref      string
-}
-
-type Due struct {
-	Title      string
-	Content    string
-	PcHref     string
-	MobileHref string
-}

+ 3 - 3
api/internal/handler/addorupdatehandler.go

@@ -3,9 +3,9 @@ package handler
 import (
 	"net/http"
 
-	"bp.jydev.jianyu360.cn/CRM/application/api/internal/logic"
-	"bp.jydev.jianyu360.cn/CRM/application/api/internal/svc"
-	"bp.jydev.jianyu360.cn/CRM/application/api/internal/types"
+	"bp.jydev.jianyu360.cn/CRM/networkManage/api/internal/logic"
+	"bp.jydev.jianyu360.cn/CRM/networkManage/api/internal/svc"
+	"bp.jydev.jianyu360.cn/CRM/networkManage/api/internal/types"
 	"github.com/zeromicro/go-zero/rest/httpx"
 )
 

+ 3 - 3
api/internal/handler/allprojecthandler.go

@@ -3,9 +3,9 @@ package handler
 import (
 	"net/http"
 
-	"bp.jydev.jianyu360.cn/CRM/application/api/internal/logic"
-	"bp.jydev.jianyu360.cn/CRM/application/api/internal/svc"
-	"bp.jydev.jianyu360.cn/CRM/application/api/internal/types"
+	"bp.jydev.jianyu360.cn/CRM/networkManage/api/internal/logic"
+	"bp.jydev.jianyu360.cn/CRM/networkManage/api/internal/svc"
+	"bp.jydev.jianyu360.cn/CRM/networkManage/api/internal/types"
 	"github.com/zeromicro/go-zero/rest/httpx"
 )
 

+ 3 - 3
api/internal/handler/associatehandler.go

@@ -3,9 +3,9 @@ package handler
 import (
 	"net/http"
 
-	"bp.jydev.jianyu360.cn/CRM/application/api/internal/logic"
-	"bp.jydev.jianyu360.cn/CRM/application/api/internal/svc"
-	"bp.jydev.jianyu360.cn/CRM/application/api/internal/types"
+	"bp.jydev.jianyu360.cn/CRM/networkManage/api/internal/logic"
+	"bp.jydev.jianyu360.cn/CRM/networkManage/api/internal/svc"
+	"bp.jydev.jianyu360.cn/CRM/networkManage/api/internal/types"
 	"github.com/zeromicro/go-zero/rest/httpx"
 )
 

+ 3 - 3
api/internal/handler/coophistorylisthandler.go

@@ -3,9 +3,9 @@ package handler
 import (
 	"net/http"
 
-	"bp.jydev.jianyu360.cn/CRM/application/api/internal/logic"
-	"bp.jydev.jianyu360.cn/CRM/application/api/internal/svc"
-	"bp.jydev.jianyu360.cn/CRM/application/api/internal/types"
+	"bp.jydev.jianyu360.cn/CRM/networkManage/api/internal/logic"
+	"bp.jydev.jianyu360.cn/CRM/networkManage/api/internal/svc"
+	"bp.jydev.jianyu360.cn/CRM/networkManage/api/internal/types"
 	"github.com/zeromicro/go-zero/rest/httpx"
 )
 

+ 3 - 3
api/internal/handler/infodetailhandler.go

@@ -3,9 +3,9 @@ package handler
 import (
 	"net/http"
 
-	"bp.jydev.jianyu360.cn/CRM/application/api/internal/logic"
-	"bp.jydev.jianyu360.cn/CRM/application/api/internal/svc"
-	"bp.jydev.jianyu360.cn/CRM/application/api/internal/types"
+	"bp.jydev.jianyu360.cn/CRM/networkManage/api/internal/logic"
+	"bp.jydev.jianyu360.cn/CRM/networkManage/api/internal/svc"
+	"bp.jydev.jianyu360.cn/CRM/networkManage/api/internal/types"
 	"github.com/zeromicro/go-zero/rest/httpx"
 )
 

+ 3 - 3
api/internal/handler/networklisthandler.go

@@ -3,9 +3,9 @@ package handler
 import (
 	"net/http"
 
-	"bp.jydev.jianyu360.cn/CRM/application/api/internal/logic"
-	"bp.jydev.jianyu360.cn/CRM/application/api/internal/svc"
-	"bp.jydev.jianyu360.cn/CRM/application/api/internal/types"
+	"bp.jydev.jianyu360.cn/CRM/networkManage/api/internal/logic"
+	"bp.jydev.jianyu360.cn/CRM/networkManage/api/internal/svc"
+	"bp.jydev.jianyu360.cn/CRM/networkManage/api/internal/types"
 	"github.com/zeromicro/go-zero/rest/httpx"
 )
 

+ 3 - 3
api/internal/handler/ownercooperatehandler.go

@@ -3,9 +3,9 @@ package handler
 import (
 	"net/http"
 
-	"bp.jydev.jianyu360.cn/CRM/application/api/internal/logic"
-	"bp.jydev.jianyu360.cn/CRM/application/api/internal/svc"
-	"bp.jydev.jianyu360.cn/CRM/application/api/internal/types"
+	"bp.jydev.jianyu360.cn/CRM/networkManage/api/internal/logic"
+	"bp.jydev.jianyu360.cn/CRM/networkManage/api/internal/svc"
+	"bp.jydev.jianyu360.cn/CRM/networkManage/api/internal/types"
 	"github.com/zeromicro/go-zero/rest/httpx"
 )
 

+ 3 - 3
api/internal/handler/ownerlisthandler.go

@@ -3,9 +3,9 @@ package handler
 import (
 	"net/http"
 
-	"bp.jydev.jianyu360.cn/CRM/application/api/internal/logic"
-	"bp.jydev.jianyu360.cn/CRM/application/api/internal/svc"
-	"bp.jydev.jianyu360.cn/CRM/application/api/internal/types"
+	"bp.jydev.jianyu360.cn/CRM/networkManage/api/internal/logic"
+	"bp.jydev.jianyu360.cn/CRM/networkManage/api/internal/svc"
+	"bp.jydev.jianyu360.cn/CRM/networkManage/api/internal/types"
 	"github.com/zeromicro/go-zero/rest/httpx"
 )
 

+ 3 - 3
api/internal/handler/ownerroutehandler.go

@@ -3,9 +3,9 @@ package handler
 import (
 	"net/http"
 
-	"bp.jydev.jianyu360.cn/CRM/application/api/internal/logic"
-	"bp.jydev.jianyu360.cn/CRM/application/api/internal/svc"
-	"bp.jydev.jianyu360.cn/CRM/application/api/internal/types"
+	"bp.jydev.jianyu360.cn/CRM/networkManage/api/internal/logic"
+	"bp.jydev.jianyu360.cn/CRM/networkManage/api/internal/svc"
+	"bp.jydev.jianyu360.cn/CRM/networkManage/api/internal/types"
 	"github.com/zeromicro/go-zero/rest/httpx"
 )
 

+ 3 - 3
api/internal/handler/projecthistoryhandler.go

@@ -3,9 +3,9 @@ package handler
 import (
 	"net/http"
 
-	"bp.jydev.jianyu360.cn/CRM/application/api/internal/logic"
-	"bp.jydev.jianyu360.cn/CRM/application/api/internal/svc"
-	"bp.jydev.jianyu360.cn/CRM/application/api/internal/types"
+	"bp.jydev.jianyu360.cn/CRM/networkManage/api/internal/logic"
+	"bp.jydev.jianyu360.cn/CRM/networkManage/api/internal/svc"
+	"bp.jydev.jianyu360.cn/CRM/networkManage/api/internal/types"
 	"github.com/zeromicro/go-zero/rest/httpx"
 )
 

+ 3 - 3
api/internal/handler/projectlisthandler.go

@@ -3,9 +3,9 @@ package handler
 import (
 	"net/http"
 
-	"bp.jydev.jianyu360.cn/CRM/application/api/internal/logic"
-	"bp.jydev.jianyu360.cn/CRM/application/api/internal/svc"
-	"bp.jydev.jianyu360.cn/CRM/application/api/internal/types"
+	"bp.jydev.jianyu360.cn/CRM/networkManage/api/internal/logic"
+	"bp.jydev.jianyu360.cn/CRM/networkManage/api/internal/svc"
+	"bp.jydev.jianyu360.cn/CRM/networkManage/api/internal/types"
 	"github.com/zeromicro/go-zero/rest/httpx"
 )
 

+ 3 - 3
api/internal/handler/prpnameasshandler.go

@@ -3,9 +3,9 @@ package handler
 import (
 	"net/http"
 
-	"bp.jydev.jianyu360.cn/CRM/application/api/internal/logic"
-	"bp.jydev.jianyu360.cn/CRM/application/api/internal/svc"
-	"bp.jydev.jianyu360.cn/CRM/application/api/internal/types"
+	"bp.jydev.jianyu360.cn/CRM/networkManage/api/internal/logic"
+	"bp.jydev.jianyu360.cn/CRM/networkManage/api/internal/svc"
+	"bp.jydev.jianyu360.cn/CRM/networkManage/api/internal/types"
 	"github.com/zeromicro/go-zero/rest/httpx"
 )
 

+ 1 - 1
api/internal/handler/routes.go

@@ -4,7 +4,7 @@ package handler
 import (
 	"net/http"
 
-	"bp.jydev.jianyu360.cn/CRM/application/api/internal/svc"
+	"bp.jydev.jianyu360.cn/CRM/networkManage/api/internal/svc"
 
 	"github.com/zeromicro/go-zero/rest"
 )

+ 3 - 3
api/internal/logic/addorupdatelogic.go

@@ -4,9 +4,9 @@ import (
 	"context"
 	"fmt"
 
-	"bp.jydev.jianyu360.cn/CRM/application/api/internal/service"
-	"bp.jydev.jianyu360.cn/CRM/application/api/internal/svc"
-	"bp.jydev.jianyu360.cn/CRM/application/api/internal/types"
+	"bp.jydev.jianyu360.cn/CRM/networkManage/api/internal/service"
+	"bp.jydev.jianyu360.cn/CRM/networkManage/api/internal/svc"
+	"bp.jydev.jianyu360.cn/CRM/networkManage/api/internal/types"
 	"github.com/zeromicro/go-zero/core/logx"
 )
 

+ 3 - 3
api/internal/logic/allprojectlogic.go

@@ -4,9 +4,9 @@ import (
 	"context"
 	"fmt"
 
-	"bp.jydev.jianyu360.cn/CRM/application/api/internal/service"
-	"bp.jydev.jianyu360.cn/CRM/application/api/internal/svc"
-	"bp.jydev.jianyu360.cn/CRM/application/api/internal/types"
+	"bp.jydev.jianyu360.cn/CRM/networkManage/api/internal/service"
+	"bp.jydev.jianyu360.cn/CRM/networkManage/api/internal/svc"
+	"bp.jydev.jianyu360.cn/CRM/networkManage/api/internal/types"
 	"github.com/zeromicro/go-zero/core/logx"
 )
 

+ 3 - 3
api/internal/logic/associatelogic.go

@@ -4,9 +4,9 @@ import (
 	"context"
 	"fmt"
 
-	"bp.jydev.jianyu360.cn/CRM/application/api/internal/service"
-	"bp.jydev.jianyu360.cn/CRM/application/api/internal/svc"
-	"bp.jydev.jianyu360.cn/CRM/application/api/internal/types"
+	"bp.jydev.jianyu360.cn/CRM/networkManage/api/internal/service"
+	"bp.jydev.jianyu360.cn/CRM/networkManage/api/internal/svc"
+	"bp.jydev.jianyu360.cn/CRM/networkManage/api/internal/types"
 	"github.com/zeromicro/go-zero/core/logx"
 )
 

+ 3 - 3
api/internal/logic/coophistorylistlogic.go

@@ -1,9 +1,9 @@
 package logic
 
 import (
-	"bp.jydev.jianyu360.cn/CRM/application/api/internal/service"
-	"bp.jydev.jianyu360.cn/CRM/application/api/internal/svc"
-	"bp.jydev.jianyu360.cn/CRM/application/api/internal/types"
+	"bp.jydev.jianyu360.cn/CRM/networkManage/api/internal/service"
+	"bp.jydev.jianyu360.cn/CRM/networkManage/api/internal/svc"
+	"bp.jydev.jianyu360.cn/CRM/networkManage/api/internal/types"
 	"context"
 	"fmt"
 

+ 3 - 3
api/internal/logic/infodetaillogic.go

@@ -3,12 +3,12 @@ package logic
 import (
 	"app.yhyue.com/moapp/jybase/common"
 	"app.yhyue.com/moapp/jybase/encrypt"
-	T "bp.jydev.jianyu360.cn/CRM/application/api/common"
+	T "bp.jydev.jianyu360.cn/CRM/networkManage/api/common"
 	"context"
 	"fmt"
 
-	"bp.jydev.jianyu360.cn/CRM/application/api/internal/svc"
-	"bp.jydev.jianyu360.cn/CRM/application/api/internal/types"
+	"bp.jydev.jianyu360.cn/CRM/networkManage/api/internal/svc"
+	"bp.jydev.jianyu360.cn/CRM/networkManage/api/internal/types"
 
 	"github.com/zeromicro/go-zero/core/logx"
 )

+ 3 - 3
api/internal/logic/networklistlogic.go

@@ -1,9 +1,9 @@
 package logic
 
 import (
-	"bp.jydev.jianyu360.cn/CRM/application/api/internal/service"
-	"bp.jydev.jianyu360.cn/CRM/application/api/internal/svc"
-	"bp.jydev.jianyu360.cn/CRM/application/api/internal/types"
+	"bp.jydev.jianyu360.cn/CRM/networkManage/api/internal/service"
+	"bp.jydev.jianyu360.cn/CRM/networkManage/api/internal/svc"
+	"bp.jydev.jianyu360.cn/CRM/networkManage/api/internal/types"
 	"context"
 	"fmt"
 	"github.com/zeromicro/go-zero/core/logx"

+ 3 - 3
api/internal/logic/ownercooperatelogic.go

@@ -1,12 +1,12 @@
 package logic
 
 import (
-	"bp.jydev.jianyu360.cn/CRM/application/api/internal/service"
+	"bp.jydev.jianyu360.cn/CRM/networkManage/api/internal/service"
 	"context"
 	"fmt"
 
-	"bp.jydev.jianyu360.cn/CRM/application/api/internal/svc"
-	"bp.jydev.jianyu360.cn/CRM/application/api/internal/types"
+	"bp.jydev.jianyu360.cn/CRM/networkManage/api/internal/svc"
+	"bp.jydev.jianyu360.cn/CRM/networkManage/api/internal/types"
 
 	"github.com/zeromicro/go-zero/core/logx"
 )

+ 3 - 3
api/internal/logic/ownerlistlogic.go

@@ -4,10 +4,10 @@ import (
 	"context"
 	"fmt"
 
-	"bp.jydev.jianyu360.cn/CRM/application/api/internal/service"
+	"bp.jydev.jianyu360.cn/CRM/networkManage/api/internal/service"
 
-	"bp.jydev.jianyu360.cn/CRM/application/api/internal/svc"
-	"bp.jydev.jianyu360.cn/CRM/application/api/internal/types"
+	"bp.jydev.jianyu360.cn/CRM/networkManage/api/internal/svc"
+	"bp.jydev.jianyu360.cn/CRM/networkManage/api/internal/types"
 
 	"github.com/zeromicro/go-zero/core/logx"
 )

+ 3 - 3
api/internal/logic/ownerroutelogic.go

@@ -1,12 +1,12 @@
 package logic
 
 import (
-	"bp.jydev.jianyu360.cn/CRM/application/api/internal/service"
+	"bp.jydev.jianyu360.cn/CRM/networkManage/api/internal/service"
 	"context"
 	"fmt"
 
-	"bp.jydev.jianyu360.cn/CRM/application/api/internal/svc"
-	"bp.jydev.jianyu360.cn/CRM/application/api/internal/types"
+	"bp.jydev.jianyu360.cn/CRM/networkManage/api/internal/svc"
+	"bp.jydev.jianyu360.cn/CRM/networkManage/api/internal/types"
 
 	"github.com/zeromicro/go-zero/core/logx"
 )

+ 3 - 3
api/internal/logic/projecthistorylogic.go

@@ -1,12 +1,12 @@
 package logic
 
 import (
-	"bp.jydev.jianyu360.cn/CRM/application/api/internal/service"
+	"bp.jydev.jianyu360.cn/CRM/networkManage/api/internal/service"
 	"context"
 	"fmt"
 
-	"bp.jydev.jianyu360.cn/CRM/application/api/internal/svc"
-	"bp.jydev.jianyu360.cn/CRM/application/api/internal/types"
+	"bp.jydev.jianyu360.cn/CRM/networkManage/api/internal/svc"
+	"bp.jydev.jianyu360.cn/CRM/networkManage/api/internal/types"
 
 	"github.com/zeromicro/go-zero/core/logx"
 )

+ 3 - 3
api/internal/logic/projectlistlogic.go

@@ -1,12 +1,12 @@
 package logic
 
 import (
-	"bp.jydev.jianyu360.cn/CRM/application/api/internal/service"
+	"bp.jydev.jianyu360.cn/CRM/networkManage/api/internal/service"
 	"context"
 	"fmt"
 
-	"bp.jydev.jianyu360.cn/CRM/application/api/internal/svc"
-	"bp.jydev.jianyu360.cn/CRM/application/api/internal/types"
+	"bp.jydev.jianyu360.cn/CRM/networkManage/api/internal/svc"
+	"bp.jydev.jianyu360.cn/CRM/networkManage/api/internal/types"
 
 	"github.com/zeromicro/go-zero/core/logx"
 )

+ 2 - 2
api/internal/logic/prpnameasslogic.go

@@ -2,8 +2,8 @@ package logic
 
 import (
 	. "app.yhyue.com/moapp/jybase/es"
-	"bp.jydev.jianyu360.cn/CRM/application/api/internal/svc"
-	"bp.jydev.jianyu360.cn/CRM/application/api/internal/types"
+	"bp.jydev.jianyu360.cn/CRM/networkManage/api/internal/svc"
+	"bp.jydev.jianyu360.cn/CRM/networkManage/api/internal/types"
 	"context"
 	"fmt"
 

+ 2 - 2
api/internal/service/CoopHistoryService.go

@@ -10,8 +10,8 @@ import (
 	"app.yhyue.com/moapp/jybase/common"
 	"app.yhyue.com/moapp/jybase/encrypt"
 	elastic "app.yhyue.com/moapp/jybase/es"
-	T "bp.jydev.jianyu360.cn/CRM/application/api/common"
-	"bp.jydev.jianyu360.cn/CRM/application/api/internal/types"
+	T "bp.jydev.jianyu360.cn/CRM/networkManage/api/common"
+	"bp.jydev.jianyu360.cn/CRM/networkManage/api/internal/types"
 	"github.com/ClickHouse/clickhouse-go/v2/lib/driver"
 	"github.com/zeromicro/go-zero/core/logx"
 )

+ 2 - 2
api/internal/service/network.go

@@ -16,8 +16,8 @@ import (
 	"app.yhyue.com/moapp/jybase/encrypt"
 	. "app.yhyue.com/moapp/jybase/es"
 	. "app.yhyue.com/moapp/jybase/sort"
-	. "bp.jydev.jianyu360.cn/CRM/application/api/common"
-	"bp.jydev.jianyu360.cn/CRM/application/api/internal/types"
+	. "bp.jydev.jianyu360.cn/CRM/networkManage/api/common"
+	"bp.jydev.jianyu360.cn/CRM/networkManage/api/internal/types"
 	"github.com/shopspring/decimal"
 	"github.com/zeromicro/go-zero/core/logx"
 )

+ 3 - 3
api/internal/service/network_test.go

@@ -8,9 +8,9 @@ import (
 	"testing"
 
 	. "app.yhyue.com/moapp/jybase/common"
-	. "bp.jydev.jianyu360.cn/CRM/application/api/common"
-	"bp.jydev.jianyu360.cn/CRM/application/api/internal/types"
-	"bp.jydev.jianyu360.cn/CRM/application/service"
+	. "bp.jydev.jianyu360.cn/CRM/networkManage/api/common"
+	"bp.jydev.jianyu360.cn/CRM/networkManage/api/internal/types"
+	"bp.jydev.jianyu360.cn/CRM/networkManage/service"
 )
 
 //go test -test.run=TestAddCustomService -fs=../../etc/crmapplication.yaml -lf=../../etc/logs.yaml -df=../../etc/db.yaml -pf=../../etc/push.yaml

+ 2 - 2
api/internal/service/owner.go

@@ -11,8 +11,8 @@ import (
 	"app.yhyue.com/moapp/jybase/common"
 	"app.yhyue.com/moapp/jybase/encrypt"
 	elastic "app.yhyue.com/moapp/jybase/es"
-	. "bp.jydev.jianyu360.cn/CRM/application/api/common"
-	"bp.jydev.jianyu360.cn/CRM/application/entity"
+	. "bp.jydev.jianyu360.cn/CRM/networkManage/api/common"
+	"bp.jydev.jianyu360.cn/CRM/networkManage/entity"
 	"github.com/gogf/gf/v2/util/gconv"
 	"github.com/shopspring/decimal"
 	"github.com/zeromicro/go-zero/core/logx"

+ 2 - 2
api/internal/service/plistService.go

@@ -4,8 +4,8 @@ import (
 	"app.yhyue.com/moapp/jybase/common"
 	"app.yhyue.com/moapp/jybase/encrypt"
 	"app.yhyue.com/moapp/jypkg/ent/util"
-	T "bp.jydev.jianyu360.cn/CRM/application/api/common"
-	"bp.jydev.jianyu360.cn/CRM/application/api/internal/types"
+	T "bp.jydev.jianyu360.cn/CRM/networkManage/api/common"
+	"bp.jydev.jianyu360.cn/CRM/networkManage/api/internal/types"
 	"context"
 	"fmt"
 	"github.com/gogf/gf/v2/util/gconv"

+ 1 - 1
api/internal/svc/servicecontext.go

@@ -1,7 +1,7 @@
 package svc
 
 import (
-	"bp.jydev.jianyu360.cn/CRM/application/api/internal/config"
+	"bp.jydev.jianyu360.cn/CRM/networkManage/api/internal/config"
 )
 
 type ServiceContext struct {

+ 6 - 0
api/logs/access.log

@@ -0,0 +1,6 @@
+{"@timestamp":"2024-10-11T14:49:09.916+08:00","caller":"common/initconfig.go:53","content":"info--日志记录","level":"info"}
+{"@timestamp":"2024-10-11T14:49:09.916+08:00","caller":"common/initconfig.go:53","content":"error--日志记录","level":"info"}
+{"@timestamp":"2024-10-11T14:50:47.501+08:00","caller":"common/initconfig.go:53","content":"info--日志记录","level":"info"}
+{"@timestamp":"2024-10-11T14:50:47.501+08:00","caller":"common/initconfig.go:53","content":"error--日志记录","level":"info"}
+{"@timestamp":"2024-10-11T14:50:47.622+08:00","caller":"common/initconfig.go:83","content":"--初始化 mongodb--","level":"info"}
+{"@timestamp":"2024-10-11T14:50:47.624+08:00","caller":"common/initconfig.go:92","content":"--初始化 mongodb Bidding --","level":"info"}

+ 0 - 0
api/logs/error.log


+ 0 - 0
api/logs/severe.log


+ 0 - 0
api/logs/slow.log


+ 0 - 0
api/logs/stat.log


+ 3 - 3
api/networkmanage.go

@@ -9,9 +9,9 @@ import (
 
 	mc "app.yhyue.com/moapp/jybase/common"
 	"bp.jydev.jianyu360.cn/BaseService/gateway/core/node"
-	. "bp.jydev.jianyu360.cn/CRM/application/api/common"
-	"bp.jydev.jianyu360.cn/CRM/application/api/internal/handler"
-	"bp.jydev.jianyu360.cn/CRM/application/api/internal/svc"
+	. "bp.jydev.jianyu360.cn/CRM/networkManage/api/common"
+	"bp.jydev.jianyu360.cn/CRM/networkManage/api/internal/handler"
+	"bp.jydev.jianyu360.cn/CRM/networkManage/api/internal/svc"
 	"github.com/zeromicro/go-zero/rest"
 )
 

+ 0 - 4
entity/db.go

@@ -4,16 +4,12 @@ type RedisStuct struct {
 	Addr []string `json:"addr"`
 }
 type Mysql struct {
-	Main        *MysqlStruct `json:"main,omitempty"`
 	BaseService *MysqlStruct `json:"baseService,omitempty"`
 	CrmService  *MysqlStruct `json:"crmService,omitempty"`
-	NiJian      *MysqlStruct `json:"niJian,omitempty"`
 }
 type Mongo struct {
 	Main    *MongoStruct `json:"main,optional"`
 	Bidding *MongoStruct `json:"bidding,optional"`
-	Ent     *MongoStruct `json:"ent,optional"`
-	Project *MongoStruct `json:"projectset,optional"`
 }
 type MongoStruct struct {
 	Address        string `json:"address"`

+ 1 - 1
go.mod

@@ -1,4 +1,4 @@
-module bp.jydev.jianyu360.cn/CRM/application
+module bp.jydev.jianyu360.cn/CRM/networkManage
 
 go 1.19