引用修复

modules/ibizlab-generator-core/src/main/resources/templ/r7/{{projectName}}-app/{{projectName}}-app-{{apps}}/src/main/resources/application-{{apps}}-prod.yml.hbs

-server:
-  port: {{#if app.httpPort}}{{app.httpPort}}{{else}}8080{{/if}}
-
-
 spring:
   cache:
     redis:
@@ -62,6 +58,7 @@ ibiz:
 
 ### 启用Gzip压缩
 server:
+  port: {{#if app.httpPort}}{{app.httpPort}}{{else}}8080{{/if}}
   compression:
     enabled: true
     mime-types: application/javascript,text/css,application/json,application/xml,text/html,text/xml,text/plain

modules/ibizlab-generator-core/src/main/resources/templ/r7/{{projectName}}-core/src/main/java/{{packageName}}/core/util/config/LiquibaseConfiguration.java.hbs

 package {{packageName}}.core.util.config;
 
 import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -21,6 +22,7 @@ import com.alibaba.druid.pool.DruidDataSource;
 import org.apache.ibatis.session.SqlSessionFactory;
 
 @Configuration
+@ConditionalOnProperty( name = "spring.datasource.isSyncDBSchema", havingValue = "true")
 public class LiquibaseConfiguration {
 
    /**

modules/ibizlab-generator-core/src/main/resources/templ/r7/{{projectName}}-core/src/main/resources/application-sys.yml.hbs

@@ -43,26 +43,6 @@ spring:
     isSyncDBSchema: false
     defaultSchema: {{projectName}}
   {{#if system.enableDS}}
-    conf: classpath:liquibase/master.xml      
-    filters: stat,wall,log4j2
-    #配置初始化大小/最小/最大
-    initial-size: 1
-    min-idle: 1
-    max-active: 20
-    #获取连接等待超时时间
-    max-wait: 60000
-    #间隔多久进行一次检测，检测需要关闭的空闲连接
-    time-between-eviction-runs-millis: 60000
-    #一个连接在池中最小生存的时间
-    min-evictable-idle-time-millis: 300000
-    validation-query: SELECT 1 FROM DUAL
-    test-while-idle: true
-    test-on-borrow: false
-    test-on-return: false
-    #打开PSCache，并指定每个连接上PSCache的大小。oracle设为true，mysql设为false。分库分表较多推荐设置为false
-    pool-prepared-statements: false
-    max-pool-prepared-statement-per-connection-size: 20
-  {{else}}
     dynamic:
       druid: #以下是全局默认值，可以全局更改
         filters: stat,log4j2
@@ -100,6 +80,26 @@ spring:
           conf: classpath:liquibase/master.xml
           isSyncDBSchema: ${spring.datasource.isSyncDBSchema}
           defaultSchema: ${spring.datasource.defaultSchema}
+  {{else}}
+    conf: classpath:liquibase/master.xml      
+    filters: stat,wall,log4j2
+    #配置初始化大小/最小/最大
+    initial-size: 1
+    min-idle: 1
+    max-active: 20
+    #获取连接等待超时时间
+    max-wait: 60000
+    #间隔多久进行一次检测，检测需要关闭的空闲连接
+    time-between-eviction-runs-millis: 60000
+    #一个连接在池中最小生存的时间
+    min-evictable-idle-time-millis: 300000
+    validation-query: SELECT 1 FROM DUAL
+    test-while-idle: true
+    test-on-borrow: false
+    test-on-return: false
+    #打开PSCache，并指定每个连接上PSCache的大小。oracle设为true，mysql设为false。分库分表较多推荐设置为false
+    pool-prepared-statements: false
+    max-pool-prepared-statement-per-connection-size: 20
   {{/if}}
 
 #Mybatis-plus配置

modules/ibizlab-generator-core/src/main/resources/templ/r7/{{projectName}}-dependencies/pom.xml.hbs

@@ -15,7 +15,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.2.1.RELEASE</version>
+        <version>2.2.5.RELEASE</version>
     </parent>
 
     <properties>
@@ -25,22 +25,22 @@
         <spring-cloud-security.version>2.1.1.RELEASE</spring-cloud-security.version>
 
         <!--  openfeign  -->
-        <spring-cloud-openfeign.version>2.2.1.RELEASE</spring-cloud-openfeign.version>
+        <spring-cloud-openfeign.version>2.2.5.RELEASE</spring-cloud-openfeign.version>
 
         <!--  Zuul网关  -->
-        <spring-cloud-starter-netflix-zuul.version>2.2.1.RELEASE</spring-cloud-starter-netflix-zuul.version>
+        <spring-cloud-starter-netflix-zuul.version>2.2.5.RELEASE</spring-cloud-starter-netflix-zuul.version>
 
         <!--  Spring Cloud Alibaba(2.2.x.RELEASE) & Spring Cloud(Spring Cloud Greenwich) & Spring Boot(2.2.x.RELEASE) compatibility -->
         <spring-cloud-alibaba.version>2.2.1.RELEASE</spring-cloud-alibaba.version>
 
         <!-- eureka微服务注册中心 -->
-        <eureka-client.version>2.2.1.RELEASE</eureka-client.version>
+        <eureka-client.version>2.2.5.RELEASE</eureka-client.version>
 
         <!--Java Web Token-->
         <jsonwebtoken-jjwt.version>0.9.1</jsonwebtoken-jjwt.version>
 
         <!--caffeine缓存-->
-        <caffeine-cache.version>2.6.0</caffeine-cache.version>
+        <caffeine.version>2.8.1</caffeine.version>
 
         <!--反序列化工具-->
         <kryo.version>4.0.2</kryo.version>
@@ -80,24 +80,24 @@
         <baomidou-jobs.version>1.0.3</baomidou-jobs.version>
 
         <!-- 阿里sentinel熔断器 -->
-        <alibaba-sentinel.version>2.1.1.RELEASE</alibaba-sentinel.version>
+        <alibaba-sentinel.version>2.2.1.RELEASE</alibaba-sentinel.version>
 
         <!-- 阿里seata分布式事务 -->
         <alibaba-seata.version>1.3.0</alibaba-seata.version>
 
-        <oracle.version>19.8.0.0</oracle.version>
+        <ojdbc.version>19.8.0.0</ojdbc.version>
         
-        <postgresql.version>42.2.6</postgresql.version>
+        <postgresql.version>42.2.10</postgresql.version>
         
-        <mysql.version>8.0.18</mysql.version>
+        <mysql.version>8.0.19</mysql.version>
 
         <rocketmq.version>4.7.0</rocketmq.version>
         
         <flowable-modeler.version>6.4.2</flowable-modeler.version>
 
-        <ibizlab-common.version>1.0.2</ibizlab-common.version>
+        <ibizlab-common.version>1.0.3</ibizlab-common.version>
 
-        <ibizlab-util.version>1.0.2</ibizlab-util.version>
+        <ibizlab-util.version>1.0.3</ibizlab-util.version>
 
     </properties>
 
@@ -154,7 +154,7 @@
             <dependency>
                 <groupId>com.github.ben-manes.caffeine</groupId>
                 <artifactId>caffeine</artifactId>
-                <version>${caffeine-cache.version}</version>
+                <version>${caffeine.version}</version>
             </dependency>
 
             <dependency>
@@ -301,12 +301,12 @@
             <dependency>
                 <groupId>com.oracle.database.jdbc</groupId>
                 <artifactId>ojdbc8</artifactId>
-                <version>${oracle.version}</version>
+                <version>${ojdbc.version}</version>
             </dependency>
             <dependency>
                 <groupId>com.oracle.database.nls</groupId>
                 <artifactId>orai18n</artifactId>
-                <version>${oracle.version}</version>
+                <version>${ojdbc.version}</version>
             </dependency>
             <!--  PostgreSQL驱动包 -->
             <dependency>
@@ -319,6 +319,12 @@
                 <groupId>mysql</groupId>
                 <artifactId>mysql-connector-java</artifactId>
                 <version>${mysql.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <artifactId>protobuf-java</artifactId>
+                        <groupId>com.google.protobuf</groupId>
+                    </exclusion>
+                </exclusions>
             </dependency>
 
 

modules/ibizlab-generator-core/src/main/resources/templ/r7/{{projectName}}-provider/pom.xml.hbs

@@ -27,6 +27,11 @@
 			<scope>provided</scope>
 		</dependency>
 
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-netflix-zuul</artifactId>
+        </dependency>
+
 
 	</dependencies>
 

modules/ibizlab-generator-core/src/main/resources/templ/r7/{{projectName}}-provider/{{projectName}}-provider-{{apis}}/src/main/java/{{packageName}}/swagger/SwaggerConfiguration.java.hbs

@@ -59,7 +59,7 @@ public class SwaggerConfiguration {
 						.build()
                     )
 				.select()
-				.apis(RequestHandlerSelectors.basePackage("{{packageName}}.{{api.codeName}}"))
+				.apis(RequestHandlerSelectors.basePackage("{{packageName}}.{{lowerCase api.codeName}}"))
 				.paths(PathSelectors.any())
 				.build();
 	}

modules/ibizlab-generator-core/src/main/resources/templ/r7/{{projectName}}-provider/{{projectName}}-provider-{{apis}}/src/main/java/{{packageName}}/{{apis}}/{{system.codeName}}{{api.codeName}}Application.java.hbs

@@ -25,11 +25,11 @@ import java.util.List;
 @EnableTransactionManagement
 @ComponentScan(basePackages = {"{{packageName}}","cn.ibizlab.util"}
 //        ,excludeFilters={
-//                @ComponentScan.Filter(type= org.springframework.context.annotation.FilterType.REGEX,pattern="{{packageName}}.${item.codeName?lower_case}.rest.xxx"),
+//                @ComponentScan.Filter(type= org.springframework.context.annotation.FilterType.REGEX,pattern="{{packageName}}.{{lowerCase api.codeName}}.rest.xxx"),
 //        }
 )
 @EnableMongoRepositories(basePackages = {"{{packageName}}"})
-@MapperScan("{{packageName}}.*.mapper")
+@MapperScan({"{{packageName}}.*.mapper","cn.ibizlab.util.mapper" })
 @SpringBootApplication(exclude = {
         org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration.class,
         {{#unless system.enableMongo}}