📀 重构前端框架进行适配后端框架

kicc-common/kicc-common-bom/pom.xml

@@ -101,6 +101,16 @@
 				<artifactId>kicc-system-api</artifactId>
 				<version>${kicc.common.version}</version>
 			</dependency>
+			<dependency>
+				<groupId>com.cloud</groupId>
+				<artifactId>kicc-monitor-api</artifactId>
+				<version>${kicc.common.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>com.cloud</groupId>
+				<artifactId>kicc-template-api</artifactId>
+				<version>${kicc.common.version}</version>
+			</dependency>
 			<!--最新版本2021.1 com.alibaba.cloud.seata.rest.SeataRestTemplateAutoConfiguration有自调Bean问题
 				与当前 spring cloud 2021 不兼容,更换2021.0.1.0兼容版本-->
 			<dependency>

kicc-platform/kicc-platform-api/kicc-monitor-api/pom.xml

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>com.cloud</groupId>
+		<artifactId>kicc-platform-api</artifactId>
+		<version>1.0.0</version>
+	</parent>
+
+	<artifactId>kicc-monitor-api</artifactId>
+	<packaging>jar</packaging>
+
+	<description>kicc 运维监控api模块</description>
+
+	<dependencies>
+		<!--断路器依赖-->
+		<dependency>
+			<groupId>com.cloud</groupId>
+			<artifactId>kicc-common-feign</artifactId>
+		</dependency>
+		<!--数据服务核心包-->
+		<dependency>
+			<groupId>com.cloud</groupId>
+			<artifactId>kicc-common-data</artifactId>
+		</dependency>
+	</dependencies>
+</project>

kicc-platform/kicc-platform-api/kicc-monitor-api/src/main/resources/META-INF/spring.factories

@@ -0,0 +1 @@
+com.cloud.kicc.common.feign.KiccFeignAutoConfiguration=\

kicc-platform/kicc-platform-api/kicc-system-api/pom.xml

@@ -11,8 +11,7 @@
 	<artifactId>kicc-system-api</artifactId>
 	<packaging>jar</packaging>
 
-	<description>kicc 通用用户权限管理系统公共api模块</description>
+	<description>kicc 系统api模块</description>
-
 
 	<dependencies>
 		<!--断路器依赖-->

kicc-platform/kicc-platform-api/kicc-template-api/pom.xml

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>com.cloud</groupId>
+		<artifactId>kicc-platform-api</artifactId>
+		<version>1.0.0</version>
+	</parent>
+
+	<artifactId>kicc-template-api</artifactId>
+	<packaging>jar</packaging>
+
+	<description>kicc 新建api模块模板,只提供基础依赖</description>
+
+	<dependencies>
+		<!--断路器依赖-->
+		<dependency>
+			<groupId>com.cloud</groupId>
+			<artifactId>kicc-common-feign</artifactId>
+		</dependency>
+		<!--数据服务核心包-->
+		<dependency>
+			<groupId>com.cloud</groupId>
+			<artifactId>kicc-common-data</artifactId>
+		</dependency>
+	</dependencies>
+</project>

kicc-platform/kicc-platform-api/kicc-template-api/src/main/resources/META-INF/spring.factories

@@ -0,0 +1 @@
+com.cloud.kicc.common.feign.KiccFeignAutoConfiguration=\

kicc-platform/kicc-platform-api/pom.xml

@@ -17,6 +17,8 @@
     <modules>
         <module>kicc-system-api</module>
         <module>kicc-common-api</module>
+        <module>kicc-monitor-api</module>
+        <module>kicc-template-api</module>
     </modules>
 
 </project>

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"
 

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;

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

kicc-platform/kicc-platform-biz/kicc-monitor-biz/pom.xml

@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>com.cloud</groupId>
+		<artifactId>kicc-platform-biz</artifactId>
+		<version>1.0.0</version>
+	</parent>
+
+	<artifactId>kicc-monitor-biz</artifactId>
+	<packaging>jar</packaging>
+
+	<description>kicc 运维监控模块</description>
+
+	<dependencies>
+		<!--日志处理-->
+		<dependency>
+			<groupId>com.cloud</groupId>
+			<artifactId>kicc-common-log</artifactId>
+		</dependency>
+		<!--安全模块-->
+		<dependency>
+			<groupId>com.cloud</groupId>
+			<artifactId>kicc-common-security</artifactId>
+		</dependency>
+		<!--接口文档-->
+		<dependency>
+			<groupId>com.cloud</groupId>
+			<artifactId>kicc-common-swagger</artifactId>
+		</dependency>
+		<!--注册中心客户端-->
+		<dependency>
+			<groupId>com.alibaba.cloud</groupId>
+			<artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
+		</dependency>
+		<!--配置中心客户端-->
+		<dependency>
+			<groupId>com.alibaba.cloud</groupId>
+			<artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
+		</dependency>
+		<!--undertow容器-->
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-undertow</artifactId>
+		</dependency>
+		<!--模拟测试-->
+		<dependency>
+			<groupId>com.cloud</groupId>
+			<artifactId>kicc-common-mock</artifactId>
+		</dependency>
+	</dependencies>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>io.fabric8</groupId>
+				<artifactId>docker-maven-plugin</artifactId>
+			</plugin>
+			<plugin>
+				<groupId>org.springframework.boot</groupId>
+				<artifactId>spring-boot-maven-plugin</artifactId>
+			</plugin>
+		</plugins>
+	</build>
+
+</project>

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;
+
+/**
+ *<p>
+ * 运维监控模块
+ *</p>
+ *
+ * @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);
+	}
+
+}

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}

kicc-platform/kicc-platform-biz/kicc-monitor-biz/src/main/resources/logback-spring.xml

@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--基础日志配置,工程继承可以进行替换-->
+<configuration debug="false" scan="false">
+	<springProperty scop="context" name="spring.application.name" source="spring.application.name" defaultValue=""/>
+	<property name="log.path" value="logs/${spring.application.name}"/>
+	<!-- 彩色日志格式 -->
+	<property name="CONSOLE_LOG_PATTERN"
+			  value="${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
+	<!-- 彩色日志依赖的渲染类 -->
+	<conversionRule conversionWord="clr" converterClass="org.springframework.boot.logging.logback.ColorConverter"/>
+	<conversionRule conversionWord="wex"
+					converterClass="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter"/>
+	<conversionRule conversionWord="wEx"
+					converterClass="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter"/>
+	<!-- 控制台日志输出 -->
+	<appender name="console" class="ch.qos.logback.core.ConsoleAppender">
+		<encoder>
+			<pattern>${CONSOLE_LOG_PATTERN}</pattern>
+		</encoder>
+	</appender>
+
+	<!-- 日志文件调试输出 -->
+	<appender name="debug" class="ch.qos.logback.core.rolling.RollingFileAppender">
+		<file>${log.path}/debug.log</file>
+		<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+			<fileNamePattern>${log.path}/%d{yyyy-MM, aux}/debug.%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern>
+			<maxFileSize>50MB</maxFileSize>
+			<maxHistory>30</maxHistory>
+		</rollingPolicy>
+		<encoder>
+			<pattern>%date [%thread] %-5level [%logger{50}] %file:%line - %msg%n</pattern>
+		</encoder>
+	</appender>
+
+	<!-- 日志文件错误输出 -->
+	<appender name="error" class="ch.qos.logback.core.rolling.RollingFileAppender">
+		<file>${log.path}/error.log</file>
+		<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+			<fileNamePattern>${log.path}/%d{yyyy-MM}/error.%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern>
+			<maxFileSize>50MB</maxFileSize>
+			<maxHistory>30</maxHistory>
+		</rollingPolicy>
+		<encoder>
+			<pattern>%date [%thread] %-5level [%logger{50}] %file:%line - %msg%n</pattern>
+		</encoder>
+		<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+			<level>ERROR</level>
+		</filter>
+	</appender>
+
+	<!-- Level: FATAL 0  ERROR 3  WARN 4  INFO 6  DEBUG 7 -->
+	<root level="INFO">
+		<appender-ref ref="console"/>
+		<appender-ref ref="debug"/>
+		<appender-ref ref="error"/>
+	</root>
+</configuration>

kicc-platform/kicc-platform-biz/kicc-system-biz/pom.xml

@@ -11,7 +11,7 @@
 	<artifactId>kicc-system-biz</artifactId>
 	<packaging>jar</packaging>
 
-	<description>kicc 通用用户权限管理系统业务处理模块</description>
+	<description>kicc 系统模块</description>
 
 	<dependencies>
 		<!--oss文件管理-->

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;
 
 /**
  *<p>
- * 用户统一管理系统
+ * 管理系统模块
  *</p>
  *
  * @Author: entfrm开发团队-王翔

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

kicc-platform/kicc-platform-biz/kicc-template-biz/pom.xml

@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>com.cloud</groupId>
+		<artifactId>kicc-platform-biz</artifactId>
+		<version>1.0.0</version>
+	</parent>
+
+	<artifactId>kicc-template-biz</artifactId>
+	<packaging>jar</packaging>
+
+	<description>kicc 新建模块模板,只提供基础依赖</description>
+
+	<dependencies>
+		<!--template api模块-->
+		<dependency>
+			<groupId>com.cloud</groupId>
+			<artifactId>kicc-template-api</artifactId>
+		</dependency>
+		<!--安全模块-->
+		<dependency>
+			<groupId>com.cloud</groupId>
+			<artifactId>kicc-common-security</artifactId>
+		</dependency>
+		<!--日志处理-->
+		<dependency>
+			<groupId>com.cloud</groupId>
+			<artifactId>kicc-common-log</artifactId>
+		</dependency>
+		<!--接口文档-->
+		<dependency>
+			<groupId>com.cloud</groupId>
+			<artifactId>kicc-common-swagger</artifactId>
+		</dependency>
+		<!--注册中心客户端-->
+		<dependency>
+			<groupId>com.alibaba.cloud</groupId>
+			<artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
+		</dependency>
+		<!--配置中心客户端-->
+		<dependency>
+			<groupId>com.alibaba.cloud</groupId>
+			<artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
+		</dependency>
+		<!--undertow容器-->
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-undertow</artifactId>
+		</dependency>
+		<!--模拟测试-->
+		<dependency>
+			<groupId>com.cloud</groupId>
+			<artifactId>kicc-common-mock</artifactId>
+		</dependency>
+	</dependencies>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>io.fabric8</groupId>
+				<artifactId>docker-maven-plugin</artifactId>
+			</plugin>
+			<plugin>
+				<groupId>org.springframework.boot</groupId>
+				<artifactId>spring-boot-maven-plugin</artifactId>
+			</plugin>
+		</plugins>
+	</build>
+
+</project>

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;
+
+/**
+ *<p>
+ * 此处填写自己的业务模块名称
+ * 规范:【xxx模块】
+ *</p>
+ *
+ * @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);
+	}
+
+}

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}

kicc-platform/kicc-platform-biz/kicc-template-biz/src/main/resources/logback-spring.xml

@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--基础日志配置,工程继承可以进行替换-->
+<configuration debug="false" scan="false">
+	<springProperty scop="context" name="spring.application.name" source="spring.application.name" defaultValue=""/>
+	<property name="log.path" value="logs/${spring.application.name}"/>
+	<!-- 彩色日志格式 -->
+	<property name="CONSOLE_LOG_PATTERN"
+			  value="${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
+	<!-- 彩色日志依赖的渲染类 -->
+	<conversionRule conversionWord="clr" converterClass="org.springframework.boot.logging.logback.ColorConverter"/>
+	<conversionRule conversionWord="wex"
+					converterClass="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter"/>
+	<conversionRule conversionWord="wEx"
+					converterClass="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter"/>
+	<!-- 控制台日志输出 -->
+	<appender name="console" class="ch.qos.logback.core.ConsoleAppender">
+		<encoder>
+			<pattern>${CONSOLE_LOG_PATTERN}</pattern>
+		</encoder>
+	</appender>
+
+	<!-- 日志文件调试输出 -->
+	<appender name="debug" class="ch.qos.logback.core.rolling.RollingFileAppender">
+		<file>${log.path}/debug.log</file>
+		<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+			<fileNamePattern>${log.path}/%d{yyyy-MM, aux}/debug.%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern>
+			<maxFileSize>50MB</maxFileSize>
+			<maxHistory>30</maxHistory>
+		</rollingPolicy>
+		<encoder>
+			<pattern>%date [%thread] %-5level [%logger{50}] %file:%line - %msg%n</pattern>
+		</encoder>
+	</appender>
+
+	<!-- 日志文件错误输出 -->
+	<appender name="error" class="ch.qos.logback.core.rolling.RollingFileAppender">
+		<file>${log.path}/error.log</file>
+		<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+			<fileNamePattern>${log.path}/%d{yyyy-MM}/error.%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern>
+			<maxFileSize>50MB</maxFileSize>
+			<maxHistory>30</maxHistory>
+		</rollingPolicy>
+		<encoder>
+			<pattern>%date [%thread] %-5level [%logger{50}] %file:%line - %msg%n</pattern>
+		</encoder>
+		<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+			<level>ERROR</level>
+		</filter>
+	</appender>
+
+	<!-- Level: FATAL 0  ERROR 3  WARN 4  INFO 6  DEBUG 7 -->
+	<root level="INFO">
+		<appender-ref ref="console"/>
+		<appender-ref ref="debug"/>
+		<appender-ref ref="error"/>
+	</root>
+</configuration>

kicc-platform/kicc-platform-biz/pom.xml

@@ -17,6 +17,8 @@
     <modules>
         <module>kicc-system-biz</module>
         <module>kicc-common-biz</module>
+        <module>kicc-monitor-biz</module>
+        <module>kicc-template-biz</module>
     </modules>
 
 </project>