diff --git a/nflg-mobilebroken-auth/src/main/java/com/nflg/mobilebroken/auth/controller/AppController.java b/nflg-mobilebroken-auth/src/main/java/com/nflg/mobilebroken/auth/controller/AppController.java
index 539300bb..f98bf7e3 100644
--- a/nflg-mobilebroken-auth/src/main/java/com/nflg/mobilebroken/auth/controller/AppController.java
+++ b/nflg-mobilebroken-auth/src/main/java/com/nflg/mobilebroken/auth/controller/AppController.java
@@ -9,16 +9,11 @@ import com.nflg.mobilebroken.common.constant.UserState;
 import com.nflg.mobilebroken.common.pojo.ApiResult;
 import com.nflg.mobilebroken.common.pojo.vo.AppLoginVO;
 import com.nflg.mobilebroken.common.pojo.vo.MenuVO;
-import com.nflg.mobilebroken.common.util.AppUserUtil;
-import com.nflg.mobilebroken.common.util.MultilingualUtil;
-import com.nflg.mobilebroken.common.util.SaTokenAppUtil;
-import com.nflg.mobilebroken.common.util.VUtils;
+import com.nflg.mobilebroken.common.pojo.vo.RoleVO;
+import com.nflg.mobilebroken.common.util.*;
 import com.nflg.mobilebroken.repository.entity.AdminUser;
 import com.nflg.mobilebroken.repository.entity.AppUser;
-import com.nflg.mobilebroken.repository.service.IAdminRoleService;
-import com.nflg.mobilebroken.repository.service.IAdminUserService;
-import com.nflg.mobilebroken.repository.service.IAppUserService;
-import com.nflg.mobilebroken.repository.service.IDictionaryItemTranslateService;
+import com.nflg.mobilebroken.repository.service.*;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -50,6 +45,10 @@ public class AppController extends ControllerBase {
     @Resource
     private IAdminRoleService adminRoleService;
 
+    @Resource
+    private IAdminUserRoleMapService adminUserRoleMapService;
+
+
     /**
      * 用户端登录
      * @param userName 用户名
@@ -68,10 +67,18 @@ public class AppController extends ControllerBase {
                     .setExtra("from", Constant.FROM_ADMIN)
                     .setExtra("name", adminUser.getUserName())
                     .setExtra("email", adminUser.getEmail()));
+            List<RoleVO> roleCodes = adminUserRoleMapService.getRoleList(adminUser.getId());
+            SaTokenAdminUtil.login(adminUser.getId(), SaLoginConfig
+                    .setExtra("from", Constant.FROM_ADMIN)
+                    .setExtra("name", adminUser.getUserName())
+                    .setExtra("code", adminUser.getUserCode())
+                    .setExtra("email", adminUser.getEmail())
+                    .setExtra("roles", roleCodes.stream().map(RoleVO::getCode).collect(Collectors.toList())));
             SaTokenInfo tokenInfo = SaTokenAppUtil.getTokenInfo();
             return ApiResult.success(new AppLoginVO()
                     .setUserId(adminUser.getId())
                     .setToken(tokenInfo.getTokenValue())
+                    .setAdminToken(SaTokenAdminUtil.getTokenInfo().getTokenValue())
                     .setExpire(tokenInfo.getTokenTimeout())
                     .setLanguageCode(Constant.DEFAULT_LANGUAGE_CODE)
                     .setPlatform(Constant.FROM_ADMIN));
diff --git a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/AppLoginVO.java b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/AppLoginVO.java
index 20c28f42..62b110a6 100644
--- a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/AppLoginVO.java
+++ b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/AppLoginVO.java
@@ -11,6 +11,11 @@ public class AppLoginVO {
 
     private String token;
 
+    /**
+     * 管理员端token
+     */
+    private String adminToken;
+
     private Long expire;
 
     //语言编码