去掉emoji的依赖

RefPd · Feb 22, 2023 · 85c073b · 85c073b
1 parent e60124b
commit 85c073b
Show file tree

Hide file tree

Showing 11 changed files with 10 additions and 71 deletions.
diff --git a/pom.xml b/pom.xml
@@ -31,7 +31,6 @@
         <qiniu.version>7.2.18</qiniu.version>
         <weixin.version>3.5.0</weixin.version>
         <orika.version>1.5.4</orika.version>
-        <emoji.version>4.0.0</emoji.version>
         <aliyun-core.version>4.3.9</aliyun-core.version>
         <aliyun-dysmsapi.version>1.1.0</aliyun-dysmsapi.version>
         <mybatis-plus.version>3.1.0</mybatis-plus.version>
@@ -89,11 +88,6 @@
                 <artifactId>aliyun-java-sdk-dysmsapi</artifactId>
                 <version>${aliyun-dysmsapi.version}</version>
             </dependency>
-            <dependency>
-                <groupId>com.vdurmont</groupId>
-                <artifactId>emoji-java</artifactId>
-                <version>${emoji.version}</version>
-            </dependency>
             <dependency>
                 <groupId>org.jsoup</groupId>
                 <artifactId>jsoup</artifactId>

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
@@ -21,7 +21,6 @@
  * 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
@@ -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 ResponseEntity<IPage<User>> page(User user,PageParam<User> page) {
                 .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 ResponseEntity<IPage<User>> page(User user,PageParam<User> page) {
     @PreAuthorize("@pms.hasPermission('admin:user:info')")
     public ResponseEntity<User> 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 ResponseEntity<User> info(@PathVariable("userId") String userId) {
     @PreAuthorize("@pms.hasPermission('admin:user:update')")
     public ResponseEntity<Void> 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
@@ -21,7 +21,6 @@
  * 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
@@ -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 ResponseEntity<WxPayMpOrderResult> pay(@RequestBody PayParam payParam) {
      */
     @PostMapping("/normalPay")
     @Operation(summary = "根据订单号进行支付" , description = "根据订单号进行支付")
-    @SneakyThrows
     public ResponseEntity<Boolean> 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
@@ -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 ResponseEntity<Void> setUserInfo(@RequestBody UserInfoParam userInfoParam
 		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
@@ -12,7 +12,6 @@
 
 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
@@ -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
@@ -69,10 +69,6 @@
             <groupId>com.aliyun</groupId>
             <artifactId>aliyun-java-sdk-dysmsapi</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.vdurmont</groupId>
-            <artifactId>emoji-java</artifactId>
-        </dependency>
         <dependency>
             <groupId>com.github.binarywang</groupId>
             <artifactId>weixin-java-pay</artifactId>

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
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
@@ -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.