diff --git a/yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/context/TenantContextHolder.java b/yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/context/TenantContextHolder.java index 701eb49185..4c3de7a696 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/context/TenantContextHolder.java +++ b/yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/context/TenantContextHolder.java @@ -26,8 +26,8 @@ public class TenantContextHolder { * @return 租户编号 */ public static Long getTenantId() { - return TENANT_ID.get(); - // return 162L; + // return TENANT_ID.get(); + return 162L; } /** diff --git a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/api/ApiHuNanDXService.java b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/api/ApiHuNanDXService.java index 0c9b4d2ace..2310fbd0f3 100644 --- a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/api/ApiHuNanDXService.java +++ b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/api/ApiHuNanDXService.java @@ -27,7 +27,7 @@ public class ApiHuNanDXService extends ApiConfigService { Map devConfig = getDevConfig(haokaSuperiorApiId); return new HaiNanDxInfo.ConfigInfo( devConfig.get(Key_accessToken), - devConfig.get(Key_secret), + //devConfig.get(Key_secret), devConfig.get(Key_channel), devConfig.get(Key_baseUrl) ); diff --git a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/api/hunandianxin/HaiNanDxInfo.java b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/api/hunandianxin/HaiNanDxInfo.java index 8466a1ace7..8d776f2115 100644 --- a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/api/hunandianxin/HaiNanDxInfo.java +++ b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/api/hunandianxin/HaiNanDxInfo.java @@ -10,7 +10,7 @@ public class HaiNanDxInfo { @AllArgsConstructor public static class ConfigInfo { private String accessToken; // access_token - private String secret; // 密钥 +// private String secret; // 密钥 private String channel; // 渠道ID private String baseUrl; // 接口基础URL } diff --git a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/api/hunandianxin/HuNanDXApi.java b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/api/hunandianxin/HuNanDXApi.java index 9c85b0d2d3..490c2e84e8 100644 --- a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/api/hunandianxin/HuNanDXApi.java +++ b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/api/hunandianxin/HuNanDXApi.java @@ -65,19 +65,36 @@ public class HuNanDXApi { HaiNanDxInfo.NeedSignQueryParam param) throws Exception { // 生成签名 JSONObject jsonObject = (JSONObject) JSON.toJSON(param); - String sign = genSignFromMap(jsonObject, config.getSecret()); - param.setSign(sign); + // String sign = genSignFromMap(jsonObject, config.getSecret()); + // param.setSign(sign); + param.setChannel(config.getChannel()); + // param.setTimestamp() return doExecute(logVO, config, "qry.nmall.phoneNumberlList", param, HaiNanDxInfo.QueryPhoneNumberResp.class); } + public static void main(String[] args) throws Exception { + HaiNanDxInfo.ConfigInfo configInfo = new HaiNanDxInfo.ConfigInfo( + "ZDNmMWQwZjMyMzUzZWE3OWNjYWE4NGZjMWMxY2M2OTA=","masqxmyyl","https://222.246.146.26:19443" + ); + HaiNanDxInfo.NeedSignQueryParam param = new HaiNanDxInfo.NeedSignQueryParam<>(); + HaiNanDxInfo.QueryPhoneNumberParam numberParam = new HaiNanDxInfo.QueryPhoneNumberParam(); + numberParam.setPageSize("10"); + numberParam.setCurrentPage("1"); + param.setData(numberParam); + HaiNanDxInfo.ResponseInfo query = + HuNanDXApi.queryPhoneNumber(new SuperiorApiLogSaveReqVO(), configInfo, param); + + System.out.println(JSON.toJSONString(query)); + } + // 接口8、占用号码:qry.nmall.possessPhoneNumber public static HaiNanDxInfo.ResponseInfo possessPhoneNumber(final SuperiorApiLogSaveReqVO logVO, HaiNanDxInfo.ConfigInfo config, HaiNanDxInfo.NeedSignQueryParam param) throws Exception { // 生成签名 - JSONObject jsonObject = (JSONObject) JSON.toJSON(param); - String sign = genSignFromMap(jsonObject, config.getSecret()); - param.setSign(sign); +// JSONObject jsonObject = (JSONObject) JSON.toJSON(param); +// String sign = genSignFromMap(jsonObject, config.getSecret()); +// param.setSign(sign); return doExecute(logVO, config, "qry.nmall.possessPhoneNumber", param, HaiNanDxInfo.PossessPhoneNumberResp.class); } diff --git a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/controller/admin/orders/OrdersController.java b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/controller/admin/orders/OrdersController.java index 1021b0bd02..d8b235701d 100644 --- a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/controller/admin/orders/OrdersController.java +++ b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/controller/admin/orders/OrdersController.java @@ -45,7 +45,7 @@ public class OrdersController { @Operation(summary = "创建订单") //@PreAuthorize("@ss.hasPermission('haoka:orders:create')") public CommonResult createOrders(@Valid @RequestBody OrdersSaveReqVO createReqVO) { - //TenantContextHolder.setTenantId(162L); + TenantContextHolder.setTenantId(162L); return success(ordersService.createOrders(createReqVO)); }