Merge remote-tracking branch 'origin/master'

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

@@ -10,7 +10,10 @@ import java.security.spec.InvalidKeySpecException;
 import java.security.spec.X509EncodedKeySpec;
 import java.util.*;
 
+import com.ruoyi.common.utils.MessageUtils;
 import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.framework.manager.AsyncManager;
+import com.ruoyi.framework.manager.factory.AsyncFactory;
 import com.ruoyi.project.system.service.ISysUserService;
 import io.jsonwebtoken.*;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -203,7 +206,12 @@ public class SysLoginController {
 
         // TODO: 系统登录 获取系统token
         String cn = "ZHANGL49";
-
+        SysUser sysUser = userService.selectUserByUserName(cn);
+        AsyncManager.me().execute(AsyncFactory.recordLogininfor(cn, Constants.LOGIN_SUCCESS, MessageUtils.message("user.login.success")));
+        LoginUser loginUser = new LoginUser();
+        loginUser.setUser(sysUser);
+        String token =  tokenService.createToken(loginUser);
+        ajax.put(Constants.TOKEN, token);
         return ajax;
     }
 

ui/src/views/azureLogin.vue

@@ -35,6 +35,9 @@ export default {
       getAzureAccessToken(this.code).then(response => {
         this.msgSuccess(this.$t('Azure登录成功'));
         // TODO: Azure登录回调处理
+        console.log(response.token);
+        Cookies.set('Admin-Token', response.token);
+        this.$router.push({path: "/index" || "/404"});
       });
     }
   }