杨杰 4 лет назад
Родитель
Сommit
32dde2979a

+ 1 - 1
src/main/java/com/llisoft/pay/controller/AliPayController.java

@@ -35,7 +35,7 @@ public class AliPayController {
 	public String retur(HttpServletRequest request) throws Exception {
 		Map<String, String> resultMap = this.getParamMap(request);
 		logger.info("收到支付宝同步回调: {}", resultMap);
-		return aliPayService.doReturn(resultMap);
+		return "redirect:" + aliPayService.doReturn(resultMap);
 	}
 	
 	@ApiOperation(value="异步通知")

+ 3 - 3
src/main/java/com/llisoft/pay/dao/ItemDao.java

@@ -18,12 +18,12 @@ public interface ItemDao {
 	@Select("select * from mta_pay_item where pay_num=#{payNum}")
 	Item selectByPayNum(String payNum);
 	
-    @Insert("insert into mta_pay_item (pay_id,pay_num,pay_status,pay_type,order_id,create_time) "
-    		+ "values (#{payId},#{payNum},#{payStatus},#{payType},#{orderId},now())")
+    @Insert("insert into mta_pay_item (pay_id,pay_num,pay_status,pay_money,pay_type,order_id,create_time) "
+    		+ "values (#{payId},#{payNum},#{payStatus},#{payMoney},#{payType},#{orderId},now())")
     @SelectKey(statement="SELECT LAST_INSERT_ID()", keyProperty="orderId", before=false, resultType=Integer.class)
     boolean insert(Item item);
 
-    @Update("update mta_pay_item set pay_status=#{payStatus},pay_flag=#{payFlag},trade_num=#{tradeNum},pay_time=now() where auth_id=#{authId}")
+    @Update("update mta_pay_item set pay_status=#{payStatus},pay_flag=#{payFlag},trade_num=#{tradeNum},pay_time=now() where pay_id=#{payId}")
 	boolean updatePay(@Param("payId")int payId, @Param("tradeNum")String tradeNum, 
 			@Param("payStatus")byte payStatus, @Param("payFlag")byte payFlag);
 	

+ 1 - 1
src/main/java/com/llisoft/pay/service/AliPayService.java

@@ -215,7 +215,7 @@ public class AliPayService {
 	private boolean checkSign(Map<String, String> map) {
 		boolean result = false;
 		try {
-			result = AlipaySignature.rsaCheckV2(map, publicKey, charset, signType);
+			result = AlipaySignature.rsaCheckV1(map, publicKey, charset, signType);
 		} catch (AlipayApiException exception) {
 			logger.error("支付宝签名验证异常: {}", exception);
 		}

+ 2 - 2
src/main/resources/application.yml

@@ -6,8 +6,8 @@ mta:
 alipay: #支付宝
   appid: 2017040506554054
   serverUrl: https://openapi.alipay.com/gateway.do
-  publicKey: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2IdPdE84wpC1Whnr7fKk7+qT24LKsIqO+66goAy0OP6zkPMfjti+Y9px9vBS2kEUavk7/D097t3r+JmdiyBu4QaBCxWMO7OEc6ysPT1ulXmKrKm/SaEJCcwm2xUpCMRS1fgiiAj5FKibtOP8EOgh9iHwQZQbqBlB/VPxzPxGUEsEIhYMk6myirCq7sFQ7CecgS/anmYwOzcJTpJN+4ErcfLyZ5w+W/a/bV9+C70yKD0eGd2fMwNGIcF56Z0oIs+w55t8nzh3O0CZhnMsfjfGtD7BfwdIBsNuouSb9odtUODGs2W9f1hcaY7f6amr8+ljLLnJBQjkOwJsFz4fQw03SwIDAQAB
-  privateKey: MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCJ4u4FBfriCF4LzN00JPcmAfRXoTY5Oro/yWdSUC558uD/xCCd7+2PO92cQ+CrndLJyEPWtCc5au0GUBA1W8edDdIli12P/q4xv2TaDmHTG+uok3/Sje4Rv0eXuHl/YfHr5iy+c0kTVWDW5ZV/2h0FMMo6AOG+u9RrkalZ5Srdl1mzlf290iaJ/3ZRHhLjGvd5ZK7OqwQbSAGJnb8u91nZztH8+JXSwdDJ/FEfRmFzB/ON5ioWQ+0WI9x+7gUudDPiLsJ2sN/P4IU+0cl2tl9Lm+H3Xxb6OddA+xI3epI2fnz85DLv5BRtT+O5OsIPvzHdmbLVSki4Htbd7MyELbqNAgMBAAECggEAYJTspeYfak30Gg3gb5Lo7t11mh/YzFNffCiFz7lMJK1EfsKRGi+h1a9YNgmxiGQe7qnxIqXDx8smxUI1aDqmYlL4/MVWvvLkbwIiET77tJSdB9JxOTmjJRk3e4WCzP/9JYBvnONBr2IhV8UuZ4SOyUD4lZJijWghjUtVNRt5YAaJYIT+jLtscA4c7NpkuChK+kRllyLdQetvaaT2QHGZ15DJOaVo5A/6n5LkhbP7jCx5ACzWmLqiMuCZd0POJP6GtMdtrqwdpG22ROlaap8bSIOJkEgyCjUiE9/w3Rojq5A3fQ0GOtcucThBmYmY+toKdFefoqQ0vzlIA4CXykJdwQKBgQC83pHOK1kHCgy8eGxqRTFj8qX3gjpbi2jO96IrJfOpgigMkaomPPvvDZmLDRtdhJ+vJi/5dBSBYF46B1ZKvsL/9zKYoVuFG27x5Fp2rx/0/YNfoUrrIj6ZpdL3YJX82AYjMRa5Ynmu69HT2Ye6TTPP0moQbTGeD5zsPlrPC9V0kQKBgQC65V2CDEqeIjSrw/DwtEfWzQsP8u/AAf7xrGAVLz5mK7915em2I6bCgMo7lg+BAWKC09WVKvE1BCMtR0Y7sHwKnWrew6xLOfRLwujHur87XihhTPksKMgg11t+8+XBf9eIwC71zBcZz4HOFKY6lAXyXhErOBwEHijh8ncNiCu0PQKBgB62Tp1o/Rwg7TtEldSeFc776TMbUSQLwmpNaGh9zmaVDLAmi7WWGx2fZ4VuBzIo29KechStZJw5MHldMhILfSgkaWzaaEh30o2xJWjBR4AOLWvCja04r1dK2MhzQ1CPTEgytlBFDCZ+oGtDp0eLQE6eF7M+HmBmh4z/AsNCWF6RAoGBAK1TyBuyoIT1PhnKFyp0V2eLM2YwLE7KyxCAh38+GEWS7vY9Kjkj6STbYjJOocRHb3/bS2oSsC41zxXP0v/KVc9WXGWJ3MDLV5fnhBCvTWiWkyZhx3g/vhJPB2i+cua4VEBb03FbPFVQj5Z6qgsLelRjDtMhL0JWYh3hyq1/CuEVAoGAVhTb1R8mDhnG0ft3Ll8lL1qiLcK0xw4MH1MAM2kgG+xYZGKCDVRQMyX0h3bSvwT0skALfXagPcjF0S7zVB56ImTtUBSqlXVogr71lwu7FuOY43JSfCeRTyWl6N43Wu7LKzGJBiZCoR1kLgRYuSWzW5UJ3zxBUaIm7UdYUnZPSSs=
+  publicKey: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0ZsJ44iDOtJ2vJnoIL970l3a9xJXiRtLWJWlUyhFz8zIlkNb0A/oMSWWpkUs7B2ryUTKmItmRqg8em4diQTcE5b0fpYIFntg+ThLN4Jbt3+CK05tCKIKfuCkDSaIkr8PP+vCZyHlpw5MBdBpX4sG9lDsPh3E48qXeh9vvLUeqF2n+Pok9FHHzEUcrCtVWp5eHL34a/HnJbTzb4t25b9FqQmhYK/vI2CUN3aI+rmthzqJFrmxsTFkR5rTvcMyVzOze6EoDgzBFShJnrfVD4efbqhc1+afmrKj+VAp8Uxpj8HCzTvuBDuB2yg/rgTt2y3u9HZT67NM18Butk/XgmIUlQIDAQAB
+  privateKey: MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCQuhGz/rYmk0vLVlRkE5P4lyfhtWQPT/7jG8PryBHdXyPubUBWzX0oIURMyfcJX5em+/zdMM22ph22q4qZW5lcMFbsN1BjIAgxfssY/yfG9rcvGTAK8zkUWakd0MTRwg+zuEwtr4Fc6DJm4ZOhcS+nAwKWT4vwmYS2QELQ351ibuyYlW/7ixl4Mvr7/WF2uBBrDTq9TMamzHw2PUFGygDy7bmMzTAG38j+5Dki/MT/BumUJdimxBqo4MEZ4+moNTMedBtR4xSaKEv1Vrs1OUuRk2I4Fv2lS/nWZzKpfkvgCFhi9vrRzfTjGPOVg2AljmufxzKyFrutUEY2yBJYUGd5AgMBAAECggEBAIrjVcvjm5BneKxZW8FynGVLQgW0GqMrRNNUOO/T33kPLZ9JDx5+MybIzg/XHhDLwPCKEL+Ab1piDk/YTbkgk4tKBJDKAIYwHkzJfkSt0NF6wI8dX+KSSWvDI62uRMN7ta/mJI0PSVkMqBndTtz2jyF6nQf8rLIn0ZlJEBX9Er97eH5ExhMLC8CtUJdDlJCe9sLdQsEcDnaHs+y9N0v9cre0xzmwV6DMeA+jx0byM35e9qLYYpxHWeCio7sQjbS2bm86FPDpJ1EUnNuTGg4ksbKn4UCp7zCR+AmHriqoMS/LoLVhXApod6rM2zNnzJBxTQhOSVN4P1bhNWcYHPsgvwECgYEA3tsCRnddcYnKCjK9DKCjhdv7RnZSArLpE27Wyi3FvOp7WBLktTg5TTKn8wW4C6Hc3hHYiOBhGc8rDMx5MJGvgRYHScDT/ADm9jzjNkhVBy9U9tWbjQUU5T9B1Pmq+DpyNv+wSVmMko3gjnAB7xh6teoHmkiftc8KnvGYDXNA/lkCgYEApkBkfEXBDeiFD9lfm+zQvCEDsWxlPrKLoRALUQW2Nn15Fs1+41a3Jwf6OUgN+rptdX/CBkoKQnxbZIo6Qv4CfD5v75TzLBQjEEEUIXv+9RlXLAbQ3sXk7dWElxtNlxPD0p8Q6MVuqsTLzgkknsXgxVRnQ9aMqXcoiWFKp9HkziECgYBe15ABUz1mW4CrlGpWXGsbRcKLe0Ftupxs08f/ZTl5K8VwdyH0acghLYTCbVWlRa6Mp8WigvNwG3WzzbVp0SaC5lAVuEW/QtcIRmNgL6pYE3GyVrgLbPU2lxQ6QkLbv2vqMijhHoYvvMerdsmr6pwWnVG8/FlT85gOirzuRHWNiQKBgB9s5JGpDcj3Ps+0IyJyLTKievQ6rRig30veoIT8M2kxZoYs6eNHLO+vzlitihbuzmn7cE2ICVBv+UaT6ldndEjP9JCw8xZN6CLWalu5+IOT+qpTz3+MoK1kQt/dRVldXxKdBrE5QKX+9RdJGyb3+HjUb4CfOY9++qadQWNfhYSBAoGBANIm9fnERbTS2pu76KrcA0EryFG0+Ch01RsdbiXVYm8chuFFry/z3vEqVN8oLi+ciVe+jz74NxzOaQSe8rPKK3oWom9R496Eft0dRO4pCT4x9fxyUY3SFMmiMBHCWuDDyZ86xvjWdTGm119rlt3K+7EAmXEvxPdXj35AGibNLFkP
 wxpay: #微信支付
   mchid: 1570392471 #商户号
   mchkey: 1q2w3e4r5t6y7u8i9o0pPOIUYTREWQAS