美术阅卷10月新增需求-新增图片加密配置

stmms-ms-collect/src/main/java/cn/com/qmth/stmms/ms/collect/api/CollectApi.java

@@ -6,6 +6,7 @@ import cn.com.qmth.stmms.ms.collect.dto.CollectStuDTO;
 import cn.com.qmth.stmms.ms.collect.dto.CollectSubjectDTO;
 import cn.com.qmth.stmms.ms.collect.dto.LoginDTO;
 import cn.com.qmth.stmms.ms.commons.config.ImageCompressionConfig;
+import cn.com.qmth.stmms.ms.commons.config.ImageConfig;
 import cn.com.qmth.stmms.ms.commons.config.SystemConfig;
 import cn.com.qmth.stmms.ms.commons.constant.SystemConstant;
 import cn.com.qmth.stmms.ms.commons.utils.MD5Util;
@@ -14,7 +15,6 @@ import cn.com.qmth.stmms.ms.core.domain.MarkSubject;
 import cn.com.qmth.stmms.ms.core.domain.Student;
 import cn.com.qmth.stmms.ms.core.domain.Work;
 import cn.com.qmth.stmms.ms.core.repository.MarkSubjectRepo;
-import cn.com.qmth.stmms.ms.core.repository.PaperRepo;
 import cn.com.qmth.stmms.ms.core.repository.StudentRepo;
 import cn.com.qmth.stmms.ms.core.repository.WorkRepo;
 import cn.com.qmth.stmms.ms.core.vo.Subject;
@@ -64,9 +64,8 @@ public class CollectApi {
     @Autowired
     private ImageCompressionConfig compressionConfig;
 
-
     @Autowired
-    private PaperRepo paperRepo;
+    ImageConfig imageConfig;
 
     @RequestMapping("user/login")
     public LoginDTO login(@RequestParam String loginname, @RequestParam String password) {
@@ -77,6 +76,7 @@ public class CollectApi {
             loginDTO = new LoginDTO();
             loginDTO.setExamId(activeWork.getId());
             loginDTO.setExamName(activeWork.getName());
+            loginDTO.setImageEnc(imageConfig.isImageEnc());
             List<CollectSubjectDTO> collectSubjectDTOs = new ArrayList<>();
             activeWork.getSubjects().forEach(s -> {
                 int id = s.getSubject().ordinal() + 1;

stmms-ms-collect/src/main/java/cn/com/qmth/stmms/ms/collect/dto/LoginDTO.java

@@ -11,8 +11,17 @@ public class LoginDTO {
     private String name;
     private Long examId;
     private String examName;
+    private boolean imageEnc;
     private List<CollectSubjectDTO> subjects = new ArrayList<>();
 
+    public boolean isImageEnc() {
+        return imageEnc;
+    }
+
+    public void setImageEnc(boolean imageEnc) {
+        this.imageEnc = imageEnc;
+    }
+
     public String getName() {
         return name;
     }

stmms-ms-commons/src/main/java/cn/com/qmth/stmms/ms/commons/config/ImageConfig.java

@@ -0,0 +1,27 @@
+package cn.com.qmth.stmms.ms.commons.config;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.stereotype.Component;
+
+/**
+ * @Description: 读取图片加密配置
+ * @Param:
+ * @return:
+ * @Author: wangliang
+ * @Date: 2019/10/27
+ */
+@Component
+@ConfigurationProperties(prefix = "sys.open", ignoreUnknownFields = false)
+public class ImageConfig {
+
+    private boolean imageEnc;
+
+    public boolean isImageEnc() {
+        return imageEnc;
+    }
+
+    public void setImageEnc(boolean imageEnc) {
+        this.imageEnc = imageEnc;
+    }
+}

stmms-ms-main/src/main/resources/application-dev.properties

@@ -1,3 +1,7 @@
+#spring.datasource.url=jdbc:mysql://192.168.10.42:3306/stmms-ms-2-1?useUnicode=true&characterEncoding=UTF-8
+#spring.datasource.username=root
+#spring.datasource.password=root
+
 spring.datasource.url=jdbc:mysql://localhost:3306/stmms-ms-3?useUnicode=true&characterEncoding=UTF-8
 spring.datasource.username=root
 spring.datasource.password=123456789
@@ -41,7 +45,9 @@ app.inspection.password=123456
 sys.config.imageDir=/Users/king/stmms-ms/static/images
 sys.config.thumbDir=/Users/king/stmms-ms/static/thumbs
 sys.config.sheetDir=/Users/king/stmms-ms/static/sheet
-sys.config.watermark=/Users/yuanpan/tmp/stmms-ms/static/watermark
+sys.config.watermark=/Users/king/stmms-ms/static/watermark
+#是否开启图片加密
+sys.open.imageEnc=true
 #sys.config.imageDir=.\\static\\images
 #sys.config.thumbDir=.\\static\\thumbs
 sys.config.compression.percent=60