From a6f820c3417ad05896204127e7f6811f141e6992 Mon Sep 17 00:00:00 2001 From: RuoYi Date: Thu, 11 Jul 2019 10:53:18 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=96=87=E4=BB=B6=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=E8=BF=94=E5=9B=9E=E5=AE=8C=E6=95=B4=E8=B7=AF?= =?UTF-8?q?=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ruoyi/web/controller/common/CommonController.java | 7 +------ .../src/main/resources/templates/demo/table/image.html | 2 +- ruoyi-admin/src/main/resources/templates/index.html | 4 ++-- .../resources/templates/system/user/profile/avatar.html | 2 +- .../resources/templates/system/user/profile/profile.html | 2 +- .../java/com/ruoyi/common/utils/file/FileUploadUtils.java | 6 +++--- 6 files changed, 9 insertions(+), 14 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java index 817798ba..fa80f5f1 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java @@ -27,11 +27,6 @@ public class CommonController { private static final Logger log = LoggerFactory.getLogger(CommonController.class); - /** - * 文件上传路径 - */ - public static final String UPLOAD_PATH = "/profile/upload/"; - @Autowired private ServerConfig serverConfig; @@ -82,7 +77,7 @@ public class CommonController String filePath = Global.getUploadPath(); // 上传并返回新文件名称 String fileName = FileUploadUtils.upload(filePath, file); - String url = serverConfig.getUrl() + UPLOAD_PATH + fileName; + String url = serverConfig.getUrl() + fileName; AjaxResult ajax = AjaxResult.success(); ajax.put("fileName", fileName); ajax.put("url", url); diff --git a/ruoyi-admin/src/main/resources/templates/demo/table/image.html b/ruoyi-admin/src/main/resources/templates/demo/table/image.html index 814cb67d..4aaf51eb 100644 --- a/ruoyi-admin/src/main/resources/templates/demo/table/image.html +++ b/ruoyi-admin/src/main/resources/templates/demo/table/image.html @@ -40,7 +40,7 @@ { title: '图片', formatter: function(value, row, index) { - // 图片自由组合（注意：如存储在本地需要带上 '/profile/upload' + 数据库路径） + // 图片预览（注意：如存储在本地直接获取数据库路径，如有配置context-path需要使用ctx+路径） // 如：/profile/upload/2019/08/08/3b7a839aced67397bac694d77611ce72.png if(index % 2 == 0){ return $.table.imageView('http://demo.ruoyi.vip/img/profile.jpg'); diff --git a/ruoyi-admin/src/main/resources/templates/index.html b/ruoyi-admin/src/main/resources/templates/index.html index 1fc4b07b..59c0178a 100644 --- a/ruoyi-admin/src/main/resources/templates/index.html +++ b/ruoyi-admin/src/main/resources/templates/index.html @@ -35,7 +35,7 @@
- User Image + User Image
@@ -173,7 +173,7 @@
  • 全屏显示
  • - +
      diff --git a/ruoyi-admin/src/main/resources/templates/system/user/profile/avatar.html b/ruoyi-admin/src/main/resources/templates/system/user/profile/avatar.html index 7904e5bc..a7064f64 100644 --- a/ruoyi-admin/src/main/resources/templates/system/user/profile/avatar.html +++ b/ruoyi-admin/src/main/resources/templates/system/user/profile/avatar.html @@ -30,7 +30,7 @@ $(window).load(function() { var options = { thumbBox: '.thumbBox', spinner: '.spinner', - imgSrc: $.common.isEmpty(avatar) ? ctx + 'img/profile.jpg' : ctx + 'profile/avatar/' + avatar + imgSrc: $.common.isEmpty(avatar) ? ctx + 'img/profile.jpg' : ctx + avatar.substr(1) } cropper = $('.imageBox').cropbox(options); $('#avatar').on('change', function() { diff --git a/ruoyi-admin/src/main/resources/templates/system/user/profile/profile.html b/ruoyi-admin/src/main/resources/templates/system/user/profile/profile.html index 2ba2fd1a..b83dab3e 100644 --- a/ruoyi-admin/src/main/resources/templates/system/user/profile/profile.html +++ b/ruoyi-admin/src/main/resources/templates/system/user/profile/profile.html @@ -15,7 +15,7 @@
    • -

    +

    修改头像