Merge branch 'master' of dq/kmall-pt into master

kmall-admin/src/main/resources/conf/db.properties

@@ -2,8 +2,8 @@
 
 #========== 开发环境 ==========
 jdbc.url=jdbc:mysql://120.76.84.45:3306/kmall_pt?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8
-jdbc.username=ceshi
-jdbc.password=abc-123
+jdbc.username=tuser
+jdbc.password=Qq!123
 #jdbc.url=jdbc:mysql://127.0.0.1:3306/kmall_pt?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&autoReconnect=true
 #jdbc.username=root
 #jdbc.password=root

kmall-admin/src/main/resources/conf/pingan-pay.properties

@@ -0,0 +1,58 @@
+########## 平安支付配置 ##########
+
+# [dev, prod]
+pay.pingan.env = dev
+
+
+#========== 开发环境 ==========
+#平安支付open_id
+pingan.dev.payOpenId=6ad8a69d33b5bf188f7c0ab7bae95931
+#平安支付open_key
+pingan.dev.payOpenKey=ac1705d3ace4b6b69044494d0e28310e
+#平安取消交易、退款密钥
+pingan.dev.payPrivateKey=MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDoYLKYSup2POAgmf2iHwGhUQZSeyyxLvslDcFCRekg1D7w+Y8dybhBOyDvlTbuG15jt8vqqH1xlGTI66yz351uxrUL10UL6Uw+kx1091/BCiRo1AY9frOlIeTnVZy/S2LPWjEefI9o0nOBYJkoJZsaFffX6qXVFkCfAGNMohyuU0gNHw3SXXMBiJ2n2E7GfFf/peAmtTg4zFJO+CrikfSTrL0u5Y2dWQp1KQvkfCMrXaECM24fLc6xxwAdiARC6DjMK8F+ZxovEgb0VObpbZ5pnV2XrKEbiDXQ/DbeNTmELHN8k0S3NUY6ozpu1M3JDqZPhBIDgd/gcZknFngCRJ95AgMBAAECggEAXZYkF0WEq93UfgzGozZNl8RkAW/uDeXX65JglOpG+5u/RZmcU+jbthm0KAk2OCr5lrt8+qKk8stK08hmo4KZivWoEH7AJg3tUP46zNKb08jb5QQPB1Ex1H2UDL7kA/6+arfuNFMCBrtLHX3j8NFEZ/sU9/ZelzUBDYhAdaqMVoAbfOX7MIZMRIZRhrZCuQlZI0Wz1oGzOf4WB40HEvgRfkGkdC2C+co9tCK7PRcJCiAnSro175E8NLmYIs+0yUtztUUPSUcVmZ4NfQzM/tD7oyeHREkmBEM6NT62U2PAHyhdFJH23T5Rq80u2Qbzpqv6Fk9aNlBM5uN24umVU7C2oQKBgQD0Hyw7SKOGExbBOOyJFLpeISsiACokPz7rGwgQJfNfGrbnBLuo7VyxRAX9y01FQrsZL0ZqZ09dSnY6KqjmMzUQdtF1mteiF9wC6xHcIN9oXzDtDc0geB/hb3zLRIHs5yrCgNci8FjGL0OwBaNNz0vLa02C8Vm5P6rjlclyjK7ZtQKBgQDzrz0i+mCgklD6+cbEA3Z+0b75s5Lg9cu13eBntZ/+11d2Kf1JCrgrCiRcX1ggOG2ZHmPmi5cs93J6rd+HWInPWJ+j4GUYN5wPS8GxiQun42b3FloT5Zoe4Cj3TmonIHvhFQojYAniKPx3jb3mCLOUyHWjIc5r9zE6Tovth195NQKBgE7k9CqEozRlXuk7OFZk+IYLOiFW5EeqmO7qYYS2fxyxSYMHqI5Dh71SOo128pX7pvPQr3Ubxi5kLilGOCeNTQzxGWhkjmO4SkY3KiJ2DT1x5iH2X+CqccMtgKtAjKy/WLZbZSvJeSczhzCP4eL3p4sqNnanAVQ5G0VJ1zzJ8ogxAoGAA+4inUrOfih9995Jb2Xi5l65pstXphswwukmMmYCg5izh2tb826h08fhGEBNao+ebObJk7FSqd3/0ay2OzeZWWfDg2AeIUrcUH7XS+a68mU/huKsZz+/wZm572srWSAz/0hYloN5BVXF5KO7mVcwlki5ZP0pmCIvgBI+PYF+b7UCgYEA3WpyaYgDSVrE2pcF4+dvqFNIDGcFBGqCyeCaGx4E1WuP0R7y1SFM2miGnbl+te89ZLSzSudoeFq/qS8S3W+M+PuQJlmlFnQ+B/DaEJmKGiiNAqWT9cdohLeYNaJBvk55MdnRJl4dAfkf5PFIf64CWvdDEvhehuV6kub3i8KEvH8=
+#平安进件open_id
+pingan.dev.pluginOpenId=txafCXQt058248b3230c9081ff90ce80
+#平安进件open_key
+pingan.dev.pluginOpenKey=aG0ck19g2HdthGRdSCfmiloOoGXoOzWZ
+#平安进件公钥
+pingan.dev.pluginPublicKey=MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuyohp+CrDTaz6tW2uMrWxs2lFwEbRCsPg69gObtjirgMuGtcB+vhzCFn6rN8IvohvpGkO8vjZw6qrmlbNrauaUuW5j82eyZ749ZfTggFjIqteL9MeF88sAY3rw0AItcUUP3XaYamedKGrdeellfbgvyaJJ+m2evY/yP9FRTVEKgmbi0UvNMvCqqiWty3H3WURFjjj2J+/4b5zI8od4rSTsHetD8psOViMbHuYoqhl583UW/6veu1+ZvKPkJ8ZneP/jGCWe3BNWUMH3Y9+rPSOn+pnWmV3R926qKReeZBdMfK9ExYMFZi7ZfypEASz5pG+Jh5lTAwvgEATznQ7iESNQIDAQAB
+#平安进件私钥
+pingan.dev.pluginPrivateKey=MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQC7KiGn4KsNNrPq1ba4ytbGzaUXARtEKw+Dr2A5u2OKuAy4a1wH6+HMIWfqs3wi+iG+kaQ7y+NnDqquaVs2tq5pS5bmPzZ7Jnvj1l9OCAWMiq14v0x4XzywBjevDQAi1xRQ/ddphqZ50oat156WV9uC/Jokn6bZ69j/I/0VFNUQqCZuLRS80y8KqqJa3LcfdZREWOOPYn7/hvnMjyh3itJOwd60Pymw5WIxse5iiqGXnzdRb/q967X5m8o+Qnxmd4/+MYJZ7cE1ZQwfdj36s9I6f6mdaZXdH3bqopF55kF0x8r0TFgwVmLtl/KkQBLPmkb4mHmVMDC+AQBPOdDuIRI1AgMBAAECggEAYH/ihmoCB3gS35t88F40yp+w5OF/K3CAOUcs99c0BYvLkzJXawYlj1gR+iK8eFQ7HcR9xw7imnonanGLw/QAjO2aSfCBqJE5A0m+Lb9ZDRNbSYxoYw/HfIJYJ3sufMgkA3Y9oHz6TIlNQ0iOzblSxoBzATsHjghaA4KMtFffWwxVgeY1ozHGwt4pOv5opdr7JfJHz4Xv/G2wbmDpYEwlHWn4Iu1QZgOcmnufzIjEK7OXSvfEc0Ohjta4TikpfJK9W4gZ28B3yPSUmNlszsRUbOT8R5sI2QIYHemlYuyY9h9d1ZxgMv6QVu2dYdZSGHOzqd04mueYzPIWRD4WRETvaQKBgQDk6xwaq0JnZBVy9UXbS9Kn75SaYferqgKClYbeu7GfzYyjj5N/XZEuj5DwfxQa2jijy7QqX7Tqskridh7+sTcNDZZ4J6dT5Tivgfb3YQCVXIWL16uqSdasG1thGOAI9/0tzkHjknpjIpMNcT3s15I7tx7b4kyUlhR1FTKHygh5IwKBgQDRTn1V0iwbi3P0hV3bqHRxcCLmO9Bhdf3UekDiVvegtihLVZoUGCx/aOlhWQa5+1SVMziB7ms+16vEB9QI0wZXhrHCBszknMvYJFp9AuErvFAVCkgL0cAnhvj6QBFji5AFElNyNlExZ+hUpj6nBB/kmvF/kyiOQdAQM6WInJv4xwKBgC+aJFH3YuuVCFDLaCdd8QQy8bfYv2PXCoaVCWKvrRQJ7kDkzksh7dq8x+r6wfeDgVuuNFzLYheb066b2X4k48m3FZ8Ov+DWPZ9hazWt2i00/CBETNIwYI+RcMMUJSI4T1GDHnhwMTsEKYgWEEZ73VDFl4kp2brcKozeR4+tF235AoGBAJsk9N5iVXNtYNwE51dkfDuBhTznZUR4s1eF7wZWtGKZ4zBEGVt/t6wRVbxkwwmkdEPLnb0hvrjsIFPEAbUwxmimXKiXZdSnLKnf+HrlYYaLpUiTQGgSZ75k27STPNBuqKg5t0TXYkOe46WrPJGMCx/mgc+wgsU/nzwDLFYgz7QNAoGAXNjnCWMvwDeIS4tMYDfrVUfmvjXRFZuiOm0+a92huKlu72azi3mIme0YyIVSFGLl+Lk/BeBJYWnLNo6CsGyPqLyi4Pkoftq+BZS3ls25pFl+8QGjrLXky+nIXbceqf1YwdNHEEIOU14jHZyPAJR2M2Trj1iKrqJIRhkTT6WtjgE=
+#平安交接口交易地址
+pingan.dev.payUrl=https://api.orangebank.com.cn/mct1/
+#平安交接口进件地址
+pingan.dev.pluginUrl=https://mixpayuat4.orangebank.com.cn/org1/
+#平安交文件上传地址
+pingan.dev.fileUrl=https://mixpayst6.orangebank.com.cn/fileup1/
+#平安下单异步通知地址
+pingan.dev.notifyUrl=http://qhdswl.f3322.net:9002/api/pay/pingan/notify
+#平安支付成功跳转地址
+pingan.dev.jumpUrl=
+
+
+#========== 生产环境 ==========
+#平安支付open_id
+pingan.prod.payOpenId=6ad8a69d33b5bf188f7c0ab7bae95931
+#平安支付open_key
+pingan.prod.payOpenKey=ac1705d3ace4b6b69044494d0e28310e
+#平安取消交易、退款密钥
+pingan.prod.payPrivateKey=MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDoYLKYSup2POAgmf2iHwGhUQZSeyyxLvslDcFCRekg1D7w+Y8dybhBOyDvlTbuG15jt8vqqH1xlGTI66yz351uxrUL10UL6Uw+kx1091/BCiRo1AY9frOlIeTnVZy/S2LPWjEefI9o0nOBYJkoJZsaFffX6qXVFkCfAGNMohyuU0gNHw3SXXMBiJ2n2E7GfFf/peAmtTg4zFJO+CrikfSTrL0u5Y2dWQp1KQvkfCMrXaECM24fLc6xxwAdiARC6DjMK8F+ZxovEgb0VObpbZ5pnV2XrKEbiDXQ/DbeNTmELHN8k0S3NUY6ozpu1M3JDqZPhBIDgd/gcZknFngCRJ95AgMBAAECggEAXZYkF0WEq93UfgzGozZNl8RkAW/uDeXX65JglOpG+5u/RZmcU+jbthm0KAk2OCr5lrt8+qKk8stK08hmo4KZivWoEH7AJg3tUP46zNKb08jb5QQPB1Ex1H2UDL7kA/6+arfuNFMCBrtLHX3j8NFEZ/sU9/ZelzUBDYhAdaqMVoAbfOX7MIZMRIZRhrZCuQlZI0Wz1oGzOf4WB40HEvgRfkGkdC2C+co9tCK7PRcJCiAnSro175E8NLmYIs+0yUtztUUPSUcVmZ4NfQzM/tD7oyeHREkmBEM6NT62U2PAHyhdFJH23T5Rq80u2Qbzpqv6Fk9aNlBM5uN24umVU7C2oQKBgQD0Hyw7SKOGExbBOOyJFLpeISsiACokPz7rGwgQJfNfGrbnBLuo7VyxRAX9y01FQrsZL0ZqZ09dSnY6KqjmMzUQdtF1mteiF9wC6xHcIN9oXzDtDc0geB/hb3zLRIHs5yrCgNci8FjGL0OwBaNNz0vLa02C8Vm5P6rjlclyjK7ZtQKBgQDzrz0i+mCgklD6+cbEA3Z+0b75s5Lg9cu13eBntZ/+11d2Kf1JCrgrCiRcX1ggOG2ZHmPmi5cs93J6rd+HWInPWJ+j4GUYN5wPS8GxiQun42b3FloT5Zoe4Cj3TmonIHvhFQojYAniKPx3jb3mCLOUyHWjIc5r9zE6Tovth195NQKBgE7k9CqEozRlXuk7OFZk+IYLOiFW5EeqmO7qYYS2fxyxSYMHqI5Dh71SOo128pX7pvPQr3Ubxi5kLilGOCeNTQzxGWhkjmO4SkY3KiJ2DT1x5iH2X+CqccMtgKtAjKy/WLZbZSvJeSczhzCP4eL3p4sqNnanAVQ5G0VJ1zzJ8ogxAoGAA+4inUrOfih9995Jb2Xi5l65pstXphswwukmMmYCg5izh2tb826h08fhGEBNao+ebObJk7FSqd3/0ay2OzeZWWfDg2AeIUrcUH7XS+a68mU/huKsZz+/wZm572srWSAz/0hYloN5BVXF5KO7mVcwlki5ZP0pmCIvgBI+PYF+b7UCgYEA3WpyaYgDSVrE2pcF4+dvqFNIDGcFBGqCyeCaGx4E1WuP0R7y1SFM2miGnbl+te89ZLSzSudoeFq/qS8S3W+M+PuQJlmlFnQ+B/DaEJmKGiiNAqWT9cdohLeYNaJBvk55MdnRJl4dAfkf5PFIf64CWvdDEvhehuV6kub3i8KEvH8=
+#平安进件open_id
+pingan.prod.pluginOpenId=txafCXQt058248b3230c9081ff90ce80
+#平安进件open_key
+pingan.prod.pluginOpenKey=aG0ck19g2HdthGRdSCfmiloOoGXoOzWZ
+#平安进件公钥
+pingan.prod.pluginPublicKey=MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuyohp+CrDTaz6tW2uMrWxs2lFwEbRCsPg69gObtjirgMuGtcB+vhzCFn6rN8IvohvpGkO8vjZw6qrmlbNrauaUuW5j82eyZ749ZfTggFjIqteL9MeF88sAY3rw0AItcUUP3XaYamedKGrdeellfbgvyaJJ+m2evY/yP9FRTVEKgmbi0UvNMvCqqiWty3H3WURFjjj2J+/4b5zI8od4rSTsHetD8psOViMbHuYoqhl583UW/6veu1+ZvKPkJ8ZneP/jGCWe3BNWUMH3Y9+rPSOn+pnWmV3R926qKReeZBdMfK9ExYMFZi7ZfypEASz5pG+Jh5lTAwvgEATznQ7iESNQIDAQAB
+#平安进件私钥
+pingan.prod.pluginPrivateKey=MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQC7KiGn4KsNNrPq1ba4ytbGzaUXARtEKw+Dr2A5u2OKuAy4a1wH6+HMIWfqs3wi+iG+kaQ7y+NnDqquaVs2tq5pS5bmPzZ7Jnvj1l9OCAWMiq14v0x4XzywBjevDQAi1xRQ/ddphqZ50oat156WV9uC/Jokn6bZ69j/I/0VFNUQqCZuLRS80y8KqqJa3LcfdZREWOOPYn7/hvnMjyh3itJOwd60Pymw5WIxse5iiqGXnzdRb/q967X5m8o+Qnxmd4/+MYJZ7cE1ZQwfdj36s9I6f6mdaZXdH3bqopF55kF0x8r0TFgwVmLtl/KkQBLPmkb4mHmVMDC+AQBPOdDuIRI1AgMBAAECggEAYH/ihmoCB3gS35t88F40yp+w5OF/K3CAOUcs99c0BYvLkzJXawYlj1gR+iK8eFQ7HcR9xw7imnonanGLw/QAjO2aSfCBqJE5A0m+Lb9ZDRNbSYxoYw/HfIJYJ3sufMgkA3Y9oHz6TIlNQ0iOzblSxoBzATsHjghaA4KMtFffWwxVgeY1ozHGwt4pOv5opdr7JfJHz4Xv/G2wbmDpYEwlHWn4Iu1QZgOcmnufzIjEK7OXSvfEc0Ohjta4TikpfJK9W4gZ28B3yPSUmNlszsRUbOT8R5sI2QIYHemlYuyY9h9d1ZxgMv6QVu2dYdZSGHOzqd04mueYzPIWRD4WRETvaQKBgQDk6xwaq0JnZBVy9UXbS9Kn75SaYferqgKClYbeu7GfzYyjj5N/XZEuj5DwfxQa2jijy7QqX7Tqskridh7+sTcNDZZ4J6dT5Tivgfb3YQCVXIWL16uqSdasG1thGOAI9/0tzkHjknpjIpMNcT3s15I7tx7b4kyUlhR1FTKHygh5IwKBgQDRTn1V0iwbi3P0hV3bqHRxcCLmO9Bhdf3UekDiVvegtihLVZoUGCx/aOlhWQa5+1SVMziB7ms+16vEB9QI0wZXhrHCBszknMvYJFp9AuErvFAVCkgL0cAnhvj6QBFji5AFElNyNlExZ+hUpj6nBB/kmvF/kyiOQdAQM6WInJv4xwKBgC+aJFH3YuuVCFDLaCdd8QQy8bfYv2PXCoaVCWKvrRQJ7kDkzksh7dq8x+r6wfeDgVuuNFzLYheb066b2X4k48m3FZ8Ov+DWPZ9hazWt2i00/CBETNIwYI+RcMMUJSI4T1GDHnhwMTsEKYgWEEZ73VDFl4kp2brcKozeR4+tF235AoGBAJsk9N5iVXNtYNwE51dkfDuBhTznZUR4s1eF7wZWtGKZ4zBEGVt/t6wRVbxkwwmkdEPLnb0hvrjsIFPEAbUwxmimXKiXZdSnLKnf+HrlYYaLpUiTQGgSZ75k27STPNBuqKg5t0TXYkOe46WrPJGMCx/mgc+wgsU/nzwDLFYgz7QNAoGAXNjnCWMvwDeIS4tMYDfrVUfmvjXRFZuiOm0+a92huKlu72azi3mIme0YyIVSFGLl+Lk/BeBJYWnLNo6CsGyPqLyi4Pkoftq+BZS3ls25pFl+8QGjrLXky+nIXbceqf1YwdNHEEIOU14jHZyPAJR2M2Trj1iKrqJIRhkTT6WtjgE=
+#平安交接口交易地址
+pingan.prod.payUrl=https://api.orangebank.com.cn/mct1/
+#平安交接口进件地址
+pingan.prod.pluginUrl=https://api.orangebank.com.cn/org1/
+#平安交文件上传地址
+pingan.prod.fileUrl=https://up.orangebank.com.cn/fileup1/
+#平安下单异步通知地址
+pingan.prod.notifyUrl=https://mp.k1net.cn/api/pay/pingan/notify
+#平安支付成功跳转地址
+pingan.prod.jumpUrl=

kmall-admin/src/main/resources/spring/spring-context.xml

@@ -27,6 +27,7 @@
                 <value>classpath:conf/redis.properties</value>
                 <value>classpath:conf/servlet.properties</value>
                 <value>classpath:conf/wx-mp.properties</value>
+                <value>classpath:conf/pingan-pay.properties</value>
                 <value>classpath:conf/oms-merch.properties</value>
                 <value>classpath:conf/print-ticket.properties</value>
                 <value>classpath:conf/common.properties</value>

kmall-admin/src/main/resources/spring/spring-main.xml

@@ -18,6 +18,7 @@
     <import resource="spring-redis.xml"/>
     <import resource="spring-express-kdn.xml"/>
     <import resource="spring-wx-pay.xml"/>
+    <import resource="spring-pingan-pay.xml"/>
     <import resource="spring-jdbc.xml"/>
     <import resource="spring-oms-merch.xml"/>
     <import resource="spring-print-ticket.xml"/>

kmall-admin/src/main/resources/spring/spring-pingan-pay.xml

@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:context="http://www.springframework.org/schema/context"
+       xmlns:aop="http://www.springframework.org/schema/aop"
+       xmlns:mvc="http://www.springframework.org/schema/mvc"
+       xsi:schemaLocation="
+        http://www.springframework.org/schema/beans 
+        http://www.springframework.org/schema/beans/spring-beans-4.2.xsd
+        http://www.springframework.org/schema/context
+        http://www.springframework.org/schema/context/spring-context-4.2.xsd
+     	http://www.springframework.org/schema/aop
+     	http://www.springframework.org/schema/aop/spring-aop-4.2.xsd
+		http://www.springframework.org/schema/mvc
+     	http://www.springframework.org/schema/mvc/spring-mvc-4.2.xsd">
+
+    <bean id="pinganPayProdProperties" class="com.kmall.common.utils.pingan.properties.PinganPayProdProperties">
+        <property name="payOpenId" value="${pingan.prod.payOpenId}"/>
+        <property name="payOpenKey" value="${pingan.prod.payOpenKey}"/>
+        <property name="payPrivateKey" value="${pingan.prod.payPrivateKey}"/>
+
+        <property name="pluginOpenId" value="${pingan.prod.pluginOpenId}"/>
+        <property name="pluginOpenKey" value="${pingan.prod.pluginOpenKey}"/>
+        <property name="pluginPublicKey" value="${pingan.prod.pluginPublicKey}"/>
+        <property name="pluginPrivateKey" value="${pingan.prod.pluginPrivateKey}"/>
+
+        <property name="payUrl" value="${pingan.prod.payUrl}"/>
+        <property name="pluginUrl" value="${pingan.prod.pluginUrl}"/>
+        <property name="fileUrl" value="${pingan.prod.fileUrl}"/>
+
+        <property name="notifyUrl" value="${pingan.prod.notifyUrl}"/>
+        <property name="jumpUrl" value="${pingan.prod.jumpUrl}"/>
+    </bean>
+
+    <bean id="pinganPayDevProperties" class="com.kmall.common.utils.pingan.properties.PinganPayDevProperties">
+        <property name="payOpenId" value="${pingan.dev.payOpenId}"/>
+        <property name="payOpenKey" value="${pingan.dev.payOpenKey}"/>
+        <property name="payPrivateKey" value="${pingan.dev.payPrivateKey}"/>
+
+        <property name="pluginOpenId" value="${pingan.dev.pluginOpenId}"/>
+        <property name="pluginOpenKey" value="${pingan.dev.pluginOpenKey}"/>
+        <property name="pluginPublicKey" value="${pingan.dev.pluginPublicKey}"/>
+        <property name="pluginPrivateKey" value="${pingan.dev.pluginPrivateKey}"/>
+
+        <property name="payUrl" value="${pingan.dev.payUrl}"/>
+        <property name="pluginUrl" value="${pingan.dev.pluginUrl}"/>
+        <property name="fileUrl" value="${pingan.dev.fileUrl}"/>
+
+        <property name="notifyUrl" value="${pingan.dev.notifyUrl}"/>
+        <property name="jumpUrl" value="${pingan.dev.jumpUrl}"/>
+    </bean>
+</beans>

kmall-admin/src/main/webapp/WEB-INF/web.xml

@@ -12,6 +12,7 @@
             classpath:spring/spring-express-kdn.xml,
             classpath:spring/spring-redis.xml,
             classpath:spring/spring-wx-pay.xml,
+            classpath:spring/spring-pingan-pay.xml,
             classpath:spring/spring-jdbc.xml,,
             classpath:spring/spring-oms-merch.xml,
             classpath:spring/spring-print-ticket.xml,

kmall-framework/src/main/webapp/WEB-INF/web.xml

@@ -12,6 +12,7 @@
             classpath:spring/spring-express-kdn.xml,
             classpath:spring/spring-redis.xml,
             classpath:spring/spring-wx-pay.xml,
+            classpath:spring/spring-pingan-pay.xml,
             classpath:spring/spring-jdbc.xml,
             classpath:spring/spring-oms-merch.xml,
             classpath:spring/spring-print-ticket.xml,

kmall-framework/src/test/resources/applicationContext-test.xml

@@ -25,6 +25,11 @@
                 <value>classpath:conf/redis.properties</value>
                 <value>classpath:conf/servlet.properties</value>
                 <value>classpath:conf/wx-mp.properties</value>
+                <value>classpath:conf/pingan-pay.properties</value>
+                <value>classpath:conf/oms-merch.properties</value>
+                <value>classpath:conf/print-ticket.properties</value>
+                <value>classpath:conf/common.properties</value>
+                <value>classpath:conf/fastdfs.properties</value>
             </list>
         </property>
         <property name="fileEncoding" value="UTF-8"/>