调整 pay-service-impl 的包，增加 biz 包

增加定时任务，使用 xxl-job

pay/pay-application/src/main/java/cn/iocoder/mall/pay/application/scheduler/PayNotifyAppJob.java

@@ -1,12 +0,0 @@
-package cn.iocoder.mall.pay.application.scheduler;
-
-/**
- * TODO
- */
-public class PayNotifyAppJob {
-
-    // TODO 需要考虑下是基于 MQ 还是 Job
-    // TODO 通知频率
-    // TODO rpc 泛化回调
-
-}

pay/pay-service-impl/pom.xml

@@ -19,6 +19,7 @@
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>dubbo</artifactId>
+            <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>cn.iocoder.mall</groupId>
@@ -66,6 +67,12 @@
             <type>jar</type>
         </dependency>
 
+        <dependency>
+            <groupId>com.xuxueli</groupId>
+            <artifactId>xxl-job-core</artifactId>
+            <version>2.0.1</version>
+        </dependency>
+
     </dependencies>
 
     <build>

pay/pay-service-impl/src/main/java/cn/iocoder/mall/pay/biz/client/AbstractPaySDK.java

@@ -1,8 +1,8 @@
-package cn.iocoder.mall.pay.client;
+package cn.iocoder.mall.pay.biz.client;
 
 import cn.iocoder.common.framework.vo.CommonResult;
-import cn.iocoder.mall.pay.dataobject.PayTransactionDO;
-import cn.iocoder.mall.pay.dataobject.PayTransactionExtensionDO;
+import cn.iocoder.mall.pay.biz.dataobject.PayTransactionDO;
+import cn.iocoder.mall.pay.biz.dataobject.PayTransactionExtensionDO;
 
 import java.util.Map;
 

pay/pay-service-impl/src/main/java/cn/iocoder/mall/pay/biz/client/PaySDKFactory.java

@@ -1,4 +1,4 @@
-package cn.iocoder.mall.pay.client;
+package cn.iocoder.mall.pay.biz.client;
 
 import cn.iocoder.mall.pay.api.constant.PayChannelEnum;
 

pay/pay-service-impl/src/main/java/cn/iocoder/mall/pay/biz/client/PingxxPaySDK.java

@@ -1,8 +1,8 @@
-package cn.iocoder.mall.pay.client;
+package cn.iocoder.mall.pay.biz.client;
 
 import cn.iocoder.common.framework.vo.CommonResult;
-import cn.iocoder.mall.pay.dataobject.PayTransactionDO;
-import cn.iocoder.mall.pay.dataobject.PayTransactionExtensionDO;
+import cn.iocoder.mall.pay.biz.dataobject.PayTransactionDO;
+import cn.iocoder.mall.pay.biz.dataobject.PayTransactionExtensionDO;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.google.common.collect.ImmutableMap;

pay/pay-service-impl/src/main/java/cn/iocoder/mall/pay/biz/client/TransactionPaySuccessBO.java

@@ -1,4 +1,4 @@
-package cn.iocoder.mall.pay.client;
+package cn.iocoder.mall.pay.biz.client;
 
 import java.util.Date;
 

pay/pay-service-impl/src/main/java/cn/iocoder/mall/pay/biz/config/DatabaseConfiguration.java

@@ -1,11 +1,11 @@
-package cn.iocoder.mall.pay.config;
+package cn.iocoder.mall.pay.biz.config;
 
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 
 @Configuration
-@MapperScan("cn.iocoder.mall.pay.dao") // 扫描对应的 Mapper 接口
+@MapperScan("cn.iocoder.mall.pay.biz.dao") // 扫描对应的 Mapper 接口
 @EnableTransactionManagement(proxyTargetClass = true) // 启动事务管理。为什么使用 proxyTargetClass 参数，参见 https://blog.csdn.net/huang_550/article/details/76492600
 public class DatabaseConfiguration {
 

pay/pay-service-impl/src/main/java/cn/iocoder/mall/pay/biz/config/ServiceExceptionConfiguration.java

@@ -1,4 +1,4 @@
-package cn.iocoder.mall.pay.config;
+package cn.iocoder.mall.pay.biz.config;
 
 import cn.iocoder.common.framework.util.ServiceExceptionUtil;
 import cn.iocoder.mall.pay.api.constant.PayErrorCodeEnum;

pay/pay-service-impl/src/main/java/cn/iocoder/mall/pay/biz/config/XxlJobConfiguration.java

@@ -0,0 +1,45 @@
+package cn.iocoder.mall.pay.biz.config;
+
+import com.xxl.job.core.executor.impl.XxlJobSpringExecutor;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class XxlJobConfiguration {
+
+    private Logger logger = LoggerFactory.getLogger(XxlJobConfiguration.class);
+
+    @Value("${xxl.job.admin.addresses}")
+    private String adminAddresses;
+    @Value("${xxl.job.executor.appname}")
+    private String appName;
+    @Value("${xxl.job.executor.ip}")
+    private String ip;
+    @Value("${xxl.job.executor.port}")
+    private int port;
+    @Value("${xxl.job.accessToken}")
+    private String accessToken;
+    @Value("${xxl.job.executor.logpath}")
+    private String logPath;
+    @Value("${xxl.job.executor.logretentiondays}")
+    private int logRetentionDays;
+
+    @Bean(initMethod = "start", destroyMethod = "destroy")
+    public XxlJobSpringExecutor xxlJobExecutor() {
+        logger.info(">>>>>>>>>>> xxl-job config init.");
+        XxlJobSpringExecutor xxlJobSpringExecutor = new XxlJobSpringExecutor();
+        xxlJobSpringExecutor.setAdminAddresses(adminAddresses);
+        xxlJobSpringExecutor.setAppName(appName);
+        xxlJobSpringExecutor.setIp(ip);
+        xxlJobSpringExecutor.setPort(port);
+        xxlJobSpringExecutor.setAccessToken(accessToken);
+        xxlJobSpringExecutor.setLogPath(logPath);
+        xxlJobSpringExecutor.setLogRetentionDays(logRetentionDays);
+
+        return xxlJobSpringExecutor;
+    }
+
+}

pay/pay-service-impl/src/main/java/cn/iocoder/mall/pay/biz/convert/PayTransactionConvert.java

@@ -1,10 +1,10 @@
-package cn.iocoder.mall.pay.convert;
+package cn.iocoder.mall.pay.biz.convert;
 
 import cn.iocoder.mall.pay.api.bo.PayTransactionBO;
 import cn.iocoder.mall.pay.api.dto.PayTransactionCreateDTO;
 import cn.iocoder.mall.pay.api.dto.PayTransactionSubmitDTO;
-import cn.iocoder.mall.pay.dataobject.PayTransactionDO;
-import cn.iocoder.mall.pay.dataobject.PayTransactionExtensionDO;
+import cn.iocoder.mall.pay.biz.dataobject.PayTransactionDO;
+import cn.iocoder.mall.pay.biz.dataobject.PayTransactionExtensionDO;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mappings;
 import org.mapstruct.factory.Mappers;

pay/pay-service-impl/src/main/java/cn/iocoder/mall/pay/biz/dao/PayAppMapper.java

@@ -1,6 +1,6 @@
-package cn.iocoder.mall.pay.dao;
+package cn.iocoder.mall.pay.biz.dao;
 
-import cn.iocoder.mall.pay.dataobject.PayAppDO;
+import cn.iocoder.mall.pay.biz.dataobject.PayAppDO;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 

pay/pay-service-impl/src/main/java/cn/iocoder/mall/pay/biz/dao/PayTransactionExtensionMapper.java

@@ -1,6 +1,6 @@
-package cn.iocoder.mall.pay.dao;
+package cn.iocoder.mall.pay.biz.dao;
 
-import cn.iocoder.mall.pay.dataobject.PayTransactionExtensionDO;
+import cn.iocoder.mall.pay.biz.dataobject.PayTransactionExtensionDO;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 

pay/pay-service-impl/src/main/java/cn/iocoder/mall/pay/biz/dao/PayTransactionMapper.java

@@ -1,6 +1,6 @@
-package cn.iocoder.mall.pay.dao;
+package cn.iocoder.mall.pay.biz.dao;
 
-import cn.iocoder.mall.pay.dataobject.PayTransactionDO;
+import cn.iocoder.mall.pay.biz.dataobject.PayTransactionDO;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 

pay/pay-service-impl/src/main/java/cn/iocoder/mall/pay/biz/dao/PayTransactionNotifyTaskMapper.java

@@ -1,6 +1,6 @@
-package cn.iocoder.mall.pay.dao;
+package cn.iocoder.mall.pay.biz.dao;
 
-import cn.iocoder.mall.pay.dataobject.PayTransactionNotifyTaskDO;
+import cn.iocoder.mall.pay.biz.dataobject.PayTransactionNotifyTaskDO;
 import org.springframework.stereotype.Repository;
 
 @Repository

pay/pay-service-impl/src/main/java/cn/iocoder/mall/pay/biz/dataobject/PayAppDO.java

@@ -1,4 +1,4 @@
-package cn.iocoder.mall.pay.dataobject;
+package cn.iocoder.mall.pay.biz.dataobject;
 
 import cn.iocoder.common.framework.dataobject.BaseDO;
 

pay/pay-service-impl/src/main/java/cn/iocoder/mall/pay/biz/dataobject/PayLogDO.java

@@ -1,4 +1,4 @@
-package cn.iocoder.mall.pay.dataobject;
+package cn.iocoder.mall.pay.biz.dataobject;
 
 /**
  * 交易日志 DO

pay/pay-service-impl/src/main/java/cn/iocoder/mall/pay/biz/dataobject/PayRefundDO.java

@@ -0,0 +1,4 @@
+package cn.iocoder.mall.pay.biz.dataobject;
+
+public class PayRefundDO {
+}

pay/pay-service-impl/src/main/java/cn/iocoder/mall/pay/biz/dataobject/PayRepeatTransactionDO.java

@@ -1,4 +1,4 @@
-package cn.iocoder.mall.pay.dataobject;
+package cn.iocoder.mall.pay.biz.dataobject;
 
 /**
  * TODO 重复支付的交易

pay/pay-service-impl/src/main/java/cn/iocoder/mall/pay/biz/dataobject/PayTransactionDO.java

@@ -1,4 +1,4 @@
-package cn.iocoder.mall.pay.dataobject;
+package cn.iocoder.mall.pay.biz.dataobject;
 
 import cn.iocoder.common.framework.dataobject.BaseDO;
 

pay/pay-service-impl/src/main/java/cn/iocoder/mall/pay/biz/dataobject/PayTransactionExtensionDO.java

@@ -1,4 +1,4 @@
-package cn.iocoder.mall.pay.dataobject;
+package cn.iocoder.mall.pay.biz.dataobject;
 
 import cn.iocoder.common.framework.dataobject.BaseDO;
 

pay/pay-service-impl/src/main/java/cn/iocoder/mall/pay/biz/dataobject/PayTransactionNotifyLogDO.java

@@ -1,4 +1,4 @@
-package cn.iocoder.mall.pay.dataobject;
+package cn.iocoder.mall.pay.biz.dataobject;
 
 import cn.iocoder.common.framework.dataobject.BaseDO;
 

pay/pay-service-impl/src/main/java/cn/iocoder/mall/pay/biz/dataobject/PayTransactionNotifyTaskDO.java

@@ -1,4 +1,4 @@
-package cn.iocoder.mall.pay.dataobject;
+package cn.iocoder.mall.pay.biz.dataobject;
 
 import cn.iocoder.common.framework.dataobject.BaseDO;
 

pay/pay-service-impl/src/main/java/cn/iocoder/mall/pay/biz/scheduler/PayNotifyAppJob.java

@@ -0,0 +1,25 @@
+package cn.iocoder.mall.pay.biz.scheduler;
+
+import com.xxl.job.core.biz.model.ReturnT;
+import com.xxl.job.core.handler.IJobHandler;
+import com.xxl.job.core.handler.annotation.JobHandler;
+import org.springframework.stereotype.Component;
+
+/**
+ * TODO
+ */
+@Component
+@JobHandler(value = "payNotifyAppJob")
+public class PayNotifyAppJob extends IJobHandler {
+
+    @Override
+    public ReturnT<String> execute(String param) throws Exception {
+        System.out.println("1");
+        return null;
+    }
+
+    // TODO 需要考虑下是基于 MQ 还是 Job
+    // TODO 通知频率
+    // TODO rpc 泛化回调
+
+}

pay/pay-service-impl/src/main/java/cn/iocoder/mall/pay/biz/service/PayAppServiceImpl.java

@@ -1,11 +1,11 @@
-package cn.iocoder.mall.pay.service;
+package cn.iocoder.mall.pay.biz.service;
 
 import cn.iocoder.common.framework.constant.CommonStatusEnum;
 import cn.iocoder.common.framework.util.ServiceExceptionUtil;
 import cn.iocoder.common.framework.vo.CommonResult;
 import cn.iocoder.mall.pay.api.constant.PayErrorCodeEnum;
-import cn.iocoder.mall.pay.dao.PayAppMapper;
-import cn.iocoder.mall.pay.dataobject.PayAppDO;
+import cn.iocoder.mall.pay.biz.dao.PayAppMapper;
+import cn.iocoder.mall.pay.biz.dataobject.PayAppDO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

pay/pay-service-impl/src/main/java/cn/iocoder/mall/pay/biz/service/PayDemoServiceImpl.java

@@ -1,4 +1,4 @@
-package cn.iocoder.mall.pay.service;
+package cn.iocoder.mall.pay.biz.service;
 
 import cn.iocoder.mall.pay.api.PayDemoService;
 import org.springframework.stereotype.Service;

pay/pay-service-impl/src/main/java/cn/iocoder/mall/pay/biz/service/PayServiceImpl.java

@@ -1,4 +1,4 @@
-package cn.iocoder.mall.pay.service;
+package cn.iocoder.mall.pay.biz.service;
 
 import cn.iocoder.common.framework.util.DateUtil;
 import cn.iocoder.common.framework.util.MathUtil;
@@ -12,17 +12,17 @@ import cn.iocoder.mall.pay.api.constant.PayTransactionNotifyStatusEnum;
 import cn.iocoder.mall.pay.api.constant.PayTransactionStatusEnum;
 import cn.iocoder.mall.pay.api.dto.PayTransactionCreateDTO;
 import cn.iocoder.mall.pay.api.dto.PayTransactionSubmitDTO;
-import cn.iocoder.mall.pay.client.AbstractPaySDK;
-import cn.iocoder.mall.pay.client.PaySDKFactory;
-import cn.iocoder.mall.pay.client.TransactionPaySuccessBO;
-import cn.iocoder.mall.pay.convert.PayTransactionConvert;
-import cn.iocoder.mall.pay.dao.PayTransactionExtensionMapper;
-import cn.iocoder.mall.pay.dao.PayTransactionMapper;
-import cn.iocoder.mall.pay.dao.PayTransactionNotifyTaskMapper;
-import cn.iocoder.mall.pay.dataobject.PayAppDO;
-import cn.iocoder.mall.pay.dataobject.PayTransactionDO;
-import cn.iocoder.mall.pay.dataobject.PayTransactionExtensionDO;
-import cn.iocoder.mall.pay.dataobject.PayTransactionNotifyTaskDO;
+import cn.iocoder.mall.pay.biz.client.AbstractPaySDK;
+import cn.iocoder.mall.pay.biz.client.PaySDKFactory;
+import cn.iocoder.mall.pay.biz.client.TransactionPaySuccessBO;
+import cn.iocoder.mall.pay.biz.convert.PayTransactionConvert;
+import cn.iocoder.mall.pay.biz.dao.PayTransactionExtensionMapper;
+import cn.iocoder.mall.pay.biz.dao.PayTransactionMapper;
+import cn.iocoder.mall.pay.biz.dao.PayTransactionNotifyTaskMapper;
+import cn.iocoder.mall.pay.biz.dataobject.PayAppDO;
+import cn.iocoder.mall.pay.biz.dataobject.PayTransactionDO;
+import cn.iocoder.mall.pay.biz.dataobject.PayTransactionExtensionDO;
+import cn.iocoder.mall.pay.biz.dataobject.PayTransactionNotifyTaskDO;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;

pay/pay-service-impl/src/main/java/cn/iocoder/mall/pay/dataobject/PayRefundDO.java

@@ -1,4 +0,0 @@
-package cn.iocoder.mall.pay.dataobject;
-
-public class PayRefundDO {
-}

pay/pay-service-impl/src/main/java/cn/iocoder/mall/pay/package-info.java

@@ -1 +0,0 @@
-package cn.iocoder.mall.pay;

pay/pay-service-impl/src/main/resources/config/application.yaml

@@ -10,7 +10,7 @@ spring:
 mybatis:
   config-location: classpath:mybatis-config.xml
   mapper-locations: classpath:mapper/*.xml
-  type-aliases-package: cn.iocoder.mall.pay.dataobject
+  type-aliases-package: cn.iocoder.mall.pay.biz.dataobject
 
 # dubbo
 dubbo:
@@ -22,4 +22,18 @@ dubbo:
     port: -1
     name: dubbo
   scan:
-    base-packages: cn.iocoder.mall.pay.service
+    base-packages: cn.iocoder.mall.pay.biz.service
+
+# xxl-job
+
+xxl:
+  job:
+    admin:
+      addresses: http://127.0.0.1:8080/xxl-job-admin
+    executor:
+      appname: pay-job-executor
+      ip:
+      port: 0
+      logpath: /Users/yunai/logs/xxl-job/
+      logretentiondays: 1
+    accessToken:

pay/pay-service-impl/src/main/resources/mapper/PayAppMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.iocoder.mall.pay.dao.PayAppMapper">
+<mapper namespace="cn.iocoder.mall.pay.biz.dao.PayAppMapper">
 
     <sql id="FIELDS">
         id, name, notify_url, status, create_time

pay/pay-service-impl/src/main/resources/mapper/PayTransactionExtensionMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.iocoder.mall.pay.dao.PayTransactionExtensionMapper">
+<mapper namespace="cn.iocoder.mall.pay.biz.dao.PayTransactionExtensionMapper">
 
     <sql id="FIELDS">
         id, transaction_id, pay_channel, transaction_code, extension_data,

pay/pay-service-impl/src/main/resources/mapper/PayTransactionMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.iocoder.mall.pay.dao.PayTransactionMapper">
+<mapper namespace="cn.iocoder.mall.pay.biz.dao.PayTransactionMapper">
 
     <sql id="FIELDS">
         id, app_id, create_ip, order_id, order_subject,

pay/pay-service-impl/src/main/resources/mapper/PayTransactionNotifyTaskMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.iocoder.mall.pay.dao.PayTransactionNotifyTaskMapper">
+<mapper namespace="cn.iocoder.mall.pay.biz.dao.PayTransactionNotifyTaskMapper">
 
     <sql id="FIELDS">
         id, transaction_id, transaction_extension_id, app_id, order_id,