yangzhe
/
gunshi-project-ss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

切换依赖，从原来的零散的gunshi下的包变成gunshi-modules-all

master
李一帆 2024-01-23 15:02:48 +08:00
parent 95de093b3f
commit 995a45d0ca
5 changed files with 146 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
pom.xml
View File

@ -7,9 +7,8 @@
<parent> <parent>
<groupId>com.gunshi</groupId> <groupId>com.gunshi</groupId>
<artifactId>gunshi-boot</artifactId> <artifactId>gunshi-boot</artifactId>
<version>1.2</version> <version>1.4-SNAPSHOT</version>
</parent> </parent>
<artifactId>gunshi-project-xyt</artifactId> <artifactId>gunshi-project-xyt</artifactId>
<version>1.0-SNAPSHOT</version> <version>1.0-SNAPSHOT</version>
@ -23,53 +22,10 @@
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>com.gunshi</groupId> <groupId>com.gunshi</groupId>
<artifactId>gunshi-core</artifactId> <artifactId>gunshi-modules-all</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>
<version>1.0-SNAPSHOT</version> <version>1.0-SNAPSHOT</version>
</dependency> </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> </dependencies>
<build> <build>

4
src/main/java/com/gunshi/project/xyt/Main.java
View File

@ -4,7 +4,10 @@ import com.gunshi.core.annotation.GunShiApplication;
import io.swagger.v3.oas.annotations.OpenAPIDefinition; import io.swagger.v3.oas.annotations.OpenAPIDefinition;
import io.swagger.v3.oas.annotations.servers.Server; import io.swagger.v3.oas.annotations.servers.Server;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.mybatis.spring.annotation.MapperScan;
import org.springframework.boot.SpringApplication; 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 @GunShiApplication
@MapperScan(basePackages = {"com.gunshi.**.mapper", "com.gunshi.**.model"})
@Slf4j @Slf4j
public class Main { public class Main {
public static void main(String[] args) { public static void main(String[] args) {

33
src/main/resources/application.yml Normal file
View File

@ -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

96
src/main/resources/logback.xml Normal file
View File

@ -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">-->
<!-- &lt;!&ndash; 日志格式 &ndash;&gt;-->
<!-- <encoder>-->
<!-- <pattern>%d{yyyy-MM-dd HH:mm:ss} [%class:%line] - %m%n</pattern>-->
<!-- </encoder>-->
<!-- &lt;!&ndash; 日志级别过滤器 &ndash;&gt;-->
<!-- <filter class="ch.qos.logback.classic.filter.LevelFilter">-->
<!-- &lt;!&ndash; 过滤的级别 &ndash;&gt;-->
<!-- <level>ERROR</level>-->
<!-- &lt;!&ndash; 匹配时的操作：接收（记录） &ndash;&gt;-->
<!-- <onMatch>ACCEPT</onMatch>-->
<!-- &lt;!&ndash; 不匹配时的操作：拒绝（不记录） &ndash;&gt;-->
<!-- <onMismatch>DENY</onMismatch>-->
<!-- </filter>-->
<!-- &lt;!&ndash; 循环政策：基于时间创建日志文件 &ndash;&gt;-->
<!--&lt;!&ndash; <rollingPolicy class="com.gunshiiot.config.logback.TimeBasedRollingForMongoPolicy">&ndash;&gt;-->
<!--&lt;!&ndash; &lt;!&ndash; 日志文件名格式 &ndash;&gt;&ndash;&gt;-->
<!--&lt;!&ndash; <mongoDatabase>appLogs</mongoDatabase>&ndash;&gt;-->
<!--&lt;!&ndash; <mongoCollection>exceptionRecord</mongoCollection>&ndash;&gt;-->
<!--&lt;!&ndash; &lt;!&ndash; 最大保存时间：10天&ndash;&gt;&ndash;&gt;-->
<!--&lt;!&ndash; <maxHistory>180</maxHistory>&ndash;&gt;-->
<!--&lt;!&ndash; </rollingPolicy>&ndash;&gt;-->
<!-- </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>

22
src/test/resources/application.yml
View File

@ -6,20 +6,18 @@ server:
spring: spring:
datasource: datasource:
dynamic: dynamic:
primary: main
datasource: datasource:
main: master:
type: com.zaxxer.hikari.HikariDataSource url: jdbc:sqlserver://10.0.41.115:1433;DatabaseName=xyt;trustServerCertificate=true
url: jdbc:mysql://10.0.41.112:3308/uams?characterEncoding=utf-8&serverTimezone=GMT%2B8 username: sa
username: root password: Gunshi@2024
password: 1234567a driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
driver-class-name: com.mysql.cj.jdbc.Driver
access-logging: access-logging:
type: com.zaxxer.hikari.HikariDataSource url: jdbc:sqlserver://10.0.41.115:1433;DatabaseName=xyt;trustServerCertificate=true
url: jdbc:mysql://10.0.41.112:3307/access-logging?useSSL=false&serverTimezone=UTC username: sa
username: root password: Gunshi@2024
password: 1234567a driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
driver-class-name: com.mysql.cj.jdbc.Driver
data: data:
redis: redis:
host: 10.0.41.112 host: 10.0.41.112