音视频

2023-11-22 19:23:20 +08:00
parent 9a57e4aaab
commit 5a5f97c357
22 changed files with 13599 additions and 513 deletions
--- a/hd-glasses-app/package-lock.json
+++ b/hd-glasses-app/package-lock.json
--- a/hd-glasses-app/package.json
+++ b/hd-glasses-app/package.json
@@ -3,6 +3,7 @@
  "version": "0.1.0",
  "private": true,
  "scripts": {
+    "server": "vue-cli-service serve --mode dev",
    "local-server": "vue-cli-service serve --mode local",
    "serve": "vue-cli-service serve --mode dev",
    "prod-serve": "vue-cli-service serve --mode hd",
--- a/hd-glasses-app/public/index.html
+++ b/hd-glasses-app/public/index.html
@@ -3,7 +3,7 @@
 <head>
    <script type="text/javascript" src="./vconsole.min.js"></script>
    <script>
-        var vConsole = new VConsole();
+        // var vConsole = new VConsole();
        console.log('Hello world');
    </script>
    <meta charset="utf-8">
--- a/hd-glasses-app/src/pages/call_room.vue
+++ b/hd-glasses-app/src/pages/call_room.vue
@@ -86,6 +86,10 @@ export default {
      showConfirmDialog: 0,
      inviteName: 0,
      showInviteConfirmDialog: 0,
+      videoTitle:"视频",
+      tuid:"",
+      isForce:"0",
+      hasVideo:"1"
    };
  },
  mounted() {
@@ -96,6 +100,7 @@ export default {
    this.isPublish = getUrlParam("isPublish");
    this.isPlayer = getUrlParam("isPlayer");
    this.uid = getUrlParam("uid");
+    this.tuid = getUrlParam("tuid");
    this.uname = getUrlParam("uname");
    this.roomId = getUrlParam("room");
    this.inviteName = getUrlParam("inviteName");
@@ -103,6 +108,10 @@ export default {
    this.topVideo = getUrlParam("uid");
    this.showConfirmDialog = getUrlParam("showConfirmDialog");
    this.showInviteConfirmDialog = getUrlParam("showInviteConfirmDialog");
+    this.hasVideo = getUrlParam("hasVideo");
+    this.isForce = getUrlParam("isForce");
+
+

    this.voiceImg = getStatisFileUrl("/media/voice_open.png")
    this.cameraImg = getStatisFileUrl("/media/camera_open.png")
@@ -114,6 +123,7 @@ export default {
      this.constraints.video = false
      this.isCloseCamera = true
      this.cameraImg = getStatisFileUrl("/media/camera_close.png")
+      this.videoTitle="语音"

    }

@@ -125,23 +135,25 @@ export default {
    if (this.showConfirmDialog == 1) {
      Dialog.confirm({
        title: '是否接受？',
-        message: `${this.inviteName}邀请你加入视频聊天`,
+        message: `${this.inviteName}邀请你加入${this.videoTitle}聊天`,
      })
          .then(() => {
            this.init();
            // on confirm
          })
          .catch(() => {
+            this.videoDownAction();
            location.href = "uniwebview://action?function=refuseVideoInvite";
            // on cancel
          });
    } else if (this.showInviteConfirmDialog == 1) {
      Dialog.confirm({
        title: '提示',
-        message: `确认是否发起视频聊天？`,
+        message: `确认是否发起${this.videoTitle}聊天？`,
      }).then(() => {
        console.log("确认")
        try {
+          this.sendInvite();
          this.init();
        } catch (e) {
          console.log(e)
@@ -150,6 +162,7 @@ export default {
      })
          .catch(() => {
            console.log("取消")
+            this.videoDownAction();
            window.history.go(-1);
            // on cancel
          });
@@ -165,6 +178,37 @@ export default {
    this.leaveRoom();
  },
  methods: {
+    sendInvite(){
+
+         let roomInfo = {
+              roomId: this.uid,//后面改成发起人的手机号或者id
+              roomName: `${this.uname}发起的视频聊天`,
+              creatorId: this.uid,
+              creatorName: this.uname,
+              publishId: this.uid,
+              publishName: this.uname,
+              isOver: 0,
+              webrtcUrl: process.env.VUE_APP_SRS_URL + this.uid + "/" + this.uid,
+              invitedUserList: [this.tuid],
+              isForce:this.isForce,
+              hasVideo:this.hasVideo
+            }
+
+
+            service.post(`/api/im/app/wsMsg`, {
+              msgType: "10000",
+              msgId: JSON.stringify(roomInfo),
+              cmd: "invite",
+              msgTxt: this.uname || ""
+            }).then((res) => {
+              if (res.status == 200) {
+
+              }
+            })
+
+
+
+    },
    init() {
      Notify({
        message: '如视频不能播放，请点击视频列表中对应的用户上方的小视频',
@@ -330,6 +374,7 @@ export default {
      }
      sdk = new SrsRtcPlayerAsync();

+      //如果 默认指定id跟流的发布id相同，则指定流
      if (this.topVideo == publishId) {
        const topVideo = this.$refs.videoStreamtopVideo
        topVideo.srcObject = sdk.stream;
@@ -337,11 +382,21 @@ export default {
          topVideo.volume = 0
          topVideo.play();
        };
+      }else {
+         if(this.isPublish==0){
+           const topVideo = this.$refs.videoStreamtopVideo
+           topVideo.srcObject = sdk.stream;
+           topVideo.onloadedmetadata = function (e) {
+             topVideo.volume = 0
+             topVideo.play();
+           };
+         }
      }


      video.srcObject = sdk.stream;
      video.onloadedmetadata = function (e) {
+        // 播放自己的视频流的时候静音
        if (publishId == _this.uid)
          video.volume = 0
        video.play();
--- a/hd-glasses-app/src/pages/hd_map.vue
+++ b/hd-glasses-app/src/pages/hd_map.vue
@@ -60,7 +60,9 @@ import {OL as ol} from "plot-ol/plottingol";
 import GeoJSON from 'ol/format/GeoJSON'
 import service from "@/utils/service";
 import {appInit, getStatisFileUrl, getUrlParam} from "../utils/publicFun";
-
+import WMTSTileGrid from 'ol/tilegrid/WMTS.js';
+import {get as getProjection} from 'ol/proj.js';
+import {getTopLeft, getWidth} from 'ol/extent.js';

 export default {
  data() {
@@ -123,13 +125,15 @@ export default {
      planningVectorLayer: {},
      parentPostMessageData: [],
      isCanDraw: true,
+      from:""
    };
  },
  mounted() {
    console.log(location.href)

-    this.page = this.$route.query.page;
-    this.pageType = this.$route.query.type;
+    this.page = getUrlParam("page");
+    this.pageType = getUrlParam("type");
+    this.from = getUrlParam("from");

    this.token = getUrlParam("token")
    if (this.token !=null) {
@@ -159,6 +163,11 @@ export default {
        window.addEventListener('message', (event) => {
          this.isCanDraw = false
          if (this.parentPostMessageData.length == 0) {
+            try {
+              console.error(event.data)
+            }catch (e) {
+
+            }
            this.map.removeLayer(this.drawPlanningPathLayer);
            this.parentPostMessageData = event.data;
            this.drawPcPostMessageDataLayer()
@@ -172,9 +181,15 @@ export default {
        window.addEventListener('message', (event) => {
          this.isCanDraw = false
          if (this.parentPostMessageData.length == 0) {
+
+            if(event.data instanceof Array){
              this.map.removeLayer(this.drawPlanningPathLayer);
              this.parentPostMessageData = event.data;
              this.drawPcPostMessageDataLayer()
+            }else {
+              this.isCanDraw=true;
+            }
+
          }
        });
        //处理ok
@@ -264,6 +279,62 @@ export default {
        })
      });

+
+      // 切片方案（0-18级
+      const projection = getProjection('EPSG:3857');
+      const projectionExtent = projection.getExtent();
+      const size = getWidth(projectionExtent) / 256;
+      const resolutions = new Array(19);
+      const matrixIds = new Array(19);
+      for (let z = 0; z < 19; ++z) {
+        resolutions[z] = size / Math.pow(2, z);
+        matrixIds[z] = "EPSG:3857:" + z;
+      }
+
+
+
+      var style = '';
+      var format = 'image/png';
+      var layerName = 'china:yangjianghedian_dt';
+      let baseParams = ['VERSION', 'LAYER', 'STYLE', 'TILEMATRIX', 'TILEMATRIXSET', 'SERVICE', 'FORMAT'];
+
+      let params = {
+        'VERSION': '1.0.0',
+        'LAYER': layerName,
+        'STYLE': style,
+        'TILEMATRIX': matrixIds,
+        'TILEMATRIXSET': projection,
+        'SERVICE': 'WMTS',
+        'FORMAT': format
+      };
+      var url = process.env.VUE_APP_MAP_URL + "/gwc/service/wmts?authkey=" + process.env.VUE_APP_MAP_AUTHKEY+"&"
+      for (var param in params) {
+        if (baseParams.indexOf(param.toUpperCase()) < 0) {
+          url = url + param + '=' + params[param] + '&';
+        }
+      }
+      url = url.slice(0, -1);
+
+
+      const wmtsLayer_1 = new TileLayer({
+        opacity: 1, //图层透明度
+        source: new WMTS({
+          url: url,
+          layer: "china:yangjianghedian_dt",
+          matrixSet: 'EPSG:3857',
+          format: 'image/png', // 默认：'image/jpeg'
+          projection: projection,
+          tileGrid: new WMTSTileGrid({
+            origin: getTopLeft(projectionExtent),
+            resolutions: resolutions,
+            matrixIds: matrixIds,
+          }),
+          style: '',
+          wrapX: true
+        })
+      });
+
+
      this.map = new Map({
        target: "map",
        layers: [
@@ -272,13 +343,14 @@ export default {
          //     url: "http://map.geoq.cn/ArcGIS/rest/services/ChinaOnlineStreetPurplishBlue/MapServer/tile/{z}/{y}/{x}",
          //   }),
          // }),
-          wmsLayer_1,
+          wmtsLayer_1,
          wmsLayer_0,
        ],
        view: new View({
-          projection: "EPSG:3857",
+          resolutions: resolutions,
+          projection: projection,
          center: [12497018.585823221, 2476783.2447665134],
-          zoom: 15,
+          zoom: 16,
        }),
      });
      this.map.on('singleclick', e => {
@@ -480,7 +552,14 @@ export default {
      const center = ol.proj.transform(this.selectPoint, 'EPSG:3857', 'EPSG:4326');
      console.log("================center: " + JSON.stringify(center))
      const result = JSON.stringify(center)
+
+
+      if(this.from=="pc"){
+        window.parent.postMessage(result, "*");
+      }else {
        location.href = "uniwebview://action?function=addAlarmPoint&params1=" + result;
+      }
+
    },
    pcPlanningPath() {
      //https://blog.csdn.net/Raccon_/article/details/127491268
@@ -552,12 +631,16 @@ export default {
              let pointList = []

              featureGeoJson.geometry.coordinates.map(item => {
-                const _item = ol.proj.transform(item, 'EPSG:3857', 'EPSG:4326');
-                pointList.push(_item)
+                console.log(item)
+                item.map(_item => {
+                  const _item1 = ol.proj.transform(_item, 'EPSG:3857', 'EPSG:4326');
+                  pointList.push(_item1)
+                })
+
              })
              console.log(pointList)

-              window.parent.postMessage(JSON.stringify(pointList), "*");
+              window.parent.postMessage(JSON.stringify([pointList]), "*");

            })
            .catch(() => {
@@ -833,6 +916,8 @@ export default {
    drawPcPostMessageDataLayer() {
      const tempGeometryList = []

+      console.log(this.parentPostMessageData)
+
      this.parentPostMessageData.map(item => {
        tempGeometryList.push(ol.proj.transform(item, 'EPSG:4326', 'EPSG:3857'))
      })
--- a/hd-glasses-app/src/pages/hd_show_current_patrol_history.vue
+++ b/hd-glasses-app/src/pages/hd_show_current_patrol_history.vue
--- a/hs-im-app-server/logs/mylog.log.2023-10-20.log
+++ b/hs-im-app-server/logs/mylog.log.2023-10-20.log
@@ -0,0 +1,12 @@
+2023-10-20 17:24:09 -Starting AppServiceApplication on luojie with PID 126036 (E:\workplace\huashi_project\im-system\hs-im-app-server\target\classes started by coolp in E:\workplace\huashi_project\im-system\hs-im-app-server)
+2023-10-20 17:24:09 -The following profiles are active: dev
+2023-10-20 17:24:10 -Tomcat initialized with port(s): 8989 (http)
+2023-10-20 17:24:10 -Initializing ProtocolHandler ["http-nio-8989"]
+2023-10-20 17:24:10 -Starting service [Tomcat]
+2023-10-20 17:24:10 -Starting Servlet engine: [Apache Tomcat/9.0.37]
+2023-10-20 17:24:10 -Initializing Spring embedded WebApplicationContext
+2023-10-20 17:24:10 -Root WebApplicationContext: initialization completed in 890 ms
+2023-10-20 17:24:12 -Initializing ExecutorService 'applicationTaskExecutor'
+2023-10-20 17:24:13 -Starting ProtocolHandler ["http-nio-8989"]
+2023-10-20 17:24:13 -Tomcat started on port(s): 8989 (http) with context path ''
+2023-10-20 17:24:13 -Started AppServiceApplication in 4.166 seconds (JVM running for 5.485)
--- a/hs-im-server/im-common/im-common.iml
+++ b/hs-im-server/im-common/im-common.iml
@@ -1,74 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+<module version="4">
  <component name="FacetManager">
    <facet type="Spring" name="Spring">
      <configuration />
    </facet>
  </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
-    <output url="file://$MODULE_DIR$/target/classes" />
-    <output-test url="file://$MODULE_DIR$/target/test-classes" />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <excludeFolder url="file://$MODULE_DIR$/target" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.3.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.3.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context:5.2.8.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.2.8.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.2.8.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.2.8.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.3.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: jakarta.annotation:jakarta.annotation-api:1.3.5" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-core:5.2.8.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.2.8.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.9" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.13" level="project" />
-    <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" />
-    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.14" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.12.0" level="project" />
-    <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.30" level="project" />
-    <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" />
-    <orderEntry type="library" name="Maven: ch.qos.logback:logback-access:1.2.3" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.51" level="project" />
-    <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.12" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-all:4.1.35.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.27" level="project" />
-    <orderEntry type="library" name="Maven: org.redisson:redisson:3.15.6" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-common:4.1.35.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-codec:4.1.35.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-buffer:4.1.35.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-transport:4.1.35.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-resolver:4.1.35.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-resolver-dns:4.1.35.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-codec-dns:4.1.35.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-handler:4.1.35.Final" level="project" />
-    <orderEntry type="library" name="Maven: javax.cache:cache-api:1.1.1" level="project" />
-    <orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.3.8.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.reactivestreams:reactive-streams:1.0.3" level="project" />
-    <orderEntry type="library" name="Maven: io.reactivex.rxjava3:rxjava:3.0.12" level="project" />
-    <orderEntry type="library" name="Maven: org.jboss.marshalling:jboss-marshalling-river:2.0.11.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.jboss.marshalling:jboss-marshalling:2.0.11.Final" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.11.1" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.11.1" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.11.1" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.11.1" level="project" />
-    <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.10.13" level="project" />
-    <orderEntry type="library" name="Maven: org.jodd:jodd-bean:5.1.6" level="project" />
-    <orderEntry type="library" name="Maven: org.jodd:jodd-core:5.1.6" level="project" />
-    <orderEntry type="library" name="Maven: com.rabbitmq:amqp-client:5.6.0" level="project" />
-    <orderEntry type="library" name="Maven: com.github.sgroschupf:zkclient:0.1" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.zookeeper:zookeeper:3.3.3" level="project" />
-    <orderEntry type="library" name="Maven: jline:jline:0.9.94" level="project" />
-    <orderEntry type="library" name="Maven: junit:junit:4.13" level="project" />
-    <orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:2.2" level="project" />
-    <orderEntry type="library" name="Maven: org.hamcrest:hamcrest:2.2" level="project" />
-    <orderEntry type="library" name="Maven: log4j:log4j:1.2.14" level="project" />
-    <orderEntry type="library" name="Maven: com.netflix.feign:feign-core:8.18.0" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: org.jvnet:animal-sniffer-annotation:1.0" level="project" />
-    <orderEntry type="library" name="Maven: com.netflix.feign:feign-jackson:8.18.0" level="project" />
-  </component>
 </module>
--- a/hs-im-server/im-common/pom.xml
+++ b/hs-im-server/im-common/pom.xml
@@ -30,6 +30,12 @@
        <dependency>
            <groupId>org.apache.httpcomponents</groupId>
            <artifactId>httpclient</artifactId>
+<!--            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.httpcomponents</groupId>
+                    <artifactId>httpcore</artifactId>
+                </exclusion>
+            </exclusions>-->
        </dependency>

        <!-- commons -->
--- a/hs-im-server/im-service/im-service.iml
+++ b/hs-im-server/im-service/im-service.iml
@@ -1,146 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+<module version="4">
  <component name="FacetManager">
    <facet type="web" name="Web">
      <configuration>
        <webroots />
+        <sourceRoots>
+          <root url="file://$MODULE_DIR$/src/main/java" />
+          <root url="file://$MODULE_DIR$/src/main/resources" />
+          <root url="file://$MODULE_DIR$/target/generated-sources/annotations" />
+        </sourceRoots>
      </configuration>
    </facet>
    <facet type="Spring" name="Spring">
      <configuration />
    </facet>
  </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
-    <output url="file://$MODULE_DIR$/target/classes" />
-    <output-test url="file://$MODULE_DIR$/target/test-classes" />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
-      <excludeFolder url="file://$MODULE_DIR$/target" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-amqp:2.3.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.3.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.3.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.3.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.13.3" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.13.3" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.30" level="project" />
-    <orderEntry type="library" name="Maven: jakarta.annotation:jakarta.annotation-api:1.3.5" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-core:5.2.8.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.2.8.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-messaging:5.2.8.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.2.8.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.amqp:spring-rabbit:2.2.9.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.amqp:spring-amqp:2.2.9.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.retry:spring-retry:1.2.5.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context:5.2.8.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-tx:5.2.8.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-validation:2.3.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.glassfish:jakarta.el:3.0.3" level="project" />
-    <orderEntry type="library" name="Maven: org.hibernate.validator:hibernate-validator:6.1.5.Final" level="project" />
-    <orderEntry type="library" name="Maven: jakarta.validation:jakarta.validation-api:2.0.2" level="project" />
-    <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.4.1.Final" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.5.1" level="project" />
-    <orderEntry type="library" name="Maven: com.github.sgroschupf:zkclient:0.1" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.zookeeper:zookeeper:3.3.3" level="project" />
-    <orderEntry type="library" name="Maven: jline:jline:0.9.94" level="project" />
-    <orderEntry type="library" name="Maven: junit:junit:4.13" level="project" />
-    <orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:2.2" level="project" />
-    <orderEntry type="library" name="Maven: org.hamcrest:hamcrest:2.2" level="project" />
-    <orderEntry type="library" name="Maven: log4j:log4j:1.2.14" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-redis:2.3.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-redis:2.3.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-keyvalue:2.3.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:2.3.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-oxm:5.2.8.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.2.8.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.2.8.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: io.lettuce:lettuce-core:5.3.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.3.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-json:2.3.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.11.1" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.11.1" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.11.1" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:2.3.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:9.0.37" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:9.0.37" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-web:5.2.8.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.2.8.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.2.8.RELEASE" level="project" />
-    <orderEntry type="module" module-name="im-codec" />
-    <orderEntry type="library" name="Maven: cn.hutool:hutool-all:5.0.6" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:2.3.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: com.zaxxer:HikariCP:3.4.5" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-jdbc:5.2.8.RELEASE" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: mysql:mysql-connector-java:8.0.21" level="project" />
-    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-boot-starter:3.4.2" level="project" />
-    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus:3.4.2" level="project" />
-    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-extension:3.4.2" level="project" />
-    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-core:3.4.2" level="project" />
-    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-annotation:3.4.2" level="project" />
-    <orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:4.0" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis:mybatis:3.5.6" level="project" />
-    <orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:2.0.5" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.3.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: com.github.jeffreyning:mybatisplus-plus:1.5.1-RELEASE" level="project" />
-    <orderEntry type="module" module-name="im-common" />
-    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.9" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.13" level="project" />
-    <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" />
-    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.14" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.12.0" level="project" />
-    <orderEntry type="library" name="Maven: io.minio:minio:8.4.5" level="project" />
-    <orderEntry type="library" name="Maven: com.carrotsearch.thirdparty:simple-xml-safe:2.7.1" level="project" />
-    <orderEntry type="library" name="Maven: com.google.guava:guava:30.1.1-jre" level="project" />
-    <orderEntry type="library" name="Maven: com.google.guava:failureaccess:1.0.1" level="project" />
-    <orderEntry type="library" name="Maven: com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava" level="project" />
-    <orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:3.0.2" level="project" />
-    <orderEntry type="library" name="Maven: org.checkerframework:checker-qual:3.8.0" level="project" />
-    <orderEntry type="library" name="Maven: com.google.errorprone:error_prone_annotations:2.5.1" level="project" />
-    <orderEntry type="library" name="Maven: com.google.j2objc:j2objc-annotations:1.3" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.11.1" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.11.1" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.11.1" level="project" />
-    <orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk15on:1.69" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-compress:1.21" level="project" />
-    <orderEntry type="library" name="Maven: org.xerial.snappy:snappy-java:1.1.8.4" level="project" />
-    <orderEntry type="library" name="Maven: com.squareup.okhttp3:okhttp:4.9.0" level="project" />
-    <orderEntry type="library" name="Maven: com.squareup.okio:okio:2.8.0" level="project" />
-    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib-common:1.3.72" level="project" />
-    <orderEntry type="library" name="Maven: org.jetbrains.kotlin:kotlin-stdlib:1.3.72" level="project" />
-    <orderEntry type="library" name="Maven: org.jetbrains:annotations:13.0" level="project" />
-    <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.30" level="project" />
-    <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" />
-    <orderEntry type="library" name="Maven: ch.qos.logback:logback-access:1.2.3" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.51" level="project" />
-    <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.12" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-all:4.1.35.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.27" level="project" />
-    <orderEntry type="library" name="Maven: org.redisson:redisson:3.15.6" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-common:4.1.35.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-codec:4.1.35.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-buffer:4.1.35.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-transport:4.1.35.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-resolver:4.1.35.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-resolver-dns:4.1.35.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-codec-dns:4.1.35.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-handler:4.1.35.Final" level="project" />
-    <orderEntry type="library" name="Maven: javax.cache:cache-api:1.1.1" level="project" />
-    <orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.3.8.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.reactivestreams:reactive-streams:1.0.3" level="project" />
-    <orderEntry type="library" name="Maven: io.reactivex.rxjava3:rxjava:3.0.12" level="project" />
-    <orderEntry type="library" name="Maven: org.jboss.marshalling:jboss-marshalling-river:2.0.11.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.jboss.marshalling:jboss-marshalling:2.0.11.Final" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.11.1" level="project" />
-    <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.10.13" level="project" />
-    <orderEntry type="library" name="Maven: org.jodd:jodd-bean:5.1.6" level="project" />
-    <orderEntry type="library" name="Maven: org.jodd:jodd-core:5.1.6" level="project" />
-    <orderEntry type="library" name="Maven: com.rabbitmq:amqp-client:5.6.0" level="project" />
-    <orderEntry type="library" name="Maven: com.netflix.feign:feign-core:8.18.0" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: org.jvnet:animal-sniffer-annotation:1.0" level="project" />
-    <orderEntry type="library" name="Maven: com.netflix.feign:feign-jackson:8.18.0" level="project" />
-  </component>
 </module>
--- a/hs-im-server/im-service/pom.xml
+++ b/hs-im-server/im-service/pom.xml
@@ -89,7 +89,7 @@
            <version>1.0.0-SNAPSHOT</version>
        </dependency>

-
+        <!-- 对象存储 MinIO -->
        <dependency>
            <groupId>io.minio</groupId>
            <artifactId>minio</artifactId>
@@ -100,7 +100,6 @@
                </exclusion>
            </exclusions>
        </dependency>
-
        <dependency>
            <groupId>com.squareup.okhttp3</groupId>
            <artifactId>okhttp</artifactId>
--- a/hs-im-server/im-service/src/main/java/com/lld/im/service/call/controller/ImCallHistoryController.java
+++ b/hs-im-server/im-service/src/main/java/com/lld/im/service/call/controller/ImCallHistoryController.java
@@ -0,0 +1,13 @@
+package com.lld.im.service.call.controller;
+
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@Slf4j
+@RestController
+@RequestMapping("v1/im_call_history")
+public class ImCallHistoryController {
+
+}
--- a/hs-im-server/im-service/src/main/java/com/lld/im/service/call/dao/ImCallHistoryEntity.java
+++ b/hs-im-server/im-service/src/main/java/com/lld/im/service/call/dao/ImCallHistoryEntity.java
@@ -0,0 +1,32 @@
+package com.lld.im.service.call.dao;
+
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+@TableName("im_call_history")
+public class ImCallHistoryEntity {
+    private String id;
+    private String inviteId;
+    private String inviteName;
+    private String passiveId;
+    private String passiveName;
+    private String roomId;
+
+    // 通话唯一uuid
+    private String sessionId;
+
+    // 待开始，正在进行中，已结束
+    private String status;
+
+
+    private Date createTime;
+    private Date endTime;
+
+    // 持续时间(秒)
+    private Integer continueSecond;
+
+}
--- a/hs-im-server/im-service/src/main/java/com/lld/im/service/call/dao/mapper/ImCallHistoryMapper.java
+++ b/hs-im-server/im-service/src/main/java/com/lld/im/service/call/dao/mapper/ImCallHistoryMapper.java
@@ -0,0 +1,10 @@
+package com.lld.im.service.call.dao.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.lld.im.service.call.dao.ImCallHistoryEntity;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface ImCallHistoryMapper  extends BaseMapper<ImCallHistoryEntity> {
+}
--- a/hs-im-server/im-service/src/main/java/com/lld/im/service/call/service/ImCallHistoryService.java
+++ b/hs-im-server/im-service/src/main/java/com/lld/im/service/call/service/ImCallHistoryService.java
@@ -0,0 +1,8 @@
+package com.lld.im.service.call.service;
+
+
+import org.springframework.stereotype.Service;
+
+@Service
+public class ImCallHistoryService {
+}
--- a/hs-im-server/im-service/src/main/java/com/lld/im/service/room/controller/RoomController.java
+++ b/hs-im-server/im-service/src/main/java/com/lld/im/service/room/controller/RoomController.java
@@ -72,7 +72,11 @@ public class RoomController {
        try {
            ImRoomEntity roomEntity = new ImRoomEntity();
            roomEntity.setRoomId(callBackReq.getApp());
-            roomEntity.setPublishId(callBackReq.getStream());
+
+            String[] publishResults=callBackReq.getStream().split("unity");
+
+            roomEntity.setPublishId(publishResults[0]);
+
            if(StringUtils.equals(callBackReq.getAction() ,"on_unpublish")){
                roomService.deleteUserFromRoom(roomEntity);
            }else if(StringUtils.equals(callBackReq.getAction() ,"on_publish")){
--- a/hs-im-server/im-service/src/main/java/com/lld/im/service/room/dao/ImRoomEntity.java
+++ b/hs-im-server/im-service/src/main/java/com/lld/im/service/room/dao/ImRoomEntity.java
@@ -21,5 +21,8 @@ public class ImRoomEntity {
  private String webrtcUrl;
  private String rtmpUrl;
  private String type;
+
+  // publish  开始推流   hangup  结束推流
+  private String cmd;
  private Integer offline;
 }
--- a/hs-im-server/im-system.iml
+++ b/hs-im-server/im-system.iml
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
-    <output url="file://$MODULE_DIR$/target/classes" />
-    <output-test url="file://$MODULE_DIR$/target/test-classes" />
-    <content url="file://$MODULE_DIR$">
-      <excludeFolder url="file://$MODULE_DIR$/target" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.30" level="project" />
-    <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" />
-    <orderEntry type="library" name="Maven: ch.qos.logback:logback-access:1.2.3" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.51" level="project" />
-    <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.12" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-all:4.1.35.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.27" level="project" />
-    <orderEntry type="library" name="Maven: org.redisson:redisson:3.15.6" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-common:4.1.35.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-codec:4.1.35.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-buffer:4.1.35.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-transport:4.1.35.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-resolver:4.1.35.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-resolver-dns:4.1.35.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-codec-dns:4.1.35.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-handler:4.1.35.Final" level="project" />
-    <orderEntry type="library" name="Maven: javax.cache:cache-api:1.1.1" level="project" />
-    <orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.3.8.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.reactivestreams:reactive-streams:1.0.3" level="project" />
-    <orderEntry type="library" name="Maven: io.reactivex.rxjava3:rxjava:3.0.12" level="project" />
-    <orderEntry type="library" name="Maven: org.jboss.marshalling:jboss-marshalling-river:2.0.11.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.jboss.marshalling:jboss-marshalling:2.0.11.Final" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.11.1" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.11.1" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.11.1" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.11.1" level="project" />
-    <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.10.13" level="project" />
-    <orderEntry type="library" name="Maven: org.jodd:jodd-bean:5.1.6" level="project" />
-    <orderEntry type="library" name="Maven: org.jodd:jodd-core:5.1.6" level="project" />
-    <orderEntry type="library" name="Maven: com.rabbitmq:amqp-client:5.6.0" level="project" />
-    <orderEntry type="library" name="Maven: com.github.sgroschupf:zkclient:0.1" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.zookeeper:zookeeper:3.3.3" level="project" />
-    <orderEntry type="library" name="Maven: jline:jline:0.9.94" level="project" />
-    <orderEntry type="library" name="Maven: junit:junit:4.13" level="project" />
-    <orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:2.2" level="project" />
-    <orderEntry type="library" name="Maven: org.hamcrest:hamcrest:2.2" level="project" />
-    <orderEntry type="library" name="Maven: log4j:log4j:1.2.14" level="project" />
-    <orderEntry type="library" name="Maven: com.netflix.feign:feign-core:8.18.0" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: org.jvnet:animal-sniffer-annotation:1.0" level="project" />
-    <orderEntry type="library" name="Maven: com.netflix.feign:feign-jackson:8.18.0" level="project" />
-  </component>
-</module>
--- a/hs-im-server/im-tcp/im-tcp.iml
+++ b/hs-im-server/im-tcp/im-tcp.iml
@@ -1,101 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+<module version="4">
  <component name="FacetManager">
    <facet type="web" name="Web">
      <configuration>
        <webroots />
+        <sourceRoots>
+          <root url="file://$MODULE_DIR$/src/main/java" />
+          <root url="file://$MODULE_DIR$/src/main/resources" />
+        </sourceRoots>
      </configuration>
    </facet>
    <facet type="Spring" name="Spring">
      <configuration />
    </facet>
  </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
-    <output url="file://$MODULE_DIR$/target/classes" />
-    <output-test url="file://$MODULE_DIR$/target/test-classes" />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
-      <excludeFolder url="file://$MODULE_DIR$/target" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.12.0" level="project" />
-    <orderEntry type="library" name="Maven: org.hibernate.validator:hibernate-validator:6.1.5.Final" level="project" />
-    <orderEntry type="library" name="Maven: jakarta.validation:jakarta.validation-api:2.0.2" level="project" />
-    <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.4.1.Final" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.5.1" level="project" />
-    <orderEntry type="library" name="Maven: com.github.sgroschupf:zkclient:0.1" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.zookeeper:zookeeper:3.3.3" level="project" />
-    <orderEntry type="library" name="Maven: jline:jline:0.9.94" level="project" />
-    <orderEntry type="library" name="Maven: junit:junit:4.13" level="project" />
-    <orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:2.2" level="project" />
-    <orderEntry type="library" name="Maven: org.hamcrest:hamcrest:2.2" level="project" />
-    <orderEntry type="library" name="Maven: log4j:log4j:1.2.14" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-all:4.1.35.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.27" level="project" />
-    <orderEntry type="library" name="Maven: org.redisson:redisson:3.15.6" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-common:4.1.35.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-codec:4.1.35.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-buffer:4.1.35.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-transport:4.1.35.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-resolver:4.1.35.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-resolver-dns:4.1.35.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-codec-dns:4.1.35.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-handler:4.1.35.Final" level="project" />
-    <orderEntry type="library" name="Maven: javax.cache:cache-api:1.1.1" level="project" />
-    <orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.3.8.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.reactivestreams:reactive-streams:1.0.3" level="project" />
-    <orderEntry type="library" name="Maven: io.reactivex.rxjava3:rxjava:3.0.12" level="project" />
-    <orderEntry type="library" name="Maven: org.jboss.marshalling:jboss-marshalling-river:2.0.11.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.jboss.marshalling:jboss-marshalling:2.0.11.Final" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.30" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.11.1" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.11.1" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.11.1" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.11.1" level="project" />
-    <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.10.13" level="project" />
-    <orderEntry type="library" name="Maven: org.jodd:jodd-bean:5.1.6" level="project" />
-    <orderEntry type="library" name="Maven: org.jodd:jodd-core:5.1.6" level="project" />
-    <orderEntry type="library" name="Maven: com.rabbitmq:amqp-client:5.6.0" level="project" />
-    <orderEntry type="library" name="Maven: com.netflix.feign:feign-core:8.18.0" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: org.jvnet:animal-sniffer-annotation:1.0" level="project" />
-    <orderEntry type="library" name="Maven: com.netflix.feign:feign-jackson:8.18.0" level="project" />
-    <orderEntry type="module" module-name="im-codec" />
-    <orderEntry type="module" module-name="im-common" />
-    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.9" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.13" level="project" />
-    <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" />
-    <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.14" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.3.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.3.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.3.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.3.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.3.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.13.3" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.13.3" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.30" level="project" />
-    <orderEntry type="library" name="Maven: jakarta.annotation:jakarta.annotation-api:1.3.5" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-core:5.2.8.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.2.8.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-json:2.3.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.11.1" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.11.1" level="project" />
-    <orderEntry type="library" name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.11.1" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:2.3.2.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:9.0.37" level="project" />
-    <orderEntry type="library" name="Maven: org.glassfish:jakarta.el:3.0.3" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:9.0.37" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-web:5.2.8.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.2.8.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.2.8.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.2.8.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-context:5.2.8.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-expression:5.2.8.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" />
-    <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" />
-    <orderEntry type="library" name="Maven: ch.qos.logback:logback-access:1.2.3" level="project" />
-    <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.51" level="project" />
-    <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.12" level="project" />
-  </component>
 </module>
--- a/im-uniapp/common/config.js
+++ b/im-uniapp/common/config.js
@@ -23,14 +23,14 @@ export default class config{
 	static getImAppId(){
 		return 10000;
 	}
-	static getVideoRoomUrl(room,userid,isPublish=0,isPlayer=1,hasVideo=1){
+	static getVideoRoomUrl(room,userid,isPublish=0,isPlayer=1,hasVideo=1,uname,tuid){
 		if(process.env.NODE_ENV === 'development' ){
-			return  `http://localhost:8080/hd-glasses-app/#/call_room?showInviteConfirmDialog=1&isPublish=${isPublish}&isPlayer=${isPlayer}&uid=${userid}&room=${room}&hasVideo=${hasVideo}`
+			return  `http://localhost:8080/hd-glasses-app/#/call_room?showInviteConfirmDialog=1&isForce=0&isPublish=${isPublish}&isPlayer=${isPlayer}&uid=${userid}&room=${room}&hasVideo=${hasVideo}&uname=${uname}&tuid=${tuid}`
 		}else{
 			if(this.prod=="online"){
-				return  `https://119.45.242.222/hd-glasses-app/#/call_room?showInviteConfirmDialog=1&isPublish=${isPublish}&isPlayer=${isPlayer}&uid=${userid}&room=${room}&hasVideo=${hasVideo}`
+				return  `https://119.45.242.222/hd-glasses-app/#/call_room?showInviteConfirmDialog=1&isForce=0&isPublish=${isPublish}&isPlayer=${isPlayer}&uid=${userid}&room=${room}&hasVideo=${hasVideo}&uname=${uname}&tuid=${tuid}`
 			}else{
-				return  `https://172.16.3.19/hd-glasses-app/#/call_room?showInviteConfirmDialog=1&isPublish=${isPublish}&isPlayer=${isPlayer}&uid=${userid}&room=${room}&hasVideo=${hasVideo}`
+				return  `https://172.16.3.19/hd-glasses-app/#/call_room?showInviteConfirmDialog=1&isForce=0&isPublish=${isPublish}&isPlayer=${isPlayer}&uid=${userid}&room=${room}&hasVideo=${hasVideo}&uname=${uname}&tuid=${tuid}`
 			}
 		}
 	}
--- a/im-uniapp/wx/chatWindow/index.vue
+++ b/im-uniapp/wx/chatWindow/index.vue
@@ -497,7 +497,7 @@
 								target: "znzq"
 							},
 						}).then((res1) => {
-							location.href = config.getVideoRoomUrl(roomInfo.roomId, roomInfo.creatorId, 1, 1,hasVideo)
+							location.href = config.getVideoRoomUrl(roomInfo.roomId, roomInfo.creatorId, 1, 1,hasVideo,userInfo.nickName,this.talkTo.userId)
 						})
 					})
 				if (1 > 0) {
--- a/im-uniapp/wx/tabbar2/index.vue
+++ b/im-uniapp/wx/tabbar2/index.vue
@@ -78,6 +78,8 @@
 				    // 注：如果局部custom与全局custom有同名属性，则后面的属性会覆盖前面的属性，相当于Object.assign(全局，局部)
 				     custom: {target: "znzq"} , // 可以加一些自定义参数，在拦截器等地方使用。比如这里我加了一个auth，可在拦截器里拿到，如果true就传token
 				}).then(res => {
+					//userInfo
+					 const userId = uni.getStorageSync("userId")
 				     console.log("=========获取到数据")
 					 console.log(res)
 					 if(res.statusCode==200){
@@ -85,6 +87,8 @@
 							 var list=[]
 							 res.data.result.records.map((item)=>{
 								 console.log(item)
+								 //在通讯录中过滤掉自己
+								 if(userId!=item.userId){
 									list.push({
 										name:item.realname,
 										avatar:item.portrait,
@@ -92,7 +96,7 @@
 										userType:1,
 										chatNo:item.userId
 									}) 
-								 
+								 }
 							 })
 							 
 							 this.list=this.$fc.sortList({list:list,key:'name'})