修改拦截

ruoyi-admin/src/main/java/com/ruoyi/api/controller/clock/ApiCommonController.java

@@ -0,0 +1,47 @@
+package com.ruoyi.api.controller.clock;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.ruoyi.api.controller.common.AbstractApiController;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.system.domain.SysOss;
+import com.ruoyi.system.service.ISysOssService;
+import io.swagger.annotations.Api;
+import lombok.RequiredArgsConstructor;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 公共Controller
+ *
+ * @author pengc
+ * @date 2026-03-11
+ */
+@Validated
+@Api(value = "公共", tags = {"公共管理"})
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/api/common")
+public class ApiCommonController extends AbstractApiController {
+
+    private final ISysOssService iSysOssService;
+
+    /**
+     * 上传到本地 OSS对象存储
+     */
+    @PostMapping("/local-upload")
+    public R<Map<String, String>> localUpload(@RequestPart("file") MultipartFile file) {
+        if (ObjectUtil.isNull(file)) {
+            throw new ServiceException("上传文件不能为空");
+        }
+        SysOss oss = iSysOssService.localUpload(file);
+        Map<String, String> map = new HashMap<>(2);
+        map.put("url", oss.getUrl());
+        map.put("fileName", oss.getFileName());
+        return R.ok(map);
+    }
+
+}

ruoyi-api/src/main/java/com/ruoyi/api/controller/user/ApiUserController.java

@@ -28,7 +28,6 @@ import org.springframework.web.bind.annotation.*;
 @RequestMapping("/api/miniapp/user")
 public class ApiUserController extends AbstractApiController {
 
-    private final IUserService iUserService;
     private final IEmployeeService employeeService;
 
     /**
@@ -36,7 +35,7 @@ public class ApiUserController extends AbstractApiController {
      */
     @ApiOperation("获取用户管理详细信息")
     @GetMapping("/info")
-    public R getInfo() {
+    public R<EmployeeVo> getInfo() {
         EmployeeVo employeeVo = employeeService.queryById(getUserId());
         employeeVo.loadAgentVo();
         employeeVo.loadShopVo();
@@ -59,9 +58,8 @@ public class ApiUserController extends AbstractApiController {
     /**
      * 修改密码
      */
-    @ApiDecrypt
     @ApiOperation("修改密码")
-    @GetMapping("/updatePwd")
+    @PostMapping("/updatePwd")
     public R<Boolean> updatePwd(@RequestBody EmployeePasswordBo bo) {
         bo.setEmployeeId(getUserId());
         return R.ok(employeeService.updatePwd(bo));

ruoyi-system/src/main/java/com/ruoyi/clock/domain/bo/EmployeePasswordBo.java

@@ -1,9 +1,12 @@
 package com.ruoyi.clock.domain.bo;
 
+import com.ruoyi.common.core.validate.AddGroup;
 import com.ruoyi.common.core.validate.EditGroup;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 
 /**
@@ -21,14 +24,13 @@ public class EmployeePasswordBo{
      * 员工id
      */
     @ApiModelProperty(value = "员工id", required = true)
-    @NotNull(message = "员工id不能为空", groups = { EditGroup.class })
     private Long employeeId;
 
     /**
      * 密码
      */
     @ApiModelProperty(value = "密码", required = true)
-    //@NotBlank(message = "密码不能为空", groups = { AddGroup.class, EditGroup.class })
+    @NotBlank(message = "密码不能为空", groups = { AddGroup.class, EditGroup.class })
     private String password;
 
 }