Merge branch 'feature/macau' into develop

# Conflicts:
#	build.gradle
#	src/main/java/com/webank/weid/service/impl/AuthorityIssuerServiceImpl.java
#	src/main/java/com/webank/weid/service/impl/CptServiceImpl.java
#	src/main/java/com/webank/weid/service/impl/WeIdServiceImpl.java
#	src/main/java/com/webank/weid/util/TransactionUtils.java
#	src/test/java/com/webank/weid/full/auth/TestRegisterAuthorityIssuer.java
#	src/test/java/com/webank/weid/full/cpt/TestRegisterCpt.java
#	src/test/java/com/webank/weid/full/weid/TestCreateWeId1.java
#	src/test/java/com/webank/weid/util/TestTransactionUtils.java

.travis.yml

@@ -5,13 +5,13 @@ dist: trusty
 branches:
   except:
   - /^release.*/
-  - /^feature.*/
 
 # safelist
 branches:
   only:
   - master
   - develop
+  - feature/macau
   - /^v\d+\.\d+\.\d+$/
 
 language: java

build-tools/bin/setup.sh

@@ -75,11 +75,13 @@ function modify_config()
     cpt_address=$(cat cptController.address)
     issuer_address=$(cat authorityIssuer.address)
     evidence_address=$(cat evidenceController.address)
+    specificissuer_address=$(cat specificIssuer.address)
     export WEID_ADDRESS=${weid_address}
     export CPT_ADDRESS=${cpt_address}
     export ISSUER_ADDRESS=${issuer_address}
     export EVIDENCE_ADDRESS=${evidence_address}
-    MYVARS='${BLOCKCHIAN_NODE_INFO}:${WEID_ADDRESS}:${CPT_ADDRESS}:${ISSUER_ADDRESS}:${EVIDENCE_ADDRESS}'
+    export SPECIFICISSUER_ADDRESS=${specificissuer_address}
+    MYVARS='${BLOCKCHIAN_NODE_INFO}:${WEID_ADDRESS}:${CPT_ADDRESS}:${ISSUER_ADDRESS}:${EVIDENCE_ADDRESS}:${SPECIFICISSUER_ADDRESS}'
     envsubst ${MYVARS} < ${app_xml_config_tpl} >${app_xml_config}
     cp ${app_xml_config} ${app_xml_config_dir}
     echo "modify sdk config finished..."
@@ -127,7 +129,8 @@ function gradle_build_sdk()
     export CPT_ADDRESS="0x0"
     export ISSUER_ADDRESS="0x0"
     export EVIDENCE_ADDRESS="0x0"
-    MYVARS='${BLOCKCHIAN_NODE_INFO}:${WEID_ADDRESS}:${CPT_ADDRESS}:${ISSUER_ADDRESS}:${EVIDENCE_ADDRESS}'
+    export SPECIFICISSUER_ADDRESS="0x0"
+    MYVARS='${BLOCKCHIAN_NODE_INFO}:${WEID_ADDRESS}:${CPT_ADDRESS}:${ISSUER_ADDRESS}:${EVIDENCE_ADDRESS}:${SPECIFICISSUER_ADDRESS}'
     envsubst ${MYVARS} < ${app_xml_config_tpl} >${app_xml_config}
 
     cd ${java_source_code_dir}/