فهرست منبع

调整服务的端口,减少冲突的概率

jishenghua 2 ماه پیش
والد
کامیت
d9f6f94b69

+ 4 - 4
gyj-iot-boot/gyjiot-admin/src/main/resources/application.yml

@@ -11,7 +11,7 @@ gyjiot:
 
 # 开发环境配置
 server:
-  port: 8080                # 服务器的HTTP端口,默认为8080
+  port: 38080                # 服务器的HTTP端口,默认为38080
   servlet:
     context-path: /         # 应用的访问路径
   tomcat:
@@ -23,8 +23,8 @@ server:
   # 基于netty的服务器
   broker:
     broker-node: node1
-    port: 1883
-    websocket-port: 8083
+    port: 31883
+    websocket-port: 38083
     websocket-path: /mqtt
     keep-alive: 70           # 默认的全部客户端心跳上传时间
 
@@ -113,4 +113,4 @@ sip:
   port: 35060                                # SIP端口(保持默认)
   domain: 3402000000                        # 由省级、市级、区级、基层编号组成
   id: 34020000002000000001                  # 同上,另外增加编号,(可保持默认)
-  password: 12345678                        # 监控设备接入的密码
+  password: 12345678                        # 监控设备接入的密码

+ 2 - 2
gyj-iot-web/.env.development

@@ -11,7 +11,7 @@ VITE_APP_BASE_API = '/dev-api'
 VITE_CLI_BABEL_TRANSPILE_MODULES = true
 
 # 后端接口地址
-VITE_APP_SERVER_API_URL = 'http://localhost:8080/'
+VITE_APP_SERVER_API_URL = 'http://localhost:38080/'
 
 # Mqtt消息服务器连接地址
-VITE_APP_MQTT_SERVER_URL = 'ws://localhost:8083/mqtt'
+VITE_APP_MQTT_SERVER_URL = 'ws://localhost:38083/mqtt'

+ 1 - 1
gyj-iot-web/src/utils/mqttTool.js

@@ -20,7 +20,7 @@ mqttTool.connect = function () {
   if (url == '') {
     console.log('自动获取mqtt连接地址');
     if (window.location.protocol === 'http:') {
-      url = 'ws://' + window.location.hostname + ':8083/mqtt';
+      url = 'ws://' + window.location.hostname + ':38083/mqtt';
     } else {
       url = 'wss://' + window.location.hostname + '/mqtt';
     }

+ 1 - 1
gyj-iot-web/src/views/iot/sip/mediaServer-edit.vue

@@ -250,7 +250,7 @@ function checkServer() {
           mediaServerForm.value.tenantId = tempTenantId.value;
           mediaServerForm.value.tenantName = tempTenantName.value;
           mediaServerForm.value.serverId = 'gyjiot';
-          mediaServerForm.value.hookurl = 'java:8080';
+          mediaServerForm.value.hookurl = 'java:38080';
           mediaServerForm.value.portHttps = 8443;
           mediaServerForm.value.recordPort = 18081;
           mediaServerForm.value.portRtmp = 1935;

+ 1 - 1
gyj-iot-web/vite.config.js

@@ -31,7 +31,7 @@ export default defineConfig(({ mode, command }) => {
       proxy: {
         // https://cn.vitejs.dev/config/#server-proxy
         '/dev-api': {
-          target: 'http://localhost:8080',
+          target: 'http://localhost:38080',
           // target: 'https://api.wzs.pub/mock/13',
           changeOrigin: true,
           rewrite: (p) => p.replace(/^\/dev-api/, '')