去除无效的代码，代码 格式、位置 调整
This commit is contained in:
Chopper
parent
27efe772ab
commit
f0f343aa23
@ -6,8 +6,8 @@ import cn.lili.common.exception.ServiceException;
|
|||||||
import cn.lili.common.vo.ResultMessage;
|
import cn.lili.common.vo.ResultMessage;
|
||||||
import cn.lili.modules.payment.kit.CashierSupport;
|
import cn.lili.modules.payment.kit.CashierSupport;
|
||||||
import cn.lili.modules.payment.kit.dto.PayParam;
|
import cn.lili.modules.payment.kit.dto.PayParam;
|
||||||
import cn.lili.modules.payment.kit.enums.PaymentClientEnum;
|
import cn.lili.modules.payment.entity.enums.PaymentClientEnum;
|
||||||
import cn.lili.modules.payment.kit.enums.PaymentMethodEnum;
|
import cn.lili.modules.payment.entity.enums.PaymentMethodEnum;
|
||||||
import cn.lili.modules.payment.kit.params.dto.CashierParam;
|
import cn.lili.modules.payment.kit.params.dto.CashierParam;
|
||||||
import io.swagger.annotations.Api;
|
import io.swagger.annotations.Api;
|
||||||
import io.swagger.annotations.ApiImplicitParam;
|
import io.swagger.annotations.ApiImplicitParam;
|
||||||
|
|||||||
@ -1,10 +1,9 @@
|
|||||||
package cn.lili.controller.payment;
|
package cn.lili.controller.payment;
|
||||||
|
|
||||||
import cn.lili.modules.payment.kit.RefundSupport;
|
import cn.lili.modules.payment.kit.RefundSupport;
|
||||||
import cn.lili.modules.payment.kit.enums.PaymentMethodEnum;
|
import cn.lili.modules.payment.entity.enums.PaymentMethodEnum;
|
||||||
import io.swagger.annotations.Api;
|
import io.swagger.annotations.Api;
|
||||||
import io.swagger.annotations.ApiOperation;
|
import io.swagger.annotations.ApiOperation;
|
||||||
import lombok.RequiredArgsConstructor;
|
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.web.bind.annotation.PathVariable;
|
import org.springframework.web.bind.annotation.PathVariable;
|
||||||
import org.springframework.web.bind.annotation.RequestMapping;
|
import org.springframework.web.bind.annotation.RequestMapping;
|
||||||
|
|||||||
@ -1,4 +0,0 @@
|
|||||||
#NOTE: This is a Maven Resolver internal implementation file, its format can be changed without prior notice.
|
|
||||||
#Thu Dec 24 11:13:34 CST 2020
|
|
||||||
xxl-job-admin-2.3.0-SNAPSHOT.pom>=
|
|
||||||
xxl-job-admin-2.3.0-SNAPSHOT.jar>=
|
|
||||||
@ -1,24 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<metadata modelVersion="1.1.0">
|
|
||||||
<groupId>com.xuxueli</groupId>
|
|
||||||
<artifactId>xxl-job-admin</artifactId>
|
|
||||||
<version>2.3.0-SNAPSHOT</version>
|
|
||||||
<versioning>
|
|
||||||
<snapshot>
|
|
||||||
<localCopy>true</localCopy>
|
|
||||||
</snapshot>
|
|
||||||
<lastUpdated>20201224031334</lastUpdated>
|
|
||||||
<snapshotVersions>
|
|
||||||
<snapshotVersion>
|
|
||||||
<extension>jar</extension>
|
|
||||||
<value>2.3.0-SNAPSHOT</value>
|
|
||||||
<updated>20201224031334</updated>
|
|
||||||
</snapshotVersion>
|
|
||||||
<snapshotVersion>
|
|
||||||
<extension>pom</extension>
|
|
||||||
<value>2.3.0-SNAPSHOT</value>
|
|
||||||
<updated>20201224031334</updated>
|
|
||||||
</snapshotVersion>
|
|
||||||
</snapshotVersions>
|
|
||||||
</versioning>
|
|
||||||
</metadata>
|
|
||||||
Binary file not shown.
@ -1,113 +0,0 @@
|
|||||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
|
||||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
|
||||||
<modelVersion>4.0.0</modelVersion>
|
|
||||||
<parent>
|
|
||||||
<groupId>com.xuxueli</groupId>
|
|
||||||
<artifactId>xxl-job</artifactId>
|
|
||||||
<version>2.3.0-SNAPSHOT</version>
|
|
||||||
</parent>
|
|
||||||
<artifactId>xxl-job-admin</artifactId>
|
|
||||||
<packaging>jar</packaging>
|
|
||||||
|
|
||||||
<dependencyManagement>
|
|
||||||
<dependencies>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.springframework.boot</groupId>
|
|
||||||
<artifactId>spring-boot-starter-parent</artifactId>
|
|
||||||
<version>${spring-boot.version}</version>
|
|
||||||
<type>pom</type>
|
|
||||||
<scope>import</scope>
|
|
||||||
</dependency>
|
|
||||||
</dependencies>
|
|
||||||
</dependencyManagement>
|
|
||||||
|
|
||||||
<dependencies>
|
|
||||||
|
|
||||||
<!-- starter-web：spring-webmvc + autoconfigure + logback + yaml + tomcat -->
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.springframework.boot</groupId>
|
|
||||||
<artifactId>spring-boot-starter-web</artifactId>
|
|
||||||
</dependency>
|
|
||||||
<!-- starter-test：junit + spring-test + mockito -->
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.springframework.boot</groupId>
|
|
||||||
<artifactId>spring-boot-starter-test</artifactId>
|
|
||||||
<scope>test</scope>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<!-- freemarker-starter -->
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.springframework.boot</groupId>
|
|
||||||
<artifactId>spring-boot-starter-freemarker</artifactId>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<!-- mail-starter -->
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.springframework.boot</groupId>
|
|
||||||
<artifactId>spring-boot-starter-mail</artifactId>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<!-- starter-actuator -->
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.springframework.boot</groupId>
|
|
||||||
<artifactId>spring-boot-starter-actuator</artifactId>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<!-- mybatis-starter：mybatis + mybatis-spring + hikari（default） -->
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.mybatis.spring.boot</groupId>
|
|
||||||
<artifactId>mybatis-spring-boot-starter</artifactId>
|
|
||||||
<version>${mybatis-spring-boot-starter.version}</version>
|
|
||||||
</dependency>
|
|
||||||
<!-- mysql -->
|
|
||||||
<dependency>
|
|
||||||
<groupId>mysql</groupId>
|
|
||||||
<artifactId>mysql-connector-java</artifactId>
|
|
||||||
<version>${mysql-connector-java.version}</version>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<!-- xxl-job-core -->
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.xuxueli</groupId>
|
|
||||||
<artifactId>xxl-job-core</artifactId>
|
|
||||||
<version>${project.parent.version}</version>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
</dependencies>
|
|
||||||
|
|
||||||
<build>
|
|
||||||
<plugins>
|
|
||||||
<plugin>
|
|
||||||
<groupId>org.springframework.boot</groupId>
|
|
||||||
<artifactId>spring-boot-maven-plugin</artifactId>
|
|
||||||
<version>${spring-boot.version}</version>
|
|
||||||
<executions>
|
|
||||||
<execution>
|
|
||||||
<goals>
|
|
||||||
<goal>repackage</goal>
|
|
||||||
</goals>
|
|
||||||
</execution>
|
|
||||||
</executions>
|
|
||||||
</plugin>
|
|
||||||
<!-- docker -->
|
|
||||||
<plugin>
|
|
||||||
<groupId>com.spotify</groupId>
|
|
||||||
<artifactId>docker-maven-plugin</artifactId>
|
|
||||||
<version>0.4.13</version>
|
|
||||||
<configuration>
|
|
||||||
<!-- made of '[a-z0-9-_.]' -->
|
|
||||||
<imageName>${project.artifactId}:${project.version}</imageName>
|
|
||||||
<dockerDirectory>${project.basedir}</dockerDirectory>
|
|
||||||
<resources>
|
|
||||||
<resource>
|
|
||||||
<targetPath>/</targetPath>
|
|
||||||
<directory>${project.build.directory}</directory>
|
|
||||||
<include>${project.build.finalName}.jar</include>
|
|
||||||
</resource>
|
|
||||||
</resources>
|
|
||||||
</configuration>
|
|
||||||
</plugin>
|
|
||||||
</plugins>
|
|
||||||
</build>
|
|
||||||
|
|
||||||
</project>
|
|
||||||
@ -1,11 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<metadata>
|
|
||||||
<groupId>com.xuxueli</groupId>
|
|
||||||
<artifactId>xxl-job-admin</artifactId>
|
|
||||||
<versioning>
|
|
||||||
<versions>
|
|
||||||
<version>2.3.0-SNAPSHOT</version>
|
|
||||||
</versions>
|
|
||||||
<lastUpdated>20201224031334</lastUpdated>
|
|
||||||
</versioning>
|
|
||||||
</metadata>
|
|
||||||
@ -1,4 +0,0 @@
|
|||||||
#NOTE: This is a Maven Resolver internal implementation file, its format can be changed without prior notice.
|
|
||||||
#Thu Dec 24 11:13:30 CST 2020
|
|
||||||
xxl-job-core-2.3.0-SNAPSHOT.pom>=
|
|
||||||
xxl-job-core-2.3.0-SNAPSHOT.jar>=
|
|
||||||
@ -1,24 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<metadata modelVersion="1.1.0">
|
|
||||||
<groupId>com.xuxueli</groupId>
|
|
||||||
<artifactId>xxl-job-core</artifactId>
|
|
||||||
<version>2.3.0-SNAPSHOT</version>
|
|
||||||
<versioning>
|
|
||||||
<snapshot>
|
|
||||||
<localCopy>true</localCopy>
|
|
||||||
</snapshot>
|
|
||||||
<lastUpdated>20201224031330</lastUpdated>
|
|
||||||
<snapshotVersions>
|
|
||||||
<snapshotVersion>
|
|
||||||
<extension>jar</extension>
|
|
||||||
<value>2.3.0-SNAPSHOT</value>
|
|
||||||
<updated>20201224031330</updated>
|
|
||||||
</snapshotVersion>
|
|
||||||
<snapshotVersion>
|
|
||||||
<extension>pom</extension>
|
|
||||||
<value>2.3.0-SNAPSHOT</value>
|
|
||||||
<updated>20201224031330</updated>
|
|
||||||
</snapshotVersion>
|
|
||||||
</snapshotVersions>
|
|
||||||
</versioning>
|
|
||||||
</metadata>
|
|
||||||
@ -1,6 +0,0 @@
|
|||||||
#NOTE: This is a Maven Resolver internal implementation file, its format can be changed without prior notice.
|
|
||||||
#Thu Dec 24 20:01:24 CST 2020
|
|
||||||
maven-metadata-maven-central.xml/@default-maven-central-http\://central.maven.org/maven2/.lastUpdated=1608811283852
|
|
||||||
maven-metadata-aliyun.xml.error=
|
|
||||||
maven-metadata-maven-central.xml.error=Could not transfer metadata com.xuxueli\:xxl-job-core\:2.3.0-SNAPSHOT/maven-metadata.xml from/to maven-central (http\://central.maven.org/maven2/)\: Transfer failed for http\://central.maven.org/maven2/com/xuxueli/xxl-job-core/2.3.0-SNAPSHOT/maven-metadata.xml
|
|
||||||
maven-metadata-aliyun.xml.lastUpdated=1608811284126
|
|
||||||
Binary file not shown.
@ -1,64 +0,0 @@
|
|||||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
|
||||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
|
||||||
<modelVersion>4.0.0</modelVersion>
|
|
||||||
<parent>
|
|
||||||
<groupId>com.xuxueli</groupId>
|
|
||||||
<artifactId>xxl-job</artifactId>
|
|
||||||
<version>2.3.0-SNAPSHOT</version>
|
|
||||||
</parent>
|
|
||||||
<artifactId>xxl-job-core</artifactId>
|
|
||||||
<packaging>jar</packaging>
|
|
||||||
|
|
||||||
<name>${project.artifactId}</name>
|
|
||||||
<description>A distributed task scheduling framework.</description>
|
|
||||||
<url>https://www.xuxueli.com/</url>
|
|
||||||
|
|
||||||
<dependencies>
|
|
||||||
|
|
||||||
<!-- ********************** embed server: netty + gson ********************** -->
|
|
||||||
<dependency>
|
|
||||||
<groupId>io.netty</groupId>
|
|
||||||
<artifactId>netty-all</artifactId>
|
|
||||||
<version>${netty-all.version}</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.google.code.gson</groupId>
|
|
||||||
<artifactId>gson</artifactId>
|
|
||||||
<version>${gson.version}</version>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<!-- ********************** plugin ********************** -->
|
|
||||||
<!-- groovy-all -->
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.codehaus.groovy</groupId>
|
|
||||||
<artifactId>groovy</artifactId>
|
|
||||||
<version>${groovy.version}</version>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<!-- spring-context -->
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.springframework</groupId>
|
|
||||||
<artifactId>spring-context</artifactId>
|
|
||||||
<version>${spring.version}</version>
|
|
||||||
<scope>provided</scope>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<!-- ********************** base ********************** -->
|
|
||||||
<!-- slf4j -->
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.slf4j</groupId>
|
|
||||||
<artifactId>slf4j-api</artifactId>
|
|
||||||
<version>${slf4j-api.version}</version>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<!-- javax.annotation-api -->
|
|
||||||
<dependency>
|
|
||||||
<groupId>javax.annotation</groupId>
|
|
||||||
<artifactId>javax.annotation-api</artifactId>
|
|
||||||
<version>${javax.annotation-api.version}</version>
|
|
||||||
<scope>provided</scope>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
</dependencies>
|
|
||||||
|
|
||||||
</project>
|
|
||||||
@ -1,11 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<metadata>
|
|
||||||
<groupId>com.xuxueli</groupId>
|
|
||||||
<artifactId>xxl-job-core</artifactId>
|
|
||||||
<versioning>
|
|
||||||
<versions>
|
|
||||||
<version>2.3.0-SNAPSHOT</version>
|
|
||||||
</versions>
|
|
||||||
<lastUpdated>20201224031330</lastUpdated>
|
|
||||||
</versioning>
|
|
||||||
</metadata>
|
|
||||||
@ -1,3 +0,0 @@
|
|||||||
#NOTE: This is a Maven Resolver internal implementation file, its format can be changed without prior notice.
|
|
||||||
#Thu Dec 24 11:13:27 CST 2020
|
|
||||||
xxl-job-2.3.0-SNAPSHOT.pom>=
|
|
||||||
@ -1,19 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<metadata modelVersion="1.1.0">
|
|
||||||
<groupId>com.xuxueli</groupId>
|
|
||||||
<artifactId>xxl-job</artifactId>
|
|
||||||
<version>2.3.0-SNAPSHOT</version>
|
|
||||||
<versioning>
|
|
||||||
<snapshot>
|
|
||||||
<localCopy>true</localCopy>
|
|
||||||
</snapshot>
|
|
||||||
<lastUpdated>20201224031327</lastUpdated>
|
|
||||||
<snapshotVersions>
|
|
||||||
<snapshotVersion>
|
|
||||||
<extension>pom</extension>
|
|
||||||
<value>2.3.0-SNAPSHOT</value>
|
|
||||||
<updated>20201224031327</updated>
|
|
||||||
</snapshotVersion>
|
|
||||||
</snapshotVersions>
|
|
||||||
</versioning>
|
|
||||||
</metadata>
|
|
||||||
@ -1,6 +0,0 @@
|
|||||||
#NOTE: This is a Maven Resolver internal implementation file, its format can be changed without prior notice.
|
|
||||||
#Thu Dec 24 20:01:24 CST 2020
|
|
||||||
maven-metadata-maven-central.xml/@default-maven-central-http\://central.maven.org/maven2/.lastUpdated=1608811284134
|
|
||||||
maven-metadata-aliyun.xml.error=
|
|
||||||
maven-metadata-maven-central.xml.error=Could not transfer metadata com.xuxueli\:xxl-job\:2.3.0-SNAPSHOT/maven-metadata.xml from/to maven-central (http\://central.maven.org/maven2/)\: Transfer failed for http\://central.maven.org/maven2/com/xuxueli/xxl-job/2.3.0-SNAPSHOT/maven-metadata.xml
|
|
||||||
maven-metadata-aliyun.xml.lastUpdated=1608811284273
|
|
||||||
@ -1,145 +0,0 @@
|
|||||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
|
||||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
|
||||||
<modelVersion>4.0.0</modelVersion>
|
|
||||||
<groupId>com.xuxueli</groupId>
|
|
||||||
<artifactId>xxl-job</artifactId>
|
|
||||||
<version>2.3.0-SNAPSHOT</version>
|
|
||||||
<packaging>pom</packaging>
|
|
||||||
|
|
||||||
<name>${project.artifactId}</name>
|
|
||||||
<description>A distributed task scheduling framework.</description>
|
|
||||||
<url>https://www.xuxueli.com/</url>
|
|
||||||
|
|
||||||
<modules>
|
|
||||||
<module>xxl-job-core</module>
|
|
||||||
<module>xxl-job-admin</module>
|
|
||||||
<module>xxl-job-executor-samples</module>
|
|
||||||
</modules>
|
|
||||||
|
|
||||||
<properties>
|
|
||||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
|
||||||
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
|
|
||||||
<maven.compiler.encoding>UTF-8</maven.compiler.encoding>
|
|
||||||
<maven.compiler.source>1.8</maven.compiler.source>
|
|
||||||
<maven.compiler.target>1.8</maven.compiler.target>
|
|
||||||
<maven.test.skip>true</maven.test.skip>
|
|
||||||
|
|
||||||
<netty-all.version>4.1.54.Final</netty-all.version>
|
|
||||||
<gson.version>2.8.6</gson.version>
|
|
||||||
|
|
||||||
<spring.version>5.3.1</spring.version>
|
|
||||||
<spring-boot.version>2.4.0</spring-boot.version>
|
|
||||||
|
|
||||||
<mybatis-spring-boot-starter.version>2.1.4</mybatis-spring-boot-starter.version>
|
|
||||||
<mysql-connector-java.version>8.0.22</mysql-connector-java.version>
|
|
||||||
|
|
||||||
<slf4j-api.version>1.7.30</slf4j-api.version>
|
|
||||||
<junit.version>5.7.0</junit.version>
|
|
||||||
<javax.annotation-api.version>1.3.2</javax.annotation-api.version>
|
|
||||||
|
|
||||||
<groovy.version>3.0.7</groovy.version>
|
|
||||||
|
|
||||||
<maven-source-plugin.version>3.2.1</maven-source-plugin.version>
|
|
||||||
<maven-javadoc-plugin.version>3.2.0</maven-javadoc-plugin.version>
|
|
||||||
<maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
|
|
||||||
<maven-war-plugin.version>3.3.1</maven-war-plugin.version>
|
|
||||||
</properties>
|
|
||||||
|
|
||||||
<build>
|
|
||||||
<plugins>
|
|
||||||
</plugins>
|
|
||||||
</build>
|
|
||||||
|
|
||||||
|
|
||||||
<licenses>
|
|
||||||
<license>
|
|
||||||
<name>GNU General Public License version 3</name>
|
|
||||||
<url>https://opensource.org/licenses/GPL-3.0</url>
|
|
||||||
</license>
|
|
||||||
</licenses>
|
|
||||||
|
|
||||||
<scm>
|
|
||||||
<tag>master</tag>
|
|
||||||
<url>https://github.com/xuxueli/xxl-job.git</url>
|
|
||||||
<connection>scm:git:https://github.com/xuxueli/xxl-job.git</connection>
|
|
||||||
<developerConnection>scm:git:git@github.com:xuxueli/xxl-job.git</developerConnection>
|
|
||||||
</scm>
|
|
||||||
<developers>
|
|
||||||
<developer>
|
|
||||||
<id>XXL</id>
|
|
||||||
<name>xuxueli</name>
|
|
||||||
<email>931591021@qq.com</email>
|
|
||||||
<url>https://github.com/xuxueli</url>
|
|
||||||
</developer>
|
|
||||||
</developers>
|
|
||||||
|
|
||||||
<profiles>
|
|
||||||
|
|
||||||
<profile>
|
|
||||||
<id>release</id>
|
|
||||||
<build>
|
|
||||||
<plugins>
|
|
||||||
<!-- Source -->
|
|
||||||
<plugin>
|
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
|
||||||
<artifactId>maven-source-plugin</artifactId>
|
|
||||||
<version>${maven-source-plugin.version}</version>
|
|
||||||
<executions>
|
|
||||||
<execution>
|
|
||||||
<phase>package</phase>
|
|
||||||
<goals>
|
|
||||||
<goal>jar-no-fork</goal>
|
|
||||||
</goals>
|
|
||||||
</execution>
|
|
||||||
</executions>
|
|
||||||
</plugin>
|
|
||||||
<!-- Javadoc -->
|
|
||||||
<plugin>
|
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
|
||||||
<artifactId>maven-javadoc-plugin</artifactId>
|
|
||||||
<version>${maven-javadoc-plugin.version}</version>
|
|
||||||
<executions>
|
|
||||||
<execution>
|
|
||||||
<phase>package</phase>
|
|
||||||
<goals>
|
|
||||||
<goal>jar</goal>
|
|
||||||
</goals>
|
|
||||||
<configuration>
|
|
||||||
<doclint>none</doclint>
|
|
||||||
</configuration>
|
|
||||||
</execution>
|
|
||||||
</executions>
|
|
||||||
</plugin>
|
|
||||||
<!-- GPG -->
|
|
||||||
<plugin>
|
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
|
||||||
<artifactId>maven-gpg-plugin</artifactId>
|
|
||||||
<version>${maven-gpg-plugin.version}</version>
|
|
||||||
<configuration>
|
|
||||||
<useAgent>false</useAgent>
|
|
||||||
</configuration>
|
|
||||||
<executions>
|
|
||||||
<execution>
|
|
||||||
<phase>verify</phase>
|
|
||||||
<goals>
|
|
||||||
<goal>sign</goal>
|
|
||||||
</goals>
|
|
||||||
</execution>
|
|
||||||
</executions>
|
|
||||||
</plugin>
|
|
||||||
</plugins>
|
|
||||||
</build>
|
|
||||||
<distributionManagement>
|
|
||||||
<snapshotRepository>
|
|
||||||
<id>oss</id>
|
|
||||||
<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
|
|
||||||
</snapshotRepository>
|
|
||||||
<repository>
|
|
||||||
<id>oss</id>
|
|
||||||
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
|
|
||||||
</repository>
|
|
||||||
</distributionManagement>
|
|
||||||
</profile>
|
|
||||||
</profiles>
|
|
||||||
|
|
||||||
</project>
|
|
||||||
@ -1,11 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<metadata>
|
|
||||||
<groupId>com.xuxueli</groupId>
|
|
||||||
<artifactId>xxl-job</artifactId>
|
|
||||||
<versioning>
|
|
||||||
<versions>
|
|
||||||
<version>2.3.0-SNAPSHOT</version>
|
|
||||||
</versions>
|
|
||||||
<lastUpdated>20201224031327</lastUpdated>
|
|
||||||
</versioning>
|
|
||||||
</metadata>
|
|
||||||
@ -1,5 +0,0 @@
|
|||||||
#NOTE: This is a Maven Resolver internal implementation file, its format can be changed without prior notice.
|
|
||||||
#Sat Apr 04 19:56:05 CST 2020
|
|
||||||
xxl-rpc-core-1.2.1.pom>aliyun=
|
|
||||||
xxl-rpc-core-1.2.1-sources.jar>aliyun=
|
|
||||||
xxl-rpc-core-1.2.1.jar>aliyun=
|
|
||||||
Binary file not shown.
@ -1,5 +0,0 @@
|
|||||||
#NOTE: This is a Maven Resolver internal implementation file, its format can be changed without prior notice.
|
|
||||||
#Sat Apr 04 19:56:05 CST 2020
|
|
||||||
http\://central.maven.org/maven2/.error=Could not transfer artifact com.xuxueli\:xxl-rpc-core\:jar\:sources\:1.2.1 from/to maven-central (http\://central.maven.org/maven2/)\: central.maven.org
|
|
||||||
@default-maven-central-http\://central.maven.org/maven2/.lastUpdated=1586001364931
|
|
||||||
http\://maven.aliyun.com/nexus/content/groups/public/.lastUpdated=1586001365245
|
|
||||||
@ -1,2 +0,0 @@
|
|||||||
|
|
||||||
33b53883ecf6e77b8b4eafe3506e213e83b2c80a
|
|
||||||
Binary file not shown.
@ -1 +0,0 @@
|
|||||||
27f8d667b1ede36b219f36af75b493b0e6143288
|
|
||||||
@ -1,143 +0,0 @@
|
|||||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
|
||||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
|
||||||
<modelVersion>4.0.0</modelVersion>
|
|
||||||
<parent>
|
|
||||||
<groupId>com.xuxueli</groupId>
|
|
||||||
<artifactId>xxl-rpc</artifactId>
|
|
||||||
<version>1.2.1</version>
|
|
||||||
</parent>
|
|
||||||
<artifactId>xxl-rpc-core</artifactId>
|
|
||||||
<packaging>jar</packaging>
|
|
||||||
|
|
||||||
<name>${project.artifactId}</name>
|
|
||||||
<description>A high performance, distributed RPC framework.</description>
|
|
||||||
<url>http://www.xuxueli.com/</url>
|
|
||||||
|
|
||||||
<dependencies>
|
|
||||||
|
|
||||||
<!-- ********************** base ********************** -->
|
|
||||||
|
|
||||||
<!-- slf4j -->
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.slf4j</groupId>
|
|
||||||
<artifactId>slf4j-api</artifactId>
|
|
||||||
<version>${slf4j-api.version}</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.slf4j</groupId>
|
|
||||||
<artifactId>slf4j-log4j12</artifactId>
|
|
||||||
<version>${slf4j-api.version}</version>
|
|
||||||
<scope>test</scope>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
|
|
||||||
<!-- ********************** serialize (hessian default) ********************** -->
|
|
||||||
|
|
||||||
<!-- hessian -->
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.caucho</groupId>
|
|
||||||
<artifactId>hessian</artifactId>
|
|
||||||
<version>${hessian.version}</version>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<!-- protostuff + objenesis (provided) -->
|
|
||||||
<dependency>
|
|
||||||
<groupId>io.protostuff</groupId>
|
|
||||||
<artifactId>protostuff-core</artifactId>
|
|
||||||
<version>${protostuff.version}</version>
|
|
||||||
<scope>provided</scope>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>io.protostuff</groupId>
|
|
||||||
<artifactId>protostuff-runtime</artifactId>
|
|
||||||
<version>${protostuff.version}</version>
|
|
||||||
<scope>provided</scope>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.objenesis</groupId>
|
|
||||||
<artifactId>objenesis</artifactId>
|
|
||||||
<version>${objenesis.version}</version>
|
|
||||||
<scope>provided</scope>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<!-- jackson (provided) -->
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.fasterxml.jackson.core</groupId>
|
|
||||||
<artifactId>jackson-databind</artifactId>
|
|
||||||
<version>${jackson.version}</version>
|
|
||||||
<scope>provided</scope>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
|
|
||||||
<!-- ********************** registry (local default) ********************** -->
|
|
||||||
|
|
||||||
<!-- zookeeper (provided) -->
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.apache.zookeeper</groupId>
|
|
||||||
<artifactId>zookeeper</artifactId>
|
|
||||||
<version>${zookeeper.version}</version>
|
|
||||||
<scope>provided</scope>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
|
|
||||||
<!-- ********************** net (jetty default) ********************** -->
|
|
||||||
|
|
||||||
<!-- jetty (javax.servlet-api:3.1.0;) -->
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.eclipse.jetty</groupId>
|
|
||||||
<artifactId>jetty-server</artifactId>
|
|
||||||
<version>${jetty-server.version}</version>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.eclipse.jetty</groupId>
|
|
||||||
<artifactId>jetty-client</artifactId>
|
|
||||||
<version>${jetty-server.version}</version>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<!-- netty (commons-pool2) -->
|
|
||||||
<dependency>
|
|
||||||
<groupId>io.netty</groupId>
|
|
||||||
<artifactId>netty-all</artifactId>
|
|
||||||
<version>${netty.version}</version>
|
|
||||||
<scope>provided</scope>
|
|
||||||
</dependency>
|
|
||||||
<!-- mina (commons-pool2) -->
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.apache.mina</groupId>
|
|
||||||
<artifactId>mina-core</artifactId>
|
|
||||||
<version>2.0.19</version>
|
|
||||||
<scope>provided</scope>
|
|
||||||
</dependency>
|
|
||||||
<!-- commons-pool2 -->
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.apache.commons</groupId>
|
|
||||||
<artifactId>commons-pool2</artifactId>
|
|
||||||
<version>${commons-pool2.version}</version>
|
|
||||||
<scope>provided</scope>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<!-- ********************** other ********************** -->
|
|
||||||
|
|
||||||
<!-- spring -->
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.springframework</groupId>
|
|
||||||
<artifactId>spring-beans</artifactId>
|
|
||||||
<version>${spring.version}</version>
|
|
||||||
<scope>provided</scope>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.springframework</groupId>
|
|
||||||
<artifactId>spring-core</artifactId>
|
|
||||||
<version>${spring.version}</version>
|
|
||||||
<scope>provided</scope>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.springframework</groupId>
|
|
||||||
<artifactId>spring-context</artifactId>
|
|
||||||
<version>${spring.version}</version>
|
|
||||||
<scope>provided</scope>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
</dependencies>
|
|
||||||
|
|
||||||
</project>
|
|
||||||
@ -1,2 +0,0 @@
|
|||||||
|
|
||||||
bed5b85e402f8fccf7109a3d5944f45dd5cae342
|
|
||||||
@ -1,3 +0,0 @@
|
|||||||
#NOTE: This is a Maven Resolver internal implementation file, its format can be changed without prior notice.
|
|
||||||
#Mon Mar 02 16:06:40 CST 2020
|
|
||||||
xxl-rpc-1.2.1.pom>aliyun=
|
|
||||||
@ -1,151 +0,0 @@
|
|||||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
|
||||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
|
||||||
<modelVersion>4.0.0</modelVersion>
|
|
||||||
<groupId>com.xuxueli</groupId>
|
|
||||||
<artifactId>xxl-rpc</artifactId>
|
|
||||||
<version>1.2.1</version>
|
|
||||||
<packaging>pom</packaging>
|
|
||||||
|
|
||||||
<name>${project.artifactId}</name>
|
|
||||||
<description>A high performance, distributed RPC framework.</description>
|
|
||||||
<url>http://www.xuxueli.com/</url>
|
|
||||||
|
|
||||||
<modules>
|
|
||||||
<module>xxl-rpc-core</module>
|
|
||||||
<!--<module>xxl-rpc-samples</module>-->
|
|
||||||
</modules>
|
|
||||||
|
|
||||||
<properties>
|
|
||||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
|
||||||
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
|
|
||||||
<maven.compiler.encoding>UTF-8</maven.compiler.encoding>
|
|
||||||
<maven.compiler.source>1.7</maven.compiler.source>
|
|
||||||
<maven.compiler.target>1.7</maven.compiler.target>
|
|
||||||
|
|
||||||
<maven.test.skip>true</maven.test.skip>
|
|
||||||
|
|
||||||
|
|
||||||
<javax.servlet-api.version>3.1.0</javax.servlet-api.version>
|
|
||||||
<javax.servlet.jsp-api.version>2.3.3</javax.servlet.jsp-api.version>
|
|
||||||
|
|
||||||
<slf4j-api.version>1.7.25</slf4j-api.version>
|
|
||||||
<junit.version>4.12</junit.version>
|
|
||||||
|
|
||||||
|
|
||||||
<netty.version>4.1.29.Final</netty.version>
|
|
||||||
<mina.version>2.0.19</mina.version>
|
|
||||||
<jetty-server.version>9.2.26.v20180806</jetty-server.version>
|
|
||||||
|
|
||||||
<commons-pool2.version>2.6.0</commons-pool2.version>
|
|
||||||
|
|
||||||
|
|
||||||
<hessian.version>4.0.51</hessian.version>
|
|
||||||
|
|
||||||
<protostuff.version>1.6.0</protostuff.version>
|
|
||||||
<objenesis.version>2.6</objenesis.version>
|
|
||||||
|
|
||||||
<jackson.version>2.9.6</jackson.version>
|
|
||||||
|
|
||||||
|
|
||||||
<zookeeper.version>3.4.13</zookeeper.version>
|
|
||||||
|
|
||||||
|
|
||||||
<spring.version>4.3.19.RELEASE</spring.version>
|
|
||||||
<spring-boot.version>1.5.16.RELEASE</spring-boot.version>
|
|
||||||
|
|
||||||
</properties>
|
|
||||||
|
|
||||||
<build>
|
|
||||||
<plugins>
|
|
||||||
</plugins>
|
|
||||||
</build>
|
|
||||||
|
|
||||||
<licenses>
|
|
||||||
<license>
|
|
||||||
<name>GNU General Public License version 3</name>
|
|
||||||
<url>https://opensource.org/licenses/GPL-3.0</url>
|
|
||||||
</license>
|
|
||||||
</licenses>
|
|
||||||
|
|
||||||
<scm>
|
|
||||||
<tag>master</tag>
|
|
||||||
<url>https://github.com/xuxueli/xxl-rpc.git</url>
|
|
||||||
<connection>scm:git:https://github.com/xuxueli/xxl-rpc.git</connection>
|
|
||||||
<developerConnection>scm:git:git@github.com:xuxueli/xxl-rpc.git</developerConnection>
|
|
||||||
</scm>
|
|
||||||
<developers>
|
|
||||||
<developer>
|
|
||||||
<id>XXL</id>
|
|
||||||
<name>xuxueli</name>
|
|
||||||
<email>931591021@qq.com</email>
|
|
||||||
<url>https://github.com/xuxueli</url>
|
|
||||||
</developer>
|
|
||||||
</developers>
|
|
||||||
|
|
||||||
|
|
||||||
<profiles>
|
|
||||||
<profile>
|
|
||||||
<id>release</id>
|
|
||||||
<build>
|
|
||||||
<plugins>
|
|
||||||
<!-- Source -->
|
|
||||||
<plugin>
|
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
|
||||||
<artifactId>maven-source-plugin</artifactId>
|
|
||||||
<version>3.0.1</version>
|
|
||||||
<executions>
|
|
||||||
<execution>
|
|
||||||
<phase>package</phase>
|
|
||||||
<goals>
|
|
||||||
<goal>jar-no-fork</goal>
|
|
||||||
</goals>
|
|
||||||
</execution>
|
|
||||||
</executions>
|
|
||||||
</plugin>
|
|
||||||
<!-- Javadoc -->
|
|
||||||
<plugin>
|
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
|
||||||
<artifactId>maven-javadoc-plugin</artifactId>
|
|
||||||
<version>3.0.0</version>
|
|
||||||
<executions>
|
|
||||||
<execution>
|
|
||||||
<phase>package</phase>
|
|
||||||
<goals>
|
|
||||||
<goal>jar</goal>
|
|
||||||
</goals>
|
|
||||||
</execution>
|
|
||||||
</executions>
|
|
||||||
</plugin>
|
|
||||||
<!-- GPG -->
|
|
||||||
<plugin>
|
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
|
||||||
<artifactId>maven-gpg-plugin</artifactId>
|
|
||||||
<version>1.6</version>
|
|
||||||
<configuration>
|
|
||||||
<useAgent>false</useAgent>
|
|
||||||
</configuration>
|
|
||||||
<executions>
|
|
||||||
<execution>
|
|
||||||
<phase>verify</phase>
|
|
||||||
<goals>
|
|
||||||
<goal>sign</goal>
|
|
||||||
</goals>
|
|
||||||
</execution>
|
|
||||||
</executions>
|
|
||||||
</plugin>
|
|
||||||
</plugins>
|
|
||||||
</build>
|
|
||||||
<distributionManagement>
|
|
||||||
<snapshotRepository>
|
|
||||||
<id>oss</id>
|
|
||||||
<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
|
|
||||||
</snapshotRepository>
|
|
||||||
<repository>
|
|
||||||
<id>oss</id>
|
|
||||||
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
|
|
||||||
</repository>
|
|
||||||
</distributionManagement>
|
|
||||||
</profile>
|
|
||||||
</profiles>
|
|
||||||
|
|
||||||
</project>
|
|
||||||
@ -1 +0,0 @@
|
|||||||
370f4c4f20b218942fba34d939cbc625025e1e30
|
|
||||||
@ -3,7 +3,7 @@ package cn.lili.event.impl;
|
|||||||
import cn.lili.event.TradeEvent;
|
import cn.lili.event.TradeEvent;
|
||||||
import cn.lili.modules.order.cart.entity.dto.TradeDTO;
|
import cn.lili.modules.order.cart.entity.dto.TradeDTO;
|
||||||
import cn.lili.modules.order.order.service.TradeService;
|
import cn.lili.modules.order.order.service.TradeService;
|
||||||
import cn.lili.modules.payment.kit.enums.PaymentMethodEnum;
|
import cn.lili.modules.payment.entity.enums.PaymentMethodEnum;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
|
|
||||||
|
|||||||
@ -9,7 +9,7 @@ import cn.lili.modules.order.order.entity.enums.PayStatusEnum;
|
|||||||
import cn.lili.modules.order.order.service.OrderService;
|
import cn.lili.modules.order.order.service.OrderService;
|
||||||
import cn.lili.modules.payment.entity.RefundLog;
|
import cn.lili.modules.payment.entity.RefundLog;
|
||||||
import cn.lili.modules.payment.kit.Payment;
|
import cn.lili.modules.payment.kit.Payment;
|
||||||
import cn.lili.modules.payment.kit.enums.PaymentMethodEnum;
|
import cn.lili.modules.payment.entity.enums.PaymentMethodEnum;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
|
|||||||
@ -3,7 +3,7 @@ package cn.lili.buyer.test.cart;
|
|||||||
import cn.lili.event.impl.StockUpdateExecute;
|
import cn.lili.event.impl.StockUpdateExecute;
|
||||||
import cn.lili.modules.order.order.entity.dto.OrderMessage;
|
import cn.lili.modules.order.order.entity.dto.OrderMessage;
|
||||||
import cn.lili.modules.order.order.entity.enums.OrderStatusEnum;
|
import cn.lili.modules.order.order.entity.enums.OrderStatusEnum;
|
||||||
import cn.lili.modules.payment.kit.enums.PaymentMethodEnum;
|
import cn.lili.modules.payment.entity.enums.PaymentMethodEnum;
|
||||||
import org.junit.jupiter.api.Test;
|
import org.junit.jupiter.api.Test;
|
||||||
import org.junit.jupiter.api.extension.ExtendWith;
|
import org.junit.jupiter.api.extension.ExtendWith;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
|
|||||||
@ -1,4 +1,4 @@
|
|||||||
package cn.lili.modules.member.entity.aop.annotation;
|
package cn.lili.modules.member.aop.annotation;
|
||||||
|
|
||||||
|
|
||||||
import java.lang.annotation.*;
|
import java.lang.annotation.*;
|
||||||
@ -1,4 +1,4 @@
|
|||||||
package cn.lili.modules.member.entity.aop.interceptor;
|
package cn.lili.modules.member.aop.interceptor;
|
||||||
|
|
||||||
import cn.lili.modules.member.entity.dos.Member;
|
import cn.lili.modules.member.entity.dos.Member;
|
||||||
import cn.lili.modules.member.entity.dos.MemberPointsHistory;
|
import cn.lili.modules.member.entity.dos.MemberPointsHistory;
|
||||||
@ -29,7 +29,7 @@ public class PointLogInterceptor {
|
|||||||
@Autowired
|
@Autowired
|
||||||
private MemberService memberService;
|
private MemberService memberService;
|
||||||
|
|
||||||
@After("@annotation(cn.lili.modules.member.entity.aop.annotation.PointLogPoint)")
|
@After("@annotation(cn.lili.modules.member.aop.annotation.PointLogPoint)")
|
||||||
public void doAfter(JoinPoint pjp) {
|
public void doAfter(JoinPoint pjp) {
|
||||||
//参数
|
//参数
|
||||||
Object[] obj = pjp.getArgs();
|
Object[] obj = pjp.getArgs();
|
||||||
@ -21,7 +21,7 @@ import cn.lili.modules.connect.entity.Connect;
|
|||||||
import cn.lili.modules.connect.entity.dto.ConnectAuthUser;
|
import cn.lili.modules.connect.entity.dto.ConnectAuthUser;
|
||||||
import cn.lili.modules.connect.service.ConnectService;
|
import cn.lili.modules.connect.service.ConnectService;
|
||||||
import cn.lili.modules.connect.util.UuidUtils;
|
import cn.lili.modules.connect.util.UuidUtils;
|
||||||
import cn.lili.modules.member.entity.aop.annotation.PointLogPoint;
|
import cn.lili.modules.member.aop.annotation.PointLogPoint;
|
||||||
import cn.lili.modules.member.entity.dos.Member;
|
import cn.lili.modules.member.entity.dos.Member;
|
||||||
import cn.lili.modules.member.entity.dto.ManagerMemberEditDTO;
|
import cn.lili.modules.member.entity.dto.ManagerMemberEditDTO;
|
||||||
import cn.lili.modules.member.entity.dto.MemberAddDTO;
|
import cn.lili.modules.member.entity.dto.MemberAddDTO;
|
||||||
|
|||||||
@ -1,7 +1,5 @@
|
|||||||
package cn.lili.modules.message.entity.dos;
|
package cn.lili.modules.message.entity.dos;
|
||||||
|
|
||||||
import com.baomidou.mybatisplus.annotation.TableField;
|
|
||||||
import com.baomidou.mybatisplus.annotation.TableId;
|
|
||||||
import com.baomidou.mybatisplus.annotation.TableName;
|
import com.baomidou.mybatisplus.annotation.TableName;
|
||||||
import io.swagger.annotations.ApiModel;
|
import io.swagger.annotations.ApiModel;
|
||||||
import io.swagger.annotations.ApiModelProperty;
|
import io.swagger.annotations.ApiModelProperty;
|
||||||
|
|||||||
@ -7,7 +7,7 @@ import cn.lili.modules.order.order.entity.dos.Receipt;
|
|||||||
import cn.lili.modules.order.order.entity.enums.DeliverStatusEnum;
|
import cn.lili.modules.order.order.entity.enums.DeliverStatusEnum;
|
||||||
import cn.lili.modules.order.order.entity.enums.OrderStatusEnum;
|
import cn.lili.modules.order.order.entity.enums.OrderStatusEnum;
|
||||||
import cn.lili.modules.order.order.entity.enums.PayStatusEnum;
|
import cn.lili.modules.order.order.entity.enums.PayStatusEnum;
|
||||||
import cn.lili.modules.payment.kit.enums.PaymentMethodEnum;
|
import cn.lili.modules.payment.entity.enums.PaymentMethodEnum;
|
||||||
import cn.lili.modules.order.cart.entity.enums.DeliveryMethodEnum;
|
import cn.lili.modules.order.cart.entity.enums.DeliveryMethodEnum;
|
||||||
import cn.lili.modules.order.trade.entity.dos.OrderLog;
|
import cn.lili.modules.order.trade.entity.dos.OrderLog;
|
||||||
import io.swagger.annotations.ApiModelProperty;
|
import io.swagger.annotations.ApiModelProperty;
|
||||||
|
|||||||
@ -33,7 +33,7 @@ import cn.lili.modules.order.trade.entity.enums.AfterSaleRefundWayEnum;
|
|||||||
import cn.lili.modules.order.trade.entity.enums.AfterSaleStatusEnum;
|
import cn.lili.modules.order.trade.entity.enums.AfterSaleStatusEnum;
|
||||||
import cn.lili.modules.order.trade.entity.enums.AfterSaleTypeEnum;
|
import cn.lili.modules.order.trade.entity.enums.AfterSaleTypeEnum;
|
||||||
import cn.lili.modules.payment.kit.RefundSupport;
|
import cn.lili.modules.payment.kit.RefundSupport;
|
||||||
import cn.lili.modules.payment.kit.enums.PaymentMethodEnum;
|
import cn.lili.modules.payment.entity.enums.PaymentMethodEnum;
|
||||||
import cn.lili.modules.statistics.entity.dto.StatisticsQueryParam;
|
import cn.lili.modules.statistics.entity.dto.StatisticsQueryParam;
|
||||||
import cn.lili.modules.statistics.util.StatisticsDateUtil;
|
import cn.lili.modules.statistics.util.StatisticsDateUtil;
|
||||||
import cn.lili.modules.store.entity.dto.StoreAfterSaleAddressDTO;
|
import cn.lili.modules.store.entity.dto.StoreAfterSaleAddressDTO;
|
||||||
|
|||||||
@ -36,7 +36,7 @@ import cn.lili.modules.order.order.mapper.OrderMapper;
|
|||||||
import cn.lili.modules.order.order.service.*;
|
import cn.lili.modules.order.order.service.*;
|
||||||
import cn.lili.modules.order.trade.entity.dos.OrderLog;
|
import cn.lili.modules.order.trade.entity.dos.OrderLog;
|
||||||
import cn.lili.modules.order.trade.service.OrderLogService;
|
import cn.lili.modules.order.trade.service.OrderLogService;
|
||||||
import cn.lili.modules.payment.kit.enums.PaymentMethodEnum;
|
import cn.lili.modules.payment.entity.enums.PaymentMethodEnum;
|
||||||
import cn.lili.modules.promotion.entity.dos.Pintuan;
|
import cn.lili.modules.promotion.entity.dos.Pintuan;
|
||||||
import cn.lili.modules.promotion.service.PintuanService;
|
import cn.lili.modules.promotion.service.PintuanService;
|
||||||
import cn.lili.modules.statistics.entity.dto.StatisticsQueryParam;
|
import cn.lili.modules.statistics.entity.dto.StatisticsQueryParam;
|
||||||
|
|||||||
@ -1,4 +1,4 @@
|
|||||||
package cn.lili.modules.payment.kit.enums;
|
package cn.lili.modules.payment.entity.enums;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 订单类型
|
* 订单类型
|
||||||
@ -1,4 +1,4 @@
|
|||||||
package cn.lili.modules.payment.kit.enums;
|
package cn.lili.modules.payment.entity.enums;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 支付方式枚举
|
* 支付方式枚举
|
||||||
@ -1,4 +1,4 @@
|
|||||||
package cn.lili.modules.payment.kit.enums;
|
package cn.lili.modules.payment.entity.enums;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 支付方式枚举
|
* 支付方式枚举
|
||||||
@ -9,8 +9,8 @@ import cn.lili.common.vo.ResultMessage;
|
|||||||
import cn.lili.common.enums.ClientTypeEnum;
|
import cn.lili.common.enums.ClientTypeEnum;
|
||||||
import cn.lili.modules.member.service.MemberWalletService;
|
import cn.lili.modules.member.service.MemberWalletService;
|
||||||
import cn.lili.modules.payment.kit.dto.PayParam;
|
import cn.lili.modules.payment.kit.dto.PayParam;
|
||||||
import cn.lili.modules.payment.kit.enums.PaymentClientEnum;
|
import cn.lili.modules.payment.entity.enums.PaymentClientEnum;
|
||||||
import cn.lili.modules.payment.kit.enums.PaymentMethodEnum;
|
import cn.lili.modules.payment.entity.enums.PaymentMethodEnum;
|
||||||
import cn.lili.modules.payment.kit.params.CashierExecute;
|
import cn.lili.modules.payment.kit.params.CashierExecute;
|
||||||
import cn.lili.modules.payment.kit.params.dto.CashierParam;
|
import cn.lili.modules.payment.kit.params.dto.CashierParam;
|
||||||
import cn.lili.modules.system.entity.dos.Setting;
|
import cn.lili.modules.system.entity.dos.Setting;
|
||||||
|
|||||||
@ -5,7 +5,7 @@ import cn.lili.common.exception.ServiceException;
|
|||||||
import cn.lili.common.vo.ResultMessage;
|
import cn.lili.common.vo.ResultMessage;
|
||||||
import cn.lili.modules.payment.entity.RefundLog;
|
import cn.lili.modules.payment.entity.RefundLog;
|
||||||
import cn.lili.modules.payment.kit.dto.PayParam;
|
import cn.lili.modules.payment.kit.dto.PayParam;
|
||||||
import cn.lili.modules.payment.kit.enums.PaymentMethodEnum;
|
import cn.lili.modules.payment.entity.enums.PaymentMethodEnum;
|
||||||
|
|
||||||
import javax.servlet.http.HttpServletRequest;
|
import javax.servlet.http.HttpServletRequest;
|
||||||
import javax.servlet.http.HttpServletResponse;
|
import javax.servlet.http.HttpServletResponse;
|
||||||
|
|||||||
@ -8,7 +8,7 @@ import cn.lili.modules.order.order.service.AfterSaleService;
|
|||||||
import cn.lili.modules.order.order.service.OrderService;
|
import cn.lili.modules.order.order.service.OrderService;
|
||||||
import cn.lili.modules.order.order.service.StoreFlowService;
|
import cn.lili.modules.order.order.service.StoreFlowService;
|
||||||
import cn.lili.modules.payment.entity.RefundLog;
|
import cn.lili.modules.payment.entity.RefundLog;
|
||||||
import cn.lili.modules.payment.kit.enums.PaymentMethodEnum;
|
import cn.lili.modules.payment.entity.enums.PaymentMethodEnum;
|
||||||
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
|
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
|
|||||||
@ -2,7 +2,7 @@ package cn.lili.modules.payment.kit.params;
|
|||||||
|
|
||||||
import cn.lili.modules.payment.kit.dto.PaymentSuccessParams;
|
import cn.lili.modules.payment.kit.dto.PaymentSuccessParams;
|
||||||
import cn.lili.modules.payment.kit.dto.PayParam;
|
import cn.lili.modules.payment.kit.dto.PayParam;
|
||||||
import cn.lili.modules.payment.kit.enums.CashierEnum;
|
import cn.lili.modules.payment.entity.enums.CashierEnum;
|
||||||
import cn.lili.modules.payment.kit.params.dto.CashierParam;
|
import cn.lili.modules.payment.kit.params.dto.CashierParam;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@ -11,7 +11,7 @@ import cn.lili.modules.order.order.entity.vo.OrderDetailVO;
|
|||||||
import cn.lili.modules.order.order.service.OrderService;
|
import cn.lili.modules.order.order.service.OrderService;
|
||||||
import cn.lili.modules.payment.kit.dto.PayParam;
|
import cn.lili.modules.payment.kit.dto.PayParam;
|
||||||
import cn.lili.modules.payment.kit.dto.PaymentSuccessParams;
|
import cn.lili.modules.payment.kit.dto.PaymentSuccessParams;
|
||||||
import cn.lili.modules.payment.kit.enums.CashierEnum;
|
import cn.lili.modules.payment.entity.enums.CashierEnum;
|
||||||
import cn.lili.modules.payment.kit.params.CashierExecute;
|
import cn.lili.modules.payment.kit.params.CashierExecute;
|
||||||
import cn.lili.modules.payment.kit.params.dto.CashierParam;
|
import cn.lili.modules.payment.kit.params.dto.CashierParam;
|
||||||
import cn.lili.modules.system.entity.dto.BaseSetting;
|
import cn.lili.modules.system.entity.dto.BaseSetting;
|
||||||
|
|||||||
@ -8,7 +8,7 @@ import cn.lili.modules.order.trade.entity.dos.Recharge;
|
|||||||
import cn.lili.modules.order.trade.service.RechargeService;
|
import cn.lili.modules.order.trade.service.RechargeService;
|
||||||
import cn.lili.modules.payment.kit.dto.PayParam;
|
import cn.lili.modules.payment.kit.dto.PayParam;
|
||||||
import cn.lili.modules.payment.kit.dto.PaymentSuccessParams;
|
import cn.lili.modules.payment.kit.dto.PaymentSuccessParams;
|
||||||
import cn.lili.modules.payment.kit.enums.CashierEnum;
|
import cn.lili.modules.payment.entity.enums.CashierEnum;
|
||||||
import cn.lili.modules.payment.kit.params.CashierExecute;
|
import cn.lili.modules.payment.kit.params.CashierExecute;
|
||||||
import cn.lili.modules.payment.kit.params.dto.CashierParam;
|
import cn.lili.modules.payment.kit.params.dto.CashierParam;
|
||||||
import cn.lili.modules.system.entity.dto.BaseSetting;
|
import cn.lili.modules.system.entity.dto.BaseSetting;
|
||||||
|
|||||||
@ -11,7 +11,7 @@ import cn.lili.modules.order.order.service.OrderService;
|
|||||||
import cn.lili.modules.order.order.service.TradeService;
|
import cn.lili.modules.order.order.service.TradeService;
|
||||||
import cn.lili.modules.payment.kit.dto.PayParam;
|
import cn.lili.modules.payment.kit.dto.PayParam;
|
||||||
import cn.lili.modules.payment.kit.dto.PaymentSuccessParams;
|
import cn.lili.modules.payment.kit.dto.PaymentSuccessParams;
|
||||||
import cn.lili.modules.payment.kit.enums.CashierEnum;
|
import cn.lili.modules.payment.entity.enums.CashierEnum;
|
||||||
import cn.lili.modules.payment.kit.params.CashierExecute;
|
import cn.lili.modules.payment.kit.params.CashierExecute;
|
||||||
import cn.lili.modules.payment.kit.params.dto.CashierParam;
|
import cn.lili.modules.payment.kit.params.dto.CashierParam;
|
||||||
import cn.lili.modules.system.entity.dto.BaseSetting;
|
import cn.lili.modules.system.entity.dto.BaseSetting;
|
||||||
|
|||||||
@ -18,7 +18,7 @@ import cn.lili.modules.payment.kit.CashierSupport;
|
|||||||
import cn.lili.modules.payment.kit.Payment;
|
import cn.lili.modules.payment.kit.Payment;
|
||||||
import cn.lili.modules.payment.kit.dto.PayParam;
|
import cn.lili.modules.payment.kit.dto.PayParam;
|
||||||
import cn.lili.modules.payment.kit.dto.PaymentSuccessParams;
|
import cn.lili.modules.payment.kit.dto.PaymentSuccessParams;
|
||||||
import cn.lili.modules.payment.kit.enums.PaymentMethodEnum;
|
import cn.lili.modules.payment.entity.enums.PaymentMethodEnum;
|
||||||
import cn.lili.modules.payment.kit.params.dto.CashierParam;
|
import cn.lili.modules.payment.kit.params.dto.CashierParam;
|
||||||
import cn.lili.modules.payment.service.PaymentService;
|
import cn.lili.modules.payment.service.PaymentService;
|
||||||
import cn.lili.modules.payment.service.RefundLogService;
|
import cn.lili.modules.payment.service.RefundLogService;
|
||||||
|
|||||||
@ -6,7 +6,7 @@ import cn.lili.modules.payment.entity.RefundLog;
|
|||||||
import cn.lili.modules.payment.kit.Payment;
|
import cn.lili.modules.payment.kit.Payment;
|
||||||
import cn.lili.modules.payment.kit.dto.PayParam;
|
import cn.lili.modules.payment.kit.dto.PayParam;
|
||||||
import cn.lili.modules.payment.kit.dto.PaymentSuccessParams;
|
import cn.lili.modules.payment.kit.dto.PaymentSuccessParams;
|
||||||
import cn.lili.modules.payment.kit.enums.PaymentMethodEnum;
|
import cn.lili.modules.payment.entity.enums.PaymentMethodEnum;
|
||||||
import cn.lili.modules.payment.kit.params.dto.CashierParam;
|
import cn.lili.modules.payment.kit.params.dto.CashierParam;
|
||||||
import cn.lili.modules.payment.service.PaymentService;
|
import cn.lili.modules.payment.service.PaymentService;
|
||||||
import cn.lili.modules.payment.service.RefundLogService;
|
import cn.lili.modules.payment.service.RefundLogService;
|
||||||
|
|||||||
@ -12,8 +12,8 @@ import cn.lili.modules.payment.kit.CashierSupport;
|
|||||||
import cn.lili.modules.payment.kit.Payment;
|
import cn.lili.modules.payment.kit.Payment;
|
||||||
import cn.lili.modules.payment.kit.dto.PayParam;
|
import cn.lili.modules.payment.kit.dto.PayParam;
|
||||||
import cn.lili.modules.payment.kit.dto.PaymentSuccessParams;
|
import cn.lili.modules.payment.kit.dto.PaymentSuccessParams;
|
||||||
import cn.lili.modules.payment.kit.enums.CashierEnum;
|
import cn.lili.modules.payment.entity.enums.CashierEnum;
|
||||||
import cn.lili.modules.payment.kit.enums.PaymentMethodEnum;
|
import cn.lili.modules.payment.entity.enums.PaymentMethodEnum;
|
||||||
import cn.lili.modules.payment.kit.params.dto.CashierParam;
|
import cn.lili.modules.payment.kit.params.dto.CashierParam;
|
||||||
import cn.lili.modules.payment.service.PaymentService;
|
import cn.lili.modules.payment.service.PaymentService;
|
||||||
import cn.lili.modules.payment.service.RefundLogService;
|
import cn.lili.modules.payment.service.RefundLogService;
|
||||||
|
|||||||
@ -31,7 +31,7 @@ import cn.lili.modules.payment.kit.core.kit.*;
|
|||||||
import cn.lili.modules.payment.kit.core.utils.DateTimeZoneUtil;
|
import cn.lili.modules.payment.kit.core.utils.DateTimeZoneUtil;
|
||||||
import cn.lili.modules.payment.kit.dto.PayParam;
|
import cn.lili.modules.payment.kit.dto.PayParam;
|
||||||
import cn.lili.modules.payment.kit.dto.PaymentSuccessParams;
|
import cn.lili.modules.payment.kit.dto.PaymentSuccessParams;
|
||||||
import cn.lili.modules.payment.kit.enums.PaymentMethodEnum;
|
import cn.lili.modules.payment.entity.enums.PaymentMethodEnum;
|
||||||
import cn.lili.modules.payment.kit.params.dto.CashierParam;
|
import cn.lili.modules.payment.kit.params.dto.CashierParam;
|
||||||
import cn.lili.modules.payment.kit.plugin.wechat.enums.WechatApiEnum;
|
import cn.lili.modules.payment.kit.plugin.wechat.enums.WechatApiEnum;
|
||||||
import cn.lili.modules.payment.kit.plugin.wechat.enums.WechatDomain;
|
import cn.lili.modules.payment.kit.plugin.wechat.enums.WechatDomain;
|
||||||
|
|||||||
@ -1,7 +1,7 @@
|
|||||||
package cn.lili.modules.system.entity.dto.payment;
|
package cn.lili.modules.system.entity.dto.payment;
|
||||||
|
|
||||||
import cn.lili.common.enums.ClientTypeEnum;
|
import cn.lili.common.enums.ClientTypeEnum;
|
||||||
import cn.lili.modules.payment.kit.enums.PaymentMethodEnum;
|
import cn.lili.modules.payment.entity.enums.PaymentMethodEnum;
|
||||||
import cn.lili.modules.system.entity.dto.payment.dto.PaymentSupportForm;
|
import cn.lili.modules.system.entity.dto.payment.dto.PaymentSupportForm;
|
||||||
import cn.lili.modules.system.entity.dto.payment.dto.PaymentSupportItem;
|
import cn.lili.modules.system.entity.dto.payment.dto.PaymentSupportItem;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
|||||||
@ -1,7 +1,7 @@
|
|||||||
package cn.lili.modules.system.entity.dto.payment.dto;
|
package cn.lili.modules.system.entity.dto.payment.dto;
|
||||||
|
|
||||||
import cn.lili.common.enums.ClientTypeEnum;
|
import cn.lili.common.enums.ClientTypeEnum;
|
||||||
import cn.lili.modules.payment.kit.enums.PaymentMethodEnum;
|
import cn.lili.modules.payment.entity.enums.PaymentMethodEnum;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
import lombok.experimental.Accessors;
|
import lombok.experimental.Accessors;
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user