Merge branch 'dev' into test

liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/constant/AdamRedisConst.java

@@ -28,7 +28,7 @@ public class AdamRedisConst {
     public static final String INFO_MEMBER_AGREEMENT = INFO.concat("member:agreement");
     public static final String INFO_MEMBER_CODE = INFO.concat("member:code:");
 
-    public static final String BLACK_LIST = ADAM.concat(":blacklist:");
+    public static final String BLACK_LIST = ADAM.concat("blacklist:");
     public static final String BLK_LIST_MEMBER_UID = BLACK_LIST.concat("member:uid");
 
     public static final String SHOT_MEMBER_ORDER = ADAM.concat("morder:");

liquidnet-bus-config/liquidnet-config/liquidnet-service-executor-main-dev.yml

@@ -22,4 +22,4 @@ liquidnet:
       # Job执行器运行日志，注意目录读写权限
       logpath: /data/logs/job
   url:
-    paltform: ${liquidnet.service.platform.url}
+    platform: ${liquidnet.service.platform.url}

liquidnet-bus-config/liquidnet-config/liquidnet-service-executor-main-test.yml

@@ -22,4 +22,4 @@ liquidnet:
       # Job执行器运行日志，注意目录读写权限
       logpath: /data/logs/job
   url:
-    paltform: ${liquidnet.service.platform.url}
+    platform: ${liquidnet.service.platform.url}