diff --git a/.github/workflows/build-push-docker.yml b/.github/workflows/build-push-docker.yml index 134c2ad..46cfcdc 100644 --- a/.github/workflows/build-push-docker.yml +++ b/.github/workflows/build-push-docker.yml @@ -28,7 +28,7 @@ jobs: with: java-version: '11' distribution: 'temurin' - server-id: github # Value of the distributionManagement/repository/id field of the pom.xml + server-id: github # Value of the distributionManagement/repository/id field of the pom.xml-back settings-path: ${{ github.workspace }} # location for the settings.xml file cache: maven diff --git a/agent-go/executor/function/BaseFunction.go b/agent-go/executor/function/BaseFunction.go new file mode 100644 index 0000000..348ff45 --- /dev/null +++ b/agent-go/executor/function/BaseFunction.go @@ -0,0 +1,136 @@ +package function + +import "strings" + +type BaseFunc interface { + Exec(baseFuncName string, funcArgs ...string) string +} + +type AgentOsOperator struct { + execCommandPrefix string `json:"exec_command_prefix",comment:"apt-get or yum or zapper"` + + canAccessInternet bool `json:"can_access_internet",comment:"是否可以访问公网"` +} + +// Exec 执行基础功能函数 +func (op *AgentOsOperator) Exec(baseFuncName string, funcArgs ...string) string { + + result := "" + + switch baseFuncName { + + case "shutdownFirewall": + result = op.shutdownFirewall() + break + case "modifyHostname": + result = op.modifyHostname(funcArgs) + break + case "disableSwap": + result = op.disableSwap() + break + case "installDocker": + result = op.installDocker(funcArgs) + break + case "installDockerCompose": + result = op.installDockerCompose() + break + case "modifyDockerConfig": + result = op.modifyDockerConfig() + break + case "installHelm": + result = op.installHelm() + break + case "installHarbor": + result = op.installHarbor(funcArgs) + break + case "chronyToPublicNTP": + result = op.chronyToPublicNTP() + break + case "chronyToMaster": + result = op.chronyToMaster(funcArgs) + break + case "installZSH": + result = op.installZSH() + break + case "modifySshPort": + result = op.modifySshPort(funcArgs) + break + case "openBBR": + result = op.openBBR() + break + default: + result = op.ok(funcArgs) + + } + + return result +} + +func (op *AgentOsOperator) shutdownFirewall() string { + + return "" +} + +func (op *AgentOsOperator) modifyHostname(args []string) string { + + return "" +} + +func (op *AgentOsOperator) disableSwap() string { + + return "" +} + +func (op *AgentOsOperator) installDocker(args []string) string { + + return "" +} + +func (op *AgentOsOperator) installDockerCompose() string { + + return "" +} + +func (op *AgentOsOperator) installHelm() string { + + return "" +} + +func (op *AgentOsOperator) modifyDockerConfig() string { + + return "" +} + +func (op *AgentOsOperator) installHarbor(args []string) string { + + return "" +} + +func (op *AgentOsOperator) chronyToPublicNTP() string { + + return "" +} + +func (op *AgentOsOperator) chronyToMaster(args []string) string { + + return "" +} + +func (op *AgentOsOperator) installZSH() string { + + return "" +} + +func (op *AgentOsOperator) modifySshPort(args []string) string { + + return "" +} + +func (op *AgentOsOperator) openBBR() string { + + return "" +} + +func (op *AgentOsOperator) ok(args []string) string { + return "base function is ok , args are => " + strings.Join(args, " ") +} diff --git a/agent-go/g/global.go b/agent-go/g/global.go index c5f7247..80c65eb 100644 --- a/agent-go/g/global.go +++ b/agent-go/g/global.go @@ -18,6 +18,7 @@ const ( ExecOmType = "EXECUTOR" StatusOmType = "STATUS" InitOmType = "INIT" + AgentOmType = "AGENT" ) var pool, _ = ants.NewPool(100, ants.WithNonblocking(false), ants.WithLogger(logger2.Log), ants.WithMaxBlockingTasks(30), ants.WithDisablePurge(true)) diff --git a/agent-go/rabbitmq/OctopusMessage.go b/agent-go/rabbitmq/OctopusMessage.go index 3553445..1d74ab2 100644 --- a/agent-go/rabbitmq/OctopusMessage.go +++ b/agent-go/rabbitmq/OctopusMessage.go @@ -83,6 +83,11 @@ func doHandleOctopusMessage(octopusMessage *OctopusMessage) { P.Submit(func() { statusOMHandler(octopusMessage) }) + case g.AgentOmType: + P.Submit(func() { + agentOMHandler(octopusMessage) + }, + ) default: P.Submit(func() { blackHoleOMHandler(octopusMessage) @@ -91,6 +96,11 @@ func doHandleOctopusMessage(octopusMessage *OctopusMessage) { } +// agentOMHandler 处理Agent的核心操作指令 +func agentOMHandler(octopusMessage *OctopusMessage) { + +} + func executorOMHandler(octopusMessage *OctopusMessage) { executionMsgString := octopusMessage.Content.(string) diff --git a/common/pom.xml b/common/pom.xml index e660761..54f8af6 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -27,6 +27,10 @@ oshi-core-java11 6.4.0 + + com.fasterxml.jackson.core + jackson-annotations + diff --git a/common/src/main/java/io/wdd/common/CommonApplication.java b/common/src/main/java/io/wdd/common/CommonApplication.java index 532d05b..f86cfb8 100644 --- a/common/src/main/java/io/wdd/common/CommonApplication.java +++ b/common/src/main/java/io/wdd/common/CommonApplication.java @@ -1,13 +1,13 @@ package io.wdd.common; -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; +//import org.springframework.boot.SpringApplication; +//import org.springframework.boot.autoconfigure.SpringBootApplication; -@SpringBootApplication -public class CommonApplication { - - public static void main(String[] args) { - SpringApplication.run(CommonApplication.class, args); - } - -} +//@SpringBootApplication +//public class CommonApplication { +// +// public static void main(String[] args) { +// SpringApplication.run(CommonApplication.class, args); +// } +// +//} diff --git a/pom.xml b/pom.xml index 4fc0dc5..6009b66 100644 --- a/pom.xml +++ b/pom.xml @@ -20,10 +20,10 @@ ProjectOctopus - agent server + @@ -36,101 +36,6 @@ - - - - - org.springframework.cloud - spring-cloud-dependencies - ${spring-cloud.version} - pom - import - - - - com.alibaba.cloud - spring-cloud-alibaba-dependencies - ${alibaba-cloud.version} - pom - import - - - org.springframework.cloud - spring-cloud-starter-bootstrap - 3.1.5 - - - com.alibaba.cloud - spring-cloud-starter-alibaba-nacos-config - ${alibaba-cloud.version} - - - - - - org.springframework.boot - spring-boot-starter-web - - - - - - - org.apache.commons - commons-lang3 - 3.12.0 - - - - - com.google.guava - guava - 31.1-jre - - - - - org.springframework.boot - spring-boot-starter-amqp - - - - - org.springframework.boot - spring-boot-starter-data-redis - - - - - org.apache.commons - commons-pool2 - - - - - commons-beanutils - commons-beanutils - 1.9.4 - - - - org.projectlombok - lombok - true - - + + + + + + + + + + diff --git a/server/pom.xml b/server/pom.xml index 76a7426..dcdef3c 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -21,9 +21,37 @@ - io.wdd - common - ${project.parent.version} + org.springframework.boot + spring-boot-starter-web + + + + + org.springframework.boot + spring-boot-starter-amqp + + + + + org.springframework.boot + spring-boot-starter-data-redis + + + + + org.apache.commons + commons-pool2 + + + + + commons-beanutils + commons-beanutils + 1.9.4 @@ -67,12 +95,32 @@ 3.5.2 - - + + + org.apache.commons + commons-lang3 + 3.12.0 + + + + com.github.oshi + oshi-core-java11 + 6.4.0 + + + + + com.google.guava + guava + 31.1-jre + + + + + org.projectlombok + lombok + true + @@ -87,6 +135,12 @@ runtime --> + + org.springframework.boot + spring-boot-starter-test + test + + diff --git a/common/src/main/java/io/wdd/common/handler/GlobalExceptionHandler.java b/server/src/main/java/io/wdd/common/handler/GlobalExceptionHandler.java similarity index 99% rename from common/src/main/java/io/wdd/common/handler/GlobalExceptionHandler.java rename to server/src/main/java/io/wdd/common/handler/GlobalExceptionHandler.java index 08909d0..ee0e58c 100644 --- a/common/src/main/java/io/wdd/common/handler/GlobalExceptionHandler.java +++ b/server/src/main/java/io/wdd/common/handler/GlobalExceptionHandler.java @@ -1,8 +1,8 @@ package io.wdd.common.handler; import com.google.common.collect.Maps; -import io.wdd.common.beans.response.R; -import io.wdd.common.beans.response.ResultStat; +import io.wdd.common.response.R; +import io.wdd.common.response.ResultStat; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.amqp.rabbit.support.ListenerExecutionFailedException; diff --git a/common/src/main/java/io/wdd/common/handler/MyMessageSource.java b/server/src/main/java/io/wdd/common/handler/MyMessageSource.java similarity index 100% rename from common/src/main/java/io/wdd/common/handler/MyMessageSource.java rename to server/src/main/java/io/wdd/common/handler/MyMessageSource.java diff --git a/common/src/main/java/io/wdd/common/handler/MyRuntimeException.java b/server/src/main/java/io/wdd/common/handler/MyRuntimeException.java similarity index 95% rename from common/src/main/java/io/wdd/common/handler/MyRuntimeException.java rename to server/src/main/java/io/wdd/common/handler/MyRuntimeException.java index 21f0df6..7ae4135 100644 --- a/common/src/main/java/io/wdd/common/handler/MyRuntimeException.java +++ b/server/src/main/java/io/wdd/common/handler/MyRuntimeException.java @@ -1,6 +1,6 @@ package io.wdd.common.handler; -import io.wdd.common.beans.response.ResultStat; +import io.wdd.common.response.ResultStat; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/common/src/main/java/io/wdd/common/beans/response/R.java b/server/src/main/java/io/wdd/common/response/R.java similarity index 95% rename from common/src/main/java/io/wdd/common/beans/response/R.java rename to server/src/main/java/io/wdd/common/response/R.java index 25d6bf2..b16421e 100644 --- a/common/src/main/java/io/wdd/common/beans/response/R.java +++ b/server/src/main/java/io/wdd/common/response/R.java @@ -1,4 +1,4 @@ -package io.wdd.common.beans.response; +package io.wdd.common.response; import lombok.Data; diff --git a/common/src/main/java/io/wdd/common/beans/response/ResultStat.java b/server/src/main/java/io/wdd/common/response/ResultStat.java similarity index 92% rename from common/src/main/java/io/wdd/common/beans/response/ResultStat.java rename to server/src/main/java/io/wdd/common/response/ResultStat.java index d28fe6e..1e5def6 100644 --- a/common/src/main/java/io/wdd/common/beans/response/ResultStat.java +++ b/server/src/main/java/io/wdd/common/response/ResultStat.java @@ -1,4 +1,4 @@ -package io.wdd.common.beans.response; +package io.wdd.common.response; public enum ResultStat { diff --git a/common/src/main/java/io/wdd/common/utils/DataUnit.java b/server/src/main/java/io/wdd/common/utils/DataUnit.java similarity index 100% rename from common/src/main/java/io/wdd/common/utils/DataUnit.java rename to server/src/main/java/io/wdd/common/utils/DataUnit.java diff --git a/common/src/main/java/io/wdd/common/utils/FormatUtils.java b/server/src/main/java/io/wdd/common/utils/FormatUtils.java similarity index 100% rename from common/src/main/java/io/wdd/common/utils/FormatUtils.java rename to server/src/main/java/io/wdd/common/utils/FormatUtils.java diff --git a/common/src/main/java/io/wdd/common/utils/FunctionReader.java b/server/src/main/java/io/wdd/common/utils/FunctionReader.java similarity index 100% rename from common/src/main/java/io/wdd/common/utils/FunctionReader.java rename to server/src/main/java/io/wdd/common/utils/FunctionReader.java diff --git a/common/src/main/java/io/wdd/common/utils/MessageUtils.java b/server/src/main/java/io/wdd/common/utils/MessageUtils.java similarity index 93% rename from common/src/main/java/io/wdd/common/utils/MessageUtils.java rename to server/src/main/java/io/wdd/common/utils/MessageUtils.java index faf2a79..b53ad13 100644 --- a/common/src/main/java/io/wdd/common/utils/MessageUtils.java +++ b/server/src/main/java/io/wdd/common/utils/MessageUtils.java @@ -1,8 +1,8 @@ package io.wdd.common.utils; import com.fasterxml.jackson.databind.ObjectMapper; -import io.wdd.common.beans.rabbitmq.OctopusMessage; import io.wdd.common.handler.MyRuntimeException; +import io.wdd.rpc.message.OctopusMessage; import org.springframework.amqp.core.Message; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/common/src/main/java/io/wdd/common/utils/OctopusObjectMapperConfig.java b/server/src/main/java/io/wdd/common/utils/OctopusObjectMapperConfig.java similarity index 100% rename from common/src/main/java/io/wdd/common/utils/OctopusObjectMapperConfig.java rename to server/src/main/java/io/wdd/common/utils/OctopusObjectMapperConfig.java diff --git a/common/src/main/java/io/wdd/common/utils/OctopusRabbitTemplateConfig.java b/server/src/main/java/io/wdd/common/utils/OctopusRabbitTemplateConfig.java similarity index 94% rename from common/src/main/java/io/wdd/common/utils/OctopusRabbitTemplateConfig.java rename to server/src/main/java/io/wdd/common/utils/OctopusRabbitTemplateConfig.java index 4463848..14ef8d5 100644 --- a/common/src/main/java/io/wdd/common/utils/OctopusRabbitTemplateConfig.java +++ b/server/src/main/java/io/wdd/common/utils/OctopusRabbitTemplateConfig.java @@ -8,7 +8,6 @@ import org.springframework.amqp.rabbit.core.RabbitTemplate; import org.springframework.amqp.support.converter.Jackson2JsonMessageConverter; import org.springframework.amqp.support.converter.MessageConverter; import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; import javax.annotation.Resource; import java.text.SimpleDateFormat; diff --git a/common/src/main/java/io/wdd/common/utils/TimeUtils.java b/server/src/main/java/io/wdd/common/utils/TimeUtils.java similarity index 100% rename from common/src/main/java/io/wdd/common/utils/TimeUtils.java rename to server/src/main/java/io/wdd/common/utils/TimeUtils.java diff --git a/server/src/main/java/io/wdd/func/controller/OSSController.java b/server/src/main/java/io/wdd/func/controller/OSSController.java index a164feb..9cb6cc8 100644 --- a/server/src/main/java/io/wdd/func/controller/OSSController.java +++ b/server/src/main/java/io/wdd/func/controller/OSSController.java @@ -7,7 +7,7 @@ import com.amazonaws.services.s3.model.S3Object; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; -import io.wdd.common.beans.response.R; +import io.wdd.common.response.R; import io.wdd.func.oss.config.OctopusObjectSummary; import io.wdd.func.oss.config.OssConfig; import io.wdd.func.oss.service.OSSCoreService; diff --git a/server/src/main/java/io/wdd/func/controller/XrayController.java b/server/src/main/java/io/wdd/func/controller/XrayController.java index b4b11e5..dfff82a 100644 --- a/server/src/main/java/io/wdd/func/controller/XrayController.java +++ b/server/src/main/java/io/wdd/func/controller/XrayController.java @@ -4,7 +4,7 @@ package io.wdd.func.controller; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; -import io.wdd.common.beans.response.R; +import io.wdd.common.response.R; import io.wdd.func.xray.beans.node.ProxyNode; import io.wdd.func.xray.beans.node.XrayConfigInfo; import io.wdd.func.xray.service.XrayCallAgent; diff --git a/common/src/main/java/io/wdd/common/beans/agent/AgentOperationMessage.java b/server/src/main/java/io/wdd/rpc/agent/AgentOperationMessage.java similarity index 95% rename from common/src/main/java/io/wdd/common/beans/agent/AgentOperationMessage.java rename to server/src/main/java/io/wdd/rpc/agent/AgentOperationMessage.java index 787dc54..ebdfb2f 100644 --- a/common/src/main/java/io/wdd/common/beans/agent/AgentOperationMessage.java +++ b/server/src/main/java/io/wdd/rpc/agent/AgentOperationMessage.java @@ -1,4 +1,4 @@ -package io.wdd.common.beans.agent; +package io.wdd.rpc.agent; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.AllArgsConstructor; diff --git a/common/src/main/java/io/wdd/common/beans/agent/AgentOperationType.java b/server/src/main/java/io/wdd/rpc/agent/AgentOperationType.java similarity index 86% rename from common/src/main/java/io/wdd/common/beans/agent/AgentOperationType.java rename to server/src/main/java/io/wdd/rpc/agent/AgentOperationType.java index 3919fad..799c9a3 100644 --- a/common/src/main/java/io/wdd/common/beans/agent/AgentOperationType.java +++ b/server/src/main/java/io/wdd/rpc/agent/AgentOperationType.java @@ -1,4 +1,4 @@ -package io.wdd.common.beans.agent; +package io.wdd.rpc.agent; public enum AgentOperationType { diff --git a/server/src/main/java/io/wdd/rpc/agent/OctopusAgentServiceImpl.java b/server/src/main/java/io/wdd/rpc/agent/OctopusAgentServiceImpl.java index 408d47a..59c0f25 100644 --- a/server/src/main/java/io/wdd/rpc/agent/OctopusAgentServiceImpl.java +++ b/server/src/main/java/io/wdd/rpc/agent/OctopusAgentServiceImpl.java @@ -3,11 +3,9 @@ package io.wdd.rpc.agent; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; -import io.wdd.common.beans.agent.AgentOperationMessage; -import io.wdd.common.beans.agent.AgentOperationType; -import io.wdd.common.beans.rabbitmq.OctopusMessage; -import io.wdd.common.beans.rabbitmq.OctopusMessageType; import io.wdd.common.utils.TimeUtils; +import io.wdd.rpc.message.OctopusMessage; +import io.wdd.rpc.message.OctopusMessageType; import io.wdd.rpc.message.handler.AsyncWaitOMResult; import io.wdd.rpc.message.handler.OMReplayContend; import io.wdd.rpc.message.sender.OMessageToAgentSender; diff --git a/server/src/main/java/io/wdd/rpc/controller/AgentController.java b/server/src/main/java/io/wdd/rpc/controller/AgentController.java index ed1c9c4..ddcea7d 100644 --- a/server/src/main/java/io/wdd/rpc/controller/AgentController.java +++ b/server/src/main/java/io/wdd/rpc/controller/AgentController.java @@ -2,7 +2,7 @@ package io.wdd.rpc.controller; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import io.wdd.common.beans.response.R; +import io.wdd.common.response.R; import io.wdd.rpc.agent.OctopusAgentService; import io.wdd.server.beans.vo.ServerInfoVO; import org.springframework.web.bind.annotation.GetMapping; diff --git a/server/src/main/java/io/wdd/rpc/controller/ExecutionController.java b/server/src/main/java/io/wdd/rpc/controller/ExecutionController.java index 7d2ba39..71e00c0 100644 --- a/server/src/main/java/io/wdd/rpc/controller/ExecutionController.java +++ b/server/src/main/java/io/wdd/rpc/controller/ExecutionController.java @@ -3,7 +3,7 @@ package io.wdd.rpc.controller; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; -import io.wdd.common.beans.response.R; +import io.wdd.common.response.R; import io.wdd.rpc.execute.result.BuildStreamReader; import io.wdd.rpc.execute.service.AsyncExecutionService; import io.wdd.rpc.execute.service.SyncExecutionService; diff --git a/server/src/main/java/io/wdd/rpc/controller/SchedulerController.java b/server/src/main/java/io/wdd/rpc/controller/SchedulerController.java index c06d1d1..6c50cd8 100644 --- a/server/src/main/java/io/wdd/rpc/controller/SchedulerController.java +++ b/server/src/main/java/io/wdd/rpc/controller/SchedulerController.java @@ -4,7 +4,7 @@ package io.wdd.rpc.controller; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; -import io.wdd.common.beans.response.R; +import io.wdd.common.response.R; import io.wdd.rpc.scheduler.beans.ScriptSchedulerVO; import io.wdd.rpc.scheduler.service.QuartzSchedulerService; import org.quartz.JobDetail; diff --git a/server/src/main/java/io/wdd/rpc/controller/StatusController.java b/server/src/main/java/io/wdd/rpc/controller/StatusController.java index bcaf7b4..d4190dc 100644 --- a/server/src/main/java/io/wdd/rpc/controller/StatusController.java +++ b/server/src/main/java/io/wdd/rpc/controller/StatusController.java @@ -3,7 +3,7 @@ package io.wdd.rpc.controller; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import io.wdd.common.beans.response.R; +import io.wdd.common.response.R; import io.wdd.rpc.init.ServerCacheAgentStatus; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; diff --git a/common/src/main/java/io/wdd/common/beans/executor/ExecutionMessage.java b/server/src/main/java/io/wdd/rpc/execute/ExecutionMessage.java similarity index 98% rename from common/src/main/java/io/wdd/common/beans/executor/ExecutionMessage.java rename to server/src/main/java/io/wdd/rpc/execute/ExecutionMessage.java index 74848f4..7b0e3e4 100644 --- a/common/src/main/java/io/wdd/common/beans/executor/ExecutionMessage.java +++ b/server/src/main/java/io/wdd/rpc/execute/ExecutionMessage.java @@ -1,4 +1,4 @@ -package io.wdd.common.beans.executor; +package io.wdd.rpc.execute; import com.fasterxml.jackson.annotation.JsonProperty; import io.wdd.common.utils.TimeUtils; diff --git a/server/src/main/java/io/wdd/rpc/execute/service/AsyncExecutionService.java b/server/src/main/java/io/wdd/rpc/execute/service/AsyncExecutionService.java index dee0fa2..5c831cc 100644 --- a/server/src/main/java/io/wdd/rpc/execute/service/AsyncExecutionService.java +++ b/server/src/main/java/io/wdd/rpc/execute/service/AsyncExecutionService.java @@ -1,6 +1,6 @@ package io.wdd.rpc.execute.service; -import io.wdd.common.beans.rabbitmq.OctopusMessage; +import io.wdd.rpc.message.OctopusMessage; import java.util.HashMap; import java.util.List; diff --git a/server/src/main/java/io/wdd/rpc/execute/service/AsyncExecutionServiceImpl.java b/server/src/main/java/io/wdd/rpc/execute/service/AsyncExecutionServiceImpl.java index 3d8bafc..f2cc84a 100644 --- a/server/src/main/java/io/wdd/rpc/execute/service/AsyncExecutionServiceImpl.java +++ b/server/src/main/java/io/wdd/rpc/execute/service/AsyncExecutionServiceImpl.java @@ -2,11 +2,11 @@ package io.wdd.rpc.execute.service; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; -import io.wdd.common.beans.executor.ExecutionMessage; -import io.wdd.common.beans.rabbitmq.OctopusMessage; -import io.wdd.common.beans.rabbitmq.OctopusMessageType; import io.wdd.common.utils.TimeUtils; +import io.wdd.rpc.execute.ExecutionMessage; import io.wdd.rpc.execute.config.ExecutionLog; +import io.wdd.rpc.message.OctopusMessage; +import io.wdd.rpc.message.OctopusMessageType; import io.wdd.rpc.message.sender.OMessageToAgentSender; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; diff --git a/server/src/main/java/io/wdd/rpc/execute/service/ExecutionResultDaemonHandler.java b/server/src/main/java/io/wdd/rpc/execute/service/ExecutionResultDaemonHandler.java index 1295831..b0cba48 100644 --- a/server/src/main/java/io/wdd/rpc/execute/service/ExecutionResultDaemonHandler.java +++ b/server/src/main/java/io/wdd/rpc/execute/service/ExecutionResultDaemonHandler.java @@ -9,7 +9,6 @@ import io.wdd.server.service.ExecutionLogService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.CollectionUtils; import org.springframework.context.annotation.Lazy; -import org.springframework.stereotype.Service; import javax.annotation.PostConstruct; import javax.annotation.Resource; diff --git a/server/src/main/java/io/wdd/rpc/execute/service/SyncExecutionServiceImpl.java b/server/src/main/java/io/wdd/rpc/execute/service/SyncExecutionServiceImpl.java index 06cb143..0ef3060 100644 --- a/server/src/main/java/io/wdd/rpc/execute/service/SyncExecutionServiceImpl.java +++ b/server/src/main/java/io/wdd/rpc/execute/service/SyncExecutionServiceImpl.java @@ -1,7 +1,7 @@ package io.wdd.rpc.execute.service; -import io.wdd.common.beans.rabbitmq.OctopusMessage; -import io.wdd.common.beans.rabbitmq.OctopusMessageType; +import io.wdd.rpc.message.OctopusMessage; +import io.wdd.rpc.message.OctopusMessageType; import io.wdd.rpc.message.handler.AsyncWaitOMResult; import io.wdd.rpc.message.handler.OMReplayContend; import lombok.extern.slf4j.Slf4j; diff --git a/server/src/main/java/io/wdd/rpc/init/AcceptAgentInitInfo.java b/server/src/main/java/io/wdd/rpc/init/AcceptAgentInitInfo.java index 26fabf3..8bdbe49 100644 --- a/server/src/main/java/io/wdd/rpc/init/AcceptAgentInitInfo.java +++ b/server/src/main/java/io/wdd/rpc/init/AcceptAgentInitInfo.java @@ -3,11 +3,11 @@ package io.wdd.rpc.init; import com.fasterxml.jackson.databind.ObjectMapper; import com.rabbitmq.client.Channel; -import io.wdd.common.beans.rabbitmq.OctopusMessage; -import io.wdd.common.beans.rabbitmq.OctopusMessageType; -import io.wdd.common.beans.status.AgentStatus; import io.wdd.common.handler.MyRuntimeException; +import io.wdd.rpc.message.OctopusMessage; +import io.wdd.rpc.message.OctopusMessageType; import io.wdd.rpc.message.sender.OMessageToAgentSender; +import io.wdd.rpc.status.AgentStatus; import io.wdd.server.beans.vo.ServerInfoVO; import io.wdd.server.utils.DaemonDatabaseOperator; import lombok.SneakyThrows; diff --git a/server/src/main/java/io/wdd/rpc/init/ServerCacheAgentStatus.java b/server/src/main/java/io/wdd/rpc/init/ServerCacheAgentStatus.java index 23496c7..fac1296 100644 --- a/server/src/main/java/io/wdd/rpc/init/ServerCacheAgentStatus.java +++ b/server/src/main/java/io/wdd/rpc/init/ServerCacheAgentStatus.java @@ -1,8 +1,8 @@ package io.wdd.rpc.init; -import io.wdd.common.beans.status.AgentHealthyStatusEnum; import io.wdd.common.utils.TimeUtils; +import io.wdd.rpc.status.AgentHealthyStatusEnum; import io.wdd.server.beans.vo.ServerInfoVO; import io.wdd.server.coreService.CoreServerService; import lombok.extern.slf4j.Slf4j; @@ -15,7 +15,8 @@ import javax.annotation.Resource; import java.util.*; import java.util.stream.Collectors; -import static io.wdd.common.beans.status.OctopusStatusMessage.ALL_AGENT_STATUS_REDIS_KEY; +import static io.wdd.rpc.status.OctopusStatusMessage.ALL_AGENT_STATUS_REDIS_KEY; + /** * Server启动或者运行的时候，需要初 缓存一系列的信息 diff --git a/common/src/main/java/io/wdd/common/beans/rabbitmq/OctopusMessage.java b/server/src/main/java/io/wdd/rpc/message/OctopusMessage.java similarity index 95% rename from common/src/main/java/io/wdd/common/beans/rabbitmq/OctopusMessage.java rename to server/src/main/java/io/wdd/rpc/message/OctopusMessage.java index 9dba47d..2027258 100644 --- a/common/src/main/java/io/wdd/common/beans/rabbitmq/OctopusMessage.java +++ b/server/src/main/java/io/wdd/rpc/message/OctopusMessage.java @@ -1,4 +1,4 @@ -package io.wdd.common.beans.rabbitmq; +package io.wdd.rpc.message; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/common/src/main/java/io/wdd/common/beans/rabbitmq/OctopusMessageType.java b/server/src/main/java/io/wdd/rpc/message/OctopusMessageType.java similarity index 86% rename from common/src/main/java/io/wdd/common/beans/rabbitmq/OctopusMessageType.java rename to server/src/main/java/io/wdd/rpc/message/OctopusMessageType.java index 7c69c68..ec7b52c 100644 --- a/common/src/main/java/io/wdd/common/beans/rabbitmq/OctopusMessageType.java +++ b/server/src/main/java/io/wdd/rpc/message/OctopusMessageType.java @@ -1,4 +1,4 @@ -package io.wdd.common.beans.rabbitmq; +package io.wdd.rpc.message; public enum OctopusMessageType { diff --git a/server/src/main/java/io/wdd/rpc/message/handler/AsyncWaitOMResult.java b/server/src/main/java/io/wdd/rpc/message/handler/AsyncWaitOMResult.java index 0f29808..7f88542 100644 --- a/server/src/main/java/io/wdd/rpc/message/handler/AsyncWaitOMResult.java +++ b/server/src/main/java/io/wdd/rpc/message/handler/AsyncWaitOMResult.java @@ -1,6 +1,6 @@ package io.wdd.rpc.message.handler; -import io.wdd.common.beans.rabbitmq.OctopusMessage; +import io.wdd.rpc.message.OctopusMessage; import io.wdd.server.config.ServerCommonPool; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/server/src/main/java/io/wdd/rpc/message/handler/OMReplayContend.java b/server/src/main/java/io/wdd/rpc/message/handler/OMReplayContend.java index 0abd5dc..d7a8fe2 100644 --- a/server/src/main/java/io/wdd/rpc/message/handler/OMReplayContend.java +++ b/server/src/main/java/io/wdd/rpc/message/handler/OMReplayContend.java @@ -3,8 +3,8 @@ package io.wdd.rpc.message.handler; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import io.wdd.common.beans.rabbitmq.OctopusMessage; -import io.wdd.common.beans.rabbitmq.OctopusMessageType; +import io.wdd.rpc.message.OctopusMessage; +import io.wdd.rpc.message.OctopusMessageType; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/server/src/main/java/io/wdd/rpc/message/handler/OMessageHandlerServer.java b/server/src/main/java/io/wdd/rpc/message/handler/OMessageHandlerServer.java index 570ff21..6d8053e 100644 --- a/server/src/main/java/io/wdd/rpc/message/handler/OMessageHandlerServer.java +++ b/server/src/main/java/io/wdd/rpc/message/handler/OMessageHandlerServer.java @@ -2,8 +2,8 @@ package io.wdd.rpc.message.handler; import com.fasterxml.jackson.databind.ObjectMapper; -import io.wdd.common.beans.rabbitmq.OctopusMessage; import io.wdd.common.handler.MyRuntimeException; +import io.wdd.rpc.message.OctopusMessage; import lombok.extern.slf4j.Slf4j; import org.springframework.amqp.core.Message; import org.springframework.amqp.rabbit.annotation.RabbitHandler; diff --git a/server/src/main/java/io/wdd/rpc/message/sender/OMessageToAgentSender.java b/server/src/main/java/io/wdd/rpc/message/sender/OMessageToAgentSender.java index 777d208..e4e5fbc 100644 --- a/server/src/main/java/io/wdd/rpc/message/sender/OMessageToAgentSender.java +++ b/server/src/main/java/io/wdd/rpc/message/sender/OMessageToAgentSender.java @@ -2,10 +2,10 @@ package io.wdd.rpc.message.sender; import com.fasterxml.jackson.databind.ObjectMapper; -import io.wdd.common.beans.rabbitmq.OctopusMessage; -import io.wdd.common.beans.rabbitmq.OctopusMessageType; import io.wdd.common.handler.MyRuntimeException; import io.wdd.rpc.init.InitRabbitMQConfig; +import io.wdd.rpc.message.OctopusMessage; +import io.wdd.rpc.message.OctopusMessageType; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; import org.springframework.amqp.rabbit.core.RabbitTemplate; diff --git a/server/src/main/java/io/wdd/rpc/scheduler/config/ExecutionJob.java b/server/src/main/java/io/wdd/rpc/scheduler/config/ExecutionJob.java index e273ab4..ab3c9dc 100644 --- a/server/src/main/java/io/wdd/rpc/scheduler/config/ExecutionJob.java +++ b/server/src/main/java/io/wdd/rpc/scheduler/config/ExecutionJob.java @@ -6,7 +6,6 @@ import io.wdd.server.utils.SpringUtils; import org.apache.commons.lang3.StringUtils; import org.quartz.JobExecutionContext; import org.quartz.JobExecutionException; -import org.springframework.scheduling.annotation.Async; import org.springframework.scheduling.quartz.QuartzJobBean; import org.springframework.util.ReflectionUtils; diff --git a/server/src/main/java/io/wdd/rpc/scheduler/config/QuartzSchedulerUtils.java b/server/src/main/java/io/wdd/rpc/scheduler/config/QuartzSchedulerUtils.java index 2e6e8b7..eb89986 100644 --- a/server/src/main/java/io/wdd/rpc/scheduler/config/QuartzSchedulerUtils.java +++ b/server/src/main/java/io/wdd/rpc/scheduler/config/QuartzSchedulerUtils.java @@ -1,7 +1,7 @@ package io.wdd.rpc.scheduler.config; -import io.wdd.common.beans.executor.ExecutionMessage; import io.wdd.common.utils.TimeUtils; +import io.wdd.rpc.execute.ExecutionMessage; import io.wdd.rpc.scheduler.beans.ScriptSchedulerDTO; import org.quartz.Scheduler; import org.quartz.SchedulerException; diff --git a/server/src/main/java/io/wdd/rpc/scheduler/service/status/AgentRuntimeMetricStatus.java b/server/src/main/java/io/wdd/rpc/scheduler/service/status/AgentRuntimeMetricStatus.java index a461729..1ca87c6 100644 --- a/server/src/main/java/io/wdd/rpc/scheduler/service/status/AgentRuntimeMetricStatus.java +++ b/server/src/main/java/io/wdd/rpc/scheduler/service/status/AgentRuntimeMetricStatus.java @@ -1,7 +1,7 @@ package io.wdd.rpc.scheduler.service.status; -import io.wdd.common.beans.status.OctopusStatusMessage; +import io.wdd.rpc.status.OctopusStatusMessage; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; @@ -10,8 +10,8 @@ import javax.annotation.Resource; import java.util.List; import java.util.stream.Collectors; -import static io.wdd.common.beans.status.OctopusStatusMessage.METRIC_STATUS_MESSAGE_TYPE; import static io.wdd.rpc.init.ServerCacheAgentStatus.ALL_HEALTHY_AGENT_TOPIC_NAME_LIST; +import static io.wdd.rpc.status.OctopusStatusMessage.METRIC_STATUS_MESSAGE_TYPE; /** * 收集OctopusAgent的运行Metric信息 diff --git a/server/src/main/java/io/wdd/rpc/scheduler/service/status/AgentStatusStreamReader.java b/server/src/main/java/io/wdd/rpc/scheduler/service/status/AgentStatusStreamReader.java index fee04e6..f0edfa4 100644 --- a/server/src/main/java/io/wdd/rpc/scheduler/service/status/AgentStatusStreamReader.java +++ b/server/src/main/java/io/wdd/rpc/scheduler/service/status/AgentStatusStreamReader.java @@ -4,7 +4,7 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.ObjectMapper; -import io.wdd.common.beans.status.AgentStatus; +import io.wdd.rpc.status.AgentStatus; import lombok.Getter; import lombok.Setter; import lombok.extern.slf4j.Slf4j; diff --git a/server/src/main/java/io/wdd/rpc/scheduler/service/status/CollectAgentStatus.java b/server/src/main/java/io/wdd/rpc/scheduler/service/status/CollectAgentStatus.java index 6e71a63..b0dd670 100644 --- a/server/src/main/java/io/wdd/rpc/scheduler/service/status/CollectAgentStatus.java +++ b/server/src/main/java/io/wdd/rpc/scheduler/service/status/CollectAgentStatus.java @@ -2,11 +2,11 @@ package io.wdd.rpc.scheduler.service.status; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; -import io.wdd.common.beans.rabbitmq.OctopusMessage; -import io.wdd.common.beans.rabbitmq.OctopusMessageType; -import io.wdd.common.beans.status.OctopusStatusMessage; import io.wdd.common.utils.TimeUtils; +import io.wdd.rpc.message.OctopusMessage; +import io.wdd.rpc.message.OctopusMessageType; import io.wdd.rpc.message.sender.OMessageToAgentSender; +import io.wdd.rpc.status.OctopusStatusMessage; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/server/src/main/java/io/wdd/rpc/scheduler/service/status/MonitorAllAgentStatus.java b/server/src/main/java/io/wdd/rpc/scheduler/service/status/MonitorAllAgentStatus.java index 8614d1b..69385f6 100644 --- a/server/src/main/java/io/wdd/rpc/scheduler/service/status/MonitorAllAgentStatus.java +++ b/server/src/main/java/io/wdd/rpc/scheduler/service/status/MonitorAllAgentStatus.java @@ -1,9 +1,9 @@ package io.wdd.rpc.scheduler.service.status; -import io.wdd.common.beans.status.OctopusStatusMessage; import io.wdd.common.utils.TimeUtils; import io.wdd.rpc.init.ServerCacheAgentStatus; import io.wdd.rpc.scheduler.service.BuildStatusScheduleTask; +import io.wdd.rpc.status.OctopusStatusMessage; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.CollectionUtils; import org.springframework.context.annotation.Lazy; @@ -16,9 +16,9 @@ import java.util.List; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static io.wdd.common.beans.status.OctopusStatusMessage.ALL_AGENT_STATUS_REDIS_KEY; -import static io.wdd.common.beans.status.OctopusStatusMessage.HEALTHY_STATUS_MESSAGE_TYPE; import static io.wdd.rpc.init.ServerCacheAgentStatus.ALL_AGENT_TOPIC_NAME_LIST; +import static io.wdd.rpc.status.OctopusStatusMessage.ALL_AGENT_STATUS_REDIS_KEY; +import static io.wdd.rpc.status.OctopusStatusMessage.HEALTHY_STATUS_MESSAGE_TYPE; /** * 更新频率被类 BuildStatusScheduleTask.class控制 diff --git a/common/src/main/java/io/wdd/common/beans/status/AgentHealthyStatusEnum.java b/server/src/main/java/io/wdd/rpc/status/AgentHealthyStatusEnum.java similarity index 89% rename from common/src/main/java/io/wdd/common/beans/status/AgentHealthyStatusEnum.java rename to server/src/main/java/io/wdd/rpc/status/AgentHealthyStatusEnum.java index 0494909..ef794e7 100644 --- a/common/src/main/java/io/wdd/common/beans/status/AgentHealthyStatusEnum.java +++ b/server/src/main/java/io/wdd/rpc/status/AgentHealthyStatusEnum.java @@ -1,7 +1,6 @@ -package io.wdd.common.beans.status; +package io.wdd.rpc.status; import lombok.Getter; -import lombok.Setter; /** * AgentHealthy状态描述实体类 diff --git a/common/src/main/java/io/wdd/common/beans/status/AgentStatus.java b/server/src/main/java/io/wdd/rpc/status/AgentStatus.java similarity index 95% rename from common/src/main/java/io/wdd/common/beans/status/AgentStatus.java rename to server/src/main/java/io/wdd/rpc/status/AgentStatus.java index 489a48d..83a6a90 100644 --- a/common/src/main/java/io/wdd/common/beans/status/AgentStatus.java +++ b/server/src/main/java/io/wdd/rpc/status/AgentStatus.java @@ -1,4 +1,4 @@ -package io.wdd.common.beans.status; +package io.wdd.rpc.status; import lombok.AllArgsConstructor; diff --git a/common/src/main/java/io/wdd/common/beans/status/AgentSystemInfo.java b/server/src/main/java/io/wdd/rpc/status/AgentSystemInfo.java similarity index 97% rename from common/src/main/java/io/wdd/common/beans/status/AgentSystemInfo.java rename to server/src/main/java/io/wdd/rpc/status/AgentSystemInfo.java index d9056e9..89f5abc 100644 --- a/common/src/main/java/io/wdd/common/beans/status/AgentSystemInfo.java +++ b/server/src/main/java/io/wdd/rpc/status/AgentSystemInfo.java @@ -1,4 +1,4 @@ -package io.wdd.common.beans.status; +package io.wdd.rpc.status; import io.wdd.common.utils.TimeUtils; import lombok.AllArgsConstructor; diff --git a/common/src/main/java/io/wdd/common/beans/status/AppStatusEnum.java b/server/src/main/java/io/wdd/rpc/status/AppStatusEnum.java similarity index 92% rename from common/src/main/java/io/wdd/common/beans/status/AppStatusEnum.java rename to server/src/main/java/io/wdd/rpc/status/AppStatusEnum.java index 2173f30..e627994 100644 --- a/common/src/main/java/io/wdd/common/beans/status/AppStatusEnum.java +++ b/server/src/main/java/io/wdd/rpc/status/AppStatusEnum.java @@ -1,4 +1,4 @@ -package io.wdd.common.beans.status; +package io.wdd.rpc.status; public enum AppStatusEnum { diff --git a/common/src/main/java/io/wdd/common/beans/status/AppStatusInfo.java b/server/src/main/java/io/wdd/rpc/status/AppStatusInfo.java similarity index 90% rename from common/src/main/java/io/wdd/common/beans/status/AppStatusInfo.java rename to server/src/main/java/io/wdd/rpc/status/AppStatusInfo.java index b8f647f..fd3abb0 100644 --- a/common/src/main/java/io/wdd/common/beans/status/AppStatusInfo.java +++ b/server/src/main/java/io/wdd/rpc/status/AppStatusInfo.java @@ -1,4 +1,4 @@ -package io.wdd.common.beans.status; +package io.wdd.rpc.status; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/common/src/main/java/io/wdd/common/beans/status/CpuInfo.java b/server/src/main/java/io/wdd/rpc/status/CpuInfo.java similarity index 99% rename from common/src/main/java/io/wdd/common/beans/status/CpuInfo.java rename to server/src/main/java/io/wdd/rpc/status/CpuInfo.java index 8be8979..43cb652 100644 --- a/common/src/main/java/io/wdd/common/beans/status/CpuInfo.java +++ b/server/src/main/java/io/wdd/rpc/status/CpuInfo.java @@ -1,4 +1,4 @@ -package io.wdd.common.beans.status; +package io.wdd.rpc.status; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/common/src/main/java/io/wdd/common/beans/status/CpuTicks.java b/server/src/main/java/io/wdd/rpc/status/CpuTicks.java similarity index 97% rename from common/src/main/java/io/wdd/common/beans/status/CpuTicks.java rename to server/src/main/java/io/wdd/rpc/status/CpuTicks.java index 6d4d587..2065ee7 100644 --- a/common/src/main/java/io/wdd/common/beans/status/CpuTicks.java +++ b/server/src/main/java/io/wdd/rpc/status/CpuTicks.java @@ -1,8 +1,7 @@ -package io.wdd.common.beans.status; +package io.wdd.rpc.status; import lombok.AllArgsConstructor; import lombok.Data; -import lombok.Getter; import lombok.NoArgsConstructor; import oshi.hardware.CentralProcessor; import oshi.util.Util; diff --git a/common/src/main/java/io/wdd/common/beans/status/DiskInfo.java b/server/src/main/java/io/wdd/rpc/status/DiskInfo.java similarity index 98% rename from common/src/main/java/io/wdd/common/beans/status/DiskInfo.java rename to server/src/main/java/io/wdd/rpc/status/DiskInfo.java index 085e0a2..291617a 100644 --- a/common/src/main/java/io/wdd/common/beans/status/DiskInfo.java +++ b/server/src/main/java/io/wdd/rpc/status/DiskInfo.java @@ -1,4 +1,4 @@ -package io.wdd.common.beans.status; +package io.wdd.rpc.status; import io.wdd.common.utils.FormatUtils; import lombok.AllArgsConstructor; diff --git a/common/src/main/java/io/wdd/common/beans/status/MemoryInfo.java b/server/src/main/java/io/wdd/rpc/status/MemoryInfo.java similarity index 97% rename from common/src/main/java/io/wdd/common/beans/status/MemoryInfo.java rename to server/src/main/java/io/wdd/rpc/status/MemoryInfo.java index 528e6ea..1afe27b 100644 --- a/common/src/main/java/io/wdd/common/beans/status/MemoryInfo.java +++ b/server/src/main/java/io/wdd/rpc/status/MemoryInfo.java @@ -1,4 +1,4 @@ -package io.wdd.common.beans.status; +package io.wdd.rpc.status; import io.wdd.common.utils.FormatUtils; import lombok.AllArgsConstructor; diff --git a/common/src/main/java/io/wdd/common/beans/status/MetricStatus.java b/server/src/main/java/io/wdd/rpc/status/MetricStatus.java similarity index 86% rename from common/src/main/java/io/wdd/common/beans/status/MetricStatus.java rename to server/src/main/java/io/wdd/rpc/status/MetricStatus.java index 7b980fd..2f7bae5 100644 --- a/common/src/main/java/io/wdd/common/beans/status/MetricStatus.java +++ b/server/src/main/java/io/wdd/rpc/status/MetricStatus.java @@ -1,4 +1,4 @@ -package io.wdd.common.beans.status; +package io.wdd.rpc.status; import lombok.Data; diff --git a/common/src/main/java/io/wdd/common/beans/status/NetworkInfo.java b/server/src/main/java/io/wdd/rpc/status/NetworkInfo.java similarity index 99% rename from common/src/main/java/io/wdd/common/beans/status/NetworkInfo.java rename to server/src/main/java/io/wdd/rpc/status/NetworkInfo.java index 71a93ff..d540e28 100644 --- a/common/src/main/java/io/wdd/common/beans/status/NetworkInfo.java +++ b/server/src/main/java/io/wdd/rpc/status/NetworkInfo.java @@ -1,4 +1,4 @@ -package io.wdd.common.beans.status; +package io.wdd.rpc.status; import io.wdd.common.utils.FormatUtils; diff --git a/common/src/main/java/io/wdd/common/beans/status/OctopusStatusMessage.java b/server/src/main/java/io/wdd/rpc/status/OctopusStatusMessage.java similarity index 96% rename from common/src/main/java/io/wdd/common/beans/status/OctopusStatusMessage.java rename to server/src/main/java/io/wdd/rpc/status/OctopusStatusMessage.java index d58d77a..37f62a7 100644 --- a/common/src/main/java/io/wdd/common/beans/status/OctopusStatusMessage.java +++ b/server/src/main/java/io/wdd/rpc/status/OctopusStatusMessage.java @@ -1,4 +1,4 @@ -package io.wdd.common.beans.status; +package io.wdd.rpc.status; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/server/src/main/java/io/wdd/server/controller/AppController.java b/server/src/main/java/io/wdd/server/controller/AppController.java index a7f4c08..f9a5d3a 100644 --- a/server/src/main/java/io/wdd/server/controller/AppController.java +++ b/server/src/main/java/io/wdd/server/controller/AppController.java @@ -1,9 +1,9 @@ package io.wdd.server.controller; +import io.wdd.common.response.R; import io.wdd.server.beans.vo.AppInfoVO; import io.wdd.server.coreService.CoreAppService; -import io.wdd.common.beans.response.R; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/server/src/main/java/io/wdd/server/controller/DomainController.java b/server/src/main/java/io/wdd/server/controller/DomainController.java index cd41c3c..21c00d3 100644 --- a/server/src/main/java/io/wdd/server/controller/DomainController.java +++ b/server/src/main/java/io/wdd/server/controller/DomainController.java @@ -1,9 +1,9 @@ package io.wdd.server.controller; +import io.wdd.common.response.R; import io.wdd.server.beans.po.DomainInfoPO; import io.wdd.server.beans.vo.DomainInfoVO; import io.wdd.server.coreService.CoreDomainService; -import io.wdd.common.beans.response.R; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/server/src/main/java/io/wdd/server/controller/ServerController.java b/server/src/main/java/io/wdd/server/controller/ServerController.java index 2a03dfa..411f0eb 100644 --- a/server/src/main/java/io/wdd/server/controller/ServerController.java +++ b/server/src/main/java/io/wdd/server/controller/ServerController.java @@ -4,7 +4,7 @@ package io.wdd.server.controller; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; -import io.wdd.common.beans.response.R; +import io.wdd.common.response.R; import io.wdd.server.beans.po.DomainInfoPO; import io.wdd.server.beans.po.ServerInfoPO; import io.wdd.server.beans.vo.AppInfoVO; diff --git a/server/src/main/resources/application.yml b/server/src/main/resources/application.yml new file mode 100644 index 0000000..ce2cee7 --- /dev/null +++ b/server/src/main/resources/application.yml @@ -0,0 +1,161 @@ +server: + port: 9999 + +spring: + main: + allow-circular-references: true + allow-bean-definition-overriding: true + rabbitmq: + host: 150.230.198.103 + port: 20672 + username: boge + password: boge14@Level5 + virtual-host: / + listener: + simple: + retry: + # ack failed will reentrant the Rabbit Listener + max-attempts: 2 + enabled: true + # retry interval unit ms + max-interval: 65000 + initial-interval: 65000 + redis: + host: 146.56.147.12 + port: 21370 + database: 0 + password: boge14@Level5 + # cluster: + # nodes: + # - 43.154.83.213:21370 + # - 43.154.83.213:21371 + # - 43.154.83.213:21372 + # - 43.154.83.213:21373 + # - 43.154.83.213:21374 + # - 43.154.83.213:21375 + # # 获取失败 最大重定向次数 + # max-redirects: 3 + # timeout: 50000 + #如果用以前的jedis，可以把下面的lettuce换成jedis即可 + lettuce: + pool: + # 连接池最大连接数默认值为8 + max-active: 16 + # 连接池最大阻塞时间（使用负值表示没有限制）默认值为-1 + max-wait: -1 + # 连接池中最大空闲连接数默认值为8 + max-idle: 10 + # 连接池中的最小空闲连接数，默认值为0 + min-idle: 10 + time-between-eviction-runs: 50000 + datasource: + driver-class-name: com.mysql.cj.jdbc.Driver + url: jdbc:mysql://140.238.63.37:21306/wdd_server?autoReconnect=true&useSSL=false&useUnicode=true&characterEncoding=UTF-8&serverTimezone=GMT%2B8 + username: root + password: boge14@Level5 + type: com.zaxxer.hikari.HikariDataSource + hikari: + minimum-idle: 3 + # 空闲连接存活最大时间，默认600000（10分钟） + idle-timeout: 180000 + # 连接池最大连接数，默认是10 + maximum-pool-size: 5 + # 此属性控制从池返回的连接的默认自动提交行为,默认值：true + auto-commit: true + connection-test-query: SELECT 1 + # 最大文件上传 + servlet: + multipart: + max-file-size: 500MB + max-request-size: 500MB + +mybatis-plus: + type-aliases-package: io.wdd.server.beans.po + global-config: + db-column-underline: true + db-config: + # modify ethe id strategy + id-type: assign_id + # logic delete field globally + logicDeleteField: isDelete + logic-not-delete-value: 0 + logic-delete-value: 1 + banner: false + configuration: + # 希望知道所有的sql是怎么执行的, 配置输出日志 + #log-impl: org.apache.ibatis.logging.stdout.StdOutImpl + log-impl: org.apache.ibatis.logging.nologging.NoLoggingImpl + # 数据库下划线--实体类也是下划线 需要为false + map-underscore-to-camel-case: true + # 一级缓存的 缓存级别默认为 session，如果要关闭一级缓存可以设置为 statement + local-cache-scope: session + # 是否开启二级缓存 + cache-enabled: false + # 默认地址为 classpath*:/mapper/**/*.xml +# mapper-locations: classpath*:/real-mappers/**/*.xml + +octopus: + message: + # agent boot up default common exchange + init_exchange: InitExchange + # server will send message to agent using this common queue + init_to_server: InitToServer + # agent boot up default common exchange routing key + init_to_server_key: InitToServerKey + # server will receive message from agent using this common queue + init_from_server: InitFromServer + # agent boot up default common exchange routing key + init_from_server_key: InitFromServerKey + # initialization register time out (unit ms) default is 5 min + init_ttl: "3000000" + # Octopus Exchange Name == server comunicate with agent + octopus_exchange: OctopusExchange + # Octopus Message To Server == all agent send info to server queue and topic + octopus_to_server: OctopusToServer + executor: + name: executor-functions + status: + name: octopus-agent + healthy: + type: cron + cron: 10 */1 * * * ? * + start-delay: 30 + metric: + pinch: 20 + +oss: + # 这里只是因为需要一个层级，不一定下面的都是oracle + oracle: + seoul1: + namespace: cnk8d6fazu16 + region: ap-seoul-1 + key: aed62d24d85e2da809ce02bf272420ba4ed74820 + secret: rQdEcn69K049+JkA1IGoQmC1k8zma8zfWvZvVS0h144= + capacity: 10737418240 + seoul2: + namespace: cncvl8ro2rbf + region: ap-seoul-1 + key: 9e413c6e66269bc65d7ec951d93ba9c6a9781f6e + secret: dkXD7PysjrhsTKfNIbKupUmtxdfOvYCyLXf0MXa4hnU= + capacity: 10737418240 + tokyo1: + namespace: nrjcs6lwr9vy + region: ap-tokyo-1 + key: 0584c323d6c8d24cc2fc8c2d716a4ea35bb99ae6 + secret: +xicO9obeqzC5a/WY1rXvl5pMWSWbVIpMt3Qv691NtU= + capacity: 10737418240 + phoenix1: + namespace: axqr6x6t48wm + region: us-phoenix-1 + key: e87a121f1548b244c7bd649a1f0ca35195d46cf2 + secret: uT+NIgJiKPjSaPT8EVUw3xbLSCv/CFMFuebVauznafk= + capacity: 10737418240 + london1: + namespace: lrmzslyt8jzs + region: uk-london-1 + key: 57671886f9f1bcc5ac7235b5a0e6123f5ca271b3 + secret: ukWae6TXjID2Wqxh+7mAPAf4busZPGzwAh/WDKZ5MOQ= + capacity: 10737418240 + + +