From 3abb261e5a10b11b20f4bc1712a524be9cbc82f1 Mon Sep 17 00:00:00 2001
From: DESKTOP-71BH0QO\L、ming <172680469@qq.com>
Date: 星期五, 26 三月 2021 10:08:17 +0800
Subject: [PATCH] Add:新增街道管理相关接口

---
 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommonApi.java |   44 ++++++++++++++++++++++++++------------------
 1 files changed, 26 insertions(+), 18 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 15184ca..e1cb5bb 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,11 +1,15 @@
 package com.panzhihua.applets.api;
 
 import cn.binarywang.wx.miniapp.api.WxMaSecCheckService;
+import com.netflix.discovery.converters.Auto;
 import com.panzhihua.applets.config.WxMaConfiguration;
 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.user.UserPhoneVO;
+import com.panzhihua.common.service.community.CommunityService;
+import com.panzhihua.common.service.user.UserService;
 import com.panzhihua.common.utlis.SFTPUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -25,6 +29,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.Base64;
+import java.util.List;
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 
@@ -58,37 +63,39 @@
 
     @Resource
     private WxMaConfiguration wxMaConfiguration;
+    @Resource
+    private CommunityService communityService;
 
     @ApiOperation(value = "上传照片")
-    @PostMapping(value = "uploadimage",consumes = "multipart/*",headers = "content-type=multipart/form-date")
+    @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();
+        WxMaSecCheckService wxMaSecCheckService = wxMaConfiguration.getMaService().getSecCheckService();
         String property = System.getProperty("user.dir");
-        String fileName = property + File.separator + UUID.randomUUID().toString().replace("-", "")+".jpg";
-        File file1=new File(fileName);
+        String fileName = property + File.separator + UUID.randomUUID().toString().replace("-", "") + ".jpg";
+        File file1 = new File(fileName);
 
         String name = file.getOriginalFilename();
-        name= UUID.randomUUID().toString().replaceAll("-","")+".jpg";
+        name = UUID.randomUUID().toString().replaceAll("-", "") + ".jpg";
         try {
-            SFTPUtil sftp = new SFTPUtil(userName,password,host,port);
+            SFTPUtil sftp = new SFTPUtil(userName, password, host, port);
             sftp.login();
             InputStream is = file.getInputStream();
             file.transferTo(file1);
-        try {
-            boolean b = wxMaSecCheckService.checkImage(file1);
-            boolean delete = file1.delete();
-            log.info("临时文件删除【{}】",delete);
-            if (!b) {
-                return R.fail("图片内容违规");
+            try {
+                boolean b = wxMaSecCheckService.checkImage(file1);
+                boolean delete = file1.delete();
+                log.info("临时文件删除【{}】", delete);
+                if (!b) {
+                    return R.fail("图片内容违规");
+                }
+            } catch (WxErrorException e) {
+                log.error("微信审核图片出错【{}】", e.getMessage());
+                e.printStackTrace();
             }
-        } catch (WxErrorException e) {
-            log.error("微信审核图片出错【{}】",e.getMessage());
-            e.printStackTrace();
-        }
             sftp.uploadMore(FtpConstants.FTPFILEPATH_IDCARD, name, is);
             sftp.logout();
-            return R.ok(url+"/idcard/" + name);
+            return R.ok(url + "/idcard/" + name);
         } catch (Exception e) {
             log.error("上传照片失败【{}】", e.getMessage());
             return R.fail();
@@ -106,10 +113,11 @@
         //todo 发送验证码接第三方
         int nextInt = RandomUtils.nextInt(99999, 1000000);
         ValueOperations<String, String> valueOperations = stringRedisTemplate.opsForValue();
-        valueOperations.set(UserConstants.PHONE_PUT+newPhone,nextInt+"",3, TimeUnit.MINUTES);
+        valueOperations.set(UserConstants.PHONE_PUT + newPhone, nextInt + "", 3, TimeUnit.MINUTES);
         return R.ok(nextInt);
     }
 
+
     public static void main(String[] args) {
 //        int nextInt = RandomUtils.nextInt(99999, 1000000);
 //        System.out.println(nextInt);

--
Gitblit v1.7.1