From 22a4e1929a171cab198c73f17399af0932c8d46f Mon Sep 17 00:00:00 2001 From: liaozan <378024053@qq.com> Date: Thu, 25 Jan 2024 11:50:57 +0800 Subject: [PATCH] Update --- .../initializer/service/StarrocksService.java | 11 ----- .../service/config/StarrocksProperties.java | 16 ------- .../service/impl/StarrocksServiceImpl.java | 47 ------------------- .../com/schbrain/initializer/Application.java | 17 ------- .../web/controller/EntityController.java | 6 +++ pom.xml | 2 +- 6 files changed, 7 insertions(+), 92 deletions(-) delete mode 100644 initializer-service/src/main/java/com/schbrain/initializer/service/StarrocksService.java delete mode 100644 initializer-service/src/main/java/com/schbrain/initializer/service/config/StarrocksProperties.java delete mode 100644 initializer-service/src/main/java/com/schbrain/initializer/service/impl/StarrocksServiceImpl.java diff --git a/initializer-service/src/main/java/com/schbrain/initializer/service/StarrocksService.java b/initializer-service/src/main/java/com/schbrain/initializer/service/StarrocksService.java deleted file mode 100644 index ef2086c..0000000 --- a/initializer-service/src/main/java/com/schbrain/initializer/service/StarrocksService.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.schbrain.initializer.service; - -/** - * @author liaozan - * @since 2023/11/27 - */ -public interface StarrocksService { - - boolean streamLoad(String tableName, Object content); - -} diff --git a/initializer-service/src/main/java/com/schbrain/initializer/service/config/StarrocksProperties.java b/initializer-service/src/main/java/com/schbrain/initializer/service/config/StarrocksProperties.java deleted file mode 100644 index e05188c..0000000 --- a/initializer-service/src/main/java/com/schbrain/initializer/service/config/StarrocksProperties.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.schbrain.initializer.service.config; - -import lombok.Data; -import org.springframework.boot.context.properties.ConfigurationProperties; - -/** - * @author liaozan - * @since 2023/11/23 - */ -@Data -@ConfigurationProperties(prefix = "starrocks") -public class StarrocksProperties { - - private String feServerUrl = "schbrain-fe-svc.starrocks:8030"; - -} diff --git a/initializer-service/src/main/java/com/schbrain/initializer/service/impl/StarrocksServiceImpl.java b/initializer-service/src/main/java/com/schbrain/initializer/service/impl/StarrocksServiceImpl.java deleted file mode 100644 index c16e010..0000000 --- a/initializer-service/src/main/java/com/schbrain/initializer/service/impl/StarrocksServiceImpl.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.schbrain.initializer.service.impl; - -import cn.hutool.http.HttpRequest; -import com.fasterxml.jackson.databind.JsonNode; -import com.schbrain.common.util.JacksonUtils; -import com.schbrain.initializer.service.StarrocksService; -import com.schbrain.initializer.service.config.StarrocksProperties; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -/** - * @author liaozan - * @since 2023/11/27 - */ -@Slf4j -@Service -public class StarrocksServiceImpl implements StarrocksService { - - private static final String STREAM_LOAD_TEMPLATE = "http://%s/api/schbrain_mosaic/%s/_stream_load"; - - @Autowired - private StarrocksProperties starrocksProperties; - - @Override - public boolean streamLoad(String tableName, Object content) { - String streamLoadUrl = getStreamLoadUrl(tableName); - String res = HttpRequest.put(streamLoadUrl) - .header("strict_mode", Boolean.TRUE.toString()) - .header("Expect", "100-continue") - .header("format", "json") - .basicAuth("mosaic_admin", "schbrain111623") - .setFollowRedirects(true) - .body(JacksonUtils.toJsonString(content)) - .execute() - .body(); - System.out.println(res); - JsonNode loadResponse = JacksonUtils.getJsonNode(res); - log.info("stream load response: {}", loadResponse); - return true; - } - - private String getStreamLoadUrl(String tableName) { - return String.format(STREAM_LOAD_TEMPLATE, starrocksProperties.getFeServerUrl(), tableName); - } - -} diff --git a/initializer-starter/src/main/java/com/schbrain/initializer/Application.java b/initializer-starter/src/main/java/com/schbrain/initializer/Application.java index a8455ca..e0ad37a 100644 --- a/initializer-starter/src/main/java/com/schbrain/initializer/Application.java +++ b/initializer-starter/src/main/java/com/schbrain/initializer/Application.java @@ -1,32 +1,15 @@ package com.schbrain.initializer; -import com.schbrain.initializer.service.StarrocksService; -import com.schbrain.initializer.service.config.StarrocksProperties; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.boot.context.properties.EnableConfigurationProperties; -import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; -import java.util.Map; - @RestController @SpringBootApplication -@EnableConfigurationProperties(StarrocksProperties.class) public class Application { - @Autowired - private StarrocksService starrocksService; - public static void main(String[] args) { SpringApplication.run(Application.class, args); } - @GetMapping("/load") - public void doLoad() { - Map content = Map.of("id", "1", "city", "name"); - starrocksService.streamLoad("test", content); - } - } diff --git a/initializer-web/src/main/java/com/schbrain/initializer/web/controller/EntityController.java b/initializer-web/src/main/java/com/schbrain/initializer/web/controller/EntityController.java index d324fa0..85ee00a 100644 --- a/initializer-web/src/main/java/com/schbrain/initializer/web/controller/EntityController.java +++ b/initializer-web/src/main/java/com/schbrain/initializer/web/controller/EntityController.java @@ -15,6 +15,7 @@ import org.apache.commons.lang3.tuple.Triple; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletRequest; import java.time.LocalDate; import java.util.*; @@ -32,6 +33,11 @@ public class EntityController { @Autowired private EntityWithLogicDeleteService entityWithLogicDeleteService; + @GetMapping("/header") + public void printHeaders(HttpServletRequest request) { + request.getHeaderNames().asIterator().forEachRemaining(name -> log.info(name + ": " + request.getHeader(name))); + } + @GetMapping("/copy") public void copy() { Entity entity = new Entity(); diff --git a/pom.xml b/pom.xml index 8ebe35a..805f8f3 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ com.schbrain.framework schbrain-parent - 3.0.9-SNAPSHOT + 3.0.11 com.schbrain -- GitLab