Merge branch 'k8s-test' into 'master'

K8s test

See merge request !102

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/resources/bootstrap-test.yml

@@ -6,7 +6,11 @@ liquidnet:
     username: user
     password: user123
   eureka:
-    host: 172.17.207.177:7001
+    #host: 172.17.207.177:7001
+    instance:
+      prefer-ip-address: true
+    host: eureka-test-0.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-1.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-2.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka
+
 # end-test-这里是配置信息基本值
 
 spring:

liquidnet-bus-service/liquidnet-service-candy/liquidnet-service-candy-impl/src/main/java/com/liquidnet/service/candy/controller/CandyCouponController.java

@@ -213,7 +213,7 @@ public class CandyCouponController {
         for (int i = initSize; i < forSize; i++) {
             listVo.add(list.get(i));
         }
-        return ResponseDto.success();
+        return ResponseDto.success(listVo);
     }
 
 //    //判断券是否可用

liquidnet-bus-service/liquidnet-service-candy/liquidnet-service-candy-impl/src/main/resources/bootstrap-test.yml

@@ -6,7 +6,11 @@ liquidnet:
     username: user
     password: user123
   eureka:
-    host: 172.17.207.177:7001
+    #host: 172.17.207.177:7001
+    instance:
+      prefer-ip-address: true
+    host: eureka-test-0.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-1.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka,eureka-test-2.eureka-test-svc.zhengzai-test:7001/eureka-server/eureka
+
 # end-test-这里是配置信息基本值
 
 spring: