Merge remote-tracking branch 'origin/feature/20260716/wms-module' into feature/20260716/wms-module

# Conflicts:
#	nl-module-wms/nl-module-wms-api/src/main/java/cn/code/nl/module/wms/enums/ErrorCodeConstants.java
#	nl-ui/nl-ui-admin-vben/yudao-ui-admin-vben/packages/constants/src/dict-enum.ts

nl-module-system/nl-module-system-server/src/main/java/cn/code/nl/module/system/controller/admin/oauth2/OAuth2OpenController.http

@@ -60,3 +60,24 @@ tenant-id: {{adminTenantId}}
 POST {{baseUrl}}/system/oauth2/check-token?token=620d307c5b4148df8a98dd6c6c547106
 Authorization: Basic ZGVmYXVsdDphZG1pbjEyMw==
 tenant-id: {{adminTenantId}}
+
+
+
+@host = http://localhost:48080
+@clientId = huachuang-acs
+@clientSecret = 1001open
+
+### 1、客户端模式 client_credentials（你最开始curl对应的请求）
+POST http://localhost:48080/system/oauth2/token
+Authorization: Bearer 32a8c752af4947d392809f954e32fadf
+Content-Type: application/x-www-form-urlencoded
+
+
+###
+POST http://localhost:48080/system/oauth2/token
+Authorization: Basic default admin123
+Content-Type: application/x-www-form-urlencoded
+
+grant_type = client_credentials
+
+###

nl-module-system/nl-module-system-server/src/main/java/cn/code/nl/module/system/framework/security/config/SecurityConfiguration.java

@@ -32,6 +32,8 @@ public class SecurityConfiguration {
                         .requestMatchers("/actuator/**").permitAll();
                 // RPC 服务的安全配置
                 registry.requestMatchers(ApiConstants.PREFIX + "/**").permitAll();
+                // OAuth2 开放接口，无需登录即可访问
+                registry.requestMatchers("/admin-api/system/oauth2/**").permitAll();
             }
 
         };