Able to manage channels now

common/constants.go

@@ -91,7 +91,12 @@ const (
 )
 
 const (
-	ChannelTypeUnknown = 0
-	ChannelTypeOpenAI  = 1
-	ChannelTypeAPI2D   = 2
+	ChannelTypeUnknown   = 0
+	ChannelTypeOpenAI    = 1
+	ChannelTypeAPI2D     = 2
+	ChannelTypeAzure     = 3
+	ChannelTypeCloseAI   = 4
+	ChannelTypeOpenAISB  = 5
+	ChannelTypeOpenAIMax = 6
+	ChannelTypeOhMyGPT   = 7
 )

controller/channel.go

@@ -82,6 +82,8 @@ func AddChannel(c *gin.Context) {
 		})
 		return
 	}
+	channel.CreatedTime = common.GetTimestamp()
+	channel.AccessedTime = common.GetTimestamp()
 	err = channel.Insert()
 	if err != nil {
 		c.JSON(http.StatusOK, gin.H{
@@ -136,6 +138,7 @@ func UpdateChannel(c *gin.Context) {
 	c.JSON(http.StatusOK, gin.H{
 		"success": true,
 		"message": "",
+		"data":    channel,
 	})
 	return
 }

model/channel.go

@@ -9,7 +9,7 @@ type Channel struct {
 	Type         int    `json:"type" gorm:"default:0"`
 	Key          string `json:"key"`
 	Status       int    `json:"status" gorm:"default:1"`
-	Name         string `json:"name" gorm:"unique;index"`
+	Name         string `json:"name" gorm:"index"`
 	Weight       int    `json:"weight"`
 	CreatedTime  int64  `json:"created_time" gorm:"bigint"`
 	AccessedTime int64  `json:"accessed_time" gorm:"bigint"`

web/src/components/TokensTable.js

@@ -115,7 +115,7 @@ const TokensTable = () => {
       return;
     }
     setSearching(true);
-    const res = await API.get(`/api/token/search?keyword=${searchKeyword}/`);
+    const res = await API.get(`/api/token/search?keyword=${searchKeyword}`);
     const { success, message, data } = res.data;
     if (success) {
       setTokens(data);

web/src/constants/channel.constants.js

+export const CHANNEL_OPTIONS = [
+    { key: 1, text: 'OpenAI', value: 1, color: 'green' },
+    { key: 2, text: 'API2D', value: 2, color: 'blue' },
+    { key: 3, text: 'Azure', value: 3, color: 'olive' },
+    { key: 4, text: 'CloseAI', value: 4, color: 'teal' },
+    { key: 5, text: 'OpenAI-SB', value: 5, color: 'brown' },
+    { key: 6, text: 'OpenAI Max', value: 6, color: 'violet' },
+    { key: 7, text: 'OhMyGPT', value: 7, color: 'purple' }
+];

web/src/constants/index.js

 export * from './toast.constants';
 export * from './user.constants';
-export * from './common.constant';
\ No newline at end of file
+export * from './common.constant';
+export * from './channel.constants';
\ No newline at end of file

web/src/pages/Channel/AddChannel.js

 import React, { useState } from 'react';
 import { Button, Form, Header, Segment } from 'semantic-ui-react';
 import { API, showError, showSuccess } from '../../helpers';
+import { CHANNEL_OPTIONS } from '../../constants';
 
 const AddChannel = () => {
   const originInputs = {
-    username: '',
-    display_name: '',
-    password: '',
+    name: '',
+    type: 1,
+    key: ''
   };
   const [inputs, setInputs] = useState(originInputs);
-  const { username, display_name, password } = inputs;
+  const { name, type, key } = inputs;
 
   const handleInputChange = (e, { name, value }) => {
     setInputs((inputs) => ({ ...inputs, [name]: value }));
   };
 
   const submit = async () => {
-    if (inputs.username === '' || inputs.password === '') return;
-    const res = await API.post(`/api/user/`, inputs);
+    if (inputs.name === '' || inputs.key === '') return;
+    const res = await API.post(`/api/channel/`, inputs);
     const { success, message } = res.data;
     if (success) {
-      showSuccess('用户账户创建成功！');
+      showSuccess('渠道创建成功！');
       setInputs(originInputs);
     } else {
       showError(message);
@@ -30,38 +31,37 @@ const AddChannel = () => {
   return (
     <>
       <Segment>
-        <Header as="h3">创建新用户账户</Header>
-        <Form autoComplete="off">
+        <Header as='h3'>创建新的渠道</Header>
+        <Form autoComplete='off'>
           <Form.Field>
-            <Form.Input
-              label="用户名"
-              name="username"
-              placeholder={'请输入用户名'}
+            <Form.Select
+              label='类型'
+              name='type'
+              options={CHANNEL_OPTIONS}
+              value={inputs.type}
               onChange={handleInputChange}
-              value={username}
-              autoComplete="off"
-              required
             />
           </Form.Field>
           <Form.Field>
             <Form.Input
-              label="显示名称"
-              name="display_name"
-              placeholder={'请输入显示名称'}
+              label='名称'
+              name='name'
+              placeholder={'请输入名称'}
               onChange={handleInputChange}
-              value={display_name}
-              autoComplete="off"
+              value={name}
+              autoComplete='off'
+              required
             />
           </Form.Field>
           <Form.Field>
             <Form.Input
-              label="密码"
-              name="password"
-              type={'password'}
-              placeholder={'请输入密码'}
+              label='密钥'
+              name='key'
+              placeholder={'请输入密钥'}
               onChange={handleInputChange}
-              value={password}
-              autoComplete="off"
+              value={key}
+              // type='password'
+              autoComplete='off'
               required
             />
           </Form.Field>

web/src/pages/Channel/EditChannel.js

@@ -2,32 +2,23 @@ import React, { useEffect, useState } from 'react';
 import { Button, Form, Header, Segment } from 'semantic-ui-react';
 import { useParams } from 'react-router-dom';
 import { API, showError, showSuccess } from '../../helpers';
+import { CHANNEL_OPTIONS } from '../../constants';
 
 const EditChannel = () => {
   const params = useParams();
-  const userId = params.id;
+  const channelId = params.id;
   const [loading, setLoading] = useState(true);
   const [inputs, setInputs] = useState({
-    username: '',
-    display_name: '',
-    password: '',
-    github_id: '',
-    wechat_id: '',
-    email: '',
+    name: '',
+    key: '',
+    type: 1,
   });
-  const { username, display_name, password, github_id, wechat_id, email } =
-    inputs;
   const handleInputChange = (e, { name, value }) => {
     setInputs((inputs) => ({ ...inputs, [name]: value }));
   };
 
-  const loadUser = async () => {
-    let res = undefined;
-    if (userId) {
-      res = await API.get(`/api/user/${userId}`);
-    } else {
-      res = await API.get(`/api/user/self`);
-    }
+  const loadChannel = async () => {
+    let res = await API.get(`/api/channel/${channelId}`);
     const { success, message, data } = res.data;
     if (success) {
       data.password = '';
@@ -38,19 +29,14 @@ const EditChannel = () => {
     setLoading(false);
   };
   useEffect(() => {
-    loadUser().then();
+    loadChannel().then();
   }, []);
 
   const submit = async () => {
-    let res = undefined;
-    if (userId) {
-      res = await API.put(`/api/user/`, { ...inputs, id: parseInt(userId) });
-    } else {
-      res = await API.put(`/api/user/self`, inputs);
-    }
+    let res = await API.put(`/api/channel/`, { ...inputs, id: parseInt(channelId) });
     const { success, message } = res.data;
     if (success) {
-      showSuccess('用户信息更新成功！');
+      showSuccess('渠道更新成功！');
     } else {
       showError(message);
     }
@@ -59,67 +45,36 @@ const EditChannel = () => {
   return (
     <>
       <Segment loading={loading}>
-        <Header as='h3'>更新用户信息</Header>
+        <Header as='h3'>更新渠道信息</Header>
         <Form autoComplete='off'>
           <Form.Field>
-            <Form.Input
-              label='用户名'
-              name='username'
-              placeholder={'请输入新的用户名'}
+            <Form.Select
+              label='类型'
+              name='type'
+              options={CHANNEL_OPTIONS}
+              value={inputs.type}
               onChange={handleInputChange}
-              value={username}
-              autoComplete='off'
             />
           </Form.Field>
           <Form.Field>
             <Form.Input
-              label='密码'
-              name='password'
-              type={'password'}
-              placeholder={'请输入新的密码'}
+              label='名称'
+              name='name'
+              placeholder={'请输入新的名称'}
               onChange={handleInputChange}
-              value={password}
+              value={inputs.name}
               autoComplete='off'
             />
           </Form.Field>
           <Form.Field>
             <Form.Input
-              label='显示名称'
-              name='display_name'
-              placeholder={'请输入新的显示名称'}
+              label='密钥'
+              name='key'
+              placeholder={'请输入新的密钥'}
               onChange={handleInputChange}
-              value={display_name}
-              autoComplete='off'
-            />
-          </Form.Field>
-          <Form.Field>
-            <Form.Input
-              label='已绑定的 GitHub 账户'
-              name='github_id'
-              value={github_id}
-              autoComplete='off'
-              placeholder='此项只读，需要用户通过个人设置页面的相关绑定按钮进行绑定，不可直接修改'
-              readOnly
-            />
-          </Form.Field>
-          <Form.Field>
-            <Form.Input
-              label='已绑定的微信账户'
-              name='wechat_id'
-              value={wechat_id}
-              autoComplete='off'
-              placeholder='此项只读，需要用户通过个人设置页面的相关绑定按钮进行绑定，不可直接修改'
-              readOnly
-            />
-          </Form.Field>
-          <Form.Field>
-            <Form.Input
-              label='已绑定的邮箱账户'
-              name='email'
-              value={email}
+              value={inputs.key}
+              // type='password'
               autoComplete='off'
-              placeholder='此项只读，需要用户通过个人设置页面的相关绑定按钮进行绑定，不可直接修改'
-              readOnly
             />
           </Form.Field>
           <Button onClick={submit}>提交</Button>