切换依赖，从原来的零散的gunshi下的包变成gunshi-modules-all
parent
95de093b3f
commit
995a45d0ca
50
pom.xml
50
pom.xml
|
|
@ -7,9 +7,8 @@
|
|||
<parent>
|
||||
<groupId>com.gunshi</groupId>
|
||||
<artifactId>gunshi-boot</artifactId>
|
||||
<version>1.2</version>
|
||||
<version>1.4-SNAPSHOT</version>
|
||||
</parent>
|
||||
|
||||
<artifactId>gunshi-project-xyt</artifactId>
|
||||
<version>1.0-SNAPSHOT</version>
|
||||
|
||||
|
|
@ -23,53 +22,10 @@
|
|||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>com.gunshi</groupId>
|
||||
<artifactId>gunshi-core</artifactId>
|
||||
<version>1.4-SNAPSHOT</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.gunshi</groupId>
|
||||
<artifactId>gunshi-db</artifactId>
|
||||
<version>1.2-SNAPSHOT</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>mysql</groupId>
|
||||
<artifactId>mysql-connector-java</artifactId>
|
||||
<version>8.0.28</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.projectlombok</groupId>
|
||||
<artifactId>lombok</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.gunshi</groupId>
|
||||
<artifactId>gunshi-logging</artifactId>
|
||||
<artifactId>gunshi-modules-all</artifactId>
|
||||
<version>1.0-SNAPSHOT</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.gunshi</groupId>
|
||||
<artifactId>gunshi-file</artifactId>
|
||||
<version>1.0-SNAPSHOT</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.gunshi</groupId>
|
||||
<artifactId>gunshi-login</artifactId>
|
||||
<version>1.0-SNAPSHOT</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.gunshi</groupId>
|
||||
<artifactId>gunshi-auth</artifactId>
|
||||
<version>1.0-SNAPSHOT</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.gunshi</groupId>
|
||||
<artifactId>gunshi-addressbook</artifactId>
|
||||
<version>1.0-SNAPSHOT</version>
|
||||
</dependency>
|
||||
<!-- <dependency>-->
|
||||
<!-- <groupId>com.gunshi</groupId>-->
|
||||
<!-- <artifactId>gunshi-authentication</artifactId>-->
|
||||
<!-- <version>1.0-SNAPSHOT</version>-->
|
||||
<!-- </dependency>-->
|
||||
|
||||
</dependencies>
|
||||
|
||||
<build>
|
||||
|
|
|
|||
|
|
@ -4,7 +4,10 @@ import com.gunshi.core.annotation.GunShiApplication;
|
|||
import io.swagger.v3.oas.annotations.OpenAPIDefinition;
|
||||
import io.swagger.v3.oas.annotations.servers.Server;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.mybatis.spring.annotation.MapperScan;
|
||||
import org.springframework.boot.SpringApplication;
|
||||
import org.springframework.boot.autoconfigure.SpringBootApplication;
|
||||
import org.springframework.context.annotation.ComponentScan;
|
||||
|
||||
/**
|
||||
* 类描述
|
||||
|
|
@ -22,6 +25,7 @@ import org.springframework.boot.SpringApplication;
|
|||
}
|
||||
)
|
||||
@GunShiApplication
|
||||
@MapperScan(basePackages = {"com.gunshi.**.mapper", "com.gunshi.**.model"})
|
||||
@Slf4j
|
||||
public class Main {
|
||||
public static void main(String[] args) {
|
||||
|
|
|
|||
|
|
@ -0,0 +1,33 @@
|
|||
spring:
|
||||
datasource:
|
||||
dynamic:
|
||||
datasource:
|
||||
master:
|
||||
url: jdbc:sqlserver://10.0.41.115:1433;DatabaseName=xyt;trustServerCertificate=true
|
||||
username: sa
|
||||
password: Gunshi@2024
|
||||
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
|
||||
access-logging:
|
||||
url: jdbc:sqlserver://10.0.41.115:1433;DatabaseName=xyt;trustServerCertificate=true
|
||||
username: sa
|
||||
password: Gunshi@2024
|
||||
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
|
||||
|
||||
data:
|
||||
redis:
|
||||
host: 10.0.41.112
|
||||
port: 6379
|
||||
password: 1234567a
|
||||
database: 1
|
||||
|
||||
gunshi:
|
||||
core:
|
||||
appName: project-xyt
|
||||
file:
|
||||
key: test.by_lyf.tmp
|
||||
secret: xPXPAb63FphkGkPU0ZZkNIXmDzjDVeF3PBH6ZEKw
|
||||
endpoint: http://223.75.53.141:9102
|
||||
publicBucket: test.by-lyf.tmp
|
||||
loginBucket: test.by-lyf.tmp
|
||||
privateBucket: test.by-lyf.tmp
|
||||
|
||||
|
|
@ -0,0 +1,96 @@
|
|||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<configuration>
|
||||
<!-- 控制台打印日志的相关配置 -->
|
||||
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
|
||||
<!-- 日志格式 -->
|
||||
<encoder>
|
||||
<pattern>%d{yyyy-MM-dd HH:mm:ss} [%level] - %m%n</pattern>
|
||||
</encoder>
|
||||
</appender>
|
||||
<!-- 文件保存日志的相关配置 -->
|
||||
<appender name="INFO-OUT" class="ch.qos.logback.core.rolling.RollingFileAppender">
|
||||
<!-- 保存日志文件的路径 -->
|
||||
<file>./logs/project.log</file>
|
||||
<!-- 日志格式 -->
|
||||
<encoder>
|
||||
<pattern>%d{yyyy-MM-dd HH:mm:ss} [%class:%line] - %m%n</pattern>
|
||||
</encoder>
|
||||
|
||||
<!-- 循环政策：基于时间创建日志文件 -->
|
||||
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
|
||||
<!-- 日志文件名格式 -->
|
||||
<fileNamePattern>./logs/project-info.%d{yyyy-MM-dd}.log</fileNamePattern>
|
||||
<!-- 最大保存时间：10天-->
|
||||
<maxHistory>7</maxHistory>
|
||||
</rollingPolicy>
|
||||
</appender>
|
||||
|
||||
<appender name="ERROR-OUT" class="ch.qos.logback.core.rolling.RollingFileAppender">
|
||||
<!-- 保存日志文件的路径 -->
|
||||
<file>./logs/project-error.log</file>
|
||||
<!-- 日志格式 -->
|
||||
<encoder>
|
||||
<pattern>%d{yyyy-MM-dd HH:mm:ss} [%class:%line] - %m%n</pattern>
|
||||
</encoder>
|
||||
<!-- 日志级别过滤器 -->
|
||||
<filter class="ch.qos.logback.classic.filter.LevelFilter">
|
||||
<!-- 过滤的级别 -->
|
||||
<level>ERROR</level>
|
||||
<!-- 匹配时的操作：接收（记录） -->
|
||||
<onMatch>ACCEPT</onMatch>
|
||||
<!-- 不匹配时的操作：拒绝（不记录） -->
|
||||
<onMismatch>DENY</onMismatch>
|
||||
</filter>
|
||||
<!-- 循环政策：基于时间创建日志文件 -->
|
||||
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
|
||||
<!-- 日志文件名格式 -->
|
||||
<fileNamePattern>./logs/project-error.%d{yyyy-MM-dd}.log</fileNamePattern>
|
||||
<!-- 最大保存时间：10天-->
|
||||
<maxHistory>7</maxHistory>
|
||||
</rollingPolicy>
|
||||
</appender>
|
||||
|
||||
<!-- <appender name="ERROR-MONGO" class="com.gunshiiot.config.logback.ExceptionLoggingAppender">-->
|
||||
<!-- <!– 日志格式 –>-->
|
||||
<!-- <encoder>-->
|
||||
<!-- <pattern>%d{yyyy-MM-dd HH:mm:ss} [%class:%line] - %m%n</pattern>-->
|
||||
<!-- </encoder>-->
|
||||
<!-- <!– 日志级别过滤器 –>-->
|
||||
<!-- <filter class="ch.qos.logback.classic.filter.LevelFilter">-->
|
||||
<!-- <!– 过滤的级别 –>-->
|
||||
<!-- <level>ERROR</level>-->
|
||||
<!-- <!– 匹配时的操作：接收（记录） –>-->
|
||||
<!-- <onMatch>ACCEPT</onMatch>-->
|
||||
<!-- <!– 不匹配时的操作：拒绝（不记录） –>-->
|
||||
<!-- <onMismatch>DENY</onMismatch>-->
|
||||
<!-- </filter>-->
|
||||
<!-- <!– 循环政策：基于时间创建日志文件 –>-->
|
||||
<!--<!– <rollingPolicy class="com.gunshiiot.config.logback.TimeBasedRollingForMongoPolicy">–>-->
|
||||
<!--<!– <!– 日志文件名格式 –>–>-->
|
||||
<!--<!– <mongoDatabase>appLogs</mongoDatabase>–>-->
|
||||
<!--<!– <mongoCollection>exceptionRecord</mongoCollection>–>-->
|
||||
<!--<!– <!– 最大保存时间：10天–>–>-->
|
||||
<!--<!– <maxHistory>180</maxHistory>–>-->
|
||||
<!--<!– </rollingPolicy>–>-->
|
||||
<!-- </appender>-->
|
||||
|
||||
<root level="INFO">
|
||||
<appender-ref ref="STDOUT"/>
|
||||
<!-- <appender-ref ref="ERROR-MONGO" />-->
|
||||
</root>
|
||||
<!-- 彩色日志 -->
|
||||
<!-- 彩色日志依赖的渲染类 -->
|
||||
<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" />
|
||||
<!-- 彩色日志格式 -->
|
||||
<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}}" />
|
||||
<!-- Console 输出设置 -->
|
||||
<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
|
||||
<encoder>
|
||||
<pattern>${CONSOLE_LOG_PATTERN}</pattern>
|
||||
<charset>utf8</charset>
|
||||
</encoder>
|
||||
</appender>
|
||||
|
||||
</configuration>
|
||||
|
|
@ -6,20 +6,18 @@ server:
|
|||
spring:
|
||||
datasource:
|
||||
dynamic:
|
||||
primary: main
|
||||
datasource:
|
||||
main:
|
||||
type: com.zaxxer.hikari.HikariDataSource
|
||||
url: jdbc:mysql://10.0.41.112:3308/uams?characterEncoding=utf-8&serverTimezone=GMT%2B8
|
||||
username: root
|
||||
password: 1234567a
|
||||
driver-class-name: com.mysql.cj.jdbc.Driver
|
||||
master:
|
||||
url: jdbc:sqlserver://10.0.41.115:1433;DatabaseName=xyt;trustServerCertificate=true
|
||||
username: sa
|
||||
password: Gunshi@2024
|
||||
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
|
||||
access-logging:
|
||||
type: com.zaxxer.hikari.HikariDataSource
|
||||
url: jdbc:mysql://10.0.41.112:3307/access-logging?useSSL=false&serverTimezone=UTC
|
||||
username: root
|
||||
password: 1234567a
|
||||
driver-class-name: com.mysql.cj.jdbc.Driver
|
||||
url: jdbc:sqlserver://10.0.41.115:1433;DatabaseName=xyt;trustServerCertificate=true
|
||||
username: sa
|
||||
password: Gunshi@2024
|
||||
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
|
||||
|
||||
data:
|
||||
redis:
|
||||
host: 10.0.41.112
|
||||
|
|
|
|||
Loading…
Reference in New Issue