Merge branch 'master' of http://47.97.176.204:19000/root/framework-tools

framework-analysis/pom.xml

@@ -16,5 +16,42 @@
         <maven.compiler.target>8</maven.compiler.target>
         <maven.compiler.target>8</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
     </properties>
-
+    <dependencies>
+        <dependency>
+            <groupId>org.arch</groupId>
+            <artifactId>log</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.arch</groupId>
+            <artifactId>nacos</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
+    <build>
+        <finalName>${project.artifactId}</finalName>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <configuration>
+                    <includeSystemScope>true</includeSystemScope>
+                </configuration>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>repackage</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>
 </project>
\ No newline at end of file

framework-analysis/src/main/java/org/arch/Main.java

-package org.arch;
-
-public class Main {
-    public static void main(String[] args) {
-        System.out.println("Hello world!");
-    }
-}
\ No newline at end of file

framework-analysis/src/main/java/org/arch/analysis/FrameworkAnalysisApp.java

+package org.arch.analysis;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.EnableMBeanExport;
+import org.springframework.jmx.support.RegistrationPolicy;
+
+@SpringBootApplication
+@EnableMBeanExport(registration = RegistrationPolicy.IGNORE_EXISTING)
+public class FrameworkAnalysisApp {
+    public static void main(String[] args) {
+        SpringApplication.run(FrameworkAnalysisApp.class, args);
+    }
+}

framework-analysis/src/main/java/org/arch/analysis/controller/ArchMapController.java

+package org.arch.analysis.controller;
+
+import org.arch.base.Result;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/analysis")
+public class ArchMapController {
+
+    public Result slectPage(){
+        return null;
+    }
+}

framework-analysis/src/main/resources/bootstrap-dev.yml

+server:
+  port: 17009
+nacos:
+  server-addr: 192.168.0.200:18848
+  username: nacos
+  password: nacos
+  namespace: ${NAMESPACE:arch}
+  file-extension: yaml
+spring:
+  cloud:
+    nacos:
+      config:
+        group: DEFAULT_GROUP
+        server-addr: ${nacos.server-addr}
+        username: ${nacos.username}
+        password: ${nacos.password}
+        namespace: ${nacos.namespace}
+        # 公共配置
+        shared-configs:
+          - data-id: common-storage.${nacos.file-extension}
+            refresh: true
+          - data-id: common-config.${nacos.file-extension}
+            refresh: true
+          - data-id: common-filters.${nacos.file-extension}
+            refresh: true
+          - data-id: common-datasource.${nacos.file-extension}
+          - data-id: common-mybatis.${nacos.file-extension}
+          - data-id: common-redis.${nacos.file-extension}
+            refresh: true
+      discovery:
+        ip: localhost
+        server-addr: ${nacos.server-addr}
+        username: ${nacos.username}
+        password: ${nacos.password}
+        namespace: ${nacos.namespace}
+  config:
+    activate:
+      on-profile: dev
+
+

framework-analysis/src/main/resources/bootstrap-local.yml

+server:
+  port: 17007
+nacos:
+  server-addr: localhost:8848
+  username: nacos
+  password: nacos
+  namespace: ${NAMESPACE:public}
+  file-extension: yaml
+spring:
+  cloud:
+    nacos:
+      config:
+        group: DEFAULT_GROUP
+        server-addr: ${nacos.server-addr}
+        username: ${nacos.username}
+        password: ${nacos.password}
+        namespace: ${nacos.namespace}
+        # 公共配置
+        shared-configs:
+          - data-id: common-storage.${nacos.file-extension}
+            refresh: true
+          - data-id: common-config.${nacos.file-extension}
+            refresh: true
+          - data-id: common-log.${nacos.file-extension}
+            refresh: true
+          - data-id: common-datasource.${nacos.file-extension}
+            refresh: true
+          - data-id: common-mybatis.${nacos.file-extension}
+            refresh: true
+          - data-id: common-isc.${nacos.file-extension}
+            refresh: true
+          - data-id: common-redis.${nacos.file-extension}
+            refresh: true
+      discovery:
+        ip: localhost
+        server-addr: ${nacos.server-addr}
+        username: ${nacos.username}
+        password: ${nacos.password}
+        namespace: ${nacos.namespace}
+
+
+

framework-analysis/src/main/resources/bootstrap-sit.yml

+server:
+  port: 17007
+nacos:
+  server-addr: 192.168.0.120:18848
+  username: nacos
+  password: nacos
+  namespace: ${NAMESPACE:sit}
+  file-extension: yaml
+spring:
+  cloud:
+    nacos:
+      config:
+        group: DEFAULT_GROUP
+        server-addr: ${nacos.server-addr}
+        username: ${nacos.username}
+        password: ${nacos.password}
+        namespace: ${nacos.namespace}
+        # 公共配置
+        shared-configs:
+          - data-id: common-storage.${nacos.file-extension}
+            refresh: true
+          - data-id: common-config.${nacos.file-extension}
+            refresh: true
+          - data-id: common-log.${nacos.file-extension}
+            refresh: true
+          - data-id: common-datasource.${nacos.file-extension}
+            refresh: true
+          - data-id: common-mybatis.${nacos.file-extension}
+            refresh: true
+          - data-id: common-isc.${nacos.file-extension}
+            refresh: true
+          - data-id: common-redis.${nacos.file-extension}
+            refresh: true
+      discovery:
+        server-addr: ${nacos.server-addr}
+        username: ${nacos.username}
+        password: ${nacos.password}
+        namespace: ${nacos.namespace}
+  config:
+    activate:
+      on-profile: sit
+
+

framework-analysis/src/main/resources/bootstrap.yml

+spring:
+  application:
+    name: framework-analysis
+  main:
+    # 解决升级 Spring Boot 2.6后，因循环引用导致启动时报错是否允许循环引用
+    allow-circular-references: true
+  servlet:
+    multipart:
+      max-file-size: 50MB
+      max-request-size: 100MB
+  profiles:
+    active: dev

framework-analysis/src/main/resources/logback-spring.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<configuration debug="false">
+
+    <!--定义日志文件的存储地址 -->
+    <property name="LOG_HOME" value="./logs"/>
+    <property name="LOG_NAME" value="arch-overall"/>
+
+    <!--从配置中心加载数据-->
+    <springProperty scope="context" name="applicationName" source="spring.application.name"/>
+    <springProperty scope="context" name="logstashDestination" source="logstash.destination"/>
+
+    <!--<property name="COLOR_PATTERN" value="%black(%contextName-) %red(%d{yyyy-MM-dd HH:mm:ss}) %green([%thread]) %highlight(%-5level) %boldMagenta( %replace(%caller{1}){'\t|Caller.{1}0|\r\n', ''})- %gray(%msg%xEx%n)" />-->
+    <!-- 控制台输出 -->
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <withJansi>true</withJansi>
+        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+            <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符 -->
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %highlight(%-5level) %cyan(%logger{50}:%L) - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <!-- 按照每天生成日志文件INFO -->
+    <appender name="INFO_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <!-- 正在记录的日志文件的路径及文件名 -->
+        <file>${LOG_HOME}/${LOG_NAME}_info.log</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!--日志文件输出的文件名 -->
+            <FileNamePattern>${LOG_HOME}/${LOG_NAME}_info.%d{yyyy-MM-dd}.%i.log</FileNamePattern>
+            <maxHistory>30</maxHistory>
+            <timeBasedFileNamingAndTriggeringPolicy
+                    class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+                <maxFileSize>100MB</maxFileSize>
+            </timeBasedFileNamingAndTriggeringPolicy>
+        </rollingPolicy>
+        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+            <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符 -->
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50}:%L - %msg%n</pattern>
+            <charset>UTF-8</charset>
+        </encoder>
+    </appender>
+
+    <!-- 按照每天生成日志文件ERROR -->
+    <appender name="ERROR_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <!-- 正在记录的日志文件的路径及文件名 -->
+        <file>${LOG_HOME}/${LOG_NAME}_error.log</file>
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <FileNamePattern>${LOG_HOME}/${LOG_NAME}_error.%d{yyyy-MM-dd}.log</FileNamePattern>
+            <MaxHistory>30</MaxHistory>
+        </rollingPolicy>
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{50}:%L - %msg%n</pattern>
+            <charset>UTF-8</charset>
+        </encoder>
+        <filter class="ch.qos.logback.classic.filter.LevelFilter"><!-- 只打印错误日志 -->
+            <level>ERROR</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+
+    <!--nacos 心跳 INFO 屏蔽-->
+    <logger name="com.alibaba.nacos" level="OFF">
+        <appender-ref ref="ERROR_FILE"/>
+    </logger>
+
+    <!--myibatis log configure-->
+    <logger name="com.apache.ibatis" level="TRACE"/>
+    <logger name="java.sql.Connection" level="DEBUG"/>
+    <logger name="java.sql.Statement" level="DEBUG"/>
+    <logger name="java.sql.PreparedStatement" level="DEBUG"/>
+    <logger name="com.xxl.job.core" level="DEBUG"/>
+    <logger name="org.apache.http.impl.conn" level="INFO"/>
+    <logger name="springfox.documentation" level="INFO" />
+    <logger name="org.springframework" level="INFO" />
+    <logger name="com.baomidou.mybatisplus" level="INFO" />
+
+    <!-- 本地环境 -->
+    <springProfile name="local">
+        <root level="DEBUG">
+            <appender-ref ref="STDOUT"/>
+            <appender-ref ref="INFO_FILE"/>
+            <appender-ref ref="ERROR_FILE"/>
+        </root>
+    </springProfile>
+
+    <!-- 其它环境 -->
+    <springProfile name="dev,test,stage,prod,sit,uat,default">
+        <root level="DEBUG">
+            <appender-ref ref="STDOUT"/>
+            <appender-ref ref="INFO_FILE"/>
+            <appender-ref ref="ERROR_FILE"/>
+        </root>
+    </springProfile>
+
+</configuration>
\ No newline at end of file

framework-system-manage/pom.xml

@@ -28,5 +28,30 @@
             <version>1.0-SNAPSHOT</version>
             <version>1.0-SNAPSHOT</version>
         </dependency>
         </dependency>
     </dependencies>
     </dependencies>
-
+    <build>
+        <finalName>${project.artifactId}</finalName>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <configuration>
+                    <includeSystemScope>true</includeSystemScope>
+                </configuration>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>repackage</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>
 </project>