update

.gitignore

@@ -1,5 +1,5 @@
 /.hbuilderx
 /node_modules
 /unpackage
-
+/proto/bundle.js
 

common/httpClient.js

@@ -1,4 +1,7 @@
-import {getEncodeFun,getDecodeFun} from "./protoMap"
+import {
+	requestEncode,
+	responseDecode
+} from "./protoMap"
 
 
 const URL = 'http://60.205.190.38:80/Ohplay/Web/HttpToTcp';
@@ -6,13 +9,8 @@ const URL = 'http://60.205.190.38:80/Ohplay/Web/HttpToTcp';
 
 
 function post(request) {
-	let encodeFun = getEncodeFun(request.servant);
-	console.log(typeof encodeFun);
-	//if (typeof encodeFun === "function") {
-	let requestBuffer = encodeFun(request)
-	//}
+	let requestBuffer = requestEncode(request)
 	return uni.request({
-		//url:'https://test.api1.radio1964.com:80/Ohplay/Web/HttpToTcp'
 		url: URL,
 		header: {
 			"X-Requested-With": "XMLHttpRequest",
@@ -36,27 +34,24 @@ function post(request) {
 						msg: resJson.info
 					}
 				} catch (e) {
-					let decodeFun = getDecodeFun(request.servant)
-					// if (typeof decodeFun === "function") {
-						let data = decodeFun(response)
-						console.log(data);
-						let code = 0
-						let msg = "success"
-						if(typeof data.errInfo !== 'undefined'){
-							code = data.errInfo.errorCode
-							if(typeof data.errInfo.errorMessage === 'string'){
-								msg = data.errInfo.errorMessage
-							}else{
-								msg = Buffer.from(data.errInfo.errorMessage).toString()
-							}
+					let data = responseDecode(response)
+					console.log(data);
+					let code = 0
+					let msg = "success"
+					if (typeof data.errInfo !== 'undefined') {
+						code = data.errInfo.errorCode
+						if (typeof data.errInfo.errorMessage === 'string') {
+							msg = data.errInfo.errorMessage
+						} else {
+							msg = Buffer.from(data.errInfo.errorMessage).toString()
 						}
-						//throw "Error2"
-						return {
-							code: code,
-							msg: msg,
-							data: data
-						}
-					// }
+					}
+					//throw "Error2"
+					return {
+						code: code,
+						msg: msg,
+						data: data
+					}
 				}
 			}
 		}

common/protoMap.js

@@ -3,15 +3,11 @@ import {
 	user
 } from '../proto/bundle.js';
 
-const protoMap = {}
-
-function getEncodeFun(servant) {
-	return protoMap[servant.toString()].requestEncode;
+const protoMap = {
+	1005: user.login_req,
+	1006: user.login_rsp,
 }
 
-function getDecodeFun(servant) {
-	return protoMap[servant.toString()].responseDecode
-}
 
 function getMsgWebsocket(version, server, servant, buffer) {
 	return common.MsgWebsocket.create({
@@ -23,62 +19,48 @@ function getMsgWebsocket(version, server, servant, buffer) {
 	})
 }
 
-function getRequestBuffer(request, buffer){
+function getRequestBuffer(request, buffer) {
 	let requestMessage = getMsgWebsocket(1, request.server, request.servant, buffer)
 	let requestBuffer = common.MsgWebsocket.encode(requestMessage).finish()
 	return new Uint8Array([...requestBuffer]).buffer
 }
 
-function getResponseDataBuf(response){
+function getResponseDataBuf(response) {
 	let resBuf = Buffer.from(response.data)
 	let resMessage = common.MsgWebsocket.decode(resBuf)
 	return resMessage.data
 }
 
-//1005 是后端提供的此接口的servant
-protoMap['1005'] = {
-	requestEncode: function(request) { //登录请求的编码
-		//创建login_req的message对象
-		let loginMessage = user.login_req.create({
-			type: request.data.type,
-			//如果phone定义的是bytes，这里要转换一下，
-			//如果phone定义的是string，这里就不需要Buffer.from了
-			//要确认phone是string类型，才能把phone的bytes更换成string
-			phone: Buffer.from(request.data.phone),
-			//同phone，在proto文件中字段名（verifyInfo）最好用驼峰命名规则，不要用verify_info
-			verifyInfo: Buffer.from(request.data.verifyInfo),
-		})
-		//login_req的message 编码转换为Buffer数据
-		let buffer = user.login_req.encode(loginMessage).finish()
-		//返回请求的ArrayBuffer
-		return getRequestBuffer(request,buffer)
-	},
-	responseDecode: function(response) { //登录响应的解码
-		//得到loginRsp message的buffer数据
-		let loginRspBuf = getResponseDataBuf(response)
-		//解码得到loginRsp的message对象
-		let loginRspMessage = user.login_rsp.decode(loginRspBuf)
-		//把loginRsp Message对象转换为js对象
-		let obj = user.login_rsp.toObject(loginRspMessage, {
-			longs: String,
-			enums: String,
-		})
-		//如果proto定义的字段是bytes，在这里可以转换成一下String
-		//也可以直接在proto文件中把字段的bytes 类型 替换成string类型，
-		//但是要确认这个字段是string类型的，string类型在这里就不需要转换了
-		if(typeof obj.errInfo.errorMessage !== 'undefined'){
-			obj.errInfo.errorMessage = Buffer.from(obj.errInfo.errorMessage).toString()
-		}
-		if(typeof obj.token !== 'undefined'){
-			obj.token = Buffer.from(obj.token).toString()
-		}
-		return obj
-	}
+
+function requestEncode(request) { //请求的编码
+	let RequestMessage = protoMap[request.servant]
+	let requestMsgObj = RequestMessage.create(request.data)
+	console.log(requestMsgObj);
+	let buffer = RequestMessage.encode(requestMsgObj).finish()
+	//返回请求的ArrayBuffer
+	return getRequestBuffer(request, buffer)
+}
+
+function responseDecode(response) { //响应的解码
+	let resBuf = Buffer.from(response.data)
+	let resMessage = common.MsgWebsocket.decode(resBuf)
+	let rspBuf = resMessage.data
+
+	let ResponseMessage = protoMap[resMessage.servant]
+
+	let rspMsgObj = ResponseMessage.decode(rspBuf)
+	console.log(rspMsgObj);
+	let obj = ResponseMessage.toObject(rspMsgObj, {
+		longs: String,
+		enums: String,
+	})
+	return obj
+
 }
 
 
 
 module.exports = {
-	getEncodeFun,
-	getDecodeFun,
+	requestEncode,
+	responseDecode,
 }

common/protoMap1.js

@@ -0,0 +1,84 @@
+import {
+	common,
+	user
+} from '../proto/bundle.js';
+
+const protoMap = {}
+
+function getEncodeFun(servant) {
+	return protoMap[servant.toString()].requestEncode;
+}
+
+function getDecodeFun(servant) {
+	return protoMap[servant.toString()].responseDecode
+}
+
+function getMsgWebsocket(version, server, servant, buffer) {
+	return common.MsgWebsocket.create({
+		version: version,
+		app: 1,
+		server: server,
+		servant: servant,
+		data: buffer,
+	})
+}
+
+function getRequestBuffer(request, buffer){
+	let requestMessage = getMsgWebsocket(1, request.server, request.servant, buffer)
+	let requestBuffer = common.MsgWebsocket.encode(requestMessage).finish()
+	return new Uint8Array([...requestBuffer]).buffer
+}
+
+function getResponseDataBuf(response){
+	let resBuf = Buffer.from(response.data)
+	let resMessage = common.MsgWebsocket.decode(resBuf)
+	return resMessage.data
+}
+
+//1005 是后端提供的此接口的servant
+protoMap['1005'] = {
+	requestEncode: function(request) { //登录请求的编码
+		//创建login_req的message对象
+		let loginMessage = user.login_req.create({
+			type: request.data.type,
+			//如果phone定义的是bytes，这里要转换一下，
+			//如果phone定义的是string，这里就不需要Buffer.from了
+			//要确认phone是string类型，才能把phone的bytes更换成string
+			phone: Buffer.from(request.data.phone),
+			//同phone，在proto文件中字段名（verifyInfo）最好用驼峰命名规则，不要用verify_info
+			verifyInfo: Buffer.from(request.data.verifyInfo),
+		})
+		//login_req的message 编码转换为Buffer数据
+		let buffer = user.login_req.encode(loginMessage).finish()
+		//返回请求的ArrayBuffer
+		return getRequestBuffer(request,buffer)
+	},
+	responseDecode: function(response) { //登录响应的解码
+		//得到loginRsp message的buffer数据
+		let loginRspBuf = getResponseDataBuf(response)
+		//解码得到loginRsp的message对象
+		let loginRspMessage = user.login_rsp.decode(loginRspBuf)
+		//把loginRsp Message对象转换为js对象
+		let obj = user.login_rsp.toObject(loginRspMessage, {
+			longs: String,
+			enums: String,
+		})
+		//如果proto定义的字段是bytes，在这里可以转换成一下String
+		//也可以直接在proto文件中把字段的bytes 类型 替换成string类型，
+		//但是要确认这个字段是string类型的，string类型在这里就不需要转换了
+		if(typeof obj.errInfo.errorMessage !== 'undefined'){
+			obj.errInfo.errorMessage = Buffer.from(obj.errInfo.errorMessage).toString()
+		}
+		if(typeof obj.token !== 'undefined'){
+			obj.token = Buffer.from(obj.token).toString()
+		}
+		return obj
+	}
+}
+
+
+
+module.exports = {
+	getEncodeFun,
+	getDecodeFun,
+}

pages/index/device.vue

@@ -2,7 +2,7 @@
 	<view class="content">
 		<button @click="godoBle">添加设备</button>
 		
-		<button @click="test1">test1</button>
+		<button v-if="false" @click="test1">test1</button>
 	</view>
 </template>
 

pages/index/mine.vue

@@ -11,14 +11,14 @@
 
 <script>
 	import post from '../../common/httpClient.js'
-	import {common,	user} from '../../proto/proto.js';
+	import {common,	user} from '../../proto/bundle.js';
 	//const protobuf = require("protobufjs/minimal");
 	const axios = require('axios');
 
 	let loginMessage = user.login_req.create({
-		phone: Buffer.from('1234567890'),
+		phone: '1234567890',
 		type: 1,
-		verifyInfo: Buffer.from('123456a'),
+		verifyInfo: '123456a',
 	})
 	//proto对象转buffer
 	let buffer = user.login_req.encode(loginMessage).finish()
@@ -50,25 +50,37 @@
 				console.log(e.detail.iv)
 				console.log(e.detail.encryptedData)
 			},
-			wxHttpTest() {
+		  wxHttpTest() {
 				//try{
 				post({
 					server:2,
 					servant:1005,
 					data:{
+						// phone:Buffer.from('3246541321'),
 						phone:'3246541321',
 						type:1,
-						verifyInfo:'asdasd'
+						//verifyInfo:Buffer.from('asdasd')
+						verifyInfo:'asdasd',
+						data:{
+							
+						}
 					}
 				})
 				.then((res) =>{
-					console.log(res)
-					// if(res.code === 0){//成功
+					console.log(res);
+					/* res的结构
+					  {
+						  code:0,错误码 number类型
+						  msg:"",错误消息 string类型
+						  data:对应loginRsp的js对象
+					  }
+					 */
+					if(res.code === 0){//成功
 						
-					// }else{
-					// 	//失败
-					// }
-				}, (err) => {
+					}else{
+						//失败
+					}
+				}, (err) => {//出现异常
 					console.log(err);
 				})
 			},

proto/Common.proto

@@ -7,15 +7,6 @@ message ErrorInfo {
     string errorMessage = 2; //错误描述信息
 }
 
-message AwesomeMessage{
-    fixed32 version     = 1; 
-    fixed32 app         = 2; 
-    fixed32 server      = 3;
-    fixed32 servant     = 4; 
-    bytes data          = 9;
-}
-
-
 message MsgWebsocket {
     fixed32 version     = 1;               ///< 协议版本号
     fixed32 app         = 2;               ///<应用名称

proto/User.proto

@@ -2,16 +2,16 @@ syntax = "proto3";
 
 package user;
 
-import "Common.proto";
+import "common";
 
 //登录请求
 message login_req
 {
-    bytes  phone            = 1;
+    string  phone            = 1;
     uint32 type             = 2;//登录类型，1:密码登录,2:验证码登录
-    bytes  verify_info      = 3;//1密码,2验证码
+    string  verifyInfo      = 3;//1密码,2验证码
     int64  time				= 4;//纳秒,游客登陆用的
-    uint32 system_type      = 5;//系统类型，0全部，1:ios,2:android
+    uint32 systemType      = 5;//系统类型，0全部，1:ios,2:android
 
 }
 
@@ -20,7 +20,7 @@ message login_rsp {
     ErrorInfo errInfo  = 1; // 错误码信息
     uint32   id       = 2;
     string    token    = 3; // 访问令牌
-    bytes sskey       = 4;
+    string sskey       = 4;
 }
 
 

proto/bundle.js

@@ -228,291 +228,6 @@ $root.common = (function() {
         return ErrorInfo;
     })();
 
-    common.AwesomeMessage = (function() {
-
-        /**
-         * Properties of an AwesomeMessage.
-         * @memberof common
-         * @interface IAwesomeMessage
-         * @property {number|null} [version] AwesomeMessage version
-         * @property {number|null} [app] AwesomeMessage app
-         * @property {number|null} [server] AwesomeMessage server
-         * @property {number|null} [servant] AwesomeMessage servant
-         * @property {Uint8Array|null} [data] AwesomeMessage data
-         */
-
-        /**
-         * Constructs a new AwesomeMessage.
-         * @memberof common
-         * @classdesc Represents an AwesomeMessage.
-         * @implements IAwesomeMessage
-         * @constructor
-         * @param {common.IAwesomeMessage=} [properties] Properties to set
-         */
-        function AwesomeMessage(properties) {
-            if (properties)
-                for (var keys = Object.keys(properties), i = 0; i < keys.length; ++i)
-                    if (properties[keys[i]] != null)
-                        this[keys[i]] = properties[keys[i]];
-        }
-
-        /**
-         * AwesomeMessage version.
-         * @member {number} version
-         * @memberof common.AwesomeMessage
-         * @instance
-         */
-        AwesomeMessage.prototype.version = 0;
-
-        /**
-         * AwesomeMessage app.
-         * @member {number} app
-         * @memberof common.AwesomeMessage
-         * @instance
-         */
-        AwesomeMessage.prototype.app = 0;
-
-        /**
-         * AwesomeMessage server.
-         * @member {number} server
-         * @memberof common.AwesomeMessage
-         * @instance
-         */
-        AwesomeMessage.prototype.server = 0;
-
-        /**
-         * AwesomeMessage servant.
-         * @member {number} servant
-         * @memberof common.AwesomeMessage
-         * @instance
-         */
-        AwesomeMessage.prototype.servant = 0;
-
-        /**
-         * AwesomeMessage data.
-         * @member {Uint8Array} data
-         * @memberof common.AwesomeMessage
-         * @instance
-         */
-        AwesomeMessage.prototype.data = $util.newBuffer([]);
-
-        /**
-         * Creates a new AwesomeMessage instance using the specified properties.
-         * @function create
-         * @memberof common.AwesomeMessage
-         * @static
-         * @param {common.IAwesomeMessage=} [properties] Properties to set
-         * @returns {common.AwesomeMessage} AwesomeMessage instance
-         */
-        AwesomeMessage.create = function create(properties) {
-            return new AwesomeMessage(properties);
-        };
-
-        /**
-         * Encodes the specified AwesomeMessage message. Does not implicitly {@link common.AwesomeMessage.verify|verify} messages.
-         * @function encode
-         * @memberof common.AwesomeMessage
-         * @static
-         * @param {common.IAwesomeMessage} message AwesomeMessage message or plain object to encode
-         * @param {$protobuf.Writer} [writer] Writer to encode to
-         * @returns {$protobuf.Writer} Writer
-         */
-        AwesomeMessage.encode = function encode(message, writer) {
-            if (!writer)
-                writer = $Writer.create();
-            if (message.version != null && Object.hasOwnProperty.call(message, "version"))
-                writer.uint32(/* id 1, wireType 5 =*/13).fixed32(message.version);
-            if (message.app != null && Object.hasOwnProperty.call(message, "app"))
-                writer.uint32(/* id 2, wireType 5 =*/21).fixed32(message.app);
-            if (message.server != null && Object.hasOwnProperty.call(message, "server"))
-                writer.uint32(/* id 3, wireType 5 =*/29).fixed32(message.server);
-            if (message.servant != null && Object.hasOwnProperty.call(message, "servant"))
-                writer.uint32(/* id 4, wireType 5 =*/37).fixed32(message.servant);
-            if (message.data != null && Object.hasOwnProperty.call(message, "data"))
-                writer.uint32(/* id 9, wireType 2 =*/74).bytes(message.data);
-            return writer;
-        };
-
-        /**
-         * Encodes the specified AwesomeMessage message, length delimited. Does not implicitly {@link common.AwesomeMessage.verify|verify} messages.
-         * @function encodeDelimited
-         * @memberof common.AwesomeMessage
-         * @static
-         * @param {common.IAwesomeMessage} message AwesomeMessage message or plain object to encode
-         * @param {$protobuf.Writer} [writer] Writer to encode to
-         * @returns {$protobuf.Writer} Writer
-         */
-        AwesomeMessage.encodeDelimited = function encodeDelimited(message, writer) {
-            return this.encode(message, writer).ldelim();
-        };
-
-        /**
-         * Decodes an AwesomeMessage message from the specified reader or buffer.
-         * @function decode
-         * @memberof common.AwesomeMessage
-         * @static
-         * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from
-         * @param {number} [length] Message length if known beforehand
-         * @returns {common.AwesomeMessage} AwesomeMessage
-         * @throws {Error} If the payload is not a reader or valid buffer
-         * @throws {$protobuf.util.ProtocolError} If required fields are missing
-         */
-        AwesomeMessage.decode = function decode(reader, length) {
-            if (!(reader instanceof $Reader))
-                reader = $Reader.create(reader);
-            var end = length === undefined ? reader.len : reader.pos + length, message = new $root.common.AwesomeMessage();
-            while (reader.pos < end) {
-                var tag = reader.uint32();
-                switch (tag >>> 3) {
-                case 1:
-                    message.version = reader.fixed32();
-                    break;
-                case 2:
-                    message.app = reader.fixed32();
-                    break;
-                case 3:
-                    message.server = reader.fixed32();
-                    break;
-                case 4:
-                    message.servant = reader.fixed32();
-                    break;
-                case 9:
-                    message.data = reader.bytes();
-                    break;
-                default:
-                    reader.skipType(tag & 7);
-                    break;
-                }
-            }
-            return message;
-        };
-
-        /**
-         * Decodes an AwesomeMessage message from the specified reader or buffer, length delimited.
-         * @function decodeDelimited
-         * @memberof common.AwesomeMessage
-         * @static
-         * @param {$protobuf.Reader|Uint8Array} reader Reader or buffer to decode from
-         * @returns {common.AwesomeMessage} AwesomeMessage
-         * @throws {Error} If the payload is not a reader or valid buffer
-         * @throws {$protobuf.util.ProtocolError} If required fields are missing
-         */
-        AwesomeMessage.decodeDelimited = function decodeDelimited(reader) {
-            if (!(reader instanceof $Reader))
-                reader = new $Reader(reader);
-            return this.decode(reader, reader.uint32());
-        };
-
-        /**
-         * Verifies an AwesomeMessage message.
-         * @function verify
-         * @memberof common.AwesomeMessage
-         * @static
-         * @param {Object.<string,*>} message Plain object to verify
-         * @returns {string|null} `null` if valid, otherwise the reason why it is not
-         */
-        AwesomeMessage.verify = function verify(message) {
-            if (typeof message !== "object" || message === null)
-                return "object expected";
-            if (message.version != null && message.hasOwnProperty("version"))
-                if (!$util.isInteger(message.version))
-                    return "version: integer expected";
-            if (message.app != null && message.hasOwnProperty("app"))
-                if (!$util.isInteger(message.app))
-                    return "app: integer expected";
-            if (message.server != null && message.hasOwnProperty("server"))
-                if (!$util.isInteger(message.server))
-                    return "server: integer expected";
-            if (message.servant != null && message.hasOwnProperty("servant"))
-                if (!$util.isInteger(message.servant))
-                    return "servant: integer expected";
-            if (message.data != null && message.hasOwnProperty("data"))
-                if (!(message.data && typeof message.data.length === "number" || $util.isString(message.data)))
-                    return "data: buffer expected";
-            return null;
-        };
-
-        /**
-         * Creates an AwesomeMessage message from a plain object. Also converts values to their respective internal types.
-         * @function fromObject
-         * @memberof common.AwesomeMessage
-         * @static
-         * @param {Object.<string,*>} object Plain object
-         * @returns {common.AwesomeMessage} AwesomeMessage
-         */
-        AwesomeMessage.fromObject = function fromObject(object) {
-            if (object instanceof $root.common.AwesomeMessage)
-                return object;
-            var message = new $root.common.AwesomeMessage();
-            if (object.version != null)
-                message.version = object.version >>> 0;
-            if (object.app != null)
-                message.app = object.app >>> 0;
-            if (object.server != null)
-                message.server = object.server >>> 0;
-            if (object.servant != null)
-                message.servant = object.servant >>> 0;
-            if (object.data != null)
-                if (typeof object.data === "string")
-                    $util.base64.decode(object.data, message.data = $util.newBuffer($util.base64.length(object.data)), 0);
-                else if (object.data.length)
-                    message.data = object.data;
-            return message;
-        };
-
-        /**
-         * Creates a plain object from an AwesomeMessage message. Also converts values to other types if specified.
-         * @function toObject
-         * @memberof common.AwesomeMessage
-         * @static
-         * @param {common.AwesomeMessage} message AwesomeMessage
-         * @param {$protobuf.IConversionOptions} [options] Conversion options
-         * @returns {Object.<string,*>} Plain object
-         */
-        AwesomeMessage.toObject = function toObject(message, options) {
-            if (!options)
-                options = {};
-            var object = {};
-            if (options.defaults) {
-                object.version = 0;
-                object.app = 0;
-                object.server = 0;
-                object.servant = 0;
-                if (options.bytes === String)
-                    object.data = "";
-                else {
-                    object.data = [];
-                    if (options.bytes !== Array)
-                        object.data = $util.newBuffer(object.data);
-                }
-            }
-            if (message.version != null && message.hasOwnProperty("version"))
-                object.version = message.version;
-            if (message.app != null && message.hasOwnProperty("app"))
-                object.app = message.app;
-            if (message.server != null && message.hasOwnProperty("server"))
-                object.server = message.server;
-            if (message.servant != null && message.hasOwnProperty("servant"))
-                object.servant = message.servant;
-            if (message.data != null && message.hasOwnProperty("data"))
-                object.data = options.bytes === String ? $util.base64.encode(message.data, 0, message.data.length) : options.bytes === Array ? Array.prototype.slice.call(message.data) : message.data;
-            return object;
-        };
-
-        /**
-         * Converts this AwesomeMessage to JSON.
-         * @function toJSON
-         * @memberof common.AwesomeMessage
-         * @instance
-         * @returns {Object.<string,*>} JSON object
-         */
-        AwesomeMessage.prototype.toJSON = function toJSON() {
-            return this.constructor.toObject(this, $protobuf.util.toJSONOptions);
-        };
-
-        return AwesomeMessage;
-    })();
-
     common.MsgWebsocket = (function() {
 
         /**
@@ -904,9 +619,9 @@ $root.user = (function() {
          * Properties of a login_req.
          * @memberof user
          * @interface Ilogin_req
-         * @property {Uint8Array|null} [phone] login_req phone
+         * @property {string|null} [phone] login_req phone
          * @property {number|null} [type] login_req type
-         * @property {Uint8Array|null} [verifyInfo] login_req verifyInfo
+         * @property {string|null} [verifyInfo] login_req verifyInfo
          * @property {number|Long|null} [time] login_req time
          * @property {number|null} [systemType] login_req systemType
          */
@@ -928,11 +643,11 @@ $root.user = (function() {
 
         /**
          * login_req phone.
-         * @member {Uint8Array} phone
+         * @member {string} phone
          * @memberof user.login_req
          * @instance
          */
-        login_req.prototype.phone = $util.newBuffer([]);
+        login_req.prototype.phone = "";
 
         /**
          * login_req type.
@@ -944,11 +659,11 @@ $root.user = (function() {
 
         /**
          * login_req verifyInfo.
-         * @member {Uint8Array} verifyInfo
+         * @member {string} verifyInfo
          * @memberof user.login_req
          * @instance
          */
-        login_req.prototype.verifyInfo = $util.newBuffer([]);
+        login_req.prototype.verifyInfo = "";
 
         /**
          * login_req time.
@@ -991,11 +706,11 @@ $root.user = (function() {
             if (!writer)
                 writer = $Writer.create();
             if (message.phone != null && Object.hasOwnProperty.call(message, "phone"))
-                writer.uint32(/* id 1, wireType 2 =*/10).bytes(message.phone);
+                writer.uint32(/* id 1, wireType 2 =*/10).string(message.phone);
             if (message.type != null && Object.hasOwnProperty.call(message, "type"))
                 writer.uint32(/* id 2, wireType 0 =*/16).uint32(message.type);
             if (message.verifyInfo != null && Object.hasOwnProperty.call(message, "verifyInfo"))
-                writer.uint32(/* id 3, wireType 2 =*/26).bytes(message.verifyInfo);
+                writer.uint32(/* id 3, wireType 2 =*/26).string(message.verifyInfo);
             if (message.time != null && Object.hasOwnProperty.call(message, "time"))
                 writer.uint32(/* id 4, wireType 0 =*/32).int64(message.time);
             if (message.systemType != null && Object.hasOwnProperty.call(message, "systemType"))
@@ -1035,13 +750,13 @@ $root.user = (function() {
                 var tag = reader.uint32();
                 switch (tag >>> 3) {
                 case 1:
-                    message.phone = reader.bytes();
+                    message.phone = reader.string();
                     break;
                 case 2:
                     message.type = reader.uint32();
                     break;
                 case 3:
-                    message.verifyInfo = reader.bytes();
+                    message.verifyInfo = reader.string();
                     break;
                 case 4:
                     message.time = reader.int64();
@@ -1085,14 +800,14 @@ $root.user = (function() {
             if (typeof message !== "object" || message === null)
                 return "object expected";
             if (message.phone != null && message.hasOwnProperty("phone"))
-                if (!(message.phone && typeof message.phone.length === "number" || $util.isString(message.phone)))
-                    return "phone: buffer expected";
+                if (!$util.isString(message.phone))
+                    return "phone: string expected";
             if (message.type != null && message.hasOwnProperty("type"))
                 if (!$util.isInteger(message.type))
                     return "type: integer expected";
             if (message.verifyInfo != null && message.hasOwnProperty("verifyInfo"))
-                if (!(message.verifyInfo && typeof message.verifyInfo.length === "number" || $util.isString(message.verifyInfo)))
-                    return "verifyInfo: buffer expected";
+                if (!$util.isString(message.verifyInfo))
+                    return "verifyInfo: string expected";
             if (message.time != null && message.hasOwnProperty("time"))
                 if (!$util.isInteger(message.time) && !(message.time && $util.isInteger(message.time.low) && $util.isInteger(message.time.high)))
                     return "time: integer|Long expected";
@@ -1115,17 +830,11 @@ $root.user = (function() {
                 return object;
             var message = new $root.user.login_req();
             if (object.phone != null)
-                if (typeof object.phone === "string")
-                    $util.base64.decode(object.phone, message.phone = $util.newBuffer($util.base64.length(object.phone)), 0);
-                else if (object.phone.length)
-                    message.phone = object.phone;
+                message.phone = String(object.phone);
             if (object.type != null)
                 message.type = object.type >>> 0;
             if (object.verifyInfo != null)
-                if (typeof object.verifyInfo === "string")
-                    $util.base64.decode(object.verifyInfo, message.verifyInfo = $util.newBuffer($util.base64.length(object.verifyInfo)), 0);
-                else if (object.verifyInfo.length)
-                    message.verifyInfo = object.verifyInfo;
+                message.verifyInfo = String(object.verifyInfo);
             if (object.time != null)
                 if ($util.Long)
                     (message.time = $util.Long.fromValue(object.time)).unsigned = false;
@@ -1154,21 +863,9 @@ $root.user = (function() {
                 options = {};
             var object = {};
             if (options.defaults) {
-                if (options.bytes === String)
-                    object.phone = "";
-                else {
-                    object.phone = [];
-                    if (options.bytes !== Array)
-                        object.phone = $util.newBuffer(object.phone);
-                }
+                object.phone = "";
                 object.type = 0;
-                if (options.bytes === String)
-                    object.verifyInfo = "";
-                else {
-                    object.verifyInfo = [];
-                    if (options.bytes !== Array)
-                        object.verifyInfo = $util.newBuffer(object.verifyInfo);
-                }
+                object.verifyInfo = "";
                 if ($util.Long) {
                     var long = new $util.Long(0, 0, false);
                     object.time = options.longs === String ? long.toString() : options.longs === Number ? long.toNumber() : long;
@@ -1177,11 +874,11 @@ $root.user = (function() {
                 object.systemType = 0;
             }
             if (message.phone != null && message.hasOwnProperty("phone"))
-                object.phone = options.bytes === String ? $util.base64.encode(message.phone, 0, message.phone.length) : options.bytes === Array ? Array.prototype.slice.call(message.phone) : message.phone;
+                object.phone = message.phone;
             if (message.type != null && message.hasOwnProperty("type"))
                 object.type = message.type;
             if (message.verifyInfo != null && message.hasOwnProperty("verifyInfo"))
-                object.verifyInfo = options.bytes === String ? $util.base64.encode(message.verifyInfo, 0, message.verifyInfo.length) : options.bytes === Array ? Array.prototype.slice.call(message.verifyInfo) : message.verifyInfo;
+                object.verifyInfo = message.verifyInfo;
             if (message.time != null && message.hasOwnProperty("time"))
                 if (typeof message.time === "number")
                     object.time = options.longs === String ? String(message.time) : message.time;
@@ -1215,7 +912,7 @@ $root.user = (function() {
          * @property {common.IErrorInfo|null} [errInfo] login_rsp errInfo
          * @property {number|null} [id] login_rsp id
          * @property {string|null} [token] login_rsp token
-         * @property {Uint8Array|null} [sskey] login_rsp sskey
+         * @property {string|null} [sskey] login_rsp sskey
          */
 
         /**
@@ -1259,11 +956,11 @@ $root.user = (function() {
 
         /**
          * login_rsp sskey.
-         * @member {Uint8Array} sskey
+         * @member {string} sskey
          * @memberof user.login_rsp
          * @instance
          */
-        login_rsp.prototype.sskey = $util.newBuffer([]);
+        login_rsp.prototype.sskey = "";
 
         /**
          * Creates a new login_rsp instance using the specified properties.
@@ -1296,7 +993,7 @@ $root.user = (function() {
             if (message.token != null && Object.hasOwnProperty.call(message, "token"))
                 writer.uint32(/* id 3, wireType 2 =*/26).string(message.token);
             if (message.sskey != null && Object.hasOwnProperty.call(message, "sskey"))
-                writer.uint32(/* id 4, wireType 2 =*/34).bytes(message.sskey);
+                writer.uint32(/* id 4, wireType 2 =*/34).string(message.sskey);
             return writer;
         };
 
@@ -1341,7 +1038,7 @@ $root.user = (function() {
                     message.token = reader.string();
                     break;
                 case 4:
-                    message.sskey = reader.bytes();
+                    message.sskey = reader.string();
                     break;
                 default:
                     reader.skipType(tag & 7);
@@ -1390,8 +1087,8 @@ $root.user = (function() {
                 if (!$util.isString(message.token))
                     return "token: string expected";
             if (message.sskey != null && message.hasOwnProperty("sskey"))
-                if (!(message.sskey && typeof message.sskey.length === "number" || $util.isString(message.sskey)))
-                    return "sskey: buffer expected";
+                if (!$util.isString(message.sskey))
+                    return "sskey: string expected";
             return null;
         };
 
@@ -1417,10 +1114,7 @@ $root.user = (function() {
             if (object.token != null)
                 message.token = String(object.token);
             if (object.sskey != null)
-                if (typeof object.sskey === "string")
-                    $util.base64.decode(object.sskey, message.sskey = $util.newBuffer($util.base64.length(object.sskey)), 0);
-                else if (object.sskey.length)
-                    message.sskey = object.sskey;
+                message.sskey = String(object.sskey);
             return message;
         };
 
@@ -1441,13 +1135,7 @@ $root.user = (function() {
                 object.errInfo = null;
                 object.id = 0;
                 object.token = "";
-                if (options.bytes === String)
-                    object.sskey = "";
-                else {
-                    object.sskey = [];
-                    if (options.bytes !== Array)
-                        object.sskey = $util.newBuffer(object.sskey);
-                }
+                object.sskey = "";
             }
             if (message.errInfo != null && message.hasOwnProperty("errInfo"))
                 object.errInfo = $root.common.ErrorInfo.toObject(message.errInfo, options);
@@ -1456,7 +1144,7 @@ $root.user = (function() {
             if (message.token != null && message.hasOwnProperty("token"))
                 object.token = message.token;
             if (message.sskey != null && message.hasOwnProperty("sskey"))
-                object.sskey = options.bytes === String ? $util.base64.encode(message.sskey, 0, message.sskey.length) : options.bytes === Array ? Array.prototype.slice.call(message.sskey) : message.sskey;
+                object.sskey = message.sskey;
             return object;
         };
 

proto/proto.json

@@ -1,124 +0,0 @@
-{
-  "nested": {
-    "common": {
-      "nested": {
-        "ErrorInfo": {
-          "fields": {
-            "errorCode": {
-              "type": "fixed32",
-              "id": 1
-            },
-            "errorMessage": {
-              "type": "bytes",
-              "id": 2
-            }
-          }
-        },
-        "MsgHead": {
-          "fields": {
-            "bodyLen": {
-              "type": "fixed32",
-              "id": 1
-            },
-            "version": {
-              "type": "fixed32",
-              "id": 2
-            },
-            "app": {
-              "type": "fixed32",
-              "id": 3
-            },
-            "server": {
-              "type": "fixed32",
-              "id": 4
-            },
-            "servant": {
-              "type": "fixed32",
-              "id": 5
-            },
-            "seq": {
-              "type": "fixed32",
-              "id": 6
-            },
-            "routeId": {
-              "type": "fixed32",
-              "id": 7
-            },
-            "encrypt": {
-              "type": "fixed32",
-              "id": 8
-            }
-          }
-        },
-        "MsgBody": {
-          "fields": {
-            "body": {
-              "type": "bytes",
-              "id": 1
-            },
-            "extend": {
-              "type": "bytes",
-              "id": 2
-            }
-          }
-        },
-        "audio_type": {
-          "values": {
-            "AUDIO_TYPE_MIN": 0,
-            "MUSIC_BROADCAST": 1,
-            "RADIO_BROADCAST": 2,
-            "MUSIC_UNICAST": 3,
-            "RADIO_UNICAST": 4,
-            "MUSIC_PROGRAM": 5,
-            "RADIO_PROGRAM": 6,
-            "RADIO_SELECTION": 7
-          }
-        }
-      }
-    },
-    "user": {
-      "nested": {
-        "user_info_get_req": {
-          "fields": {
-            "id": {
-              "type": "uint32",
-              "id": 1
-            }
-          }
-        },
-        "user_info_get_rsp": {
-          "fields": {
-            "errInfo": {
-              "type": "ErrorInfo",
-              "id": 1
-            },
-            "nickname": {
-              "type": "bytes",
-              "id": 2
-            },
-            "address": {
-              "type": "bytes",
-              "id": 3
-            },
-            "headUrl": {
-              "type": "bytes",
-              "id": 4
-            },
-            "constellation": {
-              "type": "uint32",
-              "id": 5
-            },
-            "audioDuration": {
-              "type": "uint32",
-              "id": 6
-            },
-            "credits": {
-              "type": "uint32",
-              "id": 7
-            }
-          }
-        }
-      }
-    }
-  }
-}