配置公共属性

admin/src/main/java/com/huimv/farm/damsubsidy/common/utils/UploadImage.java

@@ -3,6 +3,7 @@ package com.huimv.farm.damsubsidy.common.utils;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.lang.UUID;
 import com.jcraft.jsch.*;
+import lombok.Data;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 import org.springframework.util.StringUtils;
@@ -20,17 +21,28 @@ import java.util.List;
 @Component
 public class UploadImage {
 
-    private static  String basePath = "/home/huimv/img/";
+    @Value("${img.basePath}")
+    private   String basePath;
 
-//    private static  String ip = "139.9.167.178";
-//    private static  String ip = "36.134.209.211";
-    private static  String ip = "192.168.0.13";
+    @Value("${img.ip}")
+    private    String ip ;
+//    private   String ip = "36.134.209.211";
+//    private   String ip = "192.168.0.13";
 
-    private static  String user = "huimv";
+    @Value("${img.user}")
+    private  String user ;
 
-    private static  String password = "!Hm537e@1";
+//    private   String password = "!Hm537e@1";
+
+    @Value("${img.password}")
+    private   String password ;
+
+    @Value("${img.port}")
+    public   Integer port ;
+
+    @Value("${img.url}")
+    public   String url ;
 
-    public static  Integer port = 22;
 
 
     /**
@@ -39,7 +51,7 @@ public class UploadImage {
      * @param fileName  文件名
      * @throws Exception
      */
-    public static void sshSftp(byte[] bytes,String path,String fileName) throws Exception{
+    public   void sshSftp(byte[] bytes,String path,String fileName) throws Exception{
 
         // 服务器保存路径
         String filepath = basePath +path ;
@@ -114,7 +126,7 @@ public class UploadImage {
     }
 
     //上传压缩的图片
-    public static String getImageCom(MultipartFile image) throws IOException {
+    public  String getImageCom(MultipartFile image) throws IOException {
         //获取文件输入流
         InputStream inputStream = image.getInputStream();
         String originalFilename = image.getOriginalFilename();
@@ -134,7 +146,7 @@ public class UploadImage {
             byte[] bytes = bos.toByteArray();
             String imgname = UUID.randomUUID() + "." + filenameExtension;
             sshSftp(bytes, path, imgname);
-            return "https://dam.img.ifarmcloud.com:8030/images/" + path + "/" + imgname;
+            return url+ path + "/" + imgname;
         } catch (Exception e) {
             e.printStackTrace();
             return "上传失败";
@@ -163,7 +175,7 @@ public class UploadImage {
             byte[] content = out.toByteArray();
             String imgname = UUID.randomUUID() + "." + filenameExtension;
             sshSftp(content, path, imgname);
-            return "https://dam.img.ifarmcloud.com:8030/images/" + path + "/" + imgname;
+            return url + path + "/" + imgname;
         } catch (Exception e) {
             e.printStackTrace();
             return "上传失败";

admin/src/main/java/com/huimv/farm/damsubsidy/controller/BaseUserBankController.java

@@ -37,6 +37,8 @@ import java.util.Map;
 public class BaseUserBankController {
     @Resource
     private IBaseUserBankService baseUserBankService;
+    @Resource
+    private UploadImage uploadImage;
 
     @PostMapping("/listBankCard")
     public Result listBankCard(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap){
@@ -59,7 +61,8 @@ public class BaseUserBankController {
         if(baseUserBankService.count(new QueryWrapper<BaseUserBank>().eq("bank_id",bankCardId)) !=0){
             return new Result(10001,"该卡已绑定!",false);
         }
-        String content = UploadImage.getImageCom(bankCardImg);
+//        String content = UploadImage.getImageCom(bankCardImg);
+        String content = uploadImage.getImageCom(bankCardImg);
         BaseUserBank baseUserBank = new BaseUserBank();
         baseUserBank.setBankId(bankCardId);
         baseUserBank.setUserId(TokenSign.getMemberIdByJwtToken(httpServletRequest));

admin/src/main/java/com/huimv/farm/damsubsidy/controller/BillLandingInspectionController.java

@@ -39,6 +39,8 @@ import java.util.Map;
 public class BillLandingInspectionController {
     @Autowired
     private IBillLandingInspectionService iBillLandingInspectionService;
+    @Autowired
+    private UploadImage uploadImage;
 
     @PostMapping("/addApplication")
     public Result addApplication(HttpServletRequest httpServletRequest, @RequestParam("inspectionNum") String inspectionNum,
@@ -120,30 +122,10 @@ public class BillLandingInspectionController {
     @RequestMapping("/addPay")
     public Result addPay(HttpServletRequest httpServletRequest,
                          @RequestParam(name = "idCordBackUrl",required = false) MultipartFile idCordBackUrl,
-                         @RequestParam("id") String id) {
+                         @RequestParam("id") String id) throws IOException {
         Map<String, String> map = new HashMap<>();
         if (ObjectUtil.isNotEmpty(idCordBackUrl)) {
-            String imgname = "成功";
-            String originalFilename = idCordBackUrl.getOriginalFilename();
-            String filenameExtension = StringUtils.getFilenameExtension(originalFilename);
-            String path = DateUtil.format(new Date(), "yyyy-MM");
-            try {
-                InputStream inputStream = idCordBackUrl.getInputStream();
-                BufferedInputStream in = new BufferedInputStream(inputStream);
-                ByteArrayOutputStream out = new ByteArrayOutputStream(1024);
-                byte[] temp = new byte[1024];
-                int size = 0;
-                while ((size = in.read(temp)) != -1) {
-                    out.write(temp, 0, size);
-                }
-                in.close();
-                byte[] content = out.toByteArray();
-                imgname = UUID.randomUUID() + "." + filenameExtension;
-                UploadImage.sshSftp(content, path, imgname);
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-            String content = "https://dam.img.ifarmcloud.com:8030/images/" + path + "/" + imgname;
+            String content =   uploadImage.getImageCom(idCordBackUrl);;
             map.put("url", content);
         } else {
             String content = null;
@@ -151,6 +133,7 @@ public class BillLandingInspectionController {
         }
         map.put("id", id);
 
+
         return billLandingInspectionService.addPay(httpServletRequest, map);
     }
 

admin/src/main/java/com/huimv/farm/damsubsidy/controller/BillSubsidyController.java

@@ -46,10 +46,11 @@ public class BillSubsidyController {
     @Autowired
     private IBillSubsidyService iBillSubsidyService;
     @Autowired
-    private IAreaAllService iAreaAllService;
-    @Autowired
     private ISysUserService iSysUserService;
 
+    @Autowired
+    private UploadImage uploadImage;
+
     @PostMapping("/addApplication")
     public Result addApplication(HttpServletRequest httpServletRequest, @RequestBody BillSubsidy billSubsidy) {
         return iBillSubsidyService.addApplication(httpServletRequest, billSubsidy);
@@ -83,28 +84,8 @@ public class BillSubsidyController {
                         @RequestParam("workImg") MultipartFile workImg,
                         @RequestParam("id") String id,
                         @RequestParam("type") String type,
-                        @RequestParam("rejectReason") String rejectReason) {
-        String imgname = "成功";
-        String originalFilename = workImg.getOriginalFilename();
-        String filenameExtension = StringUtils.getFilenameExtension(originalFilename);
-        String path = DateUtil.format(new Date(), "yyyy-MM");
-        try {
-            InputStream inputStream = workImg.getInputStream();
-            BufferedInputStream in = new BufferedInputStream(inputStream);
-            ByteArrayOutputStream out = new ByteArrayOutputStream(1024);
-            byte[] temp = new byte[1024];
-            int size = 0;
-            while ((size = in.read(temp)) != -1) {
-                out.write(temp, 0, size);
-            }
-            in.close();
-            byte[] content = out.toByteArray();
-            imgname = UUID.randomUUID() + "." + filenameExtension;
-            UploadImage.sshSftp(content, path, imgname);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        String content = "https://dam.img.ifarmcloud.com:8030/images/" + path + "/" + imgname;
+                        @RequestParam("rejectReason") String rejectReason) throws IOException {
+        String content = uploadImage.getImageCom(workImg);
 
         Map<String, String> map = new HashMap<>();
         map.put("id", id);

admin/src/main/java/com/huimv/farm/damsubsidy/controller/ImagesTest.java

@@ -22,6 +22,7 @@ import okhttp3.ResponseBody;
 import org.apache.commons.collections.CollectionUtils;
 import org.json.JSONException;
 import org.json.JSONObject;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
@@ -42,10 +43,14 @@ import java.util.stream.Collectors;
 public class ImagesTest {
 
 
+    @Autowired
+    private UploadImage uploadImage;
+
     @PostMapping("/test")
     public  String test( @RequestParam("image") MultipartFile image
             ) throws IOException {
-        return   UploadImage.getImageCom(image);
+//        UploadImage uploadImage = new UploadImage();
+        return   uploadImage.getImageCom(image);
 //        System.out.println(image);
 //        String imgname = "成功";
 //        String originalFilename = image.getOriginalFilename();

admin/src/main/java/com/huimv/farm/damsubsidy/controller/SysUserController.java

@@ -49,6 +49,8 @@ public class SysUserController {
     private RedisTemplate<String,String> redisTemplate;
     @Autowired
     private IBaseUserBankService bankService;
+    @Autowired
+    private UploadImage uploadImage;
 
     @PostMapping("/sendCode")
     public Result senCode(@RequestBody Map<String,String> paramsMap) throws Exception {
@@ -213,11 +215,12 @@ public class SysUserController {
     ) throws IOException {
         req.setCharacterEncoding("UTF-8");
         System.out.println(userName);
-        String content = UploadImage.getImageCom(idCordFrontUrl);
+        String content = uploadImage.getImageCom(idCordFrontUrl);
+
 
         String content2 ="" ;
         if (!"2".equals(type)){
-             content2 = UploadImage.getImageCom(idCordBackUrl);
+             content2 = uploadImage.getImageCom(idCordBackUrl);
         }
 
         Map<String, String> map = new HashMap<>();
@@ -357,7 +360,7 @@ public class SysUserController {
     @PostMapping("/addImg")
     public Result addImg(HttpServletRequest httpServletRequest,@RequestParam("permitImg") MultipartFile permitImg,
                          @RequestParam("id") String  id) throws IOException {
-        String content3 = UploadImage.getImageCom(permitImg);
+        String content3 = uploadImage.getImageCom(permitImg);
 
         Map<String, String> map = new HashMap<>();
         map.put("id", id);

admin/src/main/java/com/huimv/farm/damsubsidy/service/impl/BillBuyInfoServiceImpl.java

@@ -16,6 +16,7 @@ import com.huimv.farm.damsubsidy.mapper.BillLandingInspectionMapper;
 import com.huimv.farm.damsubsidy.mapper.SysUserMapper;
 import com.huimv.farm.damsubsidy.service.IBillBuyInfoService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
@@ -46,7 +47,8 @@ public class BillBuyInfoServiceImpl extends ServiceImpl<BillBuyInfoMapper, BillB
     private SysUserMapper sysUserMapper;
     @Resource
     private BillLandingInspectionMapper billLandingInspectionMapper;
-
+    @Autowired
+    private UploadImage uploadImage;
     @Override
     @Transactional(rollbackFor = RuntimeException.class)
     public synchronized Result addTransaction(HttpServletRequest httpServletRequest, MultipartFile image1, MultipartFile image2, MultipartFile image3, String inspectionNum, String seller, String buyer, String num, String eartags,String buyerPhone) throws IOException {
@@ -87,9 +89,9 @@ public class BillBuyInfoServiceImpl extends ServiceImpl<BillBuyInfoMapper, BillB
             baseAnimal.setBuyTime(DateTime.now());
             baseAnimalMapper.updateById(baseAnimal);
         }
-        String content = UploadImage.getImageCom(image1);
-        String content2 = UploadImage.getImageCom(image2);
-        String content3 = UploadImage.getImageCom(image3);
+        String content = uploadImage.getImageCom(image1);
+        String content2 = uploadImage.getImageCom(image2);
+        String content3 = uploadImage.getImageCom(image3);
 
 
         if (ObjectUtil.isEmpty(billBuyInfo1)){

admin/src/main/java/com/huimv/farm/damsubsidy/service/impl/BillIsolatedServiceImpl.java

@@ -18,6 +18,7 @@ import com.huimv.farm.damsubsidy.mapper.BillIsolatedMapper;
 import com.huimv.farm.damsubsidy.mapper.BillLandingInspectionMapper;
 import com.huimv.farm.damsubsidy.service.IBillIsolatedService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.StringUtils;
@@ -50,6 +51,9 @@ public class BillIsolatedServiceImpl extends ServiceImpl<BillIsolatedMapper, Bil
     @Resource
     private BaseAnimalMapper baseAnimalMapper;
 
+    @Autowired
+    private UploadImage uploadImage;
+
     @Override
     @Transactional
     public synchronized Result addIsolation(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) throws ParseException {
@@ -263,7 +267,7 @@ public class BillIsolatedServiceImpl extends ServiceImpl<BillIsolatedMapper, Bil
     @Override
     @Transactional
     public Result cancelIsolation(HttpServletRequest httpServletRequest, MultipartFile image, String id, String isDead, String deaths) throws IOException {
-        String content = UploadImage.getImageCom(image);
+        String content = uploadImage.getImageCom(image);
         BillIsolated isolation = this.getById(id);
         isolation.setIsolatedPicUrl(content);
         isolation.setIsolatedSch(2);

admin/src/main/java/com/huimv/farm/damsubsidy/service/impl/BillLandingInspectionServiceImpl.java

@@ -14,6 +14,7 @@ import com.huimv.farm.damsubsidy.entity.BillLandingInspection;
 import com.huimv.farm.damsubsidy.mapper.*;
 import com.huimv.farm.damsubsidy.service.IBillLandingInspectionService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -47,6 +48,9 @@ public class BillLandingInspectionServiceImpl extends ServiceImpl<BillLandingIns
     @Resource
     private BaseAnimalMapper baseAnimalMapper;
 
+    @Autowired
+    private UploadImage uploadImage;
+
     @Override
     public Result list(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
         Integer type = Integer.parseInt(paramsMap.get("type"));//信息类型
@@ -221,7 +225,7 @@ public class BillLandingInspectionServiceImpl extends ServiceImpl<BillLandingIns
         if (sum != total){
             return new Result(10001,"实际耳标数量和填写数量不符!",false);
         }
-        String content = UploadImage.getImageCom(image);
+        String content = uploadImage.getImageCom(image);
         BillLandingInspection billLandingInspection = new BillLandingInspection();
         billLandingInspection.setInspectionNum(inspectionNum);
         billLandingInspection.setCargoOwner(cargoOwner);

admin/src/main/resources/application-dev.yml

@@ -14,19 +14,23 @@ spring:
       max-file-size: 10MB
 
   datasource:
-    druid:
-      url: jdbc:mysql://47.96.4.54:10052/dam_subsidy?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
-      username: root
-      password: TqfMrSSucyTyWXoEa2eIp6VfLmu4IGnVPU3LWoe5DEBX+N7NQrH/BW1k/J9e6q9/Q/40xxWmy3gjtAK9dCR21A==
-      driver-class-name: com.mysql.cj.jdbc.Driver
-      filters: config
-      connect-properties:
-        config.decrypt: true
-        config.decrypt.key: ${spring.datasource.druid.publickey}
-    type: com.alibaba.druid.pool.DruidDataSource
-  autoconfigure:
-    exclude:
-      - org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration
+    url: jdbc:mysql://47.96.4.54:10052/dam_subsidy?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+    username: root
+    password: hm123456789
+    driver-class-name: com.mysql.cj.jdbc.Driver
+#    druid:
+#      url: jdbc:mysql://47.96.4.54:10052/dam_subsidy?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+#      username: root
+#      password: TqfMrSSucyTyWXoEa2eIp6VfLmu4IGnVPU3LWoe5DEBX+N7NQrH/BW1k/J9e6q9/Q/40xxWmy3gjtAK9dCR21A==
+#      driver-class-name: com.mysql.cj.jdbc.Driver
+#      filters: config
+#      connect-properties:
+#        config.decrypt: true
+#        config.decrypt.key: ${spring.datasource.druid.publickey}
+#    type: com.alibaba.druid.pool.DruidDataSource
+#  autoconfigure:
+#    exclude:
+#      - org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration
 
   #配置rabbitMq 服务器
 #  rabbitmq:
@@ -60,3 +64,11 @@ mybatis-plus:
   configuration:
 #    log-impl: org.apache.ibatis.logging.nologging.NoLoggingImpl
     log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+
+img:
+  url: https://img.ifarmcloud.com/images/
+  basePath: /home/huimv/img/
+  ip: 139.9.167.178
+  user:  huimv
+  password: "!hm123@1"
+  port: 22

admin/src/main/resources/application-formal.yml

@@ -14,8 +14,8 @@ spring:
       max-file-size: 10MB
 
   datasource:
-#      url: jdbc:mysql://192.168.0.2:3306/dam_subsidy?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
-    url: jdbc:mysql://36.133.251.176:3306/dam_subsidy?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+      url: jdbc:mysql://192.168.0.2:3306/dam_subsidy?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+#    url: jdbc:mysql://36.133.251.176:3306/dam_subsidy?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
     username: dam_subsidy
     password: ENC(6mAfId3WdkKkw+7YQzjQ6YSHCnR0bcGM)
     driver-class-name: com.mysql.cj.jdbc.Driver
@@ -60,3 +60,15 @@ mybatis-plus:
   configuration:
 #    log-impl: org.apache.ibatis.logging.nologging.NoLoggingImpl
     log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+
+img:
+  url: https://dam.img.ifarmcloud.com:8030/images/
+  basePath: /home/huimv/img/
+#  ip: 36.134.209.211
+  ip: 192.168.0.13
+  user:  huimv
+  password: "!Hm537e@1"
+  port: 22
+
+
+

admin/src/main/resources/application.properties

@@ -1,13 +1,8 @@
-#spring.profiles.active=dev
-spring.profiles.active=formal
+spring.profiles.active=dev
+#spring.profiles.active=formal
 #spring.profiles.active=root
 
 #spring.profiles.active=prod
 
-img.basepath="/home/huimv/img/"
-img.ip="139.9.167.178"
-img.user="huimv"
-img.password="!hm123@1"
-img.port=22