Merge branch 'master' of http://192.168.0.105:10010/r/zhba_app

liuyg

2021-08-12 cfd78d820cf4932717271778cbe87a4a2f51ddb0

Merge branch 'master' of http://192.168.0.105:10010/r/zhba_app

 pages/groupChat/chating.vue

@@ -214,7 +214,7 @@
                var that = this;
                that.senId = WxStorage.get("ids");
                uni.request({
                    url:"http://223.82.109.183:2082/api/chat-records/getSingleMessagePage",
                    url:"http://223.82.109.183:2080/api/chat-records/getSingleMessagePage",
                    method:"get",
                    data:{
                        senderId: that.senId,
@@ -337,7 +337,7 @@
                }
                
                uni.request({
                    url:"http://223.82.109.183:2082/api/chat-records/insertSingleChat",
                    url:"http://223.82.109.183:2080/api/chat-records/insertSingleChat",
                    method:"post",
                    data:{
                        senderId: that.senId,

 pages/groupChat/groupChat.vue

@@ -139,7 +139,7 @@
                var that = this;
                if(this.current == 0){
                    uni.request({
                        url:"http://223.82.109.183:2082/api/chat-records/getChatListPage",
                        url:"http://223.82.109.183:2080/api/chat-records/getChatListPage",
                        method:"get",
                        data:{
                            senderId: WxStorage.get("ids")
@@ -157,7 +157,7 @@
                    });
                }else if(this.current == 1){
                    uni.request({
                        url:"http://223.82.109.183:2082/api/chatgroup/selectList",
                        url:"http://223.82.109.183:2080/api/chatgroup/selectList",
                        method:"POST",
                        data:{
                            senderId: WxStorage.get("ids")
@@ -175,7 +175,7 @@
                    })
                }else if(this.current == 2){
                    uni.request({
                        url:"http://223.82.109.183:2082/api/blade-user/pages?current=1&size=9999",
                        url:"http://223.82.109.183:2080/api/blade-user/pages?current=1&size=9999",
                        method:"get",
                        data:{
                            senderId: WxStorage.get("ids")

 pages/home/home.vue

@@ -114,8 +114,8 @@
            </view>
            <!-- 新闻模块 end -->
        </view>
            <u-button class="ccbut" type="primary" @click="openVideo('Mains')">测试点视频通话：主播</u-button>
            <u-button class="ccbut" type="primary" @click="openVideo('Receiver')">测试点视频通话：第二个</u-button>
            <!-- <u-button class="ccbut" type="primary" @click="openVideo('Mains')">测试点视频通话：主播</u-button>
            <u-button class="ccbut" type="primary" @click="openVideo('Receiver')">测试点视频通话：第二个</u-button> -->
    </view>
</template>


 store/index.js

@@ -34,8 +34,8 @@
        },
        logPath: '',
        // piAPI: 'http://223.82.109.183:2080/api',
        piAPI: 'http://223.82.109.183:2082/api',
        api: 'http://192.168.0.111:83',
        piAPI: 'http://223.82.109.183:2080/api',
        api: 'http://223.82.109.183:2080/api',
        // piAPI: 'http://localhost:82/',
        // piAPI: 'http://192.168.0.108:81',
        puserName: '',

 store/mutations.js

@@ -49,7 +49,7 @@
        console.log('登入数据传输成功  开始进入连接')
        
        uni.connectSocket({
            url: 'ws://192.168.0.111:9034/websocket'
            url: 'ws://http://223.82.109.183:2086/websocket'
        });
        var socketOpen = false;
        uni.onSocketOpen(function(res) {