From 5575818556096be1dadaf5ff356b5db4c832aaa2 Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Wed, 26 May 2021 19:27:09 +0800 Subject: [PATCH] modify --- src/main/java/com/xcong/excoin/common/system/controller/CommonController.java | 65 +++++++++++++++++++++++++++++++- 1 files changed, 63 insertions(+), 2 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..76f20e3 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,39 @@ package com.xcong.excoin.common.system.controller; +import cn.hutool.core.collection.CollUtil; 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.modules.platform.dao.SysExceptionDetailDao; 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.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.transaction.annotation.Transactional; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; +import java.math.BigDecimal; +import java.math.BigInteger; +import java.util.ArrayList; import java.util.HashMap; import java.util.Map; @@ -60,7 +73,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); @@ -98,7 +111,6 @@ @PostMapping(value = "/uploadFileBase64") public Result uploadFileBase64(@RequestBody @Validated Base64UploadDto uploadDto) { String imageName = "uploadeFile/image/" + System.currentTimeMillis() + IdUtil.simpleUUID() + AppContants.UPLOAD_IMAGE_SUFFIX; - boolean flag = OssUtils.uploadFileWithBase64(uploadDto.base64Str, imageName); if (flag) { String url = aliOssProperties.getBucketName() + "/" + imageName; @@ -106,4 +118,53 @@ } 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