modify

Helius

2020-06-17 68549a377307cc97e912944d7217c25b195448c6

 src/main/java/com/xcong/excoin/common/system/controller/CommonController.java

@@ -1,20 +1,23 @@
package com.xcong.excoin.common.system.controller;

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.dto.Base64UploadDto;
import com.xcong.excoin.common.system.service.CommonService;
import com.xcong.excoin.configurations.properties.AliOssProperties;
import com.xcong.excoin.utils.OssUtils;
import com.xcong.excoin.utils.RedisUtils;
import com.xcong.excoin.utils.SmsUtils;
import com.xcong.excoin.utils.mail.SmsSend;
import com.xcong.excoin.utils.mail.SubMailSend;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import java.util.HashMap;
@@ -40,6 +43,9 @@
    @Resource
    private CommonService commonservice;

    @Resource
    private AliOssProperties aliOssProperties;

    @ApiOperation(value = "获取验证码接口", notes = "获取验证码通用接口")
    @GetMapping(value = "/verifyCode")
    public Result verifyCode(@ApiParam(name = "account", value = "手机号或邮箱", required = true) @RequestParam(value = "account") String account,
@@ -53,8 +59,8 @@

        // 发送手机验证码
        if (AppContants.ACCOUNT_TYPE_MOBILE.equals(type)) {
            Map<String, Object> result = SmsUtils.sendVerifyCode(account, code);
            if (SUCCESS.equals(result.get("resultstatus"))) {
            boolean result = SmsSend.sendVerifyCode(account, code.toString(), 2);
            if (result) {
                Map<String, Object> map = new HashMap<>();
                boolean flag = redisUtils.set(AppContants.VERIFY_CODE_PREFIX + account, code, 120);
                map.put("code", flag);
@@ -62,9 +68,13 @@
            }
            // 发送邮件验证码
        } else if (AppContants.ACCOUNT_TYPE_EMAIL.equals(type)) {
            SubMailSend.sendMail(account, code.toString());
            redisUtils.set(AppContants.VERIFY_CODE_PREFIX + account, code, 120);
            return Result.ok("success");
            boolean flag = SubMailSend.sendMail(account, code.toString());
            if (flag) {
                redisUtils.set(AppContants.VERIFY_CODE_PREFIX + account, code, 120);
                return Result.ok("success");
            } else {
                return Result.fail("发送失败");
            }
        } else {
            log.info("未定义账号类型");
            return Result.fail("fail");
@@ -84,8 +94,15 @@
    }

    @ApiOperation(value = "文件上次接口", notes = "文件上传")
    @GetMapping(value = "/uploadFile")
    public Result uploadFile() {
        return null;
    @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;
            return Result.ok("success", url);
        }
        return Result.fail("上传失败");
    }
}