Merge remote-tracking branch 'origin/dev_1_3_3_20220822' into dev_1_3_3_20220822

cooleshow-auth/auth-server/pom.xml

@@ -96,10 +96,15 @@
             <scope>compile</scope>
         </dependency>
 
+<!--        <dependency>-->
+<!--            <groupId>com.yonge.toolset</groupId>-->
+<!--            <artifactId>toolset-emoji</artifactId>-->
+<!--            <version>1.0</version>-->
+<!--        </dependency>-->
+
         <dependency>
-            <groupId>com.yonge.toolset</groupId>
-            <artifactId>toolset-emoji</artifactId>
-            <version>1.0</version>
+            <groupId>com.vdurmont</groupId>
+            <artifactId>emoji-java</artifactId>
         </dependency>
         <!-- redisson -->
         <dependency>

cooleshow-bbs/pom.xml

@@ -57,7 +57,10 @@
             <groupId>com.yonge.cooleshow</groupId>
             <artifactId>cooleshow-common</artifactId>
         </dependency>
-
+        <dependency>
+            <groupId>com.vdurmont</groupId>
+            <artifactId>emoji-java</artifactId>
+        </dependency>
         <dependency>
             <groupId>com.yonge.toolset</groupId>
             <artifactId>thirdparty-component</artifactId>
@@ -69,11 +72,11 @@
             <version>${project.version}</version>
         </dependency>
 
-        <dependency>
-            <groupId>com.yonge.toolset</groupId>
-            <artifactId>toolset-emoji</artifactId>
-            <version>1.0</version>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>com.yonge.toolset</groupId>-->
+<!--            <artifactId>toolset-emoji</artifactId>-->
+<!--            <version>1.0</version>-->
+<!--        </dependency>-->
 
         <!-- mybatis-plus -->
         <dependency>

cooleshow-cms/pom.xml

@@ -72,10 +72,14 @@
             <groupId>com.yonge.toolset</groupId>
             <artifactId>utils</artifactId>
         </dependency>
+<!--        <dependency>-->
+<!--            <groupId>com.yonge.toolset</groupId>-->
+<!--            <artifactId>toolset-emoji</artifactId>-->
+<!--            <version>1.0</version>-->
+<!--        </dependency>-->
         <dependency>
-            <groupId>com.yonge.toolset</groupId>
-            <artifactId>toolset-emoji</artifactId>
-            <version>1.0</version>
+            <groupId>com.vdurmont</groupId>
+            <artifactId>emoji-java</artifactId>
         </dependency>
         <dependency>
             <groupId>com.yonge.toolset</groupId>

cooleshow-mall/mall-admin/pom.xml

@@ -33,7 +33,10 @@
             <artifactId>thirdparty-component</artifactId>
             <version>1.0</version>
         </dependency>
-
+        <dependency>
+            <groupId>com.vdurmont</groupId>
+            <artifactId>emoji-java</artifactId>
+        </dependency>
         <dependency>
             <groupId>com.yonge.cooleshow</groupId>
             <artifactId>mall-mbg</artifactId>
@@ -77,11 +80,11 @@
             <version>${project.toolset.version}</version>
         </dependency>
 
-        <dependency>
-            <groupId>com.yonge.toolset</groupId>
-            <artifactId>toolset-emoji</artifactId>
-            <version>1.0</version>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>com.yonge.toolset</groupId>-->
+<!--            <artifactId>toolset-emoji</artifactId>-->
+<!--            <version>1.0</version>-->
+<!--        </dependency>-->
 
         <dependency>
             <groupId>com.yonge.cooleshow</groupId>

cooleshow-mall/mall-portal/pom.xml

@@ -74,10 +74,14 @@
             <version>20.0</version>
             <scope>compile</scope>
         </dependency>
+<!--        <dependency>-->
+<!--            <groupId>com.yonge.toolset</groupId>-->
+<!--            <artifactId>toolset-emoji</artifactId>-->
+<!--            <version>1.0</version>-->
+<!--        </dependency>-->
         <dependency>
-            <groupId>com.yonge.toolset</groupId>
-            <artifactId>toolset-emoji</artifactId>
-            <version>1.0</version>
+            <groupId>com.vdurmont</groupId>
+            <artifactId>emoji-java</artifactId>
         </dependency>
         <dependency>
             <groupId>com.yonge.toolset</groupId>
@@ -85,11 +89,6 @@
             <version>1.0</version>
         </dependency>
         <dependency>
-            <groupId>com.yonge.cooleshow</groupId>
-            <artifactId>cooleshow-api</artifactId>
-            <version>1.0</version>
-        </dependency>
-        <dependency>
             <groupId>com.yonge.toolset</groupId>
             <artifactId>toolset-payment</artifactId>
             <version>${project.toolset.version}</version>