mirror of
https://gitee.com/gz-yami/mall4j.git
synced 2026-03-22 09:17:16 +08:00
去掉emoji的依赖
This commit is contained in:
@@ -21,7 +21,6 @@ import org.springframework.context.annotation.Configuration;
|
||||
* Swagger文档,只有在测试环境才会使用
|
||||
* @author LGH
|
||||
*/
|
||||
//@Profile("dev")
|
||||
@Configuration
|
||||
public class SwaggerConfiguration {
|
||||
|
||||
|
||||
@@ -42,7 +42,6 @@ public class PayController {
|
||||
*/
|
||||
@PostMapping("/pay")
|
||||
@Operation(summary = "根据订单号进行支付" , description = "根据订单号进行支付")
|
||||
@SneakyThrows
|
||||
public ResponseEntity<WxPayMpOrderResult> pay(@RequestBody PayParam payParam) {
|
||||
YamiUser user = SecurityUtils.getUser();
|
||||
String userId = user.getUserId();
|
||||
@@ -58,7 +57,6 @@ public class PayController {
|
||||
*/
|
||||
@PostMapping("/normalPay")
|
||||
@Operation(summary = "根据订单号进行支付" , description = "根据订单号进行支付")
|
||||
@SneakyThrows
|
||||
public ResponseEntity<Boolean> normalPay(@RequestBody PayParam payParam) {
|
||||
|
||||
YamiUser user = SecurityUtils.getUser();
|
||||
|
||||
@@ -10,14 +10,13 @@
|
||||
|
||||
package com.yami.shop.api.controller;
|
||||
|
||||
import cn.hutool.extra.emoji.EmojiUtil;
|
||||
import com.yami.shop.bean.app.dto.UserDto;
|
||||
import com.yami.shop.bean.app.param.UserInfoParam;
|
||||
import com.yami.shop.bean.model.User;
|
||||
import com.yami.shop.security.api.util.SecurityUtils;
|
||||
import com.yami.shop.service.UserService;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import lombok.AllArgsConstructor;
|
||||
import ma.glasnost.orika.MapperFacade;
|
||||
import org.springframework.http.ResponseEntity;
|
||||
@@ -53,7 +52,7 @@ public class UserController {
|
||||
User user = new User();
|
||||
user.setUserId(userId);
|
||||
user.setPic(userInfoParam.getAvatarUrl());
|
||||
user.setNickName(EmojiUtil.toAlias(userInfoParam.getNickName()));
|
||||
user.setNickName(userInfoParam.getNickName());
|
||||
userService.updateById(user);
|
||||
return ResponseEntity.ok().build();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user