Compare commits

..

No commits in common. "40b92f25cd9ccdf07d714001376dc425c15e31e3" and "e30e18e2a64534e7c962f8e0ae88b282c8bef1ec" have entirely different histories.

4 changed files with 28 additions and 9 deletions

View File

@ -11,8 +11,7 @@ import org.springframework.scheduling.annotation.EnableScheduling;
public class AliveApiApplication { public class AliveApiApplication {
public static void main(String[] args) { public static void main(String[] args) {
SpringApplication.run(AliveApiApplication.class, args); SpringApplication.run(AliveApiApplication.class, args);
log.info("--------------ALIVE项目启动完成-------------------"); log.info("--------------ALIVE项目启动完成11-------------------");
} }
} }

View File

@ -1,14 +1,27 @@
package com.alive.server.api; package com.alive.server.api;
import com.alive.db.entity.Vo.RecommendVo;
import com.alive.server.config.TwitterConfig;
import com.alive.server.oss.AliyunOssUtils; import com.alive.server.oss.AliyunOssUtils;
import com.alive.server.oss.MultipartFileToFileUtil;
import com.alive.server.service.TwitterService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Isolation; import org.springframework.transaction.annotation.Isolation;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import java.io.BufferedReader;
import java.io.File; import java.io.File;
import java.io.InputStreamReader;
import java.net.HttpURLConnection;
import java.net.URL;
import java.net.URLEncoder;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.Base64;
import java.util.Date; import java.util.Date;
import java.util.UUID; import java.util.UUID;
@ -25,9 +38,14 @@ import java.util.UUID;
@Transactional(isolation = Isolation.READ_COMMITTED) @Transactional(isolation = Isolation.READ_COMMITTED)
public class TestController public class TestController
{ {
@Autowired
private TwitterService twitterService;
/** /**
* 上传文件阿里OSS * 上传文件阿里OSS
*
* @param file 文件对象
* @return * @return
*/ */
@ApiOperation("上传文件") @ApiOperation("上传文件")

View File

@ -291,13 +291,8 @@ public class CrowdfundingService extends BaseComponent {
try { try {
send = this.getBscWsWeb3j().ethGetLogs(filter).send(); send = this.getBscWsWeb3j().ethGetLogs(filter).send();
} catch (IOException e) { } catch (IOException e) {
String msg = e.getMessage(); e.printStackTrace();
if(msg.equals("timeout")){ throw new RuntimeException(e.getMessage());
log.error("节点读取超时------------------");
}else{
e.printStackTrace();
throw new RuntimeException(e.getMessage());
}
} }
if(send.getError() != null && send.getError().getMessage() != null){ if(send.getError() != null && send.getError().getMessage() != null){
log.info("扫描块失败(检查节点是否被限制) out {} ,{}, {}", startBlock, endBlock, send.getError().getMessage()); log.info("扫描块失败(检查节点是否被限制) out {} ,{}, {}", startBlock, endBlock, send.getError().getMessage());

View File

@ -50,6 +50,13 @@ public class NodeSettingService extends BaseComponent {
@Autowired @Autowired
private DSLContext dslContext; private DSLContext dslContext;
@Resource
private MemberService tMemberService;
@Autowired
private Web3jServer web3jServer;
public boolean buyNode() { public boolean buyNode() {
int memberId = Integer.parseInt(RequestUtil.getCurrentAccount()); int memberId = Integer.parseInt(RequestUtil.getCurrentAccount());
Integer code = dslContext.selectCount().from(NODE_BUY_LOG).where(NODE_BUY_LOG.USER_ID.eq(memberId).and(NODE_BUY_LOG.STATUS.eq(3))).fetchAnyInto(Integer.class); Integer code = dslContext.selectCount().from(NODE_BUY_LOG).where(NODE_BUY_LOG.USER_ID.eq(memberId).and(NODE_BUY_LOG.STATUS.eq(3))).fetchAnyInto(Integer.class);