添加多线程

WxrLZQ · WxrLZQ · commit e6aafd859b33 · 2021-09-24T15:47:17.000+08:00
把截图功能设置为线程任务提高响应效率
diff --git a/springboot-dubbo-api/src/main/java/com/lzq/api/pojo/Example.java b/springboot-dubbo-api/src/main/java/com/lzq/api/pojo/Example.java
@@ -27,7 +27,7 @@ public class Example implements Serializable {
     /**
      * 主键
      */
-    @TableId(value = "example_id")
+    @TableId(value = "example_id",type =IdType.ID_WORKER_STR )
     @JsonProperty("exampleId")
     private String exampleId;
     /**
diff --git a/springboot-dubbo-api/src/main/java/com/lzq/api/service/ExampleService.java b/springboot-dubbo-api/src/main/java/com/lzq/api/service/ExampleService.java
@@ -21,7 +21,7 @@ public interface ExampleService {
      * @param example 实例对象
      * @return 实例对象
      */
-    Boolean insert(Example example);
+    Example insert(Example example);
 
     /**
      * 修改数据
diff --git a/springboot-dubbo-service/src/main/java/com/lzq/dubboservice/service/ExampleServiceImpl.java b/springboot-dubbo-service/src/main/java/com/lzq/dubboservice/service/ExampleServiceImpl.java
@@ -22,8 +22,8 @@
 public class ExampleServiceImpl extends ServiceImpl<ExampleMapper, Example> implements ExampleService {
 
     @Override
-    public Boolean insert(Example example) {
-        return baseMapper.insert(example) > 0 ? true : false;
+    public Example insert(Example example) {
+        return baseMapper.insert(example) > 0 ? example : null;
     }
 
     @Override
diff --git a/springboot-dubbo-service/src/main/resources/application.yml b/springboot-dubbo-service/src/main/resources/application.yml
@@ -1,6 +1,6 @@
 spring:
   profiles:
-    active: prod
+    active: dev
   application:
     #项目名称
     name: service
diff --git a/springboot-dubbo-web/src/main/java/com/lzq/web/config/CustomMultiThreadingConfig.java b/springboot-dubbo-web/src/main/java/com/lzq/web/config/CustomMultiThreadingConfig.java
@@ -0,0 +1,33 @@
+package com.lzq.web.config;
+
+import org.springframework.aop.interceptor.AsyncUncaughtExceptionHandler;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.scheduling.annotation.AsyncConfigurer;
+import org.springframework.scheduling.annotation.EnableAsync;
+import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
+
+import java.util.concurrent.Executor;
+
+/**
+ * @author ：LZQ
+ * @description：TODO
+ * @date ：2021/9/24 9:17
+ */
+@Configuration
+@EnableAsync
+public class CustomMultiThreadingConfig implements AsyncConfigurer {
+    @Override
+    public Executor getAsyncExecutor() {
+        ThreadPoolTaskExecutor taskExecutor = new ThreadPoolTaskExecutor();
+        taskExecutor.setCorePoolSize(10);
+        taskExecutor.setMaxPoolSize(20);
+        taskExecutor.setQueueCapacity(30);
+        taskExecutor.initialize();
+        return taskExecutor;
+    }
+
+    @Override
+    public AsyncUncaughtExceptionHandler getAsyncUncaughtExceptionHandler() {
+        return null;
+    }
+}
diff --git a/springboot-dubbo-web/src/main/java/com/lzq/web/controller/ExampleController.java b/springboot-dubbo-web/src/main/java/com/lzq/web/controller/ExampleController.java
@@ -62,6 +62,9 @@ public class ExampleController {
     @Autowired
     private RabbitTemplate rabbitTemplate;
 
+    @Autowired
+    ExampleUtils exampleUtils;
+
     @Value("${resources.route}")
     public String fileLocation;
 
@@ -81,7 +84,7 @@ public Map<String, Object> CreateFile(HttpServletRequest request,Example example
         example.setUsername(username);
         log.info("开始"+new Date(System.currentTimeMillis()).toString());
         //生成22位uuid
-        String uuid = ExampleUtils.getUUid();
+        // String uuid = ExampleUtils.getUUid();
         Boolean bol =false;
         //随机生成uuid
         //判断用户是保存实例还是第一次创建实例
@@ -90,25 +93,25 @@ public Map<String, Object> CreateFile(HttpServletRequest request,Example example
                 //通过id查询实例信息
                 Example query = exampleService.queryById(example.getExampleId());
                 //获取实例的文件名和图片key
-                example.setFileName(query.getFileName());
                 example.setImg(query.getImg());
+                //修改实例内容
+                bol = contentService.updateContent(exampleContent);
+                String file = ExampleUtils.FILE_LOCATION + example.getUsername() + "/" + query.getFileName() + ".html";
                 //用户保存实例
-                bol = ExampleUtils.SaveExampleContent(example, exampleContent, content, exampleService, contentService);
-                log.info("结束"+new Date(System.currentTimeMillis()).toString());
+                exampleUtils.SaveExampleContent(example,content, exampleService,file);
                 return ResultMapUtils.ResultMap(bol,0,"保存实例内容成功");
             } catch (IOException e) {
                 e.printStackTrace();
                 return ResultMapUtils.ResultMap(false,0,"修改文件失败");
             }
         }else {
-            example.setExampleId(uuid);
             //用户第一次创建实例
             //获取当前时间毫秒
             long time = System.currentTimeMillis();
             //创建编译后的html文件
             String file = ExampleUtils.FILE_LOCATION + example.getUsername() + "/" + time + ".html";
             //初始化模板
-            File initfile = new File(ExampleUtils.INIT_HTML);
+            // File initfile = new File(ExampleUtils.INIT_HTML);
             File existfile = new File(file);
             try {
                 //创建文件
@@ -117,18 +120,23 @@ public Map<String, Object> CreateFile(HttpServletRequest request,Example example
                 }
                 existfile.createNewFile();
                 //把初始化模板拷贝到新建的html中
-                FileUtils.copyFile(initfile, existfile);
+                // FileUtils.copyFile(initfile, existfile);
                 //插入编译后的文件名称time
                 example.setFileName(Long.toString(time));
                 //把文件信息插入到数据库中
-                bol = exampleService.insert(example);
-                if (bol){
+                example = exampleService.insert(example);
+                System.out.println(example);
+                if (example!=null){
                     //更新用户的个人作品数
                     accountService.addWorks(example.getUsername());
                     //保存实例内容
-                    bol = ExampleUtils.SaveExampleContent(example, exampleContent, content, exampleService, contentService);
-                    log.info("结束"+new Date(System.currentTimeMillis()).toString());
+                    exampleContent.setExampleId(example.getExampleId());
+                    //第一次保存时在表中添加实例内容
+                    bol = contentService.addContent(exampleContent);
+                    //用户保存实例
+                    exampleUtils.SaveExampleContent(example,content, exampleService,file);
                 }
+                log.info(example.getExampleId());
                 return ResultMapUtils.ResultMap(bol, 0, example.getExampleId());
             } catch (Exception e) {
                 e.printStackTrace();
diff --git a/springboot-dubbo-web/src/main/java/com/lzq/web/utils/ExampleUtils.java b/springboot-dubbo-web/src/main/java/com/lzq/web/utils/ExampleUtils.java
@@ -2,9 +2,7 @@
 
 
 import com.luciad.imageio.webp.WebPWriteParam;
-import com.lzq.api.pojo.Content;
 import com.lzq.api.pojo.Example;
-import com.lzq.api.service.ContentService;
 import com.lzq.api.service.ExampleService;
 import com.qiniu.util.StringUtils;
 import lombok.extern.slf4j.Slf4j;
@@ -14,6 +12,7 @@
 import org.openqa.selenium.chrome.ChromeDriver;
 import org.openqa.selenium.chrome.ChromeOptions;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Component;
 
 import javax.imageio.IIOImage;
@@ -24,7 +23,7 @@
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
-import java.util.UUID;
+import java.util.Date;
 import java.util.concurrent.TimeUnit;
 
 @Slf4j
@@ -39,8 +38,6 @@ public class ExampleUtils {
 
     public static String BUCKET;
 
-    private static final char[] _UU64 = "-0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ_abcdefghijklmnopqrstuvwxyz".toCharArray();
-
     @Value("${resources.InitHtml}")
     public void setInitHtml(String initHtml) {
         INIT_HTML = initHtml;
@@ -86,7 +83,7 @@ public static String screenshot(String username, String filename) throws IOExcep
         Dimension dim = new Dimension(winWidth, winHeight);
         broswer.manage().window().setSize(dim);
         //等待1秒,
-        broswer.manage().timeouts().implicitlyWait(2, TimeUnit.SECONDS);
+        broswer.manage().timeouts().implicitlyWait(1, TimeUnit.SECONDS);
         //打开url
         broswer.get("http://localhost:8090/" + username + "/" + filename + ".html");
         //截图
@@ -110,26 +107,22 @@ public static String screenshot(String username, String filename) throws IOExcep
      * 保存实例
      *
      * @param example
-     * @param exampleContent
      * @param content        编译后的内容
      * @param exampleService
-     * @param contentService
+     * @param file
      * @return
      * @throws IOException
      */
-    public static Boolean SaveExampleContent(Example example, Content exampleContent, String content, ExampleService exampleService, ContentService contentService) throws IOException {
-        //获取html文件路劲
-        //实例内容和实例进行绑定
-        exampleContent.setExampleId(example.getExampleId());
-        String file = FILE_LOCATION + example.getUsername() + "/" + example.getFileName() + ".html";
-        log.info(file);
+    @Async
+    public void SaveExampleContent(Example example, String content, ExampleService exampleService,String file) throws IOException {
+        log.info("开始截图-------"+new Date(System.currentTimeMillis()));
+        //获取文件输出流
         FileOutputStream fos = new FileOutputStream(new File(file));
         String screenshot = null;
         Boolean bol = false;
         try {
             //包编译后的html内容覆盖原来的内容
             fos.write(content.getBytes("UTF-8"));
-            // fos.write(content.getBytes("GBK"))   ;
             //第一次保存时生成图片
             if (StringUtils.isNullOrEmpty(example.getImg())) {
                 //截图后进行保存
@@ -145,20 +138,15 @@ public static Boolean SaveExampleContent(Example example, Content exampleContent
             }
             //更新实例
             bol = exampleService.update(example);
-            //修改实例内容
-            bol = contentService.updateContent(exampleContent);
-            //当表无该数据时插入数据
-            if (!bol) {
-                //第一次保存时在表中添加实例内容
-                bol = contentService.addContent(exampleContent);
-            }
-            return bol;
+            log.info("截图成功");
         } catch (IOException e) {
             e.printStackTrace();
-            return bol;
+            log.info("截图失败");
+            // return bol;
         } finally {
             log.info("上传关闭流-----------------------");
             fos.close();
+            log.info("结束截图-------"+new Date(System.currentTimeMillis()));
         }
     }
 
@@ -190,30 +178,4 @@ public static void convertWebp(File oldfile, File newfile) throws IOException {
     }
 
 
-    //生成22为uuid
-    public static String getUUid() {
-        UUID uuid = UUID.randomUUID();
-        int index = 0;
-        char[] cs = new char[22];
-        long L = uuid.getMostSignificantBits();
-        long R = uuid.getLeastSignificantBits();
-        long mask = 63;
-        // 从L64位取10次，每次取6位
-        for (int off = 58; off >= 4; off -= 6) {
-            long hex = (L & (mask << off)) >>> off;
-            cs[index++] = _UU64[(int) hex];
-        }
-        // 从L64位取最后的4位 ＋ R64位头2位拼上
-        int l = (int) (((L & 0xF) << 2) | ((R & (3 << 62)) >>> 62));
-        cs[index++] = _UU64[l];
-        // 从R64位取10次，每次取6位
-        for (int off = 56; off >= 2; off -= 6) {
-            long hex = (R & (mask << off)) >>> off;
-            cs[index++] = _UU64[(int) hex];
-        }
-        // 剩下的两位最后取
-        cs[index++] = _UU64[(int) (R & 3)];
-        // 返回字符串
-        return new String(cs);
-    }
 }

Original file line number	Diff line number	Diff line change
`@@ -22,8 +22,8 @@`
`22`	`22`	`public class ExampleServiceImpl extends ServiceImpl<ExampleMapper, Example> implements ExampleService {`
`23`	`23`
`24`	`24`	`@Override`
`25`		`- public Boolean insert(Example example) {`
`26`		`- return baseMapper.insert(example) > 0 ? true : false;`
	`25`	`+ public Example insert(Example example) {`
	`26`	`+ return baseMapper.insert(example) > 0 ? example : null;`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`@Override`