diff --git a/power-admin/src/main/java/com/manage/controller/VideoController.java b/power-admin/src/main/java/com/manage/controller/VideoController.java new file mode 100644 index 0000000..f4c01bd --- /dev/null +++ b/power-admin/src/main/java/com/manage/controller/VideoController.java @@ -0,0 +1,30 @@ +package com.manage.controller; + +import com.manage.entity.Power_User; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.RequestMapping; + +import javax.servlet.http.HttpServletRequest; + +/** + * @author 王思懿 + */ +@Controller +@RequestMapping("/video") +public class VideoController { + + @RequestMapping("/video") + public String getVideoPage(HttpServletRequest request, Model model){ + Power_User user = (Power_User)request.getSession().getAttribute("CURRENT_USER"); + model.addAttribute("user",(Power_User)request.getSession().getAttribute("CURRENT_USER")); + return "/videoDir/video"; + } + + @RequestMapping("/videoShow") + public String getVideoShowPage(HttpServletRequest request, Model model, String videoType){ + model.addAttribute("user",(Power_User)request.getSession().getAttribute("CURRENT_USER")); + model.addAttribute("videoType", videoType); + return "/videoDir/videoShow"; + } +} diff --git a/power-admin/src/main/resources/config/config.properties b/power-admin/src/main/resources/config/config.properties index e10c6dc..cd342a0 100644 --- a/power-admin/src/main/resources/config/config.properties +++ b/power-admin/src/main/resources/config/config.properties @@ -10,7 +10,7 @@ TOKEN_EXPIRE_TIME = 1200000 ##################################################\u670D\u52A1\u5668ip########################################################## #\u901A\u7528\u670D\u52A1\u5668IP\u4E0E\u901A\u7528\u670D\u52A1\u5668\u7AEF\u53E3 SERVER_IP = localhost -SERVER_PORT = 8080 +SERVER_PORT = 8081 #power\u6743\u9650\u7CFB\u7EDFip POWER_IP = ${SERVER_IP} @@ -20,12 +20,12 @@ POWER_PORT = ${SERVER_PORT} #\u75C5\u6848\u5F52\u6863\u7CFB\u7EDFip EMRMEDICALRECORD_IP = ${SERVER_IP} #\u75C5\u6848\u5F52\u6863\u7CFB\u7EDF\u7AEF\u53E3 -EMRMEDICALRECORD_PORT = ${SERVER_PORT} +EMRMEDICALRECORD_PORT = 8082 #\u75C5\u6848\u7BA1\u7406\u7CFB\u7EDFip EMRRECORD_IP = ${SERVER_IP} #\u75C5\u6848\u7BA1\u7406\u7CFB\u7EDF\u7AEF\u53E3 -EMRRECORD_PORT = ${SERVER_PORT} +EMRRECORD_PORT = 8081 #\u75C5\u6848\u590D\u5370\u9884\u7EA6ip EMRAPPLYCOPY_IP = ${SERVER_IP} diff --git a/power-admin/src/main/webapp/WEB-INF/views/gatewayDir/gatewayIndex.jsp b/power-admin/src/main/webapp/WEB-INF/views/gatewayDir/gatewayIndex.jsp index d05c410..a56c905 100644 --- a/power-admin/src/main/webapp/WEB-INF/views/gatewayDir/gatewayIndex.jsp +++ b/power-admin/src/main/webapp/WEB-INF/views/gatewayDir/gatewayIndex.jsp @@ -552,6 +552,7 @@ + <%@ include file="/WEB-INF/jspf/webSocket.jspf" %> <%----%>
+ + <%--diff --git a/power-admin/src/main/webapp/WEB-INF/views/videoDir/video.jsp b/power-admin/src/main/webapp/WEB-INF/views/videoDir/video.jsp new file mode 100644 index 0000000..9d22590 --- /dev/null +++ b/power-admin/src/main/webapp/WEB-INF/views/videoDir/video.jsp @@ -0,0 +1,76 @@ +<%-- + Created by IntelliJ IDEA. + User: 王思懿 + Date: 2020/6/11 + Time: 15:48 + To change this template use File | Settings | File Templates. +--%> +<%@ page contentType="text/html;charset=UTF-8" language="java" %> + +
+
+ <%@ include file="/WEB-INF/jspf/common.jspf" %> + + + +
+ + +