配置

admin/pom.xml

@@ -57,6 +57,7 @@
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
+            <version>8.0.26</version>
         </dependency>
 
         <dependency>

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

@@ -22,11 +22,13 @@ public class UploadImage {
 
     private static  String basePath = "/home/huimv/img/";
 
-    private static  String ip = "139.9.167.178";
+//    private static  String ip = "139.9.167.178";
+//    private static  String ip = "36.134.209.211";
+    private static  String ip = "192.168.0.13";
 
     private static  String user = "huimv";
 
-    private static  String password = "!hm123@1";
+    private static  String password = "!Hm537e@1";
 
     public static  Integer port = 22;
 
@@ -132,7 +134,7 @@ public class UploadImage {
             byte[] bytes = bos.toByteArray();
             String imgname = UUID.randomUUID() + "." + filenameExtension;
             sshSftp(bytes, path, imgname);
-            return "https://img.ifarmcloud.com/images/" + path + "/" + imgname;
+            return "https://dam.img.ifarmcloud.com:8030/images/" + path + "/" + imgname;
         } catch (Exception e) {
             e.printStackTrace();
             return "上传失败";
@@ -161,7 +163,7 @@ public class UploadImage {
             byte[] content = out.toByteArray();
             String imgname = UUID.randomUUID() + "." + filenameExtension;
             sshSftp(content, path, imgname);
-            return "https://img.ifarmcloud.com/images/" + path + "/" + imgname;
+            return "https://dam.img.ifarmcloud.com:8030/images/" + path + "/" + imgname;
         } catch (Exception e) {
             e.printStackTrace();
             return "上传失败";

admin/src/main/java/com/huimv/farm/damsubsidy/config/ApiPrefixAutoConfiguration.java

@@ -1,4 +1,3 @@
-/*
 package com.huimv.farm.damsubsidy.config;
 
 import org.springframework.context.annotation.Configuration;
@@ -11,7 +10,7 @@ public class ApiPrefixAutoConfiguration implements WebMvcConfigurer {
 
     @Override
     public void configurePathMatch(PathMatchConfigurer configurer) {
-        configurer.addPathPrefix("",  c -> c.isAnnotationPresent(RestController.class));
+        configurer.addPathPrefix("admSubsidy",  c -> c.isAnnotationPresent(RestController.class));
     }
 
-}*/
+}

admin/src/main/java/com/huimv/farm/damsubsidy/config/InterceptorConfig.java

@@ -17,8 +17,9 @@ public class InterceptorConfig implements WebMvcConfigurer {
     @Override
     public void addInterceptors(InterceptorRegistry registry) {
         registry.addInterceptor(jwtInterceptor()).
-                excludePathPatterns("/sys-user/*","/bill-subsidy/print"
-                        ,"/bill-subsidy/printPay","/bill-subsidy/printAmount","/bill-subsidy/printWaitPay","/bill-subsidy/QRCode");
+                excludePathPatterns("/admSubsidy/sys-user/*","/admSubsidy/bill-subsidy/print"
+                        ,"/admSubsidy/bill-subsidy/printPay","/admSubsidy/bill-subsidy/printAmount",
+                        "/admSubsidy/bill-subsidy/printWaitPay","/admSubsidy/bill-subsidy/QRCode");
     }
 }
 

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

@@ -132,7 +132,7 @@ public class BillLandingInspectionController {
             } catch (Exception e) {
                 e.printStackTrace();
             }
-            String content = "https://img.ifarmcloud.com/images/" + path + "/" + imgname;
+            String content = "https://dam.img.ifarmcloud.com:8030/images/" + path + "/" + imgname;
             map.put("url", content);
         } else {
             String content = null;

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

@@ -104,7 +104,7 @@ public class BillSubsidyController {
         } catch (Exception e) {
             e.printStackTrace();
         }
-        String content = "https://img.ifarmcloud.com/images/" + path + "/" + imgname;
+        String content = "https://dam.img.ifarmcloud.com:8030/images/" + path + "/" + imgname;
 
         Map<String, String> map = new HashMap<>();
         map.put("id", id);

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

@@ -72,8 +72,8 @@ public class ImagesTest {
 //        } catch (Exception e) {
 //            e.printStackTrace();
 //        }
-//        String content = "https://img.ifarmcloud.com/images" + path + "/" + imgname;
-//        String content = "https://img.ifarmcloud.com/images/" + path + "/" + imgname;
+//        String content = "https://dam.img.ifarmcloud.com:8030/images" + path + "/" + imgname;
+//        String content = "https://dam.img.ifarmcloud.com:8030/images/" + path + "/" + imgname;
 
 //        return content;
     }

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

@@ -104,6 +104,7 @@ public class SysUserController {
         accessToken.setUser(user);
         return new Result(ResultCode.SUCCESS,accessToken);
     }
+
     @PostMapping(value = "/login")
     public Result loginMultilevel(HttpServletRequest req, @RequestBody Map<String, String> map) {
         String remoteHost = req.getRemoteHost();
@@ -202,7 +203,7 @@ public class SysUserController {
 
     @PostMapping(value = "/add")
     public Result add(HttpServletRequest req,@RequestParam(name = "idCordFrontUrl") MultipartFile idCordFrontUrl,
-                      @RequestParam(name ="idCordBackUrl") MultipartFile idCordBackUrl,
+                      @RequestParam(name ="idCordBackUrl",required = false) MultipartFile idCordBackUrl,
                       @RequestParam(name ="type") String type,
                       @RequestParam(name ="userName") String userName,
                       @RequestParam(name = "idCord",required = false) String idCord,
@@ -235,29 +236,33 @@ public class SysUserController {
         } catch (Exception e) {
             e.printStackTrace();
         }
-        String content = "https://img.ifarmcloud.com/images/" + path + "/" + imgname;
+
+        String content = "https://dam.img.ifarmcloud.com:8030/images/" + path + "/" + imgname;
         String imgname2 = "成功";
-        String originalFilename2 = idCordBackUrl.getOriginalFilename();
-        String filenameExtension2 = StringUtils.getFilenameExtension(originalFilename2);
-        String path2 = 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);
+
+        String content2 ="" ;
+        if (!"2".equals(type)){
+            String originalFilename2 = idCordBackUrl.getOriginalFilename();
+            String filenameExtension2 = StringUtils.getFilenameExtension(originalFilename2);
+            String path2 = 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[] idCordBackUrlByte = out.toByteArray();
+                imgname2 = UUID.randomUUID() + "." + filenameExtension2;
+                UploadImage.sshSftp(idCordBackUrlByte, path2, imgname2);
+            } catch (Exception e) {
+                e.printStackTrace();
             }
-            in.close();
-            byte[] content2 = out.toByteArray();
-            imgname2 = UUID.randomUUID() + "." + filenameExtension2;
-            UploadImage.sshSftp(content2, path2, imgname2);
-        } catch (Exception e) {
-            e.printStackTrace();
+            content2 =   "https://dam.img.ifarmcloud.com:8030/images/" + path2 + "/" + imgname2;
         }
-        String content2 = "https://img.ifarmcloud.com/images/" + path2 + "/" + imgname2;
-
 
         Map<String, String> map = new HashMap<>();
         map.put("idCordFrontUrl", content);
@@ -416,7 +421,7 @@ public class SysUserController {
         } catch (Exception e) {
             e.printStackTrace();
         }
-        String content3 = "https://img.ifarmcloud.com/images/" + path3 + "/" + imgname3;
+        String content3 = "https://dam.img.ifarmcloud.com:8030/images/" + path3 + "/" + imgname3;
 
         Map<String, String> map = new HashMap<>();
         map.put("id", id);

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

@@ -162,7 +162,7 @@ public class BillBuyInfoServiceImpl extends ServiceImpl<BillBuyInfoMapper, BillB
 //        } catch (Exception e) {
 //            e.printStackTrace();
 //        }
-//        String content = "https://img.ifarmcloud.com/images/"+path +"/"+imgname;
+//        String content = "https://dam.img.ifarmcloud.com:8030/images/"+path +"/"+imgname;
 //
 //        String imgname2 = "成功";
 //        String originalFilename2 = image2.getOriginalFilename();
@@ -185,7 +185,7 @@ public class BillBuyInfoServiceImpl extends ServiceImpl<BillBuyInfoMapper, BillB
 //        } catch (Exception e) {
 //            e.printStackTrace();
 //        }
-//        String content2 = "https://img.ifarmcloud.com/images/"+path2 +"/"+imgname2;
+//        String content2 = "https://dam.img.ifarmcloud.com:8030/images/"+path2 +"/"+imgname2;
 //
 //        String imgname3 = "成功";
 //        String originalFilename3 = image3.getOriginalFilename();
@@ -208,7 +208,7 @@ public class BillBuyInfoServiceImpl extends ServiceImpl<BillBuyInfoMapper, BillB
 //        } catch (Exception e) {
 //            e.printStackTrace();
 //        }
-//        String content3 = "https://img.ifarmcloud.com/images/"+path3 +"/"+imgname3;
+//        String content3 = "https://dam.img.ifarmcloud.com:8030/images/"+path3 +"/"+imgname3;
 
         BillBuyInfo billBuyInfo1 = billBuyInfoMapper.selectOne(new QueryWrapper<BillBuyInfo>().eq("create_user", TokenSign.getUserName(httpServletRequest)).eq("bill_buy_status",1));
         if (ObjectUtil.isEmpty(billBuyInfo1)){

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

@@ -283,7 +283,7 @@ public class BillIsolatedServiceImpl extends ServiceImpl<BillIsolatedMapper, Bil
         } catch (Exception e) {
             e.printStackTrace();
         }
-        String content = "https://img.ifarmcloud.com/images/"+path +"/"+imgname;
+        String content = "https://dam.img.ifarmcloud.com:8030/images/"+path +"/"+imgname;
         BillIsolated isolation = this.getById(id);
         isolation.setIsolatedPicUrl(content);
         isolation.setIsolatedSch(2);

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

@@ -216,7 +216,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     public Result add(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
 
         SysUser user = new SysUser();
-     /*   if (Integer.parseInt(paramsMap.get("type")) == 2) {
+        if (Integer.parseInt(paramsMap.get("type")) == 2) {
             user.setUserType(Integer.parseInt(paramsMap.get("type")));
             user.setUserName(paramsMap.get("userName"));
             user.setPhone(TokenSign.getPhone(httpServletRequest));
@@ -246,7 +246,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             }else{
                 return new Result(10001, "该企业已存在，请重新注册！", false);
             }
-        }*/
+        }
         user.setUserType(Integer.parseInt(paramsMap.get("type")));
         user.setUserName(paramsMap.get("userName"));
         user.setIdCard(paramsMap.get("idCord"));
@@ -273,9 +273,10 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         user.setIdCardBackUrl(paramsMap.get("idCordBackUrl"));
 
 
-        if ( Integer.parseInt(paramsMap.get("type")) == 2||Integer.parseInt(paramsMap.get("type")) == 3) {
+        if ( /*Integer.parseInt(paramsMap.get("type")) == 2||*/Integer.parseInt(paramsMap.get("type")) == 3) {
             QueryWrapper<PovertyUserRegist> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq("XM", paramsMap.get("userName")).eq("ZJHM", paramsMap.get("idCord"));
+            //TODO 会有问题，不可能只有一个
             PovertyUserRegist povertyUserRegist = povertyUserRegistMapper.selectOne(queryWrapper);
             if (ObjectUtil.isEmpty(povertyUserRegist)) {
                 user.setFarmType(2);

admin/src/main/java/com/huimv/farm/damsubsidy/test/SmsAuthLogin.java

@@ -19,8 +19,6 @@ public class SmsAuthLogin {
     private static final String TEMPLATE_CODE = "your_template_code";
 
 
-
-
     // 保存手机号和验证码的映射
     private static final Map<String, String> phoneCodeMap = new HashMap<>();
 

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

@@ -0,0 +1,63 @@
+server:
+  port: 8030
+  ssl:
+    key-store: classpath:9847401_subsidy.ifarmcloud.com.jks
+    key-store-type: jks
+    key-store-password: mwasg0g9
+
+spring:
+  application:
+    name: huimv-damsubsidy
+  servlet:
+    multipart:
+      max-request-size: 100MB
+      max-file-size: 10MB
+
+  datasource:
+    druid:
+#      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: UlBlR3XCrQ30BgWe8PzMdD+oqT079kLV8aW/ug5AqfsSjCl6cTdh0t/mimPu22oAXQenD2lpbnfuNiga5LMiXQ==
+      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:
+#    host: 10.0.0.4
+#    port: 5672
+#    username: huimv
+#    password: hm123456
+#    #虚拟host 可以不设置,使用server默认host
+#    virtual-host: /
+
+  #redis
+  redis:
+    database: 0
+    host: 121.36.134.218
+    port: 6379
+    password: hm123456
+    timeout: 5000ms
+#  data:
+#    redis:
+#      host: 122.112.224.199
+#      password: hm123456
+#      port: 6379
+##  Nacos 配置
+#  cloud:
+#    nacos:
+#      discovery:
+#        server-addr: 192.168.1.68:8848 #配置nacos地址
+
+
+mybatis-plus:
+  configuration:
+#    log-impl: org.apache.ibatis.logging.nologging.NoLoggingImpl
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl

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

@@ -0,0 +1,67 @@
+server:
+  port: 8030
+  ssl:
+    key-store: classpath:9847401_subsidy.ifarmcloud.com.jks
+    key-store-type: jks
+    key-store-password: mwasg0g9
+
+spring:
+  application:
+    name: huimv-damsubsidy
+  servlet:
+    multipart:
+      max-request-size: 100MB
+      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
+    username: dam_subsidy
+    password: Xnef*<bpo9+2
+    driver-class-name: com.mysql.cj.jdbc.Driver
+#    druid:
+##      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: root
+#      password: NN0YCi+fXWSWMB1tbn8pacWqyHitLfYEYZYSgDCuHH4iloD0+/l2oQyAmowdUxDL5QSpaXhMEEL02RsN4Ia1hA==
+#      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:
+#    host: 10.0.0.4
+#    port: 5672
+#    username: huimv
+#    password: hm123456
+#    #虚拟host 可以不设置,使用server默认host
+#    virtual-host: /
+
+  #redis
+  redis:
+    database: 0
+    host: 121.36.134.218
+    port: 6379
+    password: hm123456
+    timeout: 5000ms
+#  data:
+#    redis:
+#      host: 122.112.224.199
+#      password: hm123456
+#      port: 6379
+##  Nacos 配置
+#  cloud:
+#    nacos:
+#      discovery:
+#        server-addr: 192.168.1.68:8848 #配置nacos地址
+
+
+mybatis-plus:
+  configuration:
+#    log-impl: org.apache.ibatis.logging.nologging.NoLoggingImpl
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl

admin/src/main/resources/application.properties

@@ -1,4 +1,7 @@
-spring.profiles.active=dev
+#spring.profiles.active=dev
+#spring.profiles.active=formal
+spring.profiles.active=root
+
 #spring.profiles.active=prod
 
 img.basepath="/home/huimv/img/"

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

@@ -42,7 +42,7 @@
     </resultMap>
 
     <select id="listReport" resultType="com.huimv.farm.damsubsidy.entity.vo.BillSubsidyReportVo">
-        SELECT DISTINCT aa.name AS 'villageName',
+        SELECT DISTINCT aa.name AS 'villageName', aa.id,
         (SELECT COUNT(DISTINCT u.id) FROM `bill_subsidy` s1 LEFT JOIN `sys_user` u ON s1.create_user = u.id WHERE u.farm_type = 0 AND s1.brief_address_code = aa.id AND s1.subsidy_sch = 3 AND DATE_FORMAT(s1.create_time,'%Y-%m-%d') BETWEEN #{startTime} and #{endTime}) AS 'jcdx',
         (SELECT COUNT(DISTINCT u.id) FROM `bill_subsidy` s1 LEFT JOIN `sys_user` u ON s1.create_user = u.id WHERE u.farm_type = 1 AND s1.brief_address_code = aa.id AND s1.subsidy_sch = 3 AND DATE_FORMAT(s1.create_time,'%Y-%m-%d') BETWEEN #{startTime} and #{endTime}) AS 'ytph',
         (SELECT COUNT(DISTINCT u.id) FROM `bill_subsidy` s1 LEFT JOIN `sys_user` u ON s1.create_user = u.id WHERE u.farm_type = 2 AND s1.brief_address_code = aa.id AND s1.subsidy_sch = 3 AND DATE_FORMAT(s1.create_time,'%Y-%m-%d') BETWEEN #{startTime} and #{endTime}) AS 'qt',
@@ -71,7 +71,7 @@
     </select>
 
     <select id="lisTowntReport" resultType="com.huimv.farm.damsubsidy.entity.vo.BillSubsidyReportVo">
-        SELECT DISTINCT aa.name AS 'villageName',
+        SELECT DISTINCT aa.name AS 'villageName',aa.id,
         (SELECT COUNT(DISTINCT u.id) FROM `bill_subsidy` s1 LEFT JOIN `sys_user` u ON s1.create_user = u.id WHERE u.farm_type = 0 AND s1.brief_address_code LIKE CONCAT(aa.id,'%') AND s1.subsidy_sch = 3 AND DATE_FORMAT(s1.create_time,'%Y-%m-%d') BETWEEN #{startTime} and #{endTime}) AS 'jcdx',
         (SELECT COUNT(DISTINCT u.id) FROM `bill_subsidy` s1 LEFT JOIN `sys_user` u ON s1.create_user = u.id WHERE u.farm_type = 1 AND s1.brief_address_code LIKE CONCAT(aa.id,'%') AND s1.subsidy_sch = 3 AND DATE_FORMAT(s1.create_time,'%Y-%m-%d') BETWEEN #{startTime} and #{endTime}) AS 'ytph',
         (SELECT COUNT(DISTINCT u.id) FROM `bill_subsidy` s1 LEFT JOIN `sys_user` u ON s1.create_user = u.id WHERE u.farm_type = 2 AND s1.brief_address_code LIKE CONCAT(aa.id,'%') AND s1.subsidy_sch = 3 AND DATE_FORMAT(s1.create_time,'%Y-%m-%d') BETWEEN #{startTime} and #{endTime}) AS 'qt',