From bfff341d17c08ae1748eca5b3eed3aa3d9a95c31 Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Wed, 14 Jan 2026 17:35:13 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=A2=E8=B4=AD=E6=89=AB=E7=A0=81=20token?=
 =?UTF-8?q?=E8=8E=B7=E5=8F=96=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/admin/AuthorizationController.java    | 12 ++++--------
 .../com/czg/account/service/PermissionService.java   |  7 -------
 .../account/service/impl/PermissionServiceImpl.java  | 11 -----------
 3 files changed, 4 insertions(+), 26 deletions(-)
 delete mode 100644 cash-common/cash-common-service/src/main/java/com/czg/account/service/PermissionService.java
 delete mode 100644 cash-service/account-service/src/main/java/com/czg/service/account/service/impl/PermissionServiceImpl.java

diff --git a/cash-api/account-server/src/main/java/com/czg/controller/admin/AuthorizationController.java b/cash-api/account-server/src/main/java/com/czg/controller/admin/AuthorizationController.java
index 54331aaea..ce2784489 100644
--- a/cash-api/account-server/src/main/java/com/czg/controller/admin/AuthorizationController.java
+++ b/cash-api/account-server/src/main/java/com/czg/controller/admin/AuthorizationController.java
@@ -6,6 +6,7 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.czg.account.dto.SysLoginDTO;
 import com.czg.account.entity.ShopInfo;
+import com.czg.account.entity.SysUser;
 import com.czg.account.service.*;
 import com.czg.account.vo.LoginVO;
 import com.czg.annotation.SaAdminCheckPermission;
@@ -35,11 +36,9 @@ public class AuthorizationController {
     @Resource
     private AuthorizationService authorizationService;
     @Resource
-    private PermissionService permissionService;
-    @Resource
     private ShopInfoService shopInfoService;
     @Resource
-    private ShopStaffService shopStaffService;
+    private SysUserService sysUserService;
 
 
     /**
@@ -105,14 +104,11 @@ public class AuthorizationController {
      */
     @GetMapping("/userInfo")
     public CzgResult<Map<String, Object>> getUserInfo() {
-        String account = StpKit.USER.getAccount();
         ShopInfo shopInfo = shopInfoService.queryChain()
                 .select(ShopInfo::getId, ShopInfo::getShopName)
                 .eq(ShopInfo::getId, StpKit.USER.getShopId()).one();
-        if (account.contains("@")) {
-            account = account.split("@")[1];
-        }
-        Map<String, Object> map = Map.of("shopId", shopInfo.getId(), "shopName", shopInfo.getShopName(), "account", account);
+        SysUser one = sysUserService.queryChain().eq(SysUser::getId, StpKit.USER.getShopId()).one();
+        Map<String, Object> map = Map.of("shopId", shopInfo.getId(), "shopName", shopInfo.getShopName(), "account", one.getAccount());
         return CzgResult.success(map);
     }
 }
diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/service/PermissionService.java b/cash-common/cash-common-service/src/main/java/com/czg/account/service/PermissionService.java
deleted file mode 100644
index 0d1d2a031..000000000
--- a/cash-common/cash-common-service/src/main/java/com/czg/account/service/PermissionService.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.czg.account.service;
-
-/**
- * @author Administrator
- */
-public interface PermissionService {
-}
diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/PermissionServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/PermissionServiceImpl.java
deleted file mode 100644
index 57cdc0287..000000000
--- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/PermissionServiceImpl.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.czg.service.account.service.impl;
-
-import com.czg.account.service.PermissionService;
-import org.springframework.stereotype.Service;
-
-/**
- * @author zs
- */
-@Service
-public class PermissionServiceImpl implements PermissionService {
-}