diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 11afe97..52409f1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -9,8 +9,8 @@ deploy-jar: rules: - if: $CI_COMMIT_TAG script: - - mvn clean deploy -Dmaven.test.skip -DaltDeploymentRepository=master::default::file:/usr/local/nginx/html/tiesheng-repo - - cd /usr/local/nginx/html/tiesheng-repo + - mvn clean deploy -Dmaven.test.skip -DaltDeploymentRepository=master::default::file:$TAG_REPO_FOLDER + - cd $TAG_REPO_FOLDER - git checkout master - git pull - git add . diff --git a/springboot-ademo/src/main/java/com/tiesheng/demo/controller/TestController.java b/springboot-ademo/src/main/java/com/tiesheng/demo/controller/TestController.java index f9286e9..d205ff6 100644 --- a/springboot-ademo/src/main/java/com/tiesheng/demo/controller/TestController.java +++ b/springboot-ademo/src/main/java/com/tiesheng/demo/controller/TestController.java @@ -2,15 +2,17 @@ package com.tiesheng.demo.controller; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.date.TimeInterval; +import cn.hutool.core.thread.ThreadUtil; import cn.hutool.json.JSONUtil; import cn.hutool.log.LogFactory; import cn.hutool.poi.excel.ExcelUtil; -import cn.hutool.poi.excel.sax.handler.RowHandler; import com.alibaba.excel.EasyExcel; import com.alibaba.excel.context.AnalysisContext; import com.alibaba.excel.read.listener.ReadListener; import com.tiesheng.annotation.token.TokenIgnore; +import com.tiesheng.core.service.CoreLogService; import com.tiesheng.core.service.CoreMessageService; +import com.tiesheng.core.util.ProcessImportConsumer; import com.tiesheng.demo.pojos.PoiBean; import com.tiesheng.demo.pojos.TestFile; import com.tiesheng.login.config.token.TsTokenConfig; @@ -27,6 +29,7 @@ import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletResponse; import java.io.File; +import java.util.ArrayList; import java.util.List; /** @@ -46,6 +49,8 @@ public class TestController { EncryptConfig encryptConfig; @Autowired CoreMessageService coreMessageService; + @Autowired + CoreLogService coreLogService; @RequestMapping("/index") @@ -60,6 +65,25 @@ public class TestController { @RequestMapping("/redirect") @TokenIgnore public void redirect(HttpServletResponse response) { + + ArrayList strings = CollUtil.newArrayList("11111","22222"); + coreLogService.addProcess("fdfd", strings, new ProcessImportConsumer() { + @Override + public int accept(List list) { + LogFactory.get().info("list: " + list.size()); + return 0; + } + + @Override + public String getFailFile() { + LogFactory.get().info("getFailFile: " + strings.size()); + return null; + } + }); + + LogFactory.get().info("strings: " + strings.size()); + + // tsTokenConfig.validToken("eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJleHAiOjE2NzYwMDY4NzUsImlkIjoiMSIsImVudmlyb25tZW50VHlwZSI6Im1vYmlsZSIsInNlcnZpY2UiOiJjb250ZXN0LXJlc2VydmUiLCJleHRyYSI6IiJ9.nsfxEFpCNHC7eNCS5DJXdu1VDdnHrTjSfgrozND70Lc", true); globalConfig.redirect("mobile", "/test", response); }