合并 master 最新代码

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 # 关闭演示模式
 

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;

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',
-  BPM_OA_LEAVE_TYPE: 'bpm_oa_leave_type'
-  OA_LEAVE_STATUS: 'oa_leave_status',
-  OA_LEAVE_TYPE: 'oa_leave_type',
 
+  // pay
   // 微信渠道版本
   PAY_CHANNEL_WECHAT_VERSION:'pay_channel_wechat_version',
   // 支付渠道支付宝算法类型

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：参数可以尽量随机一点，使用随机方法。这样的好处是，避免对固定参数的依赖，导致可能仅仅满足固定参数的结果
         // 这里，设置可以直接随机整个对象。