路径作用域

modules/ibizlab-generator-core/src/main/resources/templ/r7/app_{{apps}}/vue.config.js.hbs

@@ -8,7 +8,7 @@ module.exports = {
     publicPath: './',
     // 去除 map 文件 1
     productionSourceMap: false,
-    outputDir:"../{{projectName}}-app/{{projectName}}-app-{{apps}}/target/classes/META-INF/resources",
+    outputDir:"../{{projectName}}-app/{{projectName}}-app-{{lowerCase app.codeName}}/target/classes/META-INF/resources",
     devServer: {
         host: '0.0.0.0',
         port: 8111,

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

@@ -16,7 +16,7 @@
 
     <modules>
         {{#apps}}
-        <module>{{projectName}}-app-{{apps}}</module>
+        <module>{{projectName}}-app-{{lowerCase app.codeName}}</module>
         {{/apps}}
     </modules>
 

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

@@ -9,9 +9,9 @@
         <version>1.0.0.0</version>
     </parent>
 
-    <artifactId>{{projectName}}-app-{{apps}}</artifactId>
-    <name>{{projectDesc}} Gateway {{apps}}</name>
-    <description>{{projectDesc}} {{apps}}</description>
+    <artifactId>{{projectName}}-app-{{lowerCase app.codeName}}</artifactId>
+    <name>{{projectDesc}} Gateway {{lowerCase app.codeName}}</name>
+    <description>{{projectDesc}} {{lowerCase app.codeName}}</description>
     <packaging>${project.packaging}</packaging>
 
     <dependencies>
@@ -25,7 +25,7 @@
 
     <profiles>
         <profile>
-            <id>{{apps}}</id>
+            <id>{{lowerCase app.codeName}}</id>
             <build>
                 <resources>
                     <resource>
@@ -57,7 +57,7 @@
                                 </goals>
                                 <configuration>
                                     <executable>yarn</executable>
-                                    <workingDirectory>../../app_{{apps}}</workingDirectory>
+                                    <workingDirectory>../../app_{{lowerCase app.codeName}}</workingDirectory>
                                 </configuration>
                             </execution>
                             <execution>
@@ -71,7 +71,7 @@
                                     <arguments>
                                         <argument>build</argument>
                                     </arguments>
-                                    <workingDirectory>../../app_{{apps}}</workingDirectory>
+                                    <workingDirectory>../../app_{{lowerCase app.codeName}}</workingDirectory>
                                 </configuration>
                             </execution>
                             <execution>
@@ -107,9 +107,9 @@
                         <groupId>org.springframework.boot</groupId>
                         <artifactId>spring-boot-maven-plugin</artifactId>
                         <configuration>
-                            <finalName>{{projectName}}-app-{{apps}}</finalName>
+                            <finalName>{{projectName}}-app-{{lowerCase app.codeName}}</finalName>
                             <jvmArguments>-Dfile.encoding=UTF-8</jvmArguments>
-                            <mainClass>{{packageName}}.{{apps}}.{{apps}}Application</mainClass>
+                            <mainClass>{{packageName}}.{{lowerCase app.codeName}}.{{app.codeName}}Application</mainClass>
                             <outputDirectory>../../</outputDirectory>
                         </configuration>
                         <executions>
@@ -142,7 +142,7 @@
             </build>
         </profile>
         <profile>
-            <id>{{apps}}-war</id>
+            <id>{{lowerCase app.codeName}}-war</id>
             <properties>
                 <project.packaging>war</project.packaging>
             </properties>
@@ -177,7 +177,7 @@
                                 </goals>
                                 <configuration>
                                     <executable>yarn</executable>
-                                    <workingDirectory>../../app_{{apps}}</workingDirectory>
+                                    <workingDirectory>../../app_{{lowerCase app.codeName}}</workingDirectory>
                                 </configuration>
                             </execution>
                             <execution>
@@ -191,7 +191,7 @@
                                     <arguments>
                                         <argument>build</argument>
                                     </arguments>
-                                    <workingDirectory>../../app_{{apps}}</workingDirectory>
+                                    <workingDirectory>../../app_{{lowerCase app.codeName}}</workingDirectory>
                                 </configuration>
                             </execution>
                             <execution>
@@ -226,9 +226,9 @@
                         <groupId>org.springframework.boot</groupId>
                         <artifactId>spring-boot-maven-plugin</artifactId>
                         <configuration>
-                            <finalName>{{projectName}}-app-{{apps}}</finalName>
+                            <finalName>{{projectName}}-app-{{lowerCase app.codeName}}</finalName>
                             <jvmArguments>-Dfile.encoding=UTF-8</jvmArguments>
-                            <mainClass>{{packageName}}.{{apps}}.{{apps}}Application</mainClass>
+                            <mainClass>{{packageName}}.{{lowerCase app.codeName}}.{{app.codeName}}Application</mainClass>
                             <outputDirectory>../../</outputDirectory>
                         </configuration>
                         <executions>

modules/ibizlab-generator-core/src/main/resources/templ/r7/{{projectName}}-app/{{projectName}}-app-{{apps}}/src/main/docker/Dockerfile.hbs

@@ -7,8 +7,8 @@ ENV TZ="Asia/Shanghai" \
 
 CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
     sleep ${IBIZ_SLEEP} && \
-    java ${JAVA_OPTS} -Duser.timezone=$TZ -Djava.security.egd=file:/dev/./urandom -jar /{{projectName}}-app-{{apps}}.jar
+    java ${JAVA_OPTS} -Duser.timezone=$TZ -Djava.security.egd=file:/dev/./urandom -jar /{{projectName}}-app-{{lowerCase app.codeName}}.jar
 
 EXPOSE {{#if app.httpPort}}{{app.httpPort}}{{else}}8080{{/if}}
 
-ADD {{projectName}}-app-{{apps}}.jar /{{projectName}}-app-{{apps}}.jar
+ADD {{projectName}}-app-{{lowerCase app.codeName}}.jar /{{projectName}}-app-{{lowerCase app.codeName}}.jar

modules/ibizlab-generator-core/src/main/resources/templ/r7/{{projectName}}-app/{{projectName}}-app-{{apps}}/src/main/java/{{packageName}}/{{apps}}/config/NacosRegisterConfig.java.hbs

-package {{packageName}}.{{apps}}.config;
+package {{packageName}}.{{lowerCase app.codeName}}.config;
 
 import com.alibaba.cloud.nacos.registry.NacosAutoServiceRegistration;
 import cn.ibizlab.util.errors.BadRequestAlertException;

modules/ibizlab-generator-core/src/main/resources/templ/r7/{{projectName}}-app/{{projectName}}-app-{{apps}}/src/main/java/{{packageName}}/{{apps}}/config/{{app.codeName}}HeaderFilter.java.hbs

 {{#eq system.saaSMode 4}}
-package {{packageName}}.{{apps}}.config;
+package {{packageName}}.{{lowerCase app.codeName}}.config;
 
 import com.netflix.zuul.ZuulFilter;
 import com.netflix.zuul.context.RequestContext;

modules/ibizlab-generator-core/src/main/resources/templ/r7/{{projectName}}-app/{{projectName}}-app-{{apps}}/src/main/java/{{packageName}}/{{apps}}/config/{{app.codeName}}SecurityConfig.java.hbs

-package {{packageName}}.{{apps}}.config;
+package {{packageName}}.{{lowerCase app.codeName}}.config;
 
 import cn.ibizlab.util.security.AuthenticationEntryPoint;
 import cn.ibizlab.util.security.AuthorizationTokenFilter;
@@ -22,7 +22,7 @@ import org.springframework.security.web.authentication.UsernamePasswordAuthentic
 import org.springframework.context.annotation.Profile;
 import org.springframework.beans.factory.annotation.Qualifier;
 
-@Profile("{{apps}}-prod")
+@Profile("{{lowerCase app.codeName}}-prod")
 @Configuration
 @EnableWebSecurity
 public class {{app.codeName}}SecurityConfig extends WebSecurityConfigurerAdapter {

modules/ibizlab-generator-core/src/main/resources/templ/r7/{{projectName}}-app/{{projectName}}-app-{{apps}}/src/main/java/{{packageName}}/{{apps}}/{{app.codeName}}Application.java.hbs

-package {{packageName}}.{{apps}};
+package {{packageName}}.{{lowerCase app.codeName}};
 
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -25,7 +25,7 @@ import java.util.List;
 @Configuration
 @EnableFeignClients(basePackages = {"{{packageName}}" })
 @EnableZuulProxy
-@ComponentScan(basePackages = {"{{packageName}}.{{apps}}","cn.ibizlab.util"})
+@ComponentScan(basePackages = {"{{packageName}}.{{lowerCase app.codeName}}","cn.ibizlab.util"})
 @MapperScan("{{packageName}}.*.mapper")
 @SpringBootApplication(exclude = {
         org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration.class,

modules/ibizlab-generator-core/src/main/resources/templ/r7/{{projectName}}-app/{{projectName}}-app-{{apps}}/src/main/java/{{packageName}}/{{apps}}/{{app.codeName}}Initializer.java.hbs

-package {{packageName}}.{{apps}};
+package {{packageName}}.{{lowerCase app.codeName}};
 
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.boot.builder.SpringApplicationBuilder;

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

@@ -71,7 +71,7 @@ zuul:
       stripPrefix: false
   {{#each app.appEntities}}
     {{#serviceId}}
-    {{apps}}-{{lowerCase codeName}}:
+    {{lowerCase app.codeName}}-{{lowerCase codeName}}:
       path: /{{pluralize codeName}}/**
       serviceId: ${ ibiz.ref.service.{{serviceId}}:{{serviceId}} }
       stripPrefix: false

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

 spring:
   profiles:
-    include: sys ,nacos, {{apps}}-prod
+    include: sys ,nacos, {{lowerCase app.codeName}}-prod
   application:
-    name: {{projectName}}-{{apps}}
+    name: {{projectName}}-{{lowerCase app.codeName}}

modules/ibizlab-generator-core/src/main/resources/templ/r7/{{projectName}}-app/{{projectName}}-app-{{apps}}/src/main/resources/logback-spring.xml.hbs

@@ -19,14 +19,14 @@
 <!--<appender name="LOGSTASH" class="net.logstash.logback.appender.LogstashTcpSocketAppender">-->
 <!--    <destination>127.0.0.1:9601</destination>-->
 <!--    <encoder charset="UTF-8" class="net.logstash.logback.encoder.LogstashEncoder">-->
-<!--        <customFields>{"appname":"{{projectName}}-{{apps}}"}</customFields>-->
+<!--        <customFields>{"appname":"{{projectName}}-{{lowerCase app.codeName}}"}</customFields>-->
 <!--    </encoder>-->
 <!--</appender>-->
     <!-- 按照每天生成日志文件 -->
     <appender name="file"  class="ch.qos.logback.core.rolling.RollingFileAppender">
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
             <!--日志文件输出的文件名-->
-            <FileNamePattern>${LOG_PATH}}/{{projectName}}-{{apps}}.%d{yyyy-MM-dd}.log</FileNamePattern>
+            <FileNamePattern>${LOG_PATH}}/{{projectName}}-{{lowerCase app.codeName}}.%d{yyyy-MM-dd}.log</FileNamePattern>
             <!--日志文件保留天数-->
             <MaxHistory>30</MaxHistory>
         </rollingPolicy>

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

@@ -23,7 +23,7 @@
 		{{#apis}}
 		<dependency>
 			<groupId>{{packageName}}</groupId>
-			<artifactId>{{projectName}}-provider-{{apis}}</artifactId>
+			<artifactId>{{projectName}}-provider-{{lowerCase api.codeName}}</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		{{/apis}}
@@ -31,7 +31,7 @@
 		{{#apps}}
         <dependency>
             <groupId>{{packageName}}</groupId>
-            <artifactId>{{projectName}}-app-{{apps}}</artifactId>
+            <artifactId>{{projectName}}-app-{{lowerCase app.codeName}}</artifactId>
             <version>${project.version}</version>
         </dependency>
 		{{/apps}}

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

@@ -65,15 +65,15 @@ zuul:
       path: /sysauthlogs
       serviceId: ${ibiz.ref.service.uaa:ibzuaa-api}}
       stripPrefix: false
-  {{#each system.apps as | app |}}
-    {{#each app.appEntities}}
-        {{#eq entity.storage "ServiceAPI"}}
-        {{#serviceId}}
-    {{apps}}-{{lowerCase codeName}}:
-      path: /{{pluralize codeName}}/**
-      serviceId: ${ ibiz.ref.service.{{serviceId}}:{{serviceId}} }
+  {{#each apps as | webapp |}}
+    {{#each webapp.appEntities as |appEntity|}}
+        {{#eq appEntity.entity.storage "ServiceAPI"}}
+        {{#appEntity.serviceId}}
+    {{lowerCase webapp.codeName}}-{{lowerCase appEntity.codeName}}:
+      path: /{{pluralize appEntity.codeName}}/**
+      serviceId: ${ ibiz.ref.service.{{appEntity.serviceId}}:{{appEntity.serviceId}} }
       stripPrefix: false
-        {{/serviceId}}
+        {{/appEntity.serviceId}}
         {{/eq}}
     {{/each}}
   {{/each}}

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

 spring:
   profiles:
-    include: sys , nacos ,{{#each apps}} {{apps}}-dev ,{{/each}}{{#each apis}} {{apis}}-dev ,{{/each}} dev
+    include: sys , nacos ,{{#each apps}} {{lowerCase app.codeName}}-dev ,{{/each}}{{#each apis}} {{lowerCase api.codeName}}-dev ,{{/each}} dev
   application:
     name: {{projectName}}
   main:

modules/ibizlab-generator-core/src/main/resources/templ/r7/{{projectName}}-core/src/main/java/{{packageName}}/core/{{modules}}/domain/{{entities@NONE}}.java.hbs

-package {{packageName}}.core.{{module}}.domain;
+package {{packageName}}.core.{{entity.module}}.domain;
 
 import java.sql.Timestamp;
 import java.util.ArrayList;

modules/ibizlab-generator-core/src/main/resources/templ/r7/{{projectName}}-core/src/main/java/{{packageName}}/core/{{modules}}/domain/{{entities@SQL}}.java.hbs

-package {{packageName}}.core.{{module}}.domain;
+package {{packageName}}.core.{{entity.module}}.domain;
 
 import java.sql.Timestamp;
 import java.util.ArrayList;

modules/ibizlab-generator-core/src/main/resources/templ/r7/{{projectName}}-core/src/main/java/{{packageName}}/core/{{modules}}/filter/{{entities@SQL}}SearchContext.java.hbs

-package {{packageName}}.core.{{module}}.filter;
+package {{packageName}}.core.{{entity.module}}.filter;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
@@ -24,7 +24,7 @@ import org.elasticsearch.index.query.QueryBuilders;
 {{/entity.enableES}}
 import cn.ibizlab.util.filter.QueryWrapperContext;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import {{packageName}}.core.{{module}}.domain.{{entity.codeName}};
+import {{packageName}}.core.{{entity.module}}.domain.{{entity.codeName}};
 /**
  * 关系型数据实体[{{entity.codeName}}] 查询条件对象
  */

modules/ibizlab-generator-core/src/main/resources/templ/r7/{{projectName}}-core/src/main/java/{{packageName}}/core/{{modules}}/mapper/{{entities@SQL}}Mapper.java.hbs

-package {{packageName}}.core.{{module}}.mapper;
+package {{packageName}}.core.{{entity.module}}.mapper;
 
 import java.util.List;
 import org.apache.ibatis.annotations.*;
@@ -9,8 +9,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import java.util.Map;
 import org.apache.ibatis.annotations.Select;
-import {{packageName}}.core.{{module}}.domain.{{entity.codeName}};
-import {{packageName}}.core.{{module}}.filter.{{entity.codeName}}SearchContext;
+import {{packageName}}.core.{{entity.module}}.domain.{{entity.codeName}};
+import {{packageName}}.core.{{entity.module}}.filter.{{entity.codeName}}SearchContext;
 import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.cache.annotation.Cacheable;
 import java.io.Serializable;

modules/ibizlab-generator-core/src/main/resources/templ/r7/{{projectName}}-core/src/main/java/{{packageName}}/core/{{modules}}/service/I{{entities@SQL}}Service.java.hbs

-package {{packageName}}.core.{{module}}.service;
+package {{packageName}}.core.{{entity.module}}.service;
 
 import java.io.Serializable;
 import java.sql.Timestamp;
@@ -18,8 +18,8 @@ import org.springframework.cache.annotation.CacheEvict;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.dynamic.datasource.annotation.DS;
 import cn.ibizlab.util.helper.CachedBeanCopier;
-import {{packageName}}.core.{{module}}.domain.{{entity.codeName}};
-import {{packageName}}.core.{{module}}.filter.{{entity.codeName}}SearchContext;
+import {{packageName}}.core.{{entity.module}}.domain.{{entity.codeName}};
+import {{packageName}}.core.{{entity.module}}.filter.{{entity.codeName}}SearchContext;
 
 {{#dsName}}
 @DS("{{entity.dataSource}}")

modules/ibizlab-generator-core/src/main/resources/templ/r7/{{projectName}}-core/src/main/java/{{packageName}}/core/{{modules}}/service/impl/{{entities@SQL}}ServiceImpl.java.hbs

@@ -64,7 +64,7 @@ public class {{entity.codeName}}ServiceImpl extends ServiceImpl<{{entity.codeNam
     {{#if entity.indexSubDE}}
     @Autowired
     @Lazy
-    protected {{packageName}}.core.{{module}}.mapping.{{entity.codeName}}InheritMapping {{camelCase codeName}}InheritMapping;
+    protected {{packageName}}.core.{{entity.module}}.mapping.{{entity.codeName}}InheritMapping {{camelCase codeName}}InheritMapping;
     {{/if}}
 
     protected int batchSize = 500;

modules/ibizlab-generator-core/src/main/resources/templ/r7/{{projectName}}-core/src/main/resources/mapper/{{modules}}/{{entities}}/{{entities@SQL}}Mapper.xml.hbs

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper	namespace="{{packageName}}.core.{{module}}.mapper.{{entity.codeName}}Mapper">
+<mapper	namespace="{{packageName}}.core.{{entity.module}}.mapper.{{entity.codeName}}Mapper">
 
         <!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
-    <resultMap id="{{entity.codeName}}ResultMap" type="{{packageName}}.core.{{module}}.domain.{{entity.codeName}}" autoMapping="true">
+    <resultMap id="{{entity.codeName}}ResultMap" type="{{packageName}}.core.{{entity.module}}.domain.{{entity.codeName}}" autoMapping="true">
 		{{#entity.keyField.phisicalDEField}}
 		<id property="{{camelCase entity.keyField.codeName}}" column="{{entity.keyField.columnName}}" /><!--主键字段映射-->
 		{{/entity.keyField.phisicalDEField}}
@@ -54,7 +54,7 @@
          t1.{{entity.keyField.columnName}}=#{id}
     </select>
 
-    <select id="selectEntity" parameterType="{{packageName}}.core.{{module}}.domain.{{entity.codeName}}" resultMap="{{entity.codeName}}ResultMap">
+    <select id="selectEntity" parameterType="{{packageName}}.core.{{entity.module}}.domain.{{entity.codeName}}" resultMap="{{entity.codeName}}ResultMap">
     {{#if entity.viewDataQuery}}
         <include refid="view" /> 
             {{#if entity.viewDataQuery.where}}
@@ -110,7 +110,7 @@
 
     {{/each}}
     {{#each entity.dataSets}}
-    <select id="search{{pascalCase codeName}}"  parameterType="{{packageName}}.core.{{module}}.filter.{{entity.codeName}}SearchContext"  resultType={{#if enableGroup}}"java.util.HashMap"{{else}}"{{entity.codeName}}ResultMap"{{/if}}>
+    <select id="search{{pascalCase codeName}}"  parameterType="{{packageName}}.core.{{entity.module}}.filter.{{entity.codeName}}SearchContext"  resultType={{#if enableGroup}}"java.util.HashMap"{{else}}"{{entity.codeName}}ResultMap"{{/if}}>
         {{select}} 
         from (
             {{#each queries}}

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

@@ -16,7 +16,7 @@
 
     <modules>
         {{#apis}}
-        <module>{{projectName}}-provider-{{apis}}</module>
+        <module>{{projectName}}-provider-{{lowerCase api.codeName}}</module>
         {{/apis}}
     </modules>
 

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

@@ -9,8 +9,8 @@
         <version>1.0.0.0</version>
     </parent>
 
-    <artifactId>{{projectName}}-provider-{{apis}}</artifactId>
-    <name>{{projectDesc}} Microservice {{apis}}</name>
+    <artifactId>{{projectName}}-provider-{{lowerCase api.codeName}}</artifactId>
+    <name>{{projectDesc}} Microservice {{lowerCase api.codeName}}</name>
     <description> microservice</description>
     <packaging>${project.packaging}</packaging>
 
@@ -31,7 +31,7 @@
 
     <profiles>
         <profile>
-            <id>{{apis}}</id>
+            <id>{{lowerCase api.codeName}}</id>
             <build>
                 <resources>
                     <resource>
@@ -49,7 +49,7 @@
                         <configuration>
                             <finalName>{{projectName}}-provider-api</finalName>
                             <jvmArguments>-Dfile.encoding=UTF-8</jvmArguments>
-                            <mainClass>{{packageName}}.api.{{projectName}}{{apis}}Application</mainClass>
+                            <mainClass>{{packageName}}.api.{{system.codeName}}{{api.codeName}}Application</mainClass>
                             <outputDirectory>../../</outputDirectory>
                         </configuration>
                         <executions>
@@ -117,7 +117,7 @@
         </profile>
 
         <profile>
-            <id>{{apis}}-war</id>
+            <id>{{lowerCase api.codeName}}-war</id>
             <properties>
                 <project.packaging>war</project.packaging>
             </properties>
@@ -138,7 +138,7 @@
                         <configuration>
                             <finalName>{{projectName}}-provider-api</finalName>
                             <jvmArguments>-Dfile.encoding=UTF-8</jvmArguments>
-                            <mainClass>{{packageName}}.api.{{projectName}}{{apis}}Application</mainClass>
+                            <mainClass>{{packageName}}.api.{{system.codeName}}{{api.codeName}}Application</mainClass>
                             <outputDirectory>../../</outputDirectory>
                         </configuration>
                         <executions>

modules/ibizlab-generator-core/src/main/resources/templ/r7/{{projectName}}-provider/{{projectName}}-provider-{{apis}}/src/main/docker/Dockerfile.hbs

@@ -7,8 +7,8 @@ ENV TZ="Asia/Shanghai" \
 
 CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
     sleep ${IBIZ_SLEEP} && \
-    java ${JAVA_OPTS} -Duser.timezone=$TZ -Djava.security.egd=file:/dev/./urandom -jar /{{projectName}}-provider-{{apis}}.jar
+    java ${JAVA_OPTS} -Duser.timezone=$TZ -Djava.security.egd=file:/dev/./urandom -jar /{{projectName}}-provider-{{lowerCase api.codeName}}.jar
 
 EXPOSE {{#if app.httpPort}}{{app.httpPort}}{{else}}8080{{/if}}
 
-ADD {{projectName}}-provider-{{apis}}.jar /{{projectName}}-provider-{{apis}}.jar
+ADD {{projectName}}-provider-{{lowerCase api.codeName}}.jar /{{projectName}}-provider-{{lowerCase api.codeName}}.jar

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

@@ -48,7 +48,7 @@ public class SwaggerConfiguration {
     }
 
 	@Bean
-	public Docket {{apis}}Docket() {
+	public Docket {{lowerCase api.codeName}}Docket() {
 		return new Docket(DocumentationType.SWAGGER_2)
 				.groupName("{{api.name}}")
 				.pathMapping("/")

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

-package {{packageName}}.{{apis}}.config;
+package {{packageName}}.{{lowerCase api.codeName}}.config;
 
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;

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

-package {{packageName}}.{{apis}}.config;
+package {{packageName}}.{{lowerCase api.codeName}}.config;
 
 import org.springframework.context.annotation.ComponentScan;
 
-@ComponentScan("{{packageName}}.{{apis}}")
+@ComponentScan("{{packageName}}.{{lowerCase api.codeName}}")
 public class {{api.codeName}}RestConfiguration {
 
 }

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

-package {{packageName}}.{{apis}}.config;
+package {{packageName}}.{{lowerCase api.codeName}}.config;
 
 import cn.ibizlab.util.security.AuthenticationEntryPoint;
 import cn.ibizlab.util.security.AuthorizationTokenFilter;
@@ -22,7 +22,7 @@ import org.springframework.security.web.authentication.UsernamePasswordAuthentic
 import org.springframework.context.annotation.Profile;
 import org.springframework.beans.factory.annotation.Qualifier;
 
-@Profile("{{apis}}-prod")
+@Profile("{{lowerCase api.codeName}}-prod")
 @Configuration
 @EnableWebSecurity
 @EnableGlobalMethodSecurity(prePostEnabled = true)

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

-package {{packageName}}.{{apis}}.config;
+package {{packageName}}.{{lowerCase api.codeName}}.config;
 
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import lombok.Data;
 
-@ConfigurationProperties(prefix = "service.{{apis}}")
+@ConfigurationProperties(prefix = "service.{{lowerCase api.codeName}}")
 @Data
 public class {{api.codeName}}ServiceProperties {
 

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

 {{#unless apiEntity.subSysDE}}
-package {{packageName}}.{{apis}}.dto;
+package {{packageName}}.{{lowerCase apiEntity.api.codeName}}.dto;
 
 import java.sql.Timestamp;
 import java.util.ArrayList;

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

 {{#unless apiEntity.subSysDE}}
-package {{packageName}}.{{apis}}.mapping;
+package {{packageName}}.{{lowerCase apiEntity.api.codeName}}.mapping;
 
 {{#with apiEntity.entity as | entity | }}
 import org.mapstruct.*;
 import {{packageName}}.core.{{entity.module}}.domain.{{entity.codeName}};
-import {{packageName}}.{{apis}}.dto.{{apiEntity.codeName}}DTO;
+import {{packageName}}.{{lowerCase apiEntity.api.codeName}}.dto.{{apiEntity.codeName}}DTO;
 import cn.ibizlab.util.domain.MappingBase;
 
 @Mapper(componentModel = "spring", uses = {}, implementationName = "{{api.codeName}}{{apiEntity.codeName}}Mapping",

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

 {{#if apiEntity.major}}
     {{#neq apiEntity.entity.storage "NONE"}}
-package {{packageName}}.{{apis}}.rest;
+package {{packageName}}.{{lowerCase apiEntity.api.codeName}}.rest;
 
 import java.sql.Timestamp;
 import java.util.ArrayList;
@@ -29,8 +29,8 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiResponse;
 import io.swagger.annotations.ApiResponses;
-import {{packageName}}.{{apis}}.dto.*;
-import {{packageName}}.{{apis}}.mapping.*;
+import {{packageName}}.{{lowerCase apiEntity.api.codeName}}.dto.*;
+import {{packageName}}.{{lowerCase apiEntity.api.codeName}}.mapping.*;
 import {{packageName}}.core.{{apiEntity.entity.module}}.domain.{{apiEntity.entity.codeName}};
 import {{packageName}}.core.{{apiEntity.entity.module}}.service.I{{apiEntity.entity.codeName}}Service;
 import {{packageName}}.core.{{apiEntity.entity.module}}.filter.{{apiEntity.entity.codeName}}SearchContext;
@@ -38,7 +38,7 @@ import cn.ibizlab.util.annotation.VersionCheck;
 
 @Slf4j
 @Api(tags = {"{{apiEntity.entity.logicName}}" })
-@RestController("{{apis}}-{{lowerCase apiEntity.codeName}}")
+@RestController("{{lowerCase apiEntity.api.codeName}}-{{lowerCase apiEntity.codeName}}")
 @RequestMapping("")
 public class {{apiEntity.codeName}}Resource {
 

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

-package {{packageName}}.{{apis}};
+package {{packageName}}.{{lowerCase api.codeName}};
 
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.boot.SpringApplication;

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

-package {{packageName}}.{{apis}};
+package {{packageName}}.{{lowerCase api.codeName}};
 
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.boot.builder.SpringApplicationBuilder;