新增加注册功能

2022-04-14 18:30:10 +08:00
parent c5e6cfd771
commit 429f12ef01
15 changed files with 469 additions and 87 deletions
--- a/ZR.Vue/src/api/system/login.js
+++ b/ZR.Vue/src/api/system/login.js
@@ -9,9 +9,9 @@ export function login(username, password, code, uuid) {
    uuid
  }
  return request({
-      url: '/login',
-      method: 'POST',
-      data: data,
+    url: '/login',
+    method: 'POST',
+    data: data,
  })
 }

@@ -26,8 +26,8 @@ export function getInfo() {
 // 退出方法
 export function logout() {
  return request({
-      url: '/LogOut',
-      method: 'POST'
+    url: '/LogOut',
+    method: 'POST'
  })
 }

@@ -38,3 +38,15 @@ export function getCodeImg() {
    method: 'get'
  })
 }
+
+/**
+ * 注册
+ * @returns 
+ */
+export function register(data) {
+  return request({
+    url: '/register',
+    method: 'post',
+		data: data
+  })
+}
--- a/ZR.Vue/src/router/index.js
+++ b/ZR.Vue/src/router/index.js
@@ -38,6 +38,11 @@ export const constantRoutes = [{
    path: '/login',
    component: (resolve) => require(['@/views/login'], resolve),
    hidden: true
+  },
+	{
+    path: '/register',
+    component: (resolve) => require(['@/views/register'], resolve),
+    hidden: true
  },
  {
    path: '/404',
--- a/ZR.Vue/src/settings.js
+++ b/ZR.Vue/src/settings.js
@@ -47,5 +47,6 @@ module.exports = {
   * The default is only used in the production env
   * If you want to also use it in dev, you can pass ['production', 'development']
   */
-  errorLog: 'production'
+  errorLog: 'production',
+  copyRight: 'Copyright ©2022 izhaorui.cn All Rights Reserved.'
 }
--- a/ZR.Vue/src/store/modules/user.js
+++ b/ZR.Vue/src/store/modules/user.js
@@ -45,10 +45,13 @@ const user = {
            setToken(res.data)
            //提交上面的mutaions方法
            commit('SET_TOKEN', res.data)
-            resolve()//then处理
+            resolve() //then处理
          } else {
-            reject(res)//catch处理
+            console.log('login error ' + res);
+            reject(res) //catch处理
          }
+        }).catch(err => {
+          reject(err);
        })
      })
    },
@@ -69,7 +72,7 @@ const user = {

          commit('SET_NAME', data.user.nickName)
          commit('SET_AVATAR', avatar)
-          commit('SET_USERINFO', data.user)//新加
+          commit('SET_USERINFO', data.user) //新加
          resolve(res)
        }).catch(error => {
          reject(error)
@@ -79,10 +82,10 @@ const user = {

    // 退出系统
    LogOut({ commit, state }) {
-			console.log('退出登录')
+      console.log('退出登录')
      return new Promise((resolve, reject) => {
        logout().then((res) => {
-          removeToken()// 必须先移除token
+          removeToken() // 必须先移除token
          commit('SET_TOKEN', '')
          commit('SET_ROLES', [])
          commit('SET_PERMISSIONS', [])
@@ -104,4 +107,4 @@ const user = {
  }
 }

-export default user
+export default user
--- a/ZR.Vue/src/utils/request.js
+++ b/ZR.Vue/src/utils/request.js
@@ -57,7 +57,7 @@ service.interceptors.response.use(res => {
      })

      return Promise.reject('无效的会话，或者会话已过期，请重新登录。')
-    } else if (code == 0 || code == 1 || code == 110 || code == 101 || code == 403 || code == 500 || code == 429) {
+    } else if (code == 0 || code == 1 || code == 110 || code == 101 || code == 103 || code == 403 || code == 500 || code == 429) {
      Message({
        message: msg,
        type: 'error'
--- a/ZR.Vue/src/views/login.vue
+++ b/ZR.Vue/src/views/login.vue
@@ -26,122 +26,126 @@
          <span v-if="!loading">登 录</span>
          <span v-else>登 录 中...</span>
        </el-button>
+        <div style="float: right;">
+          <router-link class="link-type" :to="'/register'">还没有账号？立即注册</router-link>
+        </div>
      </el-form-item>
    </el-form>
    <!--  底部  -->
    <div class="el-login-footer">
-      <span>Copyright ©2021 izhaorui.cn All Rights Reserved.</span>
+      <span>{{copyRight}}</span>
    </div>
  </div>
 </template>

 <script>
-import { getCodeImg } from "@/api/system/login";
-import Cookies from "js-cookie";
-// import { encrypt, decrypt } from "@/utils/jsencrypt";
-import defaultSettings from "@/settings";
+import { getCodeImg } from '@/api/system/login'
+import Cookies from 'js-cookie'
+import defaultSettings from '@/settings'

 export default {
-  name: "Login",
+  name: 'Login',
  data() {
    return {
-      codeUrl: "",
-      cookiePassword: "",
+      codeUrl: '',
+      cookiePassword: '',
      loginForm: {
-        username: "",
-        password: "",
+        username: '',
+        password: '',
        rememberMe: false,
-        code: "",
-        uuid: "",
+        code: '',
+        uuid: ''
      },
      title: defaultSettings.title,
      loginRules: {
        username: [
-          { required: true, trigger: "blur", message: "用户名不能为空" },
+          { required: true, trigger: 'blur', message: '用户名不能为空' }
        ],
        password: [
-          { required: true, trigger: "blur", message: "密码不能为空" },
-        ],
-        code: [
-          { required: true, trigger: "change", message: "验证码不能为空" },
+          { required: true, trigger: 'blur', message: '密码不能为空' }
        ],
+        code: [{ required: true, trigger: 'change', message: '验证码不能为空' }]
      },
-			showCaptcha: '',
+      showCaptcha: '',
      loading: false,
-      redirect: undefined,
-    };
+      redirect: undefined
+    }
+  },
+  computed: {
+    copyRight: function() {
+      return defaultSettings.copyRight
+    }
  },
  watch: {
    $route: {
-      handler: function (route) {
-        this.redirect = route.query && route.query.redirect;
+      handler: function(route) {
+        this.redirect = route.query && route.query.redirect
      },
-      immediate: true,
-    },
+      immediate: true
+    }
  },
  created() {
-    this.getCode();
-    this.getCookie();
-    this.getConfigKey("sys.account.captchaOnOff").then((response) => {
-      this.showCaptcha = response.data;
-    });
+    this.getCode()
+    this.getCookie()
+    this.getConfigKey('sys.account.captchaOnOff').then((response) => {
+      this.showCaptcha = response.data
+    })
  },
  methods: {
    getCode() {
      // this.loginForm.code = "";
      getCodeImg().then((res) => {
-        this.codeUrl = "data:image/gif;base64," + res.data.img;
-        this.loginForm.uuid = res.data.uuid;
-        this.$forceUpdate();
-      });
+        this.codeUrl = 'data:image/gif;base64,' + res.data.img
+        this.loginForm.uuid = res.data.uuid
+        this.$forceUpdate()
+      })
    },
    getCookie() {
-      const username = Cookies.get("username");
-      const password = Cookies.get("password");
-      const rememberMe = Cookies.get("rememberMe");
+      const username = Cookies.get('username')
+      const password = Cookies.get('password')
+      const rememberMe = Cookies.get('rememberMe')

      this.loginForm = {
        username: username === undefined ? this.loginForm.username : username,
        password: password === undefined ? this.loginForm.password : password,
-        rememberMe: rememberMe === undefined ? false : Boolean(rememberMe),
-      };
+        rememberMe: rememberMe === undefined ? false : Boolean(rememberMe)
+      }
    },
    handleLogin() {
      this.$refs.loginForm.validate((valid) => {
        if (valid) {
-          this.loading = true;
+          this.loading = true
          if (this.loginForm.rememberMe) {
-            Cookies.set("username", this.loginForm.username, { expires: 30 });
-            Cookies.set("password", this.loginForm.password, {
-              expires: 30,
-            });
-            Cookies.set("rememberMe", this.loginForm.rememberMe, {
-              expires: 30,
-            });
+            Cookies.set('username', this.loginForm.username, { expires: 30 })
+            Cookies.set('password', this.loginForm.password, {
+              expires: 30
+            })
+            Cookies.set('rememberMe', this.loginForm.rememberMe, {
+              expires: 30
+            })
          } else {
-            Cookies.remove("username");
-            Cookies.remove("password");
-            Cookies.remove("rememberMe");
+            Cookies.remove('username')
+            Cookies.remove('password')
+            Cookies.remove('rememberMe')
          }
          this.$store
-            .dispatch("Login", this.loginForm)
+            .dispatch('Login', this.loginForm)
            .then(() => {
-              this.msgSuccess("登录成功");
-              this.$router.push({ path: this.redirect || "/" });
+              this.msgSuccess('登录成功')
+              this.$router.push({ path: this.redirect || '/' })
+            })
+            .catch(() => {
+              this.loading = false
+              this.getCode()
+              this.$refs.codeTxt.focus()
            })
-            .catch((error) => {
-              this.$message(error.msg);
-              this.loading = false;
-              this.getCode();
-              this.$refs.codeTxt.focus();
-            });
        } else {
-          console.log("未完成");
+          console.log('未完成')
        }
-      });
-    },
-  },
-};
+      })
+    }
+  }
+}
 </script>

 <style scoped rel="stylesheet/scss" lang="scss">
--- a/ZR.Vue/src/views/register.vue
+++ b/ZR.Vue/src/views/register.vue
@@ -0,0 +1,214 @@
+<template>
+  <div class="register">
+    <el-form ref="registerForm" :model="registerForm" :rules="registerRules" class="register-form">
+      <h3 class="title">{{title}}</h3>
+      <el-form-item prop="username">
+        <el-input v-model="registerForm.username" type="text" auto-complete="off" placeholder="账号">
+          <svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />
+        </el-input>
+      </el-form-item>
+      <el-form-item prop="password">
+        <el-input v-model="registerForm.password" type="password" auto-complete="off" placeholder="密码" @keyup.enter.native="handleRegister">
+          <svg-icon slot="prefix" icon-class="password" class="el-input__icon input-icon" />
+        </el-input>
+      </el-form-item>
+      <el-form-item prop="confirmPassword">
+        <el-input v-model="registerForm.confirmPassword" type="password" auto-complete="off" placeholder="确认密码" @keyup.enter.native="handleRegister">
+          <svg-icon slot="prefix" icon-class="password" class="el-input__icon input-icon" />
+        </el-input>
+      </el-form-item>
+      <el-form-item prop="code" v-if="captchaOnOff">
+        <el-input v-model="registerForm.code" auto-complete="off" placeholder="验证码" style="width: 63%" @keyup.enter.native="handleRegister">
+          <svg-icon slot="prefix" icon-class="validCode" class="el-input__icon input-icon" />
+        </el-input>
+        <div class="register-code">
+          <img :src="codeUrl" @click="getCode" class="register-code-img" />
+        </div>
+      </el-form-item>
+      <el-form-item style="width:100%;">
+        <el-button :loading="loading" size="medium" type="primary" style="width:100%;" @click.native.prevent="handleRegister">
+          <span v-if="!loading">注 册</span>
+          <span v-else>注 册 中...</span>
+        </el-button>
+        <div style="float: right;">
+          <router-link class="link-type" :to="'/login'">使用已有账户登录</router-link>
+        </div>
+      </el-form-item>
+    </el-form>
+    <!--  底部  -->
+    <div class="el-register-footer">
+      <span>{{copyRight}}</span>
+    </div>
+  </div>
+</template>
+
+<script>
+import { getCodeImg, register } from '@/api/system/login'
+import defaultSettings from '@/settings'
+
+export default {
+  name: 'Register',
+  data() {
+    const equalToPassword = (rule, value, callback) => {
+      if (this.registerForm.password !== value) {
+        callback(new Error('两次输入的密码不一致'))
+      } else {
+        callback()
+      }
+    }
+    return {
+      codeUrl: '',
+      registerForm: {
+        username: '',
+        password: '',
+        confirmPassword: '',
+        code: '',
+        uuid: ''
+      },
+      registerRules: {
+        username: [
+          { required: true, trigger: 'blur', message: '请输入您的账号' },
+          {
+            min: 2,
+            max: 20,
+            message: '用户账号长度必须介于 2 和 20 之间',
+            trigger: 'blur'
+          }
+        ],
+        password: [
+          { required: true, trigger: 'blur', message: '请输入您的密码' },
+          {
+            min: 5,
+            max: 20,
+            message: '用户密码长度必须介于 6 和 20 之间',
+            trigger: 'blur'
+          }
+        ],
+        confirmPassword: [
+          { required: true, trigger: 'blur', message: '请再次输入您的密码' },
+          { required: true, validator: equalToPassword, trigger: 'blur' }
+        ],
+        code: [{ required: true, trigger: 'change', message: '请输入验证码' }]
+      },
+      loading: false,
+      captchaOnOff: true
+    }
+  },
+  computed: {
+    copyRight: function() {
+      return defaultSettings.copyRight
+    },
+    title: function() {
+      return defaultSettings.title
+    }
+  },
+  created() {
+    this.getCode()
+  },
+  methods: {
+    getCode() {
+      getCodeImg().then((res) => {
+        this.codeUrl = 'data:image/gif;base64,' + res.data.img
+        this.registerForm.uuid = res.data.uuid
+        this.$forceUpdate()
+      })
+    },
+    handleRegister() {
+      this.$refs.registerForm.validate((valid) => {
+        if (valid) {
+          this.loading = true
+          register(this.registerForm)
+            .then((res) => {
+              if (res.code == 200) {
+                const username = this.registerForm.username
+                this.$alert(
+                  "<font color='red'>恭喜你，您的账号 " +
+                    username +
+                    ' 注册成功！</font>',
+                  '系统提示',
+                  {
+                    dangerouslyUseHTMLString: true,
+                    type: 'success'
+                  }
+                )
+                  .then(() => {
+                    this.$router.push('/login')
+                  })
+                  .catch(() => {})
+              }
+            })
+            .catch(() => {
+              this.loading = false
+              if (this.captchaOnOff) {
+                this.getCode()
+              }
+            })
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss">
+.register {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  height: 100%;
+  background-image: url("../assets/image/login-background.jpg");
+  background-size: cover;
+}
+.title {
+  margin: 0px auto 30px auto;
+  text-align: center;
+  color: #707070;
+}
+
+.register-form {
+  border-radius: 6px;
+  background: rgba(255, 255, 255, 0.3);
+  width: 310px;
+  padding: 25px 25px 5px 25px;
+  .el-input {
+    height: 38px;
+    input {
+      height: 38px;
+    }
+  }
+  .input-icon {
+    height: 39px;
+    width: 14px;
+    margin-left: 2px;
+  }
+}
+.register-tip {
+  font-size: 13px;
+  text-align: center;
+  color: #bfbfbf;
+}
+.register-code {
+  width: 33%;
+  height: 38px;
+  float: right;
+  img {
+    cursor: pointer;
+    vertical-align: middle;
+  }
+}
+.el-register-footer {
+  height: 40px;
+  line-height: 40px;
+  position: fixed;
+  bottom: 0;
+  width: 100%;
+  text-align: center;
+  color: #fff;
+  font-family: Arial;
+  font-size: 12px;
+  letter-spacing: 1px;
+}
+.register-code-img {
+  height: 38px;
+}
+</style>