正式环境发作业，预习，教研科目教研，token验证

sstudy/src/main/java/com/xhkjedu/sstudy/config/ConfigKey.java

@@ -74,4 +74,10 @@ public class ConfigKey {
     public void setSecretKey(String secretKey) {
         ConfigKey.secretKey = secretKey;
     }
+
+    public static String blacklist;//黑名单
+    @Value("${blacklist}")
+    public void setBlacklist(String blacklist) {
+        ConfigKey.blacklist = blacklist;
+    }
 }

sstudy/src/main/java/com/xhkjedu/sstudy/controller/paper/PaperController.java

@@ -154,17 +154,17 @@ public class PaperController {
         N_Utils.validation(new Object[]{questionStr, "试题json字符串", 1, paper.getPapertype(), "作业分类", 1
                 , paper.getPaperclass(), "作业类型", 1, paper.getPapername(), "作业名称", 2});
         List<TPaperQtype> qtypes = JSONObject.parseArray(questionStr, TPaperQtype.class);
-        boolean rtn = false;
         try {
-            rtn = paperService.updateQuestionPaper(paper, qtypes);
+            boolean rtn = paperService.updateQuestionPaper(paper, qtypes);
+            if (rtn) {
+                return new ResultVo(0, "修改成功");
+            } else {
+                return new ResultVo(1, "修改失败");
+            }
         } catch (Exception e) {
             return new ResultVo(1, "修改失败");
         }
-        if (rtn) {
-            return new ResultVo(0, "修改成功");
-        } else {
-            return new ResultVo(1, "修改失败");
-        }
+
     }
 
     /**

sstudy/src/main/java/com/xhkjedu/sstudy/controller/recite/ReciteController.java

@@ -65,15 +65,19 @@ public class ReciteController {
      */
     @PostMapping("/up")
     public ResultVo update(@RequestBody TRecite recite){
-        N_Utils.validation(new Object[]{
-                recite.getReciteid(),"背诵id",1,
-                recite.getRecitetitle(),"背诵标题",2,
-                recite.getRecitecont(),"背诵内容",2
-        });
-        Integer result = reciteService.updateRecite(recite);
-        if(result>0){
-            return new ResultVo(0,"修改成功");
-        }else{
+        try {
+            N_Utils.validation(new Object[]{
+                    recite.getReciteid(),"背诵id",1,
+                    recite.getRecitetitle(),"背诵标题",2,
+                    recite.getRecitecont(),"背诵内容",2
+            });
+            Integer result = reciteService.updateRecite(recite);
+            if(result>0){
+                return new ResultVo(0,"修改成功");
+            }else{
+                return new ResultVo(1,"修改失败");
+            }
+        }catch (Exception e){
             return new ResultVo(1,"修改失败");
         }
     }

sstudy/src/main/java/com/xhkjedu/sstudy/interceptors/RequestInterceptor.java

@@ -2,6 +2,7 @@ package com.xhkjedu.sstudy.interceptors;
 
 import com.alibaba.fastjson.JSON;
 import com.xhkjedu.exception.MissingParametersException;
+import com.xhkjedu.sstudy.config.ConfigKey;
 import com.xhkjedu.sstudy.utils.StudyUtil;
 import com.xhkjedu.utils.JedisUtil;
 import com.xhkjedu.utils.N_Utils;
@@ -53,10 +54,20 @@ public class RequestInterceptor extends JedisUtil implements HandlerInterceptor
         String requestURI = request.getRequestURI();
         String key = request.getHeader("Token-Key");
         String token = request.getHeader("Token-Value");
-        if (!requestURI.contains("user/login") && !requestURI.endsWith("/get_new")
-                && N_Utils.isNotEmpty(key) && N_Utils.isNotEmpty(token)) {//非登录和获取最新版本相关接口验证token
+
+        if(isBlacklist(requestURI) && (N_Utils.isEmpty(key) || N_Utils.isEmpty(token))){
+            ResultVo result = new ResultVo();
+            result.setCode(2);
+            result.setMsg("登录失效");
+
+            response.getWriter().print(JSON.toJSONString(result));
+            return false;
+        }
+
+        if(N_Utils.isNotEmpty(key) && N_Utils.isNotEmpty(token)){
             String redis_token = get(key);//系统缓存中保存的token
             if (redis_token != null && redis_token.equals("0")) {//获取token失败不对比
+
             } else if (!token.equals(redis_token)) {
                 ResultVo result = new ResultVo();
                 result.setCode(2);
@@ -98,6 +109,20 @@ public class RequestInterceptor extends JedisUtil implements HandlerInterceptor
         return true;
     }
 
+    private Boolean isBlacklist(String uri){
+        boolean rtn = false;
+        String blacklist = ConfigKey.blacklist;
+        if(!N_Utils.isEmpty(blacklist)){
+            String[] blackArr = blacklist.split(",");//黑名单
+            for(String str : blackArr){
+                if(uri.contains(str)){
+                    rtn = true;
+                }
+            }
+        }
+        return rtn;
+    }
+
     /**
      * 需要拦截的请求
      * @Param [uri]

sstudy/src/main/java/com/xhkjedu/sstudy/mapper/subjectbook/TeacherSubjectbookMapper.java

@@ -42,4 +42,7 @@ public interface TeacherSubjectbookMapper extends TkMapper<TTeacherSubjectbook>
 
     //根据教材id获取科目id
     String getSubjectidByLsbid(@Param("lsbid") String lsbid);
+
+    //根据教师id获取教师权限科目
+    String listSubjectidByTeacherid(@Param("teacherid") Integer teacherid);
 }

sstudy/src/main/java/com/xhkjedu/sstudy/service/paper/PaperService.java

@@ -7,6 +7,7 @@ import com.xhkjedu.sstudy.mapper.gradeclass.ClassMapper;
 import com.xhkjedu.sstudy.mapper.paper.*;
 import com.xhkjedu.sstudy.mapper.paperstudent.PaperClassMapper;
 import com.xhkjedu.sstudy.mapper.paperstudent.PaperStudentMapper;
+import com.xhkjedu.sstudy.mapper.subjectbook.TeacherSubjectbookMapper;
 import com.xhkjedu.sstudy.model.paper.*;
 import com.xhkjedu.sstudy.model.paperstudent.TPaperClass;
 import com.xhkjedu.sstudy.model.paperstudent.TPaperStudent;
@@ -59,6 +60,9 @@ public class PaperService {
     @Resource
     private PaperClassMapper paperClassMapper;
 
+    @Resource
+    private TeacherSubjectbookMapper teacherSubjectbookMapper;
+
     /**
      * 功能描述  答题卡作业--保存
      *
@@ -72,6 +76,13 @@ public class PaperService {
     public Integer saveScantronPaper(TPaper paper, List<TPaperScantronQtype> qtypes) throws Exception {
         Integer paperid = 0;
         try {
+
+            //根据用户id获取用户权限科目，如果上传科目和权限科目不一致，不允许保存
+            String subjectid = teacherSubjectbookMapper.listSubjectidByTeacherid(paper.getCreateid());
+            if(!subjectid.equals(paper.getSubjectid())){
+                throw new Exception("保存失败");
+            }
+
             paper.setPapertype(2); //作业类型1结构性试题2自定义答题卡
 
             //答题卡中试题
@@ -127,7 +138,6 @@ public class PaperService {
     public boolean updateScantronPaper(TPaper paper, List<TPaperScantronQtype> qtypes) throws Exception {
         boolean rtn = false;
         try {
-
             //答题卡中试题
             List<TPaperScantron> scanlist = new ArrayList<>();
             qtypes.forEach(t->{
@@ -378,6 +388,13 @@ public class PaperService {
     public Integer saveQuestionPaper(TPaper paper, List<TPaperQtype> qtypes) throws Exception {
         Integer paperid = 0;
         try {
+
+            //根据用户id获取用户权限科目，如果上传科目和权限科目不一致，不允许保存
+            String subjectid = teacherSubjectbookMapper.listSubjectidByTeacherid(paper.getCreateid());
+            if(!subjectid.equals(paper.getSubjectid())){
+                throw new Exception("保存失败");
+            }
+
             setPaperScoreAndNum(paper, qtypes);//设置作业分值和试题数量
             paperid = savePaper(paper);//保存作业
             paper.setPaperid(paperid);
@@ -413,6 +430,7 @@ public class PaperService {
     public boolean updateQuestionPaper(TPaper paper, List<TPaperQtype> qtypes) throws Exception {
         boolean rtn = false;
         try {
+
             setPaperScoreAndNum(paper, qtypes);//设置作业分值和试题数量
             //修改作业基本信息
             paperMapper.updatePaper(paper);

sstudy/src/main/java/com/xhkjedu/sstudy/service/recite/ReciteService.java

@@ -4,6 +4,7 @@ import com.xhkjedu.sstudy.mapper.gradeclass.ClassMapper;
 import com.xhkjedu.sstudy.mapper.recite.ReciteGroupMapper;
 import com.xhkjedu.sstudy.mapper.recite.ReciteMapper;
 import com.xhkjedu.sstudy.mapper.recite.ReciteStudentMapper;
+import com.xhkjedu.sstudy.mapper.subjectbook.TeacherSubjectbookMapper;
 import com.xhkjedu.sstudy.mapper.system.SchoolMapper;
 import com.xhkjedu.sstudy.model.recite.TRecite;
 import com.xhkjedu.sstudy.model.recite.TReciteGroup;
@@ -45,30 +46,37 @@ public class ReciteService {
     @Resource
     private SchoolMapper schoolMapper;
 
+    @Resource
+    private TeacherSubjectbookMapper teacherSubjectbookMapper;
+
     @Transactional(rollbackFor = Exception.class)
     public ResultVo save(TRecite recite){
         try {
-
-            recite.setCreatetime(N_Utils.getSecondTimestamp());
-            recite.setRecitestate(22);//背诵作业状态：21未布置 22 已布置
-            if(N_Utils.isListNotEmpty(recite.getJtrclist())){
-                recite.setHashb(1);
+            //根据用户id获取用户权限科目，如果上传科目和权限科目不一致，不允许保存
+            String subjectid = teacherSubjectbookMapper.listSubjectidByTeacherid(recite.getCreateid());
+            if(!subjectid.equals(recite.getSubjectid())){
+                return new ResultVo(1,"保存失败");
             }else{
-                recite.setHashb(0);
-            }
-
-            int year = schoolMapper.getYearById(recite.getSchoolid());
-            recite.setYear(year);
-            reciteMapper.insertUseGeneratedKeys(recite);
-            //保存背诵班级-分组-学生
-            saveReciteGroup(recite);
+                recite.setCreatetime(N_Utils.getSecondTimestamp());
+                recite.setRecitestate(22);//背诵作业状态：21未布置 22 已布置
+                if(N_Utils.isListNotEmpty(recite.getJtrclist())){
+                    recite.setHashb(1);
+                }else{
+                    recite.setHashb(0);
+                }
 
+                int year = schoolMapper.getYearById(recite.getSchoolid());
+                recite.setYear(year);
+                reciteMapper.insertUseGeneratedKeys(recite);
+                //保存背诵班级-分组-学生
+                saveReciteGroup(recite);
+                return new ResultVo(0,"保存成功");
+            }
         }catch (Exception e){
             log.error("发布背诵失败：" + e.getMessage());
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
             return new ResultVo(1,"保存失败");
         }
-        return new ResultVo(0,"保存成功");
     }
 
     //保存背诵班级-分组-学生
@@ -165,7 +173,7 @@ public class ReciteService {
      * @param  * @param recite
      * @return java.lang.Integer
      */
-    public Integer updateRecite(TRecite recite){
+    public Integer updateRecite(TRecite recite) throws Exception{
         return reciteMapper.updateRecite(recite);
     }
 

sstudy/src/main/java/com/xhkjedu/sstudy/service/resource/GuideService.java

@@ -4,6 +4,7 @@ import com.xhkjedu.sstudy.listener.MessageSender;
 import com.xhkjedu.sstudy.mapper.gradeclass.ClassMapper;
 import com.xhkjedu.sstudy.mapper.resource.*;
 import com.xhkjedu.sstudy.mapper.subjectbook.SubjectMapper;
+import com.xhkjedu.sstudy.mapper.subjectbook.TeacherSubjectbookMapper;
 import com.xhkjedu.sstudy.mapper.system.SchoolMapper;
 import com.xhkjedu.sstudy.model.resource.*;
 import com.xhkjedu.sstudy.utils.ConvertUtil;
@@ -55,6 +56,8 @@ public class GuideService {
     private MessageSender messageSender;
     @Autowired
     private ConvertUtil convertUtil;
+    @Resource
+    private TeacherSubjectbookMapper teacherSubjectbookMapper;
 
     //学生预习列表--教师网页端
     public List<GuideVo> listGuidesForTeacherWeb(TGuide guide){
@@ -95,57 +98,62 @@ public class GuideService {
     //保存学生预习
     @Transactional(rollbackFor = Exception.class)
     public ResultVo save(TGuide guide){
-
         try {
-            Integer timestamp = N_Utils.getSecondTimestamp();
-            guide.setCreatetime(timestamp);
-            Integer hashb = 0;
-            if (N_Utils.isListNotEmpty(guide.getJtrclist())) {
-                hashb = 1;
-            }
-            guide.setHashb(hashb);
-            int year = schoolMapper.getYearById(guide.getSchoolid());
-            guide.setYear(year);
-            guideMapper.insertUseGeneratedKeys(guide);
-            Integer guideid = guide.getId();//预习id
-            guide.setGuideid(guideid);
-
-            //保存资源
-            List<TResource> resources = guide.getResources();
-            for(TResource r : resources) {
-                r.setCreateid(guide.getCreateid());
-                r.setCreatetime(guide.getCreatetime());
-                r.setLevel(3);
-                r.setResourcestate(1);
-                r.setResourcetype(10);
-                r.setBelong(4);
-                r.setSchoolid(guide.getSchoolid());
-                r.setSubjectid(guide.getSubjectid());
-
-                String resourceid = StudyUtil.getId();//资源id
-                r.setResourceid(resourceid);
-                Integer resourceclass = r.getResourceclass();
-                if (resourceclass == 3 || resourceclass == 4 || resourceclass == 6) {
-                    r.setConverted(1);
-                } else if (resourceclass == 5 && ("flv".equals(r.getSuffix()) || "h264".equals(r.getMp4code()))) {
-                    r.setConverted(1);
+            //根据用户id获取用户权限科目，如果上传科目和权限科目不一致，不允许保存
+            String subjectid = teacherSubjectbookMapper.listSubjectidByTeacherid(guide.getCreateid());
+            if(!subjectid.equals(guide.getSubjectid())){
+                return new ResultVo(1,"保存失败");
+            }else{
+                Integer timestamp = N_Utils.getSecondTimestamp();
+                guide.setCreatetime(timestamp);
+                Integer hashb = 0;
+                if (N_Utils.isListNotEmpty(guide.getJtrclist())) {
+                    hashb = 1;
+                }
+                guide.setHashb(hashb);
+                int year = schoolMapper.getYearById(guide.getSchoolid());
+                guide.setYear(year);
+                guideMapper.insertUseGeneratedKeys(guide);
+                Integer guideid = guide.getId();//预习id
+                guide.setGuideid(guideid);
+
+                //保存资源
+                List<TResource> resources = guide.getResources();
+                for(TResource r : resources) {
+                    r.setCreateid(guide.getCreateid());
+                    r.setCreatetime(guide.getCreatetime());
+                    r.setLevel(3);
+                    r.setResourcestate(1);
+                    r.setResourcetype(10);
+                    r.setBelong(4);
+                    r.setSchoolid(guide.getSchoolid());
+                    r.setSubjectid(guide.getSubjectid());
+
+                    String resourceid = StudyUtil.getId();//资源id
+                    r.setResourceid(resourceid);
+                    Integer resourceclass = r.getResourceclass();
+                    if (resourceclass == 3 || resourceclass == 4 || resourceclass == 6) {
+                        r.setConverted(1);
+                    } else if (resourceclass == 5 && ("flv".equals(r.getSuffix()) || "h264".equals(r.getMp4code()))) {
+                        r.setConverted(1);
+                    }
+                    //保存资源信息
+                    resourceMapper.insertSelective(r);
+                    //保存预习资源关联关系
+                    TGuideResource gr = new TGuideResource();
+                    gr.setGuideid(guideid);
+                    gr.setResourceid(resourceid);
+                    gr.setCreateid(guide.getCreateid());
+                    gr.setCreatetime(guide.getCreatetime());
+                    guideResourceMapper.insertUseGeneratedKeys(gr);
+
+                    convertUtil.convertResource(r);//资源转换（word或ppt转为pdf，视频非h264编码转码，压缩包解压）
                 }
-                //保存资源信息
-                resourceMapper.insertSelective(r);
-                //保存预习资源关联关系
-                TGuideResource gr = new TGuideResource();
-                gr.setGuideid(guideid);
-                gr.setResourceid(resourceid);
-                gr.setCreateid(guide.getCreateid());
-                gr.setCreatetime(guide.getCreatetime());
-                guideResourceMapper.insertUseGeneratedKeys(gr);
-
-                convertUtil.convertResource(r);//资源转换（word或ppt转为pdf，视频非h264编码转码，压缩包解压）
-            }
 
-            //保存预习学生关联信息
-            batchSaveGuideStudent(guide);
-            return new ResultVo(0,"保存成功");
+                //保存预习学生关联信息
+                batchSaveGuideStudent(guide);
+                return new ResultVo(0,"保存成功");
+            }
         }catch (Exception e){
             log.error("保存预习失败：" + e.getMessage());
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
@@ -159,29 +167,35 @@ public class GuideService {
     public ResultVo shareGuide(TGuide guide){
 
         try {
-            String resourceid = guide.getResourceid();
-            Integer timestamp = N_Utils.getSecondTimestamp();
-            guide.setCreatetime(timestamp);
-            Integer hashb = 0;
-            if (N_Utils.isListNotEmpty(guide.getJtrclist())) {
-                hashb = 1;
+            //根据用户id获取用户权限科目，如果上传科目和权限科目不一致，不允许保存
+            String subjectid = teacherSubjectbookMapper.listSubjectidByTeacherid(guide.getCreateid());
+            if(!subjectid.equals(guide.getSubjectid())){
+                return new ResultVo(1,"分享失败");
+            }else{
+                String resourceid = guide.getResourceid();
+                Integer timestamp = N_Utils.getSecondTimestamp();
+                guide.setCreatetime(timestamp);
+                Integer hashb = 0;
+                if (N_Utils.isListNotEmpty(guide.getJtrclist())) {
+                    hashb = 1;
+                }
+                guide.setHashb(hashb);
+                guideMapper.insertUseGeneratedKeys(guide);
+                Integer guideid = guide.getId();//预习id
+
+                //保存预习资源
+                TGuideResource guideResource = new TGuideResource();
+                guideResource.setGuideid(guideid);
+                guideResource.setResourceid(resourceid);
+                guideResource.setCreateid(guide.getCreateid());
+                guideResource.setCreatetime(timestamp);
+                guideResourceMapper.insert(guideResource);
+                guide.setGuideid(guideid);
+
+                //保存预习学生关联信息
+                batchSaveGuideStudent(guide);
+                return new ResultVo(0,"分享成功");
             }
-            guide.setHashb(hashb);
-            guideMapper.insertUseGeneratedKeys(guide);
-            Integer guideid = guide.getId();//预习id
-
-            //保存预习资源
-            TGuideResource guideResource = new TGuideResource();
-            guideResource.setGuideid(guideid);
-            guideResource.setResourceid(resourceid);
-            guideResource.setCreateid(guide.getCreateid());
-            guideResource.setCreatetime(timestamp);
-            guideResourceMapper.insert(guideResource);
-            guide.setGuideid(guideid);
-
-            //保存预习学生关联信息
-            batchSaveGuideStudent(guide);
-            return new ResultVo(0,"分享成功");
         }catch (Exception e){
             log.error("分享预习失败：" + e.getMessage());
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();

sstudy/src/main/resources/application.properties

@@ -3,15 +3,16 @@ server.port=8086
 
 spring.application.name=sstudy
 #注册到我们本地的eureka注册中心，端口8081
-eureka.client.service-url.defaultZone=http://xhschool:Xhkjedud07@127.0.0.1:8081/eureka/
-#eureka.client.register-with-eureka=false
-#eureka.client.fetch-registry=false
+#eureka.client.service-url.defaultZone=http://xhschool:Xhkjedud07@127.0.0.1:8081/eureka/
+eureka.client.register-with-eureka=false
+eureka.client.fetch-registry=false
 #设置eureka输出日志级别
 logging.level.com.netflix=error
 
 spring.datasource.url=jdbc:mysql://dbtest.xhkjedu.com:3306/xhkjedu_school_test?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&rewriteBatchedStatements=true&allowMultiQueries=true
 spring.datasource.username=root
 spring.datasource.password=HNxhkjedu!@#07
+
 spring.mvc.hiddenmethod.filter.enabled=true
 
 #数据库连接池配置
@@ -114,5 +115,8 @@ file.showurl=http://schoolstatictest.xhkjedu.com/static/
 #数据库名
 dbname=xhkjedu_school_test
 
+#拦截黑名单
+blacklist=guide/add,guide/share,recite/save,recite/up,paper/saves,paper/ups,paper/saveq,paper/updateq
+
 #版本号
-versionname=Test_v3.9.0
+versionname=Test_v3.11.1

sstudy/src/main/resources/mapper/subjectbook/TeacherSubjectBookMapper.xml

@@ -104,4 +104,9 @@
     <select id="getSubjectidByLsbid" resultType="java.lang.String">
         select subjectid from t_subject_book where lsbid=#{lsbid}
     </select>
+
+    <!--根据教师id获取教师权限科目-->
+    <select id="listSubjectidByTeacherid" resultType="java.lang.String">
+        select DISTINCT subjectid from t_teacher_powersb where teacherid=#{teacherid} limit 1
+    </select>
 </mapper>