feat(护栏三面): 鉴权盲区启动自检 + SQL 分层口径落码 + 六页等待循环合一
后端
- AdminApiGuardFilter 增 guardedPrefixes()/matchesPrefix() 公开入口(原 private,
自检抄一份清单迟早与守卫脱钩);行为零变化
- 新增 ApiGuardCoverageAuditor:启动期把"已映射端点既不在守卫前缀名单、也不在
公开/待收清单里"打成 API_GUARD_UNCOVERED 一行 WARN,供现网巡检 grep;
PUBLIC_BY_DESIGN 与 PENDING_CONVERGENCE 两张清单逐条写理由(只读不拦)
- SQL 分层按新口径落码:AsinResultCacheMapper 的两条动态 SQL(<foreach> 批量 +
ON DUPLICATE KEY UPDATE + 逐列 COALESCE)迁到 resources/mapper/asincache/,
注解摘干净(注解+XML 同名会让启动期抛重复语句)
- 判据:SqlLayeringConventionTest(注解写 SQL 基线 16 接口/29 条只减不增、
@Select 65 条/16 文件、wrapper 夹带函数级 SQL 4 文件/15 条,last("LIMIT n")
205 处显式豁免并反向钉住豁免面)、ApiGuardCoverageAuditorTest(含清单腐烂与
欠账/名单重叠两类反向失明)、AsinResultCacheMapperXmlTest(真解析 XML 向
BoundSql 断言 28 个占位符与 5 个 COALESCE 列)
用户端 frontend-vue
- 终态集合合一:实测六页里 PriceTrack/ProductRisk 只认 SUCCESS|FAILED,
而 COMPLETED≡SUCCESS 早有出处(task-status-text 两者都译「已完成」,
后端 TaskCenterQueryMapper SUCCESS_STATUSES_ORDERED 也含 COMPLETED)
⇒ 窄集合页收到 COMPLETED 会空转到瞬断预算耗尽,PriceTrack 的轮询摘除路径
同样窄 ⇒ 任务永不退出轮询、列表卡在"执行中"
- 新增 shared/utils/task-terminal.ts 循环骨架(disposed/瞬断预算/恢复提示/
每轮 sleep/非瞬断上抛),六页全部接上;取数、文案、快照合并、DELETED 语义
留在各页回调,没有顺手统一
- 判据两支:骨架 8 例契约 + 六页源码窄集合回归钉(含"判据自己先自证"一例,
loop-run 的 STOPPED 词表不误报)
This commit is contained in:
+165
@@ -0,0 +1,165 @@
|
||||
package com.nanri.aiimage.modules.asincache.mapper;
|
||||
|
||||
import com.baomidou.mybatisplus.core.MybatisConfiguration;
|
||||
import com.nanri.aiimage.modules.asincache.model.entity.AsinResultCacheEntity;
|
||||
import org.apache.ibatis.io.Resources;
|
||||
import org.apache.ibatis.builder.xml.XMLMapperBuilder;
|
||||
import org.apache.ibatis.mapping.BoundSql;
|
||||
import org.apache.ibatis.mapping.MappedStatement;
|
||||
import org.apache.ibatis.session.Configuration;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
import java.io.InputStream;
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||
import static org.junit.jupiter.api.Assertions.assertFalse;
|
||||
import static org.junit.jupiter.api.Assertions.assertSame;
|
||||
import static org.junit.jupiter.api.Assertions.assertTrue;
|
||||
|
||||
/**
|
||||
* {@code AsinResultCacheMapper} 的 SQL 已从注解搬到 mapper XML,本用例钉住"搬完还是同一条 SQL"。
|
||||
*
|
||||
* <p>为什么必须有:注解与 XML 同名会让 MyBatis 在启动期直接抛异常(本地不起容器就看不见),
|
||||
* 而只搬一半(select 在 XML、upsert 还在注解)表现是"启动正常、调用时报无此语句"。
|
||||
* 这里用真 {@code XMLMapperBuilder} 解析、向真 {@code BoundSql} 断言,
|
||||
* 并把列级继承口径(5 个 COALESCE 列)逐条钉住——XML 里没有注解那种编译期约束,
|
||||
* 少写一个 COALESCE 只会让线上把卖家名抹成空,不会有任何测试自然变红。
|
||||
*/
|
||||
class AsinResultCacheMapperXmlTest {
|
||||
|
||||
private static final String XML = "mapper/asincache/AsinResultCacheMapper.xml";
|
||||
private static final String NS = "com.nanri.aiimage.modules.asincache.mapper.AsinResultCacheMapper";
|
||||
|
||||
/** 参与"新值没带到就保旧值"的列——与实体注释里的继承口径一一对应。 */
|
||||
private static final List<String> INHERITED_COLUMNS = List.of(
|
||||
"brand", "delivery_method", "seller_name", "seller_id", "declared_members_json");
|
||||
|
||||
/** 本行结论的主体,重采必须直接覆盖(404 要能把 price 清空)。 */
|
||||
private static final List<String> OVERWRITTEN_COLUMNS = List.of(
|
||||
"availability", "price", "source_chain", "source_task_id", "observed_at", "updated_at");
|
||||
|
||||
@Test
|
||||
void xmlIsParsableAndBindsEveryInterfaceMethod() throws Exception {
|
||||
Configuration configuration = parseXml();
|
||||
|
||||
for (String id : List.of("selectByCountryAndAsins", "upsertBatch")) {
|
||||
assertTrue(configuration.hasStatement(NS + "." + id),
|
||||
() -> XML + " 里没有 " + id + "(语句名必须与接口方法名逐字一致)");
|
||||
}
|
||||
// namespace 能绑到接口,说明 mapper-locations 扫得到、包名没写错
|
||||
assertTrue(configuration.hasMapper(AsinResultCacheMapper.class),
|
||||
"namespace 没能绑定到接口——检查 mybatis-plus.mapper-locations 与包路径");
|
||||
}
|
||||
|
||||
@Test
|
||||
void annotationsAreGoneSoTheStatementIsNotDefinedTwice() throws Exception {
|
||||
for (var method : AsinResultCacheMapper.class.getDeclaredMethods()) {
|
||||
assertFalse(method.isAnnotationPresent(org.apache.ibatis.annotations.Select.class),
|
||||
() -> method.getName() + " 还带着 @Select:注解 + XML 同名会让启动期抛重复语句");
|
||||
assertFalse(method.isAnnotationPresent(org.apache.ibatis.annotations.Insert.class),
|
||||
() -> method.getName() + " 还带着 @Insert:注解 + XML 同名会让启动期抛重复语句");
|
||||
}
|
||||
}
|
||||
|
||||
@Test
|
||||
void upsertExpandsOneValueTuplePerRowAndCarriesNoInjection() throws Exception {
|
||||
Configuration configuration = parseXml();
|
||||
MappedStatement statement = configuration.getMappedStatement(NS + ".upsertBatch");
|
||||
|
||||
BoundSql boundSql = statement.getBoundSql(param(rows(2)));
|
||||
String sql = boundSql.getSql().replaceAll("\\s+", " ");
|
||||
|
||||
assertTrue(sql.startsWith("INSERT INTO biz_asin_result_cache "), "仍是整行 upsert 形态: " + sql);
|
||||
assertTrue(sql.contains("ON DUPLICATE KEY UPDATE"), () -> "upsert 退化成纯 INSERT 会插重复行: " + sql);
|
||||
assertEquals(28, boundSql.getParameterMappings().size(),
|
||||
"14 列 x 2 行的占位符数(列清单被改动过就要重新核对): " + sql);
|
||||
assertFalse(sql.contains("$"), "不得出现 ${} 拼接面");
|
||||
}
|
||||
|
||||
@Test
|
||||
void columnLevelInheritanceSurvivesTheMove() throws Exception {
|
||||
Configuration configuration = parseXml();
|
||||
String sql = configuration.getMappedStatement(NS + ".upsertBatch")
|
||||
.getBoundSql(param(rows(1))).getSql().replaceAll("\\s+", " ");
|
||||
String updateClause = sql.substring(sql.indexOf("ON DUPLICATE KEY UPDATE"));
|
||||
|
||||
for (String column : INHERITED_COLUMNS) {
|
||||
assertTrue(updateClause.contains("COALESCE(VALUES(" + column + "), " + column + ")"),
|
||||
() -> column + " 丢了列级继承:一条变体记录会把关键词记录里的卖家信息抹成空");
|
||||
}
|
||||
for (String column : OVERWRITTEN_COLUMNS) {
|
||||
assertTrue(updateClause.contains(column + " = VALUES(" + column + ")"),
|
||||
() -> column + " 不再直接覆盖:404 就清不掉旧价格了");
|
||||
assertFalse(updateClause.contains("COALESCE(VALUES(" + column + ")"),
|
||||
() -> column + " 不该参与继承: " + column);
|
||||
}
|
||||
assertEquals(INHERITED_COLUMNS.size(), countOccurrences(updateClause, "COALESCE("),
|
||||
"COALESCE 列数变了——继承清单被悄悄加/减过");
|
||||
}
|
||||
|
||||
@Test
|
||||
void selectStaysOnTheCountryPrefixAndMapsToTheEntity() throws Exception {
|
||||
Configuration configuration = parseXml();
|
||||
MappedStatement statement = configuration.getMappedStatement(NS + ".selectByCountryAndAsins");
|
||||
|
||||
String sql = statement.getBoundSql(Map.of("country", "DE", "asins", List.of("B01", "B02")))
|
||||
.getSql().replaceAll("\\s+", " ");
|
||||
assertSame(AsinResultCacheEntity.class, statement.getResultMaps().get(0).getType());
|
||||
// country 必须是等值:放进 (country,asin) IN ((..),(..)) 在 MySQL 上用不上 uk_asin_cache_country_asin
|
||||
assertTrue(sql.contains("WHERE country = ? AND asin IN"),
|
||||
() -> "国家维度的等值形状变了,唯一键前缀会失配: " + sql);
|
||||
assertEquals(3, sql.chars().filter(c -> c == '?').count(), "1 个 country + 2 个 asin");
|
||||
}
|
||||
|
||||
@Test
|
||||
void mapperLocationsStillPointsAtTheXmlDirectory() throws Exception {
|
||||
String yml;
|
||||
try (InputStream in = Resources.getResourceAsStream("application.yml")) {
|
||||
yml = new String(in.readAllBytes(), java.nio.charset.StandardCharsets.UTF_8);
|
||||
}
|
||||
assertTrue(yml.replaceAll("\\s+", " ").toLowerCase().contains("mapper/**/*.xml"),
|
||||
"application.yml 的 mapper-locations 不含 mapper/**/*.xml —— XML 会被静默忽略,"
|
||||
+ "调用时才报 no statement");
|
||||
}
|
||||
|
||||
/** 生产走 @Param("rows"),MyBatis 会包成 ParamMap;测试要照这个形状喂,直接给 List 会命中 CollectionWrapper。 */
|
||||
private static Map<String, Object> param(List<AsinResultCacheEntity> rows) {
|
||||
Map<String, Object> parameter = new HashMap<>();
|
||||
parameter.put("rows", rows);
|
||||
return parameter;
|
||||
}
|
||||
|
||||
private static List<AsinResultCacheEntity> rows(int count) {
|
||||
List<AsinResultCacheEntity> rows = new ArrayList<>(count);
|
||||
for (int i = 0; i < count; i++) {
|
||||
AsinResultCacheEntity row = new AsinResultCacheEntity();
|
||||
row.setCountry("DE");
|
||||
row.setAsin("B00000000" + i);
|
||||
row.setAvailability(AsinResultCacheEntity.AVAILABILITY_OK);
|
||||
rows.add(row);
|
||||
}
|
||||
return rows;
|
||||
}
|
||||
|
||||
private static Configuration parseXml() throws Exception {
|
||||
MybatisConfiguration configuration = new MybatisConfiguration();
|
||||
try (InputStream in = Resources.getResourceAsStream(XML)) {
|
||||
new XMLMapperBuilder(in, configuration, XML, configuration.getSqlFragments()).parse();
|
||||
}
|
||||
return configuration;
|
||||
}
|
||||
|
||||
private static int countOccurrences(String haystack, String needle) {
|
||||
int at = 0;
|
||||
int count = 0;
|
||||
while ((at = haystack.indexOf(needle, at)) >= 0) {
|
||||
count++;
|
||||
at += needle.length();
|
||||
}
|
||||
return count;
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user