为新注册用户设置全局初始次数，并且同步全局次数限制的开关 (#478)

* add globalUseAmout & fix uselimit to New User, * normalize * fix: formatting * fix: globalAmount use number type Signed-off-by: Bob Du <[email protected]> --------- Signed-off-by: Bob Du <[email protected]> Co-authored-by: root <[email protected]> Co-authored-by: Bob Du <[email protected]>
chatgpt-web-dev · Mar 20, 2024 · 7e195d1 · 7e195d1
1 parent 7260934
commit 7e195d1
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 6 deletions.
diff --git a/service/src/storage/model.ts b/service/src/storage/model.ts
@@ -200,6 +200,7 @@ export class SiteConfig {
     public registerMails?: string,
     public siteDomain?: string,
     public chatModels?: string,
+    public globalAmount?: number,
     public usageCountLimit?: boolean,
   ) { }
 }

diff --git a/service/src/storage/mongo.ts b/service/src/storage/mongo.ts
@@ -251,15 +251,21 @@ export async function deleteChat(roomId: number, uuid: number, inversion: boolea
 export async function createUser(email: string, password: string, roles?: UserRole[], status?: Status, remark?: string, useAmount?: number, limit_switch?: boolean): Promise<UserInfo> {
   email = email.toLowerCase()
   const userInfo = new UserInfo(email, password)
+  const config = await getCacheConfig()
+
   if (roles && roles.includes(UserRole.Admin))
     userInfo.status = Status.Normal
   if (status)
     userInfo.status = status
 
   userInfo.roles = roles
   userInfo.remark = remark
-  userInfo.useAmount = useAmount
-  userInfo.limit_switch = limit_switch
+  if (limit_switch != null)
+    userInfo.limit_switch = limit_switch
+  if (useAmount != null)
+    userInfo.useAmount = useAmount
+  else
+    userInfo.useAmount = config?.siteConfig?.globalAmount ?? 10
   await userCol.insertOne(userInfo)
   return userInfo
 }

diff --git a/src/components/common/Setting/Site.vue b/src/components/common/Setting/Site.vue
@@ -1,6 +1,6 @@
 <script setup lang='ts'>
 import { onMounted, ref } from 'vue'
-import { NButton, NInput, NSpin, NSwitch, useMessage } from 'naive-ui'
+import { NButton, NInput, NInputNumber, NSpin, NSwitch, useMessage } from 'naive-ui'
 import type { ConfigState } from './model'
 import { SiteConfig } from './model'
 import { fetchChatConfig, fetchUpdateSite } from '@/api'
@@ -11,14 +11,13 @@ const ms = useMessage()
 const loading = ref(false)
 const saving = ref(false)
 
-const config = ref<SiteConfig>()
-config.value = new SiteConfig()
+const config = ref(new SiteConfig())
 
 async function fetchConfig() {
   try {
     loading.value = true
     const { data } = await fetchChatConfig<ConfigState>()
-    config.value = data.siteConfig
+    config.value = data.siteConfig ? data.siteConfig : new SiteConfig()
   }
   finally {
     loading.value = false
@@ -129,6 +128,15 @@ onMounted(() => {
             />
           </div>
         </div>
+        <!--		增加新注册用户的全局数量设置		-->
+        <div class="flex items-center space-x-4">
+          <span class="flex-shrink-0 w-[100px]">{{ $t('setting.globalAmount') }}</span>
+          <div class="flex-1">
+            <NInputNumber
+              v-model:value="config.globalAmount" placeholder=""
+            />
+          </div>
+        </div>
         <div class="flex items-center space-x-4">
           <span class="flex-shrink-0 w-[100px]">{{ $t('setting.usageCountLimit') }}</span>
           <div class="flex-1">

diff --git a/src/components/common/Setting/model.ts b/src/components/common/Setting/model.ts
@@ -29,6 +29,7 @@ export class SiteConfig {
   registerMails?: string
   siteDomain?: string
   chatModels?: string
+  globalAmount?: number
   usageCountLimit?: boolean
 }
 

diff --git a/src/locales/en-US.ts b/src/locales/en-US.ts
@@ -80,6 +80,7 @@ export default {
     disable2FAConfirm: 'Are you sure to disable 2FA for this user?',
   },
   setting: {
+    globalAmount: 'Global Usage Amount for New User',
     limit_switch: 'Open Usage Limitation',
     usageCountLimit: 'Enable Usage Count Limit',
     redeemCardNo: 'Redeem CardNo',

diff --git a/src/locales/ko-KR.ts b/src/locales/ko-KR.ts
@@ -80,6 +80,7 @@ export default {
     disable2FAConfirm: 'Are you sure to disable 2FA for this user?',
   },
   setting: {
+    globalAmount: 'Global Usage Amount for New User',
     limit_switch: '오픈 횟수 제한',
     redeemCardNo: '질문 허용 횟수',
     useAmount: '질문 허용 횟수',

diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts
@@ -80,6 +80,7 @@ export default {
     disable2FAConfirm: '您确定要为此用户禁用两步验证吗？?',
   },
   setting: {
+    globalAmount: '新用户全局次数设置',
     limit_switch: '打开次数限制',
     usageCountLimit: '使用次数限制',
     redeemCardNo: '兑换码卡号',

diff --git a/src/locales/zh-TW.ts b/src/locales/zh-TW.ts
@@ -80,6 +80,7 @@ export default {
     disable2FAConfirm: '您确定要为此用户禁用两步验证吗？?',
   },
   setting: {
+    globalAmount: '新用户全局次数设置',
     limit_switch: '開啟次數限制',
     redeemCardNo: '兌換碼卡號',
     useAmount: '可提問次數',