TRX hai 1 ano
pai
achega
a0c34298e1

+ 18 - 0
src/main/java/com/zswl/dataservice/controller/user/UserController.java

@@ -2,6 +2,7 @@ package com.zswl.dataservice.controller.user;
 
 import com.zswl.dataservice.model.user.UpdateUserPassWordParam;
 import com.zswl.dataservice.model.user.UserInfoModel;
+import com.zswl.dataservice.model.user.UserUpdateParam;
 import com.zswl.dataservice.service.mqtt.DeviceInfoService;
 import com.zswl.dataservice.service.user.impl.UserServiceImpl;
 import com.zswl.dataservice.utils.result.ResultContent;
@@ -58,4 +59,21 @@ public class UserController {
         return userService.resetUserPassWord(id);
     }
 
+    @Parameter(in = ParameterIn.HEADER, name = "accessToken", required = false, description = "accessToken")
+    @Operation(summary = "修改当前用户基本信息", description = "")
+    @RequestMapping(value = "updateUserInfo", method = {RequestMethod.POST})
+    public ResultContent<UserInfoModel> updateUserInfo(@RequestBody UserUpdateParam param) {
+        Assert.hasText(param.getUserName(), "userName不能为空");
+        return userService.updateUserInfo(param);
+    }
+
+    @Parameter(in = ParameterIn.HEADER, name = "accessToken", required = false, description = "accessToken")
+    @Operation(summary = "修改当前用户头像", description = "")
+    @RequestMapping(value = "updateUserHead", method = {RequestMethod.GET})
+    public ResultContent<UserInfoModel> updateUserHead(
+            @Parameter(name = "url", description = "头像地址", example = "")
+            @RequestParam("url") String url) {
+        return userService.updateUserHead(url);
+    }
+
 }

+ 21 - 0
src/main/java/com/zswl/dataservice/service/user/impl/UserServiceImpl.java

@@ -8,6 +8,7 @@ import com.zswl.dataservice.domain.user.User;
 import com.zswl.dataservice.model.mqtt.SendMessageModel;
 import com.zswl.dataservice.model.user.UpdateUserPassWordParam;
 import com.zswl.dataservice.model.user.UserInfoModel;
+import com.zswl.dataservice.model.user.UserUpdateParam;
 import com.zswl.dataservice.service.base.RedisService;
 import com.zswl.dataservice.service.base.SuperService;
 import com.zswl.dataservice.service.user.UserService;
@@ -142,6 +143,26 @@ public class UserServiceImpl extends SuperService implements UserService {
         return ResultContent.buildSuccess();
     }
 
+    public ResultContent updateUserInfo(UserUpdateParam param) {
+        User user = userDao.findTopById(getCurrentUserId());
+        if (ObjectUtils.isEmpty(user)) {
+            return ResultContent.buildFail(ResultState.UserNotExists.getRemark());
+        }
+        BeanUtils.copyProperties(param, user);
+        userDao.save(user);
+        return ResultContent.buildSuccess();
+    }
+
+    public ResultContent updateUserHead(String url) {
+        User user = userDao.findTopById(getCurrentUserId());
+        if (ObjectUtils.isEmpty(user)) {
+            return ResultContent.buildFail(ResultState.UserNotExists.getRemark());
+        }
+        user.setHeadUrl(url);
+        userDao.save(user);
+        return ResultContent.buildSuccess();
+    }
+
     public UserInfoModel toModel(User entity) {
         UserInfoModel model = new UserInfoModel();
         if (ObjectUtils.isNotEmpty(entity)) {

+ 13 - 0
src/main/resources/application-dev.yml

@@ -66,6 +66,19 @@ spring:
 artemis:
   alwaysSessionAsync: true
 
+# 阿里云OSS
+oss:
+  maxCacheMinutes: 10
+  maxCacheCount: 100
+  _other:
+    host: https://oss.dev.zonelife.cn/
+  _type: ALiObjectStorage
+  endpoint: oss-cn-chengdu.aliyuncs.com
+  bucket: zswl-dev
+  accessKeyId: LTAI5tCvJccdHK17R4kYrLgy
+  accessKeySecret: Vbt3NiZfi6f47vU8QcfqQIsjiFo6vH
+  arn: acs:ram::1540890773231210:role/oss
+
 # 日志配置
 logging:
   file:

+ 2 - 0
src/main/resources/application.yml

@@ -103,9 +103,11 @@ springdoc:
     operations-sorter: order
   api-docs:
     path: /v3/api-docs
+
 knife4j:
   enable: true
   # 开启认证,默认是false
+
   basic:
     enable: false
     # 认证用户名