Commit e74dacd7e53f4172825f0ae72447ea64b5d41f97
1 parent
6c5014b5
修改
Showing
2 changed files
with
3 additions
and
1 deletions
src/main/java/com/cnlive/shenhe/api/LiveApplyControllerApi.java
| @@ -65,7 +65,7 @@ public class LiveApplyControllerApi { | @@ -65,7 +65,7 @@ public class LiveApplyControllerApi { | ||
| 65 | Integer contentProperty = Integer.parseInt(json.getString("contentProperty"));//内容属性:1商业类活动 0非商业活动 | 65 | Integer contentProperty = Integer.parseInt(json.getString("contentProperty"));//内容属性:1商业类活动 0非商业活动 |
| 66 | String simpleContent = json.getString("simpleContent");//内容简述 | 66 | String simpleContent = json.getString("simpleContent");//内容简述 |
| 67 | String live_type = json.getString("liveType");//直播类型 | 67 | String live_type = json.getString("liveType");//直播类型 |
| 68 | - String keys = json.getString("keys").equals("")?"-1":json.getString("keys");//要点报备:0品牌植入 1广告植入 2商品推销 3网家家独家麦标 | 68 | + String keys = json.getString("keys").equals("")?"无":json.getString("keys");//要点报备:0品牌植入 1广告植入 2商品推销 3网家家独家麦标 |
| 69 | String livePlace = json.getString("livePlace");//直播地点 | 69 | String livePlace = json.getString("livePlace");//直播地点 |
| 70 | String pushUrl = json.getString("pushUrl");//推流地址 | 70 | String pushUrl = json.getString("pushUrl");//推流地址 |
| 71 | String pullUrl = json.getString("pullUrl").equals("无拉流地址")?"":json.getString("pullUrl");//拉流地址 | 71 | String pullUrl = json.getString("pullUrl").equals("无拉流地址")?"":json.getString("pullUrl");//拉流地址 |
src/main/resources/templates/page/liveApplyDetail.html
| @@ -120,6 +120,8 @@ | @@ -120,6 +120,8 @@ | ||
| 120 | <tr align="center" valign="middle" height="40px"> | 120 | <tr align="center" valign="middle" height="40px"> |
| 121 | <td >拉流地址</td> | 121 | <td >拉流地址</td> |
| 122 | <td colspan="5"> | 122 | <td colspan="5"> |
| 123 | + <span style="color:#DC143C" th:text="${shyLiveapply.pull_source}">11111111111111</span> | ||
| 124 | + <span >,</span> | ||
| 123 | <span style="color:#DC143C" th:text="${shyLiveapply.pull_url}">11111111111111</span> | 125 | <span style="color:#DC143C" th:text="${shyLiveapply.pull_url}">11111111111111</span> |
| 124 | </td> | 126 | </td> |
| 125 | </tr> | 127 | </tr> |