Merge branch 'master' into hjc_goblin_pos

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/KylinRefundsStatusServiceImpl.java

@@ -411,6 +411,7 @@ public class KylinRefundsStatusServiceImpl {
             );
             if (!Objects.equals(orderRefundsOld.getStatus(), KylinTableStatusConst.ORDER_REFUND_STATUS_APPROVED)
                 && !Objects.equals(orderRefundsOld.getStatus(), KylinTableStatusConst.ORDER_REFUND_STATUS_TICKET)
+                && !Objects.equals(orderRefundsOld.getStatus(), KylinTableStatusConst.ORDER_REFUND_STATUS_ERROR)
             ) {
                 continue;
             }

liquidnet-bus-config/liquidnet-config/application-test.yml

@@ -34,51 +34,59 @@ liquidnet:
     kylin:
       database: 255
       dbs: 0,256
-      host: r-2ze7002ckw5u75fgukpd.redis.rds.aliyuncs.com
+      host: r-2zeucai3yj2t0f4nmzpd.redis.rds.aliyuncs.com
+
       port: 6380
-      password: PO@B!Iud32
+      password: 7eoK2XehKqF1
     slime:
       database: 255
       dbs: 0,256
-      host: r-2ze7002ckw5u75fgukpd.redis.rds.aliyuncs.com
+      host: r-2zeucai3yj2t0f4nmzpd.redis.rds.aliyuncs.com
+
       port: 6380
-      password: PO@B!Iud32
+      password: 7eoK2XehKqF1
     dragon:
       database: 255
       dbs: 0,256
-      host: r-2ze7002ckw5u75fgukpd.redis.rds.aliyuncs.com
+      host: r-2zeucai3yj2t0f4nmzpd.redis.rds.aliyuncs.com
+
       port: 6380
-      password: PO@B!Iud32
+      password: 7eoK2XehKqF1
     sweet:
       database: 255
       dbs: 0,256
-      host: r-2ze7002ckw5u75fgukpd.redis.rds.aliyuncs.com
+      host: r-2zeucai3yj2t0f4nmzpd.redis.rds.aliyuncs.com
+
       port: 6380
-      password: PO@B!Iud32
+      password: 7eoK2XehKqF1
     adam:
       database: 255
       dbs: 0,256
-      host: r-2ze7002ckw5u75fgukpd.redis.rds.aliyuncs.com
+      host: r-2zeucai3yj2t0f4nmzpd.redis.rds.aliyuncs.com
+
       port: 6380
-      password: PO@B!Iud32
+      password: 7eoK2XehKqF1
     candy:
       database: 255
       dbs: 0,256
-      host: r-2ze7002ckw5u75fgukpd.redis.rds.aliyuncs.com
+      host: r-2zeucai3yj2t0f4nmzpd.redis.rds.aliyuncs.com
+
       port: 6380
-      password: PO@B!Iud32
+      password: 7eoK2XehKqF1
     goblin:
       database: 255
       dbs: 0,256
-      host: r-2ze7002ckw5u75fgukpd.redis.rds.aliyuncs.com
+      host: r-2zeucai3yj2t0f4nmzpd.redis.rds.aliyuncs.com
+
       port: 6380
-      password: PO@B!Iud32
+      password: 7eoK2XehKqF1
     smile:
       database: 255
       dbs: 0,256
-      host: r-2ze7002ckw5u75fgukpd.redis.rds.aliyuncs.com
+      host: r-2zeucai3yj2t0f4nmzpd.redis.rds.aliyuncs.com
+
       port: 6380
-      password: PO@B!Iud32
+      password: 7eoK2XehKqF1
   mongodb:
     host: 39.107.71.112:27017
     port: 27017