admin/smartDriveEE
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

配置迁移到表

Browse Source
This commit is contained in:
cst61
2026-05-30 22:03:52 +08:00
parent 1b596e10a7
commit bf685417e7
7 changed files with 194 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
src/main/java/com/rj/service/HxrAdminGoodsService.java
View File

@@ -7,6 +7,7 @@ import com.fasterxml.jackson.databind.PropertyNamingStrategies;
import com.fasterxml.jackson.databind.SerializationFeature;
import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
import com.rj.config.HxrAdminProperties;
import com.rj.dto.hxr.HxrGoodsApiContext;
import com.rj.dto.hxr.HxrLbGoodsSelectResponse;
import com.rj.util.HxrGoodsSignUtil;
import lombok.RequiredArgsConstructor;
@@ -49,7 +50,7 @@ public class HxrAdminGoodsService {
private final HxrAdminProperties properties;
/**
* 分页拉取货品列表。
* 分页拉取货品列表（使用 {@code hxr.admin} 配置文件，兼容旧调用）。
*
* @param page 页码，从 1 开始
* @param token 可选；非空时作为请求头 token，否则使用 {@code hxr.admin.goods-api-token}
@@ -65,11 +66,45 @@ public class HxrAdminGoodsService {
log.warn("hxr.admin 未配置 goods-api-app-str，跳过 /api/order/goods");
return Optional.empty();
}
HxrGoodsApiContext ctx = new HxrGoodsApiContext(
stripQuery(properties.getGoodsApiUrl()),
GOODS_PAGE_SIZE,
properties.getGoodsApiOrigin(),
properties.getGoodsApiReferer(),
resolvedToken,
appStr.trim());
return fetchGoodsPage(page, ctx);
}
/**
* 分页拉取货品列表（使用租户 {@code lb_third_integration_config} 解析出的运行时配置）。
*/
public Optional<HxrLbGoodsSelectResponse> fetchGoodsPage(int page, HxrGoodsApiContext ctx) throws Exception {
if (ctx == null) {
log.warn("货品 API 配置为空，跳过 /api/order/goods");
return Optional.empty();
}
String resolvedToken = ctx.token();
if (resolvedToken == null || resolvedToken.isBlank()) {
log.warn("未提供 token，跳过 /api/order/goods");
return Optional.empty();
}
String appStr = ctx.appStr();
if (appStr == null || appStr.isBlank()) {
log.warn("未配置 goodsApiAppStr，跳过 /api/order/goods");
return Optional.empty();
}
String goodsApiBaseUrl = ctx.goodsApiBaseUrl();
if (goodsApiBaseUrl == null || goodsApiBaseUrl.isBlank()) {
log.warn("未配置 goodsApiBaseUrl，跳过 /api/order/goods");
return Optional.empty();
}
int pageLimit = ctx.pageLimit() > 0 ? ctx.pageLimit() : GOODS_PAGE_SIZE;
int safePage = Math.max(1, page);
String uri = UriComponentsBuilder.fromUriString(properties.getGoodsApiUrl())
String uri = UriComponentsBuilder.fromUriString(goodsApiBaseUrl)
.replaceQueryParam("page", safePage)
.replaceQueryParam("limit", GOODS_PAGE_SIZE)
.replaceQueryParam("limit", pageLimit)
.build()
.encode()
.toUriString();
@@ -78,7 +113,7 @@ public class HxrAdminGoodsService {
String noncestr = randomNoncestr();
Map<String, Object> signParams = new LinkedHashMap<>();
signParams.put("page", safePage);
signParams.put("limit", GOODS_PAGE_SIZE);
signParams.put("limit", pageLimit);
signParams.put("timestamp", timestamp);
signParams.put("noncestr", noncestr);
String sign = HxrGoodsSignUtil.computeSign(signParams, appStr.trim());
@@ -93,8 +128,8 @@ public class HxrAdminGoodsService {
.timeout(Duration.ofSeconds(120))
.header("Accept", "application/json,*/*")
.header("Accept-Language", "zh-CN,zh;q=0.9,en;q=0.8")
.header("Origin", properties.getGoodsApiOrigin())
.header("Referer", properties.getGoodsApiReferer())
.header("Origin", ctx.origin())
.header("Referer", ctx.referer())
.header("User-Agent", USER_AGENT)
.header("token", resolvedToken)
.header("S", sign)
@@ -136,6 +171,15 @@ public class HxrAdminGoodsService {
return Optional.of(body);
}
/** 从完整 URL 中去掉 query，供配置文件回退路径使用。 */
private static String stripQuery(String url) {
if (url == null || url.isBlank()) {
return url;
}
int q = url.indexOf('?');
return q >= 0 ? url.substring(0, q) : url;
}
/** 优先使用入参 token，否则回退到配置 {@code goods-api-token}。 */
private String resolveToken(String token) {
if (token != null && !token.isBlank()) {

7
src/main/java/com/rj/service/ILbThirdIntegrationConfigService.java
View File

@@ -2,9 +2,11 @@ package com.rj.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.rj.dto.LbThirdIntegrationCredentialUpdateRequest;
import com.rj.dto.hxr.HxrGoodsApiContext;
import com.rj.entity.LbThirdIntegrationConfig;
import java.util.Map;
import java.util.Optional;
/**
* 租户第三方集成配置服务
@@ -35,4 +37,9 @@ public interface ILbThirdIntegrationConfigService extends IService<LbThirdIntegr
*/
Map<String, Object> updateCredentialByTenantId(
String tenantId, LbThirdIntegrationCredentialUpdateRequest request);
/**
* 按租户 id 解析货品 API 运行时配置（含解密凭证）；{@code tokenOverride} 非空时优先于库中 token。
*/
Optional<HxrGoodsApiContext> resolveGoodsApiContext(String tenantId, String tokenOverride);
}

20
src/main/java/com/rj/service/impl/LbGoodsServiceImpl.java
View File

@@ -3,6 +3,7 @@ package com.rj.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.rj.dto.hxr.HxrGoodsApiContext;
import com.rj.dto.hxr.HxrLbGoodsPageData;
import com.rj.dto.hxr.HxrLbGoodsSelectResponse;
import com.rj.entity.LbGoods;
@@ -10,6 +11,7 @@ import com.rj.mapper.LbGoodsMapper;
import com.rj.service.HxrAdminBuyService;
import com.rj.service.HxrAdminGoodsService;
import com.rj.service.ILbGoodsService;
import com.rj.service.ILbThirdIntegrationConfigService;
import com.rj.tenant.TenantContextHolder;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@@ -40,6 +42,8 @@ public class LbGoodsServiceImpl extends ServiceImpl<LbGoodsMapper, LbGoods> impl
private final HxrAdminBuyService hxrAdminBuyService;
private final ILbThirdIntegrationConfigService lbThirdIntegrationConfigService;
@Override
public Map<String, Object> add(LbGoods entity) {
Map<String, Object> result = new HashMap<>();
@@ -260,6 +264,17 @@ public class LbGoodsServiceImpl extends ServiceImpl<LbGoodsMapper, LbGoods> impl
}
String tid = tenantId.trim();
Optional<HxrGoodsApiContext> apiContextOpt =
lbThirdIntegrationConfigService.resolveGoodsApiContext(tid, token);
if (apiContextOpt.isEmpty()) {
result.put("success", false);
result.put("message",
"未找到该租户的第三方集成配置，或配置未启用、URL/凭证不完整（请检查 lb_third_integration_config）");
result.put("synced", 0);
return result;
}
HxrGoodsApiContext apiContext = apiContextOpt.get();
String previousTenantId = TenantContextHolder.getTenantId();
TenantContextHolder.setTenantId(tid);
try {
@@ -268,11 +283,12 @@ public class LbGoodsServiceImpl extends ServiceImpl<LbGoodsMapper, LbGoods> impl
int totalSynced = 0;
while (true) {
Optional<HxrLbGoodsSelectResponse> opt =
hxrAdminGoodsService.fetchGoodsPage(page, token);
hxrAdminGoodsService.fetchGoodsPage(page, apiContext);
if (opt.isEmpty()) {
if (page == 1) {
result.put("success", false);
result.put("message", "未拉取到货品（请检查 hxr.admin.goods-api-token、goods-api-app-str 或网络）");
result.put("message",
"未拉取到货品（请检查 lb_third_integration_config 中 token、appStr、URL 或网络）");
result.put("synced", 0);
return result;
}

37
src/main/java/com/rj/service/impl/LbThirdIntegrationConfigServiceImpl.java
View File

@@ -7,9 +7,11 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.rj.common.LbThirdIntegrationConstants;
import com.rj.common.PasswordUtil;
import com.rj.dto.LbThirdIntegrationCredentialUpdateRequest;
import com.rj.dto.hxr.HxrGoodsApiContext;
import com.rj.entity.LbThirdIntegrationConfig;
import com.rj.mapper.LbThirdIntegrationConfigMapper;
import com.rj.service.ILbThirdIntegrationConfigService;
import com.rj.util.LbThirdIntegrationConfigUtil;
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;
@@ -18,6 +20,7 @@ import java.time.LocalDateTime;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.UUID;
/**
@@ -306,6 +309,40 @@ public class LbThirdIntegrationConfigServiceImpl
}
}
@Override
public Optional<HxrGoodsApiContext> resolveGoodsApiContext(String tenantId, String tokenOverride) {
if (!StringUtils.hasText(tenantId)) {
return Optional.empty();
}
LbThirdIntegrationConfig config = getByTenantIdOrNull(tenantId.trim());
if (config == null) {
return Optional.empty();
}
if (config.getEnabled() == null || config.getEnabled() != 1) {
return Optional.empty();
}
String token = StringUtils.hasText(tokenOverride)
? tokenOverride.trim()
: decryptFromBytes(config.getGoodsApiTokenCipher());
String appStr = decryptFromBytes(config.getGoodsApiAppStrCipher());
if (!StringUtils.hasText(token) || !StringUtils.hasText(appStr)) {
return Optional.empty();
}
try {
return Optional.of(new HxrGoodsApiContext(
LbThirdIntegrationConfigUtil.resolveGoodsApiBaseUrl(config),
LbThirdIntegrationConfigUtil.resolveGoodsPageLimit(config),
LbThirdIntegrationConfigUtil.resolveGoodsApiOrigin(config),
LbThirdIntegrationConfigUtil.resolveGoodsApiReferer(config),
token.trim(),
appStr.trim()));
} catch (IllegalStateException e) {
return Optional.empty();
}
}
private LbThirdIntegrationConfig getByTenantIdOrNull(String tenantId) {
return this.getOne(new LambdaQueryWrapper<LbThirdIntegrationConfig>()
.eq(LbThirdIntegrationConfig::getTenantId, tenantId)