修改

pay.sql

@@ -0,0 +1,44 @@
+CREATE TABLE `mta_pay_app` (
+  `app_id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'ID',
+  `app_key` varchar(255) NOT NULL COMMENT '业务唯一标识',
+  `app_name` varchar(255) NOT NULL COMMENT '业务名称, 在第三方支付页面显示',
+  `notify_url` varchar(255) DEFAULT NULL COMMENT '支付成功后异步通知地址(post/可选)',
+  `return_url` varchar(255) DEFAULT NULL COMMENT '支付成功后同步回调地址(get/可选)',
+  `debug` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否测试状态(测试中支付金额为1分)',
+  `create_time` datetime DEFAULT NULL COMMENT '创建时间',
+  `update_time` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
+  PRIMARY KEY (`app_id`),
+  UNIQUE KEY `app_key` (`app_key`)
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;
+
+
+CREATE TABLE `mta_pay_item` (
+  `pay_id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'ID',
+  `pay_num` varchar(255) NOT NULL COMMENT '支付号',
+  `pay_status` tinyint(4) NOT NULL DEFAULT '0' COMMENT '支付状态(1未支付/2已支付)',
+  `pay_money` int(11) NOT NULL DEFAULT '0' COMMENT '支付金额(分)',
+  `pay_type` tinyint(4) NOT NULL DEFAULT '0' COMMENT '支付类型(1支付宝/2微信)',
+  `pay_flag` tinyint(4) NOT NULL DEFAULT '0' COMMENT '支付成功标记(1异步通知/2同步回调/3主动查询/4对账)',
+  `trade_num` varchar(255) DEFAULT NULL COMMENT '第三方交易号(由第三方通知返回)',
+  `order_id` int(11) NOT NULL DEFAULT '0' COMMENT '订单ID',
+  `pay_time` datetime DEFAULT NULL COMMENT '支付时间',
+  `create_time` datetime DEFAULT NULL COMMENT '创建时间',
+  `update_time` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
+  PRIMARY KEY (`pay_id`),
+  UNIQUE KEY `pay_num` (`pay_num`)
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;
+
+
+CREATE TABLE `mta_pay_order` (
+  `order_id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'ID',
+  `order_num` varchar(255) NOT NULL COMMENT '订单号',
+  `order_status` tinyint(4) NOT NULL DEFAULT '0' COMMENT '订单状态(1待付款/2已付款)',
+  `order_money` int(11) NOT NULL DEFAULT '0' COMMENT '订单金额(分)',
+  `order_title` varchar(255) DEFAULT NULL COMMENT '订单标题',
+  `app_id` int(11) NOT NULL DEFAULT '0' COMMENT '业务ID',
+  `pay_time` datetime DEFAULT NULL COMMENT '支付时间',
+  `create_time` datetime DEFAULT NULL COMMENT '创建时间',
+  `update_time` timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
+  PRIMARY KEY (`order_id`),
+  UNIQUE KEY `order_num` (`order_num`)
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;

src/main/java/com/llisoft/pay/service/AliPayService.java

@@ -36,13 +36,13 @@ public class AliPayService {
 	@Value("${mta.domain}")
 	private String domain;
 	
-	@Value("${mta.ali.appid}")
+	@Value("${alipay.appid}")
 	private String appid;
-	@Value("${mta.ali.serverUrl}")
+	@Value("${alipay.serverUrl}")
 	private String serverUrl;
-	@Value("${mta.ali.publicKey}")
+	@Value("${alipay.publicKey}")
 	private String publicKey;
-	@Value("${mta.ali.privateKey}")
+	@Value("${alipay.privateKey}")
 	private String privateKey;
 	
 	/** json（固定） */

src/main/java/com/llisoft/pay/service/WxPayService.java

@@ -34,14 +34,14 @@ public class WxPayService {
 	
 	@Value("${mta.domain}")
 	private String domain;
-	@Value("${mta.wx.appid}")
-	private String appid;
-	@Value("${mta.wx.secret}")
-	private String secret;
-	@Value("${mta.wx.mchid}")
+	@Value("${wxpay.mchid}")
 	private String mchid;
-	@Value("${mta.wx.mchkey}")
+	@Value("${wxpay.mchkey}")
 	private String mchkey;
+	@Value("${wxpay.appid}")
+	private String appid;
+	@Value("${wxpay.secret}")
+	private String secret;
 	
 	@Autowired
 	private PayService payService;

src/main/resources/application.yml

@@ -2,16 +2,17 @@
 mta: 
   debug: true #是否测试
   domain: http://localhost  #本工程域名(用于支付回调 需要在支付宝开放平台和微信商户平台配置)
-  ali: #支付宝
-    appid: 2016080300154811
-    serverUrl: https://openapi.alipaydev.com/gateway.do
-    publicKey: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuHV05fB6aafE1lMvFtU/eawP0s4uFa2zZThPFGx80l1JZNWaMfQoa8+Gu8reRc/PRnx1N9syTc/zeZYZUfstPn22y8qWPLYwqxyJH53knCj9263M8P6Q4n+MF7pUVUQbkn0FTlyo8eWZlpCOJe9MDTTIhPdIMlrDn31HiFZ8TY0pySh5tEZzhYIaaJjmvQUdQuCWMwdq9uzVtHu++QFmbHCApZbekJcQ1ebaGv76DOiGpPPtlH3mrSGqR/1z0uVwC5iRn5vuax/73a/OPvQGHOVTBq2QBiZHRf23DPO7SMuCpampEVaXIwIW2weCfNnvLCWMQ+v0dxpOVIUx1BlLjwIDAQAB
-    privateKey: MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQCZ2eFSd0f+SC3Djep7v3PwNludUmrPaiJNf6Wf3+5XVIVQGeomsFCIF1qS3hecj6x9k/JEayxQTDjMnwADZLMUcqsMm/OuOa+36kzSg/yFTs2Jq23GjjsHI6/g4ioj9inl9t4QfimBN6RczGzLWBUe1trhmNICFVJqbPomUgz19ey8uCaMbttIaHi8yNLTflFEHysl9LZSmNNBlz50MtLhIc77/UKbah2ot3xllHnVnvz0jXVTdMqIP//H4Oitcucy018EcMctgvdmFNG5VIste6yOmd+uox82QyFRRAngmw+66EpYHzmbwKpGHD0KKi/35ti4IGA+uoXxY50Xcm+tAgMBAAECggEACxvMRSQPsrCLfV812xGL0YBbRRS6WZeUOnxI/S4yC2Qy7AGzAnAgoHLvO0OF+Ov2zGpuR7plTLb0MvIYEianN4bACv0Hr0DDC0iDm3+kMAvsk1ApcPi8ElvlSxuJZ2dSxyP4DMDPRmE6IOkxwczuWXex/jAGmdfoR37u4O1zuh6Wu+JpKbYfTiwmhw0OAJBq1gm1wiTN9thDr1Qf4Ifr/k0Mv9TVnOWQLAg9qGGfQHEU/UtU92Rlp4S2WB2UMl8gpq0ZgC7brxeegS7OW2uv8LtTrdekhVzC62zyE+V47xQ1hukAv06Sw9+XgjI0fLHS3xxNCUOVWqwiOnhluJjHgQKBgQDinyhksk7pHKra9ryy03hGTPZt2LYGNCogfdIuG8ShNrXva6MV4TuGcgjcJUNed+w3QW/F9C/kRUP7VQvEL/j/1lfKy4FRWvui7Mr9LyouaTlANXyVc0KzoS3u3NIy5eKTOE0QrUNs7G4x16R84Gsx3GQOGUhmFi+WPhQ0SqkiiQKBgQCty7NoCjQ7g6DMIE7vcGuRAACAEZi0P9qLZvHmwujdJlyPctYX2/wcpT1bnn1FqyavSDKNrtSIIfa5GNCUzcv4ysBiYZlXNGDw4wleQ/ENG/DRj0A4AAOR3/bR5TaAY9QnFInuj2mlKvmQWuYvc6EnLDfo1OjuWc0bDkWpO6nrBQKBgQCzJ6OlR5k+jJ09kUXIEYnJ+dnvKR1tdhu/p/ha3zTpRfk6l1tMVszaEpiSgRrrOd8SJ7cXRV3/FgsSTD+LD2nHx0mMVqmbCVRZjt1CnuC35BOQgThGZeJbY5aOeR/rgPVH8YBrKK5fE+JhoNq2pivYNSUcSDyGCBACtH0Age2IEQKBgQCQMg1VSfoSUuDL3BaB9O1abfz8RR1EmCIUPUKBKsAYFKcBYc8eFqgzgCnLZVEcx6ceETHYefDeTgethVgxzhno/xflyIJ4Zv3zfvub2ZUbQk5pIIiwrdpIYuEfPyUcGze/gPv8EcMehexwB+sp/a78mGR+6n+kmp9hTlMf2V/enQKBgQDPH5exzUjktHYwlEhEsXOGCUh1gs7KI5d7FcWWubZiWgz3I2F4iVMW9yd1godxr0XUJMuWJqft0c0A/ayPDOCRwxvnxMDEB9qhA4hdfyBdUYKU4sDxn8NmT7/srMbSUyQIzbprA6UPg4Hh68nunvMwf/vX8VK4641y+W3rYYyDjw==
-  wx: #微信支付
-    appid: wx42fe30efc65cf74b
-    secret: ff241718fc4d61919f45734411aaa9f6
-    mchid: 1570392471
-    mchkey: 1q2w3e4r5t6y7u8i9o0pPOIUYTREWQAS
+
+alipay: #支付宝
+  appid: 2017020505526927
+  serverUrl: https://openapi.alipaydev.com/gateway.do
+  publicKey: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAkX1EyAw2LJSCzFcI33VIPy6YWi6jUbXjMrzo7aLExYu+yLoYeW/9RLdnKFk8jOaK0nxMP1eIWaYs4BRDQmXmSvbg4VFHHtWPY/fxjX/29GSamOciuXZj4ytw9OIUqhNylooeYQKGFR/6UW/BjZJ4oXlY2PDAD9Uh7H+dD10KrVT7Qj2/8l+UNV0rkQvnVSYm/Y5Wy60fcgYbiV3BcGmFArZOfeO0Cuz75vEEr5tCxn4dbrVKKwMoLoSIyJPB/rqR/0SGJAOTF4F5kUzRcS8QoCqfaUc3Po4vxb8Z6Dl8ZjPCQUTru3Ze9LeCJfdPzg58bI4SNYFkXMUY+rT+5UUMkwIDAQAB
+  privateKey: MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQCRfUTIDDYslILMVwjfdUg/LphaLqNRteMyvOjtosTFi77Iuhh5b/1Et2coWTyM5orSfEw/V4hZpizgFENCZeZK9uDhUUce1Y9j9/GNf/b0ZJqY5yK5dmPjK3D04hSqE3KWih5hAoYVH/pRb8GNkniheVjY8MAP1SHsf50PXQqtVPtCPb/yX5Q1XSuRC+dVJib9jlbLrR9yBhuJXcFwaYUCtk5947QK7Pvm8QSvm0LGfh1utUorAyguhIjIk8H+upH/RIYkA5MXgXmRTNFxLxCgKp9pRzc+ji/FvxnoOXxmM8JBROu7dl70t4Il90/ODnxsjhI1gWRcxRj6tP7lRQyTAgMBAAECggEAdKOGSg8oO3NQrXu1XFjNdAHqGJq9SpvUqu+ymhldQba4XHp9dpYm6TlUFY/9MET/1KHcCwglAyJrZbY4+flxuHXWci1UJE84Zv/3guatWN9y5dSgDSnyCMTiCSFbScLPogrXMhTw4+zAJRvAg7yCw4nihgH1KHxJdy4T/6YrEiwSdR7s166p6O9QIdVjh084mh9xslTM/l9YIe3j81W/TTGtDxKjc+dhnz0wP3iK076K1sQZ8ecyniZGTdEK48UH2ioz4m8QTNAQ6A1MSMqnLWKUA2y7y0j9ZnKZjr71iLIJv+gxEWAU8lnzDYk7i6X9mt0VFzJtgFoQG4hsONzMeQKBgQDKw+SZpT1ac9/vzyAP4Tz5cA+KmVXlTML0jIF+eAuh1cqsZmspbRvcPJbSkP5oiokKApQktLgUwk/9/4sLfcq2IRYgZZz6bB/Daa7aHzyYiN0Sfc3/ImjH/vsuaH8q00/u2rahEqSTRnKDTHI43CL2pKKFk++AoVuOogB1GEKNNwKBgQC3r8qVc7rymLnJf9WlaPQ+WdzG74D43o63NYGy/Den00JITfmPRtX72HNtcAqBCfcAo0kA/MU5Wj3EqfYNl/WYcp+BN03shNldNDOQ8OxzrSx/x2tJt/nNzpIkwyx470IBvzvIZLopubScMjXkuxQltTxtITqNtNEyu7WiwXtJhQKBgQCAwLlVMw7tc+z76wsR6lV8ksLboJhhfUfCX8IOm43PWuFSbcqYSJdLVxHybW2O1oFEYPTPBg5p6CVBRVZ2mo7w7buOINf4UFYvENmd2f3xYd73UflPi/r7HBdFlcdCW2JDapBTYXItrqsiYpWZM3fkJBCrP4/ynwNzY71knV4NKwKBgQCh2OnGL5esg/dHXTTRLx3uBl3qh0N7hRX4xdOG8obTf+hqLxJSNRb8deaWqd8HfdE+paEAlrfsZeAA9cSQi7FhZrW2NBWb7h5b6k/5SN7+ubp4yCx3YvxfY8EPVU1NLXtacLZrRp1lgHRsIC2uYUxKQVuByIKAM68UZaKQSqynxQKBgQCAL50a3uBlM4t3jq0gMx7jX/o1kZwL+jJ2NLXB/46et1hBs1tUnGGL3Y0bGrEX+5TDaHTO859td+XTlv99DW1gAwPgTO70AumsKzSCl1nGHLaNY8le49KH81dQLdKEM/UCrZvNuXIFv5TaindLvOlPFUtzjMQ62KflunxawHhiKg==
+wxpay: #微信支付
+  mchid: 1570392471 #商户号
+  mchkey: 1q2w3e4r5t6y7u8i9o0pPOIUYTREWQAS
+  appid: wxc61229f2ac6c068d
+  secret: 559eb6029da80950634a43f55dc453bd
   
 ##端口配置
 server.port: 8003 #监听端口
@@ -19,7 +20,7 @@ server.port: 8003 #监听端口
 ##数据源配置
 spring.datasource: 
   driverClassName: com.mysql.jdbc.Driver
-  url: jdbc:mysql://192.168.0.172:3306/mta_platform?useUnicode=true&characterEncoding=utf8&useSSL=false
+  url: jdbc:mysql://192.168.0.178:3306/mta_platform?useUnicode=true&characterEncoding=utf8&useSSL=false
   username: dkuser
   password: dkuser
   initialSize: 3        ##初始化连接数, 默认: 10
@@ -37,7 +38,7 @@ mybatis.configuration.mapUnderscoreToCamelCase: true #开启自动驼峰命名
 
 
 ##服务名称
-spring.application.name: mta-service-file #服务名称
+spring.application.name: mta-service-pay #服务名称
  
 ##注册中心配置
 eureka:
@@ -75,4 +76,4 @@ spring.mvc.throwExceptionIfNoHandlerFound: true #出现异常时直接抛出，
 ##日志配置
 logging: 
   level:
-    com.llisoft.service.file.dao: debug
+    com.llisoft: debug