From f09fa3541ad18c00f30707f592f16d18a0537f77 Mon Sep 17 00:00:00 2001
From: manailin <261030956@qq.com>
Date: 星期二, 17 八月 2021 21:54:51 +0800
Subject: [PATCH] [新增]添加监控依赖包
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommonApi.java | 64 +++++++++++++++++++++++++------
1 files changed, 51 insertions(+), 13 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommonApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommonApi.java
index e1cb5bb..8c4ba82 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommonApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommonApi.java
@@ -1,20 +1,20 @@
package com.panzhihua.applets.api;
import cn.binarywang.wx.miniapp.api.WxMaSecCheckService;
-import com.netflix.discovery.converters.Auto;
+import com.alibaba.fastjson.JSON;
import com.panzhihua.applets.config.WxMaConfiguration;
+import com.panzhihua.common.constants.Constants;
import com.panzhihua.common.constants.FtpConstants;
import com.panzhihua.common.constants.UserConstants;
import com.panzhihua.common.model.vos.R;
-import com.panzhihua.common.model.vos.area.AreaInfoVo;
+import com.panzhihua.common.model.vos.community.WeatherVO;
import com.panzhihua.common.model.vos.user.UserPhoneVO;
import com.panzhihua.common.service.community.CommunityService;
-import com.panzhihua.common.service.user.UserService;
+import com.panzhihua.common.utlis.HttpUtils;
import com.panzhihua.common.utlis.SFTPUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
-import me.chanjar.weixin.common.error.WxErrorException;
import org.apache.commons.lang3.RandomUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.redis.core.StringRedisTemplate;
@@ -28,10 +28,12 @@
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
+import java.util.Arrays;
import java.util.Base64;
import java.util.List;
import java.util.UUID;
import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
/**
* @program: springcloud_k8s_panzhihuazhihuishequ
@@ -61,37 +63,63 @@
@Value("${ftp.url}")
private String url;
+ /**
+ * 允许的图片文件后缀
+ */
+ private static List<String> fileExtensionAllow = Arrays.asList("gif", "jpg", "png", "jpeg");
+ /**
+ * 允许的视频文件后缀
+ */
+ private static List<String> videoExtensionAllow = Arrays.asList("mp4", "mov");
+
@Resource
private WxMaConfiguration wxMaConfiguration;
@Resource
private CommunityService communityService;
- @ApiOperation(value = "上传照片")
+ @ApiOperation(value = "上传照片/视频 (jpg/jpeg/png/mp4/mov)")
@PostMapping(value = "uploadimage", consumes = "multipart/*", headers = "content-type=multipart/form-date")
public R uploadImage(@RequestParam MultipartFile file, HttpServletRequest request) throws IOException {
// 微信图片内容校验
WxMaSecCheckService wxMaSecCheckService = wxMaConfiguration.getMaService().getSecCheckService();
String property = System.getProperty("user.dir");
- String fileName = property + File.separator + UUID.randomUUID().toString().replace("-", "") + ".jpg";
+
+ String fileExtension = ".jpg";
+
+ String originName = file.getOriginalFilename();
+ AtomicBoolean isVideo = new AtomicBoolean(false);
+ videoExtensionAllow.forEach(ext ->{
+ String originNameLowerCase = originName.toLowerCase();
+ if(originNameLowerCase.endsWith("." +ext)){
+ isVideo.set(true);
+ }
+ });
+ if(isVideo.get()){
+ fileExtension = ".mp4";
+ }
+
+
+ String fileName = property + File.separator + UUID.randomUUID().toString().replace("-", "") + fileExtension;
File file1 = new File(fileName);
String name = file.getOriginalFilename();
- name = UUID.randomUUID().toString().replaceAll("-", "") + ".jpg";
+ name = UUID.randomUUID().toString().replaceAll("-", "") + fileExtension;
try {
SFTPUtil sftp = new SFTPUtil(userName, password, host, port);
sftp.login();
InputStream is = file.getInputStream();
file.transferTo(file1);
try {
- boolean b = wxMaSecCheckService.checkImage(file1);
+// boolean b = wxMaSecCheckService.checkImage(file1);
boolean delete = file1.delete();
log.info("临时文件删除【{}】", delete);
- if (!b) {
- return R.fail("图片内容违规");
- }
- } catch (WxErrorException e) {
+// if (!b) {
+// return R.fail("图片内容违规");
+// }
+ } catch (Exception e) {
log.error("微信审核图片出错【{}】", e.getMessage());
- e.printStackTrace();
+ return R.fail("图片上传失败");
+// e.printStackTrace();
}
sftp.uploadMore(FtpConstants.FTPFILEPATH_IDCARD, name, is);
sftp.logout();
@@ -117,6 +145,16 @@
return R.ok(nextInt);
}
+ @ApiOperation(value = "获取天气",response = WeatherVO.class)
+ @GetMapping(value = "/getWeather/noToken")
+ public R getWeather(){
+ //获取请求url
+ String url = Constants.G_D_WEATHER_URL;
+ //获取请求参数
+ String param = "key=" + Constants.G_D_WEATHER_KEY + "&city=510400";
+ String result = HttpUtils.sendGet(url,param);
+ return R.ok(JSON.parseObject(result));
+ }
public static void main(String[] args) {
// int nextInt = RandomUtils.nextInt(99999, 1000000);
--
Gitblit v1.7.1