Merge remote-tracking branch 'origin/master'

school-paper/src/main/java/com/ruoyi/school/paper/controller/DbBannerController.java

@@ -113,7 +113,7 @@ public class DbBannerController extends BaseController {
     @RequestMapping(value = "/uploadFile", method = RequestMethod.POST)
     public R upload(@RequestPart("file") MultipartFile file) {
         if (!file.isEmpty()) {
-            String uploadPath = "C:\\Users\\Administrator\\Pictures\\";
+//            String uploadPath = "C:\\Users\\Administrator\\Pictures\\";
             // 如果目录不存在则创建
             File uploadDir = new File(uploadPath);
             if (!uploadDir.exists()) {
@@ -124,7 +124,7 @@ public class DbBannerController extends BaseController {
             //重新随机生成名字
             String filename = UUID.randomUUID().toString() + suffixName;
             File localFile = new File(uploadPath + filename);
-            String url = "https://farming.nyinhong.com/pic/" + filename;
+            String url = "http://farming.nyinhong.com/pic/" + filename;
             try {
                 file.transferTo(localFile); //把上传的文件保存至本地
                 /**