浏览代码

修改日志

yumeng 5 年之前
父节点
当前提交
1dc5cbca5f

+ 0 - 10
jeecg-boot-module-system/src/main/java/org/jeecg/JeecgApplication.java

@@ -47,14 +47,4 @@ public class JeecgApplication {
         return new RestTemplate();
     }
 
-    @Bean
-    public MultipartConfigElement multipartConfigElement() {
-        MultipartConfigFactory factory = new MultipartConfigFactory();
-        //  单个数据大小
-        factory.setMaxFileSize("10240KB"); // KB,MB
-        /// 总上传数据大小
-        factory.setMaxRequestSize("102400KB");
-        return factory.createMultipartConfig();
-    }
-
 }

+ 1 - 22
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/MaterialInfoController.java

@@ -3,7 +3,7 @@ package org.jeecg.modules.ctop.controller;
 
 import cn.com.ctop.common.module.entity.MaterialInfo;
 import cn.com.ctop.common.module.service.IMaterialInfoService;
-import cn.com.ctop.common.module.utils.*;
+import cn.com.ctop.common.module.utils.Check;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -35,7 +35,6 @@ import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import java.text.ParseException;
 import java.util.Arrays;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -61,26 +60,6 @@ public class MaterialInfoController {
     }
 
 
-    @RequestMapping(value = "/getMd5", consumes = "multipart/form-data;charset=utf-8")
-    public String getMd5(@RequestParam("multipartFile") MultipartFile multipartFile, HttpServletRequest request) throws IOException {
-
-        Map<String, Object> returnMap = new HashMap<>();
-        try {
-            String savaPath = PropertiesUtils.getValue("kuaishou_config", "video_sava_path");
-            FileUploadTool fileUploadTool = new FileUploadTool();
-            FileEntity entity;
-            entity = fileUploadTool.createFile(multipartFile, request, savaPath);
-
-            String path = entity.getPath();
-            String md5 = LoadFileUtil.getMD5(path);
-            return md5;
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return null;
-    }
-
-
     @GetMapping(value = "/getDetail")
     public JSONObject getDetail(String materialId) {
 

+ 0 - 2
module-kuaishou/src/main/resources/log4j.properties

@@ -1,2 +0,0 @@
-log4j.logger.org.apache.http=debug
-log4j.logger.httpclient.wire=debug

+ 0 - 19
module-kuaishou/src/main/resources/logback.xml

@@ -1,19 +0,0 @@
-<configuration debug="true">
-    <logger name="org.apache" level="DEBUG"/>
-    <logger name="org.apache.http.wire" level="DEBUG"/>
-    <logger name="org.apache.http.headers" level="DEBUG"/>
-
-    <property name="CONSOLE_LOG_PATTERN"
-              value="%date{yyyy-MM-dd HH:mm:ss}  %highlight(%-5level) %magenta(%-4relative) --- [%yellow(%15.15thread)] %cyan(%-40.40logger{39}) : %msg%n"/>
-
-
-    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-        <encoder>
-            <pattern>${CONSOLE_LOG_PATTERN}</pattern>
-        </encoder>
-    </appender>
-
-    <root level="ERROR">
-        <appender-ref ref="STDOUT"/>
-    </root>
-</configuration>