1
0
Selaa lähdekoodia

新增部署配置信息,以及日志配置

hyq 6 vuotta sitten
vanhempi
commit
9693d72a8e
21 muutettua tiedostoa jossa 153 lisäystä ja 16 poistoa
  1. BIN
      cert/apiclient_cert.p12
  2. 26 0
      cert/apiclient_cert.pem
  3. 28 0
      cert/apiclient_key.pem
  4. 18 0
      cert/证书使用说明.txt
  5. 3 1
      kmall-admin/src/main/java/com/kmall/admin/controller/OrderController.java
  6. 3 1
      kmall-api/src/main/java/com/kmall/api/api/ApiAuthController.java
  7. 3 1
      kmall-api/src/main/java/com/kmall/api/api/ApiPayController.java
  8. 3 1
      kmall-api/src/main/java/com/kmall/api/api/pingan/ApiPayPinganController.java
  9. 3 1
      kmall-api/src/main/java/com/kmall/api/api/wxGlobal/ApiWxGlobalPayController.java
  10. 3 2
      kmall-api/src/main/java/com/kmall/api/cache/UserTokenCache.java
  11. 3 1
      kmall-api/src/main/java/com/kmall/api/resolver/LoginUserHandlerMethodArgumentResolver.java
  12. 3 0
      kmall-api/src/main/java/com/kmall/api/service/ApiOrderService.java
  13. 3 1
      kmall-api/src/main/java/com/kmall/api/service/ApiPayService.java
  14. 3 1
      kmall-api/src/main/java/com/kmall/api/service/wxGlobal/ApiWxGlobalPayService.java
  15. 3 1
      kmall-api/src/main/java/com/kmall/api/util/ApiBaseAction.java
  16. 3 1
      kmall-common/src/main/java/com/kmall/common/fileserver/util/FileManager.java
  17. 3 1
      kmall-common/src/main/java/com/kmall/common/utils/DateUtils.java
  18. 3 1
      kmall-common/src/main/java/com/kmall/common/utils/HttpUtil.java
  19. 3 1
      kmall-common/src/main/java/com/kmall/common/utils/RequestUtil.java
  20. 3 1
      kmall-common/src/main/java/com/kmall/common/utils/pingan/PinganUtil.java
  21. 33 0
      切换环境需要修改的.md

BIN
cert/apiclient_cert.p12


+ 26 - 0
cert/apiclient_cert.pem

@@ -0,0 +1,26 @@
+-----BEGIN CERTIFICATE-----
+MIIEZjCCA8+gAwIBAgIEAdngTDANBgkqhkiG9w0BAQUFADCBijELMAkGA1UEBhMC
+Q04xEjAQBgNVBAgTCUd1YW5nZG9uZzERMA8GA1UEBxMIU2hlbnpoZW4xEDAOBgNV
+BAoTB1RlbmNlbnQxDDAKBgNVBAsTA1dYRzETMBEGA1UEAxMKTW1wYXltY2hDQTEf
+MB0GCSqGSIb3DQEJARYQbW1wYXltY2hAdGVuY2VudDAeFw0xODAzMjkwODM3MDRa
+Fw0yODAzMjYwODM3MDRaMIGVMQswCQYDVQQGEwJDTjESMBAGA1UECBMJR3Vhbmdk
+b25nMREwDwYDVQQHEwhTaGVuemhlbjEQMA4GA1UEChMHVGVuY2VudDEOMAwGA1UE
+CxMFTU1QYXkxKTAnBgNVBAMUIOS4ree9keenkeaKgCjmt7HlnLMp5pyJ6ZmQ5YWs
+5Y+4MRIwEAYDVQQEEwkxMDAwNzM3ODYwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQCwnwvwPz1H8Z4lsOJv99gibR7PkrbpnH+zLZrsV1ldsLu41CIGpxs0
+LWCeKbknqb0VyDcdpF8Rx4c7XTgmqz2F+fIAkwV6rabHpZtoIFBBHPPvPzxLqrdy
+6ZQ/SjG52UrmRWQA+s3O8AeoCYh4FiH9lNZWVOZkrbyWh4cOFa5LaqyiTH7FyaSl
+I5G6i0wlVff9fN4433JPbrNlV/bs8UeT3RCEXMKWyFMdw8soEKX3JcmrkVDJv7x+
+DdV1pBcBxCJLNCevVGNca6QZjygZhKbxlMrTnGHvkVYPINv/j8iJM4PUyNJXeCi5
+9433TGf7WryFvupzhvsTSmIeuEtQAEO9AgMBAAGjggFGMIIBQjAJBgNVHRMEAjAA
+MCwGCWCGSAGG+EIBDQQfFh0iQ0VTLUNBIEdlbmVyYXRlIENlcnRpZmljYXRlIjAd
+BgNVHQ4EFgQUQbgBi9nQ2WhO+XxGrUmhnzeb/Zwwgb8GA1UdIwSBtzCBtIAUPgUm
+9iJitBVbiM1kfrDUYqflhnShgZCkgY0wgYoxCzAJBgNVBAYTAkNOMRIwEAYDVQQI
+EwlHdWFuZ2RvbmcxETAPBgNVBAcTCFNoZW56aGVuMRAwDgYDVQQKEwdUZW5jZW50
+MQwwCgYDVQQLEwNXWEcxEzARBgNVBAMTCk1tcGF5bWNoQ0ExHzAdBgkqhkiG9w0B
+CQEWEG1tcGF5bWNoQHRlbmNlbnSCCQC7VJcrvADoVzAOBgNVHQ8BAf8EBAMCBsAw
+FgYDVR0lAQH/BAwwCgYIKwYBBQUHAwIwDQYJKoZIhvcNAQEFBQADgYEAXRK7CjeA
+/bS7RNjxe1U66U8QbmsGpsG71jCvUPNeTROE8KYwjMzpu2itis+vKXnUtpo/vVH5
+i7sJx7/XiZbIVvLQN8dZvc4H1BXoBLKcTr9or0keY7Ld00/U6+xEZRPAv+zECDwO
+nS/tZwam25+rpTHWawP+/APSqS5r9MPgusE=
+-----END CERTIFICATE-----

+ 28 - 0
cert/apiclient_key.pem

@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCwnwvwPz1H8Z4l
+sOJv99gibR7PkrbpnH+zLZrsV1ldsLu41CIGpxs0LWCeKbknqb0VyDcdpF8Rx4c7
+XTgmqz2F+fIAkwV6rabHpZtoIFBBHPPvPzxLqrdy6ZQ/SjG52UrmRWQA+s3O8Aeo
+CYh4FiH9lNZWVOZkrbyWh4cOFa5LaqyiTH7FyaSlI5G6i0wlVff9fN4433JPbrNl
+V/bs8UeT3RCEXMKWyFMdw8soEKX3JcmrkVDJv7x+DdV1pBcBxCJLNCevVGNca6QZ
+jygZhKbxlMrTnGHvkVYPINv/j8iJM4PUyNJXeCi59433TGf7WryFvupzhvsTSmIe
+uEtQAEO9AgMBAAECggEAYozcRHmE4BfZfn5sWr2YQ91PS9M5bLB+MKRJxYYXv0dV
+95OmSMAFVd/cAWSWg6MadoT4+/kzcuA6fM1O/4SdF5yXg+qFLCao4M1vIXKmVS6q
+jdxi8HWZVu0uYwIrLOAqAsLFQiavn8AfBYwMMbVn0e6yigllZNfsWrHUke9XCYzW
+xuzwu6Tr2V6AsFbmeavJ2tUakIjpZuLi7E/DO3c6KugbAXkZujZfkcG4MHUCPglK
+g50biFJVoapxGKJEycTxHyTFvxAoqT3zoLVsMTt1wzXNeIGwP4wOPZMzp8kJAOU0
+9NlKrVT+rHw1/YHDjF1X3q1eImSG4WH2vRrsGKqtAQKBgQDcEQjlS0rNE3LNH/jY
+25hex67pmJJU/XFKAXuL27QIfaXe2/7AA+ab8S1ujKMi1fzN/iQzlSCtVno7TqAc
+EI9wkT+d6veaHYoBIsI3cM7Hqx0vQyVJC1bJMflnI4zqLM0b0k2s3eGjAI7E3KUm
+PqGiVpg4nNOChzPc8E7sCwJJZQKBgQDNdfamlGLmJHa7bVKc1wapIBTutMZaMwuD
+KHoFK9MTuUl3X4gahVPl01ypp7Zpg4ldQqB6FIuVbVvNNSlMO8rvo7xi/AvcRxFf
+/bzjZSuogu2Mym/BWL7ZorsFjlrnQJP0HtT7bLWFbxH1yMaAFYqIQyoTyyU1aVva
+mIepno2XeQKBgAXBZEwq5e/rHEuFFIsHYzrHWim91cXnQvk+hK6ptlGqh5YGhuka
+sQNPEXMctn+IvS3eAbBfrBUcd+HpMoLJZBb7lYBZztP3Bc71y8KLbr0GGqNLzEPW
+yhRE/FLYOS0+sraRj3p/6xDKSPGZG7CeXrfSL/T7FQUK6C5VEptVxl+JAoGAS7E5
+vQTNqpukYkhUNxPAkG4RSB+xM2m6xAcVbPJIQOvx9Nhs+9hCoFjNunLe8OBUqtbw
+6AjJo7M2LtN2827TxJU9wfm5JN3JuONxwxRykRIrEcNCiKh5JxSccd+P/cH8v+Lb
+9ASImy/gHfxppKZK8whLaB9fBd5ayJ2I3SRcZYECgYAEeDs5s1OxfdXtL0EXUmKP
+5R7MThVKceZ85FHFXQh2r43TY2utqJi2NoW4KRlhG8SgUwHYmxcvnfSZuITtKxsd
+LV56lcQgxhfw20tyP/79+8OYZDwnTIkC0pZtn/OpJb0Lq6861GTaD97XSXuyPPKJ
+L1hE5ZGyide2HTTps7Dk6w==
+-----END PRIVATE KEY-----

+ 18 - 0
cert/证书使用说明.txt

@@ -0,0 +1,18 @@
+欢迎使用微信支付!
+附件中的三份文件(证书pkcs12格式、证书pem格式、证书密钥pem格式),为接口中强制要求时需携带的证书文件。
+证书属于敏感信息,请妥善保管不要泄露和被他人复制。
+不同开发语言下的证书格式不同,以下为说明指引:
+    证书pkcs12格式(apiclient_cert.p12)
+        包含了私钥信息的证书文件,为p12(pfx)格式,由微信支付签发给您用来标识和界定您的身份
+        部分安全性要求较高的API需要使用该证书来确认您的调用身份
+        windows上可以直接双击导入系统,导入过程中会提示输入证书密码,证书密码默认为您的商户ID(如:10010000)
+    证书pem格式(apiclient_cert.pem)
+        从apiclient_cert.p12中导出证书部分的文件,为pem格式,请妥善保管不要泄漏和被他人复制
+        部分开发语言和环境,不能直接使用p12文件,而需要使用pem,所以为了方便您使用,已为您直接提供
+        您也可以使用openssl命令来自己导出:openssl pkcs12 -clcerts -nokeys -in apiclient_cert.p12 -out apiclient_cert.pem
+    证书密钥pem格式(apiclient_key.pem)
+        从apiclient_cert.p12中导出密钥部分的文件,为pem格式
+        部分开发语言和环境,不能直接使用p12文件,而需要使用pem,所以为了方便您使用,已为您直接提供
+        您也可以使用openssl命令来自己导出:openssl pkcs12 -nocerts -in apiclient_cert.p12 -out apiclient_key.pem
+备注说明:  
+        由于绝大部分操作系统已内置了微信支付服务器证书的根CA证书,  2018年3月6日后, 不再提供CA证书文件(rootca.pem)下载 

+ 3 - 1
kmall-admin/src/main/java/com/kmall/admin/controller/OrderController.java

@@ -20,6 +20,8 @@ import com.kmall.common.utils.wechat.wxglobal.WechatGlobalUtil;
 import com.kmall.common.utils.wechat.wxglobal.dto.WechatGlobalRefundApiResult;
 import com.kmall.common.utils.wechat.wxglobal.dto.WechatGlobalRefundApiResult;
 import net.sf.json.JSONObject;
 import net.sf.json.JSONObject;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.apache.log4j.Logger;
 import org.apache.log4j.Logger;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -40,7 +42,7 @@ import java.util.Objects;
 @RestController
 @RestController
 @RequestMapping("order")
 @RequestMapping("order")
 public class OrderController {
 public class OrderController {
-    private Logger logger = Logger.getLogger(OrderController.class);
+    private Log logger = LogFactory.getLog(OrderController.class);
     @Autowired
     @Autowired
     private OrderService orderService;
     private OrderService orderService;
     @Autowired
     @Autowired

+ 3 - 1
kmall-api/src/main/java/com/kmall/api/api/ApiAuthController.java

@@ -12,6 +12,8 @@ import com.kmall.api.util.ApiUserUtils;
 import com.kmall.api.util.CommonUtil;
 import com.kmall.api.util.CommonUtil;
 import com.qiniu.util.StringUtils;
 import com.qiniu.util.StringUtils;
 import org.apache.commons.collections.MapUtils;
 import org.apache.commons.collections.MapUtils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.apache.log4j.Logger;
 import org.apache.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;
@@ -32,7 +34,7 @@ import java.util.Map;
 @RestController
 @RestController
 @RequestMapping("/api/auth")
 @RequestMapping("/api/auth")
 public class ApiAuthController extends ApiBaseAction {
 public class ApiAuthController extends ApiBaseAction {
-    private Logger logger = Logger.getLogger(getClass());
+    private Log logger = LogFactory.getLog(ApiAuthController.class);
     @Autowired
     @Autowired
     private ApiUserService userService;
     private ApiUserService userService;
     @Autowired
     @Autowired

+ 3 - 1
kmall-api/src/main/java/com/kmall/api/api/ApiPayController.java

@@ -19,6 +19,8 @@ import com.kmall.common.utils.wechat.AESUtil;
 import com.kmall.common.utils.wechat.WechatRefundApiResult;
 import com.kmall.common.utils.wechat.WechatRefundApiResult;
 import com.kmall.common.utils.wechat.WechatRefundNotifyResult;
 import com.kmall.common.utils.wechat.WechatRefundNotifyResult;
 import com.kmall.common.utils.wechat.WechatUtil;
 import com.kmall.common.utils.wechat.WechatUtil;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.apache.log4j.Logger;
 import org.apache.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.annotation.Order;
 import org.springframework.core.annotation.Order;
@@ -39,7 +41,7 @@ import java.util.*;
 @RestController
 @RestController
 @RequestMapping("/api/pay")
 @RequestMapping("/api/pay")
 public class ApiPayController extends ApiBaseAction {
 public class ApiPayController extends ApiBaseAction {
-    private Logger logger = Logger.getLogger(ApiPayController.class);
+    private Log logger = LogFactory.getLog(ApiPayController.class);
     @Autowired
     @Autowired
     private ApiOrderService orderService;
     private ApiOrderService orderService;
     @Autowired
     @Autowired

+ 3 - 1
kmall-api/src/main/java/com/kmall/api/api/pingan/ApiPayPinganController.java

@@ -26,6 +26,8 @@ import com.kmall.common.utils.pingan.utils.InterfaceParams;
 import com.kmall.common.utils.pingan.utils.TLinx2Util;
 import com.kmall.common.utils.pingan.utils.TLinx2Util;
 import com.kmall.common.utils.pingan.utils.TLinxAESCoder;
 import com.kmall.common.utils.pingan.utils.TLinxAESCoder;
 import net.sf.json.JSONObject;
 import net.sf.json.JSONObject;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.apache.log4j.Logger;
 import org.apache.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;
@@ -39,7 +41,7 @@ import java.util.*;
 @RequestMapping("api/pay/pingan")
 @RequestMapping("api/pay/pingan")
 public class ApiPayPinganController extends ApiBaseAction {
 public class ApiPayPinganController extends ApiBaseAction {
 
 
-    private Logger logger = Logger.getLogger(ApiPayPinganController.class);
+    private Log logger = LogFactory.getLog(ApiPayPinganController.class);
 
 
     private static final String SUCCESS_CODE = "0";
     private static final String SUCCESS_CODE = "0";
 
 

+ 3 - 1
kmall-api/src/main/java/com/kmall/api/api/wxGlobal/ApiWxGlobalPayController.java

@@ -18,6 +18,8 @@ import com.kmall.common.utils.wechat.WechatUtil;
 import com.kmall.common.utils.wechat.wxglobal.WechatGlobalUtil;
 import com.kmall.common.utils.wechat.wxglobal.WechatGlobalUtil;
 import com.kmall.common.utils.wechat.wxglobal.dto.WechatGlobalNotifyResult;
 import com.kmall.common.utils.wechat.wxglobal.dto.WechatGlobalNotifyResult;
 import com.kmall.common.utils.wechat.wxglobal.dto.WechatGlobalQueryApiResult;
 import com.kmall.common.utils.wechat.wxglobal.dto.WechatGlobalQueryApiResult;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.apache.log4j.Logger;
 import org.apache.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -43,7 +45,7 @@ import java.util.*;
 @RestController
 @RestController
 @RequestMapping("/api/global/pay")
 @RequestMapping("/api/global/pay")
 public class ApiWxGlobalPayController extends ApiBaseAction {
 public class ApiWxGlobalPayController extends ApiBaseAction {
-    private Logger logger = Logger.getLogger(ApiWxGlobalPayController.class);
+    private Log logger = LogFactory.getLog(ApiWxGlobalPayController.class);
     @Autowired
     @Autowired
     private ApiOrderService orderService;
     private ApiOrderService orderService;
     @Autowired
     @Autowired

+ 3 - 2
kmall-api/src/main/java/com/kmall/api/cache/UserTokenCache.java

@@ -6,7 +6,8 @@ import com.kmall.api.entity.TokenEntity;
 import com.kmall.api.entity.UserVo;
 import com.kmall.api.entity.UserVo;
 import com.kmall.common.utils.StringUtils;
 import com.kmall.common.utils.StringUtils;
 import com.kmall.common.utils.redis.JedisUtil;
 import com.kmall.common.utils.redis.JedisUtil;
-import org.apache.log4j.Logger;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 
 
 /**
 /**
  * 会员缓存
  * 会员缓存
@@ -14,7 +15,7 @@ import org.apache.log4j.Logger;
  * @author Scott
  * @author Scott
  */
  */
 public class UserTokenCache {
 public class UserTokenCache {
-    private static Logger logger = Logger.getLogger(UserTokenCache.class);
+    private static Log logger = LogFactory.getLog(UserTokenCache.class);
     static SimplePropertyPreFilter filter = new SimplePropertyPreFilter();
     static SimplePropertyPreFilter filter = new SimplePropertyPreFilter();
 
 
     /**
     /**

+ 3 - 1
kmall-api/src/main/java/com/kmall/api/resolver/LoginUserHandlerMethodArgumentResolver.java

@@ -5,6 +5,8 @@ import com.kmall.api.cache.UserTokenCache;
 import com.kmall.api.entity.UserVo;
 import com.kmall.api.entity.UserVo;
 import com.kmall.api.interceptor.AuthorizationInterceptor;
 import com.kmall.api.interceptor.AuthorizationInterceptor;
 import com.kmall.api.service.ApiUserService;
 import com.kmall.api.service.ApiUserService;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.apache.log4j.Logger;
 import org.apache.log4j.Logger;
 import org.springframework.core.MethodParameter;
 import org.springframework.core.MethodParameter;
 import org.springframework.web.bind.support.WebDataBinderFactory;
 import org.springframework.web.bind.support.WebDataBinderFactory;
@@ -21,7 +23,7 @@ import org.springframework.web.method.support.ModelAndViewContainer;
  * @date 2017-03-23 22:02
  * @date 2017-03-23 22:02
  */
  */
 public class LoginUserHandlerMethodArgumentResolver implements HandlerMethodArgumentResolver {
 public class LoginUserHandlerMethodArgumentResolver implements HandlerMethodArgumentResolver {
-    private Logger logger = Logger.getLogger(getClass());
+    private Log logger = LogFactory.getLog(getClass());
     private ApiUserService userService;
     private ApiUserService userService;
 
 
     public void setUserService(ApiUserService userService) {
     public void setUserService(ApiUserService userService) {

+ 3 - 0
kmall-api/src/main/java/com/kmall/api/service/ApiOrderService.java

@@ -22,6 +22,8 @@ import com.kmall.common.utils.print.ticket.TicketPrintUtil;
 import com.kmall.common.utils.print.ticket.item.*;
 import com.kmall.common.utils.print.ticket.item.*;
 import com.kmall.common.utils.wxtemplate.TemplateData;
 import com.kmall.common.utils.wxtemplate.TemplateData;
 import com.kmall.common.utils.wxtemplate.WxTemplate;
 import com.kmall.common.utils.wxtemplate.WxTemplate;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.annotation.Transactional;
@@ -33,6 +35,7 @@ import java.util.*;
 
 
 @Service
 @Service
 public class ApiOrderService {
 public class ApiOrderService {
+    private Log logger = LogFactory.getLog(ApiOrderService.class);
     @Autowired
     @Autowired
     private ApiSysPrinterMapper apiSysPrinterMapper;
     private ApiSysPrinterMapper apiSysPrinterMapper;
     @Autowired
     @Autowired

+ 3 - 1
kmall-api/src/main/java/com/kmall/api/service/ApiPayService.java

@@ -15,6 +15,8 @@ import com.kmall.common.utils.DateUtils;
 import com.kmall.common.utils.MapUtils;
 import com.kmall.common.utils.MapUtils;
 import com.kmall.common.utils.wechat.WechatRefundApiResult;
 import com.kmall.common.utils.wechat.WechatRefundApiResult;
 import com.kmall.common.utils.wechat.WechatUtil;
 import com.kmall.common.utils.wechat.WechatUtil;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.apache.log4j.Logger;
 import org.apache.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
@@ -32,7 +34,7 @@ import java.util.*;
  */
  */
 @Service
 @Service
 public class ApiPayService {
 public class ApiPayService {
-    private static Logger logger = Logger.getLogger(ApiPayService.class);
+    private static Log logger = LogFactory.getLog(ApiPayService.class);
     @Autowired
     @Autowired
     private ApiOrderService orderService;
     private ApiOrderService orderService;
     @Autowired
     @Autowired

+ 3 - 1
kmall-api/src/main/java/com/kmall/api/service/wxGlobal/ApiWxGlobalPayService.java

@@ -15,6 +15,8 @@ import com.kmall.common.utils.wechat.WechatUtil;
 import com.kmall.common.utils.wechat.wxglobal.WechatGlobalUtil;
 import com.kmall.common.utils.wechat.wxglobal.WechatGlobalUtil;
 import com.kmall.common.utils.wechat.wxglobal.dto.WechatGlobalNotifyResult;
 import com.kmall.common.utils.wechat.wxglobal.dto.WechatGlobalNotifyResult;
 import com.kmall.common.utils.wechat.wxglobal.dto.WechatGlobalQueryApiResult;
 import com.kmall.common.utils.wechat.wxglobal.dto.WechatGlobalQueryApiResult;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.apache.log4j.Logger;
 import org.apache.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
@@ -32,7 +34,7 @@ import java.util.*;
  */
  */
 @Service
 @Service
 public class ApiWxGlobalPayService {
 public class ApiWxGlobalPayService {
-    private static Logger logger = Logger.getLogger(ApiWxGlobalPayService.class);
+    private Log logger = LogFactory.getLog(ApiWxGlobalPayService.class);
     @Autowired
     @Autowired
     private ApiOrderService orderService;
     private ApiOrderService orderService;
     @Autowired
     @Autowired

+ 3 - 1
kmall-api/src/main/java/com/kmall/api/util/ApiBaseAction.java

@@ -7,6 +7,8 @@ import com.kmall.common.advice.CustomTimestampEditor;
 import com.kmall.api.cache.UserTokenCache;
 import com.kmall.api.cache.UserTokenCache;
 import com.kmall.api.entity.TokenEntity;
 import com.kmall.api.entity.TokenEntity;
 import com.kmall.api.interceptor.AuthorizationInterceptor;
 import com.kmall.api.interceptor.AuthorizationInterceptor;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.apache.log4j.Logger;
 import org.apache.log4j.Logger;
 import org.apache.shiro.authz.UnauthorizedException;
 import org.apache.shiro.authz.UnauthorizedException;
 import org.springframework.beans.TypeMismatchException;
 import org.springframework.beans.TypeMismatchException;
@@ -37,7 +39,7 @@ import java.util.Map;
  * @date 2016年9月2日
  * @date 2016年9月2日
  */
  */
 public class ApiBaseAction {
 public class ApiBaseAction {
-    protected Logger logger = Logger.getLogger(getClass());
+    protected Log logger = LogFactory.getLog(ApiBaseAction.class);
     /**
     /**
      * 得到request对象
      * 得到request对象
      */
      */

+ 3 - 1
kmall-common/src/main/java/com/kmall/common/fileserver/util/FileManager.java

@@ -2,6 +2,8 @@ package com.kmall.common.fileserver.util;
 
 
 import com.kmall.common.fileserver.common.NameValuePair;
 import com.kmall.common.fileserver.common.NameValuePair;
 import com.kmall.common.fileserver.fastdfs.*;
 import com.kmall.common.fileserver.fastdfs.*;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.apache.log4j.Logger;
 import org.apache.log4j.Logger;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.HttpStatus;
@@ -28,7 +30,7 @@ public class FileManager implements Serializable {
      */
      */
     public static final String CLIENT_CONFIG_FILE = "conf/fastdfs.properties";
     public static final String CLIENT_CONFIG_FILE = "conf/fastdfs.properties";
 
 
-    private static Logger logger = Logger.getLogger(FileManager.class);
+    private static Log logger = LogFactory.getLog(FileManager.class);
 
 
     private static TrackerClient trackerClient;
     private static TrackerClient trackerClient;
     private static TrackerServer trackerServer;
     private static TrackerServer trackerServer;

+ 3 - 1
kmall-common/src/main/java/com/kmall/common/utils/DateUtils.java

@@ -1,5 +1,7 @@
 package com.kmall.common.utils;
 package com.kmall.common.utils;
 
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.apache.log4j.Logger;
 import org.apache.log4j.Logger;
 import org.springframework.util.StringUtils;
 import org.springframework.util.StringUtils;
 
 
@@ -17,7 +19,7 @@ import java.util.Date;
  */
  */
 public class DateUtils {
 public class DateUtils {
     // 日志
     // 日志
-    private static final Logger logger = Logger.getLogger(DateUtils.class);
+    private static final Log logger = LogFactory.getLog(DateUtils.class);
 
 
     /**
     /**
      * 时间格式(yyyy-MM-dd)
      * 时间格式(yyyy-MM-dd)

+ 3 - 1
kmall-common/src/main/java/com/kmall/common/utils/HttpUtil.java

@@ -8,6 +8,8 @@ import org.apache.commons.httpclient.methods.GetMethod;
 import org.apache.commons.httpclient.methods.PostMethod;
 import org.apache.commons.httpclient.methods.PostMethod;
 import org.apache.commons.httpclient.methods.RequestEntity;
 import org.apache.commons.httpclient.methods.RequestEntity;
 import org.apache.commons.httpclient.methods.StringRequestEntity;
 import org.apache.commons.httpclient.methods.StringRequestEntity;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.apache.log4j.Logger;
 import org.apache.log4j.Logger;
 
 
 import java.io.IOException;
 import java.io.IOException;
@@ -26,7 +28,7 @@ import java.util.Set;
  */
  */
 public class HttpUtil {
 public class HttpUtil {
 
 
-    private static final Logger logger = Logger.getLogger(HttpUtil.class);
+    private static final Log logger = LogFactory.getLog(HttpUtil.class);
     /**
     /**
      * 定义编码格式 UTF-8
      * 定义编码格式 UTF-8
      */
      */

+ 3 - 1
kmall-common/src/main/java/com/kmall/common/utils/RequestUtil.java

@@ -13,6 +13,8 @@ package com.kmall.common.utils;
 
 
 
 
 import com.kmall.common.Global;
 import com.kmall.common.Global;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.json.JSONObject;
 import org.json.JSONObject;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 import org.springframework.web.context.request.ServletRequestAttributes;
@@ -38,7 +40,7 @@ import java.util.logging.Logger;
  */
  */
 public class RequestUtil {
 public class RequestUtil {
 
 
-    private static final Logger LOGGER = Logger.getLogger(RequestUtil.class.getName());
+    private static final Log LOGGER = LogFactory.getLog(RequestUtil.class.getName());
 
 
     /**
     /**
      * 将request查询参数封装至Map
      * 将request查询参数封装至Map

+ 3 - 1
kmall-common/src/main/java/com/kmall/common/utils/pingan/PinganUtil.java

@@ -12,6 +12,8 @@ import com.kmall.common.utils.pingan.utils.TLinxAESCoder;
 import com.kmall.common.utils.pingan.utils.TLinxSHA1;
 import com.kmall.common.utils.pingan.utils.TLinxSHA1;
 import com.kmall.common.utils.wechat.WechatRefundQueryResult;
 import com.kmall.common.utils.wechat.WechatRefundQueryResult;
 import net.sf.json.JSONObject;
 import net.sf.json.JSONObject;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.apache.log4j.Logger;
 import org.apache.log4j.Logger;
 
 
 import java.util.Date;
 import java.util.Date;
@@ -20,7 +22,7 @@ import java.util.TreeMap;
 public class PinganUtil {
 public class PinganUtil {
 
 
     private static final String SUCCESS_CODE = "0";
     private static final String SUCCESS_CODE = "0";
-    private static Logger logger = Logger.getLogger(PinganUtil.class);
+    private static Log logger = LogFactory.getLog(PinganUtil.class);
 
 
     /**
     /**
      * 构建平安支付订单信息
      * 构建平安支付订单信息

+ 33 - 0
切换环境需要修改的.md

@@ -0,0 +1,33 @@
+切换环境需要修改的:
+
+1. 微信小程序支付配置
+    文件目录:resources\conf\wx-mp.properties
+        修改env为prod
+2. Redis配置
+    文件目录:resources\conf\redis.properties
+        修改env为prod
+3. 打印机配置
+    文件目录:resources\conf\print-ticket.properties
+
+4. 快递鸟配置
+    文件目录:resources\conf\express-kdn.properties
+        修改env为prod
+5. 云片短信配置
+    文件目录:resources\conf\common.properties
+
+6. 数据源配置
+    文件目录:resources\conf\db.properties
+        切换为生产环境配置
+
+7. 商户配置
+    文件目录:resources\conf\oms-merch.properties
+
+8. 图片上传配置
+    文件目录:resources\conf\fastdfs.properties
+        切换为生产环境配置
+        
+9. Jdk1.8
+    服务器安装jdk1.8,微信退款回调信息解密需要在目录“jdk1.8.0_131\jre\lib\security”中
+替换local_policy.jar、US_export_policy.jar两个安全的jar文件
+
+10. cert安装目录配置在wx-mp.properties的certName中