Merge branch 'chuanyin-2020-v1.0' into chuanyin-2020-v2.0

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

@@ -190,11 +190,15 @@ public class UserApi {
         if (markUser != null && !domain.getId().equals(markUser.getId())) {
             throw new RuntimeException("该账号已经存在");
         }
-        //修改用户名、密码
-        domain.setLoginName(user.getLoginName());
-        domain.setName(user.getLoginName());
-        domain.setPassword(user.getPassword());
-        domain.setEnabled(user.isEnabled());
+        //启用禁用
+        if(domain.isEnabled() != user.isEnabled()){
+            domain.setEnabled(user.isEnabled());
+        } else {
+            //修改用户名、密码
+            domain.setLoginName(user.getLoginName());
+            domain.setName(user.getLoginName());
+            domain.setPassword(user.getPassword());
+        }
         markUserRepo.save(domain);
     }
 

stmms-ms-core/src/main/java/cn/com/qmth/stmms/ms/core/domain/user/MarkUser.java

@@ -100,7 +100,7 @@ public class MarkUser extends AbstractUser {
             int x = ran.nextInt(9);
             sb.append(x);
         }
-        this.setPassword("123456");
+//        this.setPassword("123456");
     }
 
     public Subject getSubject() {

stmms-ms-marking/src/main/java/cn/com/qmth/stmms/ms/marking/assembler/PaperAssembler.java

@@ -65,16 +65,16 @@ public class PaperAssembler {
         if (ParamCache.paramMap.get(paper.getWorkId()).getImageEncrypt() == 1) {
             imgSrc = systemConfig.getImageUrl(paper.getWorkId(), paper.getSubject().ordinal(), student.getId(), SystemConstant.IMAGE);
             thumbSrc = systemConfig.getThumbUrl(paper.getWorkId(), paper.getSubject().ordinal(), student.getId(), SystemConstant.THUMB);
-            if(paper.isManual()) {
+            /*if(paper.isManual()) {
                 imgSrc = systemConfig.getSheetUrl(paper.getWorkId(), paper.getSubject().ordinal(), student.getId(), SystemConstant.IMAGE);
-            }
+            }*/
         } else {
             imgSrc = systemConfig.getImageUrl(paper.getWorkId(), paper.getSubject().toString(), paper.getAreaCode(), fileName);
             thumbSrc = systemConfig.getThumbUrl(paper.getWorkId(), paper.getSubject().toString(), paper.getAreaCode(), fileName);
-            if(paper.isManual()) {
+            /*if(paper.isManual()) {
                 imgSrc = systemConfig.getSheetUrl(paper.getWorkId(), paper.getSubject().toString(), paper.getAreaCode(), fileName);
                 thumbSrc = systemConfig.getSheetUrl(paper.getWorkId(), paper.getSubject().toString(), paper.getAreaCode(), fileName);
-            }
+            }*/
         }
         //查询阶段
         MarkSubject markSubject = markSubjectRepo.findOne(paper.getWorkId() + "-" + paper.getSubject());