add create add chat api

dd301453 · 杨铁龙 · 6547881d · dd301453 · dd301453 · dd301453
Commit dd301453 authored Feb 25, 2022 by 杨铁龙
Showing with 86 additions and 11 deletions
.env.test1
.env.test2
package-lock.json
package.json
src/config/index.ts
src/service/chat.ts
src/service/user.ts
src/views/home.vue
--- a/.env.test1
+++ b/.env.test1
-VUE_APP_TEST_ACCOUNT="15132146321"
+VUE_APP_EID="10"
-VUE_APP_TEST_PASSWORD="erhao521"
\ No newline at end of file
\ No newline at end of file
--- a/.env.test2
+++ b/.env.test2
-VUE_APP_TEST_ACCOUNT="18040417207"
+VUE_APP_EID="11"
-VUE_APP_TEST_PASSWORD="y1234567"
\ No newline at end of file
\ No newline at end of file
--- a/package-lock.json
+++ b/package-lock.json
@@ -36,6 +36,7 @@
        "@vue/eslint-config-standard": "^6.1.0",
        "@vue/eslint-config-typescript": "^9.1.0",
        "compression-webpack-plugin": "^9.2.0",
+        "cross-env": "^7.0.3",
        "eslint": "^7.32.0",
        "eslint-plugin-import": "^2.25.3",
        "eslint-plugin-node": "^11.1.0",
@@ -4825,6 +4826,25 @@
        "node": ">=8"
      }
    },
+    "node_modules/cross-env": {
+      "version": "7.0.3",
+      "resolved": "http://npm.job.qinqinxiaobao.com/cross-env/-/cross-env-7.0.3.tgz",
+      "integrity": "sha1-hlJkspZ33AFbqEGJGJZd0jL8VM8=",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "cross-spawn": "^7.0.1"
+      },
+      "bin": {
+        "cross-env": "src/bin/cross-env.js",
+        "cross-env-shell": "src/bin/cross-env-shell.js"
+      },
+      "engines": {
+        "node": ">=10.14",
+        "npm": ">=6",
+        "yarn": ">=1"
+      }
+    },
    "node_modules/cross-spawn": {
      "version": "7.0.3",
      "resolved": "https://registry.npmmirror.com/cross-spawn/-/cross-spawn-7.0.3.tgz",
@@ -16637,6 +16657,15 @@
        "yaml": "^1.7.2"
      }
    },
+    "cross-env": {
+      "version": "7.0.3",
+      "resolved": "http://npm.job.qinqinxiaobao.com/cross-env/-/cross-env-7.0.3.tgz",
+      "integrity": "sha1-hlJkspZ33AFbqEGJGJZd0jL8VM8=",
+      "dev": true,
+      "requires": {
+        "cross-spawn": "^7.0.1"
+      }
+    },
    "cross-spawn": {
      "version": "7.0.3",
      "resolved": "https://registry.npmmirror.com/cross-spawn/-/cross-spawn-7.0.3.tgz",

--- a/package.json
+++ b/package.json
--- a/src/config/index.ts
+++ b/src/config/index.ts
 export const config = {
-    chatApi: 'http://xchat-ds.jinsehuaqin.com:8020/chat/api',
+    appId: 'tecsun',
+    password: 'ds123456',
+    eid: process.env.VUE_APP_EID,
+    chatApi: 'http://xchat-ds.jinsehuaqin.com:8020/',
    SocketUrl: 'ws://xchat-ds.jinsehuaqin.com:8010/ws',
    testAccount: process.env.VUE_APP_TEST_ACCOUNT,
    testPassword: process.env.VUE_APP_TEST_PASSWORD,

--- a/src/service/chat.ts
+++ b/src/service/chat.ts
@@ -6,7 +6,6 @@ import Chat from '@/customer-service/xim'
 import store from '@/store'
 import { throttle } from 'lodash'
 import { cache } from './user'
-// import { sdk } from './sdk'
 export function initChat() {
    console.log('初始化chat')

--- a/src/service/user.ts
+++ b/src/service/user.ts
 import { config } from '@/config'
 import { randomString } from '@/utils'
 import axios from 'axios'
 export const cache = {
    chatApiOrgId: 'chatApiOrgId',
    chatApiToken: 'chatApiToken',
@@ -9,7 +10,6 @@ export const cache = {
 export function buildHeaders() {
    return {
        headers: {
-            'content-type': 'application/x-www-form-urlencoded',
            Authorization: 'Bearer ' + localStorage.getItem(cache.chatApiToken),
        },
    }
@@ -18,11 +18,15 @@ export function buildHeaders() {
 export interface CreateChat {
    // 成员uid
    members: string[]
+    // 会话标题
    title: string
 }
-function createChat(data: CreateChat) {
+/** 创建会话 biz_id暂时随机生成，唯一字段 */
+export function createChat(data: CreateChat) {
    const d = {
        members: data.members.map((i) => {
+            // 都传成员uid
            return {
                uid: i,
                eid: i,
@@ -35,6 +39,45 @@ function createChat(data: CreateChat) {
        biz_id: randomString(32),
    }
    return axios
-        .post(`${config.chatApi}/add_xchat`, d, buildHeaders())
+        .post(`${config.chatApi}/chat/api/add_xchat`, d, buildHeaders())
        .then((r) => r.data.access_token)
 }
+/**
+ * 添加成员到会话中
+ * @param members 用户id
+ * @param chatId 会话id
+ * @returns
+ */
+export function addToChat(members: string[], chatId: number) {
+    const d = {
+        members: members.map((i) => {
+            // 都传成员uid
+            return {
+                uid: i,
+                eid: i,
+                oid: i,
+            }
+        }),
+        chat_id: chatId,
+    }
+    return axios
+        .post(`${config.chatApi}/chat/api/join_xchat`, d, buildHeaders())
+        .then((r) => r.data.access_token)
+}
+/** 生成token */
+export function generateToken() {
+    return axios
+        .post(`${config.chatApi}/inside/api/get_auth_token`, {
+            app_id: config.appId,
+            password: config.password,
+            eid: config.eid,
+        })
+        .then((r) => {
+            const token = r.data.data.token
+            const orgId = r.data.data.org_id
+            localStorage.setItem(cache.chatApiToken, token)
+            localStorage.setItem(cache.chatApiOrgId, orgId)
+        })
+}
--- a/src/views/home.vue
+++ b/src/views/home.vue
@@ -29,6 +29,7 @@
    import { ChatStore, chatStore } from "@/customer-service/store/model"
    import ChatRoom from "@/customer-service/components/chat-room.vue"
    import { getUid } from "@/utils"
+    import { generateToken } from "@/service/user"
    @Component({
        components: { ChatRoom },
    })
@@ -51,7 +52,9 @@
        }
        private init() {
+            return generateToken().then(() => {
                return initChat()
+            })
        }
    }
 </script>