Merge branch 'gz' into chuanyin-v2.0.1

# Conflicts:
#	stmms-ms-main/src/main/resources/application-test.properties
#	stmms-ms-main/src/main/resources/application.properties

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

@@ -2,6 +2,7 @@ package cn.com.qmth.stmms.ms.admin.api;
 
 import cn.com.qmth.stmms.ms.admin.assembler.ScoreAssembler;
 import cn.com.qmth.stmms.ms.admin.dto.ScoreCheckDTO;
+import cn.com.qmth.stmms.ms.admin.utils.WaterMarkUtils;
 import cn.com.qmth.stmms.ms.core.domain.MarkStage;
 import cn.com.qmth.stmms.ms.core.domain.Paper;
 import cn.com.qmth.stmms.ms.core.domain.Student;
@@ -12,15 +13,19 @@ 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;
-import org.apache.catalina.connector.Response;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.*;
 
-import java.math.BigInteger;
+import java.awt.*;
+import java.io.File;
+import java.io.IOException;
+import java.nio.charset.Charset;
 import java.util.*;
+import java.util.List;
 import java.util.stream.Collectors;
 
 /**
@@ -185,4 +190,72 @@ public class ScoreApi {
         }
         return ResponseEntity.ok(null);
     }
+
+    @Value("${sys.config.imageDir}")
+    private String imagePath;
+
+    @Value("${sys.config.watermark}")
+    private String watermark;
+
+    private static int watermarkTotal;
+    private static int watermarkFinished;
+    private static boolean watermarking = false;
+
+    @PostMapping("/watermark")
+    public void watermark(@RequestParam("workId") Long workId) {
+
+        if (!watermarking) {
+            watermarking = true;
+            watermarkTotal = 0;
+            watermarkFinished = 0;
+
+            final Font font = new Font("宋体", Font.PLAIN, 60);                     //水印字体
+            final Color color = new Color(254, 3, 10, 255);                               //水印图片色彩以及透明度
+            final List<Paper> papers = paperRepo.findByWorkId(workId);
+            watermarkTotal = papers.size();
+
+            new Thread(() -> {
+
+                for (int i = 0; i < watermarkTotal; i++) {
+                    watermarkFinished = i + 1;
+                    Paper paper = papers.get(i);
+                    Double score = paper.getInspectScore() == null ? paper.getScore() : paper.getInspectScore();
+                    String examNumber = paper.getExamNumber();
+                    String areaCode = paper.getAreaCode();
+                    Subject subject = paper.getSubject();
+
+                    String imageFile = imagePath + "/" + workId + "/" + subject.toString() + "/" + areaCode + "/" + examNumber + ".jpg";
+                    String watermarkFile = watermark + "/" + workId + "/" + subject.toString() + "/" + areaCode + "/" + examNumber + ".jpg";
+
+                    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"));
+//                    WaterMarkUtils.addWaterMark(imageFile, watermarkFile, text, color, font);
+                    try {
+                        WaterMarkUtils.addTextWatermark(text, "jpg", imageFile, watermarkFile);
+                        System.out.println(watermarkFile + "生成成功");
+                    } catch (IOException e) {
+                        System.out.println(watermarkFile + "生成失败");
+                    }
+
+                }
+
+                watermarking = false;
+            }).start();
+        } else {
+            throw new RuntimeException("请勿重复生成");
+        }
+
+
+    }
+
+    @GetMapping("/watermark")
+    public Map<String, Object> watermarkProgress(@RequestParam("workId") Long workId) {
+        Map<String, Object> resultMap = new HashMap<>();
+        resultMap.put("watermarkTotal", watermarkTotal);
+        resultMap.put("watermarkFinished", watermarkFinished);
+        resultMap.put("watermarking", watermarking);
+        return resultMap;
+    }
 }

stmms-ms-admin/src/main/java/cn/com/qmth/stmms/ms/admin/dto/PaperExpDTO.java

@@ -0,0 +1,51 @@
+package cn.com.qmth.stmms.ms.admin.dto;
+
+import cn.com.qmth.stmms.ms.commons.utils.excel.ExcelProperty;
+
+/**
+ * Created by yuanpan on 2017/12/23.
+ */
+public class PaperExpDTO {
+
+    public PaperExpDTO() {
+    }
+
+    public PaperExpDTO(String studentName, String examNumber, String subject) {
+        this.studentName = studentName;
+        this.examNumber = examNumber;
+        this.subject = subject;
+    }
+
+    @ExcelProperty(name = "姓名", index = 0, type = 1)
+    private String studentName;
+
+    @ExcelProperty(name = "准考证号", index = 1, type = 1)
+    private String examNumber;
+
+    @ExcelProperty(name = "科目", index = 2, type = 1)
+    private String subject;
+
+    public String getStudentName() {
+        return studentName;
+    }
+
+    public void setStudentName(String studentName) {
+        this.studentName = studentName;
+    }
+
+    public String getExamNumber() {
+        return examNumber;
+    }
+
+    public void setExamNumber(String examNumber) {
+        this.examNumber = examNumber;
+    }
+
+    public String getSubject() {
+        return subject;
+    }
+
+    public void setSubject(String subject) {
+        this.subject = subject;
+    }
+}

stmms-ms-admin/src/main/java/cn/com/qmth/stmms/ms/admin/exporter/PaperExporter.java

@@ -0,0 +1,52 @@
+package cn.com.qmth.stmms.ms.admin.exporter;
+
+import cn.com.qmth.stmms.ms.admin.dto.PaperExpDTO;
+import cn.com.qmth.stmms.ms.admin.dto.ScoreDTO;
+import cn.com.qmth.stmms.ms.commons.utils.excel.ExportUtils;
+import cn.com.qmth.stmms.ms.core.domain.Paper;
+import cn.com.qmth.stmms.ms.core.repository.PaperRepo;
+import org.springframework.beans.factory.annotation.Autowired;
+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.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * Created by yuanpan on 2017/12/23.
+ */
+@RestController
+@RequestMapping("export/paper")
+public class PaperExporter {
+
+    @Autowired
+    private PaperRepo paperRepo;
+
+    @Value("${sys.config.imageDir}")
+    private String imagesFolder;
+
+    @GetMapping
+    public void export(@RequestParam Long workId, HttpServletResponse response) {
+
+        List<PaperExpDTO> expPapers = new ArrayList<>();
+        List<Paper> allPapers = paperRepo.findByWorkId(workId);
+        for (Paper paper : allPapers) {
+            String filePath = imagesFolder + "/" + paper.getWorkId() + "/" + paper.getSubject().toString() + "/" + paper.getAreaCode() + "/" + paper.getExamNumber() + ".jpg";
+
+            File file = new File(filePath);
+            if (!file.exists()) {
+
+                expPapers.add(new PaperExpDTO(paper.getStudentName(), paper.getExamNumber(), paper.getSubject().getName()));
+            }
+
+        }
+
+        ExportUtils.exportEXCEL("错误试卷", PaperExpDTO.class, expPapers.stream().sorted((p1, p2) -> p1.getExamNumber().compareTo(p2.getExamNumber())).collect(Collectors.toList()), response);
+    }
+}

stmms-ms-admin/src/main/java/cn/com/qmth/stmms/ms/admin/exporter/ScoreExporter.java

@@ -2,8 +2,13 @@ package cn.com.qmth.stmms.ms.admin.exporter;
 
 import cn.com.qmth.stmms.ms.admin.dto.ScoreDTO;
 import cn.com.qmth.stmms.ms.commons.utils.excel.ExportUtils;
+import cn.com.qmth.stmms.ms.core.domain.Paper;
+import cn.com.qmth.stmms.ms.core.domain.Student;
 import cn.com.qmth.stmms.ms.core.repository.ExamQuestionRepo;
 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.vo.Subject;
+import org.apache.commons.lang.math.NumberUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -27,7 +32,10 @@ public class ScoreExporter {
     @Autowired
     private ExamQuestionRepo examQuestionRepo;
 
-    @RequestMapping(method = RequestMethod.GET)
+    @Autowired
+    private StudentRepo studentRepo;
+
+    //@RequestMapping(method = RequestMethod.GET)
     public void export(@RequestParam Long workId, HttpServletResponse response) {
         List<ScoreDTO> scoreDTOs = new ArrayList<>();
         List<Object[]> objects = paperRepo.findScores(workId);
@@ -39,11 +47,14 @@ public class ScoreExporter {
             scoreDTO.setExamNumber(o[0].toString());
             scoreDTO.setStudentName(o[1].toString());
             String scoreList = String.valueOf(o[4]);
+
             if (scoreList != null && scoreList.split(",").length == 3) {
                 scoreDTO.setSc(scoreList.split(",")[0]);
                 scoreDTO.setSm(scoreList.split(",")[1]);
                 scoreDTO.setSx(scoreList.split(",")[2]);
             }
+
+
             scoreDTO.setAreaName(areaName);
             scoreDTO.setSourceName(sourceName);
             scoreDTOs.add(scoreDTO);
@@ -51,4 +62,36 @@ public class ScoreExporter {
         String fileName = "成绩总表";
         ExportUtils.exportEXCEL(fileName, ScoreDTO.class, scoreDTOs, response);
     }
+
+    @RequestMapping(method = RequestMethod.GET)
+    public void export2(@RequestParam Long workId, HttpServletResponse response) {
+
+
+        List<ScoreDTO> scoreDTOs = new ArrayList<>();
+        List<Student> students = studentRepo.findByWorkId(workId);
+
+        for (Student student : students) {
+            ScoreDTO scoreDTO = new ScoreDTO();
+
+            scoreDTO.setSourceName(student.getSourceName());
+            scoreDTO.setAreaName(student.getAreaName());
+            scoreDTO.setExamNumber(student.getExamNumber());
+            scoreDTO.setStudentName(student.getName());
+
+            Paper sc = paperRepo.findByWorkIdAndSubjectAndExamNumber(workId, Subject.SC, student.getExamNumber());
+            Paper sm = paperRepo.findByWorkIdAndSubjectAndExamNumber(workId, Subject.SM, student.getExamNumber());
+            Paper sx = paperRepo.findByWorkIdAndSubjectAndExamNumber(workId, Subject.SX, student.getExamNumber());
+
+            int scScore = (sc == null || !NumberUtils.isNumber(String.valueOf(sc.getScore()))) ? 0 : sc.getScore().intValue();
+            int smScore = (sm == null || !NumberUtils.isNumber(String.valueOf(sm.getScore()))) ? 0 : sm.getScore().intValue();
+            int sxScore = (sx == null || !NumberUtils.isNumber(String.valueOf(sx.getScore()))) ? 0 : sx.getScore().intValue();
+            scoreDTO.setSc(String.valueOf(scScore));
+            scoreDTO.setSm(String.valueOf(smScore));
+            scoreDTO.setSx(String.valueOf(sxScore));
+
+            scoreDTOs.add(scoreDTO);
+        }
+        String fileName = "成绩总表";
+        ExportUtils.exportEXCEL(fileName, ScoreDTO.class, scoreDTOs, response);
+    }
 }

stmms-ms-admin/src/main/java/cn/com/qmth/stmms/ms/admin/utils/WaterMarkUtils.java

@@ -0,0 +1,138 @@
+package cn.com.qmth.stmms.ms.admin.utils;
+
+import javax.imageio.IIOImage;
+import javax.imageio.ImageIO;
+import javax.imageio.ImageWriteParam;
+import javax.imageio.ImageWriter;
+import javax.imageio.plugins.jpeg.JPEGImageWriteParam;
+import javax.imageio.stream.FileImageOutputStream;
+import java.awt.*;
+import java.awt.geom.Rectangle2D;
+import java.awt.image.BufferedImage;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+
+/**
+ * Created by yuanpan on 2017/12/13.
+ */
+public class WaterMarkUtils {
+
+
+    public static void addTextWatermark(String text, String type, String sourcePath, String destinationPath) throws IOException {
+        File source = new File(sourcePath);
+        File destination = new File(destinationPath);
+        BufferedImage image = ImageIO.read(source);
+        int width = image.getWidth();
+        int height = image.getHeight();
+
+        // determine image type and handle correct transparency
+        //int imageType = "png".equalsIgnoreCase(type) ? BufferedImage.TYPE_INT_ARGB : BufferedImage.TYPE_INT_RGB;
+        BufferedImage watermarked = new BufferedImage(image.getWidth(), image.getHeight(), BufferedImage.TYPE_INT_RGB);
+
+        // initializes necessary graphic properties
+        Graphics2D w = (Graphics2D) watermarked.getGraphics();
+        w.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
+        w.setRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING, RenderingHints.VALUE_TEXT_ANTIALIAS_ON);
+
+        w.drawImage(image.getScaledInstance(image.getWidth(), image.getHeight(), Image.SCALE_SMOOTH), 0, 0, null);
+        AlphaComposite alphaChannel = AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 0.4f);
+        w.setComposite(alphaChannel);
+        w.setColor(Color.red);
+        w.setFont(new Font(Font.SANS_SERIF, Font.BOLD, 60));
+        FontMetrics fontMetrics = w.getFontMetrics();
+        Rectangle2D rect = fontMetrics.getStringBounds(text, w);
+
+        // calculate center of the image
+//        int x = (image.getWidth() - (int) rect.getWidth()) / 2;
+//        int y = image.getHeight() / 2;
+
+        int x = 0;
+        int y = image.getHeight() - (int) rect.getHeight() + 50;
+
+        // add text overlay to the image
+        w.drawString(text, x, y);
+        //ImageIO.write(watermarked, type, destination);
+        //w.dispose();
+
+
+        JPEGImageWriteParam jepgParams = new JPEGImageWriteParam(null);
+        jepgParams.setCompressionMode(ImageWriteParam.MODE_EXPLICIT);
+        jepgParams.setCompressionQuality(1f);
+        final ImageWriter writer = ImageIO.getImageWritersByFormatName("jpg").next();
+        writer.setOutput(new FileImageOutputStream(destination));
+        writer.write(null, new IIOImage(watermarked, null, null), jepgParams);
+        writer.dispose();
+
+
+        w.dispose();
+
+
+//        FileOutputStream fos = new FileOutputStream(destination);
+//        JPEGImageEncoder encoder = JPEGCodec.createJPEGEncoder(fos);
+//        encoder.encode(watermarked);
+//        fos.flush();
+//        fos.close();
+    }
+
+
+    /**
+     * @param srcImgPath       源图片路径
+     * @param tarImgPath       保存的图片路径
+     * @param waterMarkContent 水印内容
+     * @param markContentColor 水印颜色
+     * @param font             水印字体
+     */
+    public static void addWaterMark(String srcImgPath, String tarImgPath, String waterMarkContent, Color markContentColor, Font font) {
+
+        try {
+            // 读取原图片信息
+            File srcImgFile = new File(srcImgPath);//得到文件
+            Image srcImg = ImageIO.read(srcImgFile);//文件转化为图片
+            int srcImgWidth = srcImg.getWidth(null);//获取图片的宽
+            int srcImgHeight = srcImg.getHeight(null);//获取图片的高
+            // 加水印
+            BufferedImage bufImg = new BufferedImage(srcImgWidth, srcImgHeight, BufferedImage.TYPE_INT_RGB);
+            Graphics2D g = bufImg.createGraphics();
+            g.drawImage(srcImg, 0, 0, srcImgWidth, srcImgHeight, null);
+            g.setColor(markContentColor); //根据图片的背景设置水印颜色
+            g.setFont(font);              //设置字体
+
+            //设置水印的坐标
+//            int x = srcImgWidth - getWatermarkWidth(waterMarkContent, g);
+//            int y = getWatermarkHeight(g);
+            int x = 0;
+            int y = srcImgHeight - getWatermarkHeight(g) + 50;
+//            int y = srcImgHeight;
+            g.drawString(waterMarkContent, x, y);  //画出水印
+            g.dispose();
+            // 输出图片
+            FileOutputStream outImgStream = new FileOutputStream(tarImgPath);
+            ImageIO.write(bufImg, "jpg", outImgStream);
+            System.out.println("添加水印完成");
+            outImgStream.flush();
+            outImgStream.close();
+
+        } catch (Exception e) {
+            // TODO: handle exception
+        }
+    }
+
+    private static int getWatermarkWidth(String waterMarkContent, Graphics2D g) {
+        return g.getFontMetrics(g.getFont()).charsWidth(waterMarkContent.toCharArray(), 0, waterMarkContent.length());
+    }
+
+    private static int getWatermarkHeight(Graphics2D g) {
+        return g.getFontMetrics(g.getFont()).getHeight();
+    }
+
+    public static void main(String[] args) {
+        Font font = new Font("Symbol", Font.PLAIN, 60);                     //水印字体
+        String srcImgPath = "/Users/yuanpan/tmp/1842030001.jpg"; //源图片地址
+        String tarImgPath = "/Users/yuanpan/tmp/1842030002.jpg"; //待存储的地址
+        String waterMarkContent = "90分";  //水印内容
+        Color color = new Color(254, 3, 10, 255);                               //水印图片色彩以及透明度
+        WaterMarkUtils.addWaterMark(srcImgPath, tarImgPath, waterMarkContent, color, font);
+
+    }
+}

stmms-ms-main/src/main/java/cn/com/qmth/stmms/ms/Application.java

@@ -1,18 +1,80 @@
 package cn.com.qmth.stmms.ms;
 
 
+import cn.com.qmth.stmms.ms.commons.utils.image.ImageCompression;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 
+import javax.imageio.IIOImage;
+import javax.imageio.ImageIO;
+import javax.imageio.ImageWriteParam;
+import javax.imageio.ImageWriter;
+import javax.imageio.plugins.jpeg.JPEGImageWriteParam;
+import javax.imageio.stream.FileImageOutputStream;
+import java.awt.*;
+import java.awt.geom.Point2D;
+import java.awt.geom.Rectangle2D;
+import java.awt.image.BufferedImage;
+import java.awt.image.BufferedImageOp;
+import java.awt.image.ColorModel;
+import java.awt.image.ImageProducer;
+import java.io.File;
+
 @SpringBootApplication
 @EnableTransactionManagement
 @EnableAsync
-public class Application{
+public class Application {
 
     public static void main(String[] args) throws Exception {
         SpringApplication.run(Application.class, args);
     }
 
+    public static void testRotate() throws Exception {
+
+        File src = new File("/Users/yuanpan/Downloads/IMG_0762.JPG");
+        File dest = new File("/Users/yuanpan/Downloads/IMG_0762_3.JPG");
+
+        BufferedImage bufferedImage = ImageIO.read(src);
+        ColorModel colorModel = bufferedImage.getColorModel();
+        System.out.println(colorModel);
+        /*
+        String[] props = bufferedImage.getPropertyNames();
+        for (String propName : props) {
+            System.out.println("propName = "+propName);
+            Object prop = bufferedImage.getProperty(propName);
+            System.out.println(prop);
+        }
+        */
+        ImageProducer imageProducer = bufferedImage.getSource();
+        System.out.println(imageProducer);
+        bufferedImage.getData();
+
+
+        BufferedImage destImage = new BufferedImage(bufferedImage.getWidth(), bufferedImage.getHeight(), BufferedImage.TYPE_INT_RGB);
+
+        Graphics2D graphics2D = (Graphics2D) destImage.getGraphics();
+        //graphics2D.rotate(0, bufferedImage.getWidth() / 2, bufferedImage.getHeight() / 2);
+
+//        graphics2D.drawImage(bufferedImage, null, 0, 0);
+//        ImageIO.write(destImage, "jpg", dest);
+//        System.out.println("旋转完成");
+
+
+        graphics2D.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
+        graphics2D.setRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING, RenderingHints.VALUE_TEXT_ANTIALIAS_ON);
+        graphics2D.drawImage(bufferedImage.getScaledInstance(bufferedImage.getWidth(), bufferedImage.getHeight(), Image.SCALE_SMOOTH), 0, 0, null);
+        JPEGImageWriteParam jepgParams = new JPEGImageWriteParam(null);
+        jepgParams.setCompressionMode(ImageWriteParam.MODE_EXPLICIT);
+        jepgParams.setCompressionQuality(1f);
+        final ImageWriter writer = ImageIO.getImageWritersByFormatName("jpg").next();
+
+        writer.setOutput(new FileImageOutputStream(dest));
+        writer.write(null, new IIOImage(destImage, null, null), jepgParams);
+        writer.dispose();
+        graphics2D.dispose();
+        System.out.println("旋转完成");
+    }
+
 }

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

@@ -0,0 +1,60 @@
+spring.datasource.url=jdbc:mysql://127.0.0.1:3306/stmms-ms-2?useUnicode=true&characterEncoding=UTF-8
+spring.datasource.username=root
+spring.datasource.password=1234
+
+#spring.datasource.url=jdbc:mysql://192.168.1.74:3306/stmms-ms-2?useUnicode=true&characterEncoding=UTF-8
+#spring.datasource.username=root
+#spring.datasource.password=root
+
+
+spring.datasource.validation-query=SELECT 1 FROM DUAL
+spring.datasource.test-on-borrow=true
+
+#redis
+#spring.redis.host=192.168.199.102
+#spring.redis.port=32768
+
+server.port=9000
+server.compression.enabled=true
+server.compression.mime-types: application/json,application/xml,text/html,text/xml,text/plain,text/css,application/javascript
+
+
+logging.file=./logs/sys.log
+logging.level.org.springframework=ERROR
+logging.level.org.hibernate=ERROR
+
+spring.jpa.show-sql=false
+spring.jpa.hibernate.ddl-auto=update
+
+
+spring.http.multipart.max-file-size=10Mb
+
+#表示隔多少档位才会出现仲裁
+app.config.deviation=2
+#超级管理员账号
+app.admin.loginName=admin-cy
+#超级管理员密码
+app.admin.password=123456
+#大图存放目录
+sys.config.imageDir=D:\\stmms-ms\\images
+#缩略图存放目录
+sys.config.thumbDir=D:\\stmms-ms\\thumbs
+#分数水印图存放目录
+sys.config.watermark=D:\\stmms-ms\\watermark
+#图片压缩比
+sys.config.compression.percent=60
+#图片服务器端口
+sys.config.imageServer.port=9000
+#图片服务器ip
+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}
+
+
+app.snapshot.fdsql=D:\\stmms-ms\\stmms-ms-2-fendang.sql
+app.snapshot.dfsql=D:\\stmms-ms\\stmms-ms-2-dafen.sql
+app.snapshot.fpsql=D:\\stmms-ms\\stmms-ms-2-fuping.sql

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

@@ -1,4 +1,4 @@
-spring.profiles.active=test
+spring.profiles.active=dev
 
 spring.datasource.url=jdbc:mysql://localhost:3306/stmms-ms-2?useUnicode=true&characterEncoding=UTF-8
 spring.datasource.username=root
@@ -15,7 +15,7 @@ spring.datasource.test-on-borrow=true
 #redis
 #spring.redis.host=192.168.199.102
 #spring.redis.port=32768
-
+server.tomcat.max-threads=256
 server.port=8080
 server.compression.enabled=true
 server.compression.mime-types: application/json,application/xml,text/html,text/xml,text/plain,text/css,application/javascript
@@ -30,22 +30,30 @@ spring.jpa.hibernate.ddl-auto=update
 
 
 spring.http.multipart.max-file-size=10Mb
-
+#表示隔多少档位才会出现仲裁
 app.config.deviation=2
+#超级管理员账号
 app.admin.loginName=admin-cy
+#超级管理员密码
 app.admin.password=123456
-
+#大图存放目录
 sys.config.imageDir=/home/xuhuaq/stmms-ms/images
+#缩略图存放目录
 sys.config.thumbDir=/home/xuhuaq/stmms-ms/thumbs
+#分数水印图存放目录
+sys.config.watermark=/home/xuhuaq/stmms-ms/watermark
 #sys.config.imageDir=.\\static\\images
 #sys.config.thumbDir=.\\static\\thumbs
+#图片压缩比
 sys.config.compression.percent=60
 #sys.config.imageServer.port=3000
+#图片服务器端口
 sys.config.imageServer.port=8080
+#图片服务器ip
 sys.config.imageServer.ip=118.122.113.10
 
 
-#袁攀配置
+#前端部署目录
 web.upload-path=/home/xuhuaq/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}