修复

code/app_sample/src/ibiz-core/interface/common/i-view-detail.ts

-/**
- * 视图对象参数
- *
- * @export
- * @interface ViewDetail
- */
-export interface ViewDetail {
-
-    /**
-     * 视图名称
-     *
-     * @type {string}
-     * @memberof ViewDetail
-     */
-    name: string;
-
-    /**
-     * 代码名称
-     *
-     * @type {string}
-     * @memberof ViewDetail
-     */
-    codeName: string;
-
-    /**
-     * 视图宽度
-     *
-     * @type {number}
-     * @memberof ViewDetail
-     */
-    width?: number;
-
-    /**
-     * 视图高度
-     *
-     * @type {number}
-     * @memberof ViewDetail
-     */
-    height?: number;
-
-    /**
-     * 视图标题
-     *
-     * @type {string}
-     * @memberof ViewDetail
-     */
-    title?: string;
-
-    /**
-     * 打开方式
-     *
-     * @type {string}
-     * @memberof ViewDetail
-     */
-    openMode?: 'INDEXViewDetailTAB' | 'POPUPAPP' | 'POPUPMODAL' | 'DRAWER' | 'POPOVER' | string;
-
-    /**
-     * 重定向视图
-     *
-     * @type {boolean}
-     * @memberof ViewDetail
-     */
-     redirectView?: boolean;
-
-    /**
-     * 关系路径
-     *
-     * @type {[]}
-     * @memberof ViewDetail
-     */
-    deResPaths?: [];
-
-    /**
-     * 标题
-     *
-     * @type {string}
-     * @memberof ViewDetail
-     */
-    caption?: string;
-
-    /**
-     * 视图类型
-     *
-     * @type {string}
-     * @memberof ViewDetail
-     */
-    ViewDetailType?: string;
-
-    /**
-     * 文件路径
-     *
-     * @type {string}
-     * @memberof ViewDetail
-     */
-    fileDir?: string;
-}
\ No newline at end of file

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

@@ -117,16 +117,28 @@ public class AppEntityModel extends BaseModel{
         return app.getSystem().getEntity(getAppDataEntity().getPSDataEntity().getCodeName());
     }
 
+    private String serviceId;
+
     public String getServiceId()
+    {
+        if(serviceId==null)
         {
             String sybSysServiceType="DEFAULT";
             if(getEntity().getDataEntity().getPSSubSysServiceAPI()!=null)
                 sybSysServiceType=getEntity().getDataEntity().getPSSubSysServiceAPI().getServiceType();
             if(getEntity().getDataEntity().getStorageMode()==4 && (!"MIDDLEPLATFORM".equals(sybSysServiceType)) && (!"MASA".equals(sybSysServiceType)))
-            return getEntity().getDataEntity().getPSSubSysServiceAPI().getServiceCodeName();
+                serviceId = getEntity().getDataEntity().getPSSubSysServiceAPI().getServiceCodeName();
             else if (getAppDataEntity().getPSSysServiceAPI()!=null)
-            return app.getSystem().getProjectName()+"-"+ getAppDataEntity().getPSSysServiceAPI().getCodeName().toLowerCase();
-        else
+                serviceId = app.getSystem().getProjectName()+"-"+ getAppDataEntity().getPSSysServiceAPI().getCodeName().toLowerCase();
+        }
+        return serviceId;
+    }
+
+    public String getRefServiceId() {
+        if (getServiceId() != null)
+        {
+            return "${ibiz.ref.service."+serviceId+":"+serviceId+"}";
+        }
         return null;
     }
 

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

@@ -7,6 +7,7 @@ import lombok.NoArgsConstructor;
 import lombok.Setter;
 import lombok.experimental.Accessors;
 import net.ibizsys.model.app.IPSApplication;
+import org.springframework.util.StringUtils;
 
 import java.util.*;
 
@@ -123,4 +124,23 @@ public class AppModel extends BaseModel{
         return new ArrayList<>();
     }
 
+    private Set<String> refServiceIds;
+
+    public Set<String> getRefServiceIds()
+    {
+        if(refServiceIds==null)
+        {
+            refServiceIds=new HashSet<>();
+            getAppEntities().forEach(appEntityModel -> {
+                String serviceId=appEntityModel.getServiceId();
+                if(!StringUtils.isEmpty(serviceId))
+                {
+                    refServiceIds.add(serviceId);
+                }
+            });
+        }
+        return refServiceIds;
+
+    }
+
 }

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

+#eureka配置中心
+spring:
+  cloud:
+    nacos:
+      discovery:
+        enabled: false
+
+eureka:
+  client:
+    enabled: true
+    serviceUrl:
+      defaultZone: http://127.0.0.1:8762/eureka/
\ No newline at end of file

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

+#nacos配置中心
+spring:
+  cloud:
+    nacos:
+      discovery:
+        server-addr: 172.16.100.77:8848
+        enabled: true
+
+eureka:
+  client:
+    enabled: false
\ No newline at end of file

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

@@ -52,6 +52,7 @@ ribbon:
 #缓存级别：无缓存(无配置项)、一级缓存(L1)、二级缓存(L2)
 ibiz:
   systemid: {{system.codeName}}
+  systemname: {{system.logicName}}
   enablePermissionValid: true
   cacheLevel: L1 #(L1)一级本地caffeine缓存;(L2)caffeine缓存+Redis缓存
 
@@ -134,7 +135,7 @@ zuul:
     {{#serviceId}}
     {{lowerCase app.codeName}}-{{lowerCase codeName}}:
       path: /{{pluralize codeName}}/**
-      serviceId: ${ ibiz.ref.service.{{serviceId}}:{{serviceId}} }
+      serviceId: {{refServiceId}}
       stripPrefix: false
     {{/serviceId}}
   {{/each}}

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

@@ -14,6 +14,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Component;
 import org.springframework.util.ObjectUtils;
+import org.springframework.util.StringUtils;
 import org.springframework.util.DigestUtils;
 import java.io.InputStream;
 import java.util.*;
@@ -26,10 +27,10 @@ import java.util.*;
 @ConditionalOnProperty( name = "ibiz.enablePermissionValid", havingValue = "true")
 public class PermissionSyncJob implements ApplicationRunner {
 
-    @Value("${ ibiz.systemid:{{system.getCodeName}} }")
+    @Value("${ibiz.systemid}")
     private String systemId;
     
-    @Value("${ ibiz.systemname:{{system.getName}} }")
+    @Value("${ibiz.systemname}")
     private String systemName;
 
     @Autowired
@@ -67,8 +68,8 @@ public class PermissionSyncJob implements ApplicationRunner {
             if (!ObjectUtils.isEmpty(permission)) {
                 String strPermission = IOUtils.toString(permission, "UTF-8");
                 JSONObject system = new JSONObject();
-                system.put("pssystemid", systemId);
-                system.put("pssystemname", systemName);
+                system.put("pssystemid", StringUtils.isEmpty(systemId)?"{{system.codeName}}":systemId);
+                system.put("pssystemname", StringUtils.isEmpty(systemName)?"{{system.logicName}}":systemName);
                 system.put("sysstructure", JSONObject.parseObject(strPermission));
                 system.put("md5check", DigestUtils.md5DigestAsHex(strPermission.getBytes()));
                 if (uaaClient.syncSysAuthority(system)) {
@@ -82,7 +83,7 @@ public class PermissionSyncJob implements ApplicationRunner {
         }
 
         try {
-            InputStream model = this.getClass().getResourceAsStream("/sysmodel/${sys.codeName}.json"); //系统模型
+            InputStream model = this.getClass().getResourceAsStream("/sysmodel/{{system.codeName}}.json"); //系统模型
             if (!ObjectUtils.isEmpty(model)) {
                 String strModel = IOUtils.toString(model, "UTF-8");
                 if (liteClient.syncSysModel(JSONObject.parseObject(strModel))) {

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

@@ -187,6 +187,7 @@ ribbon:
 #缓存级别：无缓存(无配置项)、一级缓存(L1)、二级缓存(L2)
 ibiz:
   systemid: {{system.codeName}}
+  systemname: {{system.logicName}}
   enablePermissionValid: true
   cacheLevel: L1 #(L1)一级本地caffeine缓存;(L2)caffeine缓存+Redis缓存
 {{#eq system.saaSMode 4}}