增加msg返回；修复文档中的exception命名错误

lorgine-li · Oct 10, 2017 · 1dac18a · 1dac18a
1 parent 159029c
commit 1dac18a
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 12 deletions.
diff --git a/php/tarsclient/README.md b/php/tarsclient/README.md
@@ -233,7 +233,7 @@ class SimpleStruct extends \TARS_Struct {
 
 3. 在composer.json中指定require类库:
 ```
-    "phptars/tars-assistant" : "dev-master"
+    "phptars/tars-assistant" : "0.1.6"
 ```
 
 4. 执行composer install命令安装类库,此时会出现vendor目录
@@ -258,7 +258,7 @@ class SimpleStruct extends \TARS_Struct {
     try {
         $intVal = $servant->singleParam($in1,$ss1,$out1);
     }
-    catch(TUP_Exception $e) {
+    catch(phptars\TarsException $e) {
         // 错误处理
     }
 ```

diff --git a/php/tarsclient/ext/include/tup_c.h b/php/tarsclient/ext/include/tup_c.h
@@ -130,7 +130,7 @@ void  UniPacket_setVersion(UniPacket * pack, Short siVersion);
 Short UniPacket_getVersion(UniPacket * pack);
 
 Int32 Unipacket_getCode(UniPacket* unpack,JString *tmp);
-Int32 Unipacket_getMsg(UniPacket* unpack,JString *tmp);
+Int32 Unipacket_getMsg(UniPacket* unpack,JString **tmp);
 
 Int32 UniPacket_decode(UniPacket * pack, const char* buff, uint32_t len);
 

diff --git a/php/tarsclient/ext/tup_c.c b/php/tarsclient/ext/tup_c.c
@@ -834,7 +834,7 @@ Int32 Unipacket_getCode(UniPacket* unpack,JString *tmp) {
 	return ret;
 }
 
-Int32 Unipacket_getMsg(UniPacket* unpack,JString *tmp) {
+Int32 Unipacket_getMsg(UniPacket* unpack,JString **tmp) {
 
 	Int32 ret = 0;
 	char * pBuff = NULL;
@@ -860,7 +860,7 @@ Int32 Unipacket_getMsg(UniPacket* unpack,JString *tmp) {
 	TarsInputStream_setBuffer(is_string, pBuff, len);
 
 
-	ret = TarsInputStream_readString(is_string, tmp, 1, true);
+	ret = TarsInputStream_readString(is_string, *tmp, 1, true);
 
 	if (TARS_SUCCESS != ret)	goto do_clean;
 

diff --git a/php/tarsclient/ext/tupapi.c b/php/tarsclient/ext/tupapi.c
@@ -628,20 +628,22 @@ PHP_METHOD(tup,decode) {
 
     code = atoi(JString_data(tmp));
 
+    // 获取msg
+    char * msg;
+    ret = Unipacket_getMsg(unpack,&tmp);
+
+    msg = JS_STRVAL(tmp);
+    int msg_len = JS_STRLEN(tmp);
+
     if(code != TARS_SUCCESS) {
         add_assoc_long(return_value,"code",code);
+        add_assoc_stringl(return_value,"msg",msg, msg_len, 1);
+
         if(tmp) JString_del(&tmp);
         if(unpack) UniPacket_del(&unpack);
         return;
     }
 
-    // 获取msg
-    char * msg;
-    ret = Unipacket_getMsg(unpack,tmp);
-
-    msg = JS_STRVAL(tmp);
-    int msg_len = JS_STRLEN(tmp);
-
     TarsOutputStream *os = TarsOutputStream_new();
     if (!os) {
         MALLOC_EXCEPTION("Decode");