记得上下班打卡 | git大法好，push需谨慎

Skip to content

L
liquidnet-bus-v1
Commit cade8794 authored by jiangxiulong's avatar jiangxiulong
Browse files
Options

push banner jump url del

parent 72530fa1
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 109 deletions
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-common/src/main/java/com/liquidnet/client/admin/common/enums/UpushTargetType.java
View file @ cade8794
......@@ -24,7 +24,7 @@ public enum UpushTargetType {
// TARGET_TYPE24("音乐人集合", 24, "musician_collection"),
// TARGET_TYPE21("歌曲详情", 21, "song"),
// TARGET_TYPE22("专辑详情", 22, "album"),
TARGET_TYPE26("摩登会员", 26, "member"),
// TARGET_TYPE26("摩登会员", 26, "member"),
TARGET_TYPE12("活动跳转-可分享", 12, "ad_link"),
TARGET_TYPE100("活动跳转", 100, "promotion"),
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/admin/AdminUpushController.java
View file @ cade8794
......@@ -36,24 +36,12 @@ public class AdminUpushController extends BaseController {
@Value("${liquidnet.client.admin.platformUrl}")
private String platformUrl;
@Value("${liquidnet.url-banner.url5}")
private String url5;
@Value("${liquidnet.url-banner.url6}")
private String url6;
@Value("${liquidnet.url-banner.url7}")
private String url7;
@Value("${liquidnet.url-banner.url14}")
private String url14;
@Value("${liquidnet.url-banner.url20}")
private String url20;
@Value("${liquidnet.url-banner.url21}")
private String url21;
@Value("${liquidnet.url-banner.url22}")
private String url22;
@Value("${liquidnet.url-banner.url24}")
private String url24;
@Value("${liquidnet.url-banner.url26}")
private String url26;
@Autowired
private AdminUpushServiceImpl adminUpushServiceImpl;
......@@ -65,15 +53,9 @@ public class AdminUpushController extends BaseController {
mmap.put("platformUrl", platformUrl);
mmap.put("url5", url5);
mmap.put("url6", url6);
mmap.put("url7", url7);
mmap.put("url14", url14);
mmap.put("url20", url20);
mmap.put("url21", url21);
mmap.put("url22", url22);
mmap.put("url24", url24);
mmap.put("url26", url26);
return prefix + "/create";
}
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/kylin/KylinBannersAdminController.java
View file @ cade8794
......@@ -35,36 +35,12 @@ public class KylinBannersAdminController extends BaseController {
private String prefix = "zhengzai/kylin/banners";
@Value("${liquidnet.url-banner.provinces}")
private String provinces;
@Value("${liquidnet.url-banner.url1}")
private String url1;
@Value("${liquidnet.url-banner.url2}")
private String url2;
@Value("${liquidnet.url-banner.url5}")
private String url5;
@Value("${liquidnet.url-banner.url6}")
private String url6;
@Value("${liquidnet.url-banner.url7}")
private String url7;
@Value("${liquidnet.url-banner.url8}")
private String url8;
@Value("${liquidnet.url-banner.url13}")
private String url13;
@Value("${liquidnet.url-banner.url14}")
private String url14;
@Value("${liquidnet.url-banner.url20}")
private String url20;
@Value("${liquidnet.url-banner.url21}")
private String url21;
@Value("${liquidnet.url-banner.url22}")
private String url22;
@Value("${liquidnet.url-banner.url23}")
private String url23;
@Value("${liquidnet.url-banner.url24}")
private String url24;
@Value("${liquidnet.url-banner.url26}")
private String url26;
@Value("${liquidnet.client.admin.platformUrl}")
private String platformUrl;
......@@ -81,21 +57,9 @@ public class KylinBannersAdminController extends BaseController {
mmap.put("platformUrl", platformUrl);
mmap.put("provinces", provinces);
mmap.put("url1", url1);
mmap.put("url2", url2);
mmap.put("url5", url5);
mmap.put("url6", url6);
mmap.put("url7", url7);
mmap.put("url8", url8);
mmap.put("url13", url13);
mmap.put("url14", url14);
mmap.put("url20", url20);
mmap.put("url21", url21);
mmap.put("url22", url22);
mmap.put("url23", url23);
mmap.put("url24", url24);
mmap.put("url26", url26);
return prefix + "/create";
}
......@@ -127,21 +91,9 @@ public class KylinBannersAdminController extends BaseController {
mmap.put("platformUrl", platformUrl);
mmap.put("provinces", provinces);
mmap.put("url1", url1);
mmap.put("url2", url2);
mmap.put("url5", url5);
mmap.put("url6", url6);
mmap.put("url7", url7);
mmap.put("url8", url8);
mmap.put("url13", url13);
mmap.put("url14", url14);
mmap.put("url20", url20);
mmap.put("url21", url21);
mmap.put("url22", url22);
mmap.put("url23", url23);
mmap.put("url24", url24);
mmap.put("url26", url26);
return prefix + "/update";
}
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/admin/upush/create.html
View file @ cade8794
......@@ -167,15 +167,9 @@
<script type="text/javascript">
var prefix = ctx + "admin/upush";
var platformUrl = "[[${platformUrl}]]";
var url5 = "[[${url5}]]";
var url6 = "[[${url6}]]";
var url7 = "[[${url7}]]";
var url14 = "[[${url14}]]";
var url20 = "[[${url20}]]";
var url21 = "[[${url21}]]";
var url22 = "[[${url22}]]";
var url24 = "[[${url24}]]";
var url26 = "[[${url26}]]";
function submitHandler() {
if ($.validate.form()) {
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/banners/create.html
View file @ cade8794
......@@ -133,21 +133,9 @@
<script type="text/javascript">
var prefix = ctx + "kylin/banners";
var platformUrl = "[[${platformUrl}]]";
var provinces = "[[${provinces}]]";
var url1 = "[[${url1}]]";
var url2 = "[[${url2}]]";
var url5 = "[[${url5}]]";
var url6 = "[[${url6}]]";
var url7 = "[[${url7}]]";
var url8 = "[[${url8}]]";
var url13 = "[[${url13}]]";
var url14 = "[[${url14}]]";
var url20 = "[[${url20}]]";
var url21 = "[[${url21}]]";
var url22 = "[[${url22}]]";
var url23 = "[[${url23}]]";
var url24 = "[[${url24}]]";
var url26 = "[[${url26}]]";
function submitHandler() {
var bannersName = $('#bannersName').val();
......
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/banners/update.html
View file @ cade8794
......@@ -157,21 +157,9 @@
<script type="text/javascript">
var prefix = ctx + "kylin/banners";
var platformUrl = "[[${platformUrl}]]";
var provinces = "[[${provinces}]]";
var url1 = "[[${url1}]]";
var url2 = "[[${url2}]]";
var url5 = "[[${url5}]]";
var url6 = "[[${url6}]]";
var url7 = "[[${url7}]]";
var url8 = "[[${url8}]]";
var url13 = "[[${url13}]]";
var url14 = "[[${url14}]]";
var url20 = "[[${url20}]]";
var url21 = "[[${url21}]]";
var url22 = "[[${url22}]]";
var url23 = "[[${url23}]]";
var url24 = "[[${url24}]]";
var url26 = "[[${url26}]]";
var targetObj = "[[${KylinBannersVo.targetObj}]]";
var targetObjName = "[[${KylinBannersVo.targetObjName}]]";
var targetObjType = "[[${KylinBannersVo.targetType}]]";
......
liquidnet-bus-config/liquidnet-config/liquidnet-client-admin-web.yml
View file @ cade8794
......@@ -19,21 +19,9 @@ liquidnet:
apply: "${liquidnet.client.admin.phpPayUrl}/dragon/refund/refundSingle"
notify: "${liquidnet.client.admin.platformUrl}/platform/refund/callback"
url-banner:
provinces: "${liquidnet.client.admin.phpServiceUrl}/provinces" #省份
url1: "${liquidnet.client.admin.phpoMediaApiUrl}/api/video/list?per_page=50&page=1&type=1" #PGC点播
url2: "${liquidnet.client.admin.phpoMediaApiUrl}/api/video/list?per_page=50&page=1&type=2" #PGC直播
url5: "${liquidnet.client.admin.phpMallUrl}/admin/fieldListForQuick?page=1&per_page=50" #场地
url6: "/kylin/performances/recommend/performance/status?pageNum=1&pageSize=50&status=(3,6,7,8,9,10)" #票务
url7: "${liquidnet.client.admin.phpMallUrl}/admin/goodListForQuick?page=1&per_page=50" #商品
url8: "${liquidnet.client.admin.kylinApiUrl}/kylin/performances/roadShow/list?pageNum=1&pageSize=50" #巡演
url13: "${liquidnet.client.admin.phpMallUrl}/admin/integrationListForQuick?page=1&per_page=50" #积分商城
url14: "${liquidnet.client.admin.phpMallUrl}/admin/good/collective/quick?page=1&per_page=50" #商品集合
url20: "${liquidnet.client.admin.phpMerchantApiUrl}/admin/mis/musician/quick?page=1&per_page=50" #音乐人
url21: "${liquidnet.client.admin.phpMerchantApiUrl}/admin/mis/song/quick?page=1&per_page=50" #歌曲
url22: "${liquidnet.client.admin.phpMerchantApiUrl}/admin/mis/album/quick?page=1&per_page=50" #专辑
url23: "${liquidnet.client.admin.phpoMediaApiUrl}/api/play/list?page=1&per_page=50" #视频播单
url24: "${liquidnet.client.admin.phpMerchantApiUrl}/admin/mis/musician/collect?page=1&per_page=50" #音乐人合集
url26: "${liquidnet.client.admin.phpPassportUrl}/admin/vip/card/list?page=1&per_page=50&status=1" #摩登会员
al-oss:
imgUrl: "https://img.zhengzai.tv/"
appUrl: "https://app.zhengzai.tv/"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment