refactor(slim-r3): 删除零引用死模块——keywordshare/debug/PublicWorkbenchClientVersion 三线 40 件
Project-Slimming 第三轮收尾执行(用户拍板「零引用的也都要删除」): 定谳依据=6.4 天生产访问日志零流量(970 万行单遍对撞,26 UNIQUE 前缀防撞车) +四树代码零引用(后端类名/包名/字符串、admin、用户端、app_client 全扫) +V163 建菜单→V165 撤菜单的历史链(功能入口 10 月底已下线,Controller 成孤儿)。 删除(40 件): - modules/keywordshare 整模块 31 类+4 mapper XML+KeywordShareServiceTest (后管 V165 已撤菜单、app_client 同步链 kw_share_api 亦无调用方; biz_keyword_share 等表按「已应用迁移不可回改」保留在库) - modules/debug 2 支控制器(/debug/request-info、/debug/task-recovery/*) - workbenchclient/controller/PublicWorkbenchClientVersionController (/api/workbench-client/version/latest:app_client 实际走 /api/version/latest, admin 侧仅文案引用,无任何真实调用方) - config/KeywordShareSyncProperties(唯一消费方 KeywordShareService 同批删) 同步编辑: - AdminApiGuardFilter:摘 DEBUG_PREFIX 前缀(常量/javadoc/审计日志块/requiresCredential/ guardedPrefixes 五处);ApiGuardCoverageAuditor:METHOD_GUARDED_PATHS 摘 /api/keyword-share - PropertiesConfig 摘 KeywordShareSyncProperties.class;application.yml 与 application-local.example.yml 摘 keyword-share-sync 段与两个 env - 台账两处扣减:XML_SELECT_TOTAL 114→103(11 select)、XML_STATEMENT_TOTAL 164→147 (11 select+4 insert+1 delete);MigratedSqlEquivalenceTest.NOT_MIGRATED 摘 12 条点名 (tsv 基准账本零 KeywordShare 行,LEDGER_ROWS/LEDGER_SELECTS 不动) - PendingPhase5ReadPathTest 摘 P1-B2(RAND 断言随 XML 删);ApiGuardCoverageAuditorTest 前缀总数 25→24;AdminApiGuardFilterTest 摘 4 支 /debug 用例与 2 条边界 URI - admin:workbench-client-api 死常量、页面头注释与 page-hint、operation-guides 指南文案 摘被删端点字样;align-workbench-client.test 摘 3 条对应断言 零行为影响:全部删除件在 6.4 天窗口内零流量;守卫过滤器行为对现存前缀不变 (/api/admin、用户态、自助清单原样)。
This commit is contained in:
@@ -186,8 +186,3 @@ AIIMAGE_ZINIAO_SESSION_TTL_HOURS=2
|
||||
AIIMAGE_ZINIAO_SHOPS_CACHE_MINUTES=30
|
||||
AIIMAGE_ZINIAO_CONNECT_TIMEOUT_SECONDS=5
|
||||
AIIMAGE_ZINIAO_READ_TIMEOUT_SECONDS=15
|
||||
|
||||
# 工作台客户端关键词全量同步(POST /api/keyword-share/sync/import)。
|
||||
# 客户端每行自报真实使用人,服务端只接受名单内姓名并按名单写法落库;名单为空时必须保持 strict=false。
|
||||
AIIMAGE_KEYWORD_SHARE_SYNC_STRICT=false
|
||||
AIIMAGE_KEYWORD_SHARE_SYNC_USED_USERS=
|
||||
|
||||
@@ -315,12 +315,6 @@ aiimage:
|
||||
cron: ${AIIMAGE_MODULE_CLEANUP_CRON:0 0 0 * * *}
|
||||
retention-days: ${AIIMAGE_MODULE_CLEANUP_RETENTION_DAYS:7}
|
||||
module-types: ${AIIMAGE_MODULE_CLEANUP_MODULE_TYPES:DEDUPE,SPLIT,CONVERT,DELETE_BRAND,PRODUCT_RISK_RESOLVE,PRICE_TRACK,SHOP_MATCH,PATROL_DELETE,QUERY_ASIN,WITHDRAW,APPEARANCE_PATENT,SIMILAR_ASIN,COLLECT_DATA,JD_SHOP_COLLECT}
|
||||
# 工作台客户端全量同步(POST /api/keyword-share/sync/import)。客户端每行自报真实使用人,
|
||||
# 服务端只接受名单内姓名、并统一按名单里那份写法落库(避免全/半角括号把同一个人拆成两个使用者)。
|
||||
# 名单为空时必须保持 strict=false:否则首次上线会把全部记录静默改写成同步账号名,比现状更糟。
|
||||
keyword-share-sync:
|
||||
strict: ${AIIMAGE_KEYWORD_SHARE_SYNC_STRICT:false}
|
||||
used-users: ${AIIMAGE_KEYWORD_SHARE_SYNC_USED_USERS:}
|
||||
# 以下为各业务表的保留期清理(2026-09-16 统一补齐):这些表此前只增不删,
|
||||
# 或只有"读的时候顺手删一行"这类碰运气的清理。全部按天分批删除、带分布式锁单实例执行。
|
||||
device-log:
|
||||
|
||||
@@ -1,11 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "https://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.nanri.aiimage.modules.keywordshare.mapper.KeywordAddLogMapper">
|
||||
<insert id="insertBatch">
|
||||
INSERT INTO keyword_add_log (company_id, country, keyword, user_name, add_time)
|
||||
VALUES
|
||||
<foreach collection="rows" item="row" separator=",">
|
||||
(#{row.companyId}, #{row.country}, #{row.keyword}, #{row.userName}, #{row.addTime})
|
||||
</foreach>
|
||||
</insert>
|
||||
</mapper>
|
||||
@@ -1,11 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "https://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.nanri.aiimage.modules.keywordshare.mapper.KeywordDeleteLogMapper">
|
||||
<insert id="insertBatch">
|
||||
INSERT INTO keyword_delete_log (company_id, country, keyword, user_name, delete_time)
|
||||
VALUES
|
||||
<foreach collection="rows" item="row" separator=",">
|
||||
(#{row.companyId}, #{row.country}, #{row.keyword}, #{row.userName}, #{row.deleteTime})
|
||||
</foreach>
|
||||
</insert>
|
||||
</mapper>
|
||||
@@ -1,167 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "https://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.nanri.aiimage.modules.keywordshare.mapper.KeywordShareMapper">
|
||||
<!-- 五国关键词共享(词本体 keyword_share)。动态筛选全部走 #{} 占位符,不做任何字符串拼接;
|
||||
排序口径对齐桌面版 keyword_share_app.py _filtered_rows_conn(未使用在前、已使用按 used_time 升序)。 -->
|
||||
|
||||
<!-- 词表 × 使用状态:usage 行按 (company_id, country, keyword) 三键对上,与桌面版同一口径 -->
|
||||
<sql id="usageJoin">
|
||||
keyword_share k
|
||||
LEFT JOIN keyword_usage u
|
||||
ON u.company_id = k.company_id
|
||||
AND u.country = k.country
|
||||
AND u.keyword = k.keyword
|
||||
</sql>
|
||||
|
||||
<sql id="filterConds">
|
||||
k.company_id = #{f.companyId}
|
||||
<if test="f.country != null and f.country != ''">AND k.country = #{f.country}</if>
|
||||
<if test="f.category != null and f.category != ''">AND k.category = #{f.category}</if>
|
||||
<if test="f.subCategory != null and f.subCategory != ''">AND k.sub_category = #{f.subCategory}</if>
|
||||
<if test="f.categoryL3 != null and f.categoryL3 != ''">AND k.category_l3 = #{f.categoryL3}</if>
|
||||
<if test="f.categoryL4 != null and f.categoryL4 != ''">AND k.category_l4 = #{f.categoryL4}</if>
|
||||
<if test="f.search != null and f.search != ''">
|
||||
AND (k.keyword LIKE CONCAT('%', #{f.search}, '%') OR k.chinese LIKE CONCAT('%', #{f.search}, '%'))
|
||||
</if>
|
||||
<if test="f.status == 'used'">AND u.country IS NOT NULL</if>
|
||||
<if test="f.status == 'unused'">AND u.country IS NULL</if>
|
||||
<if test="f.usedSince != null">AND u.country IS NOT NULL AND u.used_time >= #{f.usedSince}</if>
|
||||
<if test="f.onlyMine != null and f.onlyMine">AND u.user_name = #{f.userName}</if>
|
||||
</sql>
|
||||
|
||||
<select id="countHit" resultType="long">
|
||||
SELECT COUNT(*)
|
||||
FROM <include refid="usageJoin"/>
|
||||
WHERE <include refid="filterConds"/>
|
||||
</select>
|
||||
|
||||
<select id="selectRows" resultType="com.nanri.aiimage.modules.keywordshare.model.vo.KeywordShareRowVo">
|
||||
<!-- used_user 别名不可省:VO 属性叫 usedUser,驼峰映射只会把 user_name 认成不存在的 userName。 -->
|
||||
SELECT k.id, k.country, k.keyword, k.chinese, k.category, k.sub_category, k.category_l3, k.category_l4,
|
||||
(u.country IS NOT NULL) AS used, u.used_time, u.user_name AS used_user
|
||||
FROM <include refid="usageJoin"/>
|
||||
WHERE <include refid="filterConds"/>
|
||||
ORDER BY (u.country IS NULL) ASC, u.used_time ASC
|
||||
LIMIT #{f.offset}, #{f.limit}
|
||||
</select>
|
||||
|
||||
<!-- AC-19(审计 P1-B2):随机抽词不再 ORDER BY RAND()——那一句给命中集每一行打一个随机数再
|
||||
filesort 全表,词库越大越慢。改成「按主键升序取一段窗口」:窗口起点由服务层先 count 命中集、
|
||||
再掷在 [0, total-limit] 上,LIMIT 之前不必排序。服务层拿到窗口后就地洗牌,
|
||||
页面看到的仍是散着的词。 -->
|
||||
<select id="selectRandomUnused" resultType="com.nanri.aiimage.modules.keywordshare.model.vo.KeywordShareRowVo">
|
||||
SELECT k.id, k.country, k.keyword, k.chinese, k.category, k.sub_category, k.category_l3, k.category_l4,
|
||||
(u.country IS NOT NULL) AS used, u.used_time, u.user_name AS used_user
|
||||
FROM <include refid="usageJoin"/>
|
||||
WHERE <include refid="filterConds"/>
|
||||
ORDER BY k.id
|
||||
LIMIT #{f.limit} OFFSET #{f.offset}
|
||||
</select>
|
||||
|
||||
<select id="countDupKeywords" resultType="long">
|
||||
SELECT COUNT(*)
|
||||
FROM (
|
||||
SELECT keyword FROM keyword_share
|
||||
WHERE company_id = #{companyId}
|
||||
GROUP BY keyword
|
||||
HAVING COUNT(DISTINCT country) > 1
|
||||
) t
|
||||
</select>
|
||||
|
||||
<select id="selectFilterCountries" resultType="string">
|
||||
SELECT DISTINCT country
|
||||
FROM keyword_share
|
||||
WHERE company_id = #{companyId}
|
||||
AND country IS NOT NULL AND country != ''
|
||||
ORDER BY country
|
||||
</select>
|
||||
|
||||
<select id="selectFilterTreeRows" resultType="com.nanri.aiimage.modules.keywordshare.model.dto.KeywordCategoryTreeRow">
|
||||
SELECT DISTINCT category, sub_category, category_l3, category_l4
|
||||
FROM keyword_share
|
||||
WHERE company_id = #{companyId}
|
||||
AND category IS NOT NULL AND category != ''
|
||||
ORDER BY category, sub_category, category_l3, category_l4
|
||||
</select>
|
||||
|
||||
<select id="selectCountryCounts" resultType="com.nanri.aiimage.modules.keywordshare.model.dto.KeywordNameCountRow">
|
||||
SELECT country AS name, COUNT(*) AS count
|
||||
FROM keyword_share
|
||||
WHERE company_id = #{companyId}
|
||||
AND country IS NOT NULL AND country != ''
|
||||
GROUP BY country
|
||||
ORDER BY count DESC
|
||||
</select>
|
||||
|
||||
<select id="selectCategoryCounts" resultType="com.nanri.aiimage.modules.keywordshare.model.dto.KeywordNameCountRow">
|
||||
SELECT category AS name, COUNT(*) AS count
|
||||
FROM keyword_share
|
||||
WHERE company_id = #{companyId}
|
||||
AND category IS NOT NULL AND category != ''
|
||||
GROUP BY category
|
||||
ORDER BY count DESC
|
||||
</select>
|
||||
|
||||
<select id="selectSubCategoryCounts" resultType="com.nanri.aiimage.modules.keywordshare.model.dto.KeywordCategoryCountRow">
|
||||
SELECT category, sub_category AS name, COUNT(*) AS count
|
||||
FROM keyword_share
|
||||
WHERE company_id = #{companyId}
|
||||
AND category IS NOT NULL AND category != ''
|
||||
GROUP BY category, sub_category
|
||||
ORDER BY category, count DESC
|
||||
</select>
|
||||
|
||||
<select id="selectCategoryL3Counts" resultType="com.nanri.aiimage.modules.keywordshare.model.dto.KeywordCategoryL3CountRow">
|
||||
SELECT category, sub_category, category_l3 AS name, COUNT(*) AS count
|
||||
FROM keyword_share
|
||||
WHERE company_id = #{companyId}
|
||||
AND category IS NOT NULL AND category != ''
|
||||
GROUP BY category, sub_category, category_l3
|
||||
ORDER BY category, count DESC
|
||||
</select>
|
||||
|
||||
<select id="selectExistingKeywords" resultType="com.nanri.aiimage.modules.keywordshare.model.dto.KeywordShareKey">
|
||||
SELECT country, keyword
|
||||
FROM keyword_share
|
||||
WHERE company_id = #{companyId}
|
||||
AND (country, keyword) IN
|
||||
<foreach collection="keys" item="key" open="(" separator="," close=")">
|
||||
(#{key.country}, #{key.keyword})
|
||||
</foreach>
|
||||
</select>
|
||||
|
||||
<insert id="insertBatchIgnore">
|
||||
INSERT IGNORE INTO keyword_share
|
||||
(country, keyword, chinese, ktype, source, category, sub_category, category_l3, category_l4,
|
||||
user_name, add_time, company_id)
|
||||
VALUES
|
||||
<foreach collection="rows" item="row" separator=",">
|
||||
(#{row.country}, #{row.keyword}, #{row.chinese}, #{row.ktype}, #{row.source}, #{row.category},
|
||||
#{row.subCategory}, #{row.categoryL3}, #{row.categoryL4}, #{row.userName}, #{row.addTime}, #{row.companyId})
|
||||
</foreach>
|
||||
</insert>
|
||||
|
||||
<!-- 客户端全量同步专用 UPSERT。与 insertBatchIgnore 的分工:那条只补新词、重复行静默跳过;
|
||||
这条要把客户端本地那份「四级类目」写进已存在的行——add() 从不设类目,主库存量行的类目是空的。
|
||||
命中 uk_comp_cw 时只覆盖非空值(COALESCE(NULLIF(...))):客户端是四级类目的唯一权威源,
|
||||
但一次不带类目的同步不该把已导入的类目永久打回空串,所以「主动清空」不走这条路。
|
||||
user_name/add_time(添加人与添加时间)在更新分支一律不动:那是历史归属,不由同步改写。 -->
|
||||
<insert id="upsertBatchFromSync">
|
||||
INSERT INTO keyword_share
|
||||
(country, keyword, chinese, ktype, source, category, sub_category, category_l3, category_l4,
|
||||
user_name, add_time, company_id)
|
||||
VALUES
|
||||
<foreach collection="rows" item="row" separator=",">
|
||||
(#{row.country}, #{row.keyword}, #{row.chinese}, #{row.ktype}, #{row.source}, #{row.category},
|
||||
#{row.subCategory}, #{row.categoryL3}, #{row.categoryL4}, #{row.userName}, #{row.addTime}, #{row.companyId})
|
||||
</foreach>
|
||||
ON DUPLICATE KEY UPDATE
|
||||
chinese = COALESCE(NULLIF(VALUES(chinese), ''), chinese),
|
||||
ktype = COALESCE(NULLIF(VALUES(ktype), ''), ktype),
|
||||
source = COALESCE(NULLIF(VALUES(source), ''), source),
|
||||
category = COALESCE(NULLIF(VALUES(category), ''), category),
|
||||
sub_category = COALESCE(NULLIF(VALUES(sub_category), ''), sub_category),
|
||||
category_l3 = COALESCE(NULLIF(VALUES(category_l3), ''), category_l3),
|
||||
category_l4 = COALESCE(NULLIF(VALUES(category_l4), ''), category_l4)
|
||||
</insert>
|
||||
</mapper>
|
||||
@@ -1,23 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "https://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.nanri.aiimage.modules.keywordshare.mapper.KeywordUsageMapper">
|
||||
<!-- 使用状态批量写:UPSERT 语义对齐桌面版 ShareSync.mark(ON DUPLICATE KEY UPDATE),
|
||||
唯一键 uk_comp_cw(company_id, country, keyword) 冲突即刷新使用者与时间,天然幂等。 -->
|
||||
<insert id="upsertBatch">
|
||||
INSERT INTO keyword_usage (company_id, country, keyword, user_name, used_time)
|
||||
VALUES
|
||||
<foreach collection="rows" item="row" separator=",">
|
||||
(#{row.companyId}, #{row.country}, #{row.keyword}, #{row.userName}, #{row.usedTime})
|
||||
</foreach>
|
||||
ON DUPLICATE KEY UPDATE user_name = VALUES(user_name), used_time = VALUES(used_time)
|
||||
</insert>
|
||||
|
||||
<delete id="deleteBatch">
|
||||
DELETE FROM keyword_usage
|
||||
WHERE company_id = #{companyId}
|
||||
AND (country, keyword) IN
|
||||
<foreach collection="keys" item="key" open="(" separator="," close=")">
|
||||
(#{key.country}, #{key.keyword})
|
||||
</foreach>
|
||||
</delete>
|
||||
</mapper>
|
||||
Reference in New Issue
Block a user