diff --git a/pom.xml b/pom.xml
index dacaab6..422f724 100644
--- a/pom.xml
+++ b/pom.xml
@@ -31,7 +31,6 @@
7.2.18
3.5.0
1.5.4
- 4.0.0
4.3.9
1.1.0
3.1.0
@@ -89,11 +88,6 @@
aliyun-java-sdk-dysmsapi
${aliyun-dysmsapi.version}
-
- com.vdurmont
- emoji-java
- ${emoji.version}
-
org.jsoup
jsoup
diff --git a/yami-shop-admin/src/main/java/com/yami/shop/admin/config/SwaggerConfiguration.java b/yami-shop-admin/src/main/java/com/yami/shop/admin/config/SwaggerConfiguration.java
index 5d7dfe0..5c37d41 100644
--- a/yami-shop-admin/src/main/java/com/yami/shop/admin/config/SwaggerConfiguration.java
+++ b/yami-shop-admin/src/main/java/com/yami/shop/admin/config/SwaggerConfiguration.java
@@ -21,7 +21,6 @@ import org.springframework.context.annotation.Configuration;
* Swagger文档，只有在测试环境才会使用
* @author LGH
*/
-//@Profile("dev")
@Configuration
public class SwaggerConfiguration {
diff --git a/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/UserController.java b/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/UserController.java
index 2bbb37d..c065051 100644
--- a/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/UserController.java
+++ b/yami-shop-admin/src/main/java/com/yami/shop/admin/controller/UserController.java
@@ -11,7 +11,6 @@
package com.yami.shop.admin.controller;
import cn.hutool.core.util.StrUtil;
-import cn.hutool.extra.emoji.EmojiUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yami.shop.bean.model.User;
@@ -46,7 +45,7 @@ public class UserController {
.like(StrUtil.isNotBlank(user.getNickName()), User::getNickName, user.getNickName())
.eq(user.getStatus() != null, User::getStatus, user.getStatus()));
for (User userResult : userPage.getRecords()) {
- userResult.setNickName(EmojiUtil.toUnicode(userResult.getNickName() == null ? "" : userResult.getNickName()));
+ userResult.setNickName(userResult.getNickName() == null ? "" : userResult.getNickName());
}
return ResponseEntity.ok(userPage);
}
@@ -58,7 +57,7 @@ public class UserController {
@PreAuthorize("@pms.hasPermission('admin:user:info')")
public ResponseEntity info(@PathVariable("userId") String userId) {
User user = userService.getById(userId);
- user.setNickName(EmojiUtil.toUnicode(user.getNickName() == null ? "" : user.getNickName()));
+ user.setNickName(user.getNickName() == null ? "" : user.getNickName());
return ResponseEntity.ok(user);
}
@@ -69,7 +68,7 @@ public class UserController {
@PreAuthorize("@pms.hasPermission('admin:user:update')")
public ResponseEntity update(@RequestBody User user) {
user.setModifyTime(new Date());
- user.setNickName(EmojiUtil.toAlias(user.getNickName() == null ? "" : user.getNickName()));
+ user.setNickName(user.getNickName() == null ? "" : user.getNickName());
userService.updateById(user);
return ResponseEntity.ok().build();
}
diff --git a/yami-shop-api/src/main/java/com/yami/shop/api/config/SwaggerConfiguration.java b/yami-shop-api/src/main/java/com/yami/shop/api/config/SwaggerConfiguration.java
index 1099ce6..ea141e8 100644
--- a/yami-shop-api/src/main/java/com/yami/shop/api/config/SwaggerConfiguration.java
+++ b/yami-shop-api/src/main/java/com/yami/shop/api/config/SwaggerConfiguration.java
@@ -21,7 +21,6 @@ import org.springframework.context.annotation.Configuration;
* Swagger文档，只有在测试环境才会使用
* @author LGH
*/
-//@Profile("dev")
@Configuration
public class SwaggerConfiguration {
diff --git a/yami-shop-api/src/main/java/com/yami/shop/api/controller/PayController.java b/yami-shop-api/src/main/java/com/yami/shop/api/controller/PayController.java
index e465c61..e0de854 100644
--- a/yami-shop-api/src/main/java/com/yami/shop/api/controller/PayController.java
+++ b/yami-shop-api/src/main/java/com/yami/shop/api/controller/PayController.java
@@ -42,7 +42,6 @@ public class PayController {
*/
@PostMapping("/pay")
@Operation(summary = "根据订单号进行支付" , description = "根据订单号进行支付")
- @SneakyThrows
public ResponseEntity 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 normalPay(@RequestBody PayParam payParam) {
YamiUser user = SecurityUtils.getUser();
diff --git a/yami-shop-api/src/main/java/com/yami/shop/api/controller/UserController.java b/yami-shop-api/src/main/java/com/yami/shop/api/controller/UserController.java
index 1ccbbfb..ac038ab 100644
--- a/yami-shop-api/src/main/java/com/yami/shop/api/controller/UserController.java
+++ b/yami-shop-api/src/main/java/com/yami/shop/api/controller/UserController.java
@@ -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();
}
diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ProdCommDto.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ProdCommDto.java
index 1e73e97..63bbbb2 100644
--- a/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ProdCommDto.java
+++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/ProdCommDto.java
@@ -12,7 +12,6 @@ package com.yami.shop.bean.app.dto;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.yami.shop.common.serializer.json.EmojiJsonSerializer;
import com.yami.shop.common.serializer.json.ImgJsonSerializer;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
@@ -63,7 +62,6 @@ public class ProdCommDto {
@JsonFormat(pattern = "yyyy-MM-dd")
private Date replyTime;
- @JsonSerialize(using = EmojiJsonSerializer.class)
@Schema(description = "用户昵称" )
private String nickName;
diff --git a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/User.java b/yami-shop-bean/src/main/java/com/yami/shop/bean/model/User.java
index 084c3a4..e72f09c 100644
--- a/yami-shop-bean/src/main/java/com/yami/shop/bean/model/User.java
+++ b/yami-shop-bean/src/main/java/com/yami/shop/bean/model/User.java
@@ -10,17 +10,14 @@
package com.yami.shop.bean.model;
-import java.io.Serializable;
-import java.util.Date;
-
-import com.baomidou.mybatisplus.annotation.*;
-
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.yami.shop.common.serializer.json.EmojiJsonSerializer;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
-import com.fasterxml.jackson.annotation.JsonFormat;
+import java.io.Serializable;
+import java.util.Date;
/**
* @author lanhai
*/
@@ -37,7 +34,6 @@ public class User implements Serializable {
/**
* 用户昵称
*/
- @JsonSerialize(using = EmojiJsonSerializer.class)
private String nickName;
/**
diff --git a/yami-shop-common/pom.xml b/yami-shop-common/pom.xml
index cc9755e..249e153 100644
--- a/yami-shop-common/pom.xml
+++ b/yami-shop-common/pom.xml
@@ -69,10 +69,6 @@
com.aliyun
aliyun-java-sdk-dysmsapi
-
- com.vdurmont
- emoji-java
-
com.github.binarywang
weixin-java-pay
diff --git a/yami-shop-common/src/main/java/com/yami/shop/common/serializer/json/EmojiJsonSerializer.java b/yami-shop-common/src/main/java/com/yami/shop/common/serializer/json/EmojiJsonSerializer.java
deleted file mode 100644
index b23e36d..0000000
--- a/yami-shop-common/src/main/java/com/yami/shop/common/serializer/json/EmojiJsonSerializer.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved.
- *
- * https://www.mall4j.com/
- *
- * 未经允许，不可做商业用途！
- *
- * 版权所有，侵权必究！
- */
-
-package com.yami.shop.common.serializer.json;
-
-import cn.hutool.core.util.StrUtil;
-import cn.hutool.extra.emoji.EmojiUtil;
-import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.databind.JsonSerializer;
-import com.fasterxml.jackson.databind.SerializerProvider;
-import lombok.SneakyThrows;
-import org.springframework.stereotype.Component;
-
-/**
- * 带有emoji字符串的json序列化
- * @author LGH
- */
-@Component
-public class EmojiJsonSerializer extends JsonSerializer {
-
- @Override
- @SneakyThrows
- public void serialize(String value, JsonGenerator gen, SerializerProvider serializers) {
- gen.writeString(EmojiUtil.toUnicode(StrUtil.isBlank(value)? "" : value));
- }
-}
diff --git a/yami-shop-service/src/main/java/com/yami/shop/service/impl/UserServiceImpl.java b/yami-shop-service/src/main/java/com/yami/shop/service/impl/UserServiceImpl.java
index 0a0cf5c..ebea7a0 100644
--- a/yami-shop-service/src/main/java/com/yami/shop/service/impl/UserServiceImpl.java
+++ b/yami-shop-service/src/main/java/com/yami/shop/service/impl/UserServiceImpl.java
@@ -10,25 +10,19 @@
package com.yami.shop.service.impl;
-import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.StrUtil;
-import cn.hutool.extra.emoji.EmojiUtil;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yami.shop.bean.model.User;
import com.yami.shop.bean.param.UserRegisterParam;
-import com.yami.shop.bean.vo.UserVO;
import com.yami.shop.common.exception.YamiShopBindException;
import com.yami.shop.common.util.RedisUtil;
import com.yami.shop.dao.UserMapper;
import com.yami.shop.service.UserService;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cache.annotation.CacheEvict;
import org.springframework.cache.annotation.Cacheable;
import org.springframework.stereotype.Service;
-import java.util.Date;
import java.util.Objects;
-import java.util.UUID;
/**
* @author lgh on 2018/09/11.