更新聊天

src/TUIKit/TUIComponents/container/TUIChat/manage-components/manage.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <i class="icon icon-chat-setting" @click="toggleShow"></i>
+    <i class="icon icon-chat-setting" v-if="platform != 'daya'" @click="toggleShow"></i>
     <div class="manage" :class="[isH5 ? 'manage-h5' : '']" v-if="show" ref="dialog">
       <header class="manage-header">
         <i class="icon icon-back" v-if="isH5 && !currentTab" @click="toggleShow"></i>
@@ -276,6 +276,7 @@ const manage = defineComponent({
       page: 1, // 当前默认查询第一页数据
       currentUserDetail: {} as any, // 用户信息
       groupDetail: {} as any,
+      platform: "",
     });
 
     const dialog: any = ref();
@@ -826,6 +827,7 @@ const manage = defineComponent({
 
     const getGroupMemberUserDetail = async () => {
       try {
+        console.log(data?.conversation?.groupProfile, "data?.conversation?.groupProfile?");
         const res = await imGroupMemberUserDetail({
           groupId: data?.conversation?.groupProfile?.groupID,
           imUserId: data?.conversation?.groupProfile?.selfInfo.userID,
@@ -865,6 +867,7 @@ const manage = defineComponent({
 
     onMounted(() => {
       try {
+        data.platform = sessionStorage.getItem("platform") || "classroom";
         getGroupDetail();
         getGroupMemberUserDetail();
         console.log(data?.conversation, "data?.conversation?");

src/TUIKit/TUIComponents/container/TUIGroup/index.vue

@@ -100,11 +100,13 @@ const TUIGroup = defineComponent({
     const handleListItem = async (item: any) => {
       try {
         // 判断群是否存在
-        const res = await imGroupDetail({ id: item.groupId });
+        console.log(item, "item");
+        // const res = await imGroupDetail({ id: item.id });
         // 判断是否有群
-        if (res.data?.id) {
-          const name = `GROUP${item.groupId}`;
+        if (item.id) {
+          const name = `GROUP${item.id}`;
           TUIServer.TUICore.TUIServer.TUIConversation.getConversationProfile(name).then((imResponse: any) => {
+            console.log(imResponse, "item");
             // 通知 TUIConversation 添加当前会话
             TUIServer.TUICore.TUIServer.TUIConversation.handleCurrentConversation(imResponse.data.conversation);
 
@@ -136,15 +138,15 @@ const TUIGroup = defineComponent({
       data.loading = true;
       try {
         const res = await imGroupPage({
-          keyword: data.keyword,
+          search: data.keyword,
           page: data.page,
           rows: data.rows,
-          roleType: "TEACHER",
         });
-        data.groupList.push(...(res.data.rows || []));
+
+        data.groupList.push(...(res.data || []));
 
         // 是否加载完成
-        data.finshed = res.data.pages <= res.data.current ? true : false;
+        data.finshed = true; //res.data.pages <= res.data.current ? true : false;
       } catch {
         //
       }

src/TUIKit/TUIComponents/container/TUIPerson/index.vue

@@ -71,14 +71,13 @@ const TUIPerson = defineComponent({
       data.loading = true;
       try {
         const res = await imUserFriendPage({
-          keyword: data.keyword,
+          search: data.keyword,
           page: data.page,
           rows: data.rows,
-          roleType: "TEACHER",
         });
-        data.friendList.push(...(res.data.rows || []));
+        data.friendList.push(...(res.data || []));
         // 是否加载完成;
-        data.finshed = res.data.pages <= res.data.current ? true : false;
+        data.finshed = true; //res.data.pages <= res.data.current ? true : false;
       } catch {
         //
       }
@@ -86,7 +85,8 @@ const TUIPerson = defineComponent({
     };
 
     const handleListItem = async (item: any) => {
-      const name = `C2C${item.imUserId}`;
+      const name = `C2C${item.imFriendId}`;
+      console.log(item, "item", TUIServer.TUICore);
       TUIServer.TUICore.TUIServer.TUIConversation.getConversationProfile(name).then((imResponse: any) => {
         // 通知 TUIConversation 添加当前会话
         TUIServer.TUICore.TUIServer.TUIConversation.handleCurrentConversation(imResponse.data.conversation);

src/TUIKit/api.ts

@@ -1,27 +1,46 @@
 import request from "../request";
 
 const platform = sessionStorage.getItem("platform") || "classroom";
-const api = platform == "classroom" ? "/edu-app" : "/api-backend";
+// const api = platform == "classroom" ? "/edu-app" : "/api-backend";
+let api = "/api-backend";
+if (platform == "classroom") {
+  api = "/edu-app";
+} else if (platform == "daya") {
+  api = "/api-web";
+}
 /**
  * 即时通讯 - 群组列表
  */
 export const imGroupPage = (params?: object) => {
-  return request.post(api + "/imGroup/page", {
-    data: params,
-  });
+  if (platform == "daya") {
+    return request.get(api + "/imGroup/queryGroupList", {
+      params,
+    });
+  } else {
+    return request.post(api + "/imGroup/page", {
+      data: params,
+    });
+  }
 };
 
 /**
  * 即时通讯 - 好友列表
  */
 export const imUserFriendPage = (params?: object) => {
-  return request.post(api + "/imUserFriend/page", {
+  if (platform == "daya") {
+    return request.get(api + "/imGroup/queryFriendList", {
+      params,
+    });
+  } else {
+  }
+  return request.post(api + "/imGroup/page", {
     data: params,
   });
 };
 
 /**
  * 即时通讯 - 转让群组
+ * [课堂乐器，管乐团]
  */
 export const imGroupChangeGroupOwner = (params?: object) => {
   return request.post(api + "/imGroup/changeGroupOwner", {
@@ -33,6 +52,12 @@ export const imGroupChangeGroupOwner = (params?: object) => {
  * 即时通讯 - 群公告列表
  */
 export const imGroupNoticePage = (params?: object) => {
+  if (platform == "daya") {
+    return request.post(api + "/imGroup/queryNoticeList", {
+      data: params,
+    });
+  } else {
+  }
   return request.post(api + "/imGroupNotice/page", {
     data: params,
   });
@@ -41,14 +66,19 @@ export const imGroupNoticePage = (params?: object) => {
 /**
  * 即时通讯 - 新增公告
  */
+let imGroupNoticeSaveUrl = api + "/imGroupNotice/save";
+if (platform == "daya") {
+  imGroupNoticeSaveUrl = api + "/imGroupNotice/add";
+}
 export const imGroupNoticeSave = (params?: object) => {
-  return request.post(api + "/imGroupNotice/save", {
+  return request.post(imGroupNoticeSaveUrl, {
     data: params,
   });
 };
 
 /**
  * 即时通讯 - 修改群公告
+ * [课堂乐器，管乐团，管乐迷]
  */
 export const imGroupNoticeUpdate = (params?: object) => {
   return request.post(api + "/imGroupNotice/update", {
@@ -59,30 +89,49 @@ export const imGroupNoticeUpdate = (params?: object) => {
 /**
  * 即时通讯 - 详情
  */
+let imGroupDetailUrl = api + "/imGroup/detail/";
+if (platform == "daya") {
+  // https://test.dayaedu.com/api-teacher/imGroup/getDetail/1664236980537458690
+  imGroupDetailUrl = api + "/imGroup/getDetail/";
+}
 export const imGroupDetail = (params?: any) => {
-  return request.get(api + "/imGroup/detail/" + params.id);
+  return request.get(imGroupDetailUrl + params.id);
 };
 
 /**
  * 即时通讯 - 群成员
  */
+
 export const imGroupMemberPage = (params?: any) => {
-  return request.post(api + "/imGroupMember/page", {
-    data: params,
-  });
+  if (platform == "daya") {
+    return request.get(api + "/imGroup/queryGroupMemberList", {
+      params,
+    });
+  } else {
+    return request.post(api + "/imGroupMember/page", {
+      data: params,
+    });
+  }
 };
 
 /**
  * 即时通讯 - 用户详情
  */
 export const imGroupMemberUserDetail = (params?: any) => {
-  return request.post(api + "/imGroupMember/userDetail", {
-    data: params,
-  });
+  if (platform == "daya") {
+    return request.get(api + "/imGroup/queryFriendDetail?userId=" + params.imUserId, {
+      params: {},
+    });
+  } else {
+    return request.post(api + "/imGroupMember/userDetail", {
+      data: params,
+    });
+  }
 };
 
 /**
  * 即时通讯 - 退出群聊
+ * [课堂乐器，管乐团]
  */
 export const imGroupQuit = (params?: any) => {
   return request.post(api + "/imGroup/quit/" + params.id, {
@@ -92,6 +141,7 @@ export const imGroupQuit = (params?: any) => {
 
 /**
  * 即时通讯 - 全体禁言-解除禁言
+ * [课堂乐器，管乐团]
  */
 export const imGroupMuteAll = (params?: any) => {
   return request.post(api + "/imGroup/muteAll", {
@@ -101,6 +151,7 @@ export const imGroupMuteAll = (params?: any) => {
 
 /**
  * 即时通讯 - 批量IM新增
+ * [课堂乐器，管乐团]
  */
 export const imGroupMemberSaveImAll = (params?: any) => {
   return request.post(api + "/imGroupMember/saveImAll", {
@@ -110,6 +161,7 @@ export const imGroupMemberSaveImAll = (params?: any) => {
 
 /**
  * 即时通讯 - 解散群聊
+ * [课堂乐器，管乐团]
  */
 export const imGroupDismiss = (params?: any) => {
   return request.post(api + "/imGroup/dismiss/" + params.id, {

src/main.ts

@@ -41,8 +41,8 @@ import { TUIComponents, TUICore, genTestUserSig } from "./TUIKit";
 console.log(import.meta.env.DEV, "import.meta.env.DEV");
 
 // 判断是否是测试环境的
-const SDKAppID = parseSearch.appId || hashSearch.appId || 1400799837; // import.meta.env.DEV ? 1400805079 : 1400799837; // 1400805079; // Your SDKAppID
-const secretKey = parseSearch.secretKey || hashSearch.secretKey || "37bfb220843e25e78768cadd0dc06756e460e55bd631354930a4149565a1d0c9"; //import.meta.env.DEV ? "c5f4ea6140128a36c842990446a2c89249ab886b5e1ea6893555aa635a0b3c30" : "37bfb220843e25e78768cadd0dc06756e460e55bd631354930a4149565a1d0c9"; //"c5f4ea6140128a36c842990446a2c89249ab886b5e1ea6893555aa635a0b3c30"; // Your secretKey
+const SDKAppID = parseSearch.appId || hashSearch.appId || 1400805079; // import.meta.env.DEV ? 1400805079 : 1400799837; // 1400805079; // Your SDKAppID
+const secretKey = parseSearch.secretKey || hashSearch.secretKey || "c5f4ea6140128a36c842990446a2c89249ab886b5e1ea6893555aa635a0b3c30"; //import.meta.env.DEV ? "c5f4ea6140128a36c842990446a2c89249ab886b5e1ea6893555aa635a0b3c30" : "37bfb220843e25e78768cadd0dc06756e460e55bd631354930a4149565a1d0c9"; //"c5f4ea6140128a36c842990446a2c89249ab886b5e1ea6893555aa635a0b3c30"; // Your secretKey
 const userID = parseSearch.userID; //|| "KT:140:TEACHER"; // User ID
 
 // init TUIKit

vite.config.ts

@@ -12,7 +12,8 @@ function pathResolve(dir: string) {
 // function resolve(dir: string) {
 //   return path.join(__dirname, dir);
 // }
-const proxyUrl = "https://test.lexiaoya.cn";
+// const proxyUrl = "https://test.lexiaoya.cn";
+const proxyUrl = "https://test.dayaedu.com";
 // https://vitejs.dev/config/
 export default defineConfig({
   base: "./",
@@ -37,6 +38,14 @@ export default defineConfig({
         target: proxyUrl,
         changeOrigin: true,
       },
+      "/api-backend": {
+        target: proxyUrl,
+        changeOrigin: true,
+      },
+      "/api-web": {
+        target: proxyUrl,
+        changeOrigin: true,
+      },
     },
   },
 });