From 4bbc4b9c58b7278509b373edd8c2b2820e26cdbb Mon Sep 17 00:00:00 2001 From: wangxiang <1827945911@qq.com> Date: Wed, 4 May 2022 05:22:48 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=93=80=20=E9=87=8D=E6=9E=84=E5=89=8D?= =?UTF-8?q?=E7=AB=AF=E6=A1=86=E6=9E=B6=E8=BF=9B=E8=A1=8C=E9=80=82=E9=85=8D?= =?UTF-8?q?=E5=90=8E=E7=AB=AF=E6=A1=86=E6=9E=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- kicc-common/kicc-common-bom/pom.xml | 10 +++ .../kicc-monitor-api/pom.xml | 28 ++++++++ .../main/resources/META-INF/spring.factories | 1 + .../kicc-platform-api/kicc-system-api/pom.xml | 3 +- .../kicc-template-api/pom.xml | 28 ++++++++ .../main/resources/META-INF/spring.factories | 1 + kicc-platform/kicc-platform-api/pom.xml | 2 + .../kicc-common-biz/Dockerfile | 2 +- .../KiccCommonApplication.java | 2 +- .../kicc-monitor-biz/Dockerfile | 15 ++++ .../kicc-monitor-biz/pom.xml | 67 +++++++++++++++++ .../kicc/monitor/KiccMonitorApplication.java | 29 ++++++++ .../src/main/resources/bootstrap.yml | 17 +++++ .../src/main/resources/logback-spring.xml | 57 +++++++++++++++ .../kicc-platform-biz/kicc-system-biz/pom.xml | 2 +- .../kicc/system/KiccSystemApplication.java | 2 +- .../kicc-template-biz/Dockerfile | 15 ++++ .../kicc-template-biz/pom.xml | 72 +++++++++++++++++++ .../template/KiccTemplateApplication.java | 30 ++++++++ .../src/main/resources/bootstrap.yml | 17 +++++ .../src/main/resources/logback-spring.xml | 57 +++++++++++++++ kicc-platform/kicc-platform-biz/pom.xml | 2 + 22 files changed, 453 insertions(+), 6 deletions(-) create mode 100644 kicc-platform/kicc-platform-api/kicc-monitor-api/pom.xml create mode 100644 kicc-platform/kicc-platform-api/kicc-monitor-api/src/main/resources/META-INF/spring.factories create mode 100644 kicc-platform/kicc-platform-api/kicc-template-api/pom.xml create mode 100644 kicc-platform/kicc-platform-api/kicc-template-api/src/main/resources/META-INF/spring.factories rename kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/{commonbiz => monitor}/KiccCommonApplication.java (95%) create mode 100644 kicc-platform/kicc-platform-biz/kicc-monitor-biz/Dockerfile create mode 100644 kicc-platform/kicc-platform-biz/kicc-monitor-biz/pom.xml create mode 100644 kicc-platform/kicc-platform-biz/kicc-monitor-biz/src/main/java/com/cloud/kicc/monitor/KiccMonitorApplication.java create mode 100644 kicc-platform/kicc-platform-biz/kicc-monitor-biz/src/main/resources/bootstrap.yml create mode 100644 kicc-platform/kicc-platform-biz/kicc-monitor-biz/src/main/resources/logback-spring.xml create mode 100644 kicc-platform/kicc-platform-biz/kicc-template-biz/Dockerfile create mode 100644 kicc-platform/kicc-platform-biz/kicc-template-biz/pom.xml create mode 100644 kicc-platform/kicc-platform-biz/kicc-template-biz/src/main/java/com/cloud/kicc/template/KiccTemplateApplication.java create mode 100644 kicc-platform/kicc-platform-biz/kicc-template-biz/src/main/resources/bootstrap.yml create mode 100644 kicc-platform/kicc-platform-biz/kicc-template-biz/src/main/resources/logback-spring.xml diff --git a/kicc-common/kicc-common-bom/pom.xml b/kicc-common/kicc-common-bom/pom.xml index 40df0f23..54387644 100644 --- a/kicc-common/kicc-common-bom/pom.xml +++ b/kicc-common/kicc-common-bom/pom.xml @@ -101,6 +101,16 @@ kicc-system-api ${kicc.common.version} + + com.cloud + kicc-monitor-api + ${kicc.common.version} + + + com.cloud + kicc-template-api + ${kicc.common.version} + diff --git a/kicc-platform/kicc-platform-api/kicc-monitor-api/pom.xml b/kicc-platform/kicc-platform-api/kicc-monitor-api/pom.xml new file mode 100644 index 00000000..33ec2e97 --- /dev/null +++ b/kicc-platform/kicc-platform-api/kicc-monitor-api/pom.xml @@ -0,0 +1,28 @@ + + + 4.0.0 + + com.cloud + kicc-platform-api + 1.0.0 + + + kicc-monitor-api + jar + + kicc 运维监控api模块 + + + + + com.cloud + kicc-common-feign + + + + com.cloud + kicc-common-data + + + diff --git a/kicc-platform/kicc-platform-api/kicc-monitor-api/src/main/resources/META-INF/spring.factories b/kicc-platform/kicc-platform-api/kicc-monitor-api/src/main/resources/META-INF/spring.factories new file mode 100644 index 00000000..9d486397 --- /dev/null +++ b/kicc-platform/kicc-platform-api/kicc-monitor-api/src/main/resources/META-INF/spring.factories @@ -0,0 +1 @@ +com.cloud.kicc.common.feign.KiccFeignAutoConfiguration=\ diff --git a/kicc-platform/kicc-platform-api/kicc-system-api/pom.xml b/kicc-platform/kicc-platform-api/kicc-system-api/pom.xml index 557fd7fa..bc7406f5 100644 --- a/kicc-platform/kicc-platform-api/kicc-system-api/pom.xml +++ b/kicc-platform/kicc-platform-api/kicc-system-api/pom.xml @@ -11,8 +11,7 @@ kicc-system-api jar - kicc 通用用户权限管理系统公共api模块 - + kicc 系统api模块 diff --git a/kicc-platform/kicc-platform-api/kicc-template-api/pom.xml b/kicc-platform/kicc-platform-api/kicc-template-api/pom.xml new file mode 100644 index 00000000..835cdedf --- /dev/null +++ b/kicc-platform/kicc-platform-api/kicc-template-api/pom.xml @@ -0,0 +1,28 @@ + + + 4.0.0 + + com.cloud + kicc-platform-api + 1.0.0 + + + kicc-template-api + jar + + kicc 新建api模块模板,只提供基础依赖 + + + + + com.cloud + kicc-common-feign + + + + com.cloud + kicc-common-data + + + diff --git a/kicc-platform/kicc-platform-api/kicc-template-api/src/main/resources/META-INF/spring.factories b/kicc-platform/kicc-platform-api/kicc-template-api/src/main/resources/META-INF/spring.factories new file mode 100644 index 00000000..9d486397 --- /dev/null +++ b/kicc-platform/kicc-platform-api/kicc-template-api/src/main/resources/META-INF/spring.factories @@ -0,0 +1 @@ +com.cloud.kicc.common.feign.KiccFeignAutoConfiguration=\ diff --git a/kicc-platform/kicc-platform-api/pom.xml b/kicc-platform/kicc-platform-api/pom.xml index 1c375ddc..d49fb7d0 100644 --- a/kicc-platform/kicc-platform-api/pom.xml +++ b/kicc-platform/kicc-platform-api/pom.xml @@ -17,6 +17,8 @@ kicc-system-api kicc-common-api + kicc-monitor-api + kicc-template-api diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/Dockerfile b/kicc-platform/kicc-platform-biz/kicc-common-biz/Dockerfile index aaa5d528..3529c99c 100644 --- a/kicc-platform/kicc-platform-biz/kicc-common-biz/Dockerfile +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/Dockerfile @@ -8,7 +8,7 @@ ARG JAR_FILE=target/kicc-common-biz.jar COPY ${JAR_FILE} app.jar -EXPOSE 4000 +EXPOSE 5000 ENV TZ=Asia/Shanghai JAVA_OPTS="-Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom" diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/KiccCommonApplication.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/monitor/KiccCommonApplication.java similarity index 95% rename from kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/KiccCommonApplication.java rename to kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/monitor/KiccCommonApplication.java index eb1fd76d..25e2cd81 100644 --- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/KiccCommonApplication.java +++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/monitor/KiccCommonApplication.java @@ -1,4 +1,4 @@ -package com.cloud.kicc.commonbiz; +package com.cloud.kicc.monitor; import com.cloud.kicc.common.core.annotation.EnableKiccJacksonAutoConvert; import com.cloud.kicc.common.feign.annotation.EnableKiccFeignClients; diff --git a/kicc-platform/kicc-platform-biz/kicc-monitor-biz/Dockerfile b/kicc-platform/kicc-platform-biz/kicc-monitor-biz/Dockerfile new file mode 100644 index 00000000..6c9f2aea --- /dev/null +++ b/kicc-platform/kicc-platform-biz/kicc-monitor-biz/Dockerfile @@ -0,0 +1,15 @@ +FROM moxm/java:1.8-full + +RUN mkdir -p /kicc-monitor-biz + +WORKDIR /kicc-monitor-biz + +ARG JAR_FILE=target/kicc-monitor-biz.jar + +COPY ${JAR_FILE} app.jar + +EXPOSE 6000 + +ENV TZ=Asia/Shanghai JAVA_OPTS="-Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom" + +CMD sleep 60; java -jar app.jar $JAVA_OPTS diff --git a/kicc-platform/kicc-platform-biz/kicc-monitor-biz/pom.xml b/kicc-platform/kicc-platform-biz/kicc-monitor-biz/pom.xml new file mode 100644 index 00000000..af5057c5 --- /dev/null +++ b/kicc-platform/kicc-platform-biz/kicc-monitor-biz/pom.xml @@ -0,0 +1,67 @@ + + + 4.0.0 + + com.cloud + kicc-platform-biz + 1.0.0 + + + kicc-monitor-biz + jar + + kicc 运维监控模块 + + + + + com.cloud + kicc-common-log + + + + com.cloud + kicc-common-security + + + + com.cloud + kicc-common-swagger + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-discovery + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-config + + + + org.springframework.boot + spring-boot-starter-undertow + + + + com.cloud + kicc-common-mock + + + + + + + io.fabric8 + docker-maven-plugin + + + org.springframework.boot + spring-boot-maven-plugin + + + + + diff --git a/kicc-platform/kicc-platform-biz/kicc-monitor-biz/src/main/java/com/cloud/kicc/monitor/KiccMonitorApplication.java b/kicc-platform/kicc-platform-biz/kicc-monitor-biz/src/main/java/com/cloud/kicc/monitor/KiccMonitorApplication.java new file mode 100644 index 00000000..07586898 --- /dev/null +++ b/kicc-platform/kicc-platform-biz/kicc-monitor-biz/src/main/java/com/cloud/kicc/monitor/KiccMonitorApplication.java @@ -0,0 +1,29 @@ +package com.cloud.kicc.monitor; + +import com.cloud.kicc.common.core.annotation.EnableKiccJacksonAutoConvert; +import com.cloud.kicc.common.feign.annotation.EnableKiccFeignClients; +import com.cloud.kicc.common.security.annotation.EnableKiccResourceServer; +import com.cloud.kicc.common.swagger.annotation.EnableKiccSwagger2; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +/** + *

+ * 运维监控模块 + *

+ * + * @Author: entfrm开发团队-王翔 + * @Date: 2022/2/17 + */ +@EnableKiccSwagger2 +@EnableKiccResourceServer +@EnableKiccFeignClients +@SpringBootApplication +@EnableKiccJacksonAutoConvert +public class KiccMonitorApplication { + + public static void main(String[] args) { + SpringApplication.run(KiccMonitorApplication.class, args); + } + +} diff --git a/kicc-platform/kicc-platform-biz/kicc-monitor-biz/src/main/resources/bootstrap.yml b/kicc-platform/kicc-platform-biz/kicc-monitor-biz/src/main/resources/bootstrap.yml new file mode 100644 index 00000000..3fb820f3 --- /dev/null +++ b/kicc-platform/kicc-platform-biz/kicc-monitor-biz/src/main/resources/bootstrap.yml @@ -0,0 +1,17 @@ +server: + port: 6000 + +spring: + application: + name: @artifactId@ + cloud: + nacos: + discovery: + server-addr: ${NACOS_HOST:kicc-register}:${NACOS_PORT:8848} + namespace: @profiles.namespace@ + config: + server-addr: ${spring.cloud.nacos.discovery.server-addr} + file-extension: yml + namespace: @profiles.namespace@ + shared-configs: + - application.${spring.cloud.nacos.config.file-extension} diff --git a/kicc-platform/kicc-platform-biz/kicc-monitor-biz/src/main/resources/logback-spring.xml b/kicc-platform/kicc-platform-biz/kicc-monitor-biz/src/main/resources/logback-spring.xml new file mode 100644 index 00000000..9cd338b2 --- /dev/null +++ b/kicc-platform/kicc-platform-biz/kicc-monitor-biz/src/main/resources/logback-spring.xml @@ -0,0 +1,57 @@ + + + + + + + + + + + + + + + ${CONSOLE_LOG_PATTERN} + + + + + + ${log.path}/debug.log + + ${log.path}/%d{yyyy-MM, aux}/debug.%d{yyyy-MM-dd}.%i.log.gz + 50MB + 30 + + + %date [%thread] %-5level [%logger{50}] %file:%line - %msg%n + + + + + + ${log.path}/error.log + + ${log.path}/%d{yyyy-MM}/error.%d{yyyy-MM-dd}.%i.log.gz + 50MB + 30 + + + %date [%thread] %-5level [%logger{50}] %file:%line - %msg%n + + + ERROR + + + + + + + + + + diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/pom.xml b/kicc-platform/kicc-platform-biz/kicc-system-biz/pom.xml index 86710aa5..9a5a2425 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/pom.xml +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/pom.xml @@ -11,7 +11,7 @@ kicc-system-biz jar - kicc 通用用户权限管理系统业务处理模块 + kicc 系统模块 diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/KiccSystemApplication.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/KiccSystemApplication.java index ff59baba..c5a45d98 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/KiccSystemApplication.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/KiccSystemApplication.java @@ -9,7 +9,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; /** *

- * 用户统一管理系统 + * 管理系统模块 *

* * @Author: entfrm开发团队-王翔 diff --git a/kicc-platform/kicc-platform-biz/kicc-template-biz/Dockerfile b/kicc-platform/kicc-platform-biz/kicc-template-biz/Dockerfile new file mode 100644 index 00000000..41f26dfb --- /dev/null +++ b/kicc-platform/kicc-platform-biz/kicc-template-biz/Dockerfile @@ -0,0 +1,15 @@ +FROM moxm/java:1.8-full + +RUN mkdir -p /kicc-template-biz + +WORKDIR /kicc-template-biz + +ARG JAR_FILE=target/kicc-template-biz.jar + +COPY ${JAR_FILE} app.jar + +EXPOSE 4000 + +ENV TZ=Asia/Shanghai JAVA_OPTS="-Xms128m -Xmx256m -Djava.security.egd=file:/dev/./urandom" + +CMD sleep 60; java -jar app.jar $JAVA_OPTS diff --git a/kicc-platform/kicc-platform-biz/kicc-template-biz/pom.xml b/kicc-platform/kicc-platform-biz/kicc-template-biz/pom.xml new file mode 100644 index 00000000..d0d4214d --- /dev/null +++ b/kicc-platform/kicc-platform-biz/kicc-template-biz/pom.xml @@ -0,0 +1,72 @@ + + + 4.0.0 + + com.cloud + kicc-platform-biz + 1.0.0 + + + kicc-template-biz + jar + + kicc 新建模块模板,只提供基础依赖 + + + + + com.cloud + kicc-template-api + + + + com.cloud + kicc-common-security + + + + com.cloud + kicc-common-log + + + + com.cloud + kicc-common-swagger + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-discovery + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-config + + + + org.springframework.boot + spring-boot-starter-undertow + + + + com.cloud + kicc-common-mock + + + + + + + io.fabric8 + docker-maven-plugin + + + org.springframework.boot + spring-boot-maven-plugin + + + + + diff --git a/kicc-platform/kicc-platform-biz/kicc-template-biz/src/main/java/com/cloud/kicc/template/KiccTemplateApplication.java b/kicc-platform/kicc-platform-biz/kicc-template-biz/src/main/java/com/cloud/kicc/template/KiccTemplateApplication.java new file mode 100644 index 00000000..68a3ff41 --- /dev/null +++ b/kicc-platform/kicc-platform-biz/kicc-template-biz/src/main/java/com/cloud/kicc/template/KiccTemplateApplication.java @@ -0,0 +1,30 @@ +package com.cloud.kicc.template; + +import com.cloud.kicc.common.core.annotation.EnableKiccJacksonAutoConvert; +import com.cloud.kicc.common.feign.annotation.EnableKiccFeignClients; +import com.cloud.kicc.common.security.annotation.EnableKiccResourceServer; +import com.cloud.kicc.common.swagger.annotation.EnableKiccSwagger2; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +/** + *

+ * 此处填写自己的业务模块名称 + * 规范:【xxx模块】 + *

+ * + * @Author: entfrm开发团队-王翔 + * @Date: 2022/5/4 + */ +@EnableKiccSwagger2 +@EnableKiccResourceServer +@EnableKiccFeignClients +@SpringBootApplication +@EnableKiccJacksonAutoConvert +public class KiccTemplateApplication { + + public static void main(String[] args) { + SpringApplication.run(KiccTemplateApplication.class, args); + } + +} diff --git a/kicc-platform/kicc-platform-biz/kicc-template-biz/src/main/resources/bootstrap.yml b/kicc-platform/kicc-platform-biz/kicc-template-biz/src/main/resources/bootstrap.yml new file mode 100644 index 00000000..7d4c2f03 --- /dev/null +++ b/kicc-platform/kicc-platform-biz/kicc-template-biz/src/main/resources/bootstrap.yml @@ -0,0 +1,17 @@ +server: + port: 0000 + +spring: + application: + name: @artifactId@ + cloud: + nacos: + discovery: + server-addr: ${NACOS_HOST:kicc-register}:${NACOS_PORT:8848} + namespace: @profiles.namespace@ + config: + server-addr: ${spring.cloud.nacos.discovery.server-addr} + file-extension: yml + namespace: @profiles.namespace@ + shared-configs: + - application.${spring.cloud.nacos.config.file-extension} diff --git a/kicc-platform/kicc-platform-biz/kicc-template-biz/src/main/resources/logback-spring.xml b/kicc-platform/kicc-platform-biz/kicc-template-biz/src/main/resources/logback-spring.xml new file mode 100644 index 00000000..9cd338b2 --- /dev/null +++ b/kicc-platform/kicc-platform-biz/kicc-template-biz/src/main/resources/logback-spring.xml @@ -0,0 +1,57 @@ + + + + + + + + + + + + + + + ${CONSOLE_LOG_PATTERN} + + + + + + ${log.path}/debug.log + + ${log.path}/%d{yyyy-MM, aux}/debug.%d{yyyy-MM-dd}.%i.log.gz + 50MB + 30 + + + %date [%thread] %-5level [%logger{50}] %file:%line - %msg%n + + + + + + ${log.path}/error.log + + ${log.path}/%d{yyyy-MM}/error.%d{yyyy-MM-dd}.%i.log.gz + 50MB + 30 + + + %date [%thread] %-5level [%logger{50}] %file:%line - %msg%n + + + ERROR + + + + + + + + + + diff --git a/kicc-platform/kicc-platform-biz/pom.xml b/kicc-platform/kicc-platform-biz/pom.xml index 2966cf43..979b6119 100644 --- a/kicc-platform/kicc-platform-biz/pom.xml +++ b/kicc-platform/kicc-platform-biz/pom.xml @@ -17,6 +17,8 @@ kicc-system-biz kicc-common-biz + kicc-monitor-biz + kicc-template-biz