图片，https

admin/pom.xml

@@ -9,7 +9,7 @@
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
     <groupId>com.huimv.farm</groupId>
-    <artifactId>demo</artifactId>
+    <artifactId>adm-subsidy</artifactId>
     <version>0.0.1-SNAPSHOT</version>
     <name>dam.subsidy</name>
     <description>Demo project for Spring Boot</description>

admin/src/main/java/com/huimv/farm/damsubsidy/SubsidyApplication.java

@@ -40,10 +40,10 @@ public class SubsidyApplication {
         Connector connector = new Connector("org.apache.coyote.http11.Http11NioProtocol");
         connector.setScheme("http");
         //Connector监听的http的默认端口号
-        connector.setPort(10011);
+        connector.setPort(10010);
         connector.setSecure(false);
         //监听到http的端口号后转向到的https的端口号,也就是项目配置的port
-        connector.setRedirectPort(8010);
+        connector.setRedirectPort(8030);
         return connector;
     }
 

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

@@ -76,8 +76,8 @@ public class UploadImage {
             if (attrs == null) {
                 sftp.mkdir(filepath);
                 System.out.println(("创建子目录：" + filepath));
-                sftp.cd(filepath);
             }
+            sftp.cd(filepath);
 
             //以下代码实现从本地上传一个文件到服务器，如果要实现下载，对换一下流就可以了
             outstream = sftp.put(fileName);

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

@@ -41,8 +41,6 @@ public class EnterpriseCooperativeController {
     @Autowired
     private IBillLandingInspectionService iBillLandingInspectionService;
 
-    @Resource
-    private SysUserMapper sysUserMapper;
 
     @PostMapping("/listApplication")
     public Result listApplication(HttpServletRequest httpServletRequest, @RequestBody Map<String,String> paramsMap){
@@ -56,7 +54,7 @@ public class EnterpriseCooperativeController {
         landingInspectionQueryWrapper.eq("creat_user",TokenSign.getUserName(httpServletRequest))
                 .orderByDesc("create_time");
 
-        Map resultMap = new HashMap();
+        Map<String,Object> resultMap = new HashMap<String,Object>();
         if (ObjectUtil.isNotEmpty(applicationStatus)){
             landingInspectionQueryWrapper.eq("inspection_sch",applicationStatus);
             subsidyQueryWrapper.eq("subsidy_sch",applicationStatus);
@@ -65,12 +63,12 @@ public class EnterpriseCooperativeController {
             landingInspectionQueryWrapper.eq("inspection_sch",applicationStatus);
             subsidyQueryWrapper.eq("subsidy_sch",applicationStatus);
         }
-        if (applicationType.equals("0")){
+        if ("0".equals(applicationType)){
             List<BillSubsidy> subsidyList = iBillSubsidyService.list(subsidyQueryWrapper);
             List<BillLandingInspection> landingInspectionList = iBillLandingInspectionService.list(landingInspectionQueryWrapper);
             resultMap.put("subsidyList",subsidyList);
             resultMap.put("LandingInspectionList",landingInspectionList);
-        }else if (applicationType.equals("1")){
+        }else if ("1".equals(applicationType)){
             List<BillLandingInspection> subsidyList = iBillLandingInspectionService.list(landingInspectionQueryWrapper);
             resultMap.put("subsidyList",subsidyList);
         }else {
@@ -81,5 +79,4 @@ public class EnterpriseCooperativeController {
     }
 
 
-
 }

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

@@ -22,14 +22,12 @@ import java.util.Date;
 @RequestMapping("/image")
 public class ImagesTest {
 
-    @Value("${img.port}")
-    public static  Integer port;
     @PostMapping("/test")
-    public  String test( @RequestParam("image") MultipartFile image ){
+    public  String test( @RequestParam("image") MultipartFile image ) {
         String imgname = "成功";
         String originalFilename = image.getOriginalFilename();
         String filenameExtension = StringUtils.getFilenameExtension(originalFilename);
-        String path = DateUtil.format(new Date(),"yyyy-MM");
+        String path = DateUtil.format(new Date(), "yyyy-MM");
         try {
             InputStream inputStream = image.getInputStream();
             BufferedInputStream in = new BufferedInputStream(inputStream);
@@ -42,35 +40,14 @@ public class ImagesTest {
             }
             in.close();
             byte[] content = out.toByteArray();
-            imgname =UUID.randomUUID()+"."+filenameExtension;
-            UploadImage.sshSftp(content,path, imgname);
+            imgname = UUID.randomUUID() + "." + filenameExtension;
+            UploadImage.sshSftp(content, path, imgname);
         } catch (Exception e) {
             e.printStackTrace();
         }
-        String content = "http://139.9.167.178/images"+path +"/"+imgname;
+//        String content = "http://139.9.167.178/images" + path + "/" + imgname;
+        String content = "https://img.ifarmcloud.com/images/" + path + "/" + imgname;
 
         return content;
-//        byte[] key = SecureUtil.generateKey(SymmetricAlgorithm.AES.getValue()).getEncoded();
-//        System.out.println(key);
-
-//构建
-//        SymmetricCrypto aes = new SymmetricCrypto(SymmetricAlgorithm.AES, key);
-//加密为16进制表示
-      //  aes.encryptHex(content);
-        //        System.out.println(encryptHex);
-////解密为字符串
-//        String decryptStr = aes.decryptStr(encryptHex, CharsetUtil.CHARSET_UTF_8);
-//        System.out.println(decryptStr);
-//        return aes.encryptHex(content);
     }
-
-//    public static void main(String[] args) {
-//
-//        String content = "http://139.9.167.178/images";
-//        MD5 md5 = MD5.create();
-//        String s = md5.digestHex16(content);
-//        System.out.println(s);
-//    }
-
-
 }

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

@@ -1,5 +1,5 @@
 server:
-  port: 8010
+  port: 8030
   ssl:
     key-store: classpath:9847401_subsidy.ifarmcloud.com.jks
     key-store-type: jks

admin/src/main/resources/com/huimv/farm/damsubsidy/mapper/BaseAnimalMapper.xml

@@ -15,8 +15,6 @@
         <result column="seller_name" property="sellerName" />
         <result column="is_loated" property="isLoated" />
         <result column="buy_time" property="buyTime" />
-        <result column="creat_time" property="creatTime" />
-        <result column="creat_user" property="creatUser" />
         <result column="update_time" property="updateTime" />
         <result column="update_user" property="updateUser" />
         <result column="is_delete" property="isDelete" />

admin/src/main/resources/com/huimv/farm/damsubsidy/mapper/BillBuyInfoMapper.xml

@@ -19,7 +19,6 @@
         <result column="buy_pay_goods_pic_url" property="buyPayGoodsPicUrl" />
         <result column="update_time" property="updateTime" />
         <result column="update_user" property="updateUser" />
-        <result column="creat_user" property="creatUser" />
         <result column="create_time" property="createTime" />
         <result column="is_delete" property="isDelete" />
     </resultMap>

admin/src/main/resources/com/huimv/farm/damsubsidy/mapper/BillIsolatedMapper.xml

@@ -17,7 +17,6 @@
         <result column="update_time" property="updateTime" />
         <result column="update_user" property="updateUser" />
         <result column="is_delete" property="isDelete" />
-        <result column="creat_user" property="creatUser" />
         <result column="create_time" property="createTime" />
     </resultMap>
 

admin/src/main/resources/com/huimv/farm/damsubsidy/mapper/BillLandingInspectionMapper.xml

@@ -25,7 +25,6 @@
         <result column="update_time" property="updateTime" />
         <result column="update_user" property="updateUser" />
         <result column="is_delete" property="isDelete" />
-        <result column="creat_user" property="creatUser" />
     </resultMap>
 
 </mapper>

admin/src/main/resources/com/huimv/farm/damsubsidy/mapper/BillSubsidyMapper.xml

@@ -12,7 +12,6 @@
         <result column="farmer_type" property="farmerType" />
         <result column="farm_name" property="farmName" />
         <result column="id_card" property="idCard" />
-        <result column="phon" property="phon" />
         <result column="exist_num" property="existNum" />
         <result column="import_num" property="importNum" />
         <result column="reward_type" property="rewardType" />
@@ -39,7 +38,6 @@
         <result column="update_time" property="updateTime" />
         <result column="create_time" property="createTime" />
         <result column="update_user" property="updateUser" />
-        <result column="creat_user" property="creatUser" />
         <result column="is_delete" property="isDelete" />
     </resultMap>
 

admin/src/main/resources/com/huimv/farm/damsubsidy/mapper/IsloatedLogMapper.xml

@@ -8,8 +8,6 @@
         <result column="isloated_id" property="isloatedId" />
         <result column="isloated_time" property="isloatedTime" />
         <result column="isloated_log" property="isloatedLog" />
-        <result column="creat_time" property="creatTime" />
-        <result column="creat_user" property="creatUser" />
         <result column="update_time" property="updateTime" />
         <result column="update_user" property="updateUser" />
         <result column="is_delete" property="isDelete" />