tjf пре 2 месеци
родитељ
комит
e12c345e72

+ 1 - 1
ruoyi-admin/pom.xml

@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>
-    <artifactId>ruoyi-admin</artifactId>
+    <artifactId>wuye_guanli</artifactId>
 
     <description>
         web服务入口

+ 6 - 2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java

@@ -79,8 +79,12 @@ public class CommonController
     {
         try
         {
-            //压缩图片
-            file = ImageSizeUtil.compressImg(file);
+            String originalFilename = file.getOriginalFilename();
+            String fileExtension = originalFilename.substring(originalFilename.lastIndexOf("."));
+            //压缩图片 "bmp", "gif", "jpg", "jpeg", "png",
+            if(".png".equalsIgnoreCase(fileExtension) || ".bmp".equalsIgnoreCase(fileExtension)  || ".gif".equalsIgnoreCase(fileExtension) || ".jpeg".equalsIgnoreCase(fileExtension)){
+                file = ImageSizeUtil.compressImg(file);
+            }
             // 上传文件路径
             String filePath = RuoYiConfig.getUploadPath();
             // 上传并返回新文件名称

+ 3 - 5
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java

@@ -17,8 +17,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
-import java.util.Map;
-
 /**
  * 个人信息 业务处理
  * 
@@ -83,10 +81,10 @@ public class SysProfileController extends BaseController
      */
     @Log(title = "个人信息", businessType = BusinessType.UPDATE)
     @PostMapping("/updatePwd")
-    public AjaxResult updatePwd(@RequestBody Map<String, String> params)
+    public AjaxResult updatePwd(String oldPassword, String newPassword)
     {
-        String oldPassword = params.get("oldPassword");
-        String newPassword = params.get("newPassword");
+        /*String oldPassword = params.get("oldPassword");
+        String newPassword = params.get("newPassword");*/
         LoginUser loginUser = getLoginUser();
         String userName = loginUser.getUsername();
         String password = loginUser.getPassword();