fix: 提交

.env.build

@@ -2,7 +2,7 @@
 #notes: login use mock api
 
 VITE_APP_ENV = 'dev'
-VITE_APP_BASE_URL = ''
+VITE_APP_BASE_URL = http://8.217.50.96:10001
 
 #image or oss address
 VITE_APP_IMAGE_URL = ''

.env.build-test

@@ -2,7 +2,7 @@
 #notes: login use mock api
 
 VITE_APP_ENV = 'dev'
-VITE_APP_BASE_URL = ''
+VITE_APP_BASE_URL = http://8.217.50.96:10001
 
 #image or oss address
 VITE_APP_IMAGE_URL = ''

.env.serve-dev

@@ -2,7 +2,7 @@
 #notes: login use mock api
 
 VITE_APP_ENV = 'dev'
-VITE_APP_BASE_URL = ''
+VITE_APP_BASE_URL = http://8.217.50.96:10001
 
 #image or oss address
 VITE_APP_IMAGE_URL = ''

.env.serve-test

@@ -2,7 +2,7 @@
 #notes: login use mock api
 
 VITE_APP_ENV = 'dev'
-VITE_APP_BASE_URL = ''
+VITE_APP_BASE_URL = http://8.217.50.96:10001
 
 #image or oss address
 VITE_APP_IMAGE_URL = ''

eslintrc/.eslintrc-auto-import.json

@@ -77,6 +77,7 @@
     "shallowReadonly": true,
     "shallowRef": true,
     "sleepTimeout": true,
+    "sm2Encrypt": true,
     "storeToRefs": true,
     "toRaw": true,
     "toRef": true,

package.json

@@ -24,84 +24,86 @@
         "vue": "^3.4.14"
     },
     "dependencies": {
-        "@element-plus/icons-vue": "^2.0.4",
+        "@codemirror/lang-javascript": "^6.2.4",
+        "@codemirror/theme-one-dark": "^6.1.3",
+        "@element-plus/icons-vue": "^2.3.1",
         "axios": "1.6.5",
-        "codemirror": "^6.0.1",
+        "codemirror": "^6.0.2",
+        "easemob-websdk": "^4.15.1",
         "echarts": "5.3.2",
         "element-plus": "2.5.3",
-        "js-error-collection": "^1.0.7",
-        "json-editor-vue3": "^1.0.8",
+        "js-error-collection": "^1.0.8",
+        "json-editor-vue3": "^1.1.1",
         "mitt": "3.0.0",
         "moment-mini": "2.22.1",
         "nprogress": "0.2.0",
         "path": "0.12.7",
         "path-browserify": "^1.0.1",
-        "path-to-regexp": "^6.2.1",
-        "pinia": "^2.0.16",
+        "path-to-regexp": "^6.3.0",
+        "pinia": "^2.3.1",
         "pinia-plugin-persistedstate": "2.3.0",
         "screenfull": "^6.0.2",
-        "sortablejs": "^1.15.0",
-        "vue": "^3.4.14",
+        "sm-crypto": "^0.3.13",
+        "sortablejs": "^1.15.6",
+        "vue": "^3.5.17",
         "vue-clipboard3": "^2.0.0",
         "vue-codemirror": "^6.1.1",
         "vue-i18n": "9.1.10",
-        "vue-router": "^4.1.5",
-        "@codemirror/lang-javascript": "^6.1.0",
-        "@codemirror/theme-one-dark": "^6.1.0"
+        "vue-router": "^4.5.1"
     },
     "devDependencies": {
         "@babel/eslint-parser": "7.16.3",
         "@originjs/vite-plugin-commonjs": "^1.0.3",
         "@types/mockjs": "1.0.10",
-        "@types/node": "^17.0.35",
-        "@types/path-browserify": "^1.0.0",
-        "@types/sortablejs": "^1.15.0",
+        "@types/node": "^17.0.45",
+        "@types/path-browserify": "^1.0.3",
+        "@types/sortablejs": "^1.15.8",
         "@typescript-eslint/eslint-plugin": "5.30.0",
         "@typescript-eslint/parser": "5.30.0",
-        "@vitejs/plugin-legacy": "^5.2.0",
-        "@vitejs/plugin-vue": "^5.0.3",
+        "@vitejs/plugin-legacy": "^5.4.3",
+        "@vitejs/plugin-vue": "^5.2.4",
         "@vitejs/plugin-vue-jsx": "^3.1.0",
         "@vitest/coverage-c8": "^0.33.0",
-        "@vitest/ui": "^1.2.0",
+        "@vitest/ui": "^1.6.1",
         "@vue/cli-plugin-unit-jest": "4.5.17",
         "@vue/cli-service": "5.0.8",
-        "@vue/test-utils": "^2.0.2",
-        "@vueuse/core": "^8.7.5",
+        "@vue/test-utils": "^2.4.6",
+        "@vueuse/core": "^8.9.4",
+        "esbuild": "^0.19.11",
         "eslint": "8.18.0",
         "eslint-config-prettier": "8.5.0",
         "eslint-define-config": "1.5.1",
         "eslint-plugin-eslint-comments": "3.2.0",
         "eslint-plugin-import": "2.26.0",
-        "eslint-plugin-jsonc": "^2.3.0",
-        "eslint-plugin-markdown": "^3.0.0",
+        "eslint-plugin-jsonc": "^2.20.1",
+        "eslint-plugin-markdown": "^3.0.1",
         "eslint-plugin-prettier": "4.1.0",
         "eslint-plugin-simple-import-sort": "^10.0.0",
         "eslint-plugin-unicorn": "^43.0.2",
         "eslint-plugin-vue": "9.1.1",
         "husky": "7.0.2",
         "jsdom": "16.4.0",
-        "jsonc-eslint-parser": "^2.1.0",
+        "jsonc-eslint-parser": "^2.4.0",
         "majestic": "1.8.1",
         "mockjs": "1.1.0",
         "prettier": "2.2.1",
         "resize-observer-polyfill": "^1.5.1",
-        "rollup-plugin-visualizer": "^5.8.3",
+        "rollup-plugin-visualizer": "^5.14.0",
         "sass": "1.77.6",
         "svg-sprite-loader": "6.0.11",
-        "typescript": "^4.7.2",
-        "unocss": "^0.58.3",
-        "unplugin-auto-import": "^0.11.2",
-        "unplugin-vue-components": "^0.22.8",
-
-        "unplugin-vue-define-options": "^0.6.1",
-        "vite": "^5.0.11",
-        "vite-plugin-html": "^3.2.0",
-        "vite-plugin-mkcert": "^1.7.2",
-        "vite-plugin-mock": "^3.0.1",
+        "typescript": "^4.9.5",
+        "unocss": "^0.58.9",
+        "unplugin-auto-import": "^0.11.5",
+        "unplugin-vue-components": "^0.22.12",
+        "unplugin-vue-define-options": "^0.6.2",
+        "vite": "^5.4.19",
+        "vite-plugin-html": "^3.2.2",
+        "vite-plugin-mkcert": "^1.17.8",
+        "vite-plugin-mock": "^3.0.2",
         "vite-plugin-style-import": "1.2.1",
         "vite-plugin-svg-icons": "^2.0.1",
         "vitest": "^0.22.1",
-        "vue-tsc": "^0.34.16"
+        "vue-tsc": "^0.34.17"
     },
     "pnpm": {
         "peerDependencyRules": {

src/api/user.ts

@@ -1,5 +1,5 @@
 //获取用户信息
-import axiosReq from 'axios'
+import axiosReq from '@/utils/axios-req';
 // export const userInfoReq = (): Promise<any> => {
 //   return new Promise((resolve) => {
 //     const reqConfig = {
@@ -16,8 +16,8 @@ import axiosReq from 'axios'
 //登录
 export const loginReq = (subForm) => {
   return axiosReq({
-    url: '/mock/login',
-    params: subForm,
+    url: 'sys/auth/login',
+    data: subForm,
     method: 'post'
   })
 }
@@ -29,3 +29,11 @@ export const loginOutReq = () => {
     method: 'post'
   })
 }
+
+// 获取用户数据
+export const getUserInfoReq = () => {
+  return axiosReq({
+    url: '/sys/user/info',
+    method: 'get'
+  })
+}

src/im-sdk/BaseAdapter.ts

@@ -0,0 +1,35 @@
+import MessageBuffer from "./entity/MessageBuffer";
+import {
+  BaseMessage,
+  ConversationData,
+  ImUserData,
+  MessageData,
+  MessageTempData,
+} from "./types";
+
+export interface LoaderListener {
+  onLogin(): void;
+  onMessage(message: MessageData): void;
+  onConnected(): void;
+  onDisconnected(): void;
+}
+
+export interface BaseAdapter {
+  listener: LoaderListener;
+  login(userId: string, token: string): Promise<boolean>;
+  logout(): void;
+  addListener(listener: LoaderListener): void;
+
+  fetchConversations(): Promise<ConversationData[]>;
+  /**需要返回从旧到新的 */
+  fetchMessageList(
+    userId: string,
+    cursor: string
+  ): Promise<{ cursor: string; list: MessageData[]; isEnd?: boolean }>;
+
+  sendMessage(message: MessageTempData): Promise<MessageData | undefined>;
+
+  buildConversation(base: ConversationData): ConversationData;
+
+  fetchUser(imId: string): Promise<ImUserData>;
+}