Merge remote-tracking branch 'origin/master'

ibzdisk-boot/src/main/resources/application-dev.yml

@@ -52,5 +52,9 @@ zuul:
         path: /sysdepartments/**
         serviceId: ${ibiz.ref.service.ou:ibzou-api}
         stripPrefix: false
+      lite-core:
+        path: /lite/**
+        serviceId: ${ibiz.ref.service.lite:ibzlite-api}
+        stripPrefix: false
   sensitive-headers:
     - Cookie,Set-Cookie,Authorization

ibzdisk-core/src/main/java/cn/ibizlab/core/util/config/MybatisConfiguration.java

@@ -48,6 +48,7 @@ public class MybatisConfiguration {
         // paginationInterceptor.setOverflow(false);
         // 设置最大单页限制数量，默认 500 条，-1 不受限制
         paginationInterceptor.setLimit(-1);
+
         // 开启 count 的 join 优化,只针对部分 left join
         paginationInterceptor.setCountSqlParser(new JsqlParserCountOptimize(true));
         return paginationInterceptor;

ibzdisk-core/src/main/resources/sysmodel/ibzdisk.json

@@ -4,298 +4,201 @@
     "entities":[
     {
     "entity_name":"SD_FILE",
-    "logicname":"文件",
+    "logic_name":"文件",
     "code_name":"SDFile",
     "table_name":"IBZFILE",
     "system_id":"ibzdisk",
     "system_name":"ibzdisk",
-    "ds_id":null,
-    "ds_name":"",
     "fields":[
     {
     "fieldname":"FILEID" ,
     "codename":"Id",
     "field_logic_name":"标识",
     "entity_name":"SDFile",
-    "ref_field_name":"",
-    "relation_name":"",
-    "field_type":"String",
-    "dict":"",
+    "field_type":"TEXT",
     "nullable":1,
     "physical_field":1,
     "data_type":"VARCHAR",
     "data_length":100,
-    "data_preci":0,
-    "expression":"",
-    "predefined":"",
     "key_field":1,
-    "major_field":0,
-    "union_key":""
+    "major_field":0
     },
     {
     "fieldname":"FILENAME" ,
     "codename":"Name",
     "field_logic_name":"名称",
     "entity_name":"SDFile",
-    "ref_field_name":"",
-    "relation_name":"",
-    "field_type":"String",
-    "dict":"",
+    "field_type":"TEXT",
     "nullable":1,
     "physical_field":1,
     "data_type":"VARCHAR",
     "data_length":200,
-    "data_preci":0,
-    "expression":"",
-    "predefined":"",
     "key_field":0,
-    "major_field":1,
-    "union_key":""
+    "major_field":1
     },
     {
     "fieldname":"FILEPATH" ,
     "codename":"File_path",
     "field_logic_name":"路径",
     "entity_name":"SDFile",
-    "ref_field_name":"",
-    "relation_name":"",
-    "field_type":"String",
-    "dict":"",
+    "field_type":"TEXT",
     "nullable":1,
     "physical_field":1,
     "data_type":"VARCHAR",
     "data_length":500,
-    "data_preci":0,
-    "expression":"",
-    "predefined":"",
     "key_field":0,
-    "major_field":0,
-    "union_key":""
+    "major_field":0
     },
     {
     "fieldname":"FOLDER" ,
     "codename":"Folder",
     "field_logic_name":"特定目录",
     "entity_name":"SDFile",
-    "ref_field_name":"",
-    "relation_name":"",
-    "field_type":"String",
-    "dict":"",
+    "field_type":"TEXT",
     "nullable":1,
     "physical_field":1,
     "data_type":"VARCHAR",
     "data_length":40,
-    "data_preci":0,
-    "expression":"",
-    "predefined":"",
     "key_field":0,
-    "major_field":0,
-    "union_key":""
+    "major_field":0
     },
     {
     "fieldname":"FILESIZE" ,
     "codename":"File_size",
     "field_logic_name":"文件大小",
     "entity_name":"SDFile",
-    "ref_field_name":"",
-    "relation_name":"",
-    "field_type":"Integer",
-    "dict":"",
+    "field_type":"INT",
     "nullable":1,
     "physical_field":1,
     "data_type":"INT",
-    "data_length":null,
-    "data_preci":0,
-    "expression":"",
-    "predefined":"",
     "key_field":0,
-    "major_field":0,
-    "union_key":""
+    "major_field":0
     },
     {
     "fieldname":"FILEEXT" ,
     "codename":"Extension",
     "field_logic_name":"扩展名",
     "entity_name":"SDFile",
-    "ref_field_name":"",
-    "relation_name":"",
-    "field_type":"String",
-    "dict":"",
+    "field_type":"TEXT",
     "nullable":1,
     "physical_field":1,
     "data_type":"VARCHAR",
     "data_length":20,
-    "data_preci":0,
-    "expression":"",
-    "predefined":"",
     "key_field":0,
-    "major_field":0,
-    "union_key":""
+    "major_field":0
     },
     {
     "fieldname":"OWNERTYPE" ,
     "codename":"Owner_type",
     "field_logic_name":"所属类型",
     "entity_name":"SDFile",
-    "ref_field_name":"",
-    "relation_name":"",
-    "field_type":"String",
-    "dict":"",
+    "field_type":"TEXT",
     "nullable":1,
     "physical_field":1,
     "data_type":"VARCHAR",
     "data_length":100,
-    "data_preci":0,
-    "expression":"",
-    "predefined":"",
     "key_field":0,
-    "major_field":0,
-    "union_key":""
+    "major_field":0
     },
     {
     "fieldname":"OWNERID" ,
     "codename":"Owner_id",
     "field_logic_name":"所属主体",
     "entity_name":"SDFile",
-    "ref_field_name":"",
-    "relation_name":"",
-    "field_type":"String",
-    "dict":"",
+    "field_type":"TEXT",
     "nullable":1,
     "physical_field":1,
     "data_type":"VARCHAR",
     "data_length":100,
-    "data_preci":0,
-    "expression":"",
-    "predefined":"",
     "key_field":0,
-    "major_field":0,
-    "union_key":""
+    "major_field":0
     },
     {
     "fieldname":"MEMO" ,
     "codename":"Memo",
     "field_logic_name":"备注",
     "entity_name":"SDFile",
-    "ref_field_name":"",
-    "relation_name":"",
-    "field_type":"String",
-    "dict":"",
+    "field_type":"TEXT",
     "nullable":1,
     "physical_field":1,
     "data_type":"VARCHAR",
     "data_length":500,
-    "data_preci":0,
-    "expression":"",
-    "predefined":"",
     "key_field":0,
-    "major_field":0,
-    "union_key":""
+    "major_field":0
     },
     {
     "fieldname":"DIGESTCODE" ,
     "codename":"Digest_code",
     "field_logic_name":"签名",
     "entity_name":"SDFile",
-    "ref_field_name":"",
-    "relation_name":"",
-    "field_type":"String",
-    "dict":"",
+    "field_type":"TEXT",
     "nullable":1,
     "physical_field":1,
     "data_type":"VARCHAR",
     "data_length":64,
-    "data_preci":0,
-    "expression":"",
-    "predefined":"",
     "key_field":0,
-    "major_field":0,
-    "union_key":""
+    "major_field":0
     },
     {
     "fieldname":"CREATEMAN" ,
     "codename":"CreateMan",
     "field_logic_name":"创建人",
     "entity_name":"SDFile",
-    "ref_field_name":"",
-    "relation_name":"",
-    "field_type":"String",
+    "field_type":"TEXT",
     "dict":"SysOperator",
     "nullable":1,
     "physical_field":1,
     "data_type":"VARCHAR",
     "data_length":100,
-    "data_preci":0,
-    "expression":"",
     "predefined":"CREATEMAN",
     "key_field":0,
-    "major_field":0,
-    "union_key":""
+    "major_field":0
     },
     {
     "fieldname":"CREATEDATE" ,
     "codename":"CreateDate",
     "field_logic_name":"创建日期",
     "entity_name":"SDFile",
-    "ref_field_name":"",
-    "relation_name":"",
-    "field_type":"Timestamp",
-    "dict":"",
+    "field_type":"DATETIME",
     "nullable":1,
     "physical_field":1,
     "data_type":"DATETIME",
-    "data_length":null,
-    "data_preci":0,
-    "expression":"",
     "predefined":"CREATEDATE",
     "key_field":0,
-    "major_field":0,
-    "union_key":""
+    "major_field":0
     },
     {
     "fieldname":"UPDATEMAN" ,
     "codename":"UpdateMan",
     "field_logic_name":"更新人",
     "entity_name":"SDFile",
-    "ref_field_name":"",
-    "relation_name":"",
-    "field_type":"String",
+    "field_type":"TEXT",
     "dict":"SysOperator",
     "nullable":1,
     "physical_field":1,
     "data_type":"VARCHAR",
     "data_length":100,
-    "data_preci":0,
-    "expression":"",
     "predefined":"UPDATEMAN",
     "key_field":0,
-    "major_field":0,
-    "union_key":""
+    "major_field":0
     },
     {
     "fieldname":"UPDATEDATE" ,
     "codename":"UpdateDate",
     "field_logic_name":"更新时间",
     "entity_name":"SDFile",
-    "ref_field_name":"",
-    "relation_name":"",
-    "field_type":"Timestamp",
-    "dict":"",
+    "field_type":"DATETIME",
     "nullable":1,
     "physical_field":1,
     "data_type":"DATETIME",
-    "data_length":null,
-    "data_preci":0,
-    "expression":"",
     "predefined":"UPDATEDATE",
     "key_field":0,
-    "major_field":0,
-    "union_key":""
+    "major_field":0
     }
     ],
-    "parentEntitys":[
-    ],
     "subEntitys":[
+    ],
+    "parentEntitys":[
     ]
  }
     

ibzdisk-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);
 }

ibzdisk-util/src/main/java/cn/ibizlab/util/filter/SearchContextBase.java

@@ -149,6 +149,7 @@ public class SearchContextBase implements ISearchContext{
      * 获取用户上下文
      * @return
      */
+    @JsonIgnore
     public Map<String,Object> getSessioncontext() {
         return AuthenticationUser.getAuthenticationUser().getSessionParams();
     }

ibzdisk-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/ibzdisk.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]同步系统模型失败");