Merge remote-tracking branch 'origin/master'

whepi-web/src/main/java/com/bofeng/unit/QRCode.java

@@ -26,7 +26,7 @@ import java.util.Map;
 
 public class QRCode {
 
-    private static String programUploadPath = "D:\\uoplad\\whepi";
+    public static String programUploadPath = "/home/www/upload/whepi";
 
     /**
      * CODE_WIDTH：二维码宽度，单位像素

yvan-platform/src/main/java/com/yvan/mvc/JztdMvcAutoConfigration.java

@@ -32,7 +32,7 @@ public class JztdMvcAutoConfigration extends WebMvcConfigurerAdapter {
      */
     @Override
     public void addResourceHandlers(ResourceHandlerRegistry registry) {
-        registry.addResourceHandler("/whepi/upload/**").addResourceLocations("file:"+ "D:\\uoplad\\whepi" + "/upload/");
+        registry.addResourceHandler("/whepi/upload/**").addResourceLocations("file:"+ "/home/www/upload/whepi" + "/upload/");
     }
 
     /**