From 0bd0c3938bd7dce094b7bfacebd31af1cfb898f5 Mon Sep 17 00:00:00 2001 From: tangtaoit Date: Wed, 26 Jul 2023 19:47:44 +0800 Subject: [PATCH] chore(upgrade): upgrade wukongimjssdk --- apps/web/src/App/index.tsx | 2 +- apps/web/src/index.tsx | 4 +- packages/tsdaodaobase/package.json | 2 +- packages/tsdaodaobase/src/App.tsx | 6 +- .../src/Components/ChannelAvatar/index.tsx | 2 +- .../src/Components/ChannelBlacklist/index.tsx | 4 +- .../Components/ChannelManagerList/index.tsx | 2 +- .../src/Components/ChannelQRCode/index.tsx | 2 +- .../src/Components/ChannelQRCode/vm.tsx | 2 +- .../src/Components/ChannelSetting/context.tsx | 2 +- .../src/Components/ChannelSetting/index.tsx | 2 +- .../src/Components/ChannelSetting/vm.ts | 4 +- .../src/Components/Conversation/context.ts | 2 +- .../src/Components/Conversation/index.tsx | 2 +- .../src/Components/Conversation/vm.ts | 6 +- .../src/Components/ConversationList/index.tsx | 4 +- .../Components/ConversationSelect/index.tsx | 2 +- .../tsdaodaobase/src/Components/MeInfo/vm.tsx | 4 +- .../MergeforwardMessageList/index.tsx | 2 +- .../src/Components/MessageInput/index.tsx | 2 +- .../src/Components/Subscribers/index.tsx | 2 +- .../src/Components/Subscribers/vm.ts | 2 +- .../src/Components/UserInfo/index.tsx | 2 +- .../src/Components/UserInfo/vm.tsx | 4 +- .../src/Components/WKAvatar/index.tsx | 2 +- .../src/Components/WKBase/index.tsx | 2 +- packages/tsdaodaobase/src/EndpointCommon.tsx | 2 +- .../tsdaodaobase/src/Messages/Base/head.tsx | 2 +- .../tsdaodaobase/src/Messages/Base/index.tsx | 4 +- .../tsdaodaobase/src/Messages/Base/tail.tsx | 2 +- .../tsdaodaobase/src/Messages/Card/index.tsx | 2 +- .../tsdaodaobase/src/Messages/Gif/index.tsx | 2 +- .../src/Messages/HistorySplit/index.tsx | 2 +- .../tsdaodaobase/src/Messages/Image/index.tsx | 2 +- .../src/Messages/Location/index.tsx | 2 +- .../src/Messages/LottieSticker/index.tsx | 2 +- .../src/Messages/Mergeforward/index.tsx | 4 +- .../src/Messages/Revoke/index.tsx | 4 +- .../src/Messages/Screenshot/index.tsx | 2 +- .../Messages/SignalMessage/signalmessage.tsx | 2 +- .../src/Messages/System/index.tsx | 2 +- .../tsdaodaobase/src/Messages/Time/index.tsx | 2 +- .../src/Messages/Typing/index.tsx | 2 +- .../src/Messages/Unknown/index.tsx | 2 +- .../src/Messages/Unsupport/index.tsx | 2 +- .../tsdaodaobase/src/Messages/Video/index.tsx | 2 +- .../tsdaodaobase/src/Messages/Voice/index.tsx | 2 +- .../tsdaodaobase/src/Pages/Chat/index.tsx | 4 +- packages/tsdaodaobase/src/Pages/Chat/vm.ts | 8 +-- .../src/Service/ChannelSetting.ts | 2 +- .../src/Service/DataSource/DataProvider.ts | 2 +- .../src/Service/DataSource/DataSource.ts | 2 +- .../src/Service/MessageManager.tsx | 2 +- packages/tsdaodaobase/src/Service/Model.tsx | 4 +- .../src/Service/TypingManager.tsx | 2 +- packages/tsdaodaobase/src/module.tsx | 2 +- .../tsdaodaocontacts/src/Contacts/index.tsx | 2 +- .../tsdaodaocontacts/src/GroupSave/vm.tsx | 4 +- .../tsdaodaodatasource/src/conversation.ts | 2 +- packages/tsdaodaodatasource/src/convert.ts | 4 +- packages/tsdaodaodatasource/src/datasource.ts | 2 +- packages/tsdaodaodatasource/src/module.ts | 4 +- packages/tsdaodaodatasource/src/task.ts | 4 +- yarn.lock | 62 +++---------------- 64 files changed, 94 insertions(+), 138 deletions(-) diff --git a/apps/web/src/App/index.tsx b/apps/web/src/App/index.tsx index 5780129..08db5b6 100644 --- a/apps/web/src/App/index.tsx +++ b/apps/web/src/App/index.tsx @@ -3,7 +3,7 @@ import { ContactsList } from '@tsdaodao/contacts'; import React from 'react'; import './index.css'; import AppLayout from '../Layout'; -import { WKSDK } from 'wukongimjssdk/lib/sdk'; +import { WKSDK } from 'wukongimjssdk'; function App() { registerMenus() return ( diff --git a/apps/web/src/index.tsx b/apps/web/src/index.tsx index 0fa403c..a3c0a47 100644 --- a/apps/web/src/index.tsx +++ b/apps/web/src/index.tsx @@ -9,8 +9,8 @@ import { DataSourceModule } from '@tsdaodao/datasource'; import {ContactsModule} from '@tsdaodao/contacts'; -// WKApp.apiClient.config.apiURL = "https://api.botgate.cn/v1/" -WKApp.apiClient.config.apiURL = "/api/v1/" // 正式环境地址 (通用打包镜像，用此相对地址) +WKApp.apiClient.config.apiURL = "https://api.botgate.cn/v1/" +// WKApp.apiClient.config.apiURL = "/api/v1/" // 正式环境地址 (通用打包镜像，用此相对地址) WKApp.apiClient.config.tokenCallback = ()=> { return WKApp.loginInfo.token } diff --git a/packages/tsdaodaobase/package.json b/packages/tsdaodaobase/package.json index 06f3e80..462164f 100644 --- a/packages/tsdaodaobase/package.json +++ b/packages/tsdaodaobase/package.json @@ -14,7 +14,7 @@ "benz-amr-recorder": "^1.1.3", "classnames": "^2.3.1", "hotkeys-js": "^3.8.7", - "wukongimjssdk": "^1.0.5", + "wukongimjssdk": "^1.0.7", "moment": "^2.29.3", "qrcode.react": "^1.0.1", "react": "^17.0.2", diff --git a/packages/tsdaodaobase/src/App.tsx b/packages/tsdaodaobase/src/App.tsx index 06e75e6..8e7533d 100644 --- a/packages/tsdaodaobase/src/App.tsx +++ b/packages/tsdaodaobase/src/App.tsx @@ -4,19 +4,19 @@ import MenusManager from "./Service/Menus"; import { EndpointManager, IModule, ModuleManager } from "./Service/Module"; import { ProviderListener } from "./Service/Provider"; import RouteManager, { ContextRouteManager } from "./Service/Route"; -import { Channel, ChannelTypeGroup, ChannelTypePerson, WKSDK, Message, MessageContentType } from "wukongimjssdk/lib/sdk"; +import { Channel, ChannelTypeGroup, ChannelTypePerson, WKSDK, Message, MessageContentType } from "wukongimjssdk"; import { IConversationProvider } from "./Service/DataSource/DataProvider"; import MessageManager from "./Service/MessageManager"; import { DefaultEmojiService, EmojiService } from "./Service/EmojiService"; import SectionManager, { Row, Section } from "./Service/Section"; import { EndpointCategory } from "./Service/Const"; import { DataSource } from "./Service/DataSource/DataSource"; -import { ConnectAddrCallback } from "wukongimjssdk/lib/provider"; +import { ConnectAddrCallback } from "wukongimjssdk"; import 'animate.css'; import "./App.css" import RouteContext from "./Service/Context"; -import { ConnectStatus } from "wukongimjssdk/lib/connect_manager"; +import { ConnectStatus } from "wukongimjssdk"; import { WKBaseContext } from "./Components/WKBase"; import StorageService from "./Service/StorageService"; import axios from "axios"; diff --git a/packages/tsdaodaobase/src/Components/ChannelAvatar/index.tsx b/packages/tsdaodaobase/src/Components/ChannelAvatar/index.tsx index 526f610..952f8eb 100644 --- a/packages/tsdaodaobase/src/Components/ChannelAvatar/index.tsx +++ b/packages/tsdaodaobase/src/Components/ChannelAvatar/index.tsx @@ -1,6 +1,6 @@ import { Button } from "@douyinfe/semi-ui"; import axios from "axios"; -import { Channel } from "wukongimjssdk/lib/sdk"; +import { Channel } from "wukongimjssdk"; import React from "react"; import { Component } from "react"; import WKApp from "../../App"; diff --git a/packages/tsdaodaobase/src/Components/ChannelBlacklist/index.tsx b/packages/tsdaodaobase/src/Components/ChannelBlacklist/index.tsx index 9d8d330..578ac95 100644 --- a/packages/tsdaodaobase/src/Components/ChannelBlacklist/index.tsx +++ b/packages/tsdaodaobase/src/Components/ChannelBlacklist/index.tsx @@ -1,6 +1,6 @@ import { Toast } from "@douyinfe/semi-ui"; -import { SubscriberChangeListener } from "wukongimjssdk/lib/channel_manager"; -import { WKSDK } from "wukongimjssdk/lib/sdk"; +import { SubscriberChangeListener } from "wukongimjssdk"; +import { WKSDK } from "wukongimjssdk"; import React from "react"; import { Component, ReactNode } from "react"; import WKApp from "../../App"; diff --git a/packages/tsdaodaobase/src/Components/ChannelManagerList/index.tsx b/packages/tsdaodaobase/src/Components/ChannelManagerList/index.tsx index 5f805a4..b422fc7 100644 --- a/packages/tsdaodaobase/src/Components/ChannelManagerList/index.tsx +++ b/packages/tsdaodaobase/src/Components/ChannelManagerList/index.tsx @@ -1,5 +1,5 @@ import { Popconfirm, Toast } from "@douyinfe/semi-ui"; -import { Channel, ChannelTypePerson } from "wukongimjssdk/lib/sdk"; +import { Channel, ChannelTypePerson } from "wukongimjssdk"; import React from "react"; import { Component, ReactNode } from "react"; import WKApp from "../../App"; diff --git a/packages/tsdaodaobase/src/Components/ChannelQRCode/index.tsx b/packages/tsdaodaobase/src/Components/ChannelQRCode/index.tsx index 344e91c..0c2ec92 100644 --- a/packages/tsdaodaobase/src/Components/ChannelQRCode/index.tsx +++ b/packages/tsdaodaobase/src/Components/ChannelQRCode/index.tsx @@ -1,7 +1,7 @@ import React, { Component } from "react"; import QRCode from 'qrcode.react'; import "./index.css" -import { Channel, WKSDK } from "wukongimjssdk/lib/sdk"; +import { Channel, WKSDK } from "wukongimjssdk"; import WKApp from "../../App"; import Provider from "../../Service/Provider"; import { ChannelQRCodeVM } from "./vm"; diff --git a/packages/tsdaodaobase/src/Components/ChannelQRCode/vm.tsx b/packages/tsdaodaobase/src/Components/ChannelQRCode/vm.tsx index 78dc635..38c7e97 100644 --- a/packages/tsdaodaobase/src/Components/ChannelQRCode/vm.tsx +++ b/packages/tsdaodaobase/src/Components/ChannelQRCode/vm.tsx @@ -1,4 +1,4 @@ -import { Channel } from "wukongimjssdk/lib/sdk"; +import { Channel } from "wukongimjssdk"; import WKApp from "../../App"; import { ChannelQrcodeResp } from "../../Service/DataSource/DataSource"; import { ProviderListener } from "../../Service/Provider"; diff --git a/packages/tsdaodaobase/src/Components/ChannelSetting/context.tsx b/packages/tsdaodaobase/src/Components/ChannelSetting/context.tsx index b1852cb..c070e0f 100644 --- a/packages/tsdaodaobase/src/Components/ChannelSetting/context.tsx +++ b/packages/tsdaodaobase/src/Components/ChannelSetting/context.tsx @@ -1,4 +1,4 @@ -import { Channel, ChannelInfo, Subscriber } from "wukongimjssdk/lib/sdk"; +import { Channel, ChannelInfo, Subscriber } from "wukongimjssdk"; import { GroupRole } from "../../Service/Const"; import RouteContext, { RouteContextConfig } from "../../Service/Context"; import ConversationContext from "../Conversation/context"; diff --git a/packages/tsdaodaobase/src/Components/ChannelSetting/index.tsx b/packages/tsdaodaobase/src/Components/ChannelSetting/index.tsx index b84658e..ac0f4d8 100644 --- a/packages/tsdaodaobase/src/Components/ChannelSetting/index.tsx +++ b/packages/tsdaodaobase/src/Components/ChannelSetting/index.tsx @@ -1,6 +1,6 @@ import { Button, Spin } from "@douyinfe/semi-ui"; import classNames from "classnames"; -import { Channel, ChannelInfo, WKSDK, Subscriber } from "wukongimjssdk/lib/sdk"; +import { Channel, ChannelInfo, WKSDK, Subscriber } from "wukongimjssdk"; import React from "react"; import { Component } from "react"; import WKApp from "../../App"; diff --git a/packages/tsdaodaobase/src/Components/ChannelSetting/vm.ts b/packages/tsdaodaobase/src/Components/ChannelSetting/vm.ts index 47cdd04..f440438 100644 --- a/packages/tsdaodaobase/src/Components/ChannelSetting/vm.ts +++ b/packages/tsdaodaobase/src/Components/ChannelSetting/vm.ts @@ -1,5 +1,5 @@ -import { ChannelInfoListener, SubscriberChangeListener } from "wukongimjssdk/lib/channel_manager"; -import { Channel, ChannelInfo, ChannelTypePerson, WKSDK, Subscriber } from "wukongimjssdk/lib/sdk"; +import { ChannelInfoListener, SubscriberChangeListener } from "wukongimjssdk"; +import { Channel, ChannelInfo, ChannelTypePerson, WKSDK, Subscriber } from "wukongimjssdk"; import { GroupRole, SubscriberStatus } from "../../Service/Const"; import RouteContext from "../../Service/Context"; import WKApp from "../../App"; diff --git a/packages/tsdaodaobase/src/Components/Conversation/context.ts b/packages/tsdaodaobase/src/Components/Conversation/context.ts index 30a3cec..cdbccdc 100644 --- a/packages/tsdaodaobase/src/Components/Conversation/context.ts +++ b/packages/tsdaodaobase/src/Components/Conversation/context.ts @@ -1,4 +1,4 @@ -import { Channel, Message, MessageContent } from "wukongimjssdk/lib/sdk"; +import { Channel, Message, MessageContent } from "wukongimjssdk"; import { MessageInputContext } from "../MessageInput"; diff --git a/packages/tsdaodaobase/src/Components/Conversation/index.tsx b/packages/tsdaodaobase/src/Components/Conversation/index.tsx index feea92c..1d362ac 100644 --- a/packages/tsdaodaobase/src/Components/Conversation/index.tsx +++ b/packages/tsdaodaobase/src/Components/Conversation/index.tsx @@ -1,4 +1,4 @@ -import { Channel, ChannelTypeGroup, ChannelTypePerson, ConversationAction, WKSDK, Mention, Message, MessageContent, Reminder, ReminderType, Reply,MessageText } from "wukongimjssdk/lib/sdk"; +import { Channel, ChannelTypeGroup, ChannelTypePerson, ConversationAction, WKSDK, Mention, Message, MessageContent, Reminder, ReminderType, Reply,MessageText } from "wukongimjssdk"; import React, { Component, HTMLProps } from "react"; import Provider from "../../Service/Provider"; import ConversationVM from "./vm"; diff --git a/packages/tsdaodaobase/src/Components/Conversation/vm.ts b/packages/tsdaodaobase/src/Components/Conversation/vm.ts index bac978a..367e23e 100644 --- a/packages/tsdaodaobase/src/Components/Conversation/vm.ts +++ b/packages/tsdaodaobase/src/Components/Conversation/vm.ts @@ -1,4 +1,4 @@ -import { Channel, ChannelTypeGroup, ChannelTypePerson, ConversationAction, WKSDK, Message, MessageContent, MessageStatus, Subscriber, Conversation, MessageExtra,CMDContent, PullMode } from "wukongimjssdk/lib/sdk"; +import { Channel, ChannelTypeGroup, ChannelTypePerson, ConversationAction, WKSDK, Message, MessageContent, MessageStatus, Subscriber, Conversation, MessageExtra,CMDContent, PullMode } from "wukongimjssdk"; import WKApp from "../../App"; import { SyncMessageOptions } from "../../Service/DataSource/DataProvider"; import { MessageWrap } from "../../Service/Model"; @@ -8,8 +8,8 @@ import { EndpointID, MessageContentTypeConst, OrderFactor } from "../../Service/ import moment from 'moment' import { TimeContent } from "../../Messages/Time"; import { HistorySplitContent } from "../../Messages/HistorySplit"; -import { MessageListener, MessageStatusListener } from "wukongimjssdk/lib/chat_manager"; -import { SendackPacket, Setting } from "wukongimjssdk/lib/proto"; +import { MessageListener, MessageStatusListener } from "wukongimjssdk"; +import { SendackPacket, Setting } from "wukongimjssdk"; import MergeforwardContent from "../../Messages/Mergeforward"; import { TypingListener, TypingManager } from "../../Service/TypingManager"; diff --git a/packages/tsdaodaobase/src/Components/ConversationList/index.tsx b/packages/tsdaodaobase/src/Components/ConversationList/index.tsx index 6862faf..2b8c5c3 100644 --- a/packages/tsdaodaobase/src/Components/ConversationList/index.tsx +++ b/packages/tsdaodaobase/src/Components/ConversationList/index.tsx @@ -1,6 +1,6 @@ import WKSDK from "wukongimjssdk"; -import { ChannelInfoListener } from "wukongimjssdk/lib/channel_manager"; -import { Channel, ChannelInfo, ChannelTypePerson } from "wukongimjssdk/lib/sdk"; +import { ChannelInfoListener } from "wukongimjssdk"; +import { Channel, ChannelInfo, ChannelTypePerson } from "wukongimjssdk"; import React, { Component } from "react"; import { ConversationWrap, MessageWrap } from "../../Service/Model"; import { getTimeStringAutoShort2 } from '../../Utils/time' diff --git a/packages/tsdaodaobase/src/Components/ConversationSelect/index.tsx b/packages/tsdaodaobase/src/Components/ConversationSelect/index.tsx index 330079f..5a94321 100644 --- a/packages/tsdaodaobase/src/Components/ConversationSelect/index.tsx +++ b/packages/tsdaodaobase/src/Components/ConversationSelect/index.tsx @@ -1,4 +1,4 @@ -import { WKSDK,Channel, ChannelInfo } from "wukongimjssdk/lib/sdk"; +import { WKSDK,Channel, ChannelInfo } from "wukongimjssdk"; import { Component } from "react"; import Checkbox from "../Checkbox"; import { animateScroll } from 'react-scroll'; diff --git a/packages/tsdaodaobase/src/Components/MeInfo/vm.tsx b/packages/tsdaodaobase/src/Components/MeInfo/vm.tsx index cd30411..4f0c2a0 100644 --- a/packages/tsdaodaobase/src/Components/MeInfo/vm.tsx +++ b/packages/tsdaodaobase/src/Components/MeInfo/vm.tsx @@ -11,8 +11,8 @@ import { ListItemAvatar } from "../ListItemAvatar"; import axios from "axios"; import { Toast } from "@douyinfe/semi-ui"; import WKSDK from "wukongimjssdk"; -import { ChannelInfoListener } from "wukongimjssdk/lib/channel_manager"; -import { ChannelInfo, ChannelTypePerson } from "wukongimjssdk/lib/model"; +import { ChannelInfoListener } from "wukongimjssdk"; +import { ChannelInfo, ChannelTypePerson } from "wukongimjssdk"; export class MeInfoVM extends ProviderListener { channelInfoListener!:ChannelInfoListener diff --git a/packages/tsdaodaobase/src/Components/MergeforwardMessageList/index.tsx b/packages/tsdaodaobase/src/Components/MergeforwardMessageList/index.tsx index 2a430e6..fb6337b 100644 --- a/packages/tsdaodaobase/src/Components/MergeforwardMessageList/index.tsx +++ b/packages/tsdaodaobase/src/Components/MergeforwardMessageList/index.tsx @@ -1,4 +1,4 @@ -import { Channel, ChannelTypeGroup, ChannelTypePerson, WKSDK, Message, MessageContentType } from "wukongimjssdk/lib/sdk"; +import { Channel, ChannelTypeGroup, ChannelTypePerson, WKSDK, Message, MessageContentType } from "wukongimjssdk"; import React from "react"; import { Component, ReactNode } from "react"; import { ImageContent } from "../../Messages/Image"; diff --git a/packages/tsdaodaobase/src/Components/MessageInput/index.tsx b/packages/tsdaodaobase/src/Components/MessageInput/index.tsx index b13790e..d05d575 100644 --- a/packages/tsdaodaobase/src/Components/MessageInput/index.tsx +++ b/packages/tsdaodaobase/src/Components/MessageInput/index.tsx @@ -3,7 +3,7 @@ import { MentionsInput, Mention, SuggestionDataItem } from 'react-mentions' import ConversationContext from "../Conversation/context"; import clazz from 'classnames'; import './mention.css' -import { Channel, ChannelTypePerson, Subscriber } from "wukongimjssdk/lib/sdk"; +import { Channel, ChannelTypePerson, Subscriber } from "wukongimjssdk"; import hotkeys from 'hotkeys-js'; import WKApp from "../../App"; import "./index.css" diff --git a/packages/tsdaodaobase/src/Components/Subscribers/index.tsx b/packages/tsdaodaobase/src/Components/Subscribers/index.tsx index 5a67460..bd92d41 100644 --- a/packages/tsdaodaobase/src/Components/Subscribers/index.tsx +++ b/packages/tsdaodaobase/src/Components/Subscribers/index.tsx @@ -1,4 +1,4 @@ -import { Channel, WKSDK, Subscriber } from "wukongimjssdk/lib/sdk"; +import { Channel, WKSDK, Subscriber } from "wukongimjssdk"; import React from "react"; import { Component } from "react"; import Provider from "../../Service/Provider"; diff --git a/packages/tsdaodaobase/src/Components/Subscribers/vm.ts b/packages/tsdaodaobase/src/Components/Subscribers/vm.ts index 34c2286..41a3218 100644 --- a/packages/tsdaodaobase/src/Components/Subscribers/vm.ts +++ b/packages/tsdaodaobase/src/Components/Subscribers/vm.ts @@ -1,4 +1,4 @@ -import { Subscriber } from "wukongimjssdk/lib/sdk"; +import { Subscriber } from "wukongimjssdk"; import { GroupRole } from "../../Service/Const"; import WKApp from "../../App"; import { ProviderListener } from "../../Service/Provider"; diff --git a/packages/tsdaodaobase/src/Components/UserInfo/index.tsx b/packages/tsdaodaobase/src/Components/UserInfo/index.tsx index 6e1eddc..bf2f922 100644 --- a/packages/tsdaodaobase/src/Components/UserInfo/index.tsx +++ b/packages/tsdaodaobase/src/Components/UserInfo/index.tsx @@ -1,5 +1,5 @@ import { Button, Spin, Toast } from "@douyinfe/semi-ui"; -import { Channel, ChannelTypePerson } from "wukongimjssdk/lib/sdk"; +import { Channel, ChannelTypePerson } from "wukongimjssdk"; import React, { Component, HTMLProps, ReactNode } from "react"; import { UserRelation } from "../../Service/Const"; import WKApp, { FriendApply } from "../../App"; diff --git a/packages/tsdaodaobase/src/Components/UserInfo/vm.tsx b/packages/tsdaodaobase/src/Components/UserInfo/vm.tsx index 82a5557..5f3c06d 100644 --- a/packages/tsdaodaobase/src/Components/UserInfo/vm.tsx +++ b/packages/tsdaodaobase/src/Components/UserInfo/vm.tsx @@ -1,5 +1,5 @@ -import { ChannelInfoListener, SubscriberChangeListener } from "wukongimjssdk/lib/channel_manager"; -import { Channel, ChannelInfo, ChannelTypePerson, WKSDK, Subscriber } from "wukongimjssdk/lib/sdk"; +import { ChannelInfoListener, SubscriberChangeListener } from "wukongimjssdk"; +import { Channel, ChannelInfo, ChannelTypePerson, WKSDK, Subscriber } from "wukongimjssdk"; import { Section } from "../../Service/Section"; import { ProviderListener } from "../../Service/Provider"; import WKApp from "../../App"; diff --git a/packages/tsdaodaobase/src/Components/WKAvatar/index.tsx b/packages/tsdaodaobase/src/Components/WKAvatar/index.tsx index 830c3ef..becf0bc 100644 --- a/packages/tsdaodaobase/src/Components/WKAvatar/index.tsx +++ b/packages/tsdaodaobase/src/Components/WKAvatar/index.tsx @@ -1,4 +1,4 @@ -import { Channel } from "wukongimjssdk/lib/model"; +import { Channel } from "wukongimjssdk"; import React from "react"; import { Component, CSSProperties } from "react"; import WKApp from "../../App"; diff --git a/packages/tsdaodaobase/src/Components/WKBase/index.tsx b/packages/tsdaodaobase/src/Components/WKBase/index.tsx index 752b042..4813124 100644 --- a/packages/tsdaodaobase/src/Components/WKBase/index.tsx +++ b/packages/tsdaodaobase/src/Components/WKBase/index.tsx @@ -1,5 +1,5 @@ import { Modal } from "@douyinfe/semi-ui"; -import { Channel } from "wukongimjssdk/lib/sdk"; +import { Channel } from "wukongimjssdk"; import React, { Component, HTMLProps, ReactNode } from "react"; import ConversationSelect from "../ConversationSelect"; import UserInfo from "../UserInfo"; diff --git a/packages/tsdaodaobase/src/EndpointCommon.tsx b/packages/tsdaodaobase/src/EndpointCommon.tsx index 5901c0c..f1c69ec 100644 --- a/packages/tsdaodaobase/src/EndpointCommon.tsx +++ b/packages/tsdaodaobase/src/EndpointCommon.tsx @@ -1,4 +1,4 @@ -import { Channel, WKSDK, Message } from "wukongimjssdk/lib/sdk"; +import { Channel, WKSDK, Message } from "wukongimjssdk"; import WKApp from "./App"; import React, { Component, ReactNode } from "react"; import { ChatContentPage } from "./Pages/Chat"; diff --git a/packages/tsdaodaobase/src/Messages/Base/head.tsx b/packages/tsdaodaobase/src/Messages/Base/head.tsx index a7454d5..8a7d8c7 100644 --- a/packages/tsdaodaobase/src/Messages/Base/head.tsx +++ b/packages/tsdaodaobase/src/Messages/Base/head.tsx @@ -1,4 +1,4 @@ -import { Channel, ChannelTypePerson,WKSDK } from "wukongimjssdk/lib/sdk"; +import { Channel, ChannelTypePerson,WKSDK } from "wukongimjssdk"; import React from "react"; import { Component } from "react"; import { BubblePosition, MessageWrap } from "../../Service/Model"; diff --git a/packages/tsdaodaobase/src/Messages/Base/index.tsx b/packages/tsdaodaobase/src/Messages/Base/index.tsx index 48ff1e0..0278f63 100644 --- a/packages/tsdaodaobase/src/Messages/Base/index.tsx +++ b/packages/tsdaodaobase/src/Messages/Base/index.tsx @@ -1,6 +1,6 @@ import WKSDK from "wukongimjssdk"; -import { ChannelInfoListener } from "wukongimjssdk/lib/channel_manager"; -import { Channel, ChannelInfo, ChannelTypePerson, MessageStatus } from "wukongimjssdk/lib/model"; +import { ChannelInfoListener } from "wukongimjssdk"; +import { Channel, ChannelInfo, ChannelTypePerson, MessageStatus } from "wukongimjssdk"; import { Component, CSSProperties, HTMLProps } from "react"; import './index.css' import { BubblePosition, MessageWrap } from "../../Service/Model"; diff --git a/packages/tsdaodaobase/src/Messages/Base/tail.tsx b/packages/tsdaodaobase/src/Messages/Base/tail.tsx index 5a0e1e3..b98bc88 100644 --- a/packages/tsdaodaobase/src/Messages/Base/tail.tsx +++ b/packages/tsdaodaobase/src/Messages/Base/tail.tsx @@ -1,4 +1,4 @@ -import { MessageStatus } from "wukongimjssdk/lib/sdk"; +import { MessageStatus } from "wukongimjssdk"; import moment from "moment"; import React from "react"; import { Component, CSSProperties } from "react"; diff --git a/packages/tsdaodaobase/src/Messages/Card/index.tsx b/packages/tsdaodaobase/src/Messages/Card/index.tsx index 8919745..3652179 100644 --- a/packages/tsdaodaobase/src/Messages/Card/index.tsx +++ b/packages/tsdaodaobase/src/Messages/Card/index.tsx @@ -1,4 +1,4 @@ -import { Channel, ChannelTypePerson, MessageContent } from "wukongimjssdk/lib/sdk" +import { Channel, ChannelTypePerson, MessageContent } from "wukongimjssdk" import React from "react" import WKBase, { WKBaseContext } from "../../Components/WKBase" import WKApp from "../../App" diff --git a/packages/tsdaodaobase/src/Messages/Gif/index.tsx b/packages/tsdaodaobase/src/Messages/Gif/index.tsx index f0f2219..23b0945 100644 --- a/packages/tsdaodaobase/src/Messages/Gif/index.tsx +++ b/packages/tsdaodaobase/src/Messages/Gif/index.tsx @@ -1,4 +1,4 @@ -import { MessageContent } from "wukongimjssdk/lib/sdk" +import { MessageContent } from "wukongimjssdk" import React from "react" import WKApp from "../../App" import MessageBase from "../Base" diff --git a/packages/tsdaodaobase/src/Messages/HistorySplit/index.tsx b/packages/tsdaodaobase/src/Messages/HistorySplit/index.tsx index 1d478f5..68f425f 100644 --- a/packages/tsdaodaobase/src/Messages/HistorySplit/index.tsx +++ b/packages/tsdaodaobase/src/Messages/HistorySplit/index.tsx @@ -1,4 +1,4 @@ -import { MessageContent } from "wukongimjssdk/lib/model"; +import { MessageContent } from "wukongimjssdk"; import React from "react"; import { MessageContentTypeConst } from "../../Service/Const"; import { MessageCell } from "../MessageCell"; diff --git a/packages/tsdaodaobase/src/Messages/Image/index.tsx b/packages/tsdaodaobase/src/Messages/Image/index.tsx index aabd470..4064973 100644 --- a/packages/tsdaodaobase/src/Messages/Image/index.tsx +++ b/packages/tsdaodaobase/src/Messages/Image/index.tsx @@ -1,4 +1,4 @@ -import { MediaMessageContent } from "wukongimjssdk/lib/sdk" +import { MediaMessageContent } from "wukongimjssdk" import React from "react" import WKApp from "../../App" import { MessageContentTypeConst } from "../../Service/Const" diff --git a/packages/tsdaodaobase/src/Messages/Location/index.tsx b/packages/tsdaodaobase/src/Messages/Location/index.tsx index b59a204..3f0a07b 100644 --- a/packages/tsdaodaobase/src/Messages/Location/index.tsx +++ b/packages/tsdaodaobase/src/Messages/Location/index.tsx @@ -1,4 +1,4 @@ -import { MessageContent } from "wukongimjssdk/lib/sdk" +import { MessageContent } from "wukongimjssdk" import React from "react" import WKApp from "../../App" import MessageBase from "../Base" diff --git a/packages/tsdaodaobase/src/Messages/LottieSticker/index.tsx b/packages/tsdaodaobase/src/Messages/LottieSticker/index.tsx index 35fb874..dc1f469 100644 --- a/packages/tsdaodaobase/src/Messages/LottieSticker/index.tsx +++ b/packages/tsdaodaobase/src/Messages/LottieSticker/index.tsx @@ -1,4 +1,4 @@ -import { MessageContent } from "wukongimjssdk/lib/sdk" +import { MessageContent } from "wukongimjssdk" import React from "react" import WKApp from "../../App" import { MessageContentTypeConst } from "../../Service/Const" diff --git a/packages/tsdaodaobase/src/Messages/Mergeforward/index.tsx b/packages/tsdaodaobase/src/Messages/Mergeforward/index.tsx index 508cb54..493d34d 100644 --- a/packages/tsdaodaobase/src/Messages/Mergeforward/index.tsx +++ b/packages/tsdaodaobase/src/Messages/Mergeforward/index.tsx @@ -1,6 +1,6 @@ import { Modal } from "@douyinfe/semi-ui" -import { ChannelInfoListener } from "wukongimjssdk/lib/channel_manager" -import { Channel, ChannelTypeGroup, ChannelTypePerson, WKSDK, Message, MessageContent } from "wukongimjssdk/lib/sdk" +import { ChannelInfoListener } from "wukongimjssdk" +import { Channel, ChannelTypeGroup, ChannelTypePerson, WKSDK, Message, MessageContent } from "wukongimjssdk" import React from "react" import MergeforwardMessageList from "../../Components/MergeforwardMessageList" import { MessageContentTypeConst } from "../../Service/Const" diff --git a/packages/tsdaodaobase/src/Messages/Revoke/index.tsx b/packages/tsdaodaobase/src/Messages/Revoke/index.tsx index 8a6faae..8b67c50 100644 --- a/packages/tsdaodaobase/src/Messages/Revoke/index.tsx +++ b/packages/tsdaodaobase/src/Messages/Revoke/index.tsx @@ -1,10 +1,10 @@ -import { Channel, ChannelInfo, ChannelTypePerson, WKSDK } from "wukongimjssdk/lib/sdk" +import { Channel, ChannelInfo, ChannelTypePerson, WKSDK } from "wukongimjssdk" import { MessageCell } from '../MessageCell' import { MessageWrap } from '../../Service/Model' import WKApp from '../../App' import React from 'react' import "./index.css" -import { ChannelInfoListener } from "wukongimjssdk/lib/channel_manager" +import { ChannelInfoListener } from "wukongimjssdk" export class RevokeCell extends MessageCell { diff --git a/packages/tsdaodaobase/src/Messages/Screenshot/index.tsx b/packages/tsdaodaobase/src/Messages/Screenshot/index.tsx index 01fafd3..d9e4d1d 100644 --- a/packages/tsdaodaobase/src/Messages/Screenshot/index.tsx +++ b/packages/tsdaodaobase/src/Messages/Screenshot/index.tsx @@ -1,4 +1,4 @@ -import { Channel, ChannelTypePerson, WKSDK, MessageContent } from "wukongimjssdk/lib/sdk"; +import { Channel, ChannelTypePerson, WKSDK, MessageContent } from "wukongimjssdk"; import React from "react"; import WKApp from "../../App"; import { MessageContentTypeConst } from "../../Service/Const"; diff --git a/packages/tsdaodaobase/src/Messages/SignalMessage/signalmessage.tsx b/packages/tsdaodaobase/src/Messages/SignalMessage/signalmessage.tsx index 15e82a8..8fb1b8e 100644 --- a/packages/tsdaodaobase/src/Messages/SignalMessage/signalmessage.tsx +++ b/packages/tsdaodaobase/src/Messages/SignalMessage/signalmessage.tsx @@ -1,4 +1,4 @@ -import { MessageSignalContent } from "wukongimjssdk/lib/sdk" +import { MessageSignalContent } from "wukongimjssdk" import React from "react" import MessageBase from "../Base" import { MessageCell } from "../MessageCell" diff --git a/packages/tsdaodaobase/src/Messages/System/index.tsx b/packages/tsdaodaobase/src/Messages/System/index.tsx index f7443dd..e273760 100644 --- a/packages/tsdaodaobase/src/Messages/System/index.tsx +++ b/packages/tsdaodaobase/src/Messages/System/index.tsx @@ -1,4 +1,4 @@ -import { SystemContent } from "wukongimjssdk/lib/sdk" +import { SystemContent } from "wukongimjssdk" import React from "react" import { MessageCell } from "../MessageCell" import './index.css' diff --git a/packages/tsdaodaobase/src/Messages/Time/index.tsx b/packages/tsdaodaobase/src/Messages/Time/index.tsx index e8a221e..8e61a7a 100644 --- a/packages/tsdaodaobase/src/Messages/Time/index.tsx +++ b/packages/tsdaodaobase/src/Messages/Time/index.tsx @@ -1,4 +1,4 @@ -import { MessageContent } from "wukongimjssdk/lib/sdk"; +import { MessageContent } from "wukongimjssdk"; import moment from 'moment' import React from "react"; import { MessageContentTypeConst } from "../../Service/Const"; diff --git a/packages/tsdaodaobase/src/Messages/Typing/index.tsx b/packages/tsdaodaobase/src/Messages/Typing/index.tsx index 426a6b0..32d75db 100644 --- a/packages/tsdaodaobase/src/Messages/Typing/index.tsx +++ b/packages/tsdaodaobase/src/Messages/Typing/index.tsx @@ -1,4 +1,4 @@ -import { MessageContent } from "wukongimjssdk/lib/sdk" +import { MessageContent } from "wukongimjssdk" import React from "react" import { BeatLoader } from "react-spinners" import { MessageContentTypeConst } from "../../Service/Const" diff --git a/packages/tsdaodaobase/src/Messages/Unknown/index.tsx b/packages/tsdaodaobase/src/Messages/Unknown/index.tsx index 1f0c2f6..b4a1986 100644 --- a/packages/tsdaodaobase/src/Messages/Unknown/index.tsx +++ b/packages/tsdaodaobase/src/Messages/Unknown/index.tsx @@ -1,4 +1,4 @@ -import { UnknownContent } from "wukongimjssdk/lib/sdk"; +import { UnknownContent } from "wukongimjssdk"; import React from "react"; import MessageBase from "../Base"; import { MessageCell } from "../MessageCell"; diff --git a/packages/tsdaodaobase/src/Messages/Unsupport/index.tsx b/packages/tsdaodaobase/src/Messages/Unsupport/index.tsx index e60bdba..3c5a56a 100644 --- a/packages/tsdaodaobase/src/Messages/Unsupport/index.tsx +++ b/packages/tsdaodaobase/src/Messages/Unsupport/index.tsx @@ -1,4 +1,4 @@ -import { MessageContent } from "wukongimjssdk/lib/sdk"; +import { MessageContent } from "wukongimjssdk"; import React from "react"; import MessageBase from "../Base"; import { MessageCell } from "../MessageCell"; diff --git a/packages/tsdaodaobase/src/Messages/Video/index.tsx b/packages/tsdaodaobase/src/Messages/Video/index.tsx index 95fb027..26b7884 100644 --- a/packages/tsdaodaobase/src/Messages/Video/index.tsx +++ b/packages/tsdaodaobase/src/Messages/Video/index.tsx @@ -1,4 +1,4 @@ -import { MessageContent } from "wukongimjssdk/lib/sdk"; +import { MessageContent } from "wukongimjssdk"; import React from "react"; import WKApp from "../../App"; import MessageBase from "../Base"; diff --git a/packages/tsdaodaobase/src/Messages/Voice/index.tsx b/packages/tsdaodaobase/src/Messages/Voice/index.tsx index b8394c3..79682d8 100644 --- a/packages/tsdaodaobase/src/Messages/Voice/index.tsx +++ b/packages/tsdaodaobase/src/Messages/Voice/index.tsx @@ -1,4 +1,4 @@ -import { MediaMessageContent, MessageContent } from "wukongimjssdk/lib/sdk" +import { MediaMessageContent, MessageContent } from "wukongimjssdk" import React from "react" import "./index.css" import WaveCanvas from "../../Components/WaveCanvas" diff --git a/packages/tsdaodaobase/src/Pages/Chat/index.tsx b/packages/tsdaodaobase/src/Pages/Chat/index.tsx index 345a204..54fd26f 100644 --- a/packages/tsdaodaobase/src/Pages/Chat/index.tsx +++ b/packages/tsdaodaobase/src/Pages/Chat/index.tsx @@ -11,8 +11,8 @@ import { ConversationWrap } from "../../Service/Model"; import WKApp, { ThemeMode } from "../../App"; import ChannelSetting from "../../Components/ChannelSetting"; import classNames from "classnames"; -import { Channel, ChannelInfo, WKSDK } from "wukongimjssdk/lib/sdk"; -import { ChannelInfoListener } from "wukongimjssdk/lib/channel_manager"; +import { Channel, ChannelInfo, WKSDK } from "wukongimjssdk"; +import { ChannelInfoListener } from "wukongimjssdk"; import { ChatMenus } from "../../App"; import ConversationContext from "../../Components/Conversation/context"; diff --git a/packages/tsdaodaobase/src/Pages/Chat/vm.ts b/packages/tsdaodaobase/src/Pages/Chat/vm.ts index 301d9ea..57f7b64 100644 --- a/packages/tsdaodaobase/src/Pages/Chat/vm.ts +++ b/packages/tsdaodaobase/src/Pages/Chat/vm.ts @@ -1,8 +1,8 @@ import WKSDK from "wukongimjssdk"; -import { ChannelInfoListener } from "wukongimjssdk/lib/channel_manager"; -import { ConnectStatus, ConnectStatusListener } from "wukongimjssdk/lib/connect_manager"; -import { ConversationAction, ConversationListener } from "wukongimjssdk/lib/conversation_manager"; -import { Channel, ChannelInfo, Conversation, Message } from "wukongimjssdk/lib/sdk"; +import { ChannelInfoListener } from "wukongimjssdk"; +import { ConnectStatus, ConnectStatusListener } from "wukongimjssdk"; +import { ConversationAction, ConversationListener } from "wukongimjssdk"; +import { Channel, ChannelInfo, Conversation, Message } from "wukongimjssdk"; import WKApp, { MessageDeleteListener } from "../../App"; import { ConversationWrap } from "../../Service/Model"; import { ProviderListener } from "../../Service/Provider"; diff --git a/packages/tsdaodaobase/src/Service/ChannelSetting.ts b/packages/tsdaodaobase/src/Service/ChannelSetting.ts index e1c41ac..1a0b86b 100644 --- a/packages/tsdaodaobase/src/Service/ChannelSetting.ts +++ b/packages/tsdaodaobase/src/Service/ChannelSetting.ts @@ -1,5 +1,5 @@ import { Toast } from "@douyinfe/semi-ui"; -import { Channel } from "wukongimjssdk/lib/model"; +import { Channel } from "wukongimjssdk"; import WKApp from "../App"; diff --git a/packages/tsdaodaobase/src/Service/DataSource/DataProvider.ts b/packages/tsdaodaobase/src/Service/DataSource/DataProvider.ts index 7ab77ec..2580f98 100644 --- a/packages/tsdaodaobase/src/Service/DataSource/DataProvider.ts +++ b/packages/tsdaodaobase/src/Service/DataSource/DataProvider.ts @@ -1,4 +1,4 @@ -import { Channel, Conversation, Message, MessageExtra, PullMode } from "wukongimjssdk/lib/sdk" +import { Channel, Conversation, Message, MessageExtra, PullMode } from "wukongimjssdk" export class SyncMessageOptions { diff --git a/packages/tsdaodaobase/src/Service/DataSource/DataSource.ts b/packages/tsdaodaobase/src/Service/DataSource/DataSource.ts index b9d3d1d..b8b6bd0 100644 --- a/packages/tsdaodaobase/src/Service/DataSource/DataSource.ts +++ b/packages/tsdaodaobase/src/Service/DataSource/DataSource.ts @@ -1,4 +1,4 @@ -import { Channel, ChannelInfo, ConversationExtra, Message } from "wukongimjssdk/lib/sdk"; +import { Channel, ChannelInfo, ConversationExtra, Message } from "wukongimjssdk"; import { APIResp } from "../APIClient"; export type ContactsChangeListener = () => void; diff --git a/packages/tsdaodaobase/src/Service/MessageManager.tsx b/packages/tsdaodaobase/src/Service/MessageManager.tsx index 6036790..9f2df01 100644 --- a/packages/tsdaodaobase/src/Service/MessageManager.tsx +++ b/packages/tsdaodaobase/src/Service/MessageManager.tsx @@ -1,4 +1,4 @@ -import { MessageContentType } from "wukongimjssdk/lib/sdk" +import { MessageContentType } from "wukongimjssdk" import { ElementType } from "react" diff --git a/packages/tsdaodaobase/src/Service/Model.tsx b/packages/tsdaodaobase/src/Service/Model.tsx index 0074267..4d87747 100644 --- a/packages/tsdaodaobase/src/Service/Model.tsx +++ b/packages/tsdaodaobase/src/Service/Model.tsx @@ -1,5 +1,5 @@ -import { Setting } from "wukongimjssdk/lib/proto" -import { Channel, ChannelInfo, ChannelTypePerson, Conversation, WKSDK, Message, MessageContentType, MessageStatus,MessageText } from "wukongimjssdk/lib/sdk" +import { Setting } from "wukongimjssdk" +import { Channel, ChannelInfo, ChannelTypePerson, Conversation, WKSDK, Message, MessageContentType, MessageStatus,MessageText } from "wukongimjssdk" import WKApp from "../App" import { MessageContentTypeConst, MessageReasonCode, OrderFactor } from "./Const" import { DefaultEmojiService } from "./EmojiService" diff --git a/packages/tsdaodaobase/src/Service/TypingManager.tsx b/packages/tsdaodaobase/src/Service/TypingManager.tsx index 28a58c1..104d54d 100644 --- a/packages/tsdaodaobase/src/Service/TypingManager.tsx +++ b/packages/tsdaodaobase/src/Service/TypingManager.tsx @@ -1,4 +1,4 @@ -import { Channel, Message } from "wukongimjssdk/lib/sdk"; +import { Channel, Message } from "wukongimjssdk"; import WKApp from "../App"; import { TypingContent } from "../Messages/Typing"; diff --git a/packages/tsdaodaobase/src/module.tsx b/packages/tsdaodaobase/src/module.tsx index a04d7cc..a2961c3 100644 --- a/packages/tsdaodaobase/src/module.tsx +++ b/packages/tsdaodaobase/src/module.tsx @@ -1,4 +1,4 @@ -import { Channel, ChannelTypePerson, WKSDK, Message, MessageContentType, ConversationAction, ChannelTypeGroup, ChannelInfo,CMDContent, MessageText } from "wukongimjssdk/lib/sdk"; +import { Channel, ChannelTypePerson, WKSDK, Message, MessageContentType, ConversationAction, ChannelTypeGroup, ChannelInfo,CMDContent, MessageText } from "wukongimjssdk"; import React, { ElementType } from "react"; import WKApp, { FriendApply, FriendApplyState, ThemeMode } from "./App"; import ChannelQRCode from "./Components/ChannelQRCode"; diff --git a/packages/tsdaodaocontacts/src/Contacts/index.tsx b/packages/tsdaodaocontacts/src/Contacts/index.tsx index baeea63..719cc4b 100644 --- a/packages/tsdaodaocontacts/src/Contacts/index.tsx +++ b/packages/tsdaodaocontacts/src/Contacts/index.tsx @@ -6,7 +6,7 @@ import { toSimplized } from "@tsdaodao/base"; import { getPinyin } from "@tsdaodao/base"; import classnames from "classnames"; import { Toast } from "@douyinfe/semi-ui"; -import { Channel, ChannelTypePerson, WKSDK } from "wukongimjssdk/lib/sdk"; +import { Channel, ChannelTypePerson, WKSDK } from "wukongimjssdk"; import { ContactsListManager } from "../Service/ContactsListManager"; import { Card } from "@tsdaodao/base/src/Messages/Card"; diff --git a/packages/tsdaodaocontacts/src/GroupSave/vm.tsx b/packages/tsdaodaocontacts/src/GroupSave/vm.tsx index 2bccf94..3670b87 100644 --- a/packages/tsdaodaocontacts/src/GroupSave/vm.tsx +++ b/packages/tsdaodaocontacts/src/GroupSave/vm.tsx @@ -1,6 +1,6 @@ import { WKApp, ProviderListener } from "@tsdaodao/base"; -import { ChannelInfo,WKSDK } from "wukongimjssdk/lib/sdk"; -import { ChannelInfoListener } from "wukongimjssdk/lib/channel_manager"; +import { ChannelInfo,WKSDK } from "wukongimjssdk"; +import { ChannelInfoListener } from "wukongimjssdk"; export class GroupSaveVM extends ProviderListener { groups:ChannelInfo[] = [] channelInfoListener!:ChannelInfoListener diff --git a/packages/tsdaodaodatasource/src/conversation.ts b/packages/tsdaodaodatasource/src/conversation.ts index ccf94dc..f346585 100644 --- a/packages/tsdaodaodatasource/src/conversation.ts +++ b/packages/tsdaodaodatasource/src/conversation.ts @@ -1,6 +1,6 @@ import { IConversationProvider, WKApp, SyncMessageOptions } from "@tsdaodao/base"; import axios from "axios"; -import { Conversation, Message, Channel, MessageExtra } from "wukongimjssdk/lib/sdk"; +import { Conversation, Message, Channel, MessageExtra } from "wukongimjssdk"; import { Convert } from "./convert"; export class ConversationProvider implements IConversationProvider { diff --git a/packages/tsdaodaodatasource/src/convert.ts b/packages/tsdaodaodatasource/src/convert.ts index 0b26176..ceb3aa3 100644 --- a/packages/tsdaodaodatasource/src/convert.ts +++ b/packages/tsdaodaodatasource/src/convert.ts @@ -1,6 +1,6 @@ import BigNumber from "bignumber.js"; -import { Setting } from "wukongimjssdk/lib/proto"; -import { WKSDK, ChannelInfo, Channel, Conversation, Message, MessageStatus, ChannelTypePerson, ChannelTypeGroup,ConversationExtra,Reminder, MessageExtra } from "wukongimjssdk/lib/sdk"; +import { Setting } from "wukongimjssdk"; +import { WKSDK, ChannelInfo, Channel, Conversation, Message, MessageStatus, ChannelTypePerson, ChannelTypeGroup,ConversationExtra,Reminder, MessageExtra } from "wukongimjssdk"; export class Convert { diff --git a/packages/tsdaodaodatasource/src/datasource.ts b/packages/tsdaodaodatasource/src/datasource.ts index 52cd451..dafdd04 100644 --- a/packages/tsdaodaodatasource/src/datasource.ts +++ b/packages/tsdaodaodatasource/src/datasource.ts @@ -1,5 +1,5 @@ import { ChannelQrcodeResp, Contacts, IChannelDataSource, ICommonDataSource, WKApp, RequestConfig } from "@tsdaodao/base"; -import { Channel, ChannelInfo, ChannelTypeGroup, ChannelTypePerson, WKSDK, Message, MessageContentType,ConversationExtra } from "wukongimjssdk/lib/sdk"; +import { Channel, ChannelInfo, ChannelTypeGroup, ChannelTypePerson, WKSDK, Message, MessageContentType,ConversationExtra } from "wukongimjssdk"; export class ChannelDataSource implements IChannelDataSource { diff --git a/packages/tsdaodaodatasource/src/module.ts b/packages/tsdaodaodatasource/src/module.ts index 54073ee..4956a0d 100644 --- a/packages/tsdaodaodatasource/src/module.ts +++ b/packages/tsdaodaodatasource/src/module.ts @@ -1,6 +1,6 @@ import { GroupRole, IModule, WKApp } from "@tsdaodao/base" -import { Channel, ChannelInfo, ChannelTypeGroup, ChannelTypePerson, Conversation, WKSDK, Message, Subscriber, ConversationExtra, Reminder } from "wukongimjssdk/lib/sdk"; -import { MessageTask } from "wukongimjssdk/lib/task"; +import { Channel, ChannelInfo, ChannelTypeGroup, ChannelTypePerson, Conversation, WKSDK, Message, Subscriber, ConversationExtra, Reminder } from "wukongimjssdk"; +import { MessageTask } from "wukongimjssdk"; import { version } from "prettier"; import { ConversationProvider } from "./conversation"; import { Convert } from "./convert"; diff --git a/packages/tsdaodaodatasource/src/task.ts b/packages/tsdaodaodatasource/src/task.ts index dfcb1f4..3c45906 100644 --- a/packages/tsdaodaodatasource/src/task.ts +++ b/packages/tsdaodaodatasource/src/task.ts @@ -1,7 +1,7 @@ import { WKApp } from "@tsdaodao/base"; import axios, { Canceler } from "axios"; -import { MediaMessageContent } from "wukongimjssdk/lib/sdk"; -import { MessageTask, TaskStatus } from "wukongimjssdk/lib/task"; +import { MediaMessageContent } from "wukongimjssdk"; +import { MessageTask, TaskStatus } from "wukongimjssdk"; diff --git a/yarn.lock b/yarn.lock index 87112d5..fc8a6ac 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3549,11 +3549,6 @@ buffer@^6.0.3: base64-js "^1.3.1" ieee754 "^1.2.1" -builtin-modules@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f" - integrity sha512-wxXCdllwGhI2kCC0MnvTGYTMvnVZTvqgypkiTI8Pa5tcz2i6VqsqwYGgqwXji+4RgCzms6EajE4IxiUH6HH8nQ== - builtin-modules@^3.1.0: version "3.3.0" resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-3.3.0.tgz#cae62812b89801e9656336e46223e030386be7b6" @@ -3711,7 +3706,7 @@ case-sensitive-paths-webpack-plugin@2.3.0: resolved "https://registry.yarnpkg.com/case-sensitive-paths-webpack-plugin/-/case-sensitive-paths-webpack-plugin-2.3.0.tgz#23ac613cc9a856e4f88ff8bb73bbb5e989825cf7" integrity sha512-/4YgnZS8y1UXXmC02xD5rRrBEu6T5ub+mQHLNRj0fzTRbgdBYhsNo2V5EqwgqrExjxsjtF/OpAKAMkKsxbD5XQ== -chalk@2.4.2, chalk@^2.0.0, chalk@^2.0.1, chalk@^2.3.0, chalk@^2.4.1, chalk@^2.4.2: +chalk@2.4.2, chalk@^2.0.0, chalk@^2.0.1, chalk@^2.4.1, chalk@^2.4.2: version "2.4.2" resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ== @@ -3937,7 +3932,7 @@ combined-stream@^1.0.8: dependencies: delayed-stream "~1.0.0" -commander@^2.12.1, commander@^2.20.0: +commander@^2.20.0: version "2.20.3" resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== @@ -4681,11 +4676,6 @@ diff-sequences@^26.6.2: resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-26.6.2.tgz#48ba99157de1923412eed41db6b6d4aa9ca7c0b1" integrity sha512-Mv/TDa3nZ9sbc5soK+OoA74BsS3mL37yixCvUAQkiuA4Wz6YtwP/K47n2rv2ovzHZvoiQeA5FTQOschKkEwB0Q== -diff@^4.0.1: - version "4.0.2" - resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.2.tgz#60f3aecb89d5fae520c11aa19efc2bb982aade7d" - integrity sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A== - diffie-hellman@^5.0.0: version "5.0.3" resolved "https://registry.yarnpkg.com/diffie-hellman/-/diffie-hellman-5.0.3.tgz#40e8ee98f55a2149607146921c63e1ae5f3d2875" @@ -9559,7 +9549,7 @@ prepend-http@^1.0.0: resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-1.0.4.tgz#d4f4562b0ce3696e41ac52d0e002e57a635dc6dc" integrity sha512-PhmXi5XmoyKw1Un4E+opM2KcsJInDvKyuOumcjjw3waw86ZNjHwVUOOWLc4bCzLdcKNaWBH9e99sbWzDQsVaYg== -prettier@^2.0.2, prettier@^2.5.1: +prettier@^2.5.1: version "2.7.1" resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.7.1.tgz#e235806850d057f97bb08368a4f7d899f7760c64" integrity sha512-ujppO+MkdPqoVINuDFDRLClm7D78qbDt0/NR+wp5FqEZOoTNAjPHWj17QRhu7geIHJfcNhRk1XVQmF8Bp3ye+g== @@ -10577,7 +10567,7 @@ selfsigned@^1.10.8: dependencies: node-forge "^0.10.0" -"semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.6.0: +"semver@2 || 3 || 4 || 5", semver@^5.4.1, semver@^5.5.0, semver@^5.6.0: version "5.7.1" resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== @@ -11530,7 +11520,7 @@ tsconfig-paths@^3.14.1: minimist "^1.2.6" strip-bom "^3.0.0" -tslib@^1.13.0, tslib@^1.8.1: +tslib@^1.8.1: version "1.14.1" resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00" integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg== @@ -11540,37 +11530,6 @@ tslib@^2.0.3: resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.4.0.tgz#7cecaa7f073ce680a05847aa77be941098f36dc3" integrity sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ== -tslint-config-prettier@^1.18.0: - version "1.18.0" - resolved "https://registry.yarnpkg.com/tslint-config-prettier/-/tslint-config-prettier-1.18.0.tgz#75f140bde947d35d8f0d238e0ebf809d64592c37" - integrity sha512-xPw9PgNPLG3iKRxmK7DWr+Ea/SzrvfHtjFt5LBl61gk2UBG/DB9kCXRjv+xyIU1rUtnayLeMUVJBcMX8Z17nDg== - -tslint@^6.1.0: - version "6.1.3" - resolved "https://registry.yarnpkg.com/tslint/-/tslint-6.1.3.tgz#5c23b2eccc32487d5523bd3a470e9aa31789d904" - integrity sha512-IbR4nkT96EQOvKE2PW/djGz8iGNeJ4rF2mBfiYaR/nvUWYKJhLwimoJKgjIFEIDibBtOevj7BqCRL4oHeWWUCg== - dependencies: - "@babel/code-frame" "^7.0.0" - builtin-modules "^1.1.1" - chalk "^2.3.0" - commander "^2.12.1" - diff "^4.0.1" - glob "^7.1.1" - js-yaml "^3.13.1" - minimatch "^3.0.4" - mkdirp "^0.5.3" - resolve "^1.3.2" - semver "^5.3.0" - tslib "^1.13.0" - tsutils "^2.29.0" - -tsutils@^2.29.0: - version "2.29.0" - resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-2.29.0.tgz#32b488501467acbedd4b85498673a0812aca0b99" - integrity sha512-g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA== - dependencies: - tslib "^1.8.1" - tsutils@^3.17.1, tsutils@^3.21.0: version "3.21.0" resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.21.0.tgz#b48717d394cea6c1e096983eed58e9d61715b623" @@ -12506,10 +12465,10 @@ ws@^7.3.1, ws@^7.4.6: resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.9.tgz#54fa7db29f4c7cec68b1ddd3a89de099942bb591" integrity sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q== -wukongimjssdk@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/wukongimjssdk/-/wukongimjssdk-1.0.5.tgz#0d93282f8049b5de392b40ebb187b9576b4a901d" - integrity sha512-uCHM7iW+o/H4NRFdcVkt6kjoG9RK9naEnmOL/9yaxvBPu6wGFW4aYhq+FQHRt+wW5vu87DRrCKEsrlbZGG9GRQ== +wukongimjssdk@^1.0.7: + version "1.0.7" + resolved "https://registry.yarnpkg.com/wukongimjssdk/-/wukongimjssdk-1.0.7.tgz#a27e97d883837e62bc3c5dcbb8203c52fe03ed1b" + integrity sha512-b9cad02kFsbJys8cF8F1M2olKr0HUfBdvsreJpD4VFOBDep0gHU74KA/tkcdFl+7Pv057Acq5ifg6CNITGEBMw== dependencies: "@types/bignumber.js" "^5.0.0" "@types/crypto-js" "^4.0.2" @@ -12518,9 +12477,6 @@ wukongimjssdk@^1.0.5: crypto-js "^4.1.1" curve25519-js "^0.0.4" md5-typescript "^1.0.5" - prettier "^2.0.2" - tslint "^6.1.0" - tslint-config-prettier "^1.18.0" xml-name-validator@^3.0.0: version "3.0.0"