From 2c8306d7104747b18bcd8dff0208c30b942afceb Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 21 Jun 2021 11:50:28 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/common/system/controller/CommonController.java | 99 +++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 91 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/common/system/controller/CommonController.java b/src/main/java/com/xcong/excoin/common/system/controller/CommonController.java
index 02a2aa9..e14f37f 100644
--- a/src/main/java/com/xcong/excoin/common/system/controller/CommonController.java
+++ b/src/main/java/com/xcong/excoin/common/system/controller/CommonController.java
@@ -1,26 +1,42 @@
package com.xcong.excoin.common.system.controller;
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.StrUtil;
import com.xcong.excoin.common.contants.AppContants;
import com.xcong.excoin.common.response.Result;
+import com.xcong.excoin.common.system.bean.SysExceptionDetailEntity;
import com.xcong.excoin.common.system.dto.Base64UploadDto;
+import com.xcong.excoin.common.system.dto.Base64UploadFilesDto;
import com.xcong.excoin.common.system.service.CommonService;
+import com.xcong.excoin.common.system.vo.Base64UploadFilesVo;
import com.xcong.excoin.configurations.properties.AliOssProperties;
-import com.xcong.excoin.utils.MessageSourceUtils;
-import com.xcong.excoin.utils.OssUtils;
-import com.xcong.excoin.utils.RedisUtils;
-import com.xcong.excoin.utils.SmsUtils;
+import com.xcong.excoin.modules.blackchain.service.TrxUsdtUpdateService;
+import com.xcong.excoin.modules.platform.dao.SysExceptionDetailDao;
+import com.xcong.excoin.utils.*;
+import com.xcong.excoin.utils.mail.Sms106Send;
import com.xcong.excoin.utils.mail.SmsSend;
import com.xcong.excoin.utils.mail.SubMailSend;
+import com.xcong.excoin.utils.mail.ZzSmsSend;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import lombok.extern.slf4j.Slf4j;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import java.io.File;
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.text.DateFormat;
+import java.util.ArrayList;
+import java.util.Date;
import java.util.HashMap;
import java.util.Map;
@@ -47,6 +63,12 @@
@Resource
private AliOssProperties aliOssProperties;
+ @Value("${file.storage.path}")
+ private String filePath;
+
+ @Value("${file.storage.url}")
+ private String fileUrl;
+
@ApiOperation(value = "获取验证码接口", notes = "获取验证码通用接口")
@GetMapping(value = "/verifyCode")
public Result verifyCode(@ApiParam(name = "account", value = "手机号或邮箱", required = true) @RequestParam(value = "account") String account,
@@ -60,7 +82,7 @@
// 发送手机验证码
if (AppContants.ACCOUNT_TYPE_MOBILE.equals(type)) {
- boolean result = SmsSend.sendVerifyCode(account, code.toString(), 2);
+ boolean result = ZzSmsSend.sendVerifyCode(account, code.toString(), 2);
if (result) {
Map<String, Object> map = new HashMap<>();
boolean flag = redisUtils.set(AppContants.VERIFY_CODE_PREFIX + account, code, 120);
@@ -97,13 +119,74 @@
@ApiOperation(value = "文件上次接口", notes = "文件上传")
@PostMapping(value = "/uploadFileBase64")
public Result uploadFileBase64(@RequestBody @Validated Base64UploadDto uploadDto) {
- String imageName = "uploadeFile/image/" + System.currentTimeMillis() + IdUtil.simpleUUID() + AppContants.UPLOAD_IMAGE_SUFFIX;
+// String imageName = "uploadeFile/image/" + System.currentTimeMillis() + IdUtil.simpleUUID() + AppContants.UPLOAD_IMAGE_SUFFIX;
+// boolean flag = OssUtils.uploadFileWithBase64(uploadDto.base64Str, imageName);
- boolean flag = OssUtils.uploadFileWithBase64(uploadDto.base64Str, imageName);
+ String dateStr = DateUtil.format(new Date(), "yyyyMMdd");
+ String imagesPath = filePath + "/" + dateStr;
+ File pathFile = new File(imagesPath);
+
+ if (!pathFile.exists()) {
+ pathFile.mkdirs();
+ }
+
+ String imageName = System.currentTimeMillis() + IdUtil.simpleUUID() + AppContants.UPLOAD_IMAGE_SUFFIX;
+
+ boolean flag = ImageUtils.base64ToImg(uploadDto.base64Str, imagesPath + "/" + imageName);
if (flag) {
- String url = aliOssProperties.getBucketName() + "/" + imageName;
+// String url = aliOssProperties.getBucketName() + "/" + imageName;
+ String url = fileUrl + dateStr + imageName;
return Result.ok(MessageSourceUtils.getString("result_success_msg"), url);
}
return Result.fail(MessageSourceUtils.getString("uploadFile_controller_0001"));
}
+
+ @ApiOperation(value = "多文件上次接口", notes = "多文件上次接口")
+ @PostMapping(value = "/uploadFilesBase64")
+ public Result uploadFilesBase64(@RequestBody @Validated Base64UploadFilesDto uploadDtos) {
+ Base64UploadFilesVo base64UploadFilesVo = new Base64UploadFilesVo();
+ ArrayList<String> urls = new ArrayList<>();
+ if(CollUtil.isNotEmpty(uploadDtos.getBase64Str())){
+ for(String uploadDto : uploadDtos.getBase64Str()){
+ String imageName = "uploadeFile/image/" + System.currentTimeMillis() + IdUtil.simpleUUID() + AppContants.UPLOAD_IMAGE_SUFFIX;
+ boolean flag = OssUtils.uploadFileWithBase64(uploadDto, imageName);
+ if (flag) {
+ String url = aliOssProperties.getBucketName() + "/" + imageName;
+ urls.add(url);
+ }else{
+ return Result.fail(MessageSourceUtils.getString("uploadFile_controller_0001"));
+ }
+ }
+ base64UploadFilesVo.setUrls(urls);
+ }
+ return Result.ok(MessageSourceUtils.getString("result_success_msg"), base64UploadFilesVo);
+ }
+
+ @Autowired
+ private TrxUsdtUpdateService trxUsdtUpdateService;
+
+ @ApiOperation(value = "trc20测试")
+ @Transactional(rollbackFor = Exception.class)
+ @GetMapping(value = "/getTrc20Test")
+ public Result getTrc20Test() {
+ long start = System.currentTimeMillis();
+ System.out.println(start);
+ long getnowblock = trxUsdtUpdateService.getnowblock();
+ System.out.println(System.currentTimeMillis());
+ Object trc20BlockNum = redisUtils.get("USDT_TRC20_BLOCK_NUM");
+ TrxUsdtUpdateService.getblockbynum(BigInteger.valueOf(Long.parseLong(trc20BlockNum.toString())));
+ long end = System.currentTimeMillis();
+ System.out.println(end);
+ BigDecimal.ONE.divide(BigDecimal.ZERO);
+ return Result.ok(end - start);
+ }
+
+ @Autowired
+ private SysExceptionDetailDao sysExceptionDetailDao;
+
+ @GetMapping(value = "/getExceptionMsg")
+ public Result getExceptionMsg(@RequestParam(value = "id") Long id) {
+ SysExceptionDetailEntity sysExceptionDetailEntity = sysExceptionDetailDao.selectById(id);
+ return Result.ok(sysExceptionDetailEntity);
+ }
}
--
Gitblit v1.9.1