Merge remote-tracking branch 'refs/remotes/origin/feature/20260727/lms-rawfoil' into huachuang_ls

# Conflicts:
#	nl-framework/nl-spring-boot-starter-execute/src/main/java/cn/code/nl/framework/execute/biz/api/lms/LmsTaskCommonApi.java
#	nl-framework/nl-spring-boot-starter-execute/src/main/java/cn/code/nl/framework/execute/biz/api/wms/WmsTaskCommonApi.java
#	nl-gateway/src/main/resources/application-dev.yaml
#	nl-module-base/nl-module-base-server/src/main/resources/application-dev.yaml
#	nl-module-infra/nl-module-infra-server/src/main/resources/application-dev.yaml
#	nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/demo/DemoApi.java
#	nl-module-system/nl-module-system-server/src/main/resources/application-dev.yaml

nl-module-system/nl-module-system-server/src/main/java/cn/code/nl/module/system/controller/admin/logger/OperateLogController.java

@@ -7,6 +7,8 @@ import cn.code.nl.framework.common.pojo.PageResult;
 import cn.code.nl.framework.common.util.object.BeanUtils;
 import cn.code.nl.framework.excel.core.util.ExcelUtils;
 import cn.code.nl.framework.translate.core.TranslateUtils;
+import cn.code.nl.module.system.api.logger.dto.OperateLogPageReqDTO;
+import cn.code.nl.module.system.api.logger.dto.OperateLogRespDTO;
 import cn.code.nl.module.system.controller.admin.logger.vo.operatelog.OperateLogPageReqVO;
 import cn.code.nl.module.system.controller.admin.logger.vo.operatelog.OperateLogRespVO;
 import cn.code.nl.module.system.dal.dataobject.logger.OperateLogDO;
@@ -58,6 +60,15 @@ public class OperateLogController {
         return success(BeanUtils.toBean(pageResult, OperateLogRespVO.class));
     }
 
+    @GetMapping("/page2")
+    @Operation(summary = "查看操作日志分页列表2")
+    @PreAuthorize("@ss.hasPermission('system:operate-log:query')")
+    @TransMethodResult
+    public CommonResult<PageResult<OperateLogRespDTO>> getOperateLogPage(OperateLogPageReqDTO pageReqDTO) {
+        PageResult<OperateLogDO> operateLogPage = operateLogService.getOperateLogPage(pageReqDTO);
+        return success(BeanUtils.toBean(operateLogPage, OperateLogRespDTO.class));
+    }
+
     @Operation(summary = "导出操作日志")
     @GetMapping("/export-excel")
     @PreAuthorize("@ss.hasPermission('system:operate-log:export')")

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();
             }
 
         };

nl-module-system/nl-module-system-server/src/main/resources/application-test.yaml

@@ -59,12 +59,12 @@ spring:
         master:
           url: jdbc:mysql://192.168.81.193:3306/huachuang_lms_dev?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true # MySQL Connector/J 8.X 连接的示例
           username: root
-          password: root123
+          password: root
         slave: # 模拟从库，可根据自己需要修改 # 模拟从库，可根据自己需要修改
           lazy: true # 开启懒加载，保证启动速度
           url: jdbc:mysql://192.168.81.193:3306/huachuang_lms_dev?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true # MySQL Connector/J 8.X 连接的示例
           username: root
-          password: root123
+          password: root
 
   # Redis 配置。Redisson 默认的配置足够使用，一般不需要进行调优
   data: