Merge branch 'dev' into test

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/application-client-admin-web.yml

@@ -94,9 +94,9 @@ spring:
       database: ${liquidnet.mongodb.database}
   redis:
     database: 15
-    port: 6379
-    host: 39.106.122.201
-    password: 3Xa%8p
+    port: ${liquidnet.redis.port}
+    host: ${liquidnet.redis.host}
+    password: ${liquidnet.redis.password}
     lettuce:
       pool:
         max-active: 8

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/application-dev.yml

@@ -31,6 +31,10 @@ liquidnet:
     pwd: S&y$6d*JwJ
     sslEnabled: false
     database: dev_ln_scene
+  redis:
+    host: 39.106.122.201
+    port: 6379
+    password: 3Xa%8p
   url-refund:
     apply: "http://testpay.zhengzai.tv/refund/single"
     notify: "https://devkylin.zhengzai.tv/kylin/refund/callback"

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/application-test.yml

@@ -31,6 +31,11 @@ liquidnet:
     pwd: $hAh4SGcDQ
     sslEnabled: false
     database: test_ln_scene
+  redis:
+    host: r-2ze7002ckw5u75fgukpd.redis.rds.aliyuncs.com
+    #    host: r-2zefzyjbij5vbez65y.redis.rds.aliyuncs.com
+    port: 6380
+    password: PO@B!Iud32
   url-refund:
     apply: "http://testpay.zhengzai.tv/refund/single"
     notify: "https://testkylin.zhengzai.tv/kylin/refund/callback"

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/banners/update.html

@@ -337,7 +337,7 @@
                         var data = [];
                         var html = '<option value="">--请选择--</option>';
                         if (6 == targetType) {
-                            data = result.rows;
+                            data = result.value;
                             for (var i = 0, l = data.length; i < l; i++) {
                                 html += '<option value="' + data[i].performancesId + '">' + data[i].title + '</option>';
                             }
@@ -346,6 +346,16 @@
                             for (var i = 0, l = data.length; i < l; i++) {
                                 html += '<option value="' + data[i].roadShowId + '">' + data[i].title + '</option>';
                             }
+                        } else if(24 == targetType) {
+                            data = result.data;
+                            for (var i = 0, l = data.length; i < l; i++) {
+                                html += '<option value="' + data[i].id + '">' + data[i].collect_name + '</option>';
+                            }
+                        } else if(26 == targetType) {
+                            data = result.data;
+                            for (var i = 0, l = data.length; i < l; i++) {
+                                html += '<option value="' + data[i].id + '">' + data[i].name + '</option>';
+                            }
                         } else {
                             data = result.data
                             for (var i = 0, l = data.length; i < l; i++) {