川音美术阅卷，加了考点阀值的版本，合并了广州的样卷和分数水印功能。

stmms-ms-admin/src/main/java/cn/com/qmth/stmms/ms/admin/api/ConfigController.java

@@ -0,0 +1,29 @@
+package cn.com.qmth.stmms.ms.admin.api;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Created by yuanpan on 2018/1/11.
+ */
+@RestController
+@RequestMapping("api/config")
+public class ConfigController {
+
+    @Value("${sys.config.yangjuan}")
+    private Boolean enableYangJuan;
+
+    @GetMapping
+    public Map<String, Object> get() {
+
+        Map<String, Object> map = new HashMap<>();
+        map.put("enableYangJuan", enableYangJuan);
+
+        return map;
+    }
+}

stmms-ms-admin/src/main/java/cn/com/qmth/stmms/ms/admin/api/ScoreApi.java

@@ -230,7 +230,7 @@ public class ScoreApi {
                     File targetFile = new File(watermarkFile);
                     targetFile.getParentFile().mkdirs();//创建父级目录
                     String txt = "【" + paper.getExamNumber() + "】【" + paper.getStudentName() + "】【" + String.valueOf(score.intValue()) + "分】";
-                    String text = new String(txt.getBytes(), Charset.forName("GBK"));
+                    String text = new String(txt.getBytes(), Charset.forName("UTF-8"));
 //                    WaterMarkUtils.addWaterMark(imageFile, watermarkFile, text, color, font);
                     try {
                         WaterMarkUtils.addTextWatermark(text, "jpg", imageFile, watermarkFile);

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

@@ -34,6 +34,7 @@ app.admin.password=123456
 
 sys.config.imageDir=/Users/yuanpan/tmp/stmms-ms/static/images
 sys.config.thumbDir=/Users/yuanpan/tmp/stmms-ms/static/thumbs
+sys.config.watermark=/Users/yuanpan/tmp/stmms-ms/static/watermark
 #sys.config.imageDir=.\\static\\images
 #sys.config.thumbDir=.\\static\\thumbs
 sys.config.compression.percent=60
@@ -42,7 +43,7 @@ sys.config.imageServer.port=9000
 sys.config.imageServer.ip=localhost
 
 
-#袁攀配置
+#前端静态资源目录
 web.upload-path=/Users/yuanpan/tmp/stmms-ms/static/
 spring.mvc.static-path-pattern=/**
 spring.resources.static-locations=classpath:/META-INF/resources/,classpath:/resources/,classpath:/static/,classpath:/public/,file:${web.upload-path}

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

@@ -49,7 +49,7 @@ sys.config.imageServer.port=9000
 sys.config.imageServer.ip=192.168.1.100
 
 
-#袁攀配置
+#前端静态资源目录
 web.upload-path=D:\\stmms-ms\\
 spring.mvc.static-path-pattern=/**
 spring.resources.static-locations=classpath:/META-INF/resources/,classpath:/resources/,classpath:/static/,classpath:/public/,file:${web.upload-path}

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

@@ -52,6 +52,8 @@ sys.config.imageServer.port=8080
 #图片服务器ip
 sys.config.imageServer.ip=118.122.113.10
 
+sys.config.yangjuan=true
+
 
 #前端部署目录
 web.upload-path=/home/xuhuaq/stmms-ms/