test

2023-08-18 19:34:23 +08:00 · 2023-08-18 19:34:23 +08:00 · 3f9c050ca5
commit 3f9c050ca5
parent d012ef5f83
13 changed files with 2 additions and 34 deletions
--- a/proxyserver/main.go
+++ b/proxyserver/main.go
@ -184,6 +184,7 @@ func NewBackend(mux *http.ServeMux, httpAddress string, muxPaths ...string) *Bac
 			header.Del("Sec-Websocket-Key")
 			header.Del("Sec-Websocket-Version")
 			header.Del("Connection")
+
 			// header.Del("Origin")
 			proxyConn, _, err := backend.Dialer.Dial(target.String(), header)
 			if err != nil {
--- a/server/auth/internal/handler/userresettokenhandler.go
+++ b/server/auth/internal/handler/userresettokenhandler.go
@ -14,7 +14,7 @@ import (
 func UserResetTokenHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {

-		var req types.Request
+		var req types.RequestUserResetToken
 		userinfo, err := basic.RequestParse(w, r, svcCtx, &req)
 		if err != nil {
 			return
--- a/server/canteen/etc/canteen.yaml
+++ b/server/canteen/etc/canteen.yaml
@ -1,11 +1,8 @@
 Name: canteen
 Host: localhost
 Port: 9902
-<<<<<<< HEAD
 ReplicaId: 15
-=======
 Timeout: 15000 #服务超时时间
->>>>>>> ac1800bb26ce44fba8be8271c7be2b8403c7d7f5
 SourceMysql: fusentest:XErSYmLELKMnf3Dh@tcp(110.41.19.98:3306)/fusentest
 Auth:
  AccessSecret: fusen2023
--- a/server/data-transfer/etc/data-transfer.yaml
+++ b/server/data-transfer/etc/data-transfer.yaml
@ -1,11 +1,8 @@
 Name: data-transfer
 Host: localhost
 Port: 9903
-<<<<<<< HEAD
 ReplicaId: 20
-=======
 Timeout: 15000 #服务超时时间
->>>>>>> ac1800bb26ce44fba8be8271c7be2b8403c7d7f5
 SourceMysql: fusentest:XErSYmLELKMnf3Dh@tcp(110.41.19.98:3306)/fusentest
 Auth:
  AccessSecret: fusen2023
--- a/server/home-user-auth/etc/home-user-auth.yaml
+++ b/server/home-user-auth/etc/home-user-auth.yaml
@ -1,11 +1,8 @@
 Name: home-user-auth
 Host: localhost
 Port: 9904
-<<<<<<< HEAD
 ReplicaId: 25
-=======
 Timeout: 15000 #服务超时时间
->>>>>>> ac1800bb26ce44fba8be8271c7be2b8403c7d7f5
 MainAddress: "http://localhost:9900"
 SourceMysql: fusentest:XErSYmLELKMnf3Dh@tcp(110.41.19.98:3306)/fusentest

--- a/server/inventory/etc/inventory.yaml
+++ b/server/inventory/etc/inventory.yaml
@ -1,11 +1,8 @@
 Name: inventory
 Host: localhost
 Port: 9905
-<<<<<<< HEAD
 ReplicaId: 30
-=======
 Timeout: 15000 #服务超时时间
->>>>>>> ac1800bb26ce44fba8be8271c7be2b8403c7d7f5
 SourceMysql: fusentest:XErSYmLELKMnf3Dh@tcp(110.41.19.98:3306)/fusentest
 Auth:
    AccessSecret: fusen2023
--- a/server/map-library/etc/map-library.yaml
+++ b/server/map-library/etc/map-library.yaml
@ -1,11 +1,8 @@
 Name: map-library
 Host: localhost
 Port: 9906
-<<<<<<< HEAD
 ReplicaId: 35
-=======
 Timeout: 15000 #服务超时时间
->>>>>>> ac1800bb26ce44fba8be8271c7be2b8403c7d7f5
 SourceMysql: fusentest:XErSYmLELKMnf3Dh@tcp(110.41.19.98:3306)/fusentest
 Auth:
    AccessSecret: fusen2023
--- a/server/orders/etc/orders.yaml
+++ b/server/orders/etc/orders.yaml
@ -1,11 +1,8 @@
 Name: orders
 Host: localhost
 Port: 9907
-<<<<<<< HEAD
 ReplicaId: 40
-=======
 Timeout: 15000 #服务超时时间
->>>>>>> ac1800bb26ce44fba8be8271c7be2b8403c7d7f5
 SourceMysql: fusentest:XErSYmLELKMnf3Dh@tcp(110.41.19.98:3306)/fusentest
 Auth:
    AccessSecret: fusen2023
--- a/server/pay/etc/pay.yaml
+++ b/server/pay/etc/pay.yaml
@ -1,11 +1,8 @@
 Name: pay
 Host: 0.0.0.0
 Port: 9915
-<<<<<<< HEAD
 ReplicaId: 45
-=======
 Timeout: 15000 #服务超时时间
->>>>>>> ac1800bb26ce44fba8be8271c7be2b8403c7d7f5
 SourceMysql: fusentest:XErSYmLELKMnf3Dh@tcp(110.41.19.98:3306)/fusentest
 Auth:
    AccessSecret: fusen2023
--- a/server/product/etc/product.yaml
+++ b/server/product/etc/product.yaml
@ -1,11 +1,8 @@
 Name: product
 Host: localhost
 Port: 9908
-<<<<<<< HEAD
 ReplicaId: 50
-=======
 Timeout: 15000 #服务超时时间
->>>>>>> ac1800bb26ce44fba8be8271c7be2b8403c7d7f5
 SourceMysql: fusentest:XErSYmLELKMnf3Dh@tcp(110.41.19.98:3306)/fusentest
 Auth:
  AccessSecret: fusen2023
--- a/server/render/etc/render.yaml
+++ b/server/render/etc/render.yaml
@ -1,11 +1,8 @@
 Name: render
 Host: 0.0.0.0
 Port: 9919
-<<<<<<< HEAD
 ReplicaId: 55
-=======
 Timeout: 15000 #服务超时时间
->>>>>>> ac1800bb26ce44fba8be8271c7be2b8403c7d7f5
 SourceMysql: fusentest:XErSYmLELKMnf3Dh@tcp(110.41.19.98:3306)/fusentest
 Auth:
    AccessSecret: fusen2023
--- a/server/shopping-cart-confirmation/etc/shopping-cart-confirmation.yaml
+++ b/server/shopping-cart-confirmation/etc/shopping-cart-confirmation.yaml
@ -1,11 +1,8 @@
 Name: shopping-cart-confirmation
 Host: localhost
 Port: 9911
-<<<<<<< HEAD
 ReplicaId: 65
-=======
 Timeout: 15000 #服务超时时间
->>>>>>> ac1800bb26ce44fba8be8271c7be2b8403c7d7f5
 SourceMysql: fusentest:XErSYmLELKMnf3Dh@tcp(110.41.19.98:3306)/fusentest
 Auth:
    AccessSecret: fusen2023
--- a/server/upload/etc/upload.yaml
+++ b/server/upload/etc/upload.yaml
@ -1,11 +1,8 @@
 Name: upload
 Host: localhost
 Port: 9912
-<<<<<<< HEAD
 ReplicaId: 70
-=======
 Timeout: 15000 #服务超时时间
->>>>>>> ac1800bb26ce44fba8be8271c7be2b8403c7d7f5
 SourceMysql: "fusentest:XErSYmLELKMnf3Dh@tcp(110.41.19.98:3306)/fusentest"
 Env: "test"
 Auth: