Selaa lähdekoodia

王子文 Azure授权登录

wangggziwen 2 vuotta sitten
vanhempi
commit
a1095f7a20

+ 1 - 0
master/src/main/java/com/ruoyi/project/system/controller/SysLoginController.java

@@ -214,6 +214,7 @@ public class SysLoginController {
         AsyncManager.me().execute(AsyncFactory.recordLogininfor(cn, Constants.LOGIN_SUCCESS, MessageUtils.message("user.login.success")));
         LoginUser loginUser = new LoginUser();
         loginUser.setUser(sysUser);
+        loginUser.setPermissions(permissionService.getMenuPermission(sysUser));
         // TODO: 用户权限
         String token =  tokenService.createToken(loginUser);
         ajax.put(Constants.TOKEN, token);

+ 12 - 12
ui/src/views/login.vue

@@ -63,18 +63,18 @@
 <!--          <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="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">