From c4dfc206abce25a40dde51a4aae021424be4b524 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期一, 17 十月 2022 13:31:01 +0800
Subject: [PATCH] 修改小程序登录重复注册 bug
---
flower_city/src/main/java/com/dg/core/controller/CommonController.java | 26 ++++++++++++++++++++++++--
1 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/flower_city/src/main/java/com/dg/core/controller/CommonController.java b/flower_city/src/main/java/com/dg/core/controller/CommonController.java
index 041670a..e3b0ba8 100644
--- a/flower_city/src/main/java/com/dg/core/controller/CommonController.java
+++ b/flower_city/src/main/java/com/dg/core/controller/CommonController.java
@@ -1,11 +1,14 @@
package com.dg.core.controller;
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
import com.dg.core.CorsConfig;
import com.dg.core.ResultData;
import com.dg.core.db.gen.AjaxResult;
import com.dg.core.file.FtpConstants;
import com.dg.core.file.MimeTypeUtils;
import com.dg.core.file.SFTPUtil;
+import com.dg.core.util.TestDate;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -17,6 +20,7 @@
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
+import javax.annotation.Resource;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.List;
@@ -34,6 +38,7 @@
@Autowired
private CorsConfig corsConfig;
+
// FTP 登录用户名
@@ -127,13 +132,30 @@
return ResultData.error("上传文件失败 "+e.getMessage());
}
-
// AjaxResult ajax = new AjaxResult();
// ajax.put("urls", StringUtils.join(urls, FILE_DELIMETER));
// ajax.put("fileNames", StringUtils.join(fileNames, FILE_DELIMETER));
// ajax.put("originalFilenames", StringUtils.join(originalFilenames, FILE_DELIMETER));
+ }
-
+ /**
+ * 通用上传请求（多个）
+ */
+ @ApiOperation("判断当前时间是否是工作日,格式为“2022-10-16”,不传默认为今天")
+ @GetMapping("/isWeekday")
+ public ResultData isWeekday(@RequestParam(value = "dateTime",required = false) String dateTime)
+ {
+ TestDate td=new TestDate();
+ DateTime dateTimeUser;
+ if (dateTime==null)
+ dateTimeUser=DateTime.now();
+ else{
+ dateTimeUser=DateUtil.parse(dateTime);
+ }
+ if (td.isWeekday(dateTimeUser))
+ return success("工作日");
+ else
+ return success("休息日或者周末");
}
--
Gitblit v1.7.1