Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
提交反馈
为 GitLab 提交贡献
登录
切换导航
I
ibzdst
项目
项目
详情
动态
版本
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
议题
1
议题
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
ibiz4jteam
ibzdst
提交
983ad469
提交
983ad469
编写于
1月 22, 2021
作者:
ibizdev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
yuefenglong 部署微服务接口 [ibz-dst,micorservice]
上级
863067e2
变更
14
隐藏空白字符变更
内嵌
并排
正在显示
14 个修改的文件
包含
90 行增加
和
37 行删除
+90
-37
config.xml
config.xml
+5
-0
h2_table.xml
ibzdst-core/src/main/resources/liquibase/h2_table.xml
+17
-17
DAMetricMapper.xml
...ain/resources/mapper/analysis/dametric/DAMetricMapper.xml
+3
-3
MetaFieldMapper.xml
.../main/resources/mapper/lite/metafield/MetaFieldMapper.xml
+3
-3
MetaRelationshipMapper.xml
...s/mapper/lite/metarelationship/MetaRelationshipMapper.xml
+3
-3
RuleItemMapper.xml
...rc/main/resources/mapper/rule/ruleitem/RuleItemMapper.xml
+3
-3
pom.xml
ibzdst-dependencies/pom.xml
+0
-1
Dockerfile
...t-provider/ibzdst-provider-api/src/main/docker/Dockerfile
+1
-1
ibzdst-provider-api-k8s.yaml
...provider-api/src/main/docker/ibzdst-provider-api-k8s.yaml
+31
-4
ibzdst-provider-api.yaml
...dst-provider-api/src/main/docker/ibzdst-provider-api.yaml
+15
-1
RedisCacheConfig.java
...src/main/java/cn/ibizlab/util/cache/RedisCacheConfig.java
+1
-0
IBZLiteFallback.java
...src/main/java/cn/ibizlab/util/client/IBZLiteFallback.java
+3
-0
IBZLiteFeignClient.java
.../main/java/cn/ibizlab/util/client/IBZLiteFeignClient.java
+3
-0
RedisChannelTopic.java
...rc/main/java/cn/ibizlab/util/enums/RedisChannelTopic.java
+2
-1
未找到文件。
config.xml
浏览文件 @
983ad469
...
...
@@ -37,6 +37,11 @@
git clone -b master $para2 ibzdst/
export NODE_OPTIONS=--max-old-space-size=4096
cd ibzdst/
mvn clean package -Papi
cd ibzdst-provider/ibzdst-provider-api
mvn -Papi docker:build
mvn -Papi docker:push
docker -H $para1 stack deploy --compose-file=src/main/docker/ibzdst-provider-api.yaml ibzlab-rt --with-registry-auth
</command>
</hudson.tasks.Shell>
</builders>
...
...
ibzdst-core/src/main/resources/liquibase/h2_table.xml
浏览文件 @
983ad469
...
...
@@ -4,7 +4,7 @@
<!--输出实体[DA_BUILD]数据结构 -->
<changeSet
author=
"
root
"
id=
"tab-da_build-82-1"
>
<changeSet
author=
"
a_A_5d9d78509
"
id=
"tab-da_build-82-1"
>
<createTable
tableName=
"IBZDABUILD"
>
<column
name=
"BUILDID"
remarks=
""
type=
"VARCHAR(100)"
>
<constraints
primaryKey=
"true"
primaryKeyName=
"PK_DA_BUILD_BUILDID"
/>
...
...
@@ -32,7 +32,7 @@
<!--输出实体[DA_CHART]数据结构 -->
<changeSet
author=
"
root
"
id=
"tab-da_chart-22-2"
>
<changeSet
author=
"
a_A_5d9d78509
"
id=
"tab-da_chart-22-2"
>
<createTable
tableName=
"IBZDACHART"
>
<column
name=
"CHARTID"
remarks=
""
type=
"VARCHAR(100)"
>
<constraints
primaryKey=
"true"
primaryKeyName=
"PK_DA_CHART_CHARTID"
/>
...
...
@@ -54,7 +54,7 @@
<!--输出实体[DA_METRIC]数据结构 -->
<changeSet
author=
"
root
"
id=
"tab-da_metric-65-3"
>
<changeSet
author=
"
a_A_5d9d78509
"
id=
"tab-da_metric-65-3"
>
<createTable
tableName=
"IBZDAMETRIC"
>
<column
name=
"DA_METRICID"
remarks=
""
type=
"VARCHAR(100)"
>
<constraints
primaryKey=
"true"
primaryKeyName=
"PK_DA_METRIC_DA_METRICID"
/>
...
...
@@ -82,7 +82,7 @@
<!--输出实体[DA_REPORT]数据结构 -->
<changeSet
author=
"
root
"
id=
"tab-da_report-24-4"
>
<changeSet
author=
"
a_A_5d9d78509
"
id=
"tab-da_report-24-4"
>
<createTable
tableName=
"IBZDAREPORT"
>
<column
name=
"REPORTID"
remarks=
""
type=
"VARCHAR(100)"
>
<constraints
primaryKey=
"true"
primaryKeyName=
"PK_DA_REPORT_REPORTID"
/>
...
...
@@ -104,7 +104,7 @@
<!--输出实体[DST_DATASOURCE]数据结构 -->
<changeSet
author=
"
root
"
id=
"tab-dst_datasource-7-5"
>
<changeSet
author=
"
a_A_5d9d78509
"
id=
"tab-dst_datasource-7-5"
>
<createTable
tableName=
"IBZDATASOURCE"
>
<column
name=
"DSID"
remarks=
""
type=
"VARCHAR(100)"
>
<constraints
primaryKey=
"true"
primaryKeyName=
"PK_DST_DATASOURCE_DSID"
/>
...
...
@@ -120,7 +120,7 @@
<!--输出实体[DST_SYSTEM]数据结构 -->
<changeSet
author=
"
root
"
id=
"tab-dst_system-5-6"
>
<changeSet
author=
"
a_A_5d9d78509
"
id=
"tab-dst_system-5-6"
>
<createTable
tableName=
"IBZPSSYSTEM"
>
<column
name=
"PSSYSTEMID"
remarks=
""
type=
"VARCHAR(100)"
>
<constraints
primaryKey=
"true"
primaryKeyName=
"PK_DST_SYSTEM_PSSYSTEMID"
/>
...
...
@@ -140,7 +140,7 @@
<!--输出实体[RU_EXECLOG]数据结构 -->
<changeSet
author=
"
root
"
id=
"tab-ru_execlog-31-7"
>
<changeSet
author=
"
a_A_5d9d78509
"
id=
"tab-ru_execlog-31-7"
>
<createTable
tableName=
"IBZRULELOG"
>
<column
name=
"RU_EXECLOGID"
remarks=
""
type=
"VARCHAR(100)"
>
<constraints
primaryKey=
"true"
primaryKeyName=
"PK_RU_EXECLOG_RU_EXECLOGID"
/>
...
...
@@ -170,7 +170,7 @@
<!--输出实体[RU_EXECRESULT]数据结构 -->
<changeSet
author=
"
root
"
id=
"tab-ru_execresult-46-8"
>
<changeSet
author=
"
a_A_5d9d78509
"
id=
"tab-ru_execresult-46-8"
>
<createTable
tableName=
"IBZRULERESULT"
>
<column
name=
"RU_EXECRESULTID"
remarks=
""
type=
"VARCHAR(100)"
>
<constraints
primaryKey=
"true"
primaryKeyName=
"PK_RU_EXECRESULT_RU_EXECRESULT"
/>
...
...
@@ -210,7 +210,7 @@
<!--输出实体[META_DATASET]数据结构 -->
<changeSet
author=
"
root
"
id=
"tab-meta_dataset-4-9"
>
<changeSet
author=
"
a_A_5d9d78509
"
id=
"tab-meta_dataset-4-9"
>
<createTable
tableName=
"IBZDATASET"
>
<column
name=
"DATASETID"
remarks=
""
type=
"VARCHAR(100)"
>
<constraints
primaryKey=
"true"
primaryKeyName=
"PK_META_DATASET_DATASETID"
/>
...
...
@@ -232,7 +232,7 @@
<!--输出实体[META_ENTITY]数据结构 -->
<changeSet
author=
"
root
"
id=
"tab-meta_entity-21-10"
>
<changeSet
author=
"
a_A_5d9d78509
"
id=
"tab-meta_entity-21-10"
>
<createTable
tableName=
"IBZENTITY"
>
<column
name=
"ENTITYID"
remarks=
""
type=
"VARCHAR(100)"
>
<constraints
primaryKey=
"true"
primaryKeyName=
"PK_META_ENTITY_ENTITYID"
/>
...
...
@@ -264,7 +264,7 @@
<!--输出实体[META_FIELD]数据结构 -->
<changeSet
author=
"
root
"
id=
"tab-meta_field-9-11"
>
<changeSet
author=
"
a_A_5d9d78509
"
id=
"tab-meta_field-9-11"
>
<createTable
tableName=
"IBZFIELD"
>
<column
name=
"FIELDID"
remarks=
""
type=
"VARCHAR(100)"
>
<constraints
primaryKey=
"true"
primaryKeyName=
"PK_META_FIELD_FIELDID"
/>
...
...
@@ -328,7 +328,7 @@
<!--输出实体[META_MODEL]数据结构 -->
<changeSet
author=
"
root
"
id=
"tab-meta_model-77-12"
>
<changeSet
author=
"
a_A_5d9d78509
"
id=
"tab-meta_model-77-12"
>
<createTable
tableName=
"IBZMODEL"
>
<column
name=
"MODELID"
remarks=
""
type=
"VARCHAR(100)"
>
<constraints
primaryKey=
"true"
primaryKeyName=
"PK_META_MODEL_MODELID"
/>
...
...
@@ -354,7 +354,7 @@
<!--输出实体[META_MODULE]数据结构 -->
<changeSet
author=
"
root
"
id=
"tab-meta_module-7-13"
>
<changeSet
author=
"
a_A_5d9d78509
"
id=
"tab-meta_module-7-13"
>
<createTable
tableName=
"IBZMODULE"
>
<column
name=
"MODULEID"
remarks=
""
type=
"VARCHAR(100)"
>
<constraints
primaryKey=
"true"
primaryKeyName=
"PK_META_MODULE_MODULEID"
/>
...
...
@@ -372,7 +372,7 @@
<!--输出实体[META_RELATION]数据结构 -->
<changeSet
author=
"
root
"
id=
"tab-meta_relation-12-14"
>
<changeSet
author=
"
a_A_5d9d78509
"
id=
"tab-meta_relation-12-14"
>
<createTable
tableName=
"IBZRELATION"
>
<column
name=
"RELATIONID"
remarks=
""
type=
"VARCHAR(100)"
>
<constraints
primaryKey=
"true"
primaryKeyName=
"PK_META_RELATION_RELATIONID"
/>
...
...
@@ -404,7 +404,7 @@
<!--输出实体[RU_ENGINE]数据结构 -->
<changeSet
author=
"
root
"
id=
"tab-ru_engine-46-15"
>
<changeSet
author=
"
a_A_5d9d78509
"
id=
"tab-ru_engine-46-15"
>
<createTable
tableName=
"IBZRULEENGINE"
>
<column
name=
"ENGINEID"
remarks=
""
type=
"VARCHAR(100)"
>
<constraints
primaryKey=
"true"
primaryKeyName=
"PK_RU_ENGINE_ENGINEID"
/>
...
...
@@ -432,7 +432,7 @@
<!--输出实体[RU_ITEM]数据结构 -->
<changeSet
author=
"
root
"
id=
"tab-ru_item-81-16"
>
<changeSet
author=
"
a_A_5d9d78509
"
id=
"tab-ru_item-81-16"
>
<createTable
tableName=
"IBZRULE"
>
<column
name=
"RULEID"
remarks=
""
type=
"VARCHAR(100)"
>
<constraints
primaryKey=
"true"
primaryKeyName=
"PK_RU_ITEM_RULEID"
/>
...
...
@@ -469,7 +469,7 @@
<!--输出实体[DA_BUILD]外键关系 -->
<!--输出实体[DA_CHART]外键关系 -->
<!--输出实体[DA_METRIC]外键关系 -->
<changeSet
author=
"
root
"
id=
"fk-da_metric-65-17"
>
<changeSet
author=
"
a_A_5d9d78509
"
id=
"fk-da_metric-65-17"
>
<addForeignKeyConstraint
baseColumnNames=
"BUILDID"
baseTableName=
"IBZDAMETRIC"
constraintName=
"DER1N_DA_METRIC_DA_BUILD_BUILD"
deferrable=
"false"
initiallyDeferred=
"false"
onDelete=
"RESTRICT"
onUpdate=
"RESTRICT"
referencedColumnNames=
"BUILDID"
referencedTableName=
"IBZDABUILD"
validate=
"true"
/>
</changeSet>
<!--输出实体[DA_REPORT]外键关系 -->
...
...
ibzdst-core/src/main/resources/mapper/analysis/dametric/DAMetricMapper.xml
浏览文件 @
983ad469
...
...
@@ -5,7 +5,7 @@
<!--该方法用于重写mybatis中selectById方法,以实现查询逻辑属性-->
<select
id=
"selectById"
resultMap=
"DAMetricResultMap"
databaseId=
"mysql"
>
<![CDATA[select t1.* from (SELECT t1.`BUILDID`, t11.`BUILDNAME`, t1.`CFG`, t1.`CREATEDATE`, t1.`DA_METRICID`, t1.`DA_METRICNAME`, t1.`EXTOP`, t1.`FIELDSET`, t1.`METRICTYPE`, t11.`MODELID`, t11.`MODELNAME`, t1.`REFMETRIC`, t1.`UPDATEDATE` FROM `IBZDAMETRIC` t1 LEFT JOIN
IBZDABUILD t11 ON t1.BUILDID = t11.BUILDID
) t1 where da_metricid=#{id}]]>
<![CDATA[select t1.* from (SELECT t1.`BUILDID`, t11.`BUILDNAME`, t1.`CFG`, t1.`CREATEDATE`, t1.`DA_METRICID`, t1.`DA_METRICNAME`, t1.`EXTOP`, t1.`FIELDSET`, t1.`METRICTYPE`, t11.`MODELID`, t11.`MODELNAME`, t1.`REFMETRIC`, t1.`UPDATEDATE` FROM `IBZDAMETRIC` t1 LEFT JOIN
`IBZDABUILD` t11 ON t1.`BUILDID` = t11.`BUILDID`
) t1 where da_metricid=#{id}]]>
</select>
<select
id=
"selectById"
resultMap=
"DAMetricResultMap"
databaseId=
"oracle"
>
<![CDATA[select t1.* from (SELECT t1.BUILDID, t11.BUILDNAME, t1.CFG, t1.CREATEDATE, t1.DA_METRICID, t1.DA_METRICNAME, t1.EXTOP, t1.FIELDSET, t1.METRICTYPE, t11.MODELID, t11.MODELNAME, t1.REFMETRIC, t1.UPDATEDATE FROM IBZDAMETRIC t1 LEFT JOIN IBZDABUILD t11 ON t1.BUILDID = t11.BUILDID ) t1 where da_metricid=#{id}]]>
...
...
@@ -44,7 +44,7 @@
<!--数据查询[Default]-->
<sql
id=
"Default"
databaseId=
"mysql"
>
<![CDATA[ SELECT t1.`BUILDID`, t11.`BUILDNAME`, t1.`CREATEDATE`, t1.`DA_METRICID`, t1.`DA_METRICNAME`, t1.`EXTOP`, t1.`FIELDSET`, t1.`METRICTYPE`, t11.`MODELID`, t11.`MODELNAME`, t1.`REFMETRIC`, t1.`UPDATEDATE` FROM `IBZDAMETRIC` t1 LEFT JOIN
IBZDABUILD t11 ON t1.BUILDID = t11.BUILDID
<![CDATA[ SELECT t1.`BUILDID`, t11.`BUILDNAME`, t1.`CREATEDATE`, t1.`DA_METRICID`, t1.`DA_METRICNAME`, t1.`EXTOP`, t1.`FIELDSET`, t1.`METRICTYPE`, t11.`MODELID`, t11.`MODELNAME`, t1.`REFMETRIC`, t1.`UPDATEDATE` FROM `IBZDAMETRIC` t1 LEFT JOIN
`IBZDABUILD` t11 ON t1.`BUILDID` = t11.`BUILDID`
]]>
</sql>
<!--数据查询[Default]-->
...
...
@@ -59,7 +59,7 @@
</sql>
<!--数据查询[View]-->
<sql
id=
"View"
databaseId=
"mysql"
>
<![CDATA[ SELECT t1.`BUILDID`, t11.`BUILDNAME`, t1.`CFG`, t1.`CREATEDATE`, t1.`DA_METRICID`, t1.`DA_METRICNAME`, t1.`EXTOP`, t1.`FIELDSET`, t1.`METRICTYPE`, t11.`MODELID`, t11.`MODELNAME`, t1.`REFMETRIC`, t1.`UPDATEDATE` FROM `IBZDAMETRIC` t1 LEFT JOIN
IBZDABUILD t11 ON t1.BUILDID = t11.BUILDID
<![CDATA[ SELECT t1.`BUILDID`, t11.`BUILDNAME`, t1.`CFG`, t1.`CREATEDATE`, t1.`DA_METRICID`, t1.`DA_METRICNAME`, t1.`EXTOP`, t1.`FIELDSET`, t1.`METRICTYPE`, t11.`MODELID`, t11.`MODELNAME`, t1.`REFMETRIC`, t1.`UPDATEDATE` FROM `IBZDAMETRIC` t1 LEFT JOIN
`IBZDABUILD` t11 ON t1.`BUILDID` = t11.`BUILDID`
]]>
</sql>
<!--数据查询[View]-->
...
...
ibzdst-core/src/main/resources/mapper/lite/metafield/MetaFieldMapper.xml
浏览文件 @
983ad469
...
...
@@ -5,7 +5,7 @@
<!--该方法用于重写mybatis中selectById方法,以实现查询逻辑属性-->
<select
id=
"selectById"
resultMap=
"MetaFieldResultMap"
databaseId=
"mysql"
>
<![CDATA[select t1.* from (SELECT t1.`CODENAME`, t1.`CREATEDATE`, t1.`DATALENGTH`, t1.`DATAPRECI`, t1.`DATATYPE`, t1.`DICT`, t11.`CODENAME` AS `ENTITYCODENAME`, t1.`ENTITYID`, t1.`ENTITYNAME`, t1.`EXPRESSION`, t1.`EXTENSIONFIELD`, t1.`FIELDID`, t1.`FIELDLOGICNAME`, t1.`FIELDNAME`, concat(t1.`FIELDNAME`,'-',t1.`FIELDLOGICNAME`,'[',t1.`ENTITYNAME`,']') AS `FIELDSHOWNAME`, t1.`FIELDTYPE`, concat(t1.`ENTITYNAME`,'.',t1.`FIELDNAME`) AS `FIELDUNINAME`, t1.`ISENABLEAUDIT`, t1.`KEYFIELD`, t1.`MAJORFIELD`, t1.`NULLABLE`, t1.`PHYSICALFIELD`, t1.`PREDEFINED`, t21.`REFENTITYNAME`, t1.`REFFIELDID`, t1.`REFFIELDNAME`, t21.`CODENAME` AS `RELATIONCODENAME`, t1.`RELATIONID`, t1.`RELATIONNAME`, t1.`SHOWORDER`, t11.`SYSTEMID`, t1.`UNIONKEY`, t1.`UPDATEDATE` FROM `IBZFIELD` t1 LEFT JOIN
IBZENTITY t11 ON t1.ENTITYID = t11.ENTITYID LEFT JOIN IBZRELATION t21 ON t1.RELATIONID = t21.RELATIONID
) t1 where fieldid=#{id}]]>
<![CDATA[select t1.* from (SELECT t1.`CODENAME`, t1.`CREATEDATE`, t1.`DATALENGTH`, t1.`DATAPRECI`, t1.`DATATYPE`, t1.`DICT`, t11.`CODENAME` AS `ENTITYCODENAME`, t1.`ENTITYID`, t1.`ENTITYNAME`, t1.`EXPRESSION`, t1.`EXTENSIONFIELD`, t1.`FIELDID`, t1.`FIELDLOGICNAME`, t1.`FIELDNAME`, concat(t1.`FIELDNAME`,'-',t1.`FIELDLOGICNAME`,'[',t1.`ENTITYNAME`,']') AS `FIELDSHOWNAME`, t1.`FIELDTYPE`, concat(t1.`ENTITYNAME`,'.',t1.`FIELDNAME`) AS `FIELDUNINAME`, t1.`ISENABLEAUDIT`, t1.`KEYFIELD`, t1.`MAJORFIELD`, t1.`NULLABLE`, t1.`PHYSICALFIELD`, t1.`PREDEFINED`, t21.`REFENTITYNAME`, t1.`REFFIELDID`, t1.`REFFIELDNAME`, t21.`CODENAME` AS `RELATIONCODENAME`, t1.`RELATIONID`, t1.`RELATIONNAME`, t1.`SHOWORDER`, t11.`SYSTEMID`, t1.`UNIONKEY`, t1.`UPDATEDATE` FROM `IBZFIELD` t1 LEFT JOIN
`IBZENTITY` t11 ON t1.`ENTITYID` = t11.`ENTITYID` LEFT JOIN `IBZRELATION` t21 ON t1.`RELATIONID` = t21.`RELATIONID`
) t1 where fieldid=#{id}]]>
</select>
<select
id=
"selectById"
resultMap=
"MetaFieldResultMap"
databaseId=
"oracle"
>
<![CDATA[select t1.* from (SELECT t1.CODENAME, t1.CREATEDATE, t1.DATALENGTH, t1.DATAPRECI, t1.DATATYPE, t1.DICT, t11.CODENAME AS ENTITYCODENAME, t1.ENTITYID, t1.ENTITYNAME, t1.EXPRESSION, t1.EXTENSIONFIELD, t1.FIELDID, t1.FIELDLOGICNAME, t1.FIELDNAME, concat(t1.FIELDNAME,'-',t1.FIELDLOGICNAME,'[',t1.ENTITYNAME,']') AS FIELDSHOWNAME, t1.FIELDTYPE, concat(t1.ENTITYNAME,'.',t1.FIELDNAME) AS FIELDUNINAME, t1.ISENABLEAUDIT, t1.KEYFIELD, t1.MAJORFIELD, t1.NULLABLE, t1.PHYSICALFIELD, t1.PREDEFINED, t21.REFENTITYNAME, t1.REFFIELDID, t1.REFFIELDNAME, t21.CODENAME AS RELATIONCODENAME, t1.RELATIONID, t1.RELATIONNAME, t1.SHOWORDER, t11.SYSTEMID, t1.UNIONKEY, t1.UPDATEDATE FROM IBZFIELD t1 LEFT JOIN IBZENTITY t11 ON t1.ENTITYID = t11.ENTITYID LEFT JOIN IBZRELATION t21 ON t1.RELATIONID = t21.RELATIONID ) t1 where fieldid=#{id}]]>
...
...
@@ -63,7 +63,7 @@
<!--数据查询[Default]-->
<sql
id=
"Default"
databaseId=
"mysql"
>
<![CDATA[ SELECT t1.`CODENAME`, t1.`CREATEDATE`, t1.`DATALENGTH`, t1.`DATAPRECI`, t1.`DATATYPE`, t1.`DICT`, t11.`CODENAME` AS `ENTITYCODENAME`, t1.`ENTITYID`, t1.`ENTITYNAME`, t1.`EXPRESSION`, t1.`EXTENSIONFIELD`, t1.`FIELDID`, t1.`FIELDLOGICNAME`, t1.`FIELDNAME`, concat(t1.`FIELDNAME`,'-',t1.`FIELDLOGICNAME`,'[',t1.`ENTITYNAME`,']') AS `FIELDSHOWNAME`, t1.`FIELDTYPE`, concat(t1.`ENTITYNAME`,'.',t1.`FIELDNAME`) AS `FIELDUNINAME`, t1.`ISENABLEAUDIT`, t1.`KEYFIELD`, t1.`MAJORFIELD`, t1.`NULLABLE`, t1.`PHYSICALFIELD`, t1.`PREDEFINED`, t21.`REFENTITYNAME`, t1.`REFFIELDID`, t1.`REFFIELDNAME`, t21.`CODENAME` AS `RELATIONCODENAME`, t1.`RELATIONID`, t1.`RELATIONNAME`, t1.`SHOWORDER`, t11.`SYSTEMID`, t1.`UNIONKEY`, t1.`UPDATEDATE` FROM `IBZFIELD` t1 LEFT JOIN
IBZENTITY t11 ON t1.ENTITYID = t11.ENTITYID LEFT JOIN IBZRELATION t21 ON t1.RELATIONID = t21.RELATIONID
<![CDATA[ SELECT t1.`CODENAME`, t1.`CREATEDATE`, t1.`DATALENGTH`, t1.`DATAPRECI`, t1.`DATATYPE`, t1.`DICT`, t11.`CODENAME` AS `ENTITYCODENAME`, t1.`ENTITYID`, t1.`ENTITYNAME`, t1.`EXPRESSION`, t1.`EXTENSIONFIELD`, t1.`FIELDID`, t1.`FIELDLOGICNAME`, t1.`FIELDNAME`, concat(t1.`FIELDNAME`,'-',t1.`FIELDLOGICNAME`,'[',t1.`ENTITYNAME`,']') AS `FIELDSHOWNAME`, t1.`FIELDTYPE`, concat(t1.`ENTITYNAME`,'.',t1.`FIELDNAME`) AS `FIELDUNINAME`, t1.`ISENABLEAUDIT`, t1.`KEYFIELD`, t1.`MAJORFIELD`, t1.`NULLABLE`, t1.`PHYSICALFIELD`, t1.`PREDEFINED`, t21.`REFENTITYNAME`, t1.`REFFIELDID`, t1.`REFFIELDNAME`, t21.`CODENAME` AS `RELATIONCODENAME`, t1.`RELATIONID`, t1.`RELATIONNAME`, t1.`SHOWORDER`, t11.`SYSTEMID`, t1.`UNIONKEY`, t1.`UPDATEDATE` FROM `IBZFIELD` t1 LEFT JOIN
`IBZENTITY` t11 ON t1.`ENTITYID` = t11.`ENTITYID` LEFT JOIN `IBZRELATION` t21 ON t1.`RELATIONID` = t21.`RELATIONID`
]]>
</sql>
<!--数据查询[Default]-->
...
...
@@ -78,7 +78,7 @@
</sql>
<!--数据查询[View]-->
<sql
id=
"View"
databaseId=
"mysql"
>
<![CDATA[ SELECT t1.`CODENAME`, t1.`CREATEDATE`, t1.`DATALENGTH`, t1.`DATAPRECI`, t1.`DATATYPE`, t1.`DICT`, t11.`CODENAME` AS `ENTITYCODENAME`, t1.`ENTITYID`, t1.`ENTITYNAME`, t1.`EXPRESSION`, t1.`EXTENSIONFIELD`, t1.`FIELDID`, t1.`FIELDLOGICNAME`, t1.`FIELDNAME`, concat(t1.`FIELDNAME`,'-',t1.`FIELDLOGICNAME`,'[',t1.`ENTITYNAME`,']') AS `FIELDSHOWNAME`, t1.`FIELDTYPE`, concat(t1.`ENTITYNAME`,'.',t1.`FIELDNAME`) AS `FIELDUNINAME`, t1.`ISENABLEAUDIT`, t1.`KEYFIELD`, t1.`MAJORFIELD`, t1.`NULLABLE`, t1.`PHYSICALFIELD`, t1.`PREDEFINED`, t21.`REFENTITYNAME`, t1.`REFFIELDID`, t1.`REFFIELDNAME`, t21.`CODENAME` AS `RELATIONCODENAME`, t1.`RELATIONID`, t1.`RELATIONNAME`, t1.`SHOWORDER`, t11.`SYSTEMID`, t1.`UNIONKEY`, t1.`UPDATEDATE` FROM `IBZFIELD` t1 LEFT JOIN
IBZENTITY t11 ON t1.ENTITYID = t11.ENTITYID LEFT JOIN IBZRELATION t21 ON t1.RELATIONID = t21.RELATIONID
<![CDATA[ SELECT t1.`CODENAME`, t1.`CREATEDATE`, t1.`DATALENGTH`, t1.`DATAPRECI`, t1.`DATATYPE`, t1.`DICT`, t11.`CODENAME` AS `ENTITYCODENAME`, t1.`ENTITYID`, t1.`ENTITYNAME`, t1.`EXPRESSION`, t1.`EXTENSIONFIELD`, t1.`FIELDID`, t1.`FIELDLOGICNAME`, t1.`FIELDNAME`, concat(t1.`FIELDNAME`,'-',t1.`FIELDLOGICNAME`,'[',t1.`ENTITYNAME`,']') AS `FIELDSHOWNAME`, t1.`FIELDTYPE`, concat(t1.`ENTITYNAME`,'.',t1.`FIELDNAME`) AS `FIELDUNINAME`, t1.`ISENABLEAUDIT`, t1.`KEYFIELD`, t1.`MAJORFIELD`, t1.`NULLABLE`, t1.`PHYSICALFIELD`, t1.`PREDEFINED`, t21.`REFENTITYNAME`, t1.`REFFIELDID`, t1.`REFFIELDNAME`, t21.`CODENAME` AS `RELATIONCODENAME`, t1.`RELATIONID`, t1.`RELATIONNAME`, t1.`SHOWORDER`, t11.`SYSTEMID`, t1.`UNIONKEY`, t1.`UPDATEDATE` FROM `IBZFIELD` t1 LEFT JOIN
`IBZENTITY` t11 ON t1.`ENTITYID` = t11.`ENTITYID` LEFT JOIN `IBZRELATION` t21 ON t1.`RELATIONID` = t21.`RELATIONID`
]]>
</sql>
<!--数据查询[View]-->
...
...
ibzdst-core/src/main/resources/mapper/lite/metarelationship/MetaRelationshipMapper.xml
浏览文件 @
983ad469
...
...
@@ -5,7 +5,7 @@
<!--该方法用于重写mybatis中selectById方法,以实现查询逻辑属性-->
<select
id=
"selectById"
resultMap=
"MetaRelationshipResultMap"
databaseId=
"mysql"
>
<![CDATA[select t1.* from (SELECT t1.`CODENAME`, t1.`CREATEDATE`, t1.`ENTITYID`, t1.`ENTITYNAME`, t1.`LOOKUP`, t1.`NESTEDNAME`, t1.`REFENTITYID`, t1.`REFENTITYNAME`, t1.`RELATIONID`, t1.`RELATIONNAME`, t1.`RELTYPE`, t11.`SYSTEMID`, t1.`UPDATEDATE` FROM `IBZRELATION` t1 LEFT JOIN
IBZENTITY t11 ON t1.ENTITYID = t11.ENTITYID
) t1 where relationid=#{id}]]>
<![CDATA[select t1.* from (SELECT t1.`CODENAME`, t1.`CREATEDATE`, t1.`ENTITYID`, t1.`ENTITYNAME`, t1.`LOOKUP`, t1.`NESTEDNAME`, t1.`REFENTITYID`, t1.`REFENTITYNAME`, t1.`RELATIONID`, t1.`RELATIONNAME`, t1.`RELTYPE`, t11.`SYSTEMID`, t1.`UPDATEDATE` FROM `IBZRELATION` t1 LEFT JOIN
`IBZENTITY` t11 ON t1.`ENTITYID` = t11.`ENTITYID`
) t1 where relationid=#{id}]]>
</select>
<select
id=
"selectById"
resultMap=
"MetaRelationshipResultMap"
databaseId=
"oracle"
>
<![CDATA[select t1.* from (SELECT t1.CODENAME, t1.CREATEDATE, t1.ENTITYID, t1.ENTITYNAME, t1.LOOKUP, t1.NESTEDNAME, t1.REFENTITYID, t1.REFENTITYNAME, t1.RELATIONID, t1.RELATIONNAME, t1.RELTYPE, t11.SYSTEMID, t1.UPDATEDATE FROM IBZRELATION t1 LEFT JOIN IBZENTITY t11 ON t1.ENTITYID = t11.ENTITYID ) t1 where relationid=#{id}]]>
...
...
@@ -56,7 +56,7 @@
<!--数据查询[Default]-->
<sql
id=
"Default"
databaseId=
"mysql"
>
<![CDATA[ SELECT t1.`CODENAME`, t1.`CREATEDATE`, t1.`ENTITYID`, t1.`ENTITYNAME`, t1.`NESTEDNAME`, t1.`REFENTITYID`, t1.`REFENTITYNAME`, t1.`RELATIONID`, t1.`RELATIONNAME`, t1.`RELTYPE`, t11.`SYSTEMID`, t1.`UPDATEDATE` FROM `IBZRELATION` t1 LEFT JOIN
IBZENTITY t11 ON t1.ENTITYID = t11.ENTITYID
<![CDATA[ SELECT t1.`CODENAME`, t1.`CREATEDATE`, t1.`ENTITYID`, t1.`ENTITYNAME`, t1.`NESTEDNAME`, t1.`REFENTITYID`, t1.`REFENTITYNAME`, t1.`RELATIONID`, t1.`RELATIONNAME`, t1.`RELTYPE`, t11.`SYSTEMID`, t1.`UPDATEDATE` FROM `IBZRELATION` t1 LEFT JOIN
`IBZENTITY` t11 ON t1.`ENTITYID` = t11.`ENTITYID`
]]>
</sql>
<!--数据查询[Default]-->
...
...
@@ -71,7 +71,7 @@
</sql>
<!--数据查询[View]-->
<sql
id=
"View"
databaseId=
"mysql"
>
<![CDATA[ SELECT t1.`CODENAME`, t1.`CREATEDATE`, t1.`ENTITYID`, t1.`ENTITYNAME`, t1.`LOOKUP`, t1.`NESTEDNAME`, t1.`REFENTITYID`, t1.`REFENTITYNAME`, t1.`RELATIONID`, t1.`RELATIONNAME`, t1.`RELTYPE`, t11.`SYSTEMID`, t1.`UPDATEDATE` FROM `IBZRELATION` t1 LEFT JOIN
IBZENTITY t11 ON t1.ENTITYID = t11.ENTITYID
<![CDATA[ SELECT t1.`CODENAME`, t1.`CREATEDATE`, t1.`ENTITYID`, t1.`ENTITYNAME`, t1.`LOOKUP`, t1.`NESTEDNAME`, t1.`REFENTITYID`, t1.`REFENTITYNAME`, t1.`RELATIONID`, t1.`RELATIONNAME`, t1.`RELTYPE`, t11.`SYSTEMID`, t1.`UPDATEDATE` FROM `IBZRELATION` t1 LEFT JOIN
`IBZENTITY` t11 ON t1.`ENTITYID` = t11.`ENTITYID`
]]>
</sql>
<!--数据查询[View]-->
...
...
ibzdst-core/src/main/resources/mapper/rule/ruleitem/RuleItemMapper.xml
浏览文件 @
983ad469
...
...
@@ -5,7 +5,7 @@
<!--该方法用于重写mybatis中selectById方法,以实现查询逻辑属性-->
<select
id=
"selectById"
resultMap=
"RuleItemResultMap"
databaseId=
"mysql"
>
<![CDATA[select t1.* from (SELECT t1.`BUSINESSCAT`, t1.`CFG`, t1.`COND`, t1.`CREATEDATE`, t1.`CUSTAG`, t1.`FIELDSET`, t1.`MEMO`, t1.`MODELID`, t1.`MODELNAME`, t1.`RULECODE`, t1.`RULEGROUP`, t1.`RULEID`, t1.`RULENAME`, t11.`SYSTEMID`, t1.`UPDATEDATE` FROM `IBZRULE` t1 LEFT JOIN
IBZMODEL t11 ON t1.MODELID = t11.MODELID
) t1 where ruleid=#{id}]]>
<![CDATA[select t1.* from (SELECT t1.`BUSINESSCAT`, t1.`CFG`, t1.`COND`, t1.`CREATEDATE`, t1.`CUSTAG`, t1.`FIELDSET`, t1.`MEMO`, t1.`MODELID`, t1.`MODELNAME`, t1.`RULECODE`, t1.`RULEGROUP`, t1.`RULEID`, t1.`RULENAME`, t11.`SYSTEMID`, t1.`UPDATEDATE` FROM `IBZRULE` t1 LEFT JOIN
`IBZMODEL` t11 ON t1.`MODELID` = t11.`MODELID`
) t1 where ruleid=#{id}]]>
</select>
<select
id=
"selectById"
resultMap=
"RuleItemResultMap"
databaseId=
"oracle"
>
<![CDATA[select t1.* from (SELECT t1.BUSINESSCAT, t1.CFG, t1.COND, t1.CREATEDATE, t1.CUSTAG, t1.FIELDSET, t1.MEMO, t1.MODELID, t1.MODELNAME, t1.RULECODE, t1.RULEGROUP, t1.RULEID, t1.RULENAME, t11.SYSTEMID, t1.UPDATEDATE FROM IBZRULE t1 LEFT JOIN IBZMODEL t11 ON t1.MODELID = t11.MODELID ) t1 where ruleid=#{id}]]>
...
...
@@ -44,7 +44,7 @@
<!--数据查询[Default]-->
<sql
id=
"Default"
databaseId=
"mysql"
>
<![CDATA[ SELECT t1.`BUSINESSCAT`, t1.`CFG`, t1.`COND`, t1.`CREATEDATE`, t1.`CUSTAG`, t1.`FIELDSET`, t1.`MEMO`, t1.`MODELID`, t1.`MODELNAME`, t1.`RULECODE`, t1.`RULEGROUP`, t1.`RULEID`, t1.`RULENAME`, t11.`SYSTEMID`, t1.`UPDATEDATE` FROM `IBZRULE` t1 LEFT JOIN
IBZMODEL t11 ON t1.MODELID = t11.MODELID
<![CDATA[ SELECT t1.`BUSINESSCAT`, t1.`CFG`, t1.`COND`, t1.`CREATEDATE`, t1.`CUSTAG`, t1.`FIELDSET`, t1.`MEMO`, t1.`MODELID`, t1.`MODELNAME`, t1.`RULECODE`, t1.`RULEGROUP`, t1.`RULEID`, t1.`RULENAME`, t11.`SYSTEMID`, t1.`UPDATEDATE` FROM `IBZRULE` t1 LEFT JOIN
`IBZMODEL` t11 ON t1.`MODELID` = t11.`MODELID`
]]>
</sql>
<!--数据查询[Default]-->
...
...
@@ -59,7 +59,7 @@
</sql>
<!--数据查询[View]-->
<sql
id=
"View"
databaseId=
"mysql"
>
<![CDATA[ SELECT t1.`BUSINESSCAT`, t1.`CFG`, t1.`COND`, t1.`CREATEDATE`, t1.`CUSTAG`, t1.`FIELDSET`, t1.`MEMO`, t1.`MODELID`, t1.`MODELNAME`, t1.`RULECODE`, t1.`RULEGROUP`, t1.`RULEID`, t1.`RULENAME`, t11.`SYSTEMID`, t1.`UPDATEDATE` FROM `IBZRULE` t1 LEFT JOIN
IBZMODEL t11 ON t1.MODELID = t11.MODELID
<![CDATA[ SELECT t1.`BUSINESSCAT`, t1.`CFG`, t1.`COND`, t1.`CREATEDATE`, t1.`CUSTAG`, t1.`FIELDSET`, t1.`MEMO`, t1.`MODELID`, t1.`MODELNAME`, t1.`RULECODE`, t1.`RULEGROUP`, t1.`RULEID`, t1.`RULENAME`, t11.`SYSTEMID`, t1.`UPDATEDATE` FROM `IBZRULE` t1 LEFT JOIN
`IBZMODEL` t11 ON t1.`MODELID` = t11.`MODELID`
]]>
</sql>
<!--数据查询[View]-->
...
...
ibzdst-dependencies/pom.xml
浏览文件 @
983ad469
...
...
@@ -85,7 +85,6 @@
<oracle.version>
19.8.0.0
</oracle.version>
<postgresql.version>
42.2.6
</postgresql.version>
</properties>
<dependencyManagement>
...
...
ibzdst-provider/ibzdst-provider-api/src/main/docker/Dockerfile
浏览文件 @
983ad469
...
...
@@ -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 /ibzdst-provider-api.jar
EXPOSE
808
1
EXPOSE
4001
1
ADD
ibzdst-provider-api.jar /ibzdst-provider-api.jar
ibzdst-provider/ibzdst-provider-api/src/main/docker/ibzdst-provider-api-k8s.yaml
浏览文件 @
983ad469
...
...
@@ -22,7 +22,34 @@ spec:
image
:
registry.cn-shanghai.aliyuncs.com/ibizsys/ibzdst-provider-api:latest
imagePullPolicy
:
Always
ports
:
-
containerPort
:
8081
-
containerPort
:
40011
env
:
-
name
:
SPRING_CLOUD_NACOS_DISCOVERY_IP
value
:
"
172.16.180.237"
-
name
:
SERVER_PORT
value
:
"
40011"
-
name
:
SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR
value
:
"
172.16.100.243:8848"
-
name
:
SPRING_REDIS_HOST
value
:
"
172.16.100.243"
-
name
:
SPRING_REDIS_PORT
value
:
"
6379"
-
name
:
SPRING_REDIS_DATABASE
value
:
"
0"
-
name
:
SPRING_DATASOURCE_USERNAME
value
:
"
a_A_5d9d78509"
-
name
:
SPRING_DATASOURCE_PASSWORD
value
:
"
@6dEfb3@"
-
name
:
SPRING_DATASOURCE_URL
value
:
"
jdbc:mysql://172.16.180.232:3306/a_A_5d9d78509?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&allowMultiQueries=true"
-
name
:
SPRING_DATASOURCE_DRIVER-CLASS-NAME
value
:
"
com.mysql.jdbc.Driver"
-
name
:
SPRING_DATASOURCE_DEFAULTSCHEMA
value
:
"
a_A_5d9d78509"
-
name
:
NACOS
value
:
"
172.16.100.243:8848"
-
name
:
SPRING_CLOUD_NACOS_DISCOVERY_GROUP
value
:
"
ibizdev"
volumeMounts
:
-
name
:
data
mountPath
:
/app/file
...
...
@@ -42,9 +69,9 @@ spec:
type
:
NodePort
ports
:
-
name
:
http
port
:
808
1
targetPort
:
808
1
nodePort
:
808
1
port
:
4001
1
targetPort
:
4001
1
nodePort
:
4001
1
protocol
:
TCP
selector
:
app
:
ibzdst-provider-api
...
...
ibzdst-provider/ibzdst-provider-api/src/main/docker/ibzdst-provider-api.yaml
浏览文件 @
983ad469
...
...
@@ -3,9 +3,23 @@ services:
ibzdst-provider-api
:
image
:
registry.cn-shanghai.aliyuncs.com/ibizsys/ibzdst-provider-api:latest
ports
:
-
"
8081:808
1"
-
"
40011:4001
1"
networks
:
-
agent_network
environment
:
-
SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.180.237
-
SERVER_PORT=40011
-
SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.100.243: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.100.243:8848
-
SPRING_CLOUD_NACOS_DISCOVERY_GROUP=ibizdev
deploy
:
resources
:
limits
:
...
...
ibzdst-util/src/main/java/cn/ibizlab/util/cache/RedisCacheConfig.java
浏览文件 @
983ad469
...
...
@@ -124,6 +124,7 @@ public class RedisCacheConfig {
container
.
setConnectionFactory
(
redisConnectionFactory
);
container
.
addMessageListener
(
messageListener
,
RedisChannelTopic
.
REDIS_CACHE_DELETE_TOPIC
.
getChannelTopic
());
container
.
addMessageListener
(
messageListener
,
RedisChannelTopic
.
REDIS_CACHE_CLEAR_TOPIC
.
getChannelTopic
());
container
.
addMessageListener
(
messageListener
,
RedisChannelTopic
.
REDIS_CACHE_DYNAMICMODEL_TOPIC
.
getChannelTopic
());
return
container
;
}
}
\ No newline at end of file
ibzdst-util/src/main/java/cn/ibizlab/util/client/IBZLiteFallback.java
浏览文件 @
983ad469
...
...
@@ -2,6 +2,8 @@ package cn.ibizlab.util.client;
import
com.alibaba.fastjson.JSONObject
;
import
org.springframework.stereotype.Component
;
import
java.util.List
;
import
java.util.Map
;
@Component
public
class
IBZLiteFallback
implements
IBZLiteFeignClient
{
...
...
@@ -10,4 +12,5 @@ public class IBZLiteFallback implements IBZLiteFeignClient {
public
Boolean
syncSysModel
(
JSONObject
system
)
{
return
null
;
}
}
ibzdst-util/src/main/java/cn/ibizlab/util/client/IBZLiteFeignClient.java
浏览文件 @
983ad469
...
...
@@ -3,6 +3,8 @@ package cn.ibizlab.util.client;
import
com.alibaba.fastjson.JSONObject
;
import
org.springframework.cloud.openfeign.FeignClient
;
import
org.springframework.web.bind.annotation.*
;
import
java.util.List
;
import
java.util.Map
;
@FeignClient
(
value
=
"${ibiz.ref.service.lite:ibzlite-api}"
,
contextId
=
"lite"
,
fallback
=
IBZLiteFallback
.
class
)
public
interface
IBZLiteFeignClient
...
...
@@ -14,4 +16,5 @@ public interface IBZLiteFeignClient
*/
@PostMapping
(
"/lite/syncsysmodel"
)
Boolean
syncSysModel
(
@RequestBody
JSONObject
system
);
}
ibzdst-util/src/main/java/cn/ibizlab/util/enums/RedisChannelTopic.java
浏览文件 @
983ad469
...
...
@@ -6,7 +6,8 @@ import org.springframework.data.redis.listener.ChannelTopic;
*/
public
enum
RedisChannelTopic
{
REDIS_CACHE_DELETE_TOPIC
(
"redis:cache:delete:topic1"
,
"删除redis缓存消息频道"
),
REDIS_CACHE_CLEAR_TOPIC
(
"redis:cache:clear:topic2"
,
"清空redis缓存消息频道"
);
REDIS_CACHE_CLEAR_TOPIC
(
"redis:cache:clear:topic2"
,
"清空redis缓存消息频道"
),
REDIS_CACHE_DYNAMICMODEL_TOPIC
(
"redis:cache:dynamicmodel:topic3"
,
"动态模型频道"
);
String
channelTopic
;
String
label
;
...
...
编辑
预览
Markdown
格式
0%
请重试
or
添加新附件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
先完成此消息的编辑!
取消
想要评论请
注册
或
登录