Merge branch 'master' into superb

common/src/main/java/com/koobietech/eas/common/utils/StudentArchiveGenerator.java

@@ -13,10 +13,10 @@ public class StudentArchiveGenerator {
 
     private static final String STUDENT_CODE_PEREFIX = "ST";
     private static final int STUDENT_CODE_LENGTH = 25;
-    private static final int STUDENT_NUM_LENGTH = 10;
+    private static final int STUDENT_NUM_LENGTH = 8;
 
     public  static String generateArchiveCode(String studentNumber, String fileTypeCode) {
-        String studentNum = studentNumber.substring(2, STUDENT_NUM_LENGTH);
+        String studentNum = studentNumber.substring(2, STUDENT_NUM_LENGTH + 3).replace("X", "");
         String nowDate = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyMMddHhmmss", Locale.CHINA));
         String archiveCode = ARCHIVE_CODE_PREFIX + studentNum + nowDate + fileTypeCode;
         if (archiveCode.length() < ARCHIVE_CODE_LENGTH) {

service/src/main/java/com/koobietech/eas/service/impl/EasStuProfileServiceImpl.java

@@ -22,7 +22,7 @@ public class EasStuProfileServiceImpl implements EasStuProfileService {
     private static final Logger LOGGER = LoggerFactory.getLogger(EasStuProfileServiceImpl.class);
     private static final String TEMPLATE_PATH = "temp/StuRegistTemp.docx";
     private static final String PHOTO_PATH = "temp/kun.jpeg";
-    private static final String OUTPUT_PATH = "C:\\Users\\lc\\Desktop\\test.docx";
+    private static final String OUTPUT_PATH = "D:\\myDesk\\test.docx";
 
     @Override
     public JsonResult StuProfileDownload(EasArcTlsStudents easArcTlsStudents) {