Merge branch 'master' of https://gitee.com/xinyingpower/xymanagerbackend

jni/com_shxy_xymanager_service_interaction_Cma.h

@@ -90,10 +90,10 @@ JNIEXPORT jboolean JNICALL Java_com_shxy_xymanager_1service_interaction_Cma_upda
 /*
  * Class:     com_shxy_xymanager_service_interaction_Cma
  * Method:    updateTermId
- * Signature: (Ljava/lang/String;Ljava/lang/String;I)Z
+ * Signature: (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;I)Z
  */
 JNIEXPORT jboolean JNICALL Java_com_shxy_xymanager_1service_interaction_Cma_updateTermId
-  (JNIEnv *, jobject, jstring, jstring, jint);
+  (JNIEnv *, jobject, jstring, jstring, jstring, jint);
 
 /*
  * Class:     com_shxy_xymanager_service_interaction_Cma

xymanager_service/src/main/java/com/shxy/xymanager_service/interaction/Cma.java

@@ -46,7 +46,7 @@ public class Cma {
     public native boolean updateCma(String cmdid, String cmaIp, int cmaPort, String domain);
 
     // act=termid [0xAC] --cmdid=[CMD_ID] --newcmdid=[New CMD ID] --compid=[Component Id] --orgid=[Original Id]
-    public native boolean updateTermId(String cmdid, String componentId, int originalId);
+    public native boolean updateTermId(String cmdid, String newCmdid, String componentId, int originalId);
 
 
     // act=reset [0xAD] --cmdid=[CMD_ID] --mode=[Reset Mode: 0/1/2/3 Refer to SPEC doc]