소스 검색

同时支持打包为Jar和War

648540858 2 년 전
부모
커밋
6484f52e46
46개의 변경된 파일189개의 추가작업 그리고 160개의 파일을 삭제
  1. 1 1
      pom.xml
  2. 0 13
      src/main/java/com/genersoft/iot/vmp/ServletInitializer.java
  3. 25 6
      src/main/java/com/genersoft/iot/vmp/VManageBootstrap.java
  4. 3 1
      src/main/java/com/genersoft/iot/vmp/conf/ApiAccessFilter.java
  5. 30 0
      src/main/java/com/genersoft/iot/vmp/conf/ServiceInfo.java
  6. 0 24
      src/main/java/com/genersoft/iot/vmp/conf/security/UrlTokenHandler.java
  7. 14 0
      src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/RegisterRequestProcessor.java
  8. 2 1
      web_src/build/utils.js
  9. 3 3
      web_src/config/index.js
  10. 2 2
      web_src/src/components/CloudRecord.vue
  11. 5 5
      web_src/src/components/CloudRecordDetail.vue
  12. 5 5
      web_src/src/components/DeviceList.vue
  13. 8 8
      web_src/src/components/GBRecordDetail.vue
  14. 1 1
      web_src/src/components/Login.vue
  15. 2 2
      web_src/src/components/ParentPlatformList.vue
  16. 5 5
      web_src/src/components/PushVideoList.vue
  17. 6 6
      web_src/src/components/StreamProxyList.vue
  18. 2 2
      web_src/src/components/UserManager.vue
  19. 6 6
      web_src/src/components/channelList.vue
  20. 4 4
      web_src/src/components/console.vue
  21. 1 1
      web_src/src/components/dialog/MediaServerEdit.vue
  22. 4 4
      web_src/src/components/dialog/StreamProxyEdit.vue
  23. 1 1
      web_src/src/components/dialog/SyncChannelProgress.vue
  24. 2 2
      web_src/src/components/dialog/addUser.vue
  25. 1 1
      web_src/src/components/dialog/catalogEdit.vue
  26. 1 1
      web_src/src/components/dialog/changePassword.vue
  27. 1 1
      web_src/src/components/dialog/changePasswordForAdmin.vue
  28. 1 1
      web_src/src/components/dialog/changePushKey.vue
  29. 1 1
      web_src/src/components/dialog/channelMapInfobox.vue
  30. 1 1
      web_src/src/components/dialog/chooseChannel.vue
  31. 4 4
      web_src/src/components/dialog/chooseChannelForCatalog.vue
  32. 5 5
      web_src/src/components/dialog/chooseChannelForGb.vue
  33. 5 5
      web_src/src/components/dialog/chooseChannelForStream.vue
  34. 1 1
      web_src/src/components/dialog/deviceEdit.vue
  35. 7 7
      web_src/src/components/dialog/devicePlayer.vue
  36. 2 2
      web_src/src/components/dialog/getCatalog.vue
  37. 1 1
      web_src/src/components/dialog/importChannel.vue
  38. 1 1
      web_src/src/components/dialog/onvifEdit.vue
  39. 3 3
      web_src/src/components/dialog/platformEdit.vue
  40. 3 3
      web_src/src/components/dialog/pushStreamEdit.vue
  41. 1 1
      web_src/src/components/dialog/queryTrace.vue
  42. 4 4
      web_src/src/components/dialog/recordDownload.vue
  43. 1 1
      web_src/src/components/live.vue
  44. 1 1
      web_src/src/components/map.vue
  45. 5 5
      web_src/src/components/service/DeviceService.js
  46. 7 7
      web_src/src/components/service/MediaServer.js

+ 1 - 1
pom.xml

@@ -79,7 +79,7 @@
 					<exclusions>
 					<exclusions>
 						<exclusion>
 						<exclusion>
 							<groupId>org.springframework.boot</groupId>
 							<groupId>org.springframework.boot</groupId>
-							<artifactId>spring-boot-starter-tomcat</artifactId>
+							<artifactId>spring-boot-starter-jetty</artifactId>
 						</exclusion>
 						</exclusion>
 					</exclusions>
 					</exclusions>
 				</dependency>
 				</dependency>

+ 0 - 13
src/main/java/com/genersoft/iot/vmp/ServletInitializer.java

@@ -1,13 +0,0 @@
-package com.genersoft.iot.vmp;
-
-import org.springframework.boot.builder.SpringApplicationBuilder;
-import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
-
-public class ServletInitializer extends SpringBootServletInitializer {
-
-    @Override
-    protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
-        return application.sources(VManageBootstrap.class);
-    }
-
-}

+ 25 - 6
src/main/java/com/genersoft/iot/vmp/VManageBootstrap.java

@@ -1,20 +1,24 @@
 package com.genersoft.iot.vmp;
 package com.genersoft.iot.vmp;
 
 
-import java.util.logging.LogManager;
-
 import com.genersoft.iot.vmp.conf.druid.EnableDruidSupport;
 import com.genersoft.iot.vmp.conf.druid.EnableDruidSupport;
-import com.genersoft.iot.vmp.storager.impl.RedisCatchStorageImpl;
 import com.genersoft.iot.vmp.utils.GitUtil;
 import com.genersoft.iot.vmp.utils.GitUtil;
 import com.genersoft.iot.vmp.utils.SpringBeanFactory;
 import com.genersoft.iot.vmp.utils.SpringBeanFactory;
 import org.slf4j.Logger;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.boot.web.servlet.ServletComponentScan;
 import org.springframework.boot.web.servlet.ServletComponentScan;
+import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.annotation.EnableScheduling;
 
 
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import javax.servlet.SessionCookieConfig;
+import javax.servlet.SessionTrackingMode;
+import java.util.Collections;
+
 /**
 /**
  * 启动类
  * 启动类
  */
  */
@@ -22,7 +26,7 @@ import org.springframework.scheduling.annotation.EnableScheduling;
 @SpringBootApplication
 @SpringBootApplication
 @EnableScheduling
 @EnableScheduling
 @EnableDruidSupport
 @EnableDruidSupport
-public class VManageBootstrap extends LogManager {
+public class VManageBootstrap extends SpringBootServletInitializer {
 
 
 	private final static Logger logger = LoggerFactory.getLogger(VManageBootstrap.class);
 	private final static Logger logger = LoggerFactory.getLogger(VManageBootstrap.class);
 
 
@@ -41,6 +45,21 @@ public class VManageBootstrap extends LogManager {
 		context.close();
 		context.close();
 		VManageBootstrap.context = SpringApplication.run(VManageBootstrap.class, args);
 		VManageBootstrap.context = SpringApplication.run(VManageBootstrap.class, args);
 	}
 	}
-	
 
 
+	@Override
+	protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
+		return application.sources(VManageBootstrap.class);
+	}
+
+	@Override
+	public void onStartup(ServletContext servletContext) throws ServletException {
+		super.onStartup(servletContext);
+
+		servletContext.setSessionTrackingModes(
+				Collections.singleton(SessionTrackingMode.COOKIE)
+		);
+		SessionCookieConfig sessionCookieConfig = servletContext.getSessionCookieConfig();
+		sessionCookieConfig.setHttpOnly(true);
+
+	}
 }
 }

+ 3 - 1
src/main/java/com/genersoft/iot/vmp/conf/ApiAccessFilter.java

@@ -10,6 +10,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.HttpStatus;
+import org.springframework.stereotype.Component;
 import org.springframework.util.ObjectUtils;
 import org.springframework.util.ObjectUtils;
 import org.springframework.web.filter.OncePerRequestFilter;
 import org.springframework.web.filter.OncePerRequestFilter;
 
 
@@ -23,6 +24,7 @@ import java.io.IOException;
  * @author lin
  * @author lin
  */
  */
 @WebFilter(filterName = "ApiAccessFilter", urlPatterns = "/api/*", asyncSupported=true)
 @WebFilter(filterName = "ApiAccessFilter", urlPatterns = "/api/*", asyncSupported=true)
+@Component
 public class ApiAccessFilter extends OncePerRequestFilter {
 public class ApiAccessFilter extends OncePerRequestFilter {
 
 
     private final static Logger logger = LoggerFactory.getLogger(ApiAccessFilter.class);
     private final static Logger logger = LoggerFactory.getLogger(ApiAccessFilter.class);
@@ -48,7 +50,7 @@ public class ApiAccessFilter extends OncePerRequestFilter {
 
 
         filterChain.doFilter(servletRequest, servletResponse);
         filterChain.doFilter(servletRequest, servletResponse);
 
 
-        if (uriName != null && userSetting.getLogInDatebase()) {
+        if (uriName != null && userSetting != null && userSetting.getLogInDatebase() != null && userSetting.getLogInDatebase()) {
 
 
             LogDto logDto = new LogDto();
             LogDto logDto = new LogDto();
             logDto.setName(uriName);
             logDto.setName(uriName);

+ 30 - 0
src/main/java/com/genersoft/iot/vmp/conf/ServiceInfo.java

@@ -0,0 +1,30 @@
+package com.genersoft.iot.vmp.conf;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.boot.web.context.WebServerInitializedEvent;
+import org.springframework.context.ApplicationListener;
+import org.springframework.stereotype.Component;
+
+@Component
+public class ServiceInfo implements ApplicationListener<WebServerInitializedEvent> {
+
+    private final Logger logger = LoggerFactory.getLogger(ServiceInfo.class);
+
+    private static int serverPort;
+
+    public static int getServerPort() {
+        return serverPort;
+    }
+
+    @Override
+    public void onApplicationEvent(WebServerInitializedEvent event) {
+        // 项目启动获取启动的端口号
+        ServiceInfo.serverPort = event.getWebServer().getPort();
+        logger.info("项目启动获取启动的端口号:  " + ServiceInfo.serverPort);
+    }
+
+    public void setServerPort(int serverPort) {
+        ServiceInfo.serverPort = serverPort;
+    }
+}

+ 0 - 24
src/main/java/com/genersoft/iot/vmp/conf/security/UrlTokenHandler.java

@@ -1,24 +0,0 @@
-package com.genersoft.iot.vmp.conf.security;
-
-import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
-
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.SessionCookieConfig;
-import javax.servlet.SessionTrackingMode;
-import java.util.Collections;
-
-public class UrlTokenHandler extends SpringBootServletInitializer {
-
-    @Override
-    public void onStartup(ServletContext servletContext) throws ServletException {
-        super.onStartup(servletContext);
-
-        servletContext.setSessionTrackingModes(
-                Collections.singleton(SessionTrackingMode.COOKIE)
-        );
-        SessionCookieConfig sessionCookieConfig = servletContext.getSessionCookieConfig();
-        sessionCookieConfig.setHttpOnly(true);
-
-    }
-}

+ 14 - 0
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/RegisterRequestProcessor.java

@@ -1,5 +1,6 @@
 package com.genersoft.iot.vmp.gb28181.transmit.event.request.impl;
 package com.genersoft.iot.vmp.gb28181.transmit.event.request.impl;
 
 
+import com.genersoft.iot.vmp.conf.ServiceInfo;
 import com.genersoft.iot.vmp.conf.SipConfig;
 import com.genersoft.iot.vmp.conf.SipConfig;
 import com.genersoft.iot.vmp.conf.UserSetting;
 import com.genersoft.iot.vmp.conf.UserSetting;
 import com.genersoft.iot.vmp.gb28181.auth.DigestServerAuthenticationHelper;
 import com.genersoft.iot.vmp.gb28181.auth.DigestServerAuthenticationHelper;
@@ -79,6 +80,19 @@ public class RegisterRequestProcessor extends SIPRequestProcessorParent implemen
             RequestEventExt evtExt = (RequestEventExt) evt;
             RequestEventExt evtExt = (RequestEventExt) evt;
             String requestAddress = evtExt.getRemoteIpAddress() + ":" + evtExt.getRemotePort();
             String requestAddress = evtExt.getRemoteIpAddress() + ":" + evtExt.getRemotePort();
             logger.info("[注册请求] 开始处理: {}", requestAddress);
             logger.info("[注册请求] 开始处理: {}", requestAddress);
+//            MBeanServer beanServer = ManagementFactory.getPlatformMBeanServer();
+//            QueryExp protocol = Query.match(Query.attr("protocol"), Query.value("HTTP/1.1"));
+////            ObjectName name = new ObjectName("*:type=Connector,*");
+//            ObjectName name = new ObjectName("*:*");
+//            Set<ObjectName> objectNames = beanServer.queryNames(name, protocol);
+//            for (ObjectName objectName : objectNames) {
+//                String catalina = objectName.getDomain();
+//                if ("Catalina".equals(catalina)) {
+//                    System.out.println(objectName.getKeyProperty("port"));
+//                }
+//            }
+
+            System.out.println(ServiceInfo.getServerPort());
             SIPRequest request = (SIPRequest)evt.getRequest();
             SIPRequest request = (SIPRequest)evt.getRequest();
             Response response = null;
             Response response = null;
             boolean passwordCorrect = false;
             boolean passwordCorrect = false;

+ 2 - 1
web_src/build/utils.js

@@ -47,7 +47,8 @@ exports.cssLoaders = function (options) {
     if (options.extract) {
     if (options.extract) {
       return ExtractTextPlugin.extract({
       return ExtractTextPlugin.extract({
         use: loaders,
         use: loaders,
-        fallback: 'vue-style-loader'
+        fallback: 'vue-style-loader',
+        publicPath: '../../'
       })
       })
     } else {
     } else {
       return ['vue-style-loader'].concat(loaders)
       return ['vue-style-loader'].concat(loaders)

+ 3 - 3
web_src/config/index.js

@@ -8,8 +8,8 @@ module.exports = {
   dev: {
   dev: {
 
 
     // Paths
     // Paths
-    assetsSubDirectory: 'static',
-    assetsPublicPath: '/',
+    assetsSubDirectory: './static',
+    assetsPublicPath: './',
     proxyTable: {
     proxyTable: {
       '/debug': {
       '/debug': {
         target: 'http://localhost:38080',
         target: 'http://localhost:38080',
@@ -61,7 +61,7 @@ module.exports = {
     // Paths
     // Paths
     assetsRoot: path.resolve(__dirname, '../../src/main/resources/static/'),
     assetsRoot: path.resolve(__dirname, '../../src/main/resources/static/'),
     assetsSubDirectory: './static',
     assetsSubDirectory: './static',
-    assetsPublicPath: '/',
+    assetsPublicPath: './',
 
 
     /**
     /**
      * Source Maps
      * Source Maps

+ 2 - 2
web_src/src/components/CloudRecord.vue

@@ -133,7 +133,7 @@
         let that = this;
         let that = this;
         this.$axios({
         this.$axios({
           method: 'get',
           method: 'get',
-          url:`/record_proxy/${that.mediaServerId}/api/record/list`,
+          url:`./record_proxy/${that.mediaServerId}/api/record/list`,
           params: {
           params: {
             page: that.currentPage,
             page: that.currentPage,
             count: that.count
             count: that.count
@@ -185,7 +185,7 @@
         let that = this;
         let that = this;
         this.$axios({
         this.$axios({
           method: 'delete',
           method: 'delete',
-          url:`/record_proxy/api/record/delete`,
+          url:`./record_proxy/api/record/delete`,
           params: {
           params: {
             page: that.currentPage,
             page: that.currentPage,
             count: that.count
             count: that.count

+ 5 - 5
web_src/src/components/CloudRecordDetail.vue

@@ -241,7 +241,7 @@
         let that = this;
         let that = this;
         that.$axios({
         that.$axios({
           method: 'get',
           method: 'get',
-          url:`/record_proxy/${that.mediaServerId}/api/record/file/list`,
+          url:`./record_proxy/${that.mediaServerId}/api/record/file/list`,
           params: {
           params: {
             app: that.recordFile.app,
             app: that.recordFile.app,
             stream: that.recordFile.stream,
             stream: that.recordFile.stream,
@@ -340,7 +340,7 @@
         let that = this;
         let that = this;
         this.$axios({
         this.$axios({
           method: 'delete',
           method: 'delete',
-          url:`/record_proxy/${that.mediaServerId}/api/record/delete`,
+          url:`./record_proxy/${that.mediaServerId}/api/record/delete`,
           params: {
           params: {
             page: that.currentPage,
             page: that.currentPage,
             count: that.count
             count: that.count
@@ -359,7 +359,7 @@
         that.dateFilesObj = {};
         that.dateFilesObj = {};
         this.$axios({
         this.$axios({
           method: 'get',
           method: 'get',
-          url:`/record_proxy/${that.mediaServerId}/api/record/date/list`,
+          url:`./record_proxy/${that.mediaServerId}/api/record/date/list`,
           params: {
           params: {
             app: that.recordFile.app,
             app: that.recordFile.app,
             stream: that.recordFile.stream
             stream: that.recordFile.stream
@@ -408,7 +408,7 @@
         let that = this;
         let that = this;
         this.$axios({
         this.$axios({
           method: 'get',
           method: 'get',
-          url:`/record_proxy/${that.mediaServerId}/api/record/file/download/task/add`,
+          url:`./record_proxy/${that.mediaServerId}/api/record/file/download/task/add`,
           params: {
           params: {
             app: that.recordFile.app,
             app: that.recordFile.app,
             stream: that.recordFile.stream,
             stream: that.recordFile.stream,
@@ -433,7 +433,7 @@
         let that = this;
         let that = this;
         this.$axios({
         this.$axios({
           method: 'get',
           method: 'get',
-          url:`/record_proxy/${that.mediaServerId}/api/record/file/download/task/list`,
+          url:`./record_proxy/${that.mediaServerId}/api/record/file/download/task/list`,
           params: {
           params: {
             isEnd: isEnd,
             isEnd: isEnd,
           }
           }

+ 5 - 5
web_src/src/components/DeviceList.vue

@@ -152,7 +152,7 @@ export default {
       this.getDeviceListLoading = true;
       this.getDeviceListLoading = true;
       this.$axios({
       this.$axios({
         method: 'get',
         method: 'get',
-        url: `/api/device/query/devices`,
+        url: `./api/device/query/devices`,
         params: {
         params: {
           page: this.currentPage,
           page: this.currentPage,
           count: this.count
           count: this.count
@@ -182,7 +182,7 @@ export default {
       }).then(() => {
       }).then(() => {
         this.$axios({
         this.$axios({
           method: 'delete',
           method: 'delete',
-          url: `/api/device/query/devices/${row.deviceId}/delete`
+          url: `./api/device/query/devices/${row.deviceId}/delete`
         }).then((res) => {
         }).then((res) => {
           this.getDeviceList();
           this.getDeviceList();
         }).catch((error) => {
         }).catch((error) => {
@@ -208,7 +208,7 @@ export default {
       let that = this;
       let that = this;
       this.$axios({
       this.$axios({
         method: 'get',
         method: 'get',
-        url: '/api/device/query/devices/' + itemData.deviceId + '/sync'
+        url: './api/device/query/devices/' + itemData.deviceId + '/sync'
       }).then((res) => {
       }).then((res) => {
         console.log("刷新设备结果:" + JSON.stringify(res));
         console.log("刷新设备结果:" + JSON.stringify(res));
         if (res.data.code !== 0) {
         if (res.data.code !== 0) {
@@ -242,7 +242,7 @@ export default {
       await this.$axios({
       await this.$axios({
         method: 'get',
         method: 'get',
         async: false,
         async: false,
-        url: `/api/device/query/${deviceId}/sync_status/`,
+        url: `./api/device/query/${deviceId}/sync_status/`,
       }).then((res) => {
       }).then((res) => {
         if (res.data.code == 0) {
         if (res.data.code == 0) {
           if (res.data.data.errorMsg !== null) {
           if (res.data.data.errorMsg !== null) {
@@ -261,7 +261,7 @@ export default {
       let that = this;
       let that = this;
       this.$axios({
       this.$axios({
         method: 'post',
         method: 'post',
-        url: '/api/device/query/transport/' + row.deviceId + '/' + row.streamMode
+        url: './api/device/query/transport/' + row.deviceId + '/' + row.streamMode
       }).then(function (res) {
       }).then(function (res) {
 
 
       }).catch(function (e) {
       }).catch(function (e) {

+ 8 - 8
web_src/src/components/GBRecordDetail.vue

@@ -197,7 +197,7 @@
         this.detailFiles = [];
         this.detailFiles = [];
         this.$axios({
         this.$axios({
           method: 'get',
           method: 'get',
-          url: '/api/gb_record/query/' + this.deviceId + '/' + this.channelId + '?startTime=' + this.startTime + '&endTime=' + this.endTime
+          url: './api/gb_record/query/' + this.deviceId + '/' + this.channelId + '?startTime=' + this.startTime + '&endTime=' + this.endTime
         }).then((res)=>{
         }).then((res)=>{
           this.recordsLoading = false;
           this.recordsLoading = false;
           if(res.data.code === 0) {
           if(res.data.code === 0) {
@@ -249,7 +249,7 @@
         } else {
         } else {
           this.$axios({
           this.$axios({
             method: 'get',
             method: 'get',
-            url: '/api/playback/start/' + this.deviceId + '/' + this.channelId + '?startTime=' + this.startTime + '&endTime=' +
+            url: './api/playback/start/' + this.deviceId + '/' + this.channelId + '?startTime=' + this.startTime + '&endTime=' +
               this.endTime
               this.endTime
           }).then((res)=> {
           }).then((res)=> {
             if (res.data.code === 0) {
             if (res.data.code === 0) {
@@ -273,7 +273,7 @@
         console.log('前端控制:播放');
         console.log('前端控制:播放');
         this.$axios({
         this.$axios({
           method: 'get',
           method: 'get',
-          url: '/api/playback/resume/' + this.streamId
+          url: './api/playback/resume/' + this.streamId
         }).then((res)=> {
         }).then((res)=> {
           this.$refs["recordVideoPlayer"].play(this.videoUrl)
           this.$refs["recordVideoPlayer"].play(this.videoUrl)
         });
         });
@@ -282,14 +282,14 @@
         console.log('前端控制:暂停');
         console.log('前端控制:暂停');
         this.$axios({
         this.$axios({
           method: 'get',
           method: 'get',
-          url: '/api/playback/pause/' + this.streamId
+          url: './api/playback/pause/' + this.streamId
         }).then(function (res) {});
         }).then(function (res) {});
       },
       },
       gbScale(command){
       gbScale(command){
         console.log('前端控制:倍速 ' + command);
         console.log('前端控制:倍速 ' + command);
         this.$axios({
         this.$axios({
           method: 'get',
           method: 'get',
-          url: `/api/playback/speed/${this.streamId }/${command}`
+          url: `./api/playback/speed/${this.streamId }/${command}`
         }).then(function (res) {});
         }).then(function (res) {});
       },
       },
       downloadRecord: function (row) {
       downloadRecord: function (row) {
@@ -311,7 +311,7 @@
         }else {
         }else {
           this.$axios({
           this.$axios({
             method: 'get',
             method: 'get',
-            url: '/api/gb_record/download/start/' + this.deviceId + '/' + this.channelId + '?startTime=' + row.startTime + '&endTime=' +
+            url: './api/gb_record/download/start/' + this.deviceId + '/' + this.channelId + '?startTime=' + row.startTime + '&endTime=' +
               row.endTime + '&downloadSpeed=4'
               row.endTime + '&downloadSpeed=4'
           }).then( (res)=> {
           }).then( (res)=> {
             if (res.data.code === 0) {
             if (res.data.code === 0) {
@@ -332,7 +332,7 @@
         this.videoUrl = '';
         this.videoUrl = '';
         this.$axios({
         this.$axios({
           method: 'get',
           method: 'get',
-          url: '/api/gb_record/download/stop/' + this.deviceId + "/" + this.channelId+ "/" + this.streamId
+          url: './api/gb_record/download/stop/' + this.deviceId + "/" + this.channelId+ "/" + this.streamId
         }).then((res)=> {
         }).then((res)=> {
           if (callback) callback(res)
           if (callback) callback(res)
         });
         });
@@ -342,7 +342,7 @@
         this.videoUrl = '';
         this.videoUrl = '';
         this.$axios({
         this.$axios({
           method: 'get',
           method: 'get',
-          url: '/api/playback/stop/' + this.deviceId + "/" + this.channelId + "/" + this.streamId
+          url: './api/playback/stop/' + this.deviceId + "/" + this.channelId + "/" + this.streamId
         }).then(function (res) {
         }).then(function (res) {
           if (callback) callback()
           if (callback) callback()
         });
         });

+ 1 - 1
web_src/src/components/Login.vue

@@ -81,7 +81,7 @@ export default {
 
 
       this.$axios({
       this.$axios({
       	method: 'get',
       	method: 'get',
-        url:"/api/user/login",
+        url:"./api/user/login",
         params: loginParam
         params: loginParam
       }).then(function (res) {
       }).then(function (res) {
         window.clearTimeout(timeoutTask)
         window.clearTimeout(timeoutTask)

+ 2 - 2
web_src/src/components/ParentPlatformList.vue

@@ -128,7 +128,7 @@ export default {
         var that = this;
         var that = this;
         that.$axios({
         that.$axios({
           method: 'delete',
           method: 'delete',
-          url:`/api/platform/delete/${platform.serverGBId}`
+          url:`./api/platform/delete/${platform.serverGBId}`
         }).then(function (res) {
         }).then(function (res) {
             if (res.data.code === 0) {
             if (res.data.code === 0) {
                 that.$message({
                 that.$message({
@@ -162,7 +162,7 @@ export default {
 
 
       this.$axios({
       this.$axios({
       	method: 'get',
       	method: 'get',
-        url:`/api/platform/query/${that.count}/${that.currentPage}`
+        url:`./api/platform/query/${that.count}/${that.currentPage}`
       }).then(function (res) {
       }).then(function (res) {
         if (res.data.code === 0) {
         if (res.data.code === 0) {
           that.total = res.data.data.total;
           that.total = res.data.data.total;

+ 5 - 5
web_src/src/components/PushVideoList.vue

@@ -171,7 +171,7 @@ export default {
       this.getDeviceListLoading = true;
       this.getDeviceListLoading = true;
       this.$axios({
       this.$axios({
         method: 'get',
         method: 'get',
-        url: `/api/push/list`,
+        url: `./api/push/list`,
         params: {
         params: {
           page: that.currentPage,
           page: that.currentPage,
           count: that.count,
           count: that.count,
@@ -197,7 +197,7 @@ export default {
       this.getListLoading = true;
       this.getListLoading = true;
       this.$axios({
       this.$axios({
         method: 'get',
         method: 'get',
-        url: '/api/push/getPlayUrl',
+        url: './api/push/getPlayUrl',
         params: {
         params: {
           app: row.app,
           app: row.app,
           stream: row.stream,
           stream: row.stream,
@@ -223,7 +223,7 @@ export default {
       let that = this;
       let that = this;
       that.$axios({
       that.$axios({
         method: "post",
         method: "post",
-        url: "/api/push/stop",
+        url: "./api/push/stop",
         params: {
         params: {
           app: row.app,
           app: row.app,
           streamId: row.stream
           streamId: row.stream
@@ -247,7 +247,7 @@ export default {
       let that = this;
       let that = this;
       that.$axios({
       that.$axios({
         method: "delete",
         method: "delete",
-        url: "/api/push/remove_form_gb",
+        url: "./api/push/remove_form_gb",
         data: row
         data: row
       }).then((res) => {
       }).then((res) => {
         if (res.data.code === 0) {
         if (res.data.code === 0) {
@@ -274,7 +274,7 @@ export default {
         let that = this;
         let that = this;
         that.$axios({
         that.$axios({
           method: "delete",
           method: "delete",
-          url: "/api/push/batchStop",
+          url: "./api/push/batchStop",
           data: {
           data: {
             gbStreams: this.multipleSelection
             gbStreams: this.multipleSelection
           }
           }

+ 6 - 6
web_src/src/components/StreamProxyList.vue

@@ -167,7 +167,7 @@
 				let that = this;
 				let that = this;
 				this.$axios({
 				this.$axios({
 					method: 'get',
 					method: 'get',
-					url:`/api/proxy/list`,
+					url:`./api/proxy/list`,
 					params: {
 					params: {
 						page: that.currentPage,
 						page: that.currentPage,
 						count: that.count
 						count: that.count
@@ -190,7 +190,7 @@
       addOnvif: function(){
       addOnvif: function(){
         this.$axios({
         this.$axios({
           method: 'get',
           method: 'get',
-          url:`/api/onvif/search?timeout=3000`,
+          url:`./api/onvif/search?timeout=3000`,
         }).then((res) =>{
         }).then((res) =>{
           if (res.data.code === 0 ){
           if (res.data.code === 0 ){
             if (res.data.data.length > 0) {
             if (res.data.data.length > 0) {
@@ -218,7 +218,7 @@
 				let that = this;
 				let that = this;
 				this.$axios({
 				this.$axios({
 					method: 'get',
 					method: 'get',
-					url:`/api/push/getPlayUrl`,
+					url:`./api/push/getPlayUrl`,
 					params: {
 					params: {
 						app: row.app,
 						app: row.app,
 						stream: row.stream,
 						stream: row.stream,
@@ -247,7 +247,7 @@
 				let that = this;
 				let that = this;
 				that.$axios({
 				that.$axios({
                     method:"delete",
                     method:"delete",
-                    url:"/api/proxy/del",
+                    url:"./api/proxy/del",
                     params:{
                     params:{
                       app: row.app,
                       app: row.app,
                       stream: row.stream
                       stream: row.stream
@@ -263,7 +263,7 @@
         this.$set(row, 'startBtnLoading', true)
         this.$set(row, 'startBtnLoading', true)
 				this.$axios({
 				this.$axios({
 					method: 'get',
 					method: 'get',
-					url:`/api/proxy/start`,
+					url:`./api/proxy/start`,
 					params: {
 					params: {
 						app: row.app,
 						app: row.app,
 						stream: row.stream
 						stream: row.stream
@@ -295,7 +295,7 @@
 				let that = this;
 				let that = this;
 				this.$axios({
 				this.$axios({
 					method: 'get',
 					method: 'get',
-					url:`/api/proxy/stop`,
+					url:`./api/proxy/stop`,
 					params: {
 					params: {
 						app: row.app,
 						app: row.app,
 						stream: row.stream
 						stream: row.stream

+ 2 - 2
web_src/src/components/UserManager.vue

@@ -99,7 +99,7 @@ export default {
       this.getUserListLoading = true;
       this.getUserListLoading = true;
       this.$axios({
       this.$axios({
         method: 'get',
         method: 'get',
-        url: `/api/user/users`,
+        url: `./api/user/users`,
         params: {
         params: {
           page: that.currentPage,
           page: that.currentPage,
           count: that.count
           count: that.count
@@ -141,7 +141,7 @@ export default {
       }).then(() => {
       }).then(() => {
         this.$axios({
         this.$axios({
           method: 'delete',
           method: 'delete',
-          url: `/api/user/delete?id=${row.id}`
+          url: `./api/user/delete?id=${row.id}`
         }).then((res) => {
         }).then((res) => {
           this.getUserList();
           this.getUserList();
         }).catch((error) => {
         }).catch((error) => {

+ 6 - 6
web_src/src/components/channelList.vue

@@ -206,7 +206,7 @@ export default {
       if (typeof (this.$route.params.deviceId) == "undefined") return;
       if (typeof (this.$route.params.deviceId) == "undefined") return;
       this.$axios({
       this.$axios({
         method: 'get',
         method: 'get',
-        url: `/api/device/query/devices/${this.$route.params.deviceId}/channels`,
+        url: `./api/device/query/devices/${this.$route.params.deviceId}/channels`,
         params: {
         params: {
           page: that.currentPage,
           page: that.currentPage,
           count: that.count,
           count: that.count,
@@ -238,7 +238,7 @@ export default {
       let that = this;
       let that = this;
       this.$axios({
       this.$axios({
         method: 'get',
         method: 'get',
-        url: '/api/play/start/' + deviceId + '/' + channelId
+        url: './api/play/start/' + deviceId + '/' + channelId
       }).then(function (res) {
       }).then(function (res) {
         console.log(res)
         console.log(res)
         that.isLoging = false;
         that.isLoging = false;
@@ -278,7 +278,7 @@ export default {
       var that = this;
       var that = this;
       this.$axios({
       this.$axios({
         method: 'get',
         method: 'get',
-        url: '/api/play/stop/' + this.deviceId + "/" + itemData.channelId
+        url: './api/play/stop/' + this.deviceId + "/" + itemData.channelId
       }).then(function (res) {
       }).then(function (res) {
         that.initData();
         that.initData();
       }).catch(function (error) {
       }).catch(function (error) {
@@ -334,7 +334,7 @@ export default {
       if (!this.showTree) {
       if (!this.showTree) {
         this.$axios({
         this.$axios({
           method: 'get',
           method: 'get',
-          url: `/api/device/query/sub_channels/${this.deviceId}/${this.parentChannelId}/channels`,
+          url: `./api/device/query/sub_channels/${this.deviceId}/${this.parentChannelId}/channels`,
           params: {
           params: {
             page: this.currentPage,
             page: this.currentPage,
             count: this.count,
             count: this.count,
@@ -358,7 +358,7 @@ export default {
       }else {
       }else {
         this.$axios({
         this.$axios({
           method: 'get',
           method: 'get',
-          url: `/api/device/query/tree/channel/${this.deviceId}`,
+          url: `./api/device/query/tree/channel/${this.deviceId}`,
           params: {
           params: {
             parentId: this.parentChannelId,
             parentId: this.parentChannelId,
             page: this.currentPage,
             page: this.currentPage,
@@ -387,7 +387,7 @@ export default {
     updateChannel: function (row) {
     updateChannel: function (row) {
       this.$axios({
       this.$axios({
         method: 'post',
         method: 'post',
-        url: `/api/device/query/channel/update/${this.deviceId}`,
+        url: `./api/device/query/channel/update/${this.deviceId}`,
         params: row
         params: row
       }).then(function (res) {
       }).then(function (res) {
         console.log(JSON.stringify(res));
         console.log(JSON.stringify(res));

+ 4 - 4
web_src/src/components/console.vue

@@ -114,7 +114,7 @@ export default {
     getSystemInfo: function (){
     getSystemInfo: function (){
       this.$axios({
       this.$axios({
         method: 'get',
         method: 'get',
-        url: `/api/server/system/info`,
+        url: `./api/server/system/info`,
       }).then( (res)=> {
       }).then( (res)=> {
         if (res.data.code === 0) {
         if (res.data.code === 0) {
           this.$refs.consoleCPU.setData(res.data.data.cpu)
           this.$refs.consoleCPU.setData(res.data.data.cpu)
@@ -128,7 +128,7 @@ export default {
     getLoad: function (){
     getLoad: function (){
       this.$axios({
       this.$axios({
         method: 'get',
         method: 'get',
-        url: `/api/server/media_server/load`,
+        url: `./api/server/media_server/load`,
       }).then( (res)=> {
       }).then( (res)=> {
         if (res.data.code === 0) {
         if (res.data.code === 0) {
           this.$refs.consoleNodeLoad.setData(res.data.data)
           this.$refs.consoleNodeLoad.setData(res.data.data)
@@ -139,7 +139,7 @@ export default {
     getResourceInfo: function (){
     getResourceInfo: function (){
       this.$axios({
       this.$axios({
         method: 'get',
         method: 'get',
-        url: `/api/server/resource/info`,
+        url: `./api/server/resource/info`,
       }).then( (res)=> {
       }).then( (res)=> {
         if (res.data.code === 0) {
         if (res.data.code === 0) {
           this.$refs.consoleResource.setData(res.data.data)
           this.$refs.consoleResource.setData(res.data.data)
@@ -151,7 +151,7 @@ export default {
 
 
       this.$axios({
       this.$axios({
         method: 'get',
         method: 'get',
-        url: `/api/server/system/configInfo`,
+        url: `./api/server/system/configInfo`,
       }).then( (res)=> {
       }).then( (res)=> {
         console.log(res)
         console.log(res)
         if (res.data.code === 0) {
         if (res.data.code === 0) {

+ 1 - 1
web_src/src/components/dialog/MediaServerEdit.vue

@@ -335,7 +335,7 @@ export default {
       var that = this;
       var that = this;
       await that.$axios({
       await that.$axios({
         method: 'get',
         method: 'get',
-        url:`/api/platform/exit/${deviceGbId}`
+        url:`./api/platform/exit/${deviceGbId}`
       }).then(function (res) {
       }).then(function (res) {
         result = res.data;
         result = res.data;
       }).catch(function (error) {
       }).catch(function (error) {

+ 4 - 4
web_src/src/components/dialog/StreamProxyEdit.vue

@@ -195,7 +195,7 @@ export default {
       let that = this;
       let that = this;
       this.$axios({
       this.$axios({
         method: 'get',
         method: 'get',
-        url:`/api/platform/query/10000/1`
+        url:`./api/platform/query/10000/1`
       }).then(function (res) {
       }).then(function (res) {
         that.platformList = res.data.data.list;
         that.platformList = res.data.data.list;
       }).catch(function (error) {
       }).catch(function (error) {
@@ -212,7 +212,7 @@ export default {
       if (that.proxyParam.mediaServerId !== "auto"){
       if (that.proxyParam.mediaServerId !== "auto"){
         that.$axios({
         that.$axios({
           method: 'get',
           method: 'get',
-          url:`/api/proxy/ffmpeg_cmd/list`,
+          url:`./api/proxy/ffmpeg_cmd/list`,
           params: {
           params: {
             mediaServerId: that.proxyParam.mediaServerId
             mediaServerId: that.proxyParam.mediaServerId
           }
           }
@@ -230,7 +230,7 @@ export default {
       this.noneReaderHandler();
       this.noneReaderHandler();
       this.$axios({
       this.$axios({
         method: 'post',
         method: 'post',
-        url:`/api/proxy/save`,
+        url:`./api/proxy/save`,
         data: this.proxyParam
         data: this.proxyParam
       }).then((res)=> {
       }).then((res)=> {
         this.dialogLoading = false;
         this.dialogLoading = false;
@@ -261,7 +261,7 @@ export default {
       var that = this;
       var that = this;
       await that.$axios({
       await that.$axios({
         method: 'get',
         method: 'get',
-        url:`/api/platform/exit/${deviceGbId}`
+        url:`./api/platform/exit/${deviceGbId}`
       }).then(function (res) {
       }).then(function (res) {
         result = res.data;
         result = res.data;
       }).catch(function (error) {
       }).catch(function (error) {

+ 1 - 1
web_src/src/components/dialog/SyncChannelProgress.vue

@@ -55,7 +55,7 @@ export default {
     getProgress(){
     getProgress(){
       this.$axios({
       this.$axios({
         method: 'get',
         method: 'get',
-        url:`/api/device/query/${this.deviceId}/sync_status/`,
+        url:`./api/device/query/${this.deviceId}/sync_status/`,
       }).then((res) => {
       }).then((res) => {
         if (res.data.code === 0) {
         if (res.data.code === 0) {
           if (!this.syncFlag) {
           if (!this.syncFlag) {

+ 2 - 2
web_src/src/components/dialog/addUser.vue

@@ -100,7 +100,7 @@ export default {
     onSubmit: function () {
     onSubmit: function () {
       this.$axios({
       this.$axios({
         method: 'post',
         method: 'post',
-        url: "/api/user/add",
+        url: "./api/user/add",
         params: {
         params: {
           username: this.username,
           username: this.username,
           password: this.password,
           password: this.password,
@@ -139,7 +139,7 @@ export default {
 
 
       this.$axios({
       this.$axios({
         method: 'get',
         method: 'get',
-        url: "/api/role/all"
+        url: "./api/role/all"
       }).then((res) => {
       }).then((res) => {
         this.loading = true;
         this.loading = true;
         if (res.data.code === 0) {
         if (res.data.code === 0) {

+ 1 - 1
web_src/src/components/dialog/catalogEdit.vue

@@ -116,7 +116,7 @@ export default {
       console.log(this.form);
       console.log(this.form);
       this.$axios({
       this.$axios({
         method:"post",
         method:"post",
-        url:`/api/platform/catalog/${!this.isEdit? "add":"edit"}`,
+        url:`./api/platform/catalog/${!this.isEdit? "add":"edit"}`,
         data: this.form
         data: this.form
       }).then((res)=> {
       }).then((res)=> {
           if (res.data.code === 0) {
           if (res.data.code === 0) {

+ 1 - 1
web_src/src/components/dialog/changePassword.vue

@@ -90,7 +90,7 @@ export default {
     onSubmit: function () {
     onSubmit: function () {
       this.$axios({
       this.$axios({
         method: 'post',
         method: 'post',
-        url:"/api/user/changePassword",
+        url:"./api/user/changePassword",
         params: {
         params: {
           oldPassword: crypto.createHash('md5').update(this.oldPassword, "utf8").digest('hex'),
           oldPassword: crypto.createHash('md5').update(this.oldPassword, "utf8").digest('hex'),
           password: this.newPassword
           password: this.newPassword

+ 1 - 1
web_src/src/components/dialog/changePasswordForAdmin.vue

@@ -85,7 +85,7 @@ export default {
     onSubmit: function () {
     onSubmit: function () {
       this.$axios({
       this.$axios({
         method: 'post',
         method: 'post',
-        url:"/api/user/changePasswordForAdmin",
+        url:"./api/user/changePasswordForAdmin",
         params: {
         params: {
           password: this.newPassword,
           password: this.newPassword,
           userId: this.form.id,
           userId: this.form.id,

+ 1 - 1
web_src/src/components/dialog/changePushKey.vue

@@ -65,7 +65,7 @@ export default {
     onSubmit: function () {
     onSubmit: function () {
       this.$axios({
       this.$axios({
         method: 'post',
         method: 'post',
-        url:"/api/user/changePushKey",
+        url:"./api/user/changePushKey",
         params: {
         params: {
           pushKey: this.newPushKey,
           pushKey: this.newPushKey,
           userId: this.form.id,
           userId: this.form.id,

+ 1 - 1
web_src/src/components/dialog/channelMapInfobox.vue

@@ -44,7 +44,7 @@ export default {
       let that = this;
       let that = this;
       this.$axios({
       this.$axios({
         method: 'get',
         method: 'get',
-        url: '/api/play/start/' + deviceId + '/' + channelId
+        url: './api/play/start/' + deviceId + '/' + channelId
       }).then(function (res) {
       }).then(function (res) {
         that.isLoging = false;
         that.isLoging = false;
         if (res.data.code === 0) {
         if (res.data.code === 0) {

+ 1 - 1
web_src/src/components/dialog/chooseChannel.vue

@@ -98,7 +98,7 @@ export default {
 
 
             this.$axios({
             this.$axios({
                 method:"post",
                 method:"post",
-                url:"/api/platform/update_channel_for_gb",
+                url:"./api/platform/update_channel_for_gb",
                 data:{
                 data:{
                     platformId:  that.platformId,
                     platformId:  that.platformId,
                     channelReduces:  that.chooseData
                     channelReduces:  that.chooseData

+ 4 - 4
web_src/src/components/dialog/chooseChannelForCatalog.vue

@@ -82,7 +82,7 @@ export default {
             let that = this;
             let that = this;
             this.$axios({
             this.$axios({
                     method:"get",
                     method:"get",
-                    url:`/api/platform/catalog`,
+                    url:`./api/platform/catalog`,
                     params: {
                     params: {
                         platformId: that.platformId,
                         platformId: that.platformId,
                         parentId: parentId
                         parentId: parentId
@@ -134,7 +134,7 @@ export default {
         removeCatalog: function (id, node){
         removeCatalog: function (id, node){
           this.$axios({
           this.$axios({
             method:"delete",
             method:"delete",
-            url:`/api/platform/catalog/del`,
+            url:`./api/platform/catalog/del`,
             params: {
             params: {
               id: id,
               id: id,
               platformId: this.platformId,
               platformId: this.platformId,
@@ -156,7 +156,7 @@ export default {
         setDefaultCatalog: function (id){
         setDefaultCatalog: function (id){
           this.$axios({
           this.$axios({
             method:"post",
             method:"post",
-            url:`/api/platform/catalog/default/update`,
+            url:`./api/platform/catalog/default/update`,
             params: {
             params: {
               platformId: this.platformId,
               platformId: this.platformId,
               catalogId: id,
               catalogId: id,
@@ -201,7 +201,7 @@ export default {
                   onClick: () => {
                   onClick: () => {
                     this.$axios({
                     this.$axios({
                       method:"delete",
                       method:"delete",
-                      url:"/api/platform/catalog/relation/del",
+                      url:"./api/platform/catalog/relation/del",
                       data: data
                       data: data
                     }).then((res)=>{
                     }).then((res)=>{
                       console.log("移除成功")
                       console.log("移除成功")

+ 5 - 5
web_src/src/components/dialog/chooseChannelForGb.vue

@@ -121,7 +121,7 @@ export default {
           this.getCatalogFromUser((catalogId)=> {
           this.getCatalogFromUser((catalogId)=> {
             this.$axios({
             this.$axios({
               method:"post",
               method:"post",
-              url:"/api/platform/update_channel_for_gb",
+              url:"./api/platform/update_channel_for_gb",
               data:{
               data:{
                 platformId:  this.platformId,
                 platformId:  this.platformId,
                 all: all,
                 all: all,
@@ -149,7 +149,7 @@ export default {
 
 
             this.$axios({
             this.$axios({
               method:"delete",
               method:"delete",
-              url:"/api/platform/del_channel_for_gb",
+              url:"./api/platform/del_channel_for_gb",
               data:{
               data:{
                 platformId:  this.platformId,
                 platformId:  this.platformId,
                 all: all,
                 all: all,
@@ -248,7 +248,7 @@ export default {
 
 
             this.$axios({
             this.$axios({
                     method:"get",
                     method:"get",
-                    url:`/api/platform/channel_list`,
+                    url:`./api/platform/channel_list`,
                     params: {
                     params: {
                         page: that.currentPage,
                         page: that.currentPage,
                         count: that.count,
                         count: that.count,
@@ -290,7 +290,7 @@ export default {
         }).then(() => {
         }).then(() => {
           this.$axios({
           this.$axios({
             method:"delete",
             method:"delete",
-            url:"/api/platform/del_channel_for_gb",
+            url:"./api/platform/del_channel_for_gb",
             data:{
             data:{
               platformId:  this.platformId,
               platformId:  this.platformId,
               channelReduces: this.multipleSelection
               channelReduces: this.multipleSelection
@@ -310,7 +310,7 @@ export default {
 
 
           this.$axios({
           this.$axios({
             method: "post",
             method: "post",
-            url: "/api/platform/update_channel_for_gb",
+            url: "./api/platform/update_channel_for_gb",
             data: {
             data: {
               platformId: this.platformId,
               platformId: this.platformId,
               channelReduces: this.multipleSelection,
               channelReduces: this.multipleSelection,

+ 5 - 5
web_src/src/components/dialog/chooseChannelForStream.vue

@@ -134,7 +134,7 @@ export default {
           this.getCatalogFromUser((catalogId)=>{
           this.getCatalogFromUser((catalogId)=>{
             this.$axios({
             this.$axios({
               method:"post",
               method:"post",
-              url:"/api/gbStream/add",
+              url:"./api/gbStream/add",
               data:{
               data:{
                 platformId: this.platformId,
                 platformId: this.platformId,
                 catalogId: catalogId,
                 catalogId: catalogId,
@@ -163,7 +163,7 @@ export default {
 
 
             this.$axios({
             this.$axios({
               method:"delete",
               method:"delete",
-              url:"/api/gbStream/del",
+              url:"./api/gbStream/del",
               data:{
               data:{
                 platformId: this.platformId,
                 platformId: this.platformId,
                 all: all,
                 all: all,
@@ -186,7 +186,7 @@ export default {
 
 
             this.$axios({
             this.$axios({
                 method: 'get',
                 method: 'get',
-                url:`/api/gbStream/list`,
+                url:`./api/gbStream/list`,
                 params: {
                 params: {
                     page: that.currentPage,
                     page: that.currentPage,
                     count: that.count,
                     count: that.count,
@@ -222,7 +222,7 @@ export default {
           }).then(() => {
           }).then(() => {
             this.$axios({
             this.$axios({
               method:"delete",
               method:"delete",
-              url:"/api/gbStream/del",
+              url:"./api/gbStream/del",
               data:{
               data:{
                 platformId: this.platformId,
                 platformId: this.platformId,
                 gbStreams:  this.multipleSelection,
                 gbStreams:  this.multipleSelection,
@@ -242,7 +242,7 @@ export default {
           this.getCatalogFromUser((catalogId)=>{
           this.getCatalogFromUser((catalogId)=>{
             this.$axios({
             this.$axios({
               method:"post",
               method:"post",
-              url:"/api/gbStream/add",
+              url:"./api/gbStream/add",
               data:{
               data:{
                 platformId: this.platformId,
                 platformId: this.platformId,
                 catalogId: catalogId,
                 catalogId: catalogId,

+ 1 - 1
web_src/src/components/dialog/deviceEdit.vue

@@ -131,7 +131,7 @@ export default {
       this.form.mobilePositionSubmissionInterval = this.form.mobilePositionSubmissionInterval||0
       this.form.mobilePositionSubmissionInterval = this.form.mobilePositionSubmissionInterval||0
       this.$axios({
       this.$axios({
         method: 'post',
         method: 'post',
-        url:`/api/device/query/device/${this.isEdit?'update':'add'}/`,
+        url:`./api/device/query/device/${this.isEdit?'update':'add'}/`,
         params: this.form
         params: this.form
       }).then((res) => {
       }).then((res) => {
         console.log(res.data)
         console.log(res.data)

+ 7 - 7
web_src/src/components/dialog/devicePlayer.vue

@@ -320,7 +320,7 @@ export default {
             if (tab.name === "codec") {
             if (tab.name === "codec") {
                 this.$axios({
                 this.$axios({
                     method: 'get',
                     method: 'get',
-                    url: '/zlm/' +this.mediaServerId+ '/index/api/getMediaInfo?vhost=__defaultVhost__&schema=rtsp&app='+ this.app +'&stream='+ this.streamId
+                    url: './zlm/' +this.mediaServerId+ '/index/api/getMediaInfo?vhost=__defaultVhost__&schema=rtsp&app='+ this.app +'&stream='+ this.streamId
                 }).then(function (res) {
                 }).then(function (res) {
                     that.tracksLoading = false;
                     that.tracksLoading = false;
                     if (res.data.code == 0 && res.data.tracks) {
                     if (res.data.code == 0 && res.data.tracks) {
@@ -397,7 +397,7 @@ export default {
             this.$refs[this.activePlayer].pause()
             this.$refs[this.activePlayer].pause()
             that.$axios({
             that.$axios({
                 method: 'post',
                 method: 'post',
-                url: '/api/play/convert/' + that.streamId
+                url: './api/play/convert/' + that.streamId
                 }).then(function (res) {
                 }).then(function (res) {
                     if (res.data.code === 0) {
                     if (res.data.code === 0) {
                         that.convertKey = res.data.key;
                         that.convertKey = res.data.key;
@@ -434,7 +434,7 @@ export default {
             that.$refs.videoPlayer.pause()
             that.$refs.videoPlayer.pause()
             this.$axios({
             this.$axios({
                 method: 'post',
                 method: 'post',
-                url: '/api/play/convertStop/' + this.convertKey
+                url: './api/play/convertStop/' + this.convertKey
               }).then(function (res) {
               }).then(function (res) {
                 if (res.data.code == 0) {
                 if (res.data.code == 0) {
                   console.log(res.data.msg)
                   console.log(res.data.msg)
@@ -494,7 +494,7 @@ export default {
             let that = this;
             let that = this;
             this.$axios({
             this.$axios({
                 method: 'post',
                 method: 'post',
-                url: '/api/ptz/control/' + this.deviceId + '/' + this.channelId + '?command=' + command + '&horizonSpeed=' + this.controSpeed + '&verticalSpeed=' + this.controSpeed + '&zoomSpeed=' + this.controSpeed
+                url: './api/ptz/control/' + this.deviceId + '/' + this.channelId + '?command=' + command + '&horizonSpeed=' + this.controSpeed + '&verticalSpeed=' + this.controSpeed + '&zoomSpeed=' + this.controSpeed
             }).then(function (res) {});
             }).then(function (res) {});
         },
         },
         //////////////////////播放器事件处理//////////////////////////
         //////////////////////播放器事件处理//////////////////////////
@@ -506,7 +506,7 @@ export default {
             let that = this;
             let that = this;
             this.$axios({
             this.$axios({
                 method: 'post',
                 method: 'post',
-                url: '/api/ptz/front_end_command/' + this.deviceId + '/' + this.channelId + '?cmdCode=' + cmdCode + '&parameter1=0&parameter2=' + presetPos + '&combindCode2=0'
+                url: './api/ptz/front_end_command/' + this.deviceId + '/' + this.channelId + '?cmdCode=' + cmdCode + '&parameter1=0&parameter2=' + presetPos + '&combindCode2=0'
             }).then(function (res) {});
             }).then(function (res) {});
         },
         },
         setSpeedOrTime: function (cmdCode, groupNum, parameter) {
         setSpeedOrTime: function (cmdCode, groupNum, parameter) {
@@ -516,7 +516,7 @@ export default {
             console.log('前端控制:0x' + cmdCode.toString(16) + ' 0x' + groupNum.toString(16) + ' 0x' + parameter2.toString(16) + ' 0x' + combindCode2.toString(16));
             console.log('前端控制:0x' + cmdCode.toString(16) + ' 0x' + groupNum.toString(16) + ' 0x' + parameter2.toString(16) + ' 0x' + combindCode2.toString(16));
             this.$axios({
             this.$axios({
                 method: 'post',
                 method: 'post',
-                url: '/api/ptz/front_end_command/' + this.deviceId + '/' + this.channelId + '?cmdCode=' + cmdCode + '&parameter1=' + groupNum + '&parameter2=' + parameter2 + '&combindCode2=' + combindCode2
+                url: './api/ptz/front_end_command/' + this.deviceId + '/' + this.channelId + '?cmdCode=' + cmdCode + '&parameter1=' + groupNum + '&parameter2=' + parameter2 + '&combindCode2=' + combindCode2
             }).then(function (res) {});
             }).then(function (res) {});
         },
         },
         setCommand: function (cmdCode, groupNum, parameter) {
         setCommand: function (cmdCode, groupNum, parameter) {
@@ -524,7 +524,7 @@ export default {
             console.log('前端控制:0x' + cmdCode.toString(16) + ' 0x' + groupNum.toString(16) + ' 0x' + parameter.toString(16) + ' 0x0');
             console.log('前端控制:0x' + cmdCode.toString(16) + ' 0x' + groupNum.toString(16) + ' 0x' + parameter.toString(16) + ' 0x0');
             this.$axios({
             this.$axios({
                 method: 'post',
                 method: 'post',
-                url: '/api/ptz/front_end_command/' + this.deviceId + '/' + this.channelId + '?cmdCode=' + cmdCode + '&parameter1=' + groupNum + '&parameter2=' + parameter + '&combindCode2=0'
+                url: './api/ptz/front_end_command/' + this.deviceId + '/' + this.channelId + '?cmdCode=' + cmdCode + '&parameter1=' + groupNum + '&parameter2=' + parameter + '&combindCode2=0'
             }).then(function (res) {});
             }).then(function (res) {});
         },
         },
         copyUrl: function (dropdownItem){
         copyUrl: function (dropdownItem){

+ 2 - 2
web_src/src/components/dialog/getCatalog.vue

@@ -89,7 +89,7 @@ export default {
             let that = this;
             let that = this;
             this.$axios({
             this.$axios({
                     method:"get",
                     method:"get",
-                    url:`/api/platform/catalog`,
+                    url:`./api/platform/catalog`,
                     params: {
                     params: {
                         platformId: that.platformId,
                         platformId: that.platformId,
                         parentId: parentId
                         parentId: parentId
@@ -111,7 +111,7 @@ export default {
           if (node.level === 0) {
           if (node.level === 0) {
             this.$axios({
             this.$axios({
               method:"get",
               method:"get",
-              url:`/api/platform/info/` + this.platformId,
+              url:`./api/platform/info/` + this.platformId,
             })
             })
               .then((res)=> {
               .then((res)=> {
                 if (res.data.code === 0) {
                 if (res.data.code === 0) {

+ 1 - 1
web_src/src/components/dialog/importChannel.vue

@@ -60,7 +60,7 @@ export default {
       console.log(this.form);
       console.log(this.form);
       this.$axios({
       this.$axios({
         method:"post",
         method:"post",
-        url:`/api/platform/catalog/${!this.isEdit? "add":"edit"}`,
+        url:`./api/platform/catalog/${!this.isEdit? "add":"edit"}`,
         data: this.form
         data: this.form
       })
       })
         .then((res)=> {
         .then((res)=> {

+ 1 - 1
web_src/src/components/dialog/onvifEdit.vue

@@ -81,7 +81,7 @@ export default {
       console.log(this.form);
       console.log(this.form);
       this.$axios({
       this.$axios({
         method: 'get',
         method: 'get',
-        url:`api/onvif/rtsp`,
+        url:`./api/onvif/rtsp`,
         params: {
         params: {
           hostname: this.form.hostName,
           hostname: this.form.hostName,
           timeout: 3000,
           timeout: 3000,

+ 3 - 3
web_src/src/components/dialog/platformEdit.vue

@@ -138,7 +138,7 @@ export default {
       showDialog: false,
       showDialog: false,
       isLoging: false,
       isLoging: false,
       onSubmit_text: "立即创建",
       onSubmit_text: "立即创建",
-      saveUrl: "/api/platform/save",
+      saveUrl: "./api/platform/save",
 
 
       platform: {
       platform: {
         id: null,
         id: null,
@@ -192,7 +192,7 @@ export default {
         this.saveUrl = "/api/platform/add";
         this.saveUrl = "/api/platform/add";
         this.$axios({
         this.$axios({
           method: 'get',
           method: 'get',
-          url:`/api/platform/server_config`
+          url:`./api/platform/server_config`
         }).then(function (res) {
         }).then(function (res) {
           console.log(res);
           console.log(res);
           if (res.data.code === 0) {
           if (res.data.code === 0) {
@@ -315,7 +315,7 @@ export default {
       var that = this;
       var that = this;
       await that.$axios({
       await that.$axios({
                 method: 'get',
                 method: 'get',
-                url:`/api/platform/exit/${deviceGbId}`})
+                url:`./api/platform/exit/${deviceGbId}`})
         .then(function (res) {
         .then(function (res) {
             if (res.data.code === 0) {
             if (res.data.code === 0) {
               result = res.data.data;
               result = res.data.data;

+ 3 - 3
web_src/src/components/dialog/pushStreamEdit.vue

@@ -109,7 +109,7 @@ export default {
       if (this.edit) {
       if (this.edit) {
         this.$axios({
         this.$axios({
           method:"post",
           method:"post",
-          url:`/api/push/save_to_gb`,
+          url:`./api/push/save_to_gb`,
           data: this.proxyParam
           data: this.proxyParam
         }).then( (res) => {
         }).then( (res) => {
           if (res.data.code === 0) {
           if (res.data.code === 0) {
@@ -129,7 +129,7 @@ export default {
       }else {
       }else {
         this.$axios({
         this.$axios({
           method:"post",
           method:"post",
-          url:`/api/push/add`,
+          url:`./api/push/add`,
           data: this.proxyParam
           data: this.proxyParam
         }).then( (res) => {
         }).then( (res) => {
           if (res.data.code === 0) {
           if (res.data.code === 0) {
@@ -159,7 +159,7 @@ export default {
       var that = this;
       var that = this;
       await that.$axios({
       await that.$axios({
         method:"get",
         method:"get",
-        url:`/api/platform/exit/${deviceGbId}`
+        url:`./api/platform/exit/${deviceGbId}`
       }).then(function (res) {
       }).then(function (res) {
         result = res.data;
         result = res.data;
       }).catch(function (error) {
       }).catch(function (error) {

+ 1 - 1
web_src/src/components/dialog/queryTrace.vue

@@ -72,7 +72,7 @@ export default {
     onSubmit: function () {
     onSubmit: function () {
       console.log("onSubmit");
       console.log("onSubmit");
       this.isLoging = true;
       this.isLoging = true;
-      let url = `/api/position/history/${this.channel.deviceId}?start=${this.searchFrom}&end=${this.searchTo}`;
+      let url = `./api/position/history/${this.channel.deviceId}?start=${this.searchFrom}&end=${this.searchTo}`;
       if (this.channel.channelId) {
       if (this.channel.channelId) {
         url+="&channelId=${this.channel.channelId}"
         url+="&channelId=${this.channel.channelId}"
       }
       }

+ 4 - 4
web_src/src/components/dialog/recordDownload.vue

@@ -71,7 +71,7 @@ export default {
         getProgress: function (callback){
         getProgress: function (callback){
           this.$axios({
           this.$axios({
             method: 'get',
             method: 'get',
-            url: `/api/gb_record/download/progress/${this.deviceId}/${this.channelId}/${this.stream}`
+            url: `./api/gb_record/download/progress/${this.deviceId}/${this.channelId}/${this.stream}`
           }).then((res)=> {
           }).then((res)=> {
             console.log(res)
             console.log(res)
               if (res.data.code === 0) {
               if (res.data.code === 0) {
@@ -124,7 +124,7 @@ export default {
         stopDownloadRecord: function (callback) {
         stopDownloadRecord: function (callback) {
           this.$axios({
           this.$axios({
             method: 'get',
             method: 'get',
-            url: '/api/gb_record/download/stop/' + this.deviceId + "/" + this.channelId+ "/" + this.stream
+            url: './api/gb_record/download/stop/' + this.deviceId + "/" + this.channelId+ "/" + this.stream
           }).then((res)=> {
           }).then((res)=> {
             if (callback) callback(res)
             if (callback) callback(res)
           });
           });
@@ -132,7 +132,7 @@ export default {
         getFileDownload: function (){
         getFileDownload: function (){
           this.$axios({
           this.$axios({
             method: 'get',
             method: 'get',
-            url:`/record_proxy/${this.mediaServerId}/api/record/file/download/task/add`,
+            url:`./record_proxy/${this.mediaServerId}/api/record/file/download/task/add`,
             params: {
             params: {
               app: this.app,
               app: this.app,
               stream: this.stream,
               stream: this.stream,
@@ -164,7 +164,7 @@ export default {
         getProgressForFile: function (callback){
         getProgressForFile: function (callback){
           this.$axios({
           this.$axios({
             method: 'get',
             method: 'get',
-            url:`/record_proxy/${this.mediaServerId}/api/record/file/download/task/list`,
+            url:`./record_proxy/${this.mediaServerId}/api/record/file/download/task/list`,
             params: {
             params: {
               app: this.app,
               app: this.app,
               stream: this.stream,
               stream: this.stream,

+ 1 - 1
web_src/src/components/live.vue

@@ -135,7 +135,7 @@ export default {
       this.loading = true
       this.loading = true
       this.$axios({
       this.$axios({
         method: 'get',
         method: 'get',
-        url: '/api/play/start/' + deviceId + '/' + channelId
+        url: './api/play/start/' + deviceId + '/' + channelId
       }).then(function (res) {
       }).then(function (res) {
         if (res.data.code === 0 && res.data.data) {
         if (res.data.code === 0 && res.data.data) {
           let videoUrl;
           let videoUrl;

+ 1 - 1
web_src/src/components/map.vue

@@ -298,7 +298,7 @@ export default {
       let that = this;
       let that = this;
       this.$axios({
       this.$axios({
         method: 'get',
         method: 'get',
-        url: '/api/play/start/' + deviceId + '/' + channelId
+        url: './api/play/start/' + deviceId + '/' + channelId
       }).then(function (res) {
       }).then(function (res) {
         that.isLoging = false;
         that.isLoging = false;
         if (res.data.code === 0) {
         if (res.data.code === 0) {

+ 5 - 5
web_src/src/components/service/DeviceService.js

@@ -9,7 +9,7 @@ class DeviceService{
   getDeviceList(currentPage, count, callback, errorCallback){
   getDeviceList(currentPage, count, callback, errorCallback){
     this.$axios({
     this.$axios({
       method: 'get',
       method: 'get',
-      url:`/api/device/query/devices`,
+      url:`./api/device/query/devices`,
       params: {
       params: {
         page: currentPage,
         page: currentPage,
         count: count
         count: count
@@ -25,7 +25,7 @@ class DeviceService{
   getDevice(deviceId, callback, errorCallback){
   getDevice(deviceId, callback, errorCallback){
     this.$axios({
     this.$axios({
       method: 'get',
       method: 'get',
-      url:`/api/device/query/devices/${deviceId}`,
+      url:`./api/device/query/devices/${deviceId}`,
     }).then((res) => {
     }).then((res) => {
       if (typeof (callback) == "function") callback(res.data)
       if (typeof (callback) == "function") callback(res.data)
     }).catch((error) => {
     }).catch((error) => {
@@ -82,7 +82,7 @@ class DeviceService{
   getChanel(isCatalog, catalogUnderDevice, deviceId, currentPage, count, callback, errorCallback) {
   getChanel(isCatalog, catalogUnderDevice, deviceId, currentPage, count, callback, errorCallback) {
     this.$axios({
     this.$axios({
       method: 'get',
       method: 'get',
-      url: `/api/device/query/devices/${deviceId}/channels`,
+      url: `./api/device/query/devices/${deviceId}/channels`,
       params:{
       params:{
         page: currentPage,
         page: currentPage,
         count: count,
         count: count,
@@ -121,7 +121,7 @@ class DeviceService{
   getSubChannel(isCatalog, deviceId, channelId, currentPage, count, callback, errorCallback) {
   getSubChannel(isCatalog, deviceId, channelId, currentPage, count, callback, errorCallback) {
     this.$axios({
     this.$axios({
       method: 'get',
       method: 'get',
-      url: `/api/device/query/sub_channels/${deviceId}/${channelId}/channels`,
+      url: `./api/device/query/sub_channels/${deviceId}/${channelId}/channels`,
       params:{
       params:{
         page: currentPage,
         page: currentPage,
         count: count,
         count: count,
@@ -161,7 +161,7 @@ class DeviceService{
     }
     }
     this.$axios({
     this.$axios({
       method: 'get',
       method: 'get',
-      url: `/api/device/query/tree/${deviceId}`,
+      url: `./api/device/query/tree/${deviceId}`,
       params:{
       params:{
         page: currentPage,
         page: currentPage,
         count: count,
         count: count,

+ 7 - 7
web_src/src/components/service/MediaServer.js

@@ -9,7 +9,7 @@ class MediaServer{
   getOnlineMediaServerList(callback){
   getOnlineMediaServerList(callback){
     this.$axios({
     this.$axios({
       method: 'get',
       method: 'get',
-      url:`/api/server/media_server/online/list`,
+      url:`./api/server/media_server/online/list`,
     }).then((res) => {
     }).then((res) => {
       if (typeof (callback) == "function") callback(res.data)
       if (typeof (callback) == "function") callback(res.data)
     }).catch((error) => {
     }).catch((error) => {
@@ -19,7 +19,7 @@ class MediaServer{
   getMediaServerList(callback){
   getMediaServerList(callback){
     this.$axios({
     this.$axios({
       method: 'get',
       method: 'get',
-      url:`/api/server/media_server/list`,
+      url:`./api/server/media_server/list`,
     }).then(function (res) {
     }).then(function (res) {
       if (typeof (callback) == "function") callback(res.data)
       if (typeof (callback) == "function") callback(res.data)
     }).catch(function (error) {
     }).catch(function (error) {
@@ -30,7 +30,7 @@ class MediaServer{
   getMediaServer(id, callback){
   getMediaServer(id, callback){
     this.$axios({
     this.$axios({
       method: 'get',
       method: 'get',
-      url:`/api/server/media_server/one/` + id,
+      url:`./api/server/media_server/one/` + id,
     }).then(function (res) {
     }).then(function (res) {
       if (typeof (callback) == "function") callback(res.data)
       if (typeof (callback) == "function") callback(res.data)
     }).catch(function (error) {
     }).catch(function (error) {
@@ -41,7 +41,7 @@ class MediaServer{
   checkServer(param, callback){
   checkServer(param, callback){
     this.$axios({
     this.$axios({
       method: 'get',
       method: 'get',
-      url:`/api/server/media_server/check`,
+      url:`./api/server/media_server/check`,
       params: {
       params: {
         ip: param.ip,
         ip: param.ip,
         port: param.httpPort,
         port: param.httpPort,
@@ -57,7 +57,7 @@ class MediaServer{
   checkRecordServer(param, callback){
   checkRecordServer(param, callback){
     this.$axios({
     this.$axios({
       method: 'get',
       method: 'get',
-      url:`/api/server/media_server/record/check`,
+      url:`./api/server/media_server/record/check`,
       params: {
       params: {
         ip: param.ip,
         ip: param.ip,
         port: param.recordAssistPort
         port: param.recordAssistPort
@@ -72,7 +72,7 @@ class MediaServer{
   addServer(param, callback){
   addServer(param, callback){
     this.$axios({
     this.$axios({
       method: 'post',
       method: 'post',
-      url:`/api/server/media_server/save`,
+      url:`./api/server/media_server/save`,
       data: param
       data: param
     }).then(function (res) {
     }).then(function (res) {
       if (typeof (callback) == "function") callback(res.data)
       if (typeof (callback) == "function") callback(res.data)
@@ -84,7 +84,7 @@ class MediaServer{
   delete(id, callback) {
   delete(id, callback) {
     this.$axios({
     this.$axios({
       method: 'delete',
       method: 'delete',
-      url:`/api/server/media_server/delete`,
+      url:`./api/server/media_server/delete`,
       params: {
       params: {
         id: id
         id: id
       }
       }