Merge branch 'master' into 2.0-dev

* master:
  修改配置星巴克 肯德基 会员充值 话费 微信商户号
  修改配置星巴克 肯德基 会员充值 话费 微信商户号

# Conflicts:
#	hai-cweb/src/main/java/com/cweb/controller/pay/CzOrderController.java
#	hai-cweb/src/main/java/com/cweb/controller/pay/ThirdOrderController.java

hai-service/src/main/java/com/hai/service/impl/OutRechargeOrderServiceImpl.java

@@ -194,7 +194,7 @@ public class OutRechargeOrderServiceImpl implements OutRechargeOrderService {
     }
 
     @Override
-    @Cached(cacheType = CacheType.REMOTE,name="order:", key = "#orderNo",expire = 3600*24*30)
+    @Cached(cacheType = CacheType.REMOTE,name="mobile:", key = "#orderNo",expire = 3600*24*30)
     public OutRechargeOrder findByOrderNo(String orderNo) {
 
         OutRechargeOrderExample example = new OutRechargeOrderExample();

v1/src/main/java/com/v1/controller/GzSinopecController.java

@@ -40,12 +40,6 @@ public class  GzSinopecController {
 
     private static Logger log = LoggerFactory.getLogger(GzSinopecController.class);
 
-    @Resource
-    private HighOpenApiService highOpenApiService;
-
-    @Resource
-    private HighUserService highUserService;
-
     @Resource
     private ApiMerchantsService apiMerchantsService;