From 2a6566d8d6adc8ff439e8171642d137532c0c17a Mon Sep 17 00:00:00 2001 From: YunaiV Date: Sun, 23 Jan 2022 04:27:57 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6=20master=20=E6=9C=80?= =?UTF-8?q?=E6=96=B0=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-local.yaml | 1 + .../core/behavior/BpmUserTaskActivitiBehaviorTest.java | 2 +- yudao-admin-ui/src/utils/dict.js | 6 ++---- .../alipay/AlipayQrPayClientTest.java | 4 +++- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/yudao-admin-server/src/main/resources/application-local.yaml b/yudao-admin-server/src/main/resources/application-local.yaml index adc2755a0..2e26fd6fe 100644 --- a/yudao-admin-server/src/main/resources/application-local.yaml +++ b/yudao-admin-server/src/main/resources/application-local.yaml @@ -183,6 +183,7 @@ yudao: - ${management.endpoints.web.base-path}/** # 不处理 Actuator 的请求 pay: pay-notify-url: http://niubi.natapp1.cc/api/pay/order/notify + pay-return-url: http://niubi.natapp1.cc/api/pay/order/return refund-notify-url: http://niubi.natapp1.cc/api/pay/refund/notify demo: false # 关闭演示模式 diff --git a/yudao-admin-server/src/test/java/cn/iocoder/yudao/adminserver/modules/bpm/framework/activiti/core/behavior/BpmUserTaskActivitiBehaviorTest.java b/yudao-admin-server/src/test/java/cn/iocoder/yudao/adminserver/modules/bpm/framework/activiti/core/behavior/BpmUserTaskActivitiBehaviorTest.java index 21fe1fb88..d42a858a2 100644 --- a/yudao-admin-server/src/test/java/cn/iocoder/yudao/adminserver/modules/bpm/framework/activiti/core/behavior/BpmUserTaskActivitiBehaviorTest.java +++ b/yudao-admin-server/src/test/java/cn/iocoder/yudao/adminserver/modules/bpm/framework/activiti/core/behavior/BpmUserTaskActivitiBehaviorTest.java @@ -31,7 +31,7 @@ import static org.junit.jupiter.api.Assertions.*; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.when; -class BpmUserTaskActivitiBehaviorTest extends BaseMockitoUnitTest { +public class BpmUserTaskActivitiBehaviorTest extends BaseMockitoUnitTest { @InjectMocks private BpmUserTaskActivitiBehavior behavior; diff --git a/yudao-admin-ui/src/utils/dict.js b/yudao-admin-ui/src/utils/dict.js index 2c76d0ba4..e10414d40 100644 --- a/yudao-admin-ui/src/utils/dict.js +++ b/yudao-admin-ui/src/utils/dict.js @@ -41,11 +41,9 @@ export const DICT_TYPE = { BPM_PROCESS_INSTANCE_STATUS: 'bpm_process_instance_status', BPM_PROCESS_INSTANCE_RESULT: 'bpm_process_instance_result', BPM_TASK_ASSIGN_SCRIPT: 'bpm_task_assign_script', - OA_LEAVE_STATUS: 'flow_status', // todo 芋艿：可以删除 - BPM_OA_LEAVE_TYPE: 'bpm_oa_leave_type' - OA_LEAVE_STATUS: 'oa_leave_status', - OA_LEAVE_TYPE: 'oa_leave_type', + BPM_OA_LEAVE_TYPE: 'bpm_oa_leave_type', + // pay // 微信渠道版本 PAY_CHANNEL_WECHAT_VERSION:'pay_channel_wechat_version', // 支付渠道支付宝算法类型 diff --git a/yudao-framework/yudao-spring-boot-starter-biz-pay/src/test/java/cn.iocoder.yudao.framework.pay.core.client.impl/alipay/AlipayQrPayClientTest.java b/yudao-framework/yudao-spring-boot-starter-biz-pay/src/test/java/cn.iocoder.yudao.framework.pay.core.client.impl/alipay/AlipayQrPayClientTest.java index e511095dc..a4c14f634 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-pay/src/test/java/cn.iocoder.yudao.framework.pay.core.client.impl/alipay/AlipayQrPayClientTest.java +++ b/yudao-framework/yudao-spring-boot-starter-biz-pay/src/test/java/cn.iocoder.yudao.framework.pay.core.client.impl/alipay/AlipayQrPayClientTest.java @@ -8,6 +8,7 @@ import com.alipay.api.AlipayApiException; import com.alipay.api.DefaultAlipayClient; import com.alipay.api.request.AlipayTradePrecreateRequest; import com.alipay.api.response.AlipayTradePrecreateResponse; +import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.mockito.ArgumentMatcher; import org.mockito.InjectMocks; @@ -63,9 +64,10 @@ public class AlipayQrPayClientTest extends BaseMockitoUnitTest { public void testDoInit(){ client.doInit(); assertNotSame(defaultAlipayClient, ReflectUtil.getFieldValue(client, "defaultAlipayClient")); - } + @Test + @Disabled // TODO 芋艿：临时禁用 public void create() throws AlipayApiException { // TODO @tina：参数可以尽量随机一点，使用随机方法。这样的好处是，避免对固定参数的依赖，导致可能仅仅满足固定参数的结果 // 这里，设置可以直接随机整个对象。