diff --git a/pom.xml b/pom.xml
index d16e93e..8522346 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,9 +7,8 @@
com.gunshi
gunshi-boot
- 1.2
+ 1.4-SNAPSHOT
-
gunshi-project-xyt
1.0-SNAPSHOT
@@ -23,53 +22,10 @@
com.gunshi
- gunshi-core
- 1.4-SNAPSHOT
-
-
- com.gunshi
- gunshi-db
- 1.2-SNAPSHOT
-
-
- mysql
- mysql-connector-java
- 8.0.28
-
-
- org.projectlombok
- lombok
-
-
- com.gunshi
- gunshi-logging
+ gunshi-modules-all
1.0-SNAPSHOT
-
- com.gunshi
- gunshi-file
- 1.0-SNAPSHOT
-
-
- com.gunshi
- gunshi-login
- 1.0-SNAPSHOT
-
-
- com.gunshi
- gunshi-auth
- 1.0-SNAPSHOT
-
-
- com.gunshi
- gunshi-addressbook
- 1.0-SNAPSHOT
-
-
-
-
-
-
+
diff --git a/src/main/java/com/gunshi/project/xyt/Main.java b/src/main/java/com/gunshi/project/xyt/Main.java
index ae78604..31e323c 100644
--- a/src/main/java/com/gunshi/project/xyt/Main.java
+++ b/src/main/java/com/gunshi/project/xyt/Main.java
@@ -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) {
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
new file mode 100644
index 0000000..6b152d6
--- /dev/null
+++ b/src/main/resources/application.yml
@@ -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
+
diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml
new file mode 100644
index 0000000..8e23219
--- /dev/null
+++ b/src/main/resources/logback.xml
@@ -0,0 +1,96 @@
+
+
+
+
+
+
+ %d{yyyy-MM-dd HH:mm:ss} [%level] - %m%n
+
+
+
+
+
+ ./logs/project.log
+
+
+ %d{yyyy-MM-dd HH:mm:ss} [%class:%line] - %m%n
+
+
+
+
+
+ ./logs/project-info.%d{yyyy-MM-dd}.log
+
+ 7
+
+
+
+
+
+ ./logs/project-error.log
+
+
+ %d{yyyy-MM-dd HH:mm:ss} [%class:%line] - %m%n
+
+
+
+
+ ERROR
+
+ ACCEPT
+
+ DENY
+
+
+
+
+ ./logs/project-error.%d{yyyy-MM-dd}.log
+
+ 7
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ${CONSOLE_LOG_PATTERN}
+ utf8
+
+
+
+
\ No newline at end of file
diff --git a/src/test/resources/application.yml b/src/test/resources/application.yml
index d1aa80b..24dfed1 100644
--- a/src/test/resources/application.yml
+++ b/src/test/resources/application.yml
@@ -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