ibiz4j 部署微服务接口

config.xml

@@ -37,6 +37,13 @@
 	  git clone -b master $para2 ibzou/
       export NODE_OPTIONS=--max-old-space-size=4096
       cd ibzou/
+      mvn clean package -Papi
+      echo 'echo "$para1"' > apppasswd.sh
+      chmod -R 777 *
+      setsid env SSH_ASKPASS='./apppasswd.sh' DISPLAY='none:0' ssh 172.16.180.237@172.16.180.237 "mkdir -p /6FA57A4B-AA77-4DA7-A2C6-E283F7285664"
+      setsid env SSH_ASKPASS='./apppasswd.sh' DISPLAY='none:0' scp -r ibzou-provider-api.jar 172.16.180.237@172.16.180.237:/6FA57A4B-AA77-4DA7-A2C6-E283F7285664
+      setsid env SSH_ASKPASS='./apppasswd.sh' DISPLAY='none:0' ssh 172.16.180.237@172.16.180.237 "ps -ef | grep '/6FA57A4B-AA77-4DA7-A2C6-E283F7285664'| tr -s ' '|cut -d' ' -f2,8,9  | grep -v grep | grep 'jar' | cut -d' ' -f1|xargs  --no-run-if-empty kill -9"
+      setsid env SSH_ASKPASS='./apppasswd.sh' DISPLAY='none:0' ssh 172.16.180.237@172.16.180.237 "source /etc/profile;source ~/.bash_profile; nohup java -jar -Xms512m -Xmx1024m -XX:PermSize=128M -XX:MaxPermSize=128m /6FA57A4B-AA77-4DA7-A2C6-E283F7285664/ibzou-provider-api.jar >>/6FA57A4B-AA77-4DA7-A2C6-E283F7285664/ibzou_apiibzou-`date --date='0 days ago' +%Y-%m-%d`.log 2>&1 &"
       </command>
     </hudson.tasks.Shell>
   </builders>

ibzou-app/ibzou-app-web/src/main/resources/application-web-prod.yml

 server:
-  port: 8080
+  port: 30001
 #Log配置
 logging:
   level:

ibzou-boot/src/main/docker/mysql.yml

+version: "3.2"
+services:
+    ibzou-mysql:
+    image: mysql:5.7.20
+    volumes:
+      - $PWD/../../../../volumes/mysql/:/var/lib/mysql/
+    networks:
+      - agent_network
+    environment:
+      - TZ=Asia/Shanghai
+      - MYSQL_ALLOW_EMPTY_PASSWORD=yes
+      - MYSQL_ROOT_PASSWORD=root
+      - MYSQL_DATABASE=a_A_5d9d78509
+    ports:
+      - 3306:3306
+    command: mysqld --lower_case_table_names=1 --skip-ssl --character_set_server=utf8 --explicit_defaults_for_timestamp
+networks:
+  agent_network:
+    attachable: true

ibzou-core/src/main/java/cn/ibizlab/core/ou/domain/SysDepartment.java

@@ -269,6 +269,18 @@ public class SysDepartment extends EntityMP implements Serializable {
     }
 
 
+    /**
+     * 复制当前对象数据到目标对象(粘贴重置)
+     * @param targetEntity 目标数据对象
+     * @param bIncEmpty  是否包括空值
+     * @param <T>
+     * @return
+     */
+    @Override
+    public <T> T copyTo(T targetEntity, boolean bIncEmpty) {
+        this.reset("deptid");
+        return super.copyTo(targetEntity,bIncEmpty);
+    }
 }
 
 

ibzou-core/src/main/java/cn/ibizlab/core/ou/domain/SysDeptMember.java

@@ -165,6 +165,18 @@ public class SysDeptMember extends EntityMP implements Serializable {
     }
 
 
+    /**
+     * 复制当前对象数据到目标对象(粘贴重置)
+     * @param targetEntity 目标数据对象
+     * @param bIncEmpty  是否包括空值
+     * @param <T>
+     * @return
+     */
+    @Override
+    public <T> T copyTo(T targetEntity, boolean bIncEmpty) {
+        this.reset("memberid");
+        return super.copyTo(targetEntity,bIncEmpty);
+    }
 }
 
 

ibzou-core/src/main/java/cn/ibizlab/core/ou/domain/SysEmployee.java

@@ -581,6 +581,18 @@ public class SysEmployee extends EntityMP implements Serializable {
     }
 
 
+    /**
+     * 复制当前对象数据到目标对象(粘贴重置)
+     * @param targetEntity 目标数据对象
+     * @param bIncEmpty  是否包括空值
+     * @param <T>
+     * @return
+     */
+    @Override
+    public <T> T copyTo(T targetEntity, boolean bIncEmpty) {
+        this.reset("userid");
+        return super.copyTo(targetEntity,bIncEmpty);
+    }
 }
 
 

ibzou-core/src/main/java/cn/ibizlab/core/ou/domain/SysOrganization.java

@@ -202,6 +202,18 @@ public class SysOrganization extends EntityMP implements Serializable {
     }
 
 
+    /**
+     * 复制当前对象数据到目标对象(粘贴重置)
+     * @param targetEntity 目标数据对象
+     * @param bIncEmpty  是否包括空值
+     * @param <T>
+     * @return
+     */
+    @Override
+    public <T> T copyTo(T targetEntity, boolean bIncEmpty) {
+        this.reset("orgid");
+        return super.copyTo(targetEntity,bIncEmpty);
+    }
 }
 
 

ibzou-core/src/main/java/cn/ibizlab/core/ou/domain/SysPost.java

@@ -113,6 +113,18 @@ public class SysPost extends EntityMP implements Serializable {
     }
 
 
+    /**
+     * 复制当前对象数据到目标对象(粘贴重置)
+     * @param targetEntity 目标数据对象
+     * @param bIncEmpty  是否包括空值
+     * @param <T>
+     * @return
+     */
+    @Override
+    public <T> T copyTo(T targetEntity, boolean bIncEmpty) {
+        this.reset("postid");
+        return super.copyTo(targetEntity,bIncEmpty);
+    }
 }
 
 

ibzou-core/src/main/java/cn/ibizlab/core/ou/domain/SysTeam.java

@@ -98,6 +98,18 @@ public class SysTeam extends EntityMP implements Serializable {
     }
 
 
+    /**
+     * 复制当前对象数据到目标对象(粘贴重置)
+     * @param targetEntity 目标数据对象
+     * @param bIncEmpty  是否包括空值
+     * @param <T>
+     * @return
+     */
+    @Override
+    public <T> T copyTo(T targetEntity, boolean bIncEmpty) {
+        this.reset("teamid");
+        return super.copyTo(targetEntity,bIncEmpty);
+    }
 }
 
 

ibzou-core/src/main/java/cn/ibizlab/core/ou/domain/SysTeamMember.java

@@ -174,6 +174,18 @@ public class SysTeamMember extends EntityMP implements Serializable {
             return DigestUtils.md5DigestAsHex(String.format("%s||%s" ,this.getTeamid(),this.getUserid()).getBytes());
         return null;
     }
+    /**
+     * 复制当前对象数据到目标对象(粘贴重置)
+     * @param targetEntity 目标数据对象
+     * @param bIncEmpty  是否包括空值
+     * @param <T>
+     * @return
+     */
+    @Override
+    public <T> T copyTo(T targetEntity, boolean bIncEmpty) {
+        this.reset("teammemberid");
+        return super.copyTo(targetEntity,bIncEmpty);
+    }
 }
 
 

ibzou-provider/ibzou-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 /ibzou-provider-api.jar
 
-EXPOSE 8081
+EXPOSE 40001
 
 ADD ibzou-provider-api.jar /ibzou-provider-api.jar

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

@@ -3,9 +3,22 @@ services:
   ibzou-provider-api:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzou-provider-api:latest
     ports:
-      - "8081:8081"
+      - "40001:40001"
     networks:
       - agent_network
+    environment:
+      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.180.237
+      - SERVER_PORT=40001
+      - 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:

ibzou-provider/ibzou-provider-api/src/main/resources/application-api-prod.yml

 server:
-  port: 8081
+  port: 40001
 #Log配置
 logging:
   level:

ibzou-util/src/main/java/cn/ibizlab/util/client/IBZLiteFallback.java

+package cn.ibizlab.util.client;
+
+import com.alibaba.fastjson.JSONObject;
+import org.springframework.stereotype.Component;
+
+@Component
+public class IBZLiteFallback implements IBZLiteFeignClient {
+
+	@Override
+	public Boolean syncSysModel(JSONObject system) {
+		return null;
+	}
+}

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

+package cn.ibizlab.util.client;
+
+import com.alibaba.fastjson.JSONObject;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+@FeignClient(value = "${ibiz.ref.service.lite:ibzlite-api}",contextId = "lite",fallback = IBZLiteFallback.class)
+public interface IBZLiteFeignClient
+{
+	/**
+	 * 同步系统资模型到lite
+	 * @param system 系统模型信息
+	 * @return
+	 */
+	@PostMapping("/dstsystems/save")
+	Boolean syncSysModel(@RequestBody JSONObject system);
+}

ibzou-util/src/main/java/cn/ibizlab/util/domain/EntityBase.java

@@ -9,7 +9,9 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
 import org.springframework.cglib.beans.BeanMap;
 import org.springframework.data.annotation.Transient;
 import org.springframework.util.AlternativeJdkIdGenerator;
+import org.springframework.util.ObjectUtils;
 import java.io.Serializable;
+import java.lang.reflect.Field;
 import org.springframework.util.StringUtils;
 import java.util.*;
 
@@ -96,4 +98,32 @@ public class EntityBase implements Serializable {
             this.extensionparams.put(field.toLowerCase(),value);
     }
 
+    /**
+    * 复制当前对象数据到目标对象
+    * @param targetEntity 目标数据对象
+    * @param bIncEmpty  是否包括空值
+    * @param <T>
+    * @return
+    */
+    public <T> T copyTo(T targetEntity, boolean bIncEmpty){
+        if(targetEntity instanceof EntityBase){
+            EntityBase target= (EntityBase) targetEntity;
+            Hashtable<String, Field> sourceFields=DEFieldCacheMap.getFieldMap(this.getClass());
+            for(String field : sourceFields.keySet()){
+                Object value=this.get(field);
+                if( !ObjectUtils.isEmpty(value) ||  ObjectUtils.isEmpty(value) &&  getFocusNull().contains(field) &&  bIncEmpty ){
+                    target.set(field,value);
+                }
+            }
+        }
+        return targetEntity;
+    }
+
+    /**
+    * 重置当前数据对象属性值
+    * @param field
+    */
+    public void reset(String field){
+
+    }
 }
\ No newline at end of file

ibzou-util/src/main/java/cn/ibizlab/util/domain/EntityClient.java

 package cn.ibizlab.util.domain;
 
+import org.springframework.util.StringUtils;
+
 public class EntityClient extends EntityBase {
 
     @Override
@@ -15,5 +17,14 @@ public class EntityClient extends EntityBase {
         }
     }
 
+    @Override
+    public void reset(String field) {
+        if(!StringUtils.isEmpty(field)){
+            String resetField=field.toLowerCase();
+            this.set(resetField,null);
+            this.getFocusNull().remove(resetField);
+            getExtensionparams().remove(resetField+"dirtyflag");
+        }
+    }
 }
 

ibzou-util/src/main/java/cn/ibizlab/util/domain/EntityMP.java

 package cn.ibizlab.util.domain;
 
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import org.springframework.util.StringUtils;
 
 public class EntityMP extends EntityBase {
 
@@ -24,5 +25,14 @@ public class EntityMP extends EntityBase {
             this.getFocusNull().remove(field.toLowerCase());
     }
 
+    @Override
+    public void reset(String field){
+        if(!StringUtils.isEmpty(field)){
+            String resetField=field.toLowerCase();
+            this.set(resetField,null);
+            getFocusNull().remove(resetField);
+        }
+    }
+
 }
 

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

 package cn.ibizlab.util.job;
 
 import cn.ibizlab.util.client.IBZUAAFeignClient;
+import cn.ibizlab.util.client.IBZLiteFeignClient;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.JSONArray;
 import lombok.extern.slf4j.Slf4j;
@@ -36,6 +37,10 @@ public class PermissionSyncJob implements ApplicationRunner {
 
 
 
+    @Autowired
+    @Lazy
+    IBZLiteFeignClient liteFeignClient;
+
     @Override
     public void run(ApplicationArguments args) {
         try {
@@ -57,6 +62,24 @@ public class PermissionSyncJob implements ApplicationRunner {
             log.error(String.format("向[UAA]同步系统资源失败，请检查[UAA]服务是否正常! [%s]",ex));
         }
 
+        try {
+            InputStream sysModel= this.getClass().getResourceAsStream("/sysmodel/ibzou.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)){
+                log.info("向[lite]同步系统模型成功");
+            }else{
+                log.error("向[lite]同步系统模型失败");
+            }
+        }
+        catch (Exception ex) {
+            log.error(String.format("向[lite]同步系统模型失败，请检查[lite]服务是否正常! [%s]",ex));
+        }
+
 
     }
 }
\ No newline at end of file

ibzou-util/src/main/resources/application-nacos.yml

@@ -3,7 +3,7 @@ spring:
   cloud:
     nacos:
       discovery:
-        server-addr: 127.0.0.1:8848
+        server-addr: 172.16.102.211:8848
         enabled: true
 
 eureka:

ibzou-util/src/main/resources/application-sys.yml

@@ -7,7 +7,7 @@ spring:
     caffeine:
       spec: initialCapacity=5,maximumSize=500,expireAfterWrite=3600s
   redis:
-    host: 127.0.0.1
+    host: 172.16.100.243
     port: 6379
     password:
     database: 0