Merge branch '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>

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/EmployeeController.java

@@ -27,6 +27,7 @@ import com.yonge.cooleshow.biz.dal.entity.Employee;
 import com.yonge.cooleshow.biz.dal.service.EmployeeService;
 import com.yonge.cooleshow.common.controller.BaseController;
 
+import javax.annotation.Resource;
 import javax.validation.Valid;
 
 @RequestMapping("employee")
@@ -35,9 +36,9 @@ import javax.validation.Valid;
 public class EmployeeController extends BaseController {
     @Autowired
     private EmployeeService employeeService;
-    @Autowired
+    @Resource
     private SysUserFeignService sysUserFeignService;
-    @Autowired
+    @Resource
     private EmployeeDao employeeDao;
 
     @GetMapping("/detail/{id}")

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/TeacherAuthEntryRecordController.java

@@ -17,6 +17,7 @@ import org.springframework.http.HttpStatus;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
 import javax.validation.Valid;
 
 @RestController
@@ -25,7 +26,7 @@ import javax.validation.Valid;
 public class TeacherAuthEntryRecordController extends BaseController {
     @Autowired
     private TeacherAuthEntryRecordService teacherAuthEntryRecordService;
-    @Autowired
+    @Resource
     private SysUserFeignService sysUserFeignService;
 
     @GetMapping("/detail/{id}")

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/search/EmployeeSearch.java

@@ -2,6 +2,7 @@ package com.yonge.cooleshow.biz.dal.dto.search;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yonge.cooleshow.biz.dal.enums.GenderEnum;
+import com.yonge.cooleshow.common.enums.UserLockFlag;
 import com.yonge.cooleshow.common.enums.YesOrNoEnum;
 import com.yonge.toolset.base.page.QueryInfo;
 import io.swagger.annotations.ApiModel;
@@ -23,7 +24,7 @@ public class EmployeeSearch extends QueryInfo{
     @ApiModelProperty("学员声部 ")
     private String subjectIdList;
     @ApiModelProperty(value = "0-正常， 1-锁定")
-    private YesOrNoEnum lockFlag;
+    private UserLockFlag lockFlag;
     @ApiModelProperty(value = "创建开始时间")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@@ -63,11 +64,11 @@ public class EmployeeSearch extends QueryInfo{
         this.subjectIdList = subjectIdList;
     }
 
-    public YesOrNoEnum getLockFlag() {
+    public UserLockFlag getLockFlag() {
         return lockFlag;
     }
 
-    public void setLockFlag(YesOrNoEnum lockFlag) {
+    public void setLockFlag(UserLockFlag lockFlag) {
         this.lockFlag = lockFlag;
     }
 

cooleshow-user/user-biz/src/main/resources/config/mybatis/EmployeeMapper.xml

@@ -59,7 +59,6 @@
         , t.introduction_ as "introduction"
         , t.demission_date_ as "demissionDate"
         , t.contact_address_ as "contactAddress"
-        , t.lock_flag_ as "lockFlag"
     </sql>
 
     <select id="detail" resultType="com.yonge.cooleshow.biz.dal.vo.EmployeeVo">

cooleshow-user/user-biz/src/main/resources/config/mybatis/TeacherAuthEntryRecordMapper.xml

@@ -127,7 +127,7 @@
                 AND t.teacher_auth_type_ = #{param.teacherAuthType}
             </if>
         </where>
-        order by field(t.teacher_auth_status_,'DOING') desc, t.create_time_ desc
+        order by field(t.teacher_auth_status_,'DOING') desc, t.create_time_
     </select>
 
     <select id="historyPage" resultType="com.yonge.cooleshow.biz.dal.vo.TeacherAuthEntryRecordVo">