update to support latest protoc-gen-go

build

@@ -26,7 +26,7 @@ def main():
             
             if args.golang:
                 print('building ', file, ' golang ...')
-                os.system('protoc -I. --go_out=. {}'.format(os.path.join(cur,file)))
+                os.system('protoc -I. --go_opt=paths=source_relative --go_out=. {}'.format(os.path.join(cur,file)))
             if args.python:
                 print('building ', file, ' python ...')
                 os.system('protoc -I. --python_out=. {}'.format(os.path.join(cur, file)))

confs.proto

@@ -1,7 +1,8 @@
 syntax = "proto3";
 package protos;
+option go_package = ".;protos";
 
-import "structs.proto";
+//import "structs.proto";
 
 // 项目中配置文件定义
 
@@ -32,51 +33,13 @@ message NatsConf {
     string clusterId        = 4;
 }
 
-// agent 服务器配置
-message AgentConf {
-    ConfConf zoo        = 1;
-    string namespace    = 2;
-    uint64 id           = 3;
-    string addr         = 4;
-    string rpcAddr      = 5;
-    string profileAddr  = 6;
-    string agentAddr    = 7;
-    LogConf log         = 8;
-    string mode         = 10;
-}
-
 // zk 中 login 配置
 message LoginConfConf {
     repeated string addrs   = 1;
     string password         = 2;
 }
 
-// login 服务器启动配置
-// 因为 login 不在 zookeeper 中注册服务，所以 login 有两个配置
-message LoginConf {
-    uint64 id           = 1;
-    RedisConf redis     = 2;
-    NatsConf nats       = 3;
-    repeated EmailConf emails = 4;
-    string addr         = 5;
-    string agentAddr    = 7;
-    string rpcAddr      = 9;
-    string key          = 11;
-    LogConf log         = 12;
-    string mode         = 16;
-}
-
-message ManagerConf {
-    ConfConf zoo        = 1;
-    string namespace    = 2;
-    uint64 id           = 3;
-    string addr         = 4;
-    string profileAddr  = 6;
-    LogConf log         = 7;
-    string mode         = 10;
-}
-
-message LogicConf {
+message AppConf {
     ConfConf zoo        = 1;
     string namespace    = 2;
     uint64 id           = 3;
@@ -88,6 +51,11 @@ message LogicConf {
     string mode         = 10;
 }
 
+message Message {
+    string tplSubject   = 1;
+    string tplBody      = 2;
+}
+
 // smtp 服务器配置
 message EmailConf {
     string smtp         = 1;
@@ -95,6 +63,19 @@ message EmailConf {
     string username     = 3;
     string password     = 4;
     string crypto       = 5;
-    string sujectTpl    = 11;
-    string bodyTpl      = 12;
-}
+    repeated Message msg= 6;
+}
+
+message SmsTpl {
+    string tplCode      = 1;
+    string tplParam     = 2;
+}
+
+message SmsConf {
+    string type         = 1;
+    string signName     = 2;
+    string region       = 3;
+    string secretKey    = 6;
+    string accessKey    = 10;
+    repeated SmsTpl tpls= 11;
+}

enums.proto

@@ -1,6 +1,7 @@
 syntax = "proto3";
 package protos;
 
+option go_package = ".;protos";
 
 /// 渠道
 enum UserFrom {
@@ -94,4 +95,13 @@ enum LogicID {
     TAJMAHAL    = 3;
     BIT_LEGEND  = 4;
     PAYMENT     = 9;
+}
+
+// redis prefixes
+enum KeyPrefix {
+    conf        = 0;
+    user        = 1;
+    rt          = 2;
+    map         = 3;
+    tmp         = 4;
 }

enums_msgid.proto

@@ -1,6 +1,7 @@
 syntax = "proto3";
 package protos;
 
+option go_package = ".;protos";
 
 /// MsgId 包含所有客户端协议ID
 enum MsgId {

errors.proto

@@ -1,6 +1,7 @@
 syntax="proto3";
 package protos;
 
+option go_package = ".;protos";
 
 enum ErrCode {
     OK 				        		= 0;		// 成功

gossip.proto

@@ -1,6 +1,8 @@
 syntax="proto3";
 package protos;
 
+option go_package = ".;protos";
+
 /// 游戏服务器之间消息
 
 // 心跳

logics/base.proto

@@ -2,6 +2,7 @@ syntax="proto3";
 package protos.logics;
 
 // basis definations of status or code in logic server
+option go_package = ".;protos";
 
 enum RoomStatus {
     ROOM_STATUS_IDLE        = 0;

logics/bitlegend.proto

@@ -1,6 +1,7 @@
 syntax="proto3";
 package protos.logics;
 
+option go_package = ".;protos";
 
 message C_ChangeWeapon {
 

login.proto

@@ -1,6 +1,8 @@
 syntax="proto3";
 package protos;
 
+option go_package = ".;protos";
+
 /// login 服务器到客户端通信协议 json
 
 // 用户注册类型

login_internal.proto

@@ -1,6 +1,8 @@
 syntax="proto3";
 package protos;
 
+option go_package = ".;protos";
+
 /// login 到 agent 通信协议
 
 message OfflineResult {

manager.proto

@@ -1,6 +1,8 @@
 syntax="proto3";
 package protos;
 
+option go_package = ".;protos";
+
 // HTTP 接口通信协议
 
 // manager - reply

modules/checkin.proto

@@ -1,5 +1,6 @@
 syntax = "proto3";
 package protos.modules;
+option go_package = ".;protos";
 
 /// 签到模块
 

modules/mail.proto

@@ -1,5 +1,6 @@
 syntax = "proto3";
 package protos.modules;
+option go_package = ".;protos";
 
 
 /// 一封邮件

modules/notice.proto

@@ -1,5 +1,6 @@
 syntax = "proto3";
 package protos.modules;
+option go_package = ".;protos";
 
 /// 公告模块
 

modules/shop.proto

@@ -1,5 +1,6 @@
 syntax = "proto3";
 package protos.modules;
+option go_package = ".;protos";
 
 /// 商城模块
 

modules/title.proto

@@ -1,5 +1,6 @@
 syntax = "proto3";
 package protos.modules;
+option go_package = ".;protos";
 
 /// 称号模块
 

msgq_evid.proto

@@ -1,6 +1,8 @@
 syntax="proto3";
 package protos;
 
+option go_package = ".;protos";
+
 /// 消息队列事件ID
 
 enum EvId {

msgq_mgr.proto

@@ -1,4 +1,6 @@
 syntax="proto3";
 package protos;
 
+option go_package = ".;protos";
+
 // 消息队列中管理事件

msgq_sys.proto

@@ -1,6 +1,8 @@
 syntax="proto3";
 package protos;
 
+option go_package = ".;protos";
+
 // 消息队列中系统事件
 
 message SysError {

msgq_usr.proto

@@ -1,6 +1,8 @@
 syntax="proto3";
 package protos;
 
+option go_package = ".;protos";
+
 // 定义消息队列中消息格式
 
 message UserRegister {

outline.proto

@@ -1,19 +1,21 @@
 syntax="proto3";
 package protos;
 
+option go_package = ".;protos";
+
 // 游戏服务器到客户端协议
 
 message Request{
-	int32 msgId 	= 1;
-	uint64 guid 	= 2;
+	int32 msgId 		= 1;
+	uint64 guid 		= 2;
 	string msgName	= 3;
 	bytes  req      = 10;
 }
 
 message Response{
-	int32 msgId 	= 1;
-	uint64 guid 	= 2;
+	int32 msgId 		= 1;
+	uint64 guid 		= 2;
 	string msgName	= 3;
-    int32  ec       = 4;
+	int32  ec       = 4;
 	bytes  res      = 10;
 }

redis.proto

@@ -1,6 +1,7 @@
 syntax="proto3";
 package protos;
 
+option go_package = ".;protos";
 
 // 用户基本信息，主要用于 login 服务器使用
 message UserBase {

structs.proto

@@ -1,6 +1,8 @@
 syntax="proto3";
 package protos;
 
+option go_package = ".;protos";
+
 message Int32Scope {
     int32 min       = 1;
     int32 max       = 2;

tajmahal.proto

@@ -1,6 +1,8 @@
 syntax="proto3";
 package protos;
 
+option go_package = ".;protos";
+
 import "enums.proto";
 
 /// 逻辑服务器之外(大厅，对应进程 tajmahal )的到客户端的协议