修改包名

commons-spring/src/main/java/cn/quantgroup/tech/web/dto/Result.java

-package cn.quantgroup.tech.web.dto;
-
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * @author zero-mac
- * @date 16/6/28
- */
-@Getter
-@Setter
-public class Result {
-
-    /**
-     * 返回码
-     */
-    private int code;
-
-    /**
-     * 返回结果描述
-     */
-    private String message;
-
-    /**
-     * 返回内容
-     */
-    private Object data;
-
-    public int getCode() {
-        return code;
-    }
-
-    public String getMessage() {
-        return message;
-    }
-
-    public Object getData() {
-        return data;
-    }
-
-    public Result() {
-        this(ResultStatus.INIT);
-    }
-
-    public Result(int code, String message) {
-        this.code = code;
-        this.message = message;
-        this.data = "";
-    }
-
-    public Result(int code, String message, Object data) {
-        this.code = code;
-        this.message = message;
-        this.data = data;
-    }
-
-    public Result(ResultStatus status) {
-        this.code = status.getCode();
-        this.message = status.getMessage();
-        this.data = null;
-    }
-
-    public Result(ResultStatus status, Object data) {
-        this.code = status.getCode();
-        this.message = status.getMessage();
-        this.data = data;
-    }
-
-    public static Result ok(Object data) {
-        return data(data);
-    }
-
-    public static Result data(Object data) {
-        return new Result(ResultStatus.SUCCESS, data);
-    }
-
-    public static Result ok() {
-        return new Result(ResultStatus.SUCCESS);
-    }
-
-    public static Result todo() {
-        return error("TODO");
-    }
-
-    public static Result error(ResultStatus error) {
-        return new Result(error);
-    }
-
-    public static Result error(String msg) {
-        return new Result(ResultStatus.SERVER_ERROR.getCode(), msg);
-    }
-
-    // error状态下不会返回data
-    public static Result error(ResultStatus error, String msg) {
-        if (msg == null) {
-            msg = error.getMessage();
-        }
-        return new Result(error.getCode(), msg, null);
-    }
-
-}

commons-spring/src/main/java/cn/quantgroup/tech/web/dto/ResultStatus.java

-package cn.quantgroup.tech.web.dto;
-
-import lombok.Getter;
-
-/**
- * 自定义请求状态码
- *
- * @author zero-mac
- * @date 16/6/17
- */
-@Getter
-public enum ResultStatus {
-
-    INIT(0, ""),
-    SUCCESS(200, ""),
-
-    FEIGN_REQUEST_FAILED(404, "服务端未响应."),
-
-    REQUEST_VALIDATE_ERROR(400, "请求无效(Bad request),参数异常"),
-
-    // 由开发人员出现严重bug造成的异常
-    SERVER_ERROR(500, "开发状态--严重异常,程序无法正常运行,请开发人员检查问题"),
-
-    // 由开发人员代码不严谨造成的异常, 如未进行判空处理等,导致未能返回贴合业务的提示信息
-    RUNTIME_SERVER_ERROR(502, "运行状态--异常通知,请开发人员检查问题并作出正确提示"),
-
-    // 数据处理异常提醒, 包括传入数据不正确等, 异常由框架发起
-    FRAME_SERVER_ERROR(504, "运行状态--异常通知,请框架维护人员检查问题并作出正确提示"),
-
-    // 数据处理异常提醒, 包括传入数据不正确等, 异常由开发人员发起
-    APPLICATION_SERVER_ERROR(506, "运行状态--异常通知,请开发人员检查问题并作出正确提示"),
-    //
-    ;
-
-    /**
-     * 返回码
-     */
-    private int code;
-
-    /**
-     * 返回结果描述
-     */
-    private String message;
-
-    ResultStatus(int code, String message) {
-        this.code = code;
-        this.message = message;
-    }
-
-
-}

package-lock.json

-{
-  "lockfileVersion": 1
-}

qg-apollo-starter/pom.xml

@@ -4,7 +4,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>commons-parent</artifactId>
-        <groupId>cn.quantgroup</groupId>
+        <groupId>cn.quantgroup.boot</groupId>
         <version>${revision}</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>

qg-apollo-starter/src/main/java/cn/quantgroup/apollopatch/QGConfigManager.java → qg-apollo-starter/src/main/java/cn/quantgroup/boot/apollo/QGConfigManager.java

-package cn.quantgroup.apollopatch;
+package cn.quantgroup.boot.apollo;
 
 import com.ctrip.framework.apollo.build.ApolloInjector;
 import com.ctrip.framework.apollo.core.enums.Env;

qg-apollo-starter/src/main/java/cn/quantgroup/apollopatch/QGInjectorCustomizer.java → qg-apollo-starter/src/main/java/cn/quantgroup/boot/apollo/QGInjectorCustomizer.java

-package cn.quantgroup.apollopatch;
+package cn.quantgroup.boot.apollo;
 
 import com.ctrip.framework.apollo.internals.ConfigManager;
 import com.ctrip.framework.apollo.spi.ApolloInjectorCustomizer;

qg-apollo-starter/src/main/java/cn/quantgroup/apollopatch/spring/QGSpringApplicationRunListener.java → qg-apollo-starter/src/main/java/cn/quantgroup/boot/apollo/spring/QGSpringApplicationRunListener.java

-package cn.quantgroup.apollopatch.spring;
+package cn.quantgroup.boot.apollo.spring;
 
 import com.ctrip.framework.foundation.Foundation;
 import org.springframework.boot.SpringApplication;

qg-apollo-starter/src/main/resources/META-INF/services/com.ctrip.framework.apollo.spi.ApolloInjectorCustomizer

-cn.quantgroup.apollopatch.QGInjectorCustomizer
+cn.quantgroup.boot.apollo.QGInjectorCustomizer
\ No newline at end of file

qg-apollo-starter/src/main/resources/META-INF/spring.factories

 org.springframework.boot.SpringApplicationRunListener=\
-cn.quantgroup.apollopatch.spring.QGSpringApplicationRunListener
+cn.quantgroup.boot.apollo.spring.QGSpringApplicationRunListener
\ No newline at end of file

brave-spring-boot-starter/pom.xml → qg-brave-starter/pom.xml

@@ -5,11 +5,11 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <artifactId>commons-parent</artifactId>
-        <groupId>cn.quantgroup</groupId>
+        <groupId>cn.quantgroup.boot</groupId>
         <version>${revision}</version>
     </parent>
 
-    <artifactId>brave-spring-boot-starter</artifactId>
+    <artifactId>qg-brave-starter</artifactId>
 
     <dependencies>
         <dependency>

brave-spring-boot-starter/src/main/java/cn/quantgroup/tech/brave/configuration/AuthAutoConfiguration.java → qg-brave-starter/src/main/java/cn/quantgroup/boot/tech/brave/configuration/AuthAutoConfiguration.java

-package cn.quantgroup.tech.brave.configuration;
+package cn.quantgroup.boot.tech.brave.configuration;
 
-import cn.quantgroup.tech.brave.interceptor.HttpClientRequestInterceptor;
-import cn.quantgroup.tech.brave.interceptor.OkHttpClientInterceptor;
-import cn.quantgroup.tech.brave.interceptor.RestTemplateRequestInterceptor;
+import cn.quantgroup.boot.tech.brave.interceptor.impl.*;
+import cn.quantgroup.boot.tech.brave.interceptor.HttpClientRequestInterceptor;
+import cn.quantgroup.boot.tech.brave.interceptor.OkHttpClientInterceptor;
+import cn.quantgroup.boot.tech.brave.interceptor.RestTemplateRequestInterceptor;
 import cn.quantgroup.tech.brave.interceptor.impl.*;
 import okhttp3.Interceptor;
 import org.apache.http.HttpRequestInterceptor;

brave-spring-boot-starter/src/main/java/cn/quantgroup/tech/brave/configuration/BraveAutoConfiguration.java → qg-brave-starter/src/main/java/cn/quantgroup/boot/tech/brave/configuration/BraveAutoConfiguration.java

-package cn.quantgroup.tech.brave.configuration;
+package cn.quantgroup.boot.tech.brave.configuration;
 
 import brave.Tracing;
 import brave.context.slf4j.MDCScopeDecorator;
@@ -8,8 +8,10 @@ import brave.propagation.ExtraFieldPropagation;
 import brave.propagation.ThreadLocalCurrentTraceContext;
 import brave.spring.web.TracingClientHttpRequestInterceptor;
 import brave.spring.webmvc.SpanCustomizingAsyncHandlerInterceptor;
-import cn.quantgroup.tech.brave.properties.BraveProperties;
-import cn.quantgroup.tech.brave.properties.ServiceProperties;
+import cn.quantgroup.boot.tech.brave.properties.BraveProperties;
+import cn.quantgroup.boot.tech.brave.properties.ServiceProperties;
+import cn.quantgroup.boot.tech.brave.service.*;
+import cn.quantgroup.boot.tech.brave.service.impl.*;
 import cn.quantgroup.tech.brave.service.*;
 import cn.quantgroup.tech.brave.service.impl.*;
 import lombok.extern.slf4j.Slf4j;

brave-spring-boot-starter/src/main/java/cn/quantgroup/tech/brave/filter/CustomDelegatingTracingFilter.java → qg-brave-starter/src/main/java/cn/quantgroup/boot/tech/brave/filter/CustomDelegatingTracingFilter.java

-package cn.quantgroup.tech.brave.filter;
+package cn.quantgroup.boot.tech.brave.filter;
 
 import brave.servlet.TracingFilter;
 import brave.spring.webmvc.DelegatingTracingFilter;

brave-spring-boot-starter/src/main/java/cn/quantgroup/tech/brave/handler/TokenHandler.java → qg-brave-starter/src/main/java/cn/quantgroup/boot/tech/brave/handler/TokenHandler.java

-package cn.quantgroup.tech.brave.handler;
+package cn.quantgroup.boot.tech.brave.handler;
 
 public class TokenHandler {
     private static String token;

brave-spring-boot-starter/src/main/java/cn/quantgroup/tech/brave/interceptor/HttpClientRequestInterceptor.java → qg-brave-starter/src/main/java/cn/quantgroup/boot/tech/brave/interceptor/HttpClientRequestInterceptor.java

-package cn.quantgroup.tech.brave.interceptor;
+package cn.quantgroup.boot.tech.brave.interceptor;
 
 import org.apache.http.HttpRequestInterceptor;
 

brave-spring-boot-starter/src/main/java/cn/quantgroup/tech/brave/interceptor/OkHttpClientInterceptor.java → qg-brave-starter/src/main/java/cn/quantgroup/boot/tech/brave/interceptor/OkHttpClientInterceptor.java

-package cn.quantgroup.tech.brave.interceptor;
+package cn.quantgroup.boot.tech.brave.interceptor;
 
 import okhttp3.Interceptor;
 

brave-spring-boot-starter/src/main/java/cn/quantgroup/tech/brave/interceptor/RequestInterceptor.java → qg-brave-starter/src/main/java/cn/quantgroup/boot/tech/brave/interceptor/RequestInterceptor.java

-package cn.quantgroup.tech.brave.interceptor;
+package cn.quantgroup.boot.tech.brave.interceptor;
 
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;

brave-spring-boot-starter/src/main/java/cn/quantgroup/tech/brave/interceptor/RestTemplateRequestInterceptor.java → qg-brave-starter/src/main/java/cn/quantgroup/boot/tech/brave/interceptor/RestTemplateRequestInterceptor.java

-package cn.quantgroup.tech.brave.interceptor;
+package cn.quantgroup.boot.tech.brave.interceptor;
 
 import org.springframework.http.client.ClientHttpRequestInterceptor;
 

brave-spring-boot-starter/src/main/java/cn/quantgroup/tech/brave/interceptor/impl/HttpClientAuthRequestInterceptor.java → qg-brave-starter/src/main/java/cn/quantgroup/boot/tech/brave/interceptor/impl/HttpClientAuthRequestInterceptor.java

-package cn.quantgroup.tech.brave.interceptor.impl;
+package cn.quantgroup.boot.tech.brave.interceptor.impl;
 
-import cn.quantgroup.tech.brave.handler.TokenHandler;
-import cn.quantgroup.tech.brave.interceptor.HttpClientRequestInterceptor;
-import cn.quantgroup.tech.brave.interceptor.RequestInterceptor;
+import cn.quantgroup.boot.tech.brave.handler.TokenHandler;
+import cn.quantgroup.boot.tech.brave.interceptor.HttpClientRequestInterceptor;
+import cn.quantgroup.boot.tech.brave.interceptor.RequestInterceptor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.http.HttpRequest;
 import org.apache.http.client.methods.HttpRequestWrapper;

brave-spring-boot-starter/src/main/java/cn/quantgroup/tech/brave/interceptor/impl/HttpClientNoAuthRequestInterceptor.java → qg-brave-starter/src/main/java/cn/quantgroup/boot/tech/brave/interceptor/impl/HttpClientNoAuthRequestInterceptor.java

-package cn.quantgroup.tech.brave.interceptor.impl;
+package cn.quantgroup.boot.tech.brave.interceptor.impl;
 
-import cn.quantgroup.tech.brave.interceptor.HttpClientRequestInterceptor;
+import cn.quantgroup.boot.tech.brave.interceptor.HttpClientRequestInterceptor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.http.HttpRequest;
 import org.apache.http.protocol.HttpContext;

brave-spring-boot-starter/src/main/java/cn/quantgroup/tech/brave/interceptor/impl/OkHttpClientAuthInterceptor.java → qg-brave-starter/src/main/java/cn/quantgroup/boot/tech/brave/interceptor/impl/OkHttpClientAuthInterceptor.java

-package cn.quantgroup.tech.brave.interceptor.impl;
+package cn.quantgroup.boot.tech.brave.interceptor.impl;
 
-import cn.quantgroup.tech.brave.handler.TokenHandler;
-import cn.quantgroup.tech.brave.interceptor.OkHttpClientInterceptor;
-import cn.quantgroup.tech.brave.interceptor.RequestInterceptor;
+import cn.quantgroup.boot.tech.brave.handler.TokenHandler;
+import cn.quantgroup.boot.tech.brave.interceptor.OkHttpClientInterceptor;
+import cn.quantgroup.boot.tech.brave.interceptor.RequestInterceptor;
 import okhttp3.Request;
 import okhttp3.Response;
 

brave-spring-boot-starter/src/main/java/cn/quantgroup/tech/brave/interceptor/impl/OkHttpClientNoAuthInterceptor.java → qg-brave-starter/src/main/java/cn/quantgroup/boot/tech/brave/interceptor/impl/OkHttpClientNoAuthInterceptor.java

-package cn.quantgroup.tech.brave.interceptor.impl;
+package cn.quantgroup.boot.tech.brave.interceptor.impl;
 
-import cn.quantgroup.tech.brave.interceptor.OkHttpClientInterceptor;
+import cn.quantgroup.boot.tech.brave.interceptor.OkHttpClientInterceptor;
 import okhttp3.Request;
 import okhttp3.Response;
 

brave-spring-boot-starter/src/main/java/cn/quantgroup/tech/brave/interceptor/impl/RestTemplateAuthRequestInterceptor.java → qg-brave-starter/src/main/java/cn/quantgroup/boot/tech/brave/interceptor/impl/RestTemplateAuthRequestInterceptor.java

-package cn.quantgroup.tech.brave.interceptor.impl;
+package cn.quantgroup.boot.tech.brave.interceptor.impl;
 
-import cn.quantgroup.tech.brave.handler.TokenHandler;
-import cn.quantgroup.tech.brave.interceptor.RequestInterceptor;
-import cn.quantgroup.tech.brave.interceptor.RestTemplateRequestInterceptor;
+import cn.quantgroup.boot.tech.brave.handler.TokenHandler;
+import cn.quantgroup.boot.tech.brave.interceptor.RequestInterceptor;
+import cn.quantgroup.boot.tech.brave.interceptor.RestTemplateRequestInterceptor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.HttpRequest;
 import org.springframework.http.client.ClientHttpRequestExecution;

brave-spring-boot-starter/src/main/java/cn/quantgroup/tech/brave/interceptor/impl/RestTemplateNoAuthRequestInterceptor.java → qg-brave-starter/src/main/java/cn/quantgroup/boot/tech/brave/interceptor/impl/RestTemplateNoAuthRequestInterceptor.java

-package cn.quantgroup.tech.brave.interceptor.impl;
+package cn.quantgroup.boot.tech.brave.interceptor.impl;
 
-import cn.quantgroup.tech.brave.interceptor.RestTemplateRequestInterceptor;
+import cn.quantgroup.boot.tech.brave.interceptor.RestTemplateRequestInterceptor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.HttpRequest;
 import org.springframework.http.client.ClientHttpRequestExecution;

brave-spring-boot-starter/src/main/java/cn/quantgroup/tech/brave/properties/BraveProperties.java → qg-brave-starter/src/main/java/cn/quantgroup/boot/tech/brave/properties/BraveProperties.java

-package cn.quantgroup.tech.brave.properties;
+package cn.quantgroup.boot.tech.brave.properties;
 
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;

brave-spring-boot-starter/src/main/java/cn/quantgroup/tech/brave/properties/ServiceProperties.java → qg-brave-starter/src/main/java/cn/quantgroup/boot/tech/brave/properties/ServiceProperties.java

-package cn.quantgroup.tech.brave.properties;
+package cn.quantgroup.boot.tech.brave.properties;
 
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;

brave-spring-boot-starter/src/main/java/cn/quantgroup/tech/brave/service/ITechExecutorServiceBuilder.java → qg-brave-starter/src/main/java/cn/quantgroup/boot/tech/brave/service/ITechExecutorServiceBuilder.java

-package cn.quantgroup.tech.brave.service;
+package cn.quantgroup.boot.tech.brave.service;
 
 import java.util.concurrent.*;
 

brave-spring-boot-starter/src/main/java/cn/quantgroup/tech/brave/service/ITechHttpClient.java → qg-brave-starter/src/main/java/cn/quantgroup/boot/tech/brave/service/ITechHttpClient.java

-package cn.quantgroup.tech.brave.service;
+package cn.quantgroup.boot.tech.brave.service;
 
 import org.apache.http.impl.client.HttpClientBuilder;
 

brave-spring-boot-starter/src/main/java/cn/quantgroup/tech/brave/service/ITechOkHttpClient.java → qg-brave-starter/src/main/java/cn/quantgroup/boot/tech/brave/service/ITechOkHttpClient.java

-package cn.quantgroup.tech.brave.service;
+package cn.quantgroup.boot.tech.brave.service;
 
 import okhttp3.OkHttpClient;
 

brave-spring-boot-starter/src/main/java/cn/quantgroup/tech/brave/service/ITechRabbitBuilder.java → qg-brave-starter/src/main/java/cn/quantgroup/boot/tech/brave/service/ITechRabbitBuilder.java

-package cn.quantgroup.tech.brave.service;
+package cn.quantgroup.boot.tech.brave.service;
 
 import org.springframework.amqp.rabbit.config.SimpleRabbitListenerContainerFactory;
 import org.springframework.amqp.rabbit.connection.ConnectionFactory;

brave-spring-boot-starter/src/main/java/cn/quantgroup/tech/brave/service/ITechRestTemplateBuilder.java → qg-brave-starter/src/main/java/cn/quantgroup/boot/tech/brave/service/ITechRestTemplateBuilder.java

-package cn.quantgroup.tech.brave.service;
+package cn.quantgroup.boot.tech.brave.service;
 
 import org.springframework.web.client.RestTemplate;
 

brave-spring-boot-starter/src/main/java/cn/quantgroup/tech/brave/service/impl/TechExecutorServiceBuilderNoTrace.java → qg-brave-starter/src/main/java/cn/quantgroup/boot/tech/brave/service/impl/TechExecutorServiceBuilderNoTrace.java

-package cn.quantgroup.tech.brave.service.impl;
+package cn.quantgroup.boot.tech.brave.service.impl;
 
-import cn.quantgroup.tech.brave.service.ITechExecutorServiceBuilder;
+import cn.quantgroup.boot.tech.brave.service.ITechExecutorServiceBuilder;
 import lombok.extern.slf4j.Slf4j;
 
 import java.util.concurrent.ExecutorService;

brave-spring-boot-starter/src/main/java/cn/quantgroup/tech/brave/service/impl/TechExecutorServiceBuilderTrace.java → qg-brave-starter/src/main/java/cn/quantgroup/boot/tech/brave/service/impl/TechExecutorServiceBuilderTrace.java

-package cn.quantgroup.tech.brave.service.impl;
+package cn.quantgroup.boot.tech.brave.service.impl;
 
 import brave.context.slf4j.MDCScopeDecorator;
 import brave.propagation.CurrentTraceContext;
 import brave.propagation.ThreadLocalCurrentTraceContext;
-import cn.quantgroup.tech.brave.service.ITechExecutorServiceBuilder;
+import cn.quantgroup.boot.tech.brave.service.ITechExecutorServiceBuilder;
 import lombok.extern.slf4j.Slf4j;
 
 import java.util.concurrent.ExecutorService;

brave-spring-boot-starter/src/main/java/cn/quantgroup/tech/brave/service/impl/TechHttpClientNoTrace.java → qg-brave-starter/src/main/java/cn/quantgroup/boot/tech/brave/service/impl/TechHttpClientNoTrace.java

-package cn.quantgroup.tech.brave.service.impl;
+package cn.quantgroup.boot.tech.brave.service.impl;
 
-import cn.quantgroup.tech.brave.interceptor.HttpClientRequestInterceptor;
-import cn.quantgroup.tech.brave.service.ITechHttpClient;
+import cn.quantgroup.boot.tech.brave.interceptor.HttpClientRequestInterceptor;
+import cn.quantgroup.boot.tech.brave.service.ITechHttpClient;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.http.impl.client.HttpClientBuilder;
 
@@ -12,7 +12,7 @@ import javax.annotation.Resource;
  * create on 2018.05.17
  */
 @Slf4j
-public class TechHttpClientNoTrace implements ITechHttpClient{
+public class TechHttpClientNoTrace implements ITechHttpClient {
 
     @Resource
     private HttpClientRequestInterceptor httpClientRequestInterceptor;

brave-spring-boot-starter/src/main/java/cn/quantgroup/tech/brave/service/impl/TechHttpClientTrace.java → qg-brave-starter/src/main/java/cn/quantgroup/boot/tech/brave/service/impl/TechHttpClientTrace.java

-package cn.quantgroup.tech.brave.service.impl;
+package cn.quantgroup.boot.tech.brave.service.impl;
 
 import brave.Tracing;
 import brave.httpclient.TracingHttpClientBuilder;
-import cn.quantgroup.tech.brave.interceptor.HttpClientRequestInterceptor;
-import cn.quantgroup.tech.brave.service.ITechHttpClient;
+import cn.quantgroup.boot.tech.brave.interceptor.HttpClientRequestInterceptor;
+import cn.quantgroup.boot.tech.brave.service.ITechHttpClient;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.http.impl.client.HttpClientBuilder;
 

brave-spring-boot-starter/src/main/java/cn/quantgroup/tech/brave/service/impl/TechOkHttpClientNoTrace.java → qg-brave-starter/src/main/java/cn/quantgroup/boot/tech/brave/service/impl/TechOkHttpClientNoTrace.java

-package cn.quantgroup.tech.brave.service.impl;
+package cn.quantgroup.boot.tech.brave.service.impl;
 
-import cn.quantgroup.tech.brave.interceptor.OkHttpClientInterceptor;
-import cn.quantgroup.tech.brave.service.ITechOkHttpClient;
+import cn.quantgroup.boot.tech.brave.interceptor.OkHttpClientInterceptor;
+import cn.quantgroup.boot.tech.brave.service.ITechOkHttpClient;
 import lombok.extern.slf4j.Slf4j;
 import okhttp3.OkHttpClient;
 

brave-spring-boot-starter/src/main/java/cn/quantgroup/tech/brave/service/impl/TechOkHttpClientTrace.java → qg-brave-starter/src/main/java/cn/quantgroup/boot/tech/brave/service/impl/TechOkHttpClientTrace.java

-package cn.quantgroup.tech.brave.service.impl;
+package cn.quantgroup.boot.tech.brave.service.impl;
 
 import brave.Tracing;
 import brave.http.HttpTracing;
 import brave.okhttp3.TracingInterceptor;
-import cn.quantgroup.tech.brave.interceptor.OkHttpClientInterceptor;
-import cn.quantgroup.tech.brave.service.ITechOkHttpClient;
+import cn.quantgroup.boot.tech.brave.interceptor.OkHttpClientInterceptor;
+import cn.quantgroup.boot.tech.brave.service.ITechOkHttpClient;
 import lombok.extern.slf4j.Slf4j;
 import okhttp3.Dispatcher;
 import okhttp3.OkHttpClient;

brave-spring-boot-starter/src/main/java/cn/quantgroup/tech/brave/service/impl/TechRabbitBuilderNoTrace.java → qg-brave-starter/src/main/java/cn/quantgroup/boot/tech/brave/service/impl/TechRabbitBuilderNoTrace.java

-package cn.quantgroup.tech.brave.service.impl;
+package cn.quantgroup.boot.tech.brave.service.impl;
 
-import cn.quantgroup.tech.brave.service.ITechRabbitBuilder;
+import cn.quantgroup.boot.tech.brave.service.ITechRabbitBuilder;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.amqp.rabbit.config.SimpleRabbitListenerContainerFactory;
 import org.springframework.amqp.rabbit.connection.ConnectionFactory;

brave-spring-boot-starter/src/main/java/cn/quantgroup/tech/brave/service/impl/TechRabbitBuilderTrace.java → qg-brave-starter/src/main/java/cn/quantgroup/boot/tech/brave/service/impl/TechRabbitBuilderTrace.java

-package cn.quantgroup.tech.brave.service.impl;
+package cn.quantgroup.boot.tech.brave.service.impl;
 
 import brave.Tracing;
 import brave.spring.rabbit.SpringRabbitTracing;
-import cn.quantgroup.tech.brave.service.ITechRabbitBuilder;
+import cn.quantgroup.boot.tech.brave.service.ITechRabbitBuilder;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.amqp.rabbit.config.SimpleRabbitListenerContainerFactory;
 import org.springframework.amqp.rabbit.connection.ConnectionFactory;

brave-spring-boot-starter/src/main/java/cn/quantgroup/tech/brave/service/impl/TechRestTemplateBuilderTrace.java → qg-brave-starter/src/main/java/cn/quantgroup/boot/tech/brave/service/impl/TechRestTemplateBuilderTrace.java

-package cn.quantgroup.tech.brave.service.impl;
+package cn.quantgroup.boot.tech.brave.service.impl;
 
 import brave.spring.web.TracingClientHttpRequestInterceptor;
-import cn.quantgroup.tech.brave.interceptor.RestTemplateRequestInterceptor;
-import cn.quantgroup.tech.brave.service.ITechRestTemplateBuilder;
+import cn.quantgroup.boot.tech.brave.interceptor.RestTemplateRequestInterceptor;
+import cn.quantgroup.boot.tech.brave.service.ITechRestTemplateBuilder;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Import;

brave-spring-boot-starter/src/main/java/cn/quantgroup/tech/brave/service/impl/TechRestTemplateBuliderNoTrace.java → qg-brave-starter/src/main/java/cn/quantgroup/boot/tech/brave/service/impl/TechRestTemplateBuliderNoTrace.java

-package cn.quantgroup.tech.brave.service.impl;
+package cn.quantgroup.boot.tech.brave.service.impl;
 
-import cn.quantgroup.tech.brave.interceptor.RestTemplateRequestInterceptor;
-import cn.quantgroup.tech.brave.service.ITechRestTemplateBuilder;
+import cn.quantgroup.boot.tech.brave.interceptor.RestTemplateRequestInterceptor;
+import cn.quantgroup.boot.tech.brave.service.ITechRestTemplateBuilder;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.client.ClientHttpRequestInterceptor;
 import org.springframework.web.client.RestTemplate;

brave-spring-boot-starter/src/main/resources/META-INF/spring.factories → qg-brave-starter/src/main/resources/META-INF/spring.factories

 org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-  cn.quantgroup.tech.brave.configuration.BraveAutoConfiguration,\
-  cn.quantgroup.tech.brave.configuration.AuthAutoConfiguration
+  cn.quantgroup.boot.tech.brave.configuration.BraveAutoConfiguration,\
+  cn.quantgroup.boot.tech.brave.configuration.AuthAutoConfiguration
\ No newline at end of file

commons-spring/pom.xml → qg-dynamic-datasource/pom.xml

@@ -5,11 +5,11 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <artifactId>commons-parent</artifactId>
-        <groupId>cn.quantgroup</groupId>
+        <groupId>cn.quantgroup.boot</groupId>
         <version>${revision}</version>
     </parent>
 
-    <artifactId>commons-spring</artifactId>
+    <artifactId>qg-dynamic-datasource</artifactId>
 
     <dependencies>
         <dependency>
@@ -61,6 +61,11 @@
             <groupId>com.ctrip.framework.apollo</groupId>
             <artifactId>apollo-client</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <optional>true</optional>
+        </dependency>
 
 
 <!--        <dependency>-->

commons-spring/src/main/java/cn/quantgroup/tech/db/DSType.java → qg-dynamic-datasource/src/main/java/cn/quantgroup/boot/tech/db/DSType.java

-package cn.quantgroup.tech.db;
+package cn.quantgroup.boot.tech.db;
 
 /**
  * 数据源类型. 主/从

commons-spring/src/main/java/cn/quantgroup/tech/db/DynamicDataSource.java → qg-dynamic-datasource/src/main/java/cn/quantgroup/boot/tech/db/DynamicDataSource.java

-package cn.quantgroup.tech.db;
+package cn.quantgroup.boot.tech.db;
 
 import org.springframework.jdbc.datasource.lookup.AbstractRoutingDataSource;
 

commons-spring/src/main/java/cn/quantgroup/tech/db/DynamicDataSourceAspect.java → qg-dynamic-datasource/src/main/java/cn/quantgroup/boot/tech/db/DynamicDataSourceAspect.java

-package cn.quantgroup.tech.db;
+package cn.quantgroup.boot.tech.db;
 
 import lombok.extern.slf4j.Slf4j;
 import org.aspectj.lang.JoinPoint;

commons-spring/src/main/java/cn/quantgroup/tech/db/DynamicDataSourceConfiguration.java → qg-dynamic-datasource/src/main/java/cn/quantgroup/boot/tech/db/DynamicDataSourceConfiguration.java

-package cn.quantgroup.tech.db;
+package cn.quantgroup.boot.tech.db;
 
 import org.springframework.context.annotation.Bean;
 

commons-spring/src/main/java/cn/quantgroup/tech/db/DynamicDataSourceContextHolder.java → qg-dynamic-datasource/src/main/java/cn/quantgroup/boot/tech/db/DynamicDataSourceContextHolder.java

-package cn.quantgroup.tech.db;
+package cn.quantgroup.boot.tech.db;
 
 import java.util.ArrayList;
 import java.util.List;

commons-spring/src/main/java/cn/quantgroup/tech/db/DynamicDataSourceRegister.java → qg-dynamic-datasource/src/main/java/cn/quantgroup/boot/tech/db/DynamicDataSourceRegister.java

-package cn.quantgroup.tech.db;
+package cn.quantgroup.boot.tech.db;
 
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.MutablePropertyValues;

commons-spring/src/main/java/cn/quantgroup/tech/db/EnableDynamicDataSource.java → qg-dynamic-datasource/src/main/java/cn/quantgroup/boot/tech/db/EnableDynamicDataSource.java

-package cn.quantgroup.tech.db;
+package cn.quantgroup.boot.tech.db;
 
 import org.springframework.context.annotation.Import;
 

commons-spring/src/main/java/cn/quantgroup/tech/db/TargetDataSource.java → qg-dynamic-datasource/src/main/java/cn/quantgroup/boot/tech/db/TargetDataSource.java

-package cn.quantgroup.tech.db;
+package cn.quantgroup.boot.tech.db;
 
 import java.lang.annotation.*;
 

commons-spring/src/main/java/cn/quantgroup/tech/util/TechEnvironment.java → qg-dynamic-datasource/src/main/java/cn/quantgroup/boot/tech/util/TechEnvironment.java

-package cn.quantgroup.tech.util;
+package cn.quantgroup.boot.tech.util;
 
 import com.ctrip.framework.foundation.Foundation;
 import lombok.extern.slf4j.Slf4j;

enoch-agent-spring-boot-starter/pom.xml → qg-enoch-agent/pom.xml

@@ -4,29 +4,37 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <artifactId>commons-parent</artifactId>
-        <groupId>cn.quantgroup</groupId>
+        <groupId>cn.quantgroup.boot</groupId>
         <version>${revision}</version>
     </parent>
-    <groupId>cn.quantgroup</groupId>
-    <artifactId>enoch-agent-spring-boot-starter</artifactId>
+    <groupId>cn.quantgroup.boot</groupId>
+    <artifactId>qg-enoch-agent</artifactId>
 
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-actuator</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.google.code.gson</groupId>
+            <artifactId>gson</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.springframework.kafka</groupId>
             <artifactId>spring-kafka</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
             <optional>true</optional>
         </dependency>
-        <dependency>
-            <groupId>cn.quantgroup</groupId>
-            <artifactId>commons-spring</artifactId>
-        </dependency>
     </dependencies>
 </project>

enoch-agent-spring-boot-starter/src/main/java/cn/quantgroup/tech/enoch/agent/AgentReportTask.java → qg-enoch-agent/src/main/java/cn/quantgroup/boot/tech/enoch/agent/AgentReportTask.java

-package cn.quantgroup.tech.enoch.agent;
+package cn.quantgroup.boot.tech.enoch.agent;
 
-import cn.quantgroup.tech.enoch.agent.report.IAgentReportService;
+import cn.quantgroup.boot.tech.enoch.agent.report.IAgentReportService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.scheduling.annotation.EnableScheduling;

enoch-agent-spring-boot-starter/src/main/java/cn/quantgroup/tech/enoch/agent/configuration/EnochAgentAutoConfiguration.java → qg-enoch-agent/src/main/java/cn/quantgroup/boot/tech/enoch/agent/configuration/EnochAgentAutoConfiguration.java

-package cn.quantgroup.tech.enoch.agent.configuration;
+package cn.quantgroup.boot.tech.enoch.agent.configuration;
 
-import cn.quantgroup.tech.enoch.agent.AgentReportTask;
+import cn.quantgroup.boot.tech.enoch.agent.AgentReportTask;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.kafka.clients.producer.ProducerConfig;
 import org.apache.kafka.common.serialization.StringSerializer;

enoch-agent-spring-boot-starter/src/main/java/cn/quantgroup/tech/enoch/agent/configuration/EnochAgentProperties.java → qg-enoch-agent/src/main/java/cn/quantgroup/boot/tech/enoch/agent/configuration/EnochAgentProperties.java

-package cn.quantgroup.tech.enoch.agent.configuration;
+package cn.quantgroup.boot.tech.enoch.agent.configuration;
 
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;

enoch-agent-spring-boot-starter/src/main/java/cn/quantgroup/tech/enoch/agent/report/IAgentReportService.java → qg-enoch-agent/src/main/java/cn/quantgroup/boot/tech/enoch/agent/report/IAgentReportService.java

-package cn.quantgroup.tech.enoch.agent.report;
+package cn.quantgroup.boot.tech.enoch.agent.report;
 
 /**
  * @author: amen

enoch-agent-spring-boot-starter/src/main/java/cn/quantgroup/tech/enoch/agent/report/impl/AgentReportServiceImpl.java → qg-enoch-agent/src/main/java/cn/quantgroup/boot/tech/enoch/agent/report/impl/AgentReportServiceImpl.java

-package cn.quantgroup.tech.enoch.agent.report.impl;
+package cn.quantgroup.boot.tech.enoch.agent.report.impl;
 
-import cn.quantgroup.tech.enoch.agent.configuration.EnochAgentProperties;
-import cn.quantgroup.tech.enoch.agent.report.IAgentReportService;
+import cn.quantgroup.boot.tech.enoch.agent.configuration.EnochAgentProperties;
+import cn.quantgroup.boot.tech.enoch.agent.report.IAgentReportService;
 import com.google.gson.Gson;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;

idgenerator-spring-boot-starter/src/main/resources/META-INF/spring.factories → qg-enoch-agent/src/main/resources/META-INF/spring.factories

 org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-  cn.quantgroup.tech.generator.configuration.GeneratorAutoConfiguration
+  cn.quantgroup.boot.tech.enoch.agent.configuration.EnochAgentAutoConfiguration
\ No newline at end of file

idgenerator-spring-boot-starter/pom.xml → qg-idgenerator/pom.xml

@@ -4,19 +4,32 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>commons-parent</artifactId>
-        <groupId>cn.quantgroup</groupId>
+        <groupId>cn.quantgroup.boot</groupId>
         <version>${revision}</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>idgenerator-spring-boot-starter</artifactId>
+    <artifactId>qg-idgenerator</artifactId>
 
     <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-autoconfigure</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.springframework.data</groupId>
             <artifactId>spring-data-redis</artifactId>
             <optional>true</optional>
         </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <optional>true</optional>
+        </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>

idgenerator-spring-boot-starter/src/main/java/cn/quantgroup/tech/generator/BitsAllocator.java → qg-idgenerator/src/main/java/cn/quantgroup/boot/tech/generator/BitsAllocator.java

-package cn.quantgroup.tech.generator;
+package cn.quantgroup.boot.tech.generator;
 
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;

idgenerator-spring-boot-starter/src/main/java/cn/quantgroup/tech/generator/IDGenerateException.java → qg-idgenerator/src/main/java/cn/quantgroup/boot/tech/generator/IDGenerateException.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package cn.quantgroup.tech.generator;
+package cn.quantgroup.boot.tech.generator;
 
 /**
  * IDGenerateException

idgenerator-spring-boot-starter/src/main/java/cn/quantgroup/tech/generator/IDGenerator.java → qg-idgenerator/src/main/java/cn/quantgroup/boot/tech/generator/IDGenerator.java

-package cn.quantgroup.tech.generator;
+package cn.quantgroup.boot.tech.generator;
 
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.time.DateFormatUtils;

idgenerator-spring-boot-starter/src/main/java/cn/quantgroup/tech/generator/configuration/GeneratorAutoConfiguration.java → qg-idgenerator/src/main/java/cn/quantgroup/boot/tech/generator/configuration/GeneratorAutoConfiguration.java

-package cn.quantgroup.tech.generator.configuration;
+package cn.quantgroup.boot.tech.generator.configuration;
 
 
 import lombok.Data;

idgenerator-spring-boot-starter/src/main/java/cn/quantgroup/tech/generator/configuration/GeneratorFactoryBean.java → qg-idgenerator/src/main/java/cn/quantgroup/boot/tech/generator/configuration/GeneratorFactoryBean.java

-package cn.quantgroup.tech.generator.configuration;
+package cn.quantgroup.boot.tech.generator.configuration;
 
-import cn.quantgroup.tech.generator.BitsAllocator;
-import cn.quantgroup.tech.generator.IDGenerator;
+import cn.quantgroup.boot.tech.generator.BitsAllocator;
+import cn.quantgroup.boot.tech.generator.IDGenerator;
 import lombok.Builder;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.time.DateUtils;

enoch-agent-spring-boot-starter/src/main/resources/META-INF/spring.factories → qg-idgenerator/src/main/resources/META-INF/spring.factories

 org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-  cn.quantgroup.tech.enoch.agent.configuration.EnochAgentAutoConfiguration
+  cn.quantgroup.boot.tech.generator.configuration.GeneratorAutoConfiguration
\ No newline at end of file