From 56ac064506ca33818ce89cd892528eaf65e1dc7f Mon Sep 17 00:00:00 2001
From: moonrailgun <moonrailgun@gmail.com>
Date: Thu, 1 Sep 2022 16:10:56 +0800
Subject: [PATCH] =?UTF-8?q?refactor(server):=20=E7=A7=BB=E5=8A=A8call?=
 =?UTF-8?q?=E6=8C=87=E4=BB=A4=E5=88=B0sdk=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/web/src/styles/antd/dark.less               | 2 +-
 server/packages/sdk/src/const.ts                   | 4 ++++
 server/packages/sdk/src/index.ts                   | 3 +++
 server/{ => packages/sdk/src/services}/lib/call.ts | 9 +++------
 server/services/core/chat/converse.service.ts      | 2 +-
 server/services/core/group/group.service.ts        | 2 +-
 server/services/core/group/invite.service.ts       | 2 +-
 7 files changed, 14 insertions(+), 10 deletions(-)
 create mode 100644 server/packages/sdk/src/const.ts
 rename server/{ => packages/sdk/src/services}/lib/call.ts (85%)

diff --git a/client/web/src/styles/antd/dark.less b/client/web/src/styles/antd/dark.less
index 42c1ce3c..e65d38d3 100644
--- a/client/web/src/styles/antd/dark.less
+++ b/client/web/src/styles/antd/dark.less
@@ -82,7 +82,7 @@
 
   // 输入框
   .ant-input {
-    color: rgba(255, 255, 255, 0.65);
+    color: rgba(255, 255, 255, 0.85);
     background-color: transparent;
     border-color: rgba(255, 255, 255, 0.12);
 
diff --git a/server/packages/sdk/src/const.ts b/server/packages/sdk/src/const.ts
new file mode 100644
index 00000000..a6ccd26b
--- /dev/null
+++ b/server/packages/sdk/src/const.ts
@@ -0,0 +1,4 @@
+/**
+ * 系统用户id
+ */
+export const SYSTEM_USERID = '000000000000000000000000';
diff --git a/server/packages/sdk/src/index.ts b/server/packages/sdk/src/index.ts
index ea6f62b3..b96041d2 100644
--- a/server/packages/sdk/src/index.ts
+++ b/server/packages/sdk/src/index.ts
@@ -12,6 +12,7 @@ export type {
 } from './services/types';
 export { parseLanguageFromHead } from './services/lib/i18n/parser';
 export { t } from './services/lib/i18n';
+export { call } from './services/lib/call';
 export {
   config,
   buildUploadUrl,
@@ -32,6 +33,8 @@ export type { UserStruct } from './structs/user';
 // db
 export * as db from './db';
 
+export * from './const';
+
 // other
 export { Utils, Errors } from 'moleculer';
 
diff --git a/server/lib/call.ts b/server/packages/sdk/src/services/lib/call.ts
similarity index 85%
rename from server/lib/call.ts
rename to server/packages/sdk/src/services/lib/call.ts
index 82dabc94..050a0c6f 100644
--- a/server/lib/call.ts
+++ b/server/packages/sdk/src/services/lib/call.ts
@@ -1,7 +1,4 @@
-import type { TcContext } from 'tailchat-server-sdk';
-import type { Group } from '../models/group/group';
-import type { User } from '../models/user/user';
-import { SYSTEM_USERID } from './const';
+import { GroupStruct, UserStruct, SYSTEM_USERID, TcContext } from '../../index';
 
 export function call(ctx: TcContext) {
   return {
@@ -61,7 +58,7 @@ export function call(ctx: TcContext) {
     /**
      * 获取用户信息
      */
-    async getUserInfo(userId: string): Promise<User> {
+    async getUserInfo(userId: string): Promise<UserStruct> {
       return await ctx.call('user.getUserInfo', {
         userId,
       });
@@ -69,7 +66,7 @@ export function call(ctx: TcContext) {
     /**
      * 获取群组信息
      */
-    async getGroupInfo(groupId: string): Promise<Group> {
+    async getGroupInfo(groupId: string): Promise<GroupStruct> {
       return await ctx.call('group.getGroupInfo', {
         groupId,
       });
diff --git a/server/services/core/chat/converse.service.ts b/server/services/core/chat/converse.service.ts
index 6c796293..1a7e52d7 100644
--- a/server/services/core/chat/converse.service.ts
+++ b/server/services/core/chat/converse.service.ts
@@ -6,12 +6,12 @@ import {
   TcService,
   TcContext,
   UserStruct,
+  call,
 } from 'tailchat-server-sdk';
 import type {
   ConverseDocument,
   ConverseModel,
 } from '../../../models/chat/converse';
-import { call } from '../../../lib/call';
 
 interface ConverseService
   extends TcService,
diff --git a/server/services/core/group/group.service.ts b/server/services/core/group/group.service.ts
index f9f43e97..987a0fd5 100644
--- a/server/services/core/group/group.service.ts
+++ b/server/services/core/group/group.service.ts
@@ -19,8 +19,8 @@ import {
   TcContext,
   TcDbService,
   PureContext,
+  call,
 } from 'tailchat-server-sdk';
-import { call } from '../../../lib/call';
 import moment from 'moment';
 import { PERMISSION } from '../../../lib/role';
 
diff --git a/server/services/core/group/invite.service.ts b/server/services/core/group/invite.service.ts
index 1b7c99c1..2c765a09 100644
--- a/server/services/core/group/invite.service.ts
+++ b/server/services/core/group/invite.service.ts
@@ -1,5 +1,4 @@
 import _ from 'lodash';
-import { call } from '../../../lib/call';
 import { NoPermissionError } from '../../../lib/errors';
 import type {
   GroupInvite,
@@ -11,6 +10,7 @@ import {
   TcContext,
   TcDbService,
   PureContext,
+  call,
 } from 'tailchat-server-sdk';
 import { PERMISSION } from '../../../lib/role';