wwh 2 anni fa
parent
commit
f77d4f45fd

+ 5 - 0
admin/pom.xml

@@ -167,6 +167,11 @@
             <artifactId>javase</artifactId>
             <version>3.1.0</version>
         </dependency>
+        <dependency>
+            <groupId>com.google.code.gson</groupId>
+            <artifactId>gson</artifactId>
+            <version>2.8.6</version>
+        </dependency>
 <!--        百度ocr-->
         <dependency>
             <groupId>com.squareup.okhttp3</groupId>

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

@@ -22,26 +22,26 @@ import java.util.List;
 public class UploadImage {
 
     @Value("${img.basePath}")
-    private   String basePath;
+    private   String basePath="/home/huimv/img/";
 
     @Value("${img.ip}")
-    private    String ip ;
+    private    String ip="139.9.167.178" ;
 //    private   String ip = "36.134.209.211";
 //    private   String ip = "192.168.0.13";
 
     @Value("${img.user}")
-    private  String user ;
+    private  String user="huimv" ;
 
 //    private   String password = "!Hm537e@1";
 
     @Value("${img.password}")
-    private   String password ;
+    private   String password ="!hm123@1";
 
     @Value("${img.port}")
-    public   Integer port ;
+    public   Integer port=22 ;
 
     @Value("${img.url}")
-    public   String url ;
+    public   String url ="https://img.ifarmcloud.com/images/";
 
 
 

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

@@ -19,7 +19,7 @@ public class InterceptorConfig implements WebMvcConfigurer {
         registry.addInterceptor(jwtInterceptor()).
                 excludePathPatterns("/admSubsidy/sys-user/*","/admSubsidy/bill-subsidy/print"
                         ,"/admSubsidy/bill-subsidy/printPay","/admSubsidy/bill-subsidy/printAmount",
-                        "/admSubsidy/bill-subsidy/printWaitPay","/admSubsidy/bill-subsidy/QRCode");
+                        "/admSubsidy/bill-subsidy/printWaitPay","/admSubsidy/bill-subsidy/QRCode","/admSubsidy/bill-landing-inspection/QRImage");
     }
 }
 

File diff suppressed because it is too large
+ 125 - 10
admin/src/main/java/com/huimv/farm/damsubsidy/controller/BillLandingInspectionController.java


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

@@ -18,28 +18,28 @@ spring:
     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
+  #    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:
-#    host: 10.0.0.4
-#    port: 5672
-#    username: huimv
-#    password: hm123456
-#    #虚拟host 可以不设置,使用server默认host
-#    virtual-host: /
+  #  rabbitmq:
+  #    host: 10.0.0.4
+  #    port: 5672
+  #    username: huimv
+  #    password: hm123456
+  #    #虚拟host 可以不设置,使用server默认host
+  #    virtual-host: /
 
   #redis
   redis:
@@ -62,7 +62,7 @@ spring:
 
 mybatis-plus:
   configuration:
-#    log-impl: org.apache.ibatis.logging.nologging.NoLoggingImpl
+    #    log-impl: org.apache.ibatis.logging.nologging.NoLoggingImpl
     log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
 
 img: