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-31 07:33:00 +08:00
parent d9f7ea3d12
commit 76297caa81
5 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/com/rj/config/HxrAdminProperties.java
View File

@@ -20,19 +20,19 @@ public class HxrAdminProperties {
* 订单列表基础 URL（含分页等通用查询串）；各业务在代码中覆盖查询参数，或使用独立 URL 配置。 * 订单列表基础 URL（含分页等通用查询串）；各业务在代码中覆盖查询参数，或使用独立 URL 配置。
*/ */
private String orderSelectUrl = private String orderSelectUrl =
"https://hxrdhoutai.hxrdsm.cn/app/admin/order/select?page=1&limit=90"; "https://hxrdhoutai.hxrdsm.cn222/app/admin/order/select?page=1&limit=90";
/** /**
* 未支付订单拉取 URL（含 {@code status=0} 等业务筛选），供 {@link LBAdminPullScheduler#pullOrdersForUnPay} 使用。 * 未支付订单拉取 URL（含 {@code status=0} 等业务筛选），供 {@link LBAdminPullScheduler#pullOrdersForUnPay} 使用。
*/ */
private String orderSelectUnPayUrl = private String orderSelectUnPayUrl =
"https://hxrdhoutai.hxrdsm.cn/app/admin/order/select?page=1&limit=90&status=0"; "https://hxrdhoutai.hxrdsm.cn222/app/admin/order/select?page=1&limit=90&status=0";
/** /**
* 已支付订单拉取 URL（含 {@code status=1}），供 {@link LBAdminPullScheduler#pullOrdersForUnPay} 使用。 * 已支付订单拉取 URL（含 {@code status=1}），供 {@link LBAdminPullScheduler#pullOrdersForUnPay} 使用。
*/ */
private String orderSelectPaidUrl = private String orderSelectPaidUrl =
"https://hxrdhoutai.hxrdsm.cn/app/admin/order/select?page=1&limit=90&status=1"; "https://hxrdhoutai.hxrdsm.cn222/app/admin/order/select?page=1&limit=90&status=1";
/** /**
* 定时将 hxrd 订单同步到 {@code lb_order_row} 时使用的租户 id；未配置时跳过订单状态同步。 * 定时将 hxrd 订单同步到 {@code lb_order_row} 时使用的租户 id；未配置时跳过订单状态同步。
@@ -53,22 +53,22 @@ public class HxrAdminProperties {
* 用户列表接口 URL（可含默认查询串）；实际请求会覆盖 {@code mobile} 等参数。 * 用户列表接口 URL（可含默认查询串）；实际请求会覆盖 {@code mobile} 等参数。
*/ */
private String userSelectUrl = private String userSelectUrl =
"https://hxrdhoutai.hxrdsm.cn/app/admin/user/select?page=1&limit=90"; "https://hxrdhoutai.hxrdsm.cn222/app/admin/user/select?page=1&limit=90";
/** /**
* 用户更新接口 URL。 * 用户更新接口 URL。
*/ */
private String userUpdateUrl = "https://hxrdhoutai.hxrdsm.cn/app/admin/user/update"; private String userUpdateUrl = "https://hxrdhoutai.hxrdsm.cn222/app/admin/user/update";
/** /**
* 货品列表 API（{@code /api/order/goods}）；实际请求会覆盖 {@code page}、{@code limit}。 * 货品列表 API（{@code /api/order/goods}）；实际请求会覆盖 {@code page}、{@code limit}。
*/ */
private String goodsApiUrl = "https://hxrdhoutai.hxrdsm.cn/api/order/goods?page=1&limit=20"; private String goodsApiUrl = "https://hxrdhoutai.hxrdsm.cn222/api/order/goods?page=1&limit=20";
/** /**
* 抢购 API（{@code POST /api/order/buy}）。 * 抢购 API（{@code POST /api/order/buy}）。
*/ */
private String buyApiUrl = "https://hxrdhoutai.hxrdsm.cn/api/order/buy"; private String buyApiUrl = "https://hxrdhoutai.hxrdsm.cn222/api/order/buy";
/** /**
* 货品列表 API 请求头 {@code token}。 * 货品列表 API 请求头 {@code token}。

2
src/main/java/com/rj/service/HxrAdminOrderSelectService.java
View File

@@ -155,7 +155,7 @@ public class HxrAdminOrderSelectService {
} }
String refererHeader = referer; String refererHeader = referer;
if (refererHeader == null || refererHeader.isBlank()) { if (refererHeader == null || refererHeader.isBlank()) {
refererHeader = "https://hxrdhoutai.hxrdsm.cn/app/admin/order/index"; refererHeader = "https://hxrdhoutai.hxrdsm.cn222/app/admin/order/index";
} }
HttpClient client = HttpClient.newBuilder() HttpClient client = HttpClient.newBuilder()

6
src/main/java/com/rj/service/HxrAdminUserService.java
View File

@@ -117,7 +117,7 @@ public class HxrAdminUserService {
stripQuery(properties.getUserSelectUrl()), stripQuery(properties.getUserSelectUrl()),
USER_SELECT_PAGE_SIZE, USER_SELECT_PAGE_SIZE,
cookieHeader, cookieHeader,
"https://hxrdhoutai.hxrdsm.cn/app/admin/user/index"); "https://hxrdhoutai.hxrdsm.cn222/app/admin/user/index");
return fetchUserSelectPage(page, ctx); return fetchUserSelectPage(page, ctx);
} }
@@ -228,7 +228,7 @@ public class HxrAdminUserService {
.header("Accept-Language", "zh-CN,zh;q=0.9,en;q=0.8,en-GB;q=0.7,en-US;q=0.6") .header("Accept-Language", "zh-CN,zh;q=0.9,en;q=0.8,en-GB;q=0.7,en-US;q=0.6")
.header("Cookie", cookieHeader) .header("Cookie", cookieHeader)
.header("Priority", "u=1, i") .header("Priority", "u=1, i")
.header("Referer", "https://hxrdhoutai.hxrdsm.cn/app/admin/user/index") .header("Referer", "https://hxrdhoutai.hxrdsm.cn222/app/admin/user/index")
.header("User-Agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/148.0.0.0 Safari/537.36 Edg/148.0.0.0") .header("User-Agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/148.0.0.0 Safari/537.36 Edg/148.0.0.0")
.GET() .GET()
.build(); .build();
@@ -294,7 +294,7 @@ public class HxrAdminUserService {
.header("Accept", "application/json, text/javascript, */*; q=0.01") .header("Accept", "application/json, text/javascript, */*; q=0.01")
.header("Content-Type", "application/x-www-form-urlencoded; charset=UTF-8") .header("Content-Type", "application/x-www-form-urlencoded; charset=UTF-8")
.header("Cookie", cookieHeader) .header("Cookie", cookieHeader)
.header("Referer", "https://hxrdhoutai.hxrdsm.cn/app/admin/user/index") .header("Referer", "https://hxrdhoutai.hxrdsm.cn222/app/admin/user/index")
.header("User-Agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/148.0.0.0 Safari/537.36 Edg/148.0.0.0") .header("User-Agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/148.0.0.0 Safari/537.36 Edg/148.0.0.0")
.POST(HttpRequest.BodyPublishers.ofString(form, StandardCharsets.UTF_8)) .POST(HttpRequest.BodyPublishers.ofString(form, StandardCharsets.UTF_8))
.build(); .build();

2
src/main/sql/lb_third_integration_config.sql
View File

@@ -8,7 +8,7 @@ CREATE TABLE `lb_third_integration_config` (
`provider_code` VARCHAR(32) NOT NULL DEFAULT 'HXR_ADMIN' COMMENT '集成类型：HXR_ADMIN 等', `provider_code` VARCHAR(32) NOT NULL DEFAULT 'HXR_ADMIN' COMMENT '集成类型：HXR_ADMIN 等',
`enabled` TINYINT NOT NULL DEFAULT 1 COMMENT '总开关：1启用 0禁用', `enabled` TINYINT NOT NULL DEFAULT 1 COMMENT '总开关：1启用 0禁用',
`admin_base_url` VARCHAR(256) NOT NULL COMMENT '后台管理域名，如 https://hxrdhoutai.hxrdsm.cn', `admin_base_url` VARCHAR(256) NOT NULL COMMENT '后台管理域名，如 https://hxrdhoutai.hxrdsm.cn222',
`web_base_url` VARCHAR(256) NOT NULL COMMENT '前端 Web 域名，如 https://hxrdweb.hxrdsm.cn', `web_base_url` VARCHAR(256) NOT NULL COMMENT '前端 Web 域名，如 https://hxrdweb.hxrdsm.cn',
`order_select_path` VARCHAR(128) NOT NULL DEFAULT '/app/admin/order/select' COMMENT '订单列表 API 路径', `order_select_path` VARCHAR(128) NOT NULL DEFAULT '/app/admin/order/select' COMMENT '订单列表 API 路径',

4
src/test/java/com/rj/integration/HxrAdminOrderSelectHttpTest.java
View File

@@ -44,7 +44,7 @@ class HxrAdminOrderSelectHttpTest {
private static final String PROP_PHPSID = "hxr.order.phpsid"; private static final String PROP_PHPSID = "hxr.order.phpsid";
private static final String ENV_COOKIE = "HXR_ORDER_COOKIE"; private static final String ENV_COOKIE = "HXR_ORDER_COOKIE";
private static final String BASE_URL = "https://hxrdhoutai.hxrdsm.cn/app/admin/order/select"; private static final String BASE_URL = "https://hxrdhoutai.hxrdsm.cn222/app/admin/order/select";
private static final String QUERY = private static final String QUERY =
"?page=1&limit=20" "?page=1&limit=20"
@@ -85,7 +85,7 @@ class HxrAdminOrderSelectHttpTest {
.header("Accept-Language", "zh-CN,zh;q=0.9,en;q=0.8,en-GB;q=0.7,en-US;q=0.6") .header("Accept-Language", "zh-CN,zh;q=0.9,en;q=0.8,en-GB;q=0.7,en-US;q=0.6")
.header("Cookie", cookie) .header("Cookie", cookie)
.header("Priority", "u=1, i") .header("Priority", "u=1, i")
.header("Referer", "https://hxrdhoutai.hxrdsm.cn/app/admin/order/index") .header("Referer", "https://hxrdhoutai.hxrdsm.cn222/app/admin/order/index")
.header("User-Agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/148.0.0.0 Safari/537.36 Edg/148.0.0.0") .header("User-Agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/148.0.0.0 Safari/537.36 Edg/148.0.0.0")
.GET() .GET()
.build(); .build();