--no commit message

com.zrqx.pay/src/main/java/com/zrqx/pay/fg/client/member/MemberClient.java

 package com.zrqx.pay.fg.client.member;
 
-import org.springframework.cloud.netflix.feign.FeignClient;
+import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 

com.zrqx.pay/src/main/java/com/zrqx/pay/fg/client/member/MemberClientHystric.java

 package com.zrqx.pay.fg.client.member;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 
 import com.zrqx.core.util.response.CallBack;
@@ -9,8 +10,8 @@ import com.zrqx.core.vo.pay.BalancePayResultVo;
 @Component
 public class MemberClientHystric implements MemberClient {
 
-	private static final Logger log = Logger.getLogger(MemberClientHystric.class);
-
+	private final static Logger log = LoggerFactory.getLogger(MemberClientHystric.class);
+	
 	@Override
 	public CallBack<BalancePayResultVo> balancePay(String payment,
 			Integer memberId) {

com.zrqx.pay/src/main/java/com/zrqx/pay/fg/client/order/FgOrderClient.java

 package com.zrqx.pay.fg.client.order;
 
-import org.springframework.cloud.netflix.feign.FeignClient;
+import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;

com.zrqx.pay/src/main/java/com/zrqx/pay/fg/client/order/FgOrderClientHystric.java

 package com.zrqx.pay.fg.client.order;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 
 import com.zrqx.core.form.third.pay.PayResultForm;
@@ -10,8 +11,9 @@ import com.zrqx.core.vo.order.fg.OrderPayVo;
 @Component
 public class FgOrderClientHystric implements FgOrderClient {
 
-	private static final Logger log = Logger.getLogger(FgOrderClientHystric.class);
-
+	private final static Logger log = LoggerFactory.getLogger(FgOrderClientHystric.class);
+	
+	
 	@Override
 	public CallBack<OrderPayVo> getOrderInfo(String code) {
 		log.info("pay调用order服务获取订单详情失败");

com.zrqx.pay/src/main/java/com/zrqx/pay/fg/client/third/ThirdClient.java

 package com.zrqx.pay.fg.client.third;
 
-import org.springframework.cloud.netflix.feign.FeignClient;
+import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestParam;

com.zrqx.pay/src/main/java/com/zrqx/pay/fg/client/third/ThirdClientHystric.java

 package com.zrqx.pay.fg.client.third;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 
 import com.zrqx.core.form.third.pay.ToPayForm;
@@ -10,8 +11,9 @@ import com.zrqx.core.vo.third.pay.payquery.PayQueryReturnVo;
 @Component
 public class ThirdClientHystric implements ThirdClient{
 
-	private static final Logger log = Logger.getLogger(ThirdClientHystric.class);
-
+	private final static Logger log = LoggerFactory.getLogger(ThirdClientHystric.class);
+	
+	
 	@Override
 	public CallBack<PayQueryReturnVo> query(String out_trade_no, String payType) {
 		log.info("调用三方服务支付查询失败");

com.zrqx.pay/src/main/java/com/zrqx/pay/fg/service/FgPayServiceImpl.java

@@ -2,7 +2,8 @@ package com.zrqx.pay.fg.service;
 
 import java.util.Date;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -18,6 +19,7 @@ import com.zrqx.core.vo.pay.BalancePayResultVo;
 import com.zrqx.core.vo.third.pay.payquery.PayQueryReturnVo;
 import com.zrqx.pay.commons.Redis;
 import com.zrqx.pay.fg.client.member.MemberClient;
+import com.zrqx.pay.fg.client.member.MemberClientHystric;
 import com.zrqx.pay.fg.client.order.FgOrderClient;
 import com.zrqx.pay.fg.client.third.ThirdClient;
 import com.zrqx.pay.fg.mapper.TransferLogMapper;
@@ -25,9 +27,7 @@ import com.zrqx.pay.fg.mapper.TransferLogMapper;
 @Service
 public class FgPayServiceImpl implements FgPayService {
 
-	
-	private static final Logger log = Logger.getLogger(FgPayServiceImpl.class);
-	
+	private final static Logger log = LoggerFactory.getLogger(MemberClientHystric.class);
 	
 	@Autowired
 	private ThirdClient thirdClient;

com.zrqx.pay/src/test/java/com/zrqx/marketing/ApplicationTests.java

 package com.zrqx.marketing;
 
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringRunner;
-
 /*@RunWith(SpringRunner.class)
 @SpringBootTest*/
 public class ApplicationTests {