From b4e7ed0bf777541ea2196775d08be3d79db6f87f Mon Sep 17 00:00:00 2001 From: 648540858 <648540858@qq.com> Date: 星期二, 30 十一月 2021 10:16:09 +0800 Subject: [PATCH] 修复兼容接口云台控制 --- src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java | 456 +++++++++++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 395 insertions(+), 61 deletions(-) diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java index 0ea162e..233416a 100644 --- a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java +++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java @@ -1,152 +1,486 @@ package com.genersoft.iot.vmp.media.zlm; +import java.util.List; +import java.util.UUID; + +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONArray; +import com.genersoft.iot.vmp.common.StreamInfo; +import com.genersoft.iot.vmp.conf.MediaConfig; +import com.genersoft.iot.vmp.conf.UserSetup; +import com.genersoft.iot.vmp.gb28181.bean.Device; +import com.genersoft.iot.vmp.media.zlm.dto.MediaItem; +import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem; +import com.genersoft.iot.vmp.media.zlm.dto.StreamProxyItem; +import com.genersoft.iot.vmp.service.IMediaServerService; +import com.genersoft.iot.vmp.service.IMediaService; +import com.genersoft.iot.vmp.service.IStreamProxyService; +import com.genersoft.iot.vmp.service.bean.SSRCInfo; +import com.genersoft.iot.vmp.storager.IRedisCatchStorage; +import com.genersoft.iot.vmp.storager.IVideoManagerStorager; +import com.genersoft.iot.vmp.service.IPlayService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; +import com.alibaba.fastjson.JSONObject; +import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommander; + +import javax.servlet.http.HttpServletRequest; + /** - * @Description:閽堝 ZLMediaServer鐨刪ook浜嬩欢鐩戝惉 - * @author: songww + * @description:閽堝 ZLMediaServer鐨刪ook浜嬩欢鐩戝惉 + * @author: swwheihei * @date: 2020骞�5鏈�8鏃� 涓婂崍10:46:48 */ @RestController -@RequestMapping("/hook/zlm") +@RequestMapping("/index/hook") public class ZLMHttpHookListener { private final static Logger logger = LoggerFactory.getLogger(ZLMHttpHookListener.class); - + + @Autowired + private SIPCommander cmder; + + @Autowired + private IPlayService playService; + + @Autowired + private IVideoManagerStorager storager; + + @Autowired + private IRedisCatchStorage redisCatchStorage; + + @Autowired + private IMediaServerService mediaServerService; + + @Autowired + private IStreamProxyService streamProxyService; + + @Autowired + private IMediaService mediaService; + + @Autowired + private ZLMRESTfulUtils zlmresTfulUtils; + + @Autowired + private ZLMMediaListManager zlmMediaListManager; + + @Autowired + private ZLMHttpHookSubscribe subscribe; + + @Autowired + private UserSetup userSetup; + + @Autowired + private MediaConfig mediaConfig; + /** * 娴侀噺缁熻浜嬩欢锛屾挱鏀惧櫒鎴栨帹娴佸櫒鏂紑鏃跺苟涓旇�楃敤娴侀噺瓒呰繃鐗瑰畾闃堝�兼椂浼氳Е鍙戞浜嬩欢锛岄槇鍊奸�氳繃閰嶇疆鏂囦欢general.flowThreshold閰嶇疆锛涙浜嬩欢瀵瑰洖澶嶄笉鏁忔劅銆� * */ - @PostMapping("/on_flow_report") - public ResponseEntity onFlowReport(){ - // TODO Auto-generated method stub + @ResponseBody + @PostMapping(value = "/on_flow_report", produces = "application/json;charset=UTF-8") + public ResponseEntity<String> onFlowReport(@RequestBody JSONObject json){ - return null; + if (logger.isDebugEnabled()) { + logger.debug("ZLM HOOK on_flow_report API璋冪敤锛屽弬鏁帮細" + json.toString()); + } + String mediaServerId = json.getString("mediaServerId"); + JSONObject ret = new JSONObject(); + ret.put("code", 0); + ret.put("msg", "success"); + return new ResponseEntity<String>(ret.toString(),HttpStatus.OK); } /** * 璁块棶http鏂囦欢鏈嶅姟鍣ㄤ笂hls涔嬪鐨勬枃浠舵椂瑙﹀彂銆� * */ - @PostMapping("/on_http_access") - public ResponseEntity onHttpAccess(){ - // TODO Auto-generated method stub + @ResponseBody + @PostMapping(value = "/on_http_access", produces = "application/json;charset=UTF-8") + public ResponseEntity<String> onHttpAccess(@RequestBody JSONObject json){ - return null; + if (logger.isDebugEnabled()) { + logger.debug("ZLM HOOK on_http_access API 璋冪敤锛屽弬鏁帮細" + json.toString()); + } + String mediaServerId = json.getString("mediaServerId"); + JSONObject ret = new JSONObject(); + ret.put("code", 0); + ret.put("err", ""); + ret.put("path", ""); + ret.put("second", 600); + return new ResponseEntity<String>(ret.toString(),HttpStatus.OK); } /** * 鎾斁鍣ㄩ壌鏉冧簨浠讹紝rtsp/rtmp/http-flv/ws-flv/hls鐨勬挱鏀鹃兘灏嗚Е鍙戞閴存潈浜嬩欢銆� * */ - @PostMapping("/on_play") - public ResponseEntity onPlay(){ - // TODO Auto-generated method stub + @ResponseBody + @PostMapping(value = "/on_play", produces = "application/json;charset=UTF-8") + public ResponseEntity<String> onPlay(@RequestBody JSONObject json){ - return null; + if (logger.isDebugEnabled()) { + logger.debug("ZLM HOOK on_play API璋冪敤锛屽弬鏁帮細" + json.toString()); + } + String mediaServerId = json.getString("mediaServerId"); + ZLMHttpHookSubscribe.Event subscribe = this.subscribe.getSubscribe(ZLMHttpHookSubscribe.HookType.on_play, json); + if (subscribe != null ) { + MediaServerItem mediaInfo = mediaServerService.getOne(mediaServerId); + if (mediaInfo != null) { + subscribe.response(mediaInfo, json); + } + + } + JSONObject ret = new JSONObject(); + ret.put("code", 0); + ret.put("msg", "success"); + return new ResponseEntity<String>(ret.toString(),HttpStatus.OK); } /** * rtsp/rtmp/rtp鎺ㄦ祦閴存潈浜嬩欢銆� * */ - @PostMapping("/on_publish") - public ResponseEntity onPublish(){ - // TODO Auto-generated method stub - - return null; + @ResponseBody + @PostMapping(value = "/on_publish", produces = "application/json;charset=UTF-8") + public ResponseEntity<String> onPublish(@RequestBody JSONObject json) { + + logger.debug("ZLM HOOK on_publish API璋冪敤锛屽弬鏁帮細" + json.toString()); + + String mediaServerId = json.getString("mediaServerId"); + ZLMHttpHookSubscribe.Event subscribe = this.subscribe.getSubscribe(ZLMHttpHookSubscribe.HookType.on_publish, json); + if (subscribe != null) { + MediaServerItem mediaInfo = mediaServerService.getOne(mediaServerId); + if (mediaInfo != null) { + subscribe.response(mediaInfo, json); + } + } + String app = json.getString("app"); + String stream = json.getString("stream"); + StreamInfo streamInfo = redisCatchStorage.queryPlaybackByStreamId(stream); + JSONObject ret = new JSONObject(); + // 褰曞儚鍥炴斁鏃朵笉杩涜褰曞儚涓嬭浇 + if (streamInfo != null) { + ret.put("enableMP4", false); + }else { + ret.put("enableMP4", userSetup.isRecordPushLive()); + } + ret.put("code", 0); + ret.put("msg", "success"); + ret.put("enableHls", true); + ret.put("enableMP4", userSetup.isRecordPushLive()); + return new ResponseEntity<String>(ret.toString(), HttpStatus.OK); } /** * 褰曞埗mp4瀹屾垚鍚庨�氱煡浜嬩欢锛涙浜嬩欢瀵瑰洖澶嶄笉鏁忔劅銆� * */ - @PostMapping("/on_record_mp4") - public ResponseEntity onRecordMp4(){ - // TODO Auto-generated method stub + @ResponseBody + @PostMapping(value = "/on_record_mp4", produces = "application/json;charset=UTF-8") + public ResponseEntity<String> onRecordMp4(@RequestBody JSONObject json){ - return null; - } - - /** - * 璇tsp娴佹槸鍚﹀紑鍚痳tsp涓撶敤鏂瑰紡鐨勯壌鏉冧簨浠讹紝寮�鍚悗鎵嶄細瑙﹀彂on_rtsp_auth浜嬩欢銆傞渶瑕佹寚鍑虹殑鏄痳tsp涔熸敮鎸乽rl鍙傛暟閴存潈锛屽畠鏀寔涓ょ鏂瑰紡閴存潈銆� - * - */ - @PostMapping("/on_rtsp_auth") - public ResponseEntity onRtspAuth(){ - // TODO Auto-generated method stub - - return null; + if (logger.isDebugEnabled()) { + logger.debug("ZLM HOOK on_record_mp4 API璋冪敤锛屽弬鏁帮細" + json.toString()); + } + String mediaServerId = json.getString("mediaServerId"); + JSONObject ret = new JSONObject(); + ret.put("code", 0); + ret.put("msg", "success"); + return new ResponseEntity<String>(ret.toString(),HttpStatus.OK); } /** * rtsp涓撶敤鐨勯壌鏉冧簨浠讹紝鍏堣Е鍙憃n_rtsp_realm浜嬩欢鐒跺悗鎵嶄細瑙﹀彂on_rtsp_auth浜嬩欢銆� * */ - @PostMapping("/on_rtsp_realm") - public ResponseEntity onRtspRealm(){ - // TODO Auto-generated method stub + @ResponseBody + @PostMapping(value = "/on_rtsp_realm", produces = "application/json;charset=UTF-8") + public ResponseEntity<String> onRtspRealm(@RequestBody JSONObject json){ - return null; + if (logger.isDebugEnabled()) { + logger.debug("ZLM HOOK on_rtsp_realm API璋冪敤锛屽弬鏁帮細" + json.toString()); + } + String mediaServerId = json.getString("mediaServerId"); + JSONObject ret = new JSONObject(); + ret.put("code", 0); + ret.put("realm", ""); + return new ResponseEntity<String>(ret.toString(),HttpStatus.OK); + } + + + /** + * 璇tsp娴佹槸鍚﹀紑鍚痳tsp涓撶敤鏂瑰紡鐨勯壌鏉冧簨浠讹紝寮�鍚悗鎵嶄細瑙﹀彂on_rtsp_auth浜嬩欢銆傞渶瑕佹寚鍑虹殑鏄痳tsp涔熸敮鎸乽rl鍙傛暟閴存潈锛屽畠鏀寔涓ょ鏂瑰紡閴存潈銆� + * + */ + @ResponseBody + @PostMapping(value = "/on_rtsp_auth", produces = "application/json;charset=UTF-8") + public ResponseEntity<String> onRtspAuth(@RequestBody JSONObject json){ + + if (logger.isDebugEnabled()) { + logger.debug("ZLM HOOK on_rtsp_auth API璋冪敤锛屽弬鏁帮細" + json.toString()); + } + String mediaServerId = json.getString("mediaServerId"); + JSONObject ret = new JSONObject(); + ret.put("code", 0); + ret.put("encrypted", false); + ret.put("passwd", "test"); + return new ResponseEntity<String>(ret.toString(),HttpStatus.OK); } /** * shell鐧诲綍閴存潈锛孼LMediaKit鎻愪緵绠�鍗曠殑telnet璋冭瘯鏂瑰紡锛屼娇鐢╰elnet 127.0.0.1 9000鑳借繘鍏ediaServer杩涚▼鐨剆hell鐣岄潰銆� * */ - @PostMapping("/on_shell_login") - public ResponseEntity onShellLogin(){ - // TODO Auto-generated method stub + @ResponseBody + @PostMapping(value = "/on_shell_login", produces = "application/json;charset=UTF-8") + public ResponseEntity<String> onShellLogin(@RequestBody JSONObject json){ - return null; + if (logger.isDebugEnabled()) { + logger.debug("ZLM HOOK on_shell_login API璋冪敤锛屽弬鏁帮細" + json.toString()); + } + // TODO 濡傛灉鏄甫鏈塺tpstream鍒欏紑鍚寜闇�鎷夋祦 + // String app = json.getString("app"); + // String stream = json.getString("stream"); + String mediaServerId = json.getString("mediaServerId"); + ZLMHttpHookSubscribe.Event subscribe = this.subscribe.getSubscribe(ZLMHttpHookSubscribe.HookType.on_shell_login, json); + if (subscribe != null ) { + MediaServerItem mediaInfo = mediaServerService.getOne(mediaServerId); + if (mediaInfo != null) { + subscribe.response(mediaInfo, json); + } + + } + + JSONObject ret = new JSONObject(); + ret.put("code", 0); + ret.put("msg", "success"); + return new ResponseEntity<String>(ret.toString(),HttpStatus.OK); } /** * rtsp/rtmp娴佹敞鍐屾垨娉ㄩ攢鏃惰Е鍙戞浜嬩欢锛涙浜嬩欢瀵瑰洖澶嶄笉鏁忔劅銆� * */ - @PostMapping("/on_stream_changed") - public ResponseEntity onStreamChanged(){ - // TODO Auto-generated method stub + @ResponseBody + @PostMapping(value = "/on_stream_changed", produces = "application/json;charset=UTF-8") + public ResponseEntity<String> onStreamChanged(@RequestBody MediaItem item){ - return null; + if (logger.isDebugEnabled()) { + logger.debug("ZLM HOOK on_stream_changed API璋冪敤锛屽弬鏁帮細" + JSONObject.toJSONString(item)); + } + String mediaServerId = item.getMediaServerId(); + JSONObject json = (JSONObject) JSON.toJSON(item); + ZLMHttpHookSubscribe.Event subscribe = this.subscribe.getSubscribe(ZLMHttpHookSubscribe.HookType.on_stream_changed, json); + if (subscribe != null ) { + MediaServerItem mediaInfo = mediaServerService.getOne(mediaServerId); + if (mediaInfo != null) { + subscribe.response(mediaInfo, json); + } + + } + // 娴佹秷澶辩Щ闄edis play + String app = item.getApp(); + String streamId = item.getStream(); + String schema = item.getSchema(); + List<MediaItem.MediaTrack> tracks = item.getTracks(); + boolean regist = item.isRegist(); + if (tracks != null) { + logger.info("[stream: " + streamId + "] on_stream_changed->>" + schema); + } + if ("rtmp".equals(schema)){ + if (regist) { + mediaServerService.addCount(mediaServerId); + }else { + mediaServerService.removeCount(mediaServerId); + } + if ("rtp".equals(app) && !regist ) { + StreamInfo streamInfo = redisCatchStorage.queryPlayByStreamId(streamId); + if (streamInfo!=null){ + redisCatchStorage.stopPlay(streamInfo); + storager.stopPlay(streamInfo.getDeviceID(), streamInfo.getChannelId()); + }else{ + streamInfo = redisCatchStorage.queryPlaybackByStreamId(streamId); + redisCatchStorage.stopPlayback(streamInfo); + } + }else { + if (!"rtp".equals(app)){ + + boolean pushChange = false; + + MediaServerItem mediaServerItem = mediaServerService.getOne(mediaServerId); + if (regist) { + if ((item.getOriginType() == 1 || item.getOriginType() == 2 || item.getOriginType() == 8)) { + pushChange = true; + zlmMediaListManager.addMedia(item); + StreamInfo streamInfo = mediaService.getStreamInfoByAppAndStream(mediaServerItem, app, streamId, tracks); + redisCatchStorage.addPushStream(mediaServerItem, app, streamId, streamInfo); + } + }else { + int result = zlmMediaListManager.removeMedia( app, streamId); + redisCatchStorage.removePushStream(mediaServerItem, app, streamId); + if (result > 0) { + pushChange = true; + } + } + if(pushChange) { + // 鍙戦�佹祦鍙樺寲redis娑堟伅 + JSONObject jsonObject = new JSONObject(); + jsonObject.put("serverId", userSetup.getServerId()); + jsonObject.put("app", app); + jsonObject.put("stream", streamId); + jsonObject.put("register", regist); + jsonObject.put("mediaServerId", mediaServerId); + redisCatchStorage.sendStreamChangeMsg(jsonObject); + } + } + } + } + + JSONObject ret = new JSONObject(); + ret.put("code", 0); + ret.put("msg", "success"); + return new ResponseEntity<String>(ret.toString(),HttpStatus.OK); } /** * 娴佹棤浜鸿鐪嬫椂浜嬩欢锛岀敤鎴峰彲浠ラ�氳繃姝や簨浠堕�夋嫨鏄惁鍏抽棴鏃犱汉鐪嬬殑娴併�� * */ - @PostMapping("/on_stream_none_reader") - public ResponseEntity onStreamNoneReader(){ - // TODO Auto-generated method stub + @ResponseBody + @PostMapping(value = "/on_stream_none_reader", produces = "application/json;charset=UTF-8") + public ResponseEntity<String> onStreamNoneReader(@RequestBody JSONObject json){ - return null; + if (logger.isDebugEnabled()) { + logger.debug("ZLM HOOK on_stream_none_reader API璋冪敤锛屽弬鏁帮細" + json.toString()); + } + String mediaServerId = json.getString("mediaServerId"); + String streamId = json.getString("stream"); + String app = json.getString("app"); + JSONObject ret = new JSONObject(); + ret.put("code", 0); + if ("rtp".equals(app)){ + ret.put("close", true); + StreamInfo streamInfoForPlayCatch = redisCatchStorage.queryPlayByStreamId(streamId); + if (streamInfoForPlayCatch != null) { + // 濡傛灉鍦ㄧ粰涓婄骇鎺ㄦ祦锛屼篃涓嶅仠姝€�� + if (redisCatchStorage.isChannelSendingRTP(streamInfoForPlayCatch.getChannelId())) { + ret.put("close", false); + } else { + cmder.streamByeCmd(streamInfoForPlayCatch.getDeviceID(), streamInfoForPlayCatch.getChannelId()); + redisCatchStorage.stopPlay(streamInfoForPlayCatch); + storager.stopPlay(streamInfoForPlayCatch.getDeviceID(), streamInfoForPlayCatch.getChannelId()); + } + }else{ + StreamInfo streamInfoForPlayBackCatch = redisCatchStorage.queryPlaybackByStreamId(streamId); + if (streamInfoForPlayBackCatch != null) { + cmder.streamByeCmd(streamInfoForPlayBackCatch.getDeviceID(), streamInfoForPlayBackCatch.getChannelId()); + redisCatchStorage.stopPlayback(streamInfoForPlayBackCatch); + }else { + StreamInfo streamInfoForDownload = redisCatchStorage.queryDownloadByStreamId(streamId); + // 杩涜褰曞儚涓嬭浇鏃舵棤浜鸿鐪嬩笉鏂祦 + if (streamInfoForDownload != null) { + ret.put("close", false); + } + } + } + MediaServerItem mediaServerItem = mediaServerService.getOne(mediaServerId); + if (mediaServerItem != null && "-1".equals(mediaServerItem.getStreamNoneReaderDelayMS())) { + ret.put("close", false); + } + return new ResponseEntity<String>(ret.toString(),HttpStatus.OK); + }else { + StreamProxyItem streamProxyItem = streamProxyService.getStreamProxyByAppAndStream(app, streamId); + if (streamProxyItem != null && streamProxyItem.isEnable_remove_none_reader()) { + ret.put("close", true); + streamProxyService.del(app, streamId); + String url = streamProxyItem.getUrl() != null?streamProxyItem.getUrl():streamProxyItem.getSrc_url(); + logger.info("[{}/{}]<-[{}] 鎷夋祦浠g悊鏃犱汉瑙傜湅宸茬粡绉婚櫎", app, streamId, url); + }else { + ret.put("close", false); + } + return new ResponseEntity<String>(ret.toString(),HttpStatus.OK); + } + } /** * 娴佹湭鎵惧埌浜嬩欢锛岀敤鎴峰彲浠ュ湪姝や簨浠惰Е鍙戞椂锛岀珛鍗冲幓鎷夋祦锛岃繖鏍峰彲浠ュ疄鐜版寜闇�鎷夋祦锛涙浜嬩欢瀵瑰洖澶嶄笉鏁忔劅銆� * */ - @PostMapping("/on_stream_not_found") - public ResponseEntity onStreamNotFound(){ - // TODO Auto-generated method stub - - return null; + @ResponseBody + @PostMapping(value = "/on_stream_not_found", produces = "application/json;charset=UTF-8") + public ResponseEntity<String> onStreamNotFound(@RequestBody JSONObject json){ + if (logger.isDebugEnabled()) { + logger.debug("ZLM HOOK on_stream_not_found API璋冪敤锛屽弬鏁帮細" + json.toString()); + } + String mediaServerId = json.getString("mediaServerId"); + MediaServerItem mediaInfo = mediaServerService.getOne(mediaServerId); + if (userSetup.isAutoApplyPlay() && mediaInfo != null) { + String app = json.getString("app"); + String streamId = json.getString("stream"); + if ("rtp".equals(app)) { + String[] s = streamId.split("_"); + if (s.length == 2) { + String deviceId = s[0]; + String channelId = s[1]; + Device device = storager.queryVideoDevice(deviceId); + if (device != null) { + UUID uuid = UUID.randomUUID(); + SSRCInfo ssrcInfo; + String streamId2 = null; + if (mediaInfo.isRtpEnable()) { + streamId2 = String.format("%s_%s", device.getDeviceId(), channelId); + } + ssrcInfo = mediaServerService.openRTPServer(mediaInfo, streamId2); + cmder.playStreamCmd(mediaInfo, ssrcInfo, device, channelId, (MediaServerItem mediaServerItemInuse, JSONObject response) -> { + logger.info("鏀跺埌璁㈤槄娑堟伅锛� " + response.toJSONString()); + playService.onPublishHandlerForPlay(mediaServerItemInuse, response, deviceId, channelId, uuid.toString()); + }, null); + } + + } + } + + } + + JSONObject ret = new JSONObject(); + ret.put("code", 0); + ret.put("msg", "success"); + return new ResponseEntity<String>(ret.toString(),HttpStatus.OK); } /** * 鏈嶅姟鍣ㄥ惎鍔ㄤ簨浠讹紝鍙互鐢ㄤ簬鐩戝惉鏈嶅姟鍣ㄥ穿婧冮噸鍚紱姝や簨浠跺鍥炲涓嶆晱鎰熴�� * */ - @PostMapping("/on_server_started") - public ResponseEntity onServerStarted(){ - // TODO Auto-generated method stub + @ResponseBody + @PostMapping(value = "/on_server_started", produces = "application/json;charset=UTF-8") + public ResponseEntity<String> onServerStarted(HttpServletRequest request, @RequestBody JSONObject jsonObject){ - return null; + if (logger.isDebugEnabled()) { + logger.debug("ZLM HOOK on_server_started API璋冪敤锛屽弬鏁帮細" + jsonObject.toString()); + } + String remoteAddr = request.getRemoteAddr(); + jsonObject.put("ip", remoteAddr); + List<ZLMHttpHookSubscribe.Event> subscribes = this.subscribe.getSubscribes(ZLMHttpHookSubscribe.HookType.on_server_started); + if (subscribes != null && subscribes.size() > 0) { + for (ZLMHttpHookSubscribe.Event subscribe : subscribes) { + subscribe.response(null, jsonObject); + } + } + JSONObject ret = new JSONObject(); + ret.put("code", 0); + ret.put("msg", "success"); + return new ResponseEntity<String>(ret.toString(),HttpStatus.OK); } } -- Gitblit v1.8.0