diff --git a/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/constant/SecurityConstants.java b/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/constant/SecurityConstants.java
index 57de181f5..fe01e2683 100644
--- a/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/constant/SecurityConstants.java
+++ b/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/constant/SecurityConstants.java
@@ -170,6 +170,11 @@ public interface SecurityConstants {
 	 */
 	String CLIENT_CREDENTIALS = "client_credentials";
 
+	/**
+	 * 客户端编号
+	 */
+	String CLIENT_ID = "client_id";
+
 	/**
 	 * 用户ID字段
 	 */
diff --git a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/component/PigxTokenEnhancer.java b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/component/PigxTokenEnhancer.java
index 8d7b4ce2a..80b35fac8 100644
--- a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/component/PigxTokenEnhancer.java
+++ b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/component/PigxTokenEnhancer.java
@@ -45,15 +45,21 @@ public class PigxTokenEnhancer implements TokenEnhancer {
 	 */
 	@Override
 	public OAuth2AccessToken enhance(OAuth2AccessToken accessToken, OAuth2Authentication authentication) {
+
+		final Map<String, Object> additionalInfo = new HashMap<>(8);
+		String clientId = authentication.getOAuth2Request().getClientId();
+		additionalInfo.put(SecurityConstants.CLIENT_ID, clientId);
+		additionalInfo.put(SecurityConstants.DETAILS_LICENSE, SecurityConstants.PIGX_LICENSE);
+		additionalInfo.put(SecurityConstants.ACTIVE, Boolean.TRUE);
+
+		// 客户端模式不返回具体用户信息
 		if (SecurityConstants.CLIENT_CREDENTIALS.equals(authentication.getOAuth2Request().getGrantType())) {
+			((DefaultOAuth2AccessToken) accessToken).setAdditionalInformation(additionalInfo);
 			return accessToken;
 		}
 
-		final Map<String, Object> additionalInfo = new HashMap<>(8);
 		PigxUser pigxUser = (PigxUser) authentication.getUserAuthentication().getPrincipal();
 		additionalInfo.put(SecurityConstants.DETAILS_USER, pigxUser);
-		additionalInfo.put(SecurityConstants.DETAILS_LICENSE, SecurityConstants.PIGX_LICENSE);
-		additionalInfo.put(SecurityConstants.ACTIVE, Boolean.TRUE);
 		((DefaultOAuth2AccessToken) accessToken).setAdditionalInformation(additionalInfo);
 		return accessToken;
 	}