|
|
@@ -42,14 +42,7 @@ import org.springframework.dao.DuplicateKeyException;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
import org.springframework.transaction.support.TransactionSynchronization;
|
|
|
import org.springframework.transaction.support.TransactionSynchronizationManager;
|
|
|
-import org.springframework.web.bind.annotation.GetMapping;
|
|
|
-import org.springframework.web.bind.annotation.ModelAttribute;
|
|
|
-import org.springframework.web.bind.annotation.PathVariable;
|
|
|
-import org.springframework.web.bind.annotation.PostMapping;
|
|
|
-import org.springframework.web.bind.annotation.RequestHeader;
|
|
|
-import org.springframework.web.bind.annotation.RequestMapping;
|
|
|
-import org.springframework.web.bind.annotation.RequestMethod;
|
|
|
-import org.springframework.web.bind.annotation.RestController;
|
|
|
+import org.springframework.web.bind.annotation.*;
|
|
|
|
|
|
import java.io.IOException;
|
|
|
import java.net.URLEncoder;
|
|
|
@@ -130,7 +123,7 @@ public class OmgPayController extends BaseController {
|
|
|
@PostMapping("/create")
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
public AjaxResult create(@RequestHeader String token,
|
|
|
- @Valid @ModelAttribute OmgOrderRequest request) {
|
|
|
+ @Valid @ModelAttribute @RequestBody OmgOrderRequest request) {
|
|
|
String orderid = request.getOrderid();
|
|
|
String userId;
|
|
|
try {
|
|
|
@@ -246,7 +239,7 @@ public class OmgPayController extends BaseController {
|
|
|
@Anonymous
|
|
|
@PostMapping(value = "/notify", produces = "text/plain;charset=UTF-8")
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
- public String notify(@ModelAttribute OmgCallbackRequest callback,
|
|
|
+ public String notify(@ModelAttribute @RequestBody OmgCallbackRequest callback,
|
|
|
@RequestHeader(value = "X-Forwarded-For", required = false) String forwardedFor) {
|
|
|
Map<String, String> form;
|
|
|
try {
|