王子文 Azure授权登录

(cherry picked from commit e09248525e34ff831f6a2c516567104eeb323341)

# Conflicts:
#	ui/src/views/login.vue

master/src/main/java/com/ruoyi/project/system/controller/SysLoginController.java

@@ -97,7 +97,7 @@ public class SysLoginController {
     }
 
     /**
-     * 登录方法
+     * Azure登录方法
      *
      * @param loginBody 登录信息
      * @return 结果

ui/src/views/login.vue

@@ -51,30 +51,30 @@
           <span v-else>{{ $t('login.loading') }}</span>
         </el-button>
       </el-form-item>
-<!--      <el-form-item style="width:100%;">-->
-<!--        <el-button-->
-<!--          :loading="loading"-->
-<!--          size="medium"-->
-<!--          type="primary"-->
-<!--          style="width:100%;"-->
-<!--          @click.native.prevent="doSocialLogin"-->
-<!--        >-->
-<!--          <span v-if="!loading"> 员工卡登录 </span>-->
-<!--          <span v-else>{{ $t('login.loading') }}</span>-->
-<!--        </el-button>-->
-<!--      </el-form-item>-->
-      <!--<el-form-item style="width:100%;">-->
-        <!--<el-button-->
-          <!--:loading="loading"-->
-          <!--size="medium"-->
-          <!--type="primary"-->
-          <!--style="width:100%;"-->
-          <!--@click.native.prevent="doAzureLogin"-->
-        <!--&gt;-->
-          <!--<span v-if="!loading"> Azure登录 </span>-->
-          <!--<span v-else>{{ $t('login.loading') }}</span>-->
-        <!--</el-button>-->
-      <!--</el-form-item>-->
+      <el-form-item style="width:100%;">
+        <el-button
+          :loading="loading"
+          size="medium"
+          type="primary"
+          style="width:100%;"
+          @click.native.prevent="doSocialLogin"
+        >
+          <span v-if="!loading"> 员工卡登录 </span>
+          <span v-else>{{ $t('login.loading') }}</span>
+        </el-button>
+      </el-form-item>
+      <el-form-item style="width:100%;">
+        <el-button
+          :loading="loading"
+          size="medium"
+          type="primary"
+          style="width:100%;"
+          @click.native.prevent="doAzureLogin"
+        >
+          <span v-if="!loading"> Azure登录 </span>
+          <span v-else>{{ $t('login.loading') }}</span>
+        </el-button>
+      </el-form-item>
     </el-form>
     <!--  底部  -->
     <div class="el-login-footer">
@@ -125,7 +125,6 @@ export default {
     }
   },
   created() {
-    console.log(window.location)
     let code = window.location.search.replace("?code=" , '');
     if (code) {
       code = code.substring(0, code.indexOf("&"));
@@ -203,7 +202,6 @@ export default {
   //background-image: url("../assets/image/cpms-test.jpg");
   background-size: cover;
 }
-
 .title {
   margin: 0px auto 15px auto;
   text-align: center;
@@ -225,44 +223,36 @@ export default {
 
   .el-input {
     height: 38px;
-
     input {
       height: 38px;
     }
   }
-
   .input-icon {
     height: 39px;
     width: 14px;
     margin-left: 2px;
   }
 }
-
 .login-tip {
   font-size: 13px;
   text-align: center;
   color: #bfbfbf;
 }
-
 .login-code {
   width: 33%;
   height: 38px;
   float: right;
-
   img {
     cursor: pointer;
     vertical-align: middle;
   }
 }
-
 .el-dropdown {
   color: #ffffff;
 }
-
 .el-checkbox {
   color: #ffffff;
 }
-
 .el-login-footer {
   height: 40px;
   line-height: 40px;
@@ -275,7 +265,6 @@ export default {
   font-size: 12px;
   letter-spacing: 1px;
 }
-
 .login-code-img {
   height: 38px;
 }