调整包路径

src/main/java/com/qkdata/biz/aliyun/config/AliyunConfig.java → src/main/java/com/qkdata/aliyun/config/AliyunConfig.java

-package com.qkdata.biz.aliyun.config;
+package com.qkdata.aliyun.config;
 
 import lombok.Data;
 import org.springframework.beans.factory.annotation.Value;

src/main/java/com/qkdata/biz/aliyun/controller/AliyunApiController.java → src/main/java/com/qkdata/aliyun/controller/AliyunApiController.java

-package com.qkdata.biz.aliyun.controller;
+package com.qkdata.aliyun.controller;
 
 import com.aliyuncs.vod.model.v20170321.CreateUploadVideoResponse;
 import com.aliyuncs.vod.model.v20170321.RefreshUploadVideoResponse;
-import com.qkdata.biz.aliyun.service.AliyunService;
-import com.qkdata.biz.aliyun.vo.AliyunOSSUploadPolicyModel;
+import com.qkdata.aliyun.service.AliyunService;
+import com.qkdata.aliyun.vo.AliyunOSSUploadPolicyModel;
 import com.qkdata.common.base.model.Result;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

src/main/java/com/qkdata/biz/aliyun/controller/AliyunCallbackController.java → src/main/java/com/qkdata/aliyun/controller/AliyunCallbackController.java

-package com.qkdata.biz.aliyun.controller;
+package com.qkdata.aliyun.controller;
 
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONObject;
-import com.qkdata.biz.aliyun.service.AliyunService;
-import com.qkdata.biz.aliyun.vo.AliyunCallbackRespModel;
-import com.qkdata.biz.aliyun.vo.AliyunVideoCallbackModel;
-import com.qkdata.biz.aliyun.vo.ExtendData;
+import com.qkdata.aliyun.service.AliyunService;
+import com.qkdata.aliyun.vo.AliyunCallbackRespModel;
+import com.qkdata.aliyun.vo.AliyunVideoCallbackModel;
+import com.qkdata.aliyun.vo.ExtendData;
 import com.qkdata.biz.management.entity.ResourcePO;
 import com.qkdata.biz.management.service.ResourceService;
 import com.qkdata.common.annotation.SysLog;

src/main/java/com/qkdata/biz/aliyun/service/AliyunService.java → src/main/java/com/qkdata/aliyun/service/AliyunService.java

-package com.qkdata.biz.aliyun.service;
+package com.qkdata.aliyun.service;
 
 import com.alibaba.fastjson.JSONObject;
 import com.aliyun.oss.OSS;
@@ -11,8 +11,8 @@ import com.aliyuncs.exceptions.ClientException;
 import com.aliyuncs.profile.DefaultProfile;
 import com.aliyuncs.vod.model.v20170321.*;
 import com.google.common.collect.Maps;
-import com.qkdata.biz.aliyun.config.AliyunConfig;
-import com.qkdata.biz.aliyun.vo.AliyunOSSUploadPolicyModel;
+import com.qkdata.aliyun.config.AliyunConfig;
+import com.qkdata.aliyun.vo.AliyunOSSUploadPolicyModel;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;

src/main/java/com/qkdata/biz/aliyun/vo/AliyunCallbackRespModel.java → src/main/java/com/qkdata/aliyun/vo/AliyunCallbackRespModel.java

-package com.qkdata.biz.aliyun.vo;
+package com.qkdata.aliyun.vo;
 
 import lombok.Data;
 

src/main/java/com/qkdata/biz/aliyun/vo/AliyunOSSUploadPolicyModel.java → src/main/java/com/qkdata/aliyun/vo/AliyunOSSUploadPolicyModel.java

-package com.qkdata.biz.aliyun.vo;
+package com.qkdata.aliyun.vo;
 
 import lombok.Data;
 

src/main/java/com/qkdata/biz/aliyun/vo/AliyunVideoCallbackModel.java → src/main/java/com/qkdata/aliyun/vo/AliyunVideoCallbackModel.java

-package com.qkdata.biz.aliyun.vo;
+package com.qkdata.aliyun.vo;
 
 import lombok.Data;
 

src/main/java/com/qkdata/biz/aliyun/vo/ExtendData.java → src/main/java/com/qkdata/aliyun/vo/ExtendData.java

-package com.qkdata.biz.aliyun.vo;
+package com.qkdata.aliyun.vo;
 
 import lombok.Data;
 

src/main/java/com/qkdata/biz/management/service/CourseService.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.google.common.collect.Lists;
-import com.qkdata.biz.aliyun.service.AliyunService;
+import com.qkdata.aliyun.service.AliyunService;
 import com.qkdata.biz.enums.CourseAllowEnum;
 import com.qkdata.biz.enums.CourseChargeModelEnum;
 import com.qkdata.biz.enums.CourseModelEnum;

src/main/java/com/qkdata/biz/management/service/ResourceService.java

@@ -5,12 +5,11 @@ import cn.hutool.core.util.StrUtil;
 import com.aliyuncs.exceptions.ClientException;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.qkdata.biz.aliyun.service.AliyunService;
+import com.qkdata.aliyun.service.AliyunService;
 import com.qkdata.biz.management.entity.ResourcePO;
 import com.qkdata.biz.management.mapper.ResourceMapper;
 import com.qkdata.biz.management.vo.ResourceModel;
 import com.qkdata.common.base.exception.BusinessException;
-import org.apache.poi.ss.formula.udf.IndexedUDFFinder;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

src/main/java/com/qkdata/wx/pay/config/WxPayConfiguration.java

@@ -31,7 +31,7 @@ public class WxPayConfiguration {
     payConfig.setKeyPath(StringUtils.trimToNull(this.properties.getKeyPath()));
 
     // 可以指定是否使用沙箱环境
-    payConfig.setUseSandboxEnv(true);
+    payConfig.setUseSandboxEnv(this.properties.isSandbox());
 
     WxPayService wxPayService = new WxPayServiceImpl();
     wxPayService.setConfig(payConfig);

src/main/java/com/qkdata/wx/pay/config/WxPayProperties.java

@@ -36,5 +36,9 @@ public class WxPayProperties {
    * apiclient_cert.p12文件的绝对路径，或者如果放在项目中，请以classpath:开头指定
    */
   private String keyPath;
+    /**
+     * 沙盒模式
+     */
+  private boolean sandbox;
 
 }

src/main/resources/application-dev.yml

@@ -17,7 +17,9 @@ log:
   path: /Users/liuyang/work/argus_work/online-edu/data/logs
 file:
   path: /Users/liuyang/work/argus_work/online-edu/data/files #../data/files
-
+wx:
+  pay:
+    sandbox: true
 sms:
   api:
     v3: http://localhost:9004/sms/api/v3

src/main/resources/application.yml

@@ -113,6 +113,7 @@ wx:
     mchId: 1610013675
     mchKey: z33nsd1go35ynhjubi4gappp6g0fkzed
     keyPath: classpath:apiclient_cert.p12
+    sandbox: false
 sms:
   api:
     v3: http://sms-service/sms/api/v3