ibiz4j 部署微服务接口

config.xml

@@ -37,11 +37,11 @@
 	  git clone -b master $para2 ibzlite/
       export NODE_OPTIONS=--max-old-space-size=4096
       cd ibzlite/
-      mvn clean package -Pweb
-      cd ibzlite-app/ibzlite-app-web
-      mvn -Pweb docker:build
-      mvn -Pweb docker:push
-      docker -H $para1 stack deploy --compose-file=src/main/docker/ibzlite-app-web.yaml ibzlab-rt --with-registry-auth
+      mvn clean package -Papi
+      cd ibzlite-provider/ibzlite-provider-api
+      mvn -Papi docker:build
+      mvn -Papi docker:push
+      docker -H $para1 stack deploy --compose-file=src/main/docker/ibzlite-provider-api.yaml ibzlab-rt --with-registry-auth      
       </command>
     </hudson.tasks.Shell>
   </builders>

ibzlite-app/ibzlite-app-web/src/main/docker/Dockerfile

@@ -12,6 +12,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
     sleep ${IBIZ_SLEEP} && \
     java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ibzlite-app-web.jar
 
-EXPOSE 30010
+EXPOSE 8080
 
 ADD ibzlite-app-web.jar /ibzlite-app-web.jar

ibzlite-app/ibzlite-app-web/src/main/docker/ibzlite-app-web.yaml

@@ -3,22 +3,9 @@ services:
   ibzlite-app-web:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzlite-app-web:latest
     ports:
-      - "30010:30010"
+      - "8080:8080"
     networks:
       - agent_network
-    environment:
-      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.180.237
-      - SERVER_PORT=30010
-      - SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.102.211:8848
-      - SPRING_REDIS_HOST=172.16.100.243
-      - SPRING_REDIS_PORT=6379
-      - SPRING_REDIS_DATABASE=0
-      - SPRING_DATASOURCE_USERNAME=a_A_5d9d78509
-      - SPRING_DATASOURCE_PASSWORD=@6dEfb3@
-      - SPRING_DATASOURCE_URL=jdbc:mysql://172.16.180.232:3306/a_A_5d9d78509?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&allowMultiQueries=true
-      - SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
-      - SPRING_DATASOURCE_DEFAULTSCHEMA=a_A_5d9d78509
-      - NACOS=172.16.102.211:8848
     deploy:
       resources:
            limits:

ibzlite-core/src/main/java/cn/ibizlab/core/lite/service/impl/DstComponentServiceImpl.java

@@ -212,7 +212,9 @@ public class DstComponentServiceImpl extends ServiceImpl<DstComponentMapper, Dst
         if(!ObjectUtils.isEmpty(et.getEntityId())){
             cn.ibizlab.core.lite.domain.MetaEntity factEntity=et.getFactEntity();
             if(ObjectUtils.isEmpty(factEntity)){
-                cn.ibizlab.core.lite.domain.MetaEntity majorEntity=metaentityService.get(et.getEntityId());
+                cn.ibizlab.core.lite.domain.MetaEntity majorEntity=metaentityService.getById(et.getEntityId());
+                if(ObjectUtils.isEmpty(majorEntity))
+                    return;
                 et.setFactEntity(majorEntity);
                 factEntity=majorEntity;
             }

ibzlite-core/src/main/java/cn/ibizlab/core/lite/service/impl/DstViewServiceImpl.java

@@ -212,7 +212,9 @@ public class DstViewServiceImpl extends ServiceImpl<DstViewMapper, DstView> impl
         if(!ObjectUtils.isEmpty(et.getEntityId())){
             cn.ibizlab.core.lite.domain.MetaEntity factEntity=et.getFactEntity();
             if(ObjectUtils.isEmpty(factEntity)){
-                cn.ibizlab.core.lite.domain.MetaEntity majorEntity=metaentityService.get(et.getEntityId());
+                cn.ibizlab.core.lite.domain.MetaEntity majorEntity=metaentityService.getById(et.getEntityId());
+                if(ObjectUtils.isEmpty(majorEntity))
+                    return;
                 et.setFactEntity(majorEntity);
                 factEntity=majorEntity;
             }

ibzlite-core/src/main/java/cn/ibizlab/core/lite/service/impl/MetaDataSetServiceImpl.java

@@ -221,7 +221,9 @@ public class MetaDataSetServiceImpl extends ServiceImpl<MetaDataSetMapper, MetaD
         if(!ObjectUtils.isEmpty(et.getEntityId())){
             cn.ibizlab.core.lite.domain.MetaEntity entity=et.getEntity();
             if(ObjectUtils.isEmpty(entity)){
-                cn.ibizlab.core.lite.domain.MetaEntity majorEntity=metaentityService.get(et.getEntityId());
+                cn.ibizlab.core.lite.domain.MetaEntity majorEntity=metaentityService.getById(et.getEntityId());
+                if(ObjectUtils.isEmpty(majorEntity))
+                    return;
                 et.setEntity(majorEntity);
                 entity=majorEntity;
             }

ibzlite-core/src/main/java/cn/ibizlab/core/lite/service/impl/MetaEntityServiceImpl.java

@@ -233,7 +233,9 @@ public class MetaEntityServiceImpl extends ServiceImpl<MetaEntityMapper, MetaEnt
         if(!ObjectUtils.isEmpty(et.getDsId())){
             cn.ibizlab.core.lite.domain.DstDataSource dataSource=et.getDataSource();
             if(ObjectUtils.isEmpty(dataSource)){
-                cn.ibizlab.core.lite.domain.DstDataSource majorEntity=dstdatasourceService.get(et.getDsId());
+                cn.ibizlab.core.lite.domain.DstDataSource majorEntity=dstdatasourceService.getById(et.getDsId());
+                if(ObjectUtils.isEmpty(majorEntity))
+                    return;
                 et.setDataSource(majorEntity);
                 dataSource=majorEntity;
             }
@@ -243,7 +245,9 @@ public class MetaEntityServiceImpl extends ServiceImpl<MetaEntityMapper, MetaEnt
         if(!ObjectUtils.isEmpty(et.getSystemId())){
             cn.ibizlab.core.lite.domain.DstSystem system=et.getSystem();
             if(ObjectUtils.isEmpty(system)){
-                cn.ibizlab.core.lite.domain.DstSystem majorEntity=dstsystemService.get(et.getSystemId());
+                cn.ibizlab.core.lite.domain.DstSystem majorEntity=dstsystemService.getById(et.getSystemId());
+                if(ObjectUtils.isEmpty(majorEntity))
+                    return;
                 et.setSystem(majorEntity);
                 system=majorEntity;
             }

ibzlite-core/src/main/java/cn/ibizlab/core/lite/service/impl/MetaFieldServiceImpl.java

@@ -246,7 +246,9 @@ public class MetaFieldServiceImpl extends ServiceImpl<MetaFieldMapper, MetaField
         if(!ObjectUtils.isEmpty(et.getEntityId())){
             cn.ibizlab.core.lite.domain.MetaEntity entity=et.getEntity();
             if(ObjectUtils.isEmpty(entity)){
-                cn.ibizlab.core.lite.domain.MetaEntity majorEntity=metaentityService.get(et.getEntityId());
+                cn.ibizlab.core.lite.domain.MetaEntity majorEntity=metaentityService.getById(et.getEntityId());
+                if(ObjectUtils.isEmpty(majorEntity))
+                    return;
                 et.setEntity(majorEntity);
                 entity=majorEntity;
             }
@@ -258,7 +260,9 @@ public class MetaFieldServiceImpl extends ServiceImpl<MetaFieldMapper, MetaField
         if(!ObjectUtils.isEmpty(et.getRefFieldId())){
             cn.ibizlab.core.lite.domain.MetaField reffield=et.getReffield();
             if(ObjectUtils.isEmpty(reffield)){
-                cn.ibizlab.core.lite.domain.MetaField majorEntity=metafieldService.get(et.getRefFieldId());
+                cn.ibizlab.core.lite.domain.MetaField majorEntity=metafieldService.getById(et.getRefFieldId());
+                if(ObjectUtils.isEmpty(majorEntity))
+                    return;
                 et.setReffield(majorEntity);
                 reffield=majorEntity;
             }
@@ -268,7 +272,9 @@ public class MetaFieldServiceImpl extends ServiceImpl<MetaFieldMapper, MetaField
         if(!ObjectUtils.isEmpty(et.getRelationId())){
             cn.ibizlab.core.lite.domain.MetaRelationship relation=et.getRelation();
             if(ObjectUtils.isEmpty(relation)){
-                cn.ibizlab.core.lite.domain.MetaRelationship majorEntity=metarelationshipService.get(et.getRelationId());
+                cn.ibizlab.core.lite.domain.MetaRelationship majorEntity=metarelationshipService.getById(et.getRelationId());
+                if(ObjectUtils.isEmpty(majorEntity))
+                    return;
                 et.setRelation(majorEntity);
                 relation=majorEntity;
             }

ibzlite-core/src/main/java/cn/ibizlab/core/lite/service/impl/MetaRelationshipServiceImpl.java

@@ -263,7 +263,9 @@ public class MetaRelationshipServiceImpl extends ServiceImpl<MetaRelationshipMap
         if(!ObjectUtils.isEmpty(et.getEntityId())){
             cn.ibizlab.core.lite.domain.MetaEntity entity=et.getEntity();
             if(ObjectUtils.isEmpty(entity)){
-                cn.ibizlab.core.lite.domain.MetaEntity majorEntity=metaentityService.get(et.getEntityId());
+                cn.ibizlab.core.lite.domain.MetaEntity majorEntity=metaentityService.getById(et.getEntityId());
+                if(ObjectUtils.isEmpty(majorEntity))
+                    return;
                 et.setEntity(majorEntity);
                 entity=majorEntity;
             }
@@ -274,7 +276,9 @@ public class MetaRelationshipServiceImpl extends ServiceImpl<MetaRelationshipMap
         if(!ObjectUtils.isEmpty(et.getRefEntityId())){
             cn.ibizlab.core.lite.domain.MetaEntity reference=et.getReference();
             if(ObjectUtils.isEmpty(reference)){
-                cn.ibizlab.core.lite.domain.MetaEntity majorEntity=metaentityService.get(et.getRefEntityId());
+                cn.ibizlab.core.lite.domain.MetaEntity majorEntity=metaentityService.getById(et.getRefEntityId());
+                if(ObjectUtils.isEmpty(majorEntity))
+                    return;
                 et.setReference(majorEntity);
                 reference=majorEntity;
             }

ibzlite-provider/ibzlite-provider-api/src/main/docker/Dockerfile

@@ -12,6 +12,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
     sleep ${IBIZ_SLEEP} && \
     java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ibzlite-provider-api.jar
 
-EXPOSE 8081
+EXPOSE 40010
 
 ADD ibzlite-provider-api.jar /ibzlite-provider-api.jar

ibzlite-provider/ibzlite-provider-api/src/main/docker/ibzlite-provider-api.yaml

@@ -3,9 +3,22 @@ services:
   ibzlite-provider-api:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzlite-provider-api:latest
     ports:
-      - "8081:8081"
+      - "40010:40010"
     networks:
       - agent_network
+    environment:
+      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.180.237
+      - SERVER_PORT=40010
+      - SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.102.211:8848
+      - SPRING_REDIS_HOST=172.16.100.243
+      - SPRING_REDIS_PORT=6379
+      - SPRING_REDIS_DATABASE=0
+      - SPRING_DATASOURCE_USERNAME=a_A_5d9d78509
+      - SPRING_DATASOURCE_PASSWORD=@6dEfb3@
+      - SPRING_DATASOURCE_URL=jdbc:mysql://172.16.180.232:3306/a_A_5d9d78509?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&allowMultiQueries=true
+      - SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
+      - SPRING_DATASOURCE_DEFAULTSCHEMA=a_A_5d9d78509
+      - NACOS=172.16.102.211:8848
     deploy:
       resources:
            limits:

ibzlite-util/src/main/java/cn/ibizlab/util/client/IBZLiteFeignClient.java

@@ -12,6 +12,6 @@ public interface IBZLiteFeignClient
 	 * @param system 系统模型信息
 	 * @return
 	 */
-	@PostMapping("/dstsystems/save")
+	@PostMapping("/lite/syncsysmodel")
 	Boolean syncSysModel(@RequestBody JSONObject system);
 }

ibzlite-util/src/main/java/cn/ibizlab/util/job/PermissionSyncJob.java

@@ -65,12 +65,7 @@ public class PermissionSyncJob implements ApplicationRunner {
         try {
             InputStream sysModel= this.getClass().getResourceAsStream("/sysmodel/ibzlite.json"); //获取当前系统所有实体资源能力
             String strSysModel = IOUtils.toString(sysModel,"UTF-8");
-            JSONObject system= new JSONObject();
-            system.put("pssystemid",systemId);
-            system.put("pssystemname",systemName);
-            system.put("sysstructure",JSONObject.parseObject(strSysModel));
-            system.put("md5check",DigestUtils.md5DigestAsHex(strSysModel.getBytes()));
-            if(liteFeignClient.syncSysModel(system)){
+            if(liteFeignClient.syncSysModel(JSONObject.parseObject(strSysModel))){
                 log.info("向[lite]同步系统模型成功");
             }else{
                 log.error("向[lite]同步系统模型失败");