diff --git a/module-file-media/src/main/java/ink/wgink/module/file/media/controller/app/srs/rtmp/RtmpCallbackAppController.java b/module-file-media/src/main/java/ink/wgink/module/file/media/controller/app/srs/rtmp/SrsRtmpCallbackAppController.java similarity index 92% rename from module-file-media/src/main/java/ink/wgink/module/file/media/controller/app/srs/rtmp/RtmpCallbackAppController.java rename to module-file-media/src/main/java/ink/wgink/module/file/media/controller/app/srs/rtmp/SrsRtmpCallbackAppController.java index a80e96d0..2cda30e9 100644 --- a/module-file-media/src/main/java/ink/wgink/module/file/media/controller/app/srs/rtmp/RtmpCallbackAppController.java +++ b/module-file-media/src/main/java/ink/wgink/module/file/media/controller/app/srs/rtmp/SrsRtmpCallbackAppController.java @@ -2,7 +2,7 @@ package ink.wgink.module.file.media.controller.app.srs.rtmp; import ink.wgink.common.base.DefaultBaseController; import ink.wgink.interfaces.consts.ISystemConstant; -import ink.wgink.module.file.media.pojo.vos.srs.rtmp.RtmpCallbackVO; +import ink.wgink.module.file.media.pojo.vos.rtmp.RtmpCallbackVO; import ink.wgink.pojo.result.SuccessResultCode; import io.swagger.annotations.Api; import org.springframework.web.bind.annotation.PostMapping; @@ -19,8 +19,8 @@ import org.springframework.web.bind.annotation.RestController; */ @Api(tags = ISystemConstant.API_TAGS_APP_PREFIX + "rtmp回调接口") @RestController -@RequestMapping(ISystemConstant.APP_PREFIX + "/rtmp-callback") -public class RtmpCallbackAppController extends DefaultBaseController { +@RequestMapping(ISystemConstant.APP_PREFIX + "/srs-rtmp-callback") +public class SrsRtmpCallbackAppController extends DefaultBaseController { @PostMapping("on-connect") public SuccessResultCode onConnect(@RequestBody RtmpCallbackVO rtmpCallbackVO) { diff --git a/module-file-media/src/main/java/ink/wgink/module/file/media/controller/route/video/VideoRouteController.java b/module-file-media/src/main/java/ink/wgink/module/file/media/controller/route/video/VideoRouteController.java index 1a3d3531..296c695a 100644 --- a/module-file-media/src/main/java/ink/wgink/module/file/media/controller/route/video/VideoRouteController.java +++ b/module-file-media/src/main/java/ink/wgink/module/file/media/controller/route/video/VideoRouteController.java @@ -13,10 +13,8 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.servlet.ModelAndView; -import javax.servlet.AsyncContext; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.util.concurrent.CompletableFuture; /** * When you feel like quitting. Think about why you started @@ -40,12 +38,12 @@ public class VideoRouteController { @GetMapping("list") public ModelAndView list() { - return new ModelAndView("file/media/video/list"); + return new ModelAndView("video/list"); } @GetMapping("upload") public ModelAndView upload() { - ModelAndView modelAndView = new ModelAndView("file/media/video/upload"); + ModelAndView modelAndView = new ModelAndView("video/upload"); modelAndView.addObject("types", videoProperties.getTypes()); modelAndView.addObject("maxUploadCount", videoProperties.getMaxUploadCount()); return modelAndView; @@ -53,7 +51,7 @@ public class VideoRouteController { @GetMapping("preview") public ModelAndView preview() { - return new ModelAndView("file/media/video/preview"); + return new ModelAndView("video/preview"); } @ApiOperation(value = "下载视频", notes = "下载视频接口") diff --git a/module-file-media/src/main/java/ink/wgink/module/file/media/pojo/vos/srs/rtmp/RtmpCallbackVO.java b/module-file-media/src/main/java/ink/wgink/module/file/media/pojo/vos/rtmp/RtmpCallbackVO.java similarity index 98% rename from module-file-media/src/main/java/ink/wgink/module/file/media/pojo/vos/srs/rtmp/RtmpCallbackVO.java rename to module-file-media/src/main/java/ink/wgink/module/file/media/pojo/vos/rtmp/RtmpCallbackVO.java index dbc0afaa..27a998a7 100644 --- a/module-file-media/src/main/java/ink/wgink/module/file/media/pojo/vos/srs/rtmp/RtmpCallbackVO.java +++ b/module-file-media/src/main/java/ink/wgink/module/file/media/pojo/vos/rtmp/RtmpCallbackVO.java @@ -1,4 +1,4 @@ -package ink.wgink.module.file.media.pojo.vos.srs.rtmp; +package ink.wgink.module.file.media.pojo.vos.rtmp; import io.swagger.annotations.ApiModel; diff --git a/module-file-media/src/main/resources/mybatis/mapper/rtmp/rtmp-client-mapper.xml b/module-file-media/src/main/resources/mybatis/mapper/rtmp/rtmp-client-mapper.xml new file mode 100644 index 00000000..cda38ebd --- /dev/null +++ b/module-file-media/src/main/resources/mybatis/mapper/rtmp/rtmp-client-mapper.xml @@ -0,0 +1,416 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + CREATE TABLE IF NOT EXISTS `rtmp_client` ( + `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT, + `client_id` char(36) DEFAULT NULL COMMENT '主键', + `client_code` varchar(255) DEFAULT NULL COMMENT '设备编码', + `client_name` varchar(255) DEFAULT NULL COMMENT '客户端名称', + `client_summary` varchar(255) DEFAULT NULL COMMENT '客户端描述', + `client_key` varchar(255) DEFAULT NULL COMMENT '客户端用户名', + `client_secret` varchar(255) DEFAULT NULL COMMENT '客户端密码', + `client_status` varchar(20) DEFAULT '1' COMMENT '设备状态', + `client_url` text COMMENT '客户端地址', + `expire_time` varchar(255) DEFAULT '2099-12-31' COMMENT '过期时间', + `area_code` varchar(255) DEFAULT NULL COMMENT '地区编码', + `area_name` varchar(255) DEFAULT NULL COMMENT '地区名称', + `position_lng` varchar(255) DEFAULT NULL COMMENT '位置经度', + `position_lat` varchar(255) DEFAULT NULL COMMENT '位置纬度', + `position_address` varchar(500) DEFAULT NULL COMMENT '位置地址', + `creator` char(36) DEFAULT NULL COMMENT '创建人', + `gmt_create` datetime DEFAULT NULL COMMENT '创建时间', + `modifier` char(36) DEFAULT NULL COMMENT '修改人', + `gmt_modified` datetime DEFAULT NULL COMMENT '修改时间', + `is_delete` int(1) DEFAULT '0' COMMENT '是否删除', + PRIMARY KEY (`id`), + UNIQUE KEY `client_id` (`client_id`), + UNIQUE KEY `client_code` (`client_code`), + KEY `area_code` (`area_code`) + ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='rtmp客户端'; + + + + + INSERT INTO rtmp_client( + client_id, + client_code, + client_name, + client_summary, + client_key, + client_secret, + client_status, + client_url, + expire_time, + creator, + gmt_create, + modifier, + gmt_modified, + is_delete + ) VALUES( + #{clientId}, + #{clientCode}, + #{clientName}, + #{clientSummary}, + #{clientKey}, + #{clientSecret}, + #{clientStatus}, + #{clientUrl}, + #{expireTime}, + #{creator}, + #{gmtCreate}, + #{modifier}, + #{gmtModified}, + #{isDelete} + ) + + + + + UPDATE + rtmp_client + SET + gmt_modified = #{gmtModified}, + modifier = #{modifier}, + is_delete = 1 + WHERE + client_id IN + + #{clientIds[${index}]} + + + + + + DELETE FROM + rtmp_client + WHERE + client_id IN + + #{clientIds[${index}]} + + + + + + UPDATE + rtmp_client + SET + + client_name = #{clientName}, + + + client_summary = #{clientSummary}, + + + client_key = #{clientKey}, + + + client_secret = #{clientSecret}, + + + client_status = #{clientStatus}, + + + client_url = #{clientUrl}, + + + expire_time = #{expireTime}, + + gmt_modified = #{gmtModified}, + modifier = #{modifier}, + client_id = client_id + WHERE + client_id = #{clientId} + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/module-file-media/src/main/resources/mybatis/mapper/media-video-mapper.xml b/module-file-media/src/main/resources/mybatis/mapper/video/media-video-mapper.xml similarity index 100% rename from module-file-media/src/main/resources/mybatis/mapper/media-video-mapper.xml rename to module-file-media/src/main/resources/mybatis/mapper/video/media-video-mapper.xml diff --git a/module-file-media/src/main/resources/templates/file/media/video/list.html b/module-file-media/src/main/resources/templates/video/list.html similarity index 100% rename from module-file-media/src/main/resources/templates/file/media/video/list.html rename to module-file-media/src/main/resources/templates/video/list.html diff --git a/module-file-media/src/main/resources/templates/file/media/video/preview.html b/module-file-media/src/main/resources/templates/video/preview.html similarity index 100% rename from module-file-media/src/main/resources/templates/file/media/video/preview.html rename to module-file-media/src/main/resources/templates/video/preview.html diff --git a/module-file-media/src/main/resources/templates/file/media/video/upload.html b/module-file-media/src/main/resources/templates/video/upload.html similarity index 100% rename from module-file-media/src/main/resources/templates/file/media/video/upload.html rename to module-file-media/src/main/resources/templates/video/upload.html