diff --git a/config/application-local.yml b/config/application-local.yml index 621bc04..c1fc27c 100644 --- a/config/application-local.yml +++ b/config/application-local.yml @@ -83,6 +83,7 @@ pagehelper : #config log logging : config: file:config/logback.xml + log4j : logger: org: diff --git a/config/application-test.yml b/config/application-test.yml new file mode 100644 index 0000000..6be6370 --- /dev/null +++ b/config/application-test.yml @@ -0,0 +1,111 @@ +server : + port : 9276 + servlet : + context-path: /cmhi + compression: + # 开启响应压缩 + enabled : true + mime-types : + - application/json # RESTful API JSON + # 进行压缩的最小体积 + min-response-size: 1KB + +# Crypto Configure +jasypt : + encryptor: + algorithm: PBEWITHHMACSHA512ANDAES_256 + password : + +spring : + mvc : + throw-exception-if-no-handler-found: true + web : + resources: + add-mappings: false + + jackson : + date-format : yyyy-MM-dd HH:mm:ss.SSS + timezone : GMT+8 + default-property-inclusion: non_null + mapper : + default-view-inclusion: true + deserialization : + fail-on-unknown-properties: false + + datasource: + #url : jdbc:mysql://xajhuang.com:3307/common_framework?serverTimezone=Asia/Shanghai&zeroDateTimeBehavior=convertToNull&useUnicode=true + url : jdbc:mysql://localhost:3306/common_framework?serverTimezone=Asia/Shanghai&zeroDateTimeBehavior=convertToNull&useUnicode=true + driver-class-name: com.mysql.cj.jdbc.Driver + #username : xajhuang + #password : wkj!nky5cjb!GMV6guq + username : root + password : aaaHuang1 + dbcp2 : + max-total : 128 + max-wait-millis : 10000 + max-idle : 32 + min-idle : 8 + initial-size : 8 + validation-query : SELECT 1 + test-while-idle : true + connection-properties: + characterEncoding: utf8 + + sql : + init: + encoding : utf8 + schema-locations: classpath:rbac/schema.sql + data-locations : classpath:rbac/data.sql + # ALWAYS/EMBEDDED/NEVER + mode : always + enabled : true + + +#mybatis +mybatis : + mapper-locations : classpath*:mappers/*.xml + type-aliases-package: com.cmhi.gds.pojo.entry + configuration : + default-enum-type-handler: com.cf.cs.database.common.DataBaseEnumHandler + +mybatis-flex: + global-config: + print-banner: false + +#pagehelper +pagehelper : + helper-dialect : mysql + reasonable : true + support-methods-arguments: true + pageSizeZero : true + params.count : countSql + +#config log +# logging : +# config: file:config/logback.xml + +log4j : + logger: + org: + mybatis: info + +# swagger-ui custom path +springdoc : + swagger-ui: + path: /swagger-ui.html + +# JWT configure +jwt : + http-head : Authorization + secret-key : MTIzNDU2Nzg= + expire-time: 604800 + +# 字典配置 +system : + dict: + raw-value : true + cache : + enabled: true + controller: + enabled: false + prefix : /dict diff --git a/cs-authentication/pom.xml b/cs-authentication/pom.xml index 08b40ca..069a146 100644 --- a/cs-authentication/pom.xml +++ b/cs-authentication/pom.xml @@ -67,6 +67,16 @@ org.springframework.boot spring-boot-maven-plugin + + org.apache.maven.plugins + maven-surefire-plugin + + -Dspring.config.location=file:${project.parent.basedir}/config/ + + ${project.parent.basedir} + + + diff --git a/cs-authentication/src/test/java/com/cf/cs/authentication/CsAuthenticationApplicationTests.java b/cs-authentication/src/test/java/com/cf/cs/authentication/CsAuthenticationApplicationTests.java index 29ed1f8..b6c0c2d 100644 --- a/cs-authentication/src/test/java/com/cf/cs/authentication/CsAuthenticationApplicationTests.java +++ b/cs-authentication/src/test/java/com/cf/cs/authentication/CsAuthenticationApplicationTests.java @@ -1,14 +1,26 @@ package com.cf.cs.authentication; +import com.cf.cs.authentication.configure.SecuritySecurity; +import com.cf.cs.authentication.configure.UserSecurityConfigure; +import com.cf.cs.base.config.CacheConfigure; +import com.cf.cs.base.config.CommonConfigure; +import com.cf.cs.base.config.ObjectMapperProvider; +import com.cf.cs.database.config.MybatisFlexConfigure; +import com.cf.cs.protocol.config.ProtocolConfigure; import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.ActiveProfiles; +import org.springframework.test.context.ContextConfiguration; /** * The type Cs authentication application tests. * * @author xajhuang @163.com */ -@SpringBootTest +@SpringBootTest(classes = {CsAuthenticationApplication.class}) +@ActiveProfiles({"user", "test"}) +@ContextConfiguration(classes = {CacheConfigure.class, CommonConfigure.class, ObjectMapperProvider.class, MybatisFlexConfigure.class, + UserSecurityConfigure.class, SecuritySecurity.class, ProtocolConfigure.class}) class CsAuthenticationApplicationTests { /** diff --git a/cs-database/pom.xml b/cs-database/pom.xml index 6079d70..57704ec 100644 --- a/cs-database/pom.xml +++ b/cs-database/pom.xml @@ -74,6 +74,12 @@ org.apache.maven.plugins maven-surefire-plugin + + -Dspring.config.location=file:${project.parent.basedir}/config/ + + ${project.parent.basedir} + + diff --git a/cs-database/src/test/java/com/cf/cs/database/CsDatabaseApplicationTests.java b/cs-database/src/test/java/com/cf/cs/database/CsDatabaseApplicationTests.java index 5d0b843..d21951a 100644 --- a/cs-database/src/test/java/com/cf/cs/database/CsDatabaseApplicationTests.java +++ b/cs-database/src/test/java/com/cf/cs/database/CsDatabaseApplicationTests.java @@ -1,8 +1,13 @@ package com.cf.cs.database; +import com.cf.cs.base.config.CacheConfigure; +import com.cf.cs.base.config.CommonConfigure; +import com.cf.cs.base.config.ObjectMapperProvider; +import com.cf.cs.database.config.MybatisFlexConfigure; import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.ActiveProfiles; +import org.springframework.test.context.ContextConfiguration; /** * The type Cs database application tests. @@ -10,7 +15,9 @@ import org.springframework.test.context.ActiveProfiles; * @author xajhuang @163.com */ @SpringBootTest(classes = {CsDatabaseApplication.class}) -@ActiveProfiles({"user", "local"}) +@ActiveProfiles({"user", "test"}) +@ContextConfiguration(classes = {CacheConfigure.class, CommonConfigure.class, ObjectMapperProvider.class, + MybatisFlexConfigure.class}) class CsDatabaseApplicationTests { /** diff --git a/cs-protocol/pom.xml b/cs-protocol/pom.xml index 5b8b941..03791d3 100644 --- a/cs-protocol/pom.xml +++ b/cs-protocol/pom.xml @@ -58,6 +58,16 @@ exec + + org.apache.maven.plugins + maven-surefire-plugin + + -Dspring.config.location=file:${project.parent.basedir}/config/ + + ${project.parent.basedir} + + + diff --git a/cs-protocol/src/test/java/com/cf/cs/protocol/CsProtocolApplicationTests.java b/cs-protocol/src/test/java/com/cf/cs/protocol/CsProtocolApplicationTests.java index 815af93..d5acf3d 100644 --- a/cs-protocol/src/test/java/com/cf/cs/protocol/CsProtocolApplicationTests.java +++ b/cs-protocol/src/test/java/com/cf/cs/protocol/CsProtocolApplicationTests.java @@ -1,14 +1,24 @@ package com.cf.cs.protocol; +import com.cf.cs.base.config.CacheConfigure; +import com.cf.cs.base.config.CommonConfigure; +import com.cf.cs.base.config.ObjectMapperProvider; +import com.cf.cs.database.config.MybatisFlexConfigure; +import com.cf.cs.protocol.config.ProtocolConfigure; import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.ActiveProfiles; +import org.springframework.test.context.ContextConfiguration; /** * The type Cs protocol application tests. * * @author xajhuang @163.com */ -@SpringBootTest +@SpringBootTest(classes = {CsProtocolApplication.class}) +@ActiveProfiles({"user", "test"}) +@ContextConfiguration(classes = {CacheConfigure.class, CommonConfigure.class, ObjectMapperProvider.class, MybatisFlexConfigure.class, + ProtocolConfigure.class}) class CsProtocolApplicationTests { /** diff --git a/cs-restful/pom.xml b/cs-restful/pom.xml index c315af6..0d6651f 100644 --- a/cs-restful/pom.xml +++ b/cs-restful/pom.xml @@ -68,25 +68,21 @@ com.cf.cs cs-database ${cs-package.version} - compile com.cf.cs cs-protocol ${cs-package.version} - compile com.cf.cs cs-crypto ${cs-package.version} - compile com.cf.cs cs-authentication ${cs-package.version} - compile