repair

ibzlite-boot/src/main/java/cn/ibizlab/devsimul/DevNamingRegister.java

+package cn.ibizlab.devsimul;
+
+import com.alibaba.nacos.api.naming.NamingFactory;
+import com.alibaba.nacos.api.naming.NamingService;
+import com.alibaba.nacos.api.naming.pojo.Instance;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.ApplicationArguments;
+import org.springframework.boot.ApplicationRunner;
+import org.springframework.stereotype.Component;
+import org.springframework.util.StringUtils;
+
+import java.util.Properties;
+
+@Slf4j
+@Component
+public class DevNamingRegister implements ApplicationRunner {
+
+    @Value("${spring.cloud.nacos.discovery.server-addr:127.0.0.1:8848}")
+    private String serverAddr;
+
+    @Value("${spring.application.name:ibzlite}")
+    private String serviceName;
+
+    @Value("${server.port:8080}")
+    private Integer port;
+
+    @Value("${ibiz.ref.service.lite:ibzlite-api}")
+    private String liteapi;
+
+
+
+    @Value("${spring.cloud.nacos.discovery.group:DEFAULT_GROUP}")
+    private String group;
+
+
+    @Override
+    public void run(ApplicationArguments args) {
+        try {
+            Thread.sleep(10000);
+            Properties properties = new Properties();
+            properties.setProperty("serverAddr", serverAddr);
+
+            NamingService naming = NamingFactory.createNamingService(properties);
+
+            Instance instance = naming.selectOneHealthyInstance(serviceName,group);
+            if(instance!=null&&(!StringUtils.isEmpty(instance.getIp())))
+            {
+
+                naming.registerInstance(liteapi, group, instance);
+            }
+        }
+        catch (Exception ex) {
+            log.error(String.format("开发模式模拟微服务注册失败：",ex));
+        }
+    }
+}
\ No newline at end of file

ibzlite-boot/src/main/resources/application-boot.yml

@@ -8,7 +8,3 @@ spring:
     nacos:
       discovery:
         server-addr: 127.0.0.1:8848
-ibiz:
-  ref:
-    service:
-      lite: ibzlite
\ No newline at end of file

ibzlite-core/src/main/java/cn/ibizlab/core/lite/extensions/domain/SysModel.java

 package cn.ibizlab.core.lite.extensions.domain;
 
+import cn.ibizlab.core.lite.domain.MetaEntity;
 import cn.ibizlab.core.lite.domain.MetaField;
 import cn.ibizlab.core.lite.domain.MetaRelationship;
 import lombok.Data;
@@ -24,24 +25,44 @@ public class SysModel {
         Set<MetaField> fields=new HashSet<>();
         this.entities.forEach(entityNode->{
             List<MetaField> deField=entityNode.getFields();
+            MetaEntity metaEntity = new MetaEntity();
+            metaEntity.setSystemId(entityNode.getSystemId());
+            metaEntity.setEntityName(entityNode.getEntityName());
+            metaEntity.setCodeName(entityNode.getCodeName());
             if(!ObjectUtils.isEmpty(deField)){
-                deField.forEach(field->{
+
+                for(int i=0;i<deField.size();i++)
+                {
+                    MetaField field=deField.get(i);
+                    if(field.getShowOrder()==null)
+                        field.setShowOrder(1000+i);
                     String refDEId="";
                     String refFieldId="";
                     String curDEId=DigestUtils.md5DigestAsHex(String.format("%s||%s" ,systemid,entityNode.getEntityName()).getBytes());
                     Object refDEName=field.get("ref_de");
-                    Object refFieldName=field.getRefFieldName();
+                    String refFieldName=field.getRefFieldName();
                     Object relationCodeName=field.get("relation_codename");
+                    Object relationName=field.get("relation_name");
                     field.setEntityId(curDEId);
+                    field.setEntity(metaEntity);
                     if( !ObjectUtils.isEmpty(refDEName) && !ObjectUtils.isEmpty(refFieldName)){
                         refDEId=DigestUtils.md5DigestAsHex(String.format("%s||%s" ,systemid,refDEName).getBytes());
                         refFieldId=DigestUtils.md5DigestAsHex(String.format("%s||%s" ,refDEId,refFieldName).getBytes());
                         field.setRefFieldId(refFieldId);
+                        MetaField reffield = new MetaField();
+                        reffield.setFieldId(refFieldId);
+                        reffield.setFieldName(refFieldName);
+                        field.setReffield(reffield);
                     }
-                    if(!ObjectUtils.isEmpty(curDEId) && !ObjectUtils.isEmpty(refDEId) && !ObjectUtils.isEmpty(relationCodeName)){
+                    if(!ObjectUtils.isEmpty(curDEId) && !ObjectUtils.isEmpty(refDEId) && !ObjectUtils.isEmpty(relationCodeName)&& !ObjectUtils.isEmpty(relationName)){
                         field.setRelationId(DigestUtils.md5DigestAsHex(String.format("%s||%s||%s" ,refDEId,curDEId,relationCodeName).getBytes()));
+                        MetaRelationship ship=new MetaRelationship();
+                        ship.setName(relationName.toString());
+                        ship.setRefEntityName(refDEName.toString());
+                        ship.setCodeName(relationCodeName.toString());
+                        field.setRelation(ship);
                     }
-                });
+                }
                 fields.addAll(deField);
             }
             }

ibzlite-core/src/main/java/cn/ibizlab/core/lite/extensions/service/LiteCoreService.java

@@ -47,7 +47,7 @@ public class LiteCoreService {
 
     @Transactional
     public boolean syncSysModel(SysModel sysModel) {
-        //proxyService.asyncSysModel(sysModel);
+        proxyService.asyncSysModel(sysModel);
         return true;
     }
 

ibzlite-core/src/main/resources/liquibase/changelog/20200601200530_init_ibzcfg.xml

-<?xml version="1.1" encoding="UTF-8" standalone="no"?>
-<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.9.xsd">
-    <changeSet author="Think (generated)" id="1591012776347-1">
-        <createTable remarks="配置" tableName="IBZCFG">
-            <column name="CFGID" remarks="配置标识" type="VARCHAR(100)">
-                <constraints primaryKey="true"/>
-            </column>
-            <column name="SYSTEMID" remarks="系统标识" type="VARCHAR(100)"/>
-            <column name="CFGTYPE" remarks="配置类型" type="VARCHAR(100)"/>
-            <column name="TARGETTYPE" remarks="引用对象" type="VARCHAR(100)"/>
-            <column name="USERID" remarks="用户标识" type="VARCHAR(100)"/>
-            <column name="CFG" remarks="配置" type="MEDIUMTEXT"/>
-            <column name="UPDATEDATE" remarks="更新时间" type="datetime"/>
-        </createTable>
-    </changeSet>
-</databaseChangeLog>