app/pom.xml
@@ -112,19 +112,6 @@ </dependency> <!--全局排除log4j --> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> <exclusions> <exclusion> <groupId>*</groupId> <artifactId>*</artifactId> </exclusion> </exclusions> </dependency> <dependency> <groupId>com.qcloud</groupId> <artifactId>cmq-http-client</artifactId> @@ -132,7 +119,7 @@ <exclusions> <exclusion> <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> <artifactId>*</artifactId> </exclusion> <exclusion> <groupId>log4j</groupId> @@ -179,21 +166,6 @@ <version>0.0.1-SNAPSHOT</version> <scope>system</scope> <systemPath>${project.basedir}/src/main/libs/lib-common.jar</systemPath> </dependency> <dependency> <groupId>com.yeshi</groupId> <artifactId>utils</artifactId> <version>0.0.2-SNAPSHOT</version> <scope>system</scope> <systemPath>${project.basedir}/src/main/libs/utils-0.0.2-SNAPSHOT.jar</systemPath> <exclusions> <exclusion> <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> </exclusion> </exclusions> </dependency> Binary files differ
facade-lijin/pom.xml
@@ -46,17 +46,22 @@ </dependency> <dependency> <groupId>com.yeshi</groupId> <artifactId>utils</artifactId> <version>0.0.2-SNAPSHOT</version> <scope>system</scope> <systemPath>${project.basedir}/src/main/libs/utils-0.0.2.jar</systemPath> <version>0.0.3</version> <exclusions> <exclusion> <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> <artifactId>*</artifactId> </exclusion> <exclusion> <groupId>ch.qos.logback</groupId> <artifactId>*</artifactId> </exclusion> </exclusions> </dependency> Binary files differ
facade-vip/pom.xml
@@ -14,13 +14,6 @@ <packaging>jar</packaging> <dependencies> <dependency> <groupId>com.ks</groupId> <artifactId>lib-common</artifactId> <version>0.0.1-SNAPSHOT</version> <scope>system</scope> <systemPath>${project.basedir}/src/main/libs/lib-common.jar</systemPath> </dependency> <dependency> <groupId>com.ks</groupId> @@ -28,19 +21,38 @@ <version>0.0.1-SNAPSHOT</version> <scope>system</scope> <systemPath>${project.basedir}/src/main/libs/lib-common.jar</systemPath> <exclusions> <exclusion> <groupId>org.slf4j</groupId> <artifactId>*</artifactId> </exclusion> <exclusion> <groupId>ch.qos.logback</groupId> <artifactId>*</artifactId> </exclusion> </exclusions> </dependency> <dependency> <groupId>com.yeshi</groupId> <artifactId>utils</artifactId> <version>0.0.2-SNAPSHOT</version> <scope>system</scope> <systemPath>${project.basedir}/src/main/libs/utils-0.0.2.jar</systemPath> <version>0.0.3</version> <exclusions> <exclusion> <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> <artifactId>*</artifactId> </exclusion> <exclusion> <groupId>ch.qos.logback</groupId> <artifactId>logback-core</artifactId> </exclusion> <exclusion> <groupId>ch.qos.logback</groupId> <artifactId>logback-classic</artifactId> </exclusion> </exclusions> </dependency> @@ -51,6 +63,12 @@ <version>3.1</version> </dependency> <dependency> <groupId>com.alipay.sdk</groupId> <artifactId>alipay-sdk-java</artifactId> <version>4.9.71.ALL</version> </dependency> <!-- https://mvnrepository.com/artifact/dom4j/dom4j --> <dependency> facade-vip/src/main/libs/utils-0.0.2.jarBinary files differ
pom.xml
@@ -30,6 +30,16 @@ <mongo.driver.version>3.12.0</mongo.driver.version> </properties> <repositories> <repository> <id>nexus</id> <name>nexus</name> <url>http://193.112.35.168:8081/nexus/content/groups/public/</url> </repository> </repositories> <dependencies> <dependency> <groupId>org.springframework.boot</groupId> @@ -37,10 +47,10 @@ </dependency> <!--安全框架 --> <!-- <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-security</artifactId> </dependency>--> <!-- <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-security</artifactId> </dependency>--> <dependency> <groupId>org.springframework.boot</groupId> @@ -129,7 +139,7 @@ <exclusions> <exclusion> <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> <artifactId>*</artifactId> </exclusion> </exclusions> </dependency> @@ -181,7 +191,6 @@ </dependency> <!-- https://mvnrepository.com/artifact/com.beust/jcommander --> <dependency> <groupId>com.beust</groupId> @@ -196,6 +205,8 @@ <version>2.9.0</version> </dependency> </dependencies> <build> service-lijin/pom.xml
@@ -120,18 +120,6 @@ </dependency> <!--全局排除log4j --> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> <exclusions> <exclusion> <groupId>*</groupId> <artifactId>*</artifactId> </exclusion> </exclusions> </dependency> <dependency> <groupId>com.qcloud</groupId> service-lijin/src/main/java/com/ks/lijin/service/remote/LijinCreateServiceImpl.java
@@ -21,6 +21,7 @@ import com.ks.vip.service.VipCenterService; import com.ks.vip.service.VipGradePotenceService; import com.yeshi.goods.facade.entity.taobao.TaoBaoGoodsBrief; import org.apache.dubbo.config.annotation.Reference; import org.apache.dubbo.config.annotation.Service; import org.springframework.core.task.TaskExecutor; import org.springframework.transaction.annotation.Transactional; @@ -49,10 +50,10 @@ @Resource private LiJinProviderAccountService liJinProviderAccountService; @Resource @Reference(version = "1.0") private VipCenterService vipCenterService; @Resource @Reference(version = "1.0") private VipGradePotenceService vipGradePotenceService; @Resource service-lijin/src/main/resources/application.yml
@@ -1,3 +1,3 @@ spring: profiles: active: dev active: test service-vip/pom.xml
@@ -120,19 +120,6 @@ </dependency> <!--全局排除log4j --> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> <exclusions> <exclusion> <groupId>*</groupId> <artifactId>*</artifactId> </exclusion> </exclusions> </dependency> <dependency> <groupId>com.qcloud</groupId> <artifactId>cmq-http-client</artifactId> @@ -140,7 +127,7 @@ <exclusions> <exclusion> <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> <artifactId>*</artifactId> </exclusion> <exclusion> <groupId>log4j</groupId> @@ -162,6 +149,7 @@ <version>0.0.1-SNAPSHOT</version> </dependency> <!--<dependency>--> <!--<groupId>log4j</groupId>--> <!--<artifactId>log4j</artifactId>--> service-vip/src/main/java/com/ks/vip/config/RedisConfiguration.java
New file @@ -0,0 +1,35 @@ package com.ks.vip.config; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import redis.clients.jedis.JedisPool; import redis.clients.jedis.JedisPoolConfig; @Configuration public class RedisConfiguration { @Value("${redis.host}") private String host; @Value("${redis.port}") private int port; @Value("${redis.timeout}") private int timeout; @Value("${redis.password}") private String password; @Value("${redis.database}") private int database; @Bean public JedisPool redisPoolFactory() { JedisPoolConfig jedisPoolConfig = new JedisPoolConfig(); JedisPool jedisPool = new JedisPool(jedisPoolConfig, host, port, timeout, password, database); return jedisPool; } } service-vip/src/main/java/com/ks/vip/service/remote/VipOrderPayServiceImpl.java
@@ -10,11 +10,9 @@ import com.ks.vip.pojo.DTO.VipOrderDTO; import com.ks.vip.pojo.Enums.OrderTypeEnum; import com.ks.vip.pojo.Enums.PayWayEnum; import com.ks.vip.query.VipOrderQuery; import com.ks.vip.service.VipCenterService; import com.ks.vip.service.VipComboService; import com.ks.vip.service.VipOrederPayService; import com.ks.vip.service.VipOrederService; import com.ks.vip.service.manager.RedisManager; import com.ks.vip.util.Constant; import com.ks.vip.util.PayUtil; @@ -26,10 +24,7 @@ import org.yeshi.utils.wx.WXPayV3Util; import javax.annotation.Resource; import java.math.BigDecimal; import java.math.RoundingMode; import java.util.Date; import java.util.List; import java.util.UUID; @Service(version = "1.0") service-vip/src/main/resources/application.yml
@@ -1,3 +1,3 @@ spring: profiles: active: dev active: test
