wangchangsheng 2 years ago
parent
commit
4171b36a47

+ 32 - 1
exam-06173-api/src/main/java/com/gyee/exam/modules/course/dto/CourseDTO.java

@@ -12,6 +12,8 @@ import org.springframework.web.util.HtmlUtils;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 /**
 * <p>
@@ -190,7 +192,36 @@ public class CourseDTO implements Serializable {
         if(StringUtils.isBlank(this.content)){
             return this.title;
         }
-        return HtmlUtils.htmlEscapeHex(this.content);
+//        return HtmlUtils.htmlEscapeHex(this.content);
+
+        return replaceHtml(this.content);
     }
 
+
+
+    /**
+     * 去除字符串中的html标签.
+     * <p>
+     * <pre>
+     * StringUtils.replaceHtml(null)  = ""
+     * StringUtils.replaceHtml("")    = ""
+     * StringUtils.replaceHtml("<td>content</td>") = "content"
+     * StringUtils.replaceHtml("<>content</td>") = ""
+     * </pre>
+     *
+     * @param html 要处理的字符串,可以为 null
+     * @return String
+     *
+     */
+    public static String replaceHtml(String html) {
+        if (StringUtils.isBlank(html)) {
+            return StringUtils.EMPTY;
+        }
+        String regEx = "<.+?>";
+        Pattern p = Pattern.compile(regEx);
+        Matcher m = p.matcher(html);
+        String s = m.replaceAll(StringUtils.EMPTY);
+        s = s.replaceAll("<[^>]*>", "");
+        return s;
+    }
 }

+ 8 - 1
exam-06173-api/src/main/java/com/gyee/exam/modules/exam/service/impl/ExamServiceImpl.java

@@ -34,6 +34,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -72,10 +73,16 @@ public class ExamServiceImpl extends ServiceImpl<ExamMapper, Exam> implements Ex
     @Autowired
     private StatCourseService statCourseService;
 
+    @Autowired
+    private HttpServletRequest request;
+
+
     @Override
     public void save(ExamSaveReqDTO reqDTO) {
 
-        if (!reqDTO.getCreateBy().equals(reqDTO.getUpdateBy())){
+        // 从token中获得用户ID
+        String userId = UserUtils.getUserId(false);
+        if (!reqDTO.getCreateBy().equals(userId)){
             throw new ServiceException("非创建人不允许修改");
         }
 

+ 1 - 1
exam-06173-api/src/main/resources/mapper/course/CourseMapper.xml

@@ -90,7 +90,7 @@
 
     <select id="userPaging" resultMap="UserCourseResultMap">
         SELECT
-        cs.id,cs.title,cs.cover,cs.cat_id,cs.periods,cs.is_must,cs.is_pay,cs.price,
+        cs.id,cs.title,cs.content,cs.cover,cs.cat_id,cs.periods,cs.is_must,cs.is_pay,cs.price,
                (SELECT COUNT(0) FROM el_course_live WHERE course_id=cs.id) AS liveCount,
                cl.update_time,cl.learn_file,cl.total_file,cl.state
         FROM el_course cs