feat:冲突

jyBXCore/api/internal/handler/participateActionHandler.go

@@ -7,8 +7,6 @@ import (
 	"jyBXCore/api/internal/logic"
 	"jyBXCore/api/internal/svc"
 	"jyBXCore/api/internal/types"
-
-	"github.com/zeromicro/go-zero/rest/httpx"
 )
 
 func participateActionHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {

jyBXCore/api/internal/handler/participateContentHandler.go

@@ -7,8 +7,6 @@ import (
 	"jyBXCore/api/internal/logic"
 	"jyBXCore/api/internal/svc"
 	"jyBXCore/api/internal/types"
-
-	"github.com/zeromicro/go-zero/rest/httpx"
 )
 
 func ParticipateContentHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {

jyBXCore/api/internal/handler/participateInfoHandler.go

@@ -7,8 +7,6 @@ import (
 	"jyBXCore/api/internal/logic"
 	"jyBXCore/api/internal/svc"
 	"jyBXCore/api/internal/types"
-
-	"github.com/zeromicro/go-zero/rest/httpx"
 )
 
 func ParticipateInfoHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {

jyBXCore/api/internal/handler/participateListHandler.go

@@ -7,8 +7,6 @@ import (
 	"jyBXCore/api/internal/logic"
 	"jyBXCore/api/internal/svc"
 	"jyBXCore/api/internal/types"
-
-	"github.com/zeromicro/go-zero/rest/httpx"
 )
 
 func participateListHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {

jyBXCore/api/internal/handler/participatePersonsHandler.go

@@ -7,8 +7,6 @@ import (
 	"jyBXCore/api/internal/logic"
 	"jyBXCore/api/internal/svc"
 	"jyBXCore/api/internal/types"
-
-	"github.com/zeromicro/go-zero/rest/httpx"
 )
 
 func ParticipatePersonsHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {

jyBXCore/api/internal/handler/participateRecordsHandler.go

@@ -7,8 +7,6 @@ import (
 	"jyBXCore/api/internal/logic"
 	"jyBXCore/api/internal/svc"
 	"jyBXCore/api/internal/types"
-
-	"github.com/zeromicro/go-zero/rest/httpx"
 )
 
 func ParticipateRecordsHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {

jyBXCore/api/internal/handler/participateSetUpInfoHandler.go

@@ -7,8 +7,6 @@ import (
 	"jyBXCore/api/internal/logic"
 	"jyBXCore/api/internal/svc"
 	"jyBXCore/api/internal/types"
-
-	"github.com/zeromicro/go-zero/rest/httpx"
 )
 
 func participateSetUpInfoHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {

jyBXCore/api/internal/handler/participateShowHandler.go

@@ -7,8 +7,6 @@ import (
 	"jyBXCore/api/internal/logic"
 	"jyBXCore/api/internal/svc"
 	"jyBXCore/api/internal/types"
-
-	"github.com/zeromicro/go-zero/rest/httpx"
 )
 
 func participateShowHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {

jyBXCore/api/internal/handler/updateBidStatusHandler.go

@@ -7,8 +7,6 @@ import (
 	"jyBXCore/api/internal/logic"
 	"jyBXCore/api/internal/svc"
 	"jyBXCore/api/internal/types"
-
-	"github.com/zeromicro/go-zero/rest/httpx"
 )
 
 func updateBidStatusHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {

jyBXCore/api/internal/logic/participateActionLogic.go

@@ -2,6 +2,7 @@ package logic
 
 import (
 	"context"
+	"net/http"
 
 	"jyBXCore/api/internal/svc"
 	"jyBXCore/api/internal/types"

jyBXCore/api/internal/logic/participateContentLogic.go

@@ -2,6 +2,7 @@ package logic
 
 import (
 	"context"
+	"net/http"
 
 	"jyBXCore/api/internal/svc"
 	"jyBXCore/api/internal/types"

jyBXCore/api/internal/logic/participateInfoLogic.go

@@ -2,6 +2,7 @@ package logic
 
 import (
 	"context"
+	"net/http"
 
 	"jyBXCore/api/internal/svc"
 	"jyBXCore/api/internal/types"

jyBXCore/api/internal/logic/participateListLogic.go

@@ -2,6 +2,7 @@ package logic
 
 import (
 	"context"
+	"net/http"
 
 	"jyBXCore/api/internal/svc"
 	"jyBXCore/api/internal/types"

jyBXCore/api/internal/logic/participatePersonsLogic.go

@@ -2,6 +2,7 @@ package logic
 
 import (
 	"context"
+	"net/http"
 
 	"jyBXCore/api/internal/svc"
 	"jyBXCore/api/internal/types"

jyBXCore/api/internal/logic/participateRecordsLogic.go

@@ -2,6 +2,7 @@ package logic
 
 import (
 	"context"
+	"net/http"
 
 	"jyBXCore/api/internal/svc"
 	"jyBXCore/api/internal/types"

jyBXCore/api/internal/logic/participateSetUpInfoLogic.go

@@ -2,6 +2,7 @@ package logic
 
 import (
 	"context"
+	"net/http"
 
 	"jyBXCore/api/internal/svc"
 	"jyBXCore/api/internal/types"
@@ -26,7 +27,7 @@ func NewParticipateSetUpInfoLogic(ctx context.Context, svcCtx *svc.ServiceContex
 }
 
 func (l *ParticipateSetUpInfoLogic) ParticipateSetUpInfo(req *types.ParticipateSetUpInfoReq) (resp *types.CommonResp, err error) {
-	// todo: add your logic here and delete this line
+	logx.Info(req)
 
 	return
 }

jyBXCore/api/internal/logic/participateShowLogic.go

@@ -2,6 +2,7 @@ package logic
 
 import (
 	"context"
+	"net/http"
 
 	"jyBXCore/api/internal/svc"
 	"jyBXCore/api/internal/types"

jyBXCore/api/internal/logic/updateBidStatusLogic.go

@@ -2,6 +2,7 @@ package logic
 
 import (
 	"context"
+	"net/http"
 
 	"jyBXCore/api/internal/svc"
 	"jyBXCore/api/internal/types"

jyBXCore/rpc/etc/bxcore.yaml

@@ -45,5 +45,5 @@ ContextOldVipLimit: 1664553600
 PowersEtcdConf:
   Etcd:
     Hosts:
-      - 192.168.3.206:2379
+      - 192.168.3.149:2379
     Key: powercheck.rpc

jyBXCore/rpc/etc/db.yaml

@@ -1,15 +1,15 @@
 mysql:
     main:
         dbName: jianyu
-        address: 192.168.3.11:3366
+        address: 192.168.3.149:3306
         userName: root
         password: Topnet123
         maxOpenConns: 5
         maxIdleConns: 5
 redis:
     addr:
-        - other=192.168.3.206:1712
-        - newother=192.168.3.206:1712
+        - other=192.168.3.149:1712
+        - newother=192.168.3.149:1712
 es:
     addr: http://192.168.3.206:9800
     size: 50