diff --git a/public/favicon.ico b/public/favicon.ico
index 2b8baf4..433a9b2 100644
Binary files a/public/favicon.ico and b/public/favicon.ico differ
diff --git a/public/index.html b/public/index.html
index b7ae9ff..520972e 100644
--- a/public/index.html
+++ b/public/index.html
@@ -24,7 +24,7 @@
       work correctly both with client-side routing and a non-root public URL.
       Learn how to configure a non-root public URL by running `npm run build`.
     -->
-  <title>React Antd Admin管理后台</title>
+  <title>BuzzUp</title>
 </head>
 
 <body>
@@ -35,7 +35,7 @@
   <script>
     // 切换为当前主题
     const themeStyle = localStorage.getItem('themeStyle')
-    if(themeStyle) {
+    if (themeStyle) {
       const styles = document.createElement('style')
       styles.id = 'less:color'
       styles.innerText = themeStyle
@@ -54,4 +54,4 @@
     -->
 </body>
 
-</html>
+</html>
\ No newline at end of file
diff --git a/src/api/chat.ts b/src/api/chat.ts
new file mode 100644
index 0000000..aeea21f
--- /dev/null
+++ b/src/api/chat.ts
@@ -0,0 +1,4 @@
+import $axios from '@/utils/axios'
+
+export const chat_userList = (params) => $axios.post('/admin/openImUserList', params)
+export const chat_groupList = (params) => $axios.post('/admin/openImGroupList', params)
\ No newline at end of file
diff --git a/src/app.css b/src/app.css
index ee7c514..1cb9eb1 100644
--- a/src/app.css
+++ b/src/app.css
@@ -1,4 +1,8 @@
-.text-overflow{
+@tailwind base;
+@tailwind components;
+@tailwind utilities;
+
+.text-overflow {
   display: -webkit-box;
   -webkit-box-orient: vertical;
   -webkit-line-clamp: 3;
@@ -6,6 +10,6 @@
   text-overflow: ellipsis;
 }
 
-.tp{
+.tp {
   cursor: pointer;
 }
\ No newline at end of file
diff --git a/src/assets/img/logo.png b/src/assets/img/logo.png
index 56ab7f4..954f8e8 100644
Binary files a/src/assets/img/logo.png and b/src/assets/img/logo.png differ
diff --git a/src/components/Header/index.tsx b/src/components/Header/index.tsx
index 4ae3f5e..0d3e1f8 100644
--- a/src/components/Header/index.tsx
+++ b/src/components/Header/index.tsx
@@ -7,7 +7,7 @@ import { connect } from 'react-redux'
 import * as actions from '@/store/actions'
 import style from './Header.module.less'
 
-interface Props extends ReduxProps {}
+interface Props extends ReduxProps { }
 
 const Header: FC<Props> = ({
   storeData: { collapsed, theme, userInfo },
diff --git a/src/components/Menu/index.tsx b/src/components/Menu/index.tsx
index 4e2afb3..e3e1cf7 100644
--- a/src/components/Menu/index.tsx
+++ b/src/components/Menu/index.tsx
@@ -6,7 +6,7 @@ import MyIconFont from '@/components/MyIconfont'
 import { getKeyName, flattenRoutes } from '@/assets/js/publicFunc'
 import menus from '@/route/routes'
 import logo from '@/assets/img/logo.png'
-import { connect } from 'react-redux'
+import { connect, useSelector } from 'react-redux'
 import * as actions from '@/store/actions'
 import styles from './Menu.module.less'
 
@@ -17,7 +17,9 @@ interface Props extends ReduxProps { }
 
 type MenuType = CommonObjectType<string>
 
-const MenuView: FC<Props> = ({ storeData: { theme, userInfo, collapsed } }) => {
+const MenuView: FC<Props> = () => {
+
+  const { theme, userInfo, collapsed } = useSelector((state: ReduxProps) => state.storeData)
   const { pathname } = useLocation()
   const { tabKey: curKey = 'home' } = getKeyName(pathname)
   const [current, setCurrent] = useState(curKey)
@@ -123,7 +125,7 @@ const MenuView: FC<Props> = ({ storeData: { theme, userInfo, collapsed } }) => {
       <div className="logo">
         <Link to={{ pathname: '/' }}>
           <img alt="logo" src={logo} />
-          {!collapsed && <h1>React Antd Admin</h1>}
+          {!collapsed && <h1>BuzzUp Admin</h1>}
         </Link>
       </div>
       <Menu
@@ -139,7 +141,4 @@ const MenuView: FC<Props> = ({ storeData: { theme, userInfo, collapsed } }) => {
   )
 }
 
-export default connect(
-  (state) => state,
-  actions
-)(MenuView)
+export default MenuView
diff --git a/src/components/MyTable/index.tsx b/src/components/MyTable/index.tsx
index f7ddd5c..3267365 100644
--- a/src/components/MyTable/index.tsx
+++ b/src/components/MyTable/index.tsx
@@ -124,6 +124,16 @@ const MyTable: FC<TableProps> = forwardRef(
       total = validData.total;
     }
 
+    if (validData.users) {
+      tableData = validData.users;
+      total = validData.total;
+    }
+
+    if (validData.groups) {
+      tableData = validData.groups;
+      total = validData.total;
+    }
+
     // const validData = response?.data ? response.data : {}
     // const { rows: tableData = [], total } = validData
 
diff --git a/src/components/buzzup/BuzzFaceURL.tsx b/src/components/buzzup/BuzzFaceURL.tsx
new file mode 100644
index 0000000..70bc8ba
--- /dev/null
+++ b/src/components/buzzup/BuzzFaceURL.tsx
@@ -0,0 +1,27 @@
+import React from "react"
+
+interface BuzzFaceURLProps {
+  faceUrl: string,
+  name: string,
+  size?: number
+}
+
+const BuzzFaceURL = (props: BuzzFaceURLProps) => {
+  const { faceUrl, name, size = 40 } = props
+
+  return faceUrl ? (
+    <img src={faceUrl} alt="" style={{
+      width: size, height: size, objectFit: 'cover', borderRadius: 5, display: 'flex', justifyContent: 'center',
+      alignItems: 'center'
+    }} />
+  ) : (
+    <div style={{
+      width: size, height: size, objectFit: 'cover', borderRadius: 5, background: '#FBBA5A', display: 'flex', justifyContent: 'center',
+      alignItems: 'center'
+    }}>
+      {name.toLocaleUpperCase().substring(0, 1)}
+    </div>
+  )
+}
+
+export default BuzzFaceURL
\ No newline at end of file
diff --git a/src/pages/chat/group-list/index.tsx b/src/pages/chat/group-list/index.tsx
new file mode 100644
index 0000000..7fcc0d8
--- /dev/null
+++ b/src/pages/chat/group-list/index.tsx
@@ -0,0 +1,92 @@
+
+import { chat_groupList, chat_userList } from "@/api/chat"
+import BuzzFaceURL from "@/components/buzzup/BuzzFaceURL";
+import MyTable from "@/components/MyTable"
+import { getTime, isGender, isPlatformId } from "@/utils";
+import React from "react"
+
+const ChatGroupList = () => {
+
+  const columns = [
+    {
+      title: '头像',
+      dataIndex: "",
+      width: 100,
+      render: (row) => (
+        <div>
+          <BuzzFaceURL faceUrl={row.groupInfo.faceURL} name={row.groupInfo.groupName} />
+        </div>
+      )
+    },
+    {
+      title: '群组名称',
+      dataIndex: "",
+      width: 150,
+      render: (row) => (
+        <div>
+          {row.groupInfo.groupName}
+        </div>
+      )
+    },
+    {
+      title: '群组ID',
+      dataIndex: "",
+      width: 150,
+      render: (row) => (
+        <div>
+          {row.groupInfo.groupID}
+        </div>
+      )
+    },
+    {
+      title: '群主ID',
+      dataIndex: "",
+      width: 150,
+      render: (row) => (
+        <div>
+          {row.groupOwnerUserID}
+        </div>
+      )
+    },
+    {
+      title: '群组人数',
+      dataIndex: "",
+      width: 150,
+      render: (row) => (
+        <div>
+          {row.groupInfo.memberCount}
+        </div>
+      )
+    },
+    {
+      title: '创建时间',
+      dataIndex: "",
+      render: (row) => (
+        <div>
+          {getTime(row.groupInfo.createTime)}
+        </div>
+      )
+    },
+    {
+      title: 'options',
+      fixed: 'right',
+      width: 100,
+      render: (item) => (
+        <div className="flex">
+          <div className="text-4xl">群成员</div>
+          <div className="text-4xl">群成员</div>
+        </div>
+      )
+    }
+
+  ]
+  // 用户头像	用户昵称	用户ID	性别	手机号	在线状态	
+  return (
+    <MyTable
+      apiFun={chat_groupList}
+      columns={columns}
+    />
+  )
+}
+
+export default ChatGroupList
\ No newline at end of file
diff --git a/src/pages/chat/user-list/index.tsx b/src/pages/chat/user-list/index.tsx
new file mode 100644
index 0000000..b62964a
--- /dev/null
+++ b/src/pages/chat/user-list/index.tsx
@@ -0,0 +1,65 @@
+
+import { chat_userList } from "@/api/chat"
+import BuzzFaceURL from "@/components/buzzup/BuzzFaceURL";
+import MyTable from "@/components/MyTable"
+import { isGender, isPlatformId } from "@/utils";
+import React from "react"
+
+
+const ChatUserList = () => {
+
+  const columns = [
+    {
+      title: '头像',
+      dataIndex: "",
+      width: 100,
+      render: (row) => (
+        <div>
+          <BuzzFaceURL faceUrl={row.faceURL} name={row.nickname} />
+        </div>
+      )
+    },
+    {
+      title: '用户昵称',
+      dataIndex: "nickname",
+      width: 300
+    },
+    {
+      title: '用户ID',
+      dataIndex: "userID",
+      width: 300
+    },
+    {
+      title: '性别',
+      dataIndex: "gender",
+      width: 200,
+      render: (gender) => (
+        <div>{isGender(gender)}</div>
+      )
+    },
+    {
+      title: 'BuzzID',
+      dataIndex: "publicKey",
+      width: 200,
+      // render: (publicKey) => (
+      //   <div>{isGender(gender)}</div>
+      // )
+    },
+    {
+      title: '在线状态',
+      dataIndex: "platformID",
+      render: (platformID) => (
+        <div>{isPlatformId(platformID)}</div>
+      )
+    },
+  ]
+  // 用户头像	用户昵称	用户ID	性别	手机号	在线状态	
+  return (
+    <MyTable
+      apiFun={chat_userList}
+      columns={columns}
+    />
+  )
+}
+
+export default ChatUserList
\ No newline at end of file
diff --git a/src/pages/container/index.tsx b/src/pages/container/index.tsx
index d075f9e..f298f64 100644
--- a/src/pages/container/index.tsx
+++ b/src/pages/container/index.tsx
@@ -23,7 +23,7 @@ const checkAuth = (newPathname: string): boolean => {
   return true;
 }
 
-interface Props extends ReduxProps {}
+interface Props extends ReduxProps { }
 
 interface PanesItemProps {
   title: string;
diff --git a/src/route/routes.ts b/src/route/routes.ts
index 30f77f0..f1d48e8 100644
--- a/src/route/routes.ts
+++ b/src/route/routes.ts
@@ -6,6 +6,8 @@ import BUZZUPNews from "@/pages/notify/news"
 import Visa from "@/pages/visa"
 import LotteryTime from "@/pages/lotteryTime"
 import WalletVersion from "@/pages/walletVersion"
+import ChatUserList from "@/pages/chat/user-list"
+import ChatGroupList from "@/pages/chat/group-list"
 
 const routes = [
   {
@@ -17,6 +19,32 @@ const routes = [
     component: Home,
     routes: []
   },
+  {
+    path: '/chat',
+    name: 'IM模块',
+    exact: true,
+    type: 'subMenu',
+    key: 'chat',
+    icon: SolutionOutlined,
+    routes: [
+      {
+        path: '/user-list',
+        name: '用户列表',
+        exact: true,
+        key: 'uset-list',
+        component: ChatUserList,
+        routes: []
+      },
+      {
+        path: '/group-list',
+        name: '群组列表',
+        exact: true,
+        key: 'group-list',
+        component: ChatGroupList,
+        routes: []
+      }
+    ]
+  },
   {
     path: '/swiper',
     name: 'DAPP',
diff --git a/src/utils/axios.ts b/src/utils/axios.ts
index 049d861..6587322 100644
--- a/src/utils/axios.ts
+++ b/src/utils/axios.ts
@@ -12,8 +12,8 @@ interface AxiosConfig {
 }
 
 export const getBaseUrl = () => {
-  // return `http://192.168.124.20:8008/api/v1`
-  return `https://apk.buzz-up.io/api/v1`
+  return `http://192.168.124.20:8008/api/v1`
+  // return `https://apk.buzz-up.io/api/v1`
 }
 
 const config: AxiosConfig = {
diff --git a/src/utils/index.ts b/src/utils/index.ts
index 9bad655..36c4e54 100644
--- a/src/utils/index.ts
+++ b/src/utils/index.ts
@@ -3,6 +3,19 @@ import './axios'
 import { getBaseUrl } from './axios';
 import { store } from '@/store';
 
+const genders = ['保密', '男', '女']
+const platformId = ['-', 'IOS', 'Android', 'Windows', 'OSX', 'Web', 'MiniWeb', 'Linux', 'APad', 'IPad', 'Admin']
+
+export const isGender = (index: number | string) => {
+  let _idx = typeof index === 'string' ? Number(index) : index
+  return genders[_idx] || '-'
+}
+
+export const isPlatformId = (index: number | string) => {
+  let _idx = typeof index === 'string' ? Number(index) : index
+  return platformId[_idx] || '-'
+}
+
 export const splitAddress = (address: string, index?: number) => {
   try {
     let idx = index ? index : 5;
