zhouz/huachuang
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 完善日计划租约精度与安全配置

Browse Source
This commit is contained in:
zhouz
2026-08-14 16:02:03 +08:00
parent 9b4e2296fc
commit 777de97085
4 changed files with 27 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
nl-module-lms/nl-module-lms-server/src/main/java/cn/code/nl/module/lms/framwork/security/config/SecurityConfiguration.java
View File

@@ -3,6 +3,7 @@ package cn.code.nl.module.lms.framwork.security.config;
import cn.code.nl.framework.security.config.AuthorizeRequestsCustomizer;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.http.HttpMethod;
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
import org.springframework.security.config.annotation.web.configurers.AuthorizeHttpRequestsConfigurer;
@@ -106,7 +107,7 @@ public class SecurityConfiguration {
.requestMatchers("/swagger-ui").permitAll()
.requestMatchers("/swagger-ui/**").permitAll();
// ERP 日计划接口使用独立令牌鉴权
registry.requestMatchers("/lms/daily-plan/erpPush").permitAll();
registry.requestMatchers(HttpMethod.POST, "/lms/daily-plan/erpPush").permitAll();
// Spring Boot Actuator 的安全配置
registry.requestMatchers("/actuator").permitAll()
.requestMatchers("/actuator/**").permitAll();

4
nl-module-lms/nl-module-lms-server/src/main/resources/mapper/dailyplan/DailyPlanClaimMapper.xml
View File

@@ -35,7 +35,7 @@
UPDATE lms_daily_plan_claim
SET claim_status = 1, active_flag = NULL, confirmed_time = NOW(), updater = #{updater}, version = version + 1
WHERE claim_id = #{claimId} AND version = #{version} AND claim_status = 0 AND active_flag = 1
AND expire_time > NOW() AND deleted = b'0'
AND expire_time > NOW(6) AND deleted = b'0'
</update>
<update id="releaseClaim">
@@ -48,7 +48,7 @@
UPDATE lms_daily_plan_claim
SET expire_time = #{expireTime}, updater = #{updater}, version = version + 1
WHERE claim_token = #{claimToken} AND version = #{version} AND claim_status = 0 AND active_flag = 1
AND expire_time &gt; NOW() AND deleted = b'0'
AND expire_time &gt; NOW(6) AND deleted = b'0'
</update>
<update id="expireClaims">

6
nl-module-lms/nl-module-lms-server/src/main/resources/mapper/dailyplan/DailyPlanMapper.xml
View File

@@ -68,7 +68,7 @@
AND claim.tenant_id = lms_daily_plan.tenant_id
AND claim.strategy_type = #{strategyType}
AND claim.claim_status = 0 AND claim.active_flag = 1
AND claim.expire_time &gt; NOW() AND claim.deleted = b'0'
AND claim.expire_time &gt; NOW(6) AND claim.deleted = b'0'
)
FOR UPDATE
</select>
@@ -120,7 +120,7 @@
WHERE claim.daily_plan_id = lms_daily_plan.daily_plan_id
AND claim.tenant_id = lms_daily_plan.tenant_id
AND claim.strategy_type = 1 AND claim.claim_status = 0
AND claim.active_flag = 1 AND claim.expire_time &gt; NOW() AND claim.deleted = b'0'
AND claim.active_flag = 1 AND claim.expire_time &gt; NOW(6) AND claim.deleted = b'0'
)
ORDER BY sort_seq ASC, daily_plan_id ASC
</select>
@@ -138,7 +138,7 @@
WHERE claim.daily_plan_id = lms_daily_plan.daily_plan_id
AND claim.tenant_id = lms_daily_plan.tenant_id
AND claim.strategy_type = 2 AND claim.claim_status = 0
AND claim.active_flag = 1 AND claim.expire_time &gt; NOW() AND claim.deleted = b'0'
AND claim.active_flag = 1 AND claim.expire_time &gt; NOW(6) AND claim.deleted = b'0'
)
ORDER BY sort_seq ASC, daily_plan_id ASC
</select>