proto

ermazi · Oct 17, 2020 · 30559bf · 30559bf
1 parent 8d56db0
commit 30559bf
Show file tree

Hide file tree

Showing 37 changed files with 42 additions and 31 deletions.
diff --git a/core/etcd/selector.go b/core/etcd/selector.go
@@ -38,7 +38,6 @@ type Selector interface {
 type serverSelector struct {
 	cli    *clientv3.Client
 	nodes  []Node
-	config clientv3.Config
 	alg    SelectAlgorithm
 	last   int
 	name   string
@@ -50,7 +49,6 @@ func NewSelector(name string, config clientv3.Config, alg SelectAlgorithm) (Sele
 		return nil, err
 	}
 	var s = &serverSelector{
-		config: config,
 		cli:    cli,
 		name:   name,
 		alg:    alg,
@@ -79,7 +77,7 @@ func (s *serverSelector) Next() (Node, error) {
 	}
 	// 随机算法
 	//i := rand.Int() % len(s.nodes)
-	i := rand.Intn(len(s.nodes))
+	i := rand.Intn(l)
 	return s.nodes[i], nil
 }
 
@@ -100,8 +98,8 @@ func (s *serverSelector) Watch() {
 					s.AddNode(node)
 				case clientv3.EventTypeDelete:
 					keyArray := strings.Split(string(e.Kv.Key), "/")
-					if len(keyArray) <= 0 {
-						log.Printf("[EventTypeDelete] key Split err")
+					if len(keyArray) == 0 {
+						println("[ Etcd][ Event]: delete node key is empty")
 						return
 					}
 					nodeId, err := strconv.Atoi(keyArray[len(keyArray)-1])
@@ -160,7 +158,7 @@ func (s *serverSelector) loadNodes() {
 	for _, kv := range res.Kvs {
 		node, err := s.GetVal(kv.Value)
 		if err != nil {
-			log.Printf("[GetVal] err : %s", err.Error())
+			log.Println("[ Etcd][ Error]: load nodes failed! error : " + err.Error())
 			continue
 		}
 		s.nodes = append(s.nodes, node)

diff --git a/core/service/idl/advertisement_service.proto b/core/service/idl/advertisement_service.proto
@@ -1,6 +1,6 @@
 syntax = "proto3";
 option go_package = ".;proto";
-option java_outer_classname = "AdvertisementServiceR";
+option java_package="com.github.go2o.rpc";
 
 import "global.proto";
 import "message/advertisement.proto";

diff --git a/core/service/idl/aftersales_service.proto b/core/service/idl/aftersales_service.proto
@@ -1,6 +1,7 @@
 syntax = "proto3";
 option go_package = ".;proto";
-//option java_outer_classname = "AfterSalesServiceR";
+option java_package="com.github.go2o.rpc";
+option java_outer_classname = "AfterSalesServiceOuterClass";
 
 import "global.proto";
 

diff --git a/core/service/idl/cart_service.proto b/core/service/idl/cart_service.proto
@@ -1,6 +1,6 @@
 syntax = "proto3";
 option go_package = ".;proto";
-option java_outer_classname = "CartServiceR";
+option java_package="com.github.go2o.rpc";
 
 import "global.proto";
 import "message/cart.proto";

diff --git a/core/service/idl/content_service.proto b/core/service/idl/content_service.proto
@@ -1,6 +1,6 @@
 syntax = "proto3";
 option go_package = ".;proto";
-option java_outer_classname = "ContentServiceR";
+option java_package="com.github.go2o.rpc";
 
 import "global.proto";
 

diff --git a/core/service/idl/express_service.proto b/core/service/idl/express_service.proto
@@ -1,6 +1,6 @@
 syntax = "proto3";
 option go_package = ".;proto";
-option java_outer_classname = "ExpressServiceR";
+option java_package="com.github.go2o.rpc";
 
 import "global.proto";
 

diff --git a/core/service/idl/finance_service.proto b/core/service/idl/finance_service.proto
@@ -1,6 +1,6 @@
 syntax = "proto3";
 option go_package = ".;proto";
-option java_outer_classname = "FinanceServiceR";
+option java_package="com.github.go2o.rpc";
 
 import "global.proto";
 

diff --git a/core/service/idl/foundation_service.proto b/core/service/idl/foundation_service.proto
@@ -1,6 +1,6 @@
 syntax = "proto3";
 option go_package = ".;proto";
-option java_outer_classname = "FoundationServiceR";
+option java_package="com.github.go2o.rpc";
 
 import "global.proto";
 

diff --git a/core/service/idl/global.proto b/core/service/idl/global.proto
@@ -3,6 +3,7 @@
 //namespace go go2o.core.service.thrift.auto_gen.rpc.ttype
 syntax = "proto3";
 option go_package = ".;proto";
+option java_package="com.github.go2o.rpc";
 
 message Empty {
 }
@@ -61,7 +62,7 @@ enum ESettingBasis {
 
 /** 价格计算方式 */
 enum EPriceBasis {
-  _ = 0;
+  _Unused = 0;
   /** 原价 */
   Original = 1;
   /** 会员折扣价 */

diff --git a/core/service/idl/item_service.proto b/core/service/idl/item_service.proto
@@ -1,6 +1,6 @@
 syntax = "proto3";
 option go_package = ".;proto";
-option java_outer_classname = "ItemServiceR";
+option java_package="com.github.go2o.rpc";
 
 import "global.proto";
 import "message/item.proto";

diff --git a/core/service/idl/member_service.proto b/core/service/idl/member_service.proto
@@ -1,6 +1,6 @@
 syntax = "proto3";
 option go_package = ".;proto";
-option java_outer_classname = "MemberServiceR";
+option java_package="com.github.go2o.rpc";
 
 import "global.proto";
 import "message/bank.proto";

diff --git a/core/service/idl/merchant_service.proto b/core/service/idl/merchant_service.proto
@@ -1,6 +1,6 @@
 syntax = "proto3";
 option go_package = ".;proto";
-option java_outer_classname = "MerchantServiceR";
+option java_package="com.github.go2o.rpc";
 
 import "global.proto";
 import "message/merchant.proto";

diff --git a/core/service/idl/message/advertisement.proto b/core/service/idl/message/advertisement.proto
@@ -1,5 +1,6 @@
 syntax = "proto3";
 option go_package = ".;proto";
+option java_package="com.github.go2o.rpc";
 
 // 广告分组
 message SAdGroup {

diff --git a/core/service/idl/message/bank.proto b/core/service/idl/message/bank.proto
@@ -1,6 +1,6 @@
 syntax = "proto3";
 option go_package = ".;proto";
-
+option java_package="com.github.go2o.rpc";
 
 message BankCardAddRequest {
   sint64 OwnerId = 1;

diff --git a/core/service/idl/message/cart.proto b/core/service/idl/message/cart.proto
@@ -1,5 +1,6 @@
 syntax = "proto3";
 option go_package = ".;proto";
+option java_package="com.github.go2o.rpc";
 
 
 message WsCartRequest {

diff --git a/core/service/idl/message/coupon.proto b/core/service/idl/message/coupon.proto
@@ -1,4 +1,5 @@
 syntax = "proto3";
 option go_package = ".;proto";
+option java_package="com.github.go2o.rpc";
 
 
diff --git a/core/service/idl/message/item.proto b/core/service/idl/message/item.proto
@@ -1,5 +1,6 @@
 syntax = "proto3";
 option go_package = ".;proto";
+option java_package="com.github.go2o.rpc";
 
 // 商品销售类型
 enum EItemSalesType {

diff --git a/core/service/idl/message/member.proto b/core/service/idl/message/member.proto
@@ -1,5 +1,6 @@
 syntax = "proto3";
 option go_package = ".;proto";
+option java_package="com.github.go2o.rpc";
 
 import "global.proto";
 

diff --git a/core/service/idl/message/merchant.proto b/core/service/idl/message/merchant.proto
@@ -1,5 +1,6 @@
 syntax = "proto3";
 option go_package = ".;proto";
+option java_package="com.github.go2o.rpc";
 
 // 商家
 message SMerchant {

diff --git a/core/service/idl/message/order.proto b/core/service/idl/message/order.proto
@@ -1,5 +1,6 @@
 syntax = "proto3";
 option go_package = ".;proto";
+option java_package="com.github.go2o.rpc";
 
 /** 订单状态 */
 enum EOrderState {

diff --git a/core/service/idl/message/payment.proto b/core/service/idl/message/payment.proto
@@ -1,5 +1,6 @@
 syntax = "proto3";
 option go_package = ".;proto";
+option java_package="com.github.go2o.rpc";
 
 enum PaymentAccountType {
   // 余额支付

diff --git a/core/service/idl/message/product.proto b/core/service/idl/message/product.proto
@@ -1,5 +1,6 @@
 syntax = "proto3";
 option go_package = ".;proto";
+option java_package="com.github.go2o.rpc";
 
 message DeleteProductRequest {
   int64 SellerId = 1;

diff --git a/core/service/idl/message/shipment.proto b/core/service/idl/message/shipment.proto
@@ -1,5 +1,6 @@
 syntax = "proto3";
 option go_package = ".;proto";
+option java_package="com.github.go2o.rpc";
 
 // 覆盖区域
 message SCoverageValue {

diff --git a/core/service/idl/message/shop.proto b/core/service/idl/message/shop.proto
@@ -1,5 +1,6 @@
 syntax = "proto3";
 option go_package = ".;proto";
+option java_package="com.github.go2o.rpc";
 
 // 店铺
 message SShop {

diff --git a/core/service/idl/message/wallet.proto b/core/service/idl/message/wallet.proto
@@ -1,3 +1,4 @@
 syntax = "proto3";
 option go_package = ".;proto";
+option java_package="com.github.go2o.rpc";
 
diff --git a/core/service/idl/message_service.proto b/core/service/idl/message_service.proto
@@ -1,6 +1,6 @@
 syntax = "proto3";
 option go_package = ".;proto";
-option java_outer_classname = "MessageServiceR";
+option java_package="com.github.go2o.rpc";
 
 import "global.proto";
 

diff --git a/core/service/idl/order_service.proto b/core/service/idl/order_service.proto
@@ -1,6 +1,6 @@
 syntax = "proto3";
 option go_package = ".;proto";
-option java_outer_classname = "OrderServiceR";
+option java_package="com.github.go2o.rpc";
 
 import "global.proto";
 import "message/order.proto";

diff --git a/core/service/idl/payment_service.proto b/core/service/idl/payment_service.proto
@@ -1,6 +1,6 @@
 syntax = "proto3";
 option go_package = ".;proto";
-option java_outer_classname = "PaymentServiceR";
+option java_package="com.github.go2o.rpc";
 
 import "global.proto";
 

diff --git a/core/service/idl/product_service.proto b/core/service/idl/product_service.proto
@@ -1,6 +1,6 @@
 syntax = "proto3";
 option go_package = ".;proto";
-option java_outer_classname = "ProductServiceR";
+option java_package="com.github.go2o.rpc";
 
 import "global.proto";
 import "message/product.proto";

diff --git a/core/service/idl/query_service.proto b/core/service/idl/query_service.proto
@@ -1,6 +1,6 @@
 syntax = "proto3";
 option go_package = ".;proto";
-option java_outer_classname = "QueryServiceR";
+option java_package="com.github.go2o.rpc";
 
 import "global.proto";
 import "message/order.proto";

diff --git a/core/service/idl/registry_service.proto b/core/service/idl/registry_service.proto
@@ -1,6 +1,6 @@
 syntax = "proto3";
 option go_package = ".;proto";
-option java_outer_classname = "RegistryServiceR";
+option java_package="com.github.go2o.rpc";
 
 import "global.proto";
 

diff --git a/core/service/idl/shipment_service.proto b/core/service/idl/shipment_service.proto
@@ -1,6 +1,6 @@
 syntax = "proto3";
 option go_package = ".;proto";
-option java_outer_classname = "ShipmentServiceR";
+option java_package="com.github.go2o.rpc";
 
 
 import "global.proto";

diff --git a/core/service/idl/shop_service.proto b/core/service/idl/shop_service.proto
@@ -1,6 +1,6 @@
 syntax = "proto3";
 option go_package = ".;proto";
-option java_outer_classname = "ShopServiceR";
+option java_package="com.github.go2o.rpc";
 
 import "global.proto";
 import "message/shop.proto";

diff --git a/core/service/idl/status_service.proto b/core/service/idl/status_service.proto
@@ -1,6 +1,6 @@
 syntax = "proto3";
 option go_package = ".;proto";
-option java_outer_classname = "StatusServiceR";
+option java_package="com.github.go2o.rpc";
 
 import "global.proto";
 

diff --git a/core/service/idl/test.proto b/core/service/idl/test.proto
@@ -1,6 +1,6 @@
 syntax = "proto3";
 option go_package = ".;proto";
-option java_outer_classname = "GreeterServiceR";
+option java_package="com.github.go2o.rpc";
 
 
 enum EState {

diff --git a/core/service/idl/wallet_service.proto b/core/service/idl/wallet_service.proto
@@ -1,6 +1,6 @@
 syntax = "proto3";
 option go_package = ".;proto";
-option java_outer_classname = "WalletServiceR";
+option java_package="com.github.go2o.rpc";
 
 
 import "global.proto";

diff --git a/go2o-serve.go b/go2o-serve.go
@@ -17,7 +17,6 @@ import (
 	"go.etcd.io/etcd/clientv3"
 	"go2o/app"
 	"go2o/app/daemon"
-	"go2o/app/restapi"
 	"go2o/core"
 	"go2o/core/msq"
 	"go2o/core/service"
@@ -138,7 +137,7 @@ func main() {
 		go daemon.Run(newApp)
 	}
 	// 运行REST API
-	go restapi.Run(ch, newApp, domain, apiPort)
+	//go restapi.Run(ch, newApp, domain, apiPort)
 	<-ch
 }