Эх сурвалжийг харах

add 本地上传方法,yml修改上传文件目录

lenovodn 2 жил өмнө
parent
commit
78328fcca5

+ 53 - 53
jeecg-boot-base-core/src/main/java/org/jeecg/common/util/filter/FileTypeFilter.java

@@ -25,59 +25,59 @@ public class FileTypeFilter {
     static {
         FILE_TYPE_MAP.put("3c25402070616765206c", "jsp");
         FILE_TYPE_MAP.put("3c3f7068700a0a2f2a2a0a202a205048", "php");
-       /* fileTypeMap.put("ffd8ffe000104a464946", "jpg");
-        fileTypeMap.put("89504e470d0a1a0a0000", "png");
-        fileTypeMap.put("47494638396126026f01", "gif");
-        fileTypeMap.put("49492a00227105008037", "tif");
-        fileTypeMap.put("424d228c010000000000", "bmp");
-        fileTypeMap.put("424d8240090000000000", "bmp");
-        fileTypeMap.put("424d8e1b030000000000", "bmp");
-        fileTypeMap.put("41433130313500000000", "dwg");
-        fileTypeMap.put("3c21444f435459504520", "html");
-        fileTypeMap.put("3c21646f637479706520", "htm");
-        fileTypeMap.put("48544d4c207b0d0a0942", "css");
-        fileTypeMap.put("696b2e71623d696b2e71", "js");
-        fileTypeMap.put("7b5c727466315c616e73", "rtf");
-        fileTypeMap.put("38425053000100000000", "psd");
-        fileTypeMap.put("46726f6d3a203d3f6762", "eml");
-        fileTypeMap.put("d0cf11e0a1b11ae10000", "doc");
-        fileTypeMap.put("5374616E64617264204A", "mdb");
-        fileTypeMap.put("252150532D41646F6265", "ps");
-        fileTypeMap.put("255044462d312e350d0a", "pdf");
-        fileTypeMap.put("2e524d46000000120001", "rmvb");
-        fileTypeMap.put("464c5601050000000900", "flv");
-        fileTypeMap.put("00000020667479706d70", "mp4");
-        fileTypeMap.put("49443303000000002176", "mp3");
-        fileTypeMap.put("000001ba210001000180", "mpg");
-        fileTypeMap.put("3026b2758e66cf11a6d9", "wmv");
-        fileTypeMap.put("52494646e27807005741", "wav");
-        fileTypeMap.put("52494646d07d60074156", "avi");
-        fileTypeMap.put("4d546864000000060001", "mid");
-        fileTypeMap.put("504b0304140000000800", "zip");
-        fileTypeMap.put("526172211a0700cf9073", "rar");
-        fileTypeMap.put("235468697320636f6e66", "ini");
-        fileTypeMap.put("504b03040a0000000000", "jar");
-        fileTypeMap.put("4d5a9000030000000400", "exe");
-        fileTypeMap.put("3c25402070616765206c", "jsp");
-        fileTypeMap.put("4d616e69666573742d56", "mf");
-        fileTypeMap.put("3c3f786d6c2076657273", "xml");
-        fileTypeMap.put("494e5345525420494e54", "sql");
-        fileTypeMap.put("7061636b616765207765", "java");
-        fileTypeMap.put("406563686f206f66660d", "bat");
-        fileTypeMap.put("1f8b0800000000000000", "gz");
-        fileTypeMap.put("6c6f67346a2e726f6f74", "properties");
-        fileTypeMap.put("cafebabe0000002e0041", "class");
-        fileTypeMap.put("49545346030000006000", "chm");
-        fileTypeMap.put("04000000010000001300", "mxp");
-        fileTypeMap.put("504b0304140006000800", "docx");
-        fileTypeMap.put("6431303a637265617465", "torrent");
-        fileTypeMap.put("6D6F6F76", "mov");
-        fileTypeMap.put("FF575043", "wpd");
-        fileTypeMap.put("CFAD12FEC5FD746F", "dbx");
-        fileTypeMap.put("2142444E", "pst");
-        fileTypeMap.put("AC9EBD8F", "qdf");
-        fileTypeMap.put("E3828596", "pwl");
-        fileTypeMap.put("2E7261FD", "ram");*/
+        FILE_TYPE_MAP.put("ffd8ffe000104a464946", "jpg");
+        FILE_TYPE_MAP.put("89504e470d0a1a0a0000", "png");
+        FILE_TYPE_MAP.put("47494638396126026f01", "gif");
+        FILE_TYPE_MAP.put("49492a00227105008037", "tif");
+        FILE_TYPE_MAP.put("424d228c010000000000", "bmp");
+        FILE_TYPE_MAP.put("424d8240090000000000", "bmp");
+        FILE_TYPE_MAP.put("424d8e1b030000000000", "bmp");
+        FILE_TYPE_MAP.put("41433130313500000000", "dwg");
+        FILE_TYPE_MAP.put("3c21444f435459504520", "html");
+        FILE_TYPE_MAP.put("3c21646f637479706520", "htm");
+        FILE_TYPE_MAP.put("48544d4c207b0d0a0942", "css");
+        FILE_TYPE_MAP.put("696b2e71623d696b2e71", "js");
+        FILE_TYPE_MAP.put("7b5c727466315c616e73", "rtf");
+        FILE_TYPE_MAP.put("38425053000100000000", "psd");
+        FILE_TYPE_MAP.put("46726f6d3a203d3f6762", "eml");
+        FILE_TYPE_MAP.put("d0cf11e0a1b11ae10000", "doc");
+        FILE_TYPE_MAP.put("5374616E64617264204A", "mdb");
+        FILE_TYPE_MAP.put("252150532D41646F6265", "ps");
+        FILE_TYPE_MAP.put("255044462d312e350d0a", "pdf");
+        FILE_TYPE_MAP.put("2e524d46000000120001", "rmvb");
+        FILE_TYPE_MAP.put("464c5601050000000900", "flv");
+        FILE_TYPE_MAP.put("00000020667479706d70", "mp4");
+        FILE_TYPE_MAP.put("49443303000000002176", "mp3");
+        FILE_TYPE_MAP.put("000001ba210001000180", "mpg");
+        FILE_TYPE_MAP.put("3026b2758e66cf11a6d9", "wmv");
+        FILE_TYPE_MAP.put("52494646e27807005741", "wav");
+        FILE_TYPE_MAP.put("52494646d07d60074156", "avi");
+        FILE_TYPE_MAP.put("4d546864000000060001", "mid");
+        FILE_TYPE_MAP.put("504b0304140000000800", "zip");
+        FILE_TYPE_MAP.put("526172211a0700cf9073", "rar");
+        FILE_TYPE_MAP.put("235468697320636f6e66", "ini");
+        FILE_TYPE_MAP.put("504b03040a0000000000", "jar");
+        FILE_TYPE_MAP.put("4d5a9000030000000400", "exe");
+        FILE_TYPE_MAP.put("3c25402070616765206c", "jsp");
+        FILE_TYPE_MAP.put("4d616e69666573742d56", "mf");
+        FILE_TYPE_MAP.put("3c3f786d6c2076657273", "xml");
+        FILE_TYPE_MAP.put("494e5345525420494e54", "sql");
+        FILE_TYPE_MAP.put("7061636b616765207765", "java");
+        FILE_TYPE_MAP.put("406563686f206f66660d", "bat");
+        FILE_TYPE_MAP.put("1f8b0800000000000000", "gz");
+        FILE_TYPE_MAP.put("6c6f67346a2e726f6f74", "properties");
+        FILE_TYPE_MAP.put("cafebabe0000002e0041", "class");
+        FILE_TYPE_MAP.put("49545346030000006000", "chm");
+        FILE_TYPE_MAP.put("04000000010000001300", "mxp");
+        FILE_TYPE_MAP.put("504b0304140006000800", "docx");
+        FILE_TYPE_MAP.put("6431303a637265617465", "torrent");
+        FILE_TYPE_MAP.put("6D6F6F76", "mov");
+        FILE_TYPE_MAP.put("FF575043", "wpd");
+        FILE_TYPE_MAP.put("CFAD12FEC5FD746F", "dbx");
+        FILE_TYPE_MAP.put("2142444E", "pst");
+        FILE_TYPE_MAP.put("AC9EBD8F", "qdf");
+        FILE_TYPE_MAP.put("E3828596", "pwl");
+        FILE_TYPE_MAP.put("2E7261FD", "ram");
     }
 
     /**

+ 2 - 2
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/entity/DiagnosisTreatment.java

@@ -120,11 +120,11 @@ public class DiagnosisTreatment implements Serializable {
     @ApiModelProperty(value = "备注说明")
     private java.lang.String remark;
 	/**状态*/
-	@Excel(name = "状态", width = 15)
+//	@Excel(name = "状态", width = 15)
     @ApiModelProperty(value = "状态")
     private java.lang.String state;
 	/**版本*/
-	@Excel(name = "版本", width = 15)
+//	@Excel(name = "版本", width = 15)
     @ApiModelProperty(value = "版本")
     private java.lang.Integer revision;
 	/**创建人*/

+ 2 - 2
jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml

@@ -181,9 +181,9 @@ jeecg:
     app: http://localhost:8051
   path:
     #文件上传根目录 设置
-    upload: /opt/upFiles
+    upload: /Users/lanhongjie/Documents/temp
     #webapp文件路径
-    webapp: /opt/webapp
+    webapp: /Users/lanhongjie/Documents/temp/webapp
   shiro:
     excludeUrls: /test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/**
   #阿里云oss存储和大鱼短信秘钥配置