版本升级

modules/ibizlab-generator-core/src/main/java/cn/ibizlab/codegen/model/EntityModel.java

@@ -219,8 +219,23 @@ public class EntityModel  extends BaseModel {
         return lastModifyField;
     }
 
+    private FieldModel orgField;
+
+
+    public FieldModel getOrgField() {
+        if(fields!=null&&orgField==null)
+            for(FieldModel fieldModel:fields)
+                if(fieldModel.isOrgField())
+                {
+                    orgField=fieldModel;
+                    return orgField;
+                }
+        return orgField;
+    }
+
+
+
 
-    
     public boolean isLogicValid()
     {
         return getDataEntity().isLogicValid();

modules/ibizlab-generator-core/src/main/java/cn/ibizlab/codegen/model/FieldModel.java

@@ -186,6 +186,11 @@ public class FieldModel extends BaseModel {
         return "CREATEDATE".equals(this.getDataEntityField().getPredefinedType())||"CREATEMAN".equals(this.getDataEntityField().getPredefinedType());
     }
 
+    public boolean isOrgField()
+    {
+        return "ORGID".equals(this.getDataEntityField().getPredefinedType());
+    }
+
     public boolean isUnionKeyField()
     {
         return !StringUtils.isEmpty(this.getDataEntityField().getUnionKeyValue());

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

@@ -2,4 +2,4 @@ spring:
   profiles:
     include: nacos, {{lowerCase app.codeName}}-prod
   application:
-    name: {{projectName}}-{{lowerCase app.codeName}}
+    name: {{lowerCase system.codeName}}-{{lowerCase app.codeName}}

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

@@ -2,6 +2,6 @@ spring:
   profiles:
     include: sys , nacos ,{{#each system.apps}} {{lowerCase codeName}}-dev ,{{/each}}{{#each system.apis}} {{lowerCase codeName}}-dev ,{{/each}} dev
   application:
-    name: {{projectName}}
+    name: {{lowerCase system.codeName}}
   main:
     allow-bean-definition-overriding: true
\ No newline at end of file

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

@@ -2,4 +2,4 @@ spring:
   profiles:
     include: sys ,nacos, {{lowerCase api.codeName}}-prod
   application:
-    name: {{projectName}}-{{lowerCase api.codeName}}
+    name: {{lowerCase system.codeName}}-{{lowerCase api.codeName}}