add verification code for login and register page

web/src/views/ChatApps.vue

@@ -89,7 +89,8 @@ onMounted(() => {
 const getRoles = () => {
   checkSession().then(user => {
     roles.value = user.chat_roles
-  }).catch(() => {
+  }).catch(e => {
+    console.log(e.message)
   })
 }
 

web/src/views/Home.vue

@@ -72,7 +72,6 @@
 
         <div v-else>
           <el-button size="small" color="#21aa93" @click="store.setShowLoginDialog(true)" round>登录</el-button>
-          <el-button size="small" @click="router.push('/register')" round>注册</el-button>
         </div>
       </div>
     </div>
@@ -161,7 +160,7 @@ const docsURL = ref(process.env.VUE_APP_DOCS_URL)
 const gitURL = ref(process.env.VUE_APP_GIT_URL)
 
 const store = useSharedStore();
-const show = ref(true)
+const show = ref(false)
 watch(() => store.showLoginDialog, (newValue) => {
   show.value = newValue
 });

web/src/views/Login.vue

@@ -55,6 +55,8 @@
       </div>
 
       <reset-pass @hide="showResetPass = false" :show="showResetPass"/>
+
+      <captcha v-if="enableVerify" @success="doLogin" ref="captchaRef"/>
       
       <footer-bar/>
     </div>
@@ -73,6 +75,7 @@ import {checkSession, getLicenseInfo, getSystemInfo} from "@/store/cache";
 import {setUserToken} from "@/store/session";
 import ResetPass from "@/components/ResetPass.vue";
 import {showMessageError} from "@/utils/dialog";
+import Captcha from "@/components/Captcha.vue";
 
 const router = useRouter();
 const title = ref('Geek-AI');
@@ -82,12 +85,15 @@ const showResetPass = ref(false)
 const logo = ref("")
 const licenseConfig = ref({})
 const wechatLoginURL = ref('')
+const enableVerify = ref(false)
+const captchaRef = ref(null)
 
 onMounted(() => {
   // 获取系统配置
   getSystemInfo().then(res => {
     logo.value = res.data.logo
     title.value = res.data.title
+    enableVerify.value = res.data['enabled_verify']
   }).catch(e => {
     showMessageError("获取系统配置失败：" + e.message)
   })
@@ -129,7 +135,21 @@ const login = function () {
     return showMessageError('请输入密码');
   }
 
-  httpPost('/api/user/login', {username: username.value.trim(), password: password.value.trim()}).then((res) => {
+  if (enableVerify.value) {
+    captchaRef.value.loadCaptcha()
+  } else {
+    doLogin({})
+  }
+}
+
+const doLogin = (verifyData) => {
+  httpPost('/api/user/login', {
+    username: username.value.trim(),
+    password: password.value.trim(),
+    key: verifyData.key,
+    dots: verifyData.dots,
+    x: verifyData.x
+  }).then((res) => {
     setUserToken(res.data.token)
     if (isMobile()) {
       router.push('/mobile')

web/src/views/Register.vue

@@ -160,6 +160,8 @@
           </el-result>
         </div>
 
+        <captcha v-if="enableVerify" @success="doSubmitRegister" ref="captchaRef"/>
+
         <footer class="footer"  v-if="!licenseConfig.de_copy">
           <footer-bar/>
         </footer>
@@ -182,6 +184,7 @@ import {setUserToken} from "@/store/session";
 import {validateEmail, validateMobile} from "@/utils/validate";
 import {showMessageError, showMessageOK} from "@/utils/dialog";
 import {getLicenseInfo, getSystemInfo} from "@/store/cache";
+import Captcha from "@/components/Captcha.vue";
 
 const router = useRouter();
 const title = ref('');
@@ -201,6 +204,8 @@ const enableRegister = ref(true)
 const activeName = ref("mobile")
 const wxImg = ref("/images/wx.png")
 const licenseConfig = ref({})
+const enableVerify = ref(false)
+const captchaRef = ref(null)
 
 getSystemInfo().then(res => {
   if (res.data) {
@@ -222,6 +227,7 @@ getSystemInfo().then(res => {
     if (res.data['wechat_card_url'] !== '') {
       wxImg.value = res.data['wechat_card_url']
     }
+    enableVerify.value = res.data['enabled_verify']
   }
 }).catch(e => {
   ElMessage.error("获取系统配置失败：" + e.message)
@@ -257,9 +263,21 @@ const submitRegister = () => {
   if ((activeName.value === 'mobile' || activeName.value === 'email') && data.value.code === '') {
     return showMessageError('请输入验证码');
   }
+
+  if (enableVerify.value) {
+    captchaRef.value.loadCaptcha()
+  } else {
+    doSubmitRegister({})
+  }
+}
+
+const doSubmitRegister = (verifyData) => {
+  data.value.key = verifyData.key
+  data.value.dots = verifyData.dots
+  data.value.x = verifyData.x
   data.value.reg_way = activeName.value
   httpPost('/api/user/register', data.value).then((res) => {
-    setUserToken(res.data)
+    setUserToken(res.data.token)
     showMessageOK({
       "message": "注册成功，即将跳转到对话主界面...",
       onClose: () => router.push("/chat"),

web/src/views/admin/Login.vue

@@ -37,6 +37,8 @@
         </div>
       </div>
 
+      <captcha v-if="enableVerify" @success="doLogin" ref="captchaRef"/>
+
       <footer class="footer">
         <footer-bar/>
       </footer>
@@ -54,12 +56,15 @@ import {useRouter} from "vue-router";
 import FooterBar from "@/components/FooterBar.vue";
 import {setAdminToken} from "@/store/session";
 import {checkAdminSession, getSystemInfo} from "@/store/cache";
+import Captcha from "@/components/Captcha.vue";
 
 const router = useRouter();
 const title = ref('Geek-AI Console');
 const username = ref(process.env.VUE_APP_ADMIN_USER);
 const password = ref(process.env.VUE_APP_ADMIN_PASS);
 const logo = ref("")
+const enableVerify = ref(false)
+const captchaRef = ref(null)
 
 checkAdminSession().then(() => {
   router.push("/admin")
@@ -70,6 +75,7 @@ checkAdminSession().then(() => {
 getSystemInfo().then(res => {
   title.value = res.data.admin_title
   logo.value = res.data.logo
+  enableVerify.value = res.data['enabled_verify']
 }).catch(e => {
   ElMessage.error("加载系统配置失败: " + e.message)
 })
@@ -87,8 +93,21 @@ const login = function () {
   if (password.value === '') {
     return ElMessage.error('请输入密码');
   }
+  if (enableVerify.value) {
+    captchaRef.value.loadCaptcha()
+  } else {
+    doLogin({})
+  }
+}
 
-  httpPost('/api/admin/login', {username: username.value.trim(), password: password.value.trim()}).then(res => {
+const doLogin = function (verifyData) {
+  httpPost('/api/admin/login', {
+    username: username.value.trim(),
+    password: password.value.trim(),
+    key: verifyData.key,
+    dots: verifyData.dots,
+    x: verifyData.x
+  }).then(res => {
     setAdminToken(res.data.token)
     router.push("/admin")
   }).catch((e) => {