Merge pull request #102 from linhaojun857/dev

merge dev

aurora-vue/aurora-admin/public/index.html

@@ -7,7 +7,6 @@
     <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests" />
     <link rel="icon" href="<%= BASE_URL %>favicon.ico" />
     <title>后台管理系统</title>
-    <script src="https://ssl.captcha.qq.com/TCaptcha.js"></script>
     <script src="<%= BASE_URL %>lib/js/prism.js" data-manual></script>
     <link rel="stylesheet" href="<%= BASE_URL %>lib/css/prism.css" />
   </head>

aurora-vue/aurora-admin/src/assets/js/config.js

@@ -1,4 +1,3 @@
 export default {
-  TENCENT_CAPTCHA: '2091489673',
   UPLOAD_SIZE: 200
 }

aurora-vue/aurora-admin/src/views/login/Login.vue

@@ -44,24 +44,19 @@ export default {
       this.$refs.ruleForm.validate((valid) => {
         if (valid) {
           const that = this
-          var captcha = new TencentCaptcha(this.config.TENCENT_CAPTCHA, function (res) {
-            if (res.ret === 0) {
-              let param = new URLSearchParams()
-              param.append('username', that.loginForm.username)
-              param.append('password', that.loginForm.password)
-              that.axios.post('/api/users/login', param).then(({ data }) => {
-                if (data.flag) {
-                  that.$store.commit('login', data.data)
-                  generaMenu()
-                  that.$message.success('登录成功')
-                  that.$router.push({ path: '/' })
-                } else {
-                  that.$message.error(data.message)
-                }
-              })
+          let param = new URLSearchParams()
+          param.append('username', that.loginForm.username)
+          param.append('password', that.loginForm.password)
+          that.axios.post('/api/users/login', param).then(({ data }) => {
+            if (data.flag) {
+              that.$store.commit('login', data.data)
+              generaMenu()
+              that.$message.success('登录成功')
+              that.$router.push({ path: '/' })
+            } else {
+              that.$message.error(data.message)
             }
           })
-          captcha.show()
         } else {
           return false
         }

aurora-vue/aurora-blog/public/index.html

@@ -7,7 +7,6 @@
     <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests" />
     <link rel="icon" href="<%= BASE_URL %>favicon.ico" />
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/KaTeX/0.8.3/katex.min.css" />
-    <script src="https://ssl.captcha.qq.com/TCaptcha.js"></script>
     <script
       src="http://connect.qq.com/qc_jssdk.js"
       data-appid="101999415"

aurora-vue/aurora-blog/src/components/Header/src/Controls.vue

@@ -181,34 +181,28 @@ export default defineComponent({
         })
         return
       }
-      //@ts-ignore
-      let captcha = new TencentCaptcha(config.captcha.TENCENT_CAPTCHA, (res: any) => {
-        if (res.ret === 0) {
-          let params = new URLSearchParams()
-          params.append('username', loginInfo.username)
-          params.append('password', loginInfo.password)
-          api.login(params).then(({ data }) => {
-            if (data.flag) {
-              userStore.userInfo = data.data
-              sessionStorage.setItem('token', data.data.token)
-              userStore.token = data.data.token
-              proxy.$notify({
-                title: 'Success',
-                message: '登录成功',
-                type: 'success'
-              })
-              reactiveDate.loginDialogVisible = false
-            } else {
-              proxy.$notify({
-                title: 'Error',
-                message: data.message,
-                type: 'error'
-              })
-            }
+      let params = new URLSearchParams()
+      params.append('username', loginInfo.username)
+      params.append('password', loginInfo.password)
+      api.login(params).then(({ data }) => {
+        if (data.flag) {
+          userStore.userInfo = data.data
+          sessionStorage.setItem('token', data.data.token)
+          userStore.token = data.data.token
+          proxy.$notify({
+            title: 'Success',
+            message: '登录成功',
+            type: 'success'
+          })
+          reactiveDate.loginDialogVisible = false
+        } else {
+          proxy.$notify({
+            title: 'Error',
+            message: data.message,
+            type: 'error'
           })
         }
       })
-      captcha.show()
     }
     const logout = () => {
       api.logout().then(({ data }) => {

aurora-vue/aurora-blog/src/config/config.ts

@@ -1,7 +1,4 @@
 export default {
-  captcha: {
-    TENCENT_CAPTCHA: '2091489673'
-  },
   qqLogin: {
     QQ_APP_ID: '101999415',
     QQ_REDIRECT_URI: 'https://www.linhaojun.top/oauth/login/qq'