From 249ed0d0ffe70ef3778d2551e09bbe01049a3987 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E5=BD=AC=E5=BD=AC?= <18216219659@163.com>
Date: Thu, 30 Mar 2023 15:16:45 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E9=AA=8C=E8=AF=81=E7=A0=81=E5=BC=80?=
 =?UTF-8?q?=E5=85=B3=E8=AF=BB=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/login.js    | 11 +++++++++
 src/views/login.vue | 58 +++++++++++++++++++++++++--------------------
 2 files changed, 43 insertions(+), 26 deletions(-)

diff --git a/src/api/login.js b/src/api/login.js
index 8c36ba7..e3c0384 100644
--- a/src/api/login.js
+++ b/src/api/login.js
@@ -19,6 +19,17 @@ export function login(tenantId, username, password, code, uuid) {
   })
 }
 
+//注册开关
+export function registerEnabled() {
+  return request({
+    url: '/auth/registerEnabled',
+    headers: {
+      isToken: false
+    },
+    method: 'get'
+  })
+}
+
 // 注册方法
 export function register(data) {
   return request({
diff --git a/src/views/login.vue b/src/views/login.vue
index 56f0086..9b7a190 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -15,35 +15,35 @@
       </el-form-item>
       <el-form-item prop="username">
         <el-input
-          v-model="loginForm.username"
-          type="text"
-          size="large"
-          auto-complete="off"
-          placeholder="账号"
+            v-model="loginForm.username"
+            type="text"
+            size="large"
+            auto-complete="off"
+            placeholder="账号"
         >
           <template #prefix><svg-icon icon-class="user" class="el-input__icon input-icon" /></template>
         </el-input>
       </el-form-item>
       <el-form-item prop="password">
         <el-input
-          v-model="loginForm.password"
-          type="password"
-          size="large"
-          auto-complete="off"
-          placeholder="密码"
-          @keyup.enter="handleLogin"
+            v-model="loginForm.password"
+            type="password"
+            size="large"
+            auto-complete="off"
+            placeholder="密码"
+            @keyup.enter="handleLogin"
         >
           <template #prefix><svg-icon icon-class="password" class="el-input__icon input-icon" /></template>
         </el-input>
       </el-form-item>
       <el-form-item prop="code" v-if="captchaEnabled">
         <el-input
-          v-model="loginForm.code"
-          size="large"
-          auto-complete="off"
-          placeholder="验证码"
-          style="width: 63%"
-          @keyup.enter="handleLogin"
+            v-model="loginForm.code"
+            size="large"
+            auto-complete="off"
+            placeholder="验证码"
+            style="width: 63%"
+            @keyup.enter="handleLogin"
         >
           <template #prefix><svg-icon icon-class="validCode" class="el-input__icon input-icon" /></template>
         </el-input>
@@ -54,11 +54,11 @@
       <el-checkbox v-model="loginForm.rememberMe" style="margin:0px 0px 25px 0px;">记住密码</el-checkbox>
       <el-form-item style="width:100%;">
         <el-button
-          :loading="loading"
-          size="large"
-          type="primary"
-          style="width:100%;"
-          @click.prevent="handleLogin"
+            :loading="loading"
+            size="large"
+            type="primary"
+            style="width:100%;"
+            @click.prevent="handleLogin"
         >
           <span v-if="!loading">登 录</span>
           <span v-else>登 录 中...</span>
@@ -79,9 +79,9 @@
 import { getCodeImg, getTenantList } from "@/api/login";
 import Cookies from "js-cookie";
 import { encrypt, decrypt } from "@/utils/jsencrypt";
-import useUserStore from '@/store/modules/user'
-
-const userStore = useUserStore()
+import useUserStore from '@/store/modules/user';
+import {registerEnabled} from "../api/login";
+const userStore = useUserStore();
 const router = useRouter();
 const { proxy } = getCurrentInstance();
 
@@ -144,6 +144,12 @@ function handleLogin() {
   });
 }
 
+function getRegisterEnabled() {
+  registerEnabled().then(res => {
+    register.value = res.data.register === undefined ? true : res.data.register;
+  });
+}
+
 function getCode() {
   getCodeImg().then(res => {
     captchaEnabled.value = res.data.captchaEnabled === undefined ? true : res.data.captchaEnabled;
@@ -179,7 +185,7 @@ function getCookie() {
     rememberMe: rememberMe === undefined ? false : Boolean(rememberMe)
   };
 }
-
+getRegisterEnabled();
 getCode();
 initTenantList();
 getCookie();

From 0c1bcd86ff5d58902d803cb429bd236a20f603a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E5=BD=AC=E5=BD=AC?= <18216219659@163.com>
Date: Thu, 30 Mar 2023 16:37:27 +0800
Subject: [PATCH 2/4] =?UTF-8?q?1=E3=80=81=E6=B3=A8=E5=86=8C=E5=BC=80?=
 =?UTF-8?q?=E5=85=B3=E6=8E=A5=E5=8F=A3=E5=8F=98=E6=9B=B4=EF=BC=8C=E5=90=8C?=
 =?UTF-8?q?=E6=AD=A5=E4=BF=AE=E6=94=B9=E8=BF=94=E5=9B=9E=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E8=8E=B7=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/login.vue | 53 ++++++++++++++++++++++++++++++---------------
 1 file changed, 36 insertions(+), 17 deletions(-)

diff --git a/src/views/login.vue b/src/views/login.vue
index 9b7a190..0c793af 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -10,7 +10,9 @@
               :label="item.companyName"
               :value="item.tenantId">
           </el-option>
-          <template #prefix><svg-icon icon-class="company" class="el-input__icon input-icon" /></template>
+          <template #prefix>
+            <svg-icon icon-class="company" class="el-input__icon input-icon"/>
+          </template>
         </el-select>
       </el-form-item>
       <el-form-item prop="username">
@@ -21,7 +23,9 @@
             auto-complete="off"
             placeholder="账号"
         >
-          <template #prefix><svg-icon icon-class="user" class="el-input__icon input-icon" /></template>
+          <template #prefix>
+            <svg-icon icon-class="user" class="el-input__icon input-icon"/>
+          </template>
         </el-input>
       </el-form-item>
       <el-form-item prop="password">
@@ -33,7 +37,9 @@
             placeholder="密码"
             @keyup.enter="handleLogin"
         >
-          <template #prefix><svg-icon icon-class="password" class="el-input__icon input-icon" /></template>
+          <template #prefix>
+            <svg-icon icon-class="password" class="el-input__icon input-icon"/>
+          </template>
         </el-input>
       </el-form-item>
       <el-form-item prop="code" v-if="captchaEnabled">
@@ -45,7 +51,9 @@
             style="width: 63%"
             @keyup.enter="handleLogin"
         >
-          <template #prefix><svg-icon icon-class="validCode" class="el-input__icon input-icon" /></template>
+          <template #prefix>
+            <svg-icon icon-class="validCode" class="el-input__icon input-icon"/>
+          </template>
         </el-input>
         <div class="login-code">
           <img :src="codeUrl" @click="getCode" class="login-code-img"/>
@@ -76,14 +84,15 @@
 </template>
 
 <script setup>
-import { getCodeImg, getTenantList } from "@/api/login";
+import {getCodeImg, getTenantList} from "@/api/login";
 import Cookies from "js-cookie";
-import { encrypt, decrypt } from "@/utils/jsencrypt";
+import {encrypt, decrypt} from "@/utils/jsencrypt";
 import useUserStore from '@/store/modules/user';
 import {registerEnabled} from "../api/login";
+
 const userStore = useUserStore();
 const router = useRouter();
-const { proxy } = getCurrentInstance();
+const {proxy} = getCurrentInstance();
 
 const loginForm = ref({
   tenantId: "000000",
@@ -95,10 +104,10 @@ const loginForm = ref({
 });
 
 const loginRules = {
-  tenantId: [{ required: true, trigger: "blur", message: "请输入您的租户编号" }],
-  username: [{ required: true, trigger: "blur", message: "请输入您的账号" }],
-  password: [{ required: true, trigger: "blur", message: "请输入您的密码" }],
-  code: [{ required: true, trigger: "change", message: "请输入验证码" }]
+  tenantId: [{required: true, trigger: "blur", message: "请输入您的租户编号"}],
+  username: [{required: true, trigger: "blur", message: "请输入您的账号"}],
+  password: [{required: true, trigger: "blur", message: "请输入您的密码"}],
+  code: [{required: true, trigger: "change", message: "请输入验证码"}]
 };
 
 const codeUrl = ref("");
@@ -119,10 +128,10 @@ function handleLogin() {
       loading.value = true;
       // 勾选了需要记住密码设置在 cookie 中设置记住用户名和密码
       if (loginForm.value.rememberMe) {
-        Cookies.set("tenantId", loginForm.value.tenantId, { expires: 30 });
-        Cookies.set("username", loginForm.value.username, { expires: 30 });
-        Cookies.set("password", encrypt(loginForm.value.password), { expires: 30 });
-        Cookies.set("rememberMe", loginForm.value.rememberMe, { expires: 30 });
+        Cookies.set("tenantId", loginForm.value.tenantId, {expires: 30});
+        Cookies.set("username", loginForm.value.username, {expires: 30});
+        Cookies.set("password", encrypt(loginForm.value.password), {expires: 30});
+        Cookies.set("rememberMe", loginForm.value.rememberMe, {expires: 30});
       } else {
         // 否则移除
         Cookies.remove("tenantId");
@@ -132,7 +141,7 @@ function handleLogin() {
       }
       // 调用action的登录方法
       userStore.login(loginForm.value).then(() => {
-        router.push({ path: redirect.value || "/" });
+        router.push({path: redirect.value || "/"});
       }).catch(() => {
         loading.value = false;
         // 重新获取验证码
@@ -146,7 +155,7 @@ function handleLogin() {
 
 function getRegisterEnabled() {
   registerEnabled().then(res => {
-    register.value = res.data.register === undefined ? true : res.data.register;
+    register.value = res.data === undefined ? true : res.data;
   });
 }
 
@@ -185,6 +194,7 @@ function getCookie() {
     rememberMe: rememberMe === undefined ? false : Boolean(rememberMe)
   };
 }
+
 getRegisterEnabled();
 getCode();
 initTenantList();
@@ -200,6 +210,7 @@ getCookie();
   background-image: url("../assets/images/login-background.jpg");
   background-size: cover;
 }
+
 .title {
   margin: 0px auto 30px auto;
   text-align: center;
@@ -211,32 +222,39 @@ getCookie();
   background: #ffffff;
   width: 400px;
   padding: 25px 25px 5px 25px;
+
   .el-input {
     height: 40px;
+
     input {
       height: 40px;
     }
   }
+
   .input-icon {
     height: 39px;
     width: 14px;
     margin-left: 0px;
   }
 }
+
 .login-tip {
   font-size: 13px;
   text-align: center;
   color: #bfbfbf;
 }
+
 .login-code {
   width: 33%;
   height: 40px;
   float: right;
+
   img {
     cursor: pointer;
     vertical-align: middle;
   }
 }
+
 .el-login-footer {
   height: 40px;
   line-height: 40px;
@@ -249,6 +267,7 @@ getCookie();
   font-size: 12px;
   letter-spacing: 1px;
 }
+
 .login-code-img {
   height: 40px;
   padding-left: 12px;

From 3daa7e0874f6360a39869e83821a2a405d75162e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E5=BD=AC=E5=BD=AC?= <18216219659@163.com>
Date: Thu, 30 Mar 2023 16:41:22 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E5=BC=95=E5=85=A5=E6=B3=A8=E5=86=8C?=
 =?UTF-8?q?=E5=BC=80=E5=85=B3=E6=8E=A5=E5=8F=A3=E6=94=BE=E5=9C=A8getTeantL?=
 =?UTF-8?q?ist=E5=90=8E=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/login.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/login.vue b/src/views/login.vue
index 0c793af..dd3d2d4 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -85,10 +85,10 @@
 
 <script setup>
 import {getCodeImg, getTenantList} from "@/api/login";
+import {registerEnabled} from "../api/login";
 import Cookies from "js-cookie";
 import {encrypt, decrypt} from "@/utils/jsencrypt";
 import useUserStore from '@/store/modules/user';
-import {registerEnabled} from "../api/login";
 
 const userStore = useUserStore();
 const router = useRouter();

From 06b2caa89f83aa637ccc97a3ff6a288e5215f4db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E5=BD=AC=E5=BD=AC?= <18216219659@163.com>
Date: Thu, 30 Mar 2023 16:56:28 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E5=BC=95=E5=85=A5=E6=B3=A8=E5=86=8C?=
 =?UTF-8?q?=E5=BC=80=E5=85=B3=E6=8E=A5=E5=8F=A3=E9=94=99=E8=AF=AF=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/login.vue | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/views/login.vue b/src/views/login.vue
index dd3d2d4..ef2c06d 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -84,8 +84,7 @@
 </template>
 
 <script setup>
-import {getCodeImg, getTenantList} from "@/api/login";
-import {registerEnabled} from "../api/login";
+import {getCodeImg, getTenantList,registerEnabled} from "@/api/login";
 import Cookies from "js-cookie";
 import {encrypt, decrypt} from "@/utils/jsencrypt";
 import useUserStore from '@/store/modules/user';