diff --git a/pig-auth/src/main/resources/bootstrap.yml b/pig-auth/src/main/resources/bootstrap.yml index fa091002..c838d450 100755 --- a/pig-auth/src/main/resources/bootstrap.yml +++ b/pig-auth/src/main/resources/bootstrap.yml @@ -11,6 +11,8 @@ spring: config: server-addr: ${spring.cloud.nacos.discovery.server-addr} file-extension: yml - shared-dataids: application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + shared-configs: + - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} profiles: - active: @profiles.active@ + active: dev + diff --git a/pig-codegen/src/main/resources/bootstrap.yml b/pig-codegen/src/main/resources/bootstrap.yml index 5f611d89..67f2f778 100755 --- a/pig-codegen/src/main/resources/bootstrap.yml +++ b/pig-codegen/src/main/resources/bootstrap.yml @@ -11,6 +11,7 @@ spring: config: server-addr: ${spring.cloud.nacos.discovery.server-addr} file-extension: yml - shared-dataids: application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + shared-configs: + - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} profiles: - active: @profiles.active@ + active: dev diff --git a/pig-codegen/src/main/resources/template/Mapper.java.vm b/pig-codegen/src/main/resources/template/Mapper.java.vm index ed44ab23..acb78a82 100755 --- a/pig-codegen/src/main/resources/template/Mapper.java.vm +++ b/pig-codegen/src/main/resources/template/Mapper.java.vm @@ -18,6 +18,7 @@ package ${package}.${moduleName}.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import ${package}.${moduleName}.entity.${className}; +import org.apache.ibatis.annotations.Mapper; /** * ${comments} @@ -25,6 +26,7 @@ import ${package}.${moduleName}.entity.${className}; * @author ${author} * @date ${datetime} */ +@Mapper public interface ${className}Mapper extends BaseMapper<${className}> { } diff --git a/pig-gateway/src/main/resources/bootstrap.yml b/pig-gateway/src/main/resources/bootstrap.yml index 7d56a03e..0a0d2316 100755 --- a/pig-gateway/src/main/resources/bootstrap.yml +++ b/pig-gateway/src/main/resources/bootstrap.yml @@ -11,8 +11,9 @@ spring: config: server-addr: ${spring.cloud.nacos.discovery.server-addr} file-extension: yml - shared-dataids: application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + shared-configs: + - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} profiles: - active: @profiles.active@ + active: dev diff --git a/pig-monitor/src/main/resources/bootstrap.yml b/pig-monitor/src/main/resources/bootstrap.yml index 572d82d6..ed44a653 100755 --- a/pig-monitor/src/main/resources/bootstrap.yml +++ b/pig-monitor/src/main/resources/bootstrap.yml @@ -11,6 +11,7 @@ spring: config: server-addr: ${spring.cloud.nacos.discovery.server-addr} file-extension: yml - shared-dataids: application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + shared-configs: + - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} profiles: - active: @profiles.active@ + active: dev diff --git a/pig-upms/pig-upms-biz/src/main/resources/bootstrap.yml b/pig-upms/pig-upms-biz/src/main/resources/bootstrap.yml index 548bbb3e..27883645 100644 --- a/pig-upms/pig-upms-biz/src/main/resources/bootstrap.yml +++ b/pig-upms/pig-upms-biz/src/main/resources/bootstrap.yml @@ -11,6 +11,7 @@ spring: config: server-addr: ${spring.cloud.nacos.discovery.server-addr} file-extension: yml - shared-dataids: application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + shared-configs: + - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} profiles: active: @profiles.active@ diff --git a/pom.xml b/pom.xml index 1a8034b9..c71d0a49 100755 --- a/pom.xml +++ b/pom.xml @@ -35,7 +35,7 @@ 2.2.4.RELEASE Hoxton.SR1 - 2.1.1.RELEASE + 2.2.0.RELEASE UTF-8 1.8 1.8