更新数学试卷

deploy.sh

@@ -2,8 +2,8 @@ date=`date +%Y%m%d_%H%M%S`
 cd /home/jenkins/workspace/diagnosis
 docker build -t feick/diagnosis:$date .
 echo "current tag is $date"
-#sed -i "s/\${date}/$(echo $date)/g" deployment.yaml
-#kubectl apply -f deployment.yaml
+sed -i "s/\${date}/$(echo $date)/g" deployment.yaml
+kubectl apply -f deployment.yaml
 #sed -i "s/\${date}/$(echo $date)/g" deployment-prod.yaml
 #kubectl apply -f deployment-prod.yaml
 echo "build finish."

src/main/java/com/yaoxiang/diagnosis/controller/SpecialReportController.java

@@ -24,6 +24,6 @@ public class SpecialReportController {
 
     @GetMapping("/generate2")
     public SpecialResult generate2(Long pid,Long uid){
-        return specialReportService.generate(pid,uid);
+        return specialReportService.generate2(pid,uid);
     }
 }

src/main/java/com/yaoxiang/diagnosis/entity/Authority.java

@@ -1,5 +1,7 @@
 package com.yaoxiang.diagnosis.entity;
 
+import io.swagger.annotations.ApiModelProperty;
+
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
@@ -11,6 +13,8 @@ public class Authority {
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
     private String name;
+    @ApiModelProperty("权限类型 function business ")
+    private String type;
     private String des;
 
     public Long getId() {
@@ -29,6 +33,14 @@ public class Authority {
         this.name = name;
     }
 
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
     public String getDes() {
         return des;
     }

src/main/java/com/yaoxiang/diagnosis/word/WordService.java

@@ -102,7 +102,7 @@ public class WordService {
             if (text.matches(optionPattern)) {
                 //匹配到选项，至少有2个字符
                 QuestionOption option = initOption(i++, text);
-                String optionNoContent = String.format("parseQuestion,题号为%s的题目选项 %s 未检测到内容，题目内容为“%s”，请检查", question.getNumber(), text.charAt(0), content);
+                String optionNoContent = String.format("parseQuestion,题号为%s的题目选项 %s 未检测到内容，题目内容为“%s”，请检查", question.getNumber(), text, content);
                 Assert.hasText(option.getContent(), optionNoContent);
                 options.add(option);
             } else {