Merge branch 'dev'

1

themis-backend/src/main/java/com/qmth/themis/backend/api/SysController.java

@@ -224,7 +224,7 @@ public class SysController {
             }
             return ResultUtil.ok(Collections.singletonMap("logo", tbOrg.getLogo()));
         } else {
-            return ResultUtil.ok(Collections.singletonMap("logo", null));
+            return ResultUtil.ok(Collections.singletonMap("logo", dictionaryConfig.sysDomain().getAdminLogoUrl()));
         }
     }
 

themis-backend/src/main/resources/application.properties

@@ -141,6 +141,7 @@ sys.config.serverUpload=/Users/king/git/themis-files/
 #sys.config.deviceId=1
 sys.config.fileHost=localhost:6001
 sys.config.serverHost=localhost:6001
+sys.config.adminLogoUrl=http://qmth-test.oss-cn-shenzhen.aliyuncs.com/frontend/wx_logo.png
 spring.resources.static-locations=file:${sys.config.serverUpload},classpath:/META-INF/resources/,classpath:/resources/
 
 #============================================================================

themis-business/src/main/java/com/qmth/themis/business/domain/SysDomain.java

@@ -21,12 +21,22 @@ public class SysDomain implements Serializable {
     String fileHost;
 
     String serverHost;
+
+    String adminLogoUrl;
     
     /**
      * 本地临时文件目录
      */
     String tempDataDir;
 
+    public String getAdminLogoUrl() {
+        return adminLogoUrl;
+    }
+
+    public void setAdminLogoUrl(String adminLogoUrl) {
+        this.adminLogoUrl = adminLogoUrl;
+    }
+
     public String getFileHost() {
         return fileHost;
     }

themis-business/src/main/java/com/qmth/themis/business/service/impl/TBAttachmentServiceImpl.java

@@ -69,6 +69,9 @@ public class TBAttachmentServiceImpl extends ServiceImpl<TBAttachmentMapper, TBA
                     throw new BusinessException("文件格式只能为" + attachmentTypeList.toString());
                 }
             }
+            if (Objects.nonNull(fileName) && fileName.length() > 64) {
+                throw new BusinessException("文件名长度不能超过64个字符");
+            }
             long size = file.getSize();
             BigDecimal b = new BigDecimal(size);
             BigDecimal num = new BigDecimal(1024);