Merge branch 'master' of http://47.100.37.243:10080/ZHOU/yunsu

# Conflicts:
#	target/classes/main/resources/mapper/MouldEquipmentMapper.xml
#	target/classes/main/resources/mapper/MouldMapper.xml

cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/MouldFileServiceImpl.java

@@ -70,6 +70,7 @@ public class MouldFileServiceImpl extends ServiceImpl<MouldFileMapper, MouldFile
 
     @Override
     public HttpRespMsg addFile(UserVO userVO, Integer blongType, MultipartFile file, MultipartFile file2, String path) {
+        System.out.println("file2-----"+file2.getOriginalFilename());
         HttpRespMsg msg = new HttpRespMsg();
         User user = userMapper.selectOne(new QueryWrapper<User>().eq("head_imgurl", userVO.getToken()));
         Mould mould = mouldMapper.selectById(userVO.getMouldId());
@@ -170,7 +171,8 @@ public class MouldFileServiceImpl extends ServiceImpl<MouldFileMapper, MouldFile
                         pdfFile.setSourceFileUrl(projectFile.getFileUrl());
                         pdfFileMapper.insert(pdfFile);
                     }
-                    if (blongType == 5 && file2 != null && !file2.isEmpty()) {
+                   if (blongType == 5 && file2 != null && !file2.isEmpty()) {
+                        //上传的是pdf文件则直接保存
                         if(".pdf".equals(sufix2)){
                             PdfFile pdfFile = new PdfFile();
                             pdfFile.setPdfUrl(projectFile.getFileUrl2());

target/classes/main/resources/application.properties

@@ -13,7 +13,7 @@ spring.thymeleaf.jackson.date-format=yyyy-MM-dd HH:mm:ss
 # ####################################################################################################
 # Êý¾ÝÔ´ÅäÖÃ
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
-spring.datasource.url=jdbc:mysql://118.190.47.230:3306/cloud_model_test?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8
+spring.datasource.url=jdbc:mysql://118.190.47.230:3306/new_cloud_model?useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8
 spring.datasource.username=root
 spring.datasource.password=p011430seya1026
 #spring.datasource.druid.test-on-borrow=true