Skip to content

I
ibzdst
提交 9473d716 编写于 作者: ibizdev's avatar ibizdev
浏览文件
操作

ibiz4j 发布系统代码 [ibz-dst，应用]

上级 79342fe1
隐藏空白字符变更
内嵌 并排
正在显示 包含 321 行增加 和 83 行删除
app_web/src/locale/lanres/entities/exec-result/exec-result_BO_CN_base.ts
浏览文件 @ 9473d716
......@@ -6,7 +6,7 @@ function getLocaleResourceBase(){
id: commonLogic.appcommonhandle("规则执行结果标识",null),
name: commonLogic.appcommonhandle("规则执行结果描述",null),
rule_id: commonLogic.appcommonhandle("规则标识",null),
rule_name: commonLogic.appcommonhandle("规则标识",null),
rule_name: commonLogic.appcommonhandle("规则",null),
ret_value: commonLogic.appcommonhandle("是否匹配",null),
business_cat: commonLogic.appcommonhandle("业务类别",null),
key_value_field: commonLogic.appcommonhandle("标识属性",null),
......@@ -43,7 +43,7 @@ function getLocaleResourceBase(){
srfdeid: commonLogic.appcommonhandle("",null),
srfsourcekey: commonLogic.appcommonhandle("",null),
ru_execresultname: commonLogic.appcommonhandle("规则执行结果描述",null),
rulename: commonLogic.appcommonhandle("规则标识",null),
rulename: commonLogic.appcommonhandle("规则",null),
keyvaluefield: commonLogic.appcommonhandle("标识属性",null),
retvalue: commonLogic.appcommonhandle("是否匹配",null),
dimfield: commonLogic.appcommonhandle("维度属性",null),
......@@ -65,7 +65,7 @@ function getLocaleResourceBase(){
columns: {
ru_execresultname: commonLogic.appcommonhandle("规则执行结果描述",null),
ruleid: commonLogic.appcommonhandle("规则标识",null),
rulename: commonLogic.appcommonhandle("规则标识",null),
rulename: commonLogic.appcommonhandle("规则",null),
retvalue: commonLogic.appcommonhandle("是否匹配",null),
dimfield: commonLogic.appcommonhandle("维度属性",null),
domainsfield: commonLogic.appcommonhandle("分区字段",null),
......@@ -87,7 +87,7 @@ function getLocaleResourceBase(){
formpage1: commonLogic.appcommonhandle("常规条件",null),
n_ru_execresultname_like: commonLogic.appcommonhandle("规则执行结果描述(文本包含(%))",null),
n_rulename_like: commonLogic.appcommonhandle("规则标识(文本包含(%))",null),
n_rulename_eq: commonLogic.appcommonhandle("规则标识(=)",null),
n_rulename_eq: commonLogic.appcommonhandle("规则(=)",null),
n_ruleid_eq: commonLogic.appcommonhandle("规则标识(=)",null),
n_systemid_eq: commonLogic.appcommonhandle("系统标识(=)",null),
},
......
app_web/src/locale/lanres/entities/exec-result/exec-result_en_US_base.ts
浏览文件 @ 9473d716
......@@ -6,7 +6,7 @@ function getLocaleResourceBase(){
id: commonLogic.appcommonhandle("规则执行结果标识",null),
name: commonLogic.appcommonhandle("规则执行结果描述",null),
rule_id: commonLogic.appcommonhandle("规则标识",null),
rule_name: commonLogic.appcommonhandle("规则标识",null),
rule_name: commonLogic.appcommonhandle("规则",null),
ret_value: commonLogic.appcommonhandle("是否匹配",null),
business_cat: commonLogic.appcommonhandle("业务类别",null),
key_value_field: commonLogic.appcommonhandle("标识属性",null),
......@@ -43,7 +43,7 @@ function getLocaleResourceBase(){
srfdeid: commonLogic.appcommonhandle("",null),
srfsourcekey: commonLogic.appcommonhandle("",null),
ru_execresultname: commonLogic.appcommonhandle("规则执行结果描述",null),
rulename: commonLogic.appcommonhandle("规则标识",null),
rulename: commonLogic.appcommonhandle("规则",null),
keyvaluefield: commonLogic.appcommonhandle("标识属性",null),
retvalue: commonLogic.appcommonhandle("是否匹配",null),
dimfield: commonLogic.appcommonhandle("维度属性",null),
......@@ -65,7 +65,7 @@ function getLocaleResourceBase(){
columns: {
ru_execresultname: commonLogic.appcommonhandle("规则执行结果描述",null),
ruleid: commonLogic.appcommonhandle("规则标识",null),
rulename: commonLogic.appcommonhandle("规则标识",null),
rulename: commonLogic.appcommonhandle("规则",null),
retvalue: commonLogic.appcommonhandle("是否匹配",null),
dimfield: commonLogic.appcommonhandle("维度属性",null),
domainsfield: commonLogic.appcommonhandle("分区字段",null),
......@@ -87,7 +87,7 @@ function getLocaleResourceBase(){
formpage1: commonLogic.appcommonhandle("常规条件",null),
n_ru_execresultname_like: commonLogic.appcommonhandle("规则执行结果描述(文本包含(%))",null),
n_rulename_like: commonLogic.appcommonhandle("规则标识(文本包含(%))",null),
n_rulename_eq: commonLogic.appcommonhandle("规则标识(=)",null),
n_rulename_eq: commonLogic.appcommonhandle("规则(=)",null),
n_ruleid_eq: commonLogic.appcommonhandle("规则标识(=)",null),
n_systemid_eq: commonLogic.appcommonhandle("系统标识(=)",null),
},
......
app_web/src/locale/lanres/entities/exec-result/exec-result_zh_CN_base.ts
浏览文件 @ 9473d716
......@@ -6,7 +6,7 @@ function getLocaleResourceBase(){
id: commonLogic.appcommonhandle("规则执行结果标识",null),
name: commonLogic.appcommonhandle("规则执行结果描述",null),
rule_id: commonLogic.appcommonhandle("规则标识",null),
rule_name: commonLogic.appcommonhandle("规则标识",null),
rule_name: commonLogic.appcommonhandle("规则",null),
ret_value: commonLogic.appcommonhandle("是否匹配",null),
business_cat: commonLogic.appcommonhandle("业务类别",null),
key_value_field: commonLogic.appcommonhandle("标识属性",null),
......@@ -43,7 +43,7 @@ function getLocaleResourceBase(){
srfdeid: commonLogic.appcommonhandle("",null),
srfsourcekey: commonLogic.appcommonhandle("",null),
ru_execresultname: commonLogic.appcommonhandle("规则执行结果描述",null),
rulename: commonLogic.appcommonhandle("规则标识",null),
rulename: commonLogic.appcommonhandle("规则",null),
keyvaluefield: commonLogic.appcommonhandle("标识属性",null),
retvalue: commonLogic.appcommonhandle("是否匹配",null),
dimfield: commonLogic.appcommonhandle("维度属性",null),
......@@ -65,7 +65,7 @@ function getLocaleResourceBase(){
columns: {
ru_execresultname: commonLogic.appcommonhandle("规则执行结果描述",null),
ruleid: commonLogic.appcommonhandle("规则标识",null),
rulename: commonLogic.appcommonhandle("规则标识",null),
rulename: commonLogic.appcommonhandle("规则",null),
retvalue: commonLogic.appcommonhandle("是否匹配",null),
dimfield: commonLogic.appcommonhandle("维度属性",null),
domainsfield: commonLogic.appcommonhandle("分区字段",null),
......@@ -87,7 +87,7 @@ function getLocaleResourceBase(){
formpage1: commonLogic.appcommonhandle("常规条件",null),
n_ru_execresultname_like: commonLogic.appcommonhandle("规则执行结果描述(文本包含(%))",null),
n_rulename_like: commonLogic.appcommonhandle("规则标识(文本包含(%))",null),
n_rulename_eq: commonLogic.appcommonhandle("规则标识(=)",null),
n_rulename_eq: commonLogic.appcommonhandle("规则(=)",null),
n_ruleid_eq: commonLogic.appcommonhandle("规则标识(=)",null),
n_systemid_eq: commonLogic.appcommonhandle("系统标识(=)",null),
},
......
app_web/src/locale/lanres/entities/meta-model/meta-model_BO_CN_base.ts
浏览文件 @ 9473d716
......@@ -104,14 +104,14 @@ function getLocaleResourceBase(){
},
},
gridviewtoolbar_toolbar: {
tbitem1_import: {
caption: commonLogic.appcommonhandle("模型导入",null),
tip: commonLogic.appcommonhandle("模型导入",null),
},
tbitem1_export: {
caption: commonLogic.appcommonhandle("模型导出",null),
tip: commonLogic.appcommonhandle("模型导出",null),
},
tbitem1_import: {
caption: commonLogic.appcommonhandle("模型导入",null),
tip: commonLogic.appcommonhandle("模型导入",null),
},
tbitem2: {
caption: commonLogic.appcommonhandle("-",null),
tip: commonLogic.appcommonhandle("",null),
......
app_web/src/locale/lanres/entities/meta-model/meta-model_en_US_base.ts
浏览文件 @ 9473d716
......@@ -104,14 +104,14 @@ function getLocaleResourceBase(){
},
},
gridviewtoolbar_toolbar: {
tbitem1_import: {
caption: commonLogic.appcommonhandle("模型导入",null),
tip: commonLogic.appcommonhandle("模型导入",null),
},
tbitem1_export: {
caption: commonLogic.appcommonhandle("模型导出",null),
tip: commonLogic.appcommonhandle("模型导出",null),
},
tbitem1_import: {
caption: commonLogic.appcommonhandle("模型导入",null),
tip: commonLogic.appcommonhandle("模型导入",null),
},
tbitem2: {
caption: commonLogic.appcommonhandle("-",null),
tip: commonLogic.appcommonhandle("",null),
......
app_web/src/locale/lanres/entities/meta-model/meta-model_zh_CN_base.ts
浏览文件 @ 9473d716
......@@ -104,14 +104,14 @@ function getLocaleResourceBase(){
},
},
gridviewtoolbar_toolbar: {
tbitem1_import: {
caption: commonLogic.appcommonhandle("模型导入",null),
tip: commonLogic.appcommonhandle("模型导入",null),
},
tbitem1_export: {
caption: commonLogic.appcommonhandle("模型导出",null),
tip: commonLogic.appcommonhandle("模型导出",null),
},
tbitem1_import: {
caption: commonLogic.appcommonhandle("模型导入",null),
tip: commonLogic.appcommonhandle("模型导入",null),
},
tbitem2: {
caption: commonLogic.appcommonhandle("-",null),
tip: commonLogic.appcommonhandle("",null),
......
app_web/src/pages/lite/meta-model-grid-view/meta-model-grid-view-base.vue
浏览文件 @ 9473d716
......@@ -13,18 +13,18 @@
<div class='pull-right'>
<div class='toolbar-container'>
<tooltip :transfer="true" :max-width="600">
<i-button v-show="toolBarModels.tbitem1_import.visabled" :disabled="toolBarModels.tbitem1_import.disabled" class='' v-loading:i-button @click="toolbar_click({ tag: 'tbitem1_import' }, $event)">
<i-button v-show="toolBarModels.tbitem1_export.visabled" :disabled="toolBarModels.tbitem1_export.disabled" class='' v-loading:i-button @click="toolbar_click({ tag: 'tbitem1_export' }, $event)">
<i class=''></i>
<span class='caption'>{{$t('entities.metamodel.gridviewtoolbar_toolbar.tbitem1_import.caption')}}</span>
<span class='caption'>{{$t('entities.metamodel.gridviewtoolbar_toolbar.tbitem1_export.caption')}}</span>
</i-button>
<div slot='content'>{{$t('entities.metamodel.gridviewtoolbar_toolbar.tbitem1_import.tip')}}</div>
<div slot='content'>{{$t('entities.metamodel.gridviewtoolbar_toolbar.tbitem1_export.tip')}}</div>
</tooltip>
<tooltip :transfer="true" :max-width="600">
<i-button v-show="toolBarModels.tbitem1_export.visabled" :disabled="toolBarModels.tbitem1_export.disabled" class='' v-loading:i-button @click="toolbar_click({ tag: 'tbitem1_export' }, $event)">
<i-button v-show="toolBarModels.tbitem1_import.visabled" :disabled="toolBarModels.tbitem1_import.disabled" class='' v-loading:i-button @click="toolbar_click({ tag: 'tbitem1_import' }, $event)">
<i class=''></i>
<span class='caption'>{{$t('entities.metamodel.gridviewtoolbar_toolbar.tbitem1_export.caption')}}</span>
<span class='caption'>{{$t('entities.metamodel.gridviewtoolbar_toolbar.tbitem1_import.caption')}}</span>
</i-button>
<div slot='content'>{{$t('entities.metamodel.gridviewtoolbar_toolbar.tbitem1_export.tip')}}</div>
<div slot='content'>{{$t('entities.metamodel.gridviewtoolbar_toolbar.tbitem1_import.tip')}}</div>
</tooltip>
<span class='seperator'>|</span>
<tooltip :transfer="true" :max-width="600">
......@@ -384,10 +384,10 @@ export default class MetaModelGridViewBase extends Vue {
* @memberof MetaModelGridView
*/
public toolBarModels: any = {
tbitem1_import: { name: 'tbitem1_import', actiontarget: 'NONE', caption: '模型导入', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'import', target: 'NONE' } },
tbitem1_export: { name: 'tbitem1_export', actiontarget: 'NONE', caption: '模型导出', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'export', target: 'MULTIKEY' } },
tbitem1_import: { name: 'tbitem1_import', actiontarget: 'NONE', caption: '模型导入', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'import', target: 'NONE' } },
tbitem2: { name: 'tbitem2', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
tbitem3: { name: 'tbitem3', actiontarget: 'NONE', caption: '新建', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'New', target: '' } },
......@@ -764,12 +764,12 @@ export default class MetaModelGridViewBase extends Vue {
* @memberof MetaModelGridViewBase
*/
public toolbar_click($event: any, $event2?: any) {
if (Object.is($event.tag, 'tbitem1_import')) {
this.toolbar_tbitem1_import_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem1_export')) {
this.toolbar_tbitem1_export_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem1_import')) {
this.toolbar_tbitem1_import_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem3')) {
this.toolbar_tbitem3_click(null, '', $event2);
}
......@@ -920,7 +920,7 @@ export default class MetaModelGridViewBase extends Vue {
* @param {*} [$event]
* @memberof
*/
public toolbar_tbitem1_import_click(params: any = {}, tag?: any, $event?: any) {
public toolbar_tbitem1_export_click(params: any = {}, tag?: any, $event?: any) {
// 参数
// 取数
let datas: any[] = [];
......@@ -938,7 +938,7 @@ export default class MetaModelGridViewBase extends Vue {
}
// 界面行为
const curUIService:MetaModelUIService = new MetaModelUIService();
curUIService.MetaModel_import(datas,contextJO, paramJO, $event, xData,this,"MetaModel");
curUIService.MetaModel_export(datas,contextJO, paramJO, $event, xData,this,"MetaModel");
}
/**
......@@ -949,7 +949,7 @@ export default class MetaModelGridViewBase extends Vue {
* @param {*} [$event]
* @memberof
*/
public toolbar_tbitem1_export_click(params: any = {}, tag?: any, $event?: any) {
public toolbar_tbitem1_import_click(params: any = {}, tag?: any, $event?: any) {
// 参数
// 取数
let datas: any[] = [];
......@@ -967,7 +967,7 @@ export default class MetaModelGridViewBase extends Vue {
}
// 界面行为
const curUIService:MetaModelUIService = new MetaModelUIService();
curUIService.MetaModel_export(datas,contextJO, paramJO, $event, xData,this,"MetaModel");
curUIService.MetaModel_import(datas,contextJO, paramJO, $event, xData,this,"MetaModel");
}
/**
......
app_web/src/widgets/exec-result/default-searchform/default-searchform-base.vue
浏览文件 @ 9473d716
......@@ -337,7 +337,7 @@ export default class DefaultBase extends Vue implements ControlInterface {
,
n_rulename_like: new FormItemModel({ caption: '规则标识(文本包含(%))', detailType: 'FORMITEM', name: 'n_rulename_like', visible: true, isShowCaption: true, form: this,required:false, disabled: false, enableCond: 3 })
,
n_rulename_eq: new FormItemModel({ caption: '规则标识(=)', detailType: 'FORMITEM', name: 'n_rulename_eq', visible: true, isShowCaption: true, form: this,required:false, disabled: false, enableCond: 3 })
n_rulename_eq: new FormItemModel({ caption: '规则(=)', detailType: 'FORMITEM', name: 'n_rulename_eq', visible: true, isShowCaption: true, form: this,required:false, disabled: false, enableCond: 3 })
,
n_ruleid_eq: new FormItemModel({ caption: '规则标识(=)', detailType: 'FORMITEM', name: 'n_ruleid_eq', visible: true, isShowCaption: true, form: this,required:false, disabled: false, enableCond: 3 })
,
......@@ -365,10 +365,10 @@ export default class DefaultBase extends Vue implements ControlInterface {
{ required: this.detailsModel.n_rulename_like.required, type: 'string', message: '规则标识(文本包含(%)) 值不能为空', trigger: 'blur' },
],
n_rulename_eq: [
{ type: 'string', message: '规则标识(=) 值必须为字符串类型', trigger: 'change' },
{ type: 'string', message: '规则标识(=) 值必须为字符串类型', trigger: 'blur' },
{ required: this.detailsModel.n_rulename_eq.required, type: 'string', message: '规则标识(=) 值不能为空', trigger: 'change' },
{ required: this.detailsModel.n_rulename_eq.required, type: 'string', message: '规则标识(=) 值不能为空', trigger: 'blur' },
{ type: 'string', message: '规则(=) 值必须为字符串类型', trigger: 'change' },
{ type: 'string', message: '规则(=) 值必须为字符串类型', trigger: 'blur' },
{ required: this.detailsModel.n_rulename_eq.required, type: 'string', message: '规则(=) 值不能为空', trigger: 'change' },
{ required: this.detailsModel.n_rulename_eq.required, type: 'string', message: '规则(=) 值不能为空', trigger: 'blur' },
],
n_ruleid_eq: [
{ type: 'string', message: '规则标识(=) 值必须为字符串类型', trigger: 'change' },
......
app_web/src/widgets/exec-result/main-form/main-form-base.vue
浏览文件 @ 9473d716
......@@ -674,8 +674,8 @@ export default class MainBase extends Vue implements ControlInterface {
{ required: this.detailsModel.ru_execresultname.required, type: 'string', message: '规则执行结果描述 值不能为空', trigger: 'blur' },
],
rulename: [
{ required: this.detailsModel.rulename.required, type: 'string', message: '规则标识 值不能为空', trigger: 'change' },
{ required: this.detailsModel.rulename.required, type: 'string', message: '规则标识 值不能为空', trigger: 'blur' },
{ required: this.detailsModel.rulename.required, type: 'string', message: '规则 值不能为空', trigger: 'change' },
{ required: this.detailsModel.rulename.required, type: 'string', message: '规则 值不能为空', trigger: 'blur' },
],
keyvaluefield: [
{ required: this.detailsModel.keyvaluefield.required, type: 'string', message: '标识属性 值不能为空', trigger: 'change' },
......@@ -850,7 +850,7 @@ export default class MainBase extends Vue implements ControlInterface {
,
ru_execresultname: new FormItemModel({ caption: '规则执行结果描述', detailType: 'FORMITEM', name: 'ru_execresultname', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
,
rulename: new FormItemModel({ caption: '规则标识', detailType: 'FORMITEM', name: 'rulename', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
rulename: new FormItemModel({ caption: '规则', detailType: 'FORMITEM', name: 'rulename', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
,
keyvaluefield: new FormItemModel({ caption: '标识属性', detailType: 'FORMITEM', name: 'keyvaluefield', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:true, disabled: false, enableCond: 3 })
,
......
app_web/src/widgets/exec-result/main-grid/main-grid-base.vue
浏览文件 @ 9473d716
......@@ -769,7 +769,7 @@ export default class MainBase extends Vue implements ControlInterface {
},
{
name: 'rulename',
label: '规则标识',
label: '规则',
langtag: 'entities.execresult.main_grid.columns.rulename',
show: true,
unit: 'PX',
......
ibzdst-app/ibzdst-app-web/pom.xml
浏览文件 @ 9473d716
......@@ -12,6 +12,7 @@
<artifactId>ibzdst-app-web</artifactId>
<name>Ibzdst Gateway web</name>
<description>Ibzdst web</description>
<packaging>${project.packaging}</packaging>
<dependencies>
<dependency>
......@@ -22,6 +23,7 @@
</dependencies>
<properties>
<project.packaging>jar</project.packaging>
<docker.image.prefix>registry.cn-shanghai.aliyuncs.com/ibizsys</docker.image.prefix>
</properties>
......@@ -144,6 +146,125 @@
</plugins>
</build>
</profile>
<profile>
<id>web-war</id>
<properties>
<project.packaging>war</project.packaging>
</properties>
<build>
<resources>
<resource>
<directory>${basedir}/src/main/webapp</directory>
<!--注意此次必须要放在此目录下才能被访问到 -->
<targetPath>META-INF/resources</targetPath>
<includes>
<include>**/**</include>
</includes>
</resource>
<resource>
<directory>${basedir}/src/main/resources</directory>
<includes>
<include>**/**</include>
</includes>
</resource>
</resources>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>1.6.0</version>
<executions>
<execution>
<id>exec-yarn-run-install</id>
<phase>prepare-package</phase>
<goals>
<goal>exec</goal>
</goals>
<configuration>
<executable>yarn</executable>
<workingDirectory>../../app_web</workingDirectory>
</configuration>
</execution>
<execution>
<id>exec-yarn-run-build</id>
<phase>prepare-package</phase>
<goals>
<goal>exec</goal>
</goals>
<configuration>
<executable>yarn</executable>
<arguments>
<argument>build</argument>
</arguments>
<workingDirectory>../../app_web</workingDirectory>
</configuration>
</execution>
<execution>
<id>prepare</id>
<configuration>
<executable>cp</executable>
<arguments>
<argument>../../${project.artifactId}.war</argument>
<argument>${project.basedir}/src/main/dockerwar/</argument>
</arguments>
</configuration>
</execution>
<execution>
<id>buildpush</id>
<configuration>
<executable>docker</executable>
<arguments>
<argument>buildx</argument>
<argument>build</argument>
<argument>--platform</argument>
<argument>linux/arm64</argument>
<argument>-t</argument>
<argument>${docker.image.prefix}/${project.artifactId}:latest</argument>
<argument>${project.basedir}/src/main/dockerwar</argument>
<argument>--push</argument>
</arguments>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<configuration>
<finalName>ibzdst-app-web</finalName>
<jvmArguments>-Dfile.encoding=UTF-8</jvmArguments>
<mainClass>cn.ibizlab.web.webApplication</mainClass>
<outputDirectory>../../</outputDirectory>
</configuration>
<executions>
<execution>
<goals>
<goal>repackage</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>com.spotify</groupId>
<artifactId>docker-maven-plugin</artifactId>
<version>0.4.13</version>
<configuration>
<serverId>ibiz-dev</serverId>
<imageName>${docker.image.prefix}/${project.artifactId}:latest</imageName>
<dockerDirectory>${project.basedir}/src/main/dockerwar</dockerDirectory>
<resources>
<resource>
<targetPath>/</targetPath>
<directory>../../</directory>
<include>${project.artifactId}.war</include>
</resource>
</resources>
</configuration>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>
......
ibzdst-app/ibzdst-app-web/src/main/dockerwar/Dockerfile 0 → 100644
浏览文件 @ 9473d716
FROM registry.cn-shanghai.aliyuncs.com/ibizops/tongweb:arm-7.0
ENV TZ Asia/Shanghai
ENV LANG C.UTF-8
WORKDIR /opt/tongtech
ADD ibzdst-app-web.war .
RUN echo -e 'export LANG="zh_CN.UTF-8"\nexport LC_ALL="zh_CN.UTF-8"' > /etc/locale.conf
RUN unzip -oq ibzdst-app-web.war -d ./TongWeb7.0/deployment/jcyweb
ENTRYPOINT /opt/tongtech/TongWeb7.0/bin/startserver.sh
ibzdst-core/src/main/java/cn/ibizlab/core/rule/domain/ExecResult.java
浏览文件 @ 9473d716
......@@ -73,12 +73,12 @@ public class ExecResult extends EntityMP implements Serializable {
@ApiModelProperty("规则标识")
private String ruleId;
/**
* 规则标识
* 规则
*/
@TableField(value = "rulename")
@JSONField(name = "rule_name")
@JsonProperty("rule_name")
@ApiModelProperty("规则标识")
@ApiModelProperty("规则")
private String ruleName;
/**
* 是否匹配
......@@ -209,7 +209,7 @@ public class ExecResult extends EntityMP implements Serializable {
}
/**
* 设置 [规则标识]
* 设置 [规则]
*/
public void setRuleName(String ruleName) {
this.ruleName = ruleName;
......
ibzdst-core/src/main/java/cn/ibizlab/core/rule/filter/ExecResultSearchContext.java
浏览文件 @ 9473d716
......@@ -41,14 +41,14 @@ public class ExecResultSearchContext extends QueryWrapperContext<ExecResult> {
this.getSearchCond().eq("ruleid", n_ruleid_eq);
}
}
private String n_rulename_eq;//[规则标识]
private String n_rulename_eq;//[规则]
public void setN_rulename_eq(String n_rulename_eq) {
this.n_rulename_eq = n_rulename_eq;
if(!ObjectUtils.isEmpty(this.n_rulename_eq)){
this.getSearchCond().eq("rulename", n_rulename_eq);
}
}
private String n_rulename_like;//[规则标识]
private String n_rulename_like;//[规则]
public void setN_rulename_like(String n_rulename_like) {
this.n_rulename_like = n_rulename_like;
if(!ObjectUtils.isEmpty(this.n_rulename_like)){
......
ibzdst-core/src/main/resources/liquibase/h2_table.xml
浏览文件 @ 9473d716
......@@ -102,14 +102,14 @@
<!--输出实体[DICT_CATALOG]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-dict_catalog-8-5">
<changeSet author="a_A_5d9d78509" id="tab-dict_catalog-9-5">
<createTable tableName="IBZDICTCATALOG">
<column name="CID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_DICT_CATALOG_CID"/>
</column>
<column name="CCODE" remarks="" type="VARCHAR(100)">
</column>
<column name="CNAME" remarks="" type="VARCHAR(100)">
<column name="CNAME" remarks="" type="VARCHAR(300)">
</column>
<column name="CGROUP" remarks="" type="VARCHAR(100)">
</column>
......@@ -128,18 +128,18 @@
<!--输出实体[DICT_OPTION]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-dict_option-8-6">
<changeSet author="a_A_5d9d78509" id="tab-dict_option-9-6">
<createTable tableName="IBZDICTOPTION">
<column name="VKEY" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_DICT_OPTION_VKEY"/>
</column>
<column name="CID" remarks="" type="VARCHAR(100)">
</column>
<column name="CNAME" remarks="" type="VARCHAR(100)">
<column name="CNAME" remarks="" type="VARCHAR(300)">
</column>
<column name="VAL" remarks="" type="VARCHAR(40)">
</column>
<column name="LABEL" remarks="" type="VARCHAR(100)">
<column name="LABEL" remarks="" type="VARCHAR(300)">
</column>
<column name="PVAL" remarks="" type="VARCHAR(40)">
</column>
......@@ -234,7 +234,7 @@
<!--输出实体[RU_EXECRESULT]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-ru_execresult-1-10">
<changeSet author="a_A_5d9d78509" id="tab-ru_execresult-2-10">
<createTable tableName="IBZRULERESULT">
<column name="RU_EXECRESULTID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_RU_EXECRESULT_RU_EXECRESULT"/>
......@@ -243,7 +243,7 @@
</column>
<column name="RULEID" remarks="" type="VARCHAR(100)">
</column>
<column name="RULENAME" remarks="" type="VARCHAR(100)">
<column name="RULENAME" remarks="" type="VARCHAR(300)">
</column>
<column name="RETVALUE" remarks="" type="INT">
</column>
......@@ -296,14 +296,14 @@
<!--输出实体[META_ENTITY]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-meta_entity-5-12">
<changeSet author="a_A_5d9d78509" id="tab-meta_entity-6-12">
<createTable tableName="IBZENTITY">
<column name="ENTITYID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_META_ENTITY_ENTITYID"/>
</column>
<column name="ENTITYNAME" remarks="" type="VARCHAR(100)">
</column>
<column name="LOGICNAME" remarks="" type="VARCHAR(100)">
<column name="LOGICNAME" remarks="" type="VARCHAR(300)">
</column>
<column name="CODENAME" remarks="" type="VARCHAR(100)">
</column>
......@@ -328,7 +328,7 @@
<!--输出实体[META_FIELD]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-meta_field-11-13">
<changeSet author="a_A_5d9d78509" id="tab-meta_field-12-13">
<createTable tableName="IBZFIELD">
<column name="FIELDID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_META_FIELD_FIELDID"/>
......@@ -341,7 +341,7 @@
</column>
<column name="ENTITYNAME" remarks="" type="VARCHAR(100)">
</column>
<column name="FIELDLOGICNAME" remarks="" type="VARCHAR(100)">
<column name="FIELDLOGICNAME" remarks="" type="VARCHAR(300)">
</column>
<column name="REFFIELDID" remarks="" type="VARCHAR(100)">
</column>
......@@ -496,12 +496,12 @@
<!--输出实体[RU_ITEM]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-ru_item-13-18">
<changeSet author="a_A_5d9d78509" id="tab-ru_item-14-18">
<createTable tableName="IBZRULE">
<column name="RULEID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_RU_ITEM_RULEID"/>
</column>
<column name="RULENAME" remarks="" type="VARCHAR(100)">
<column name="RULENAME" remarks="" type="VARCHAR(300)">
</column>
<column name="RULEGROUP" remarks="" type="VARCHAR(100)">
</column>
......@@ -593,7 +593,7 @@
<!--输出实体[DA_REPORT]外键关系 -->
<!--输出实体[DICT_CATALOG]外键关系 -->
<!--输出实体[DICT_OPTION]外键关系 -->
<changeSet author="a_A_5d9d78509" id="fk-dict_option-8-21">
<changeSet author="a_A_5d9d78509" id="fk-dict_option-9-21">
<addForeignKeyConstraint baseColumnNames="CID" baseTableName="IBZDICTOPTION" constraintName="DER1N_DICT_OPTION_DICT_CATALOG" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="CID" referencedTableName="IBZDICTCATALOG" validate="true"/>
</changeSet>
<!--输出实体[DST_DATASOURCE]外键关系 -->
......
ibzdst-core/src/main/resources/sysmodel/ibzdst.json
浏览文件 @ 9473d716
......@@ -807,7 +807,7 @@
"nullable":0,
"physical_field":1,
"data_type":"VARCHAR",
"data_length":100,
"data_length":300,
"key_field":0,
"show_order":3,
"major_field":1
......@@ -965,7 +965,7 @@
"nullable":0,
"physical_field":1,
"data_type":"VARCHAR",
"data_length":100,
"data_length":300,
"key_field":0,
"show_order":3,
"major_field":0
......@@ -994,7 +994,7 @@
"nullable":0,
"physical_field":1,
"data_type":"VARCHAR",
"data_length":100,
"data_length":300,
"key_field":0,
"show_order":5,
"major_field":1
......@@ -1738,7 +1738,7 @@
{
"fieldname":"RULENAME" ,
"codename":"Rule_name",
"field_logic_name":"规则标识",
"field_logic_name":"规则",
"entity_name":"RU_EXECRESULT",
"ref_de":"RU_ITEM",
"ref_field_name":"RULENAME",
......@@ -1748,7 +1748,7 @@
"nullable":1,
"physical_field":1,
"data_type":"VARCHAR",
"data_length":100,
"data_length":300,
"key_field":0,
"show_order":4,
"major_field":0
......@@ -2119,7 +2119,7 @@
"nullable":1,
"physical_field":1,
"data_type":"VARCHAR",
"data_length":100,
"data_length":300,
"key_field":0,
"show_order":3,
"major_field":0
......@@ -2512,7 +2512,7 @@
"nullable":1,
"physical_field":1,
"data_type":"VARCHAR",
"data_length":100,
"data_length":300,
"key_field":0,
"show_order":7,
"major_field":0
......@@ -3800,7 +3800,7 @@
"nullable":1,
"physical_field":1,
"data_type":"VARCHAR",
"data_length":100,
"data_length":300,
"key_field":0,
"show_order":2,
"major_field":1
......
ibzdst-provider/ibzdst-provider-api/pom.xml
浏览文件 @ 9473d716
......@@ -12,6 +12,7 @@
<artifactId>ibzdst-provider-api</artifactId>
<name>Ibzdst Microservice api</name>
<description> micorservice</description>
<packaging>${project.packaging}</packaging>
<dependencies>
<dependency>
......@@ -21,10 +22,13 @@
</dependency>
</dependencies>
<properties>
<project.packaging>jar</project.packaging>
<docker.image.prefix>registry.cn-shanghai.aliyuncs.com/ibizsys</docker.image.prefix>
</properties>
<profiles>
<profile>
<id>api</id>
......@@ -111,6 +115,95 @@
</plugins>
</build>
</profile>
<profile>
<id>api-war</id>
<properties>
<project.packaging>war</project.packaging>
</properties>
<build>
<resources>
<resource>
<directory>${basedir}/src/main/resources</directory>
<includes>
<include>**/**</include>
</includes>
</resource>
</resources>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<configuration>
<finalName>ibzdst-provider-api</finalName>
<jvmArguments>-Dfile.encoding=UTF-8</jvmArguments>
<mainClass>cn.ibizlab.api.ibzdstapiApplication</mainClass>
<outputDirectory>../../</outputDirectory>
</configuration>
<executions>
<execution>
<goals>
<goal>repackage</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>com.spotify</groupId>
<artifactId>docker-maven-plugin</artifactId>
<version>0.4.13</version>
<configuration>
<serverId>ibiz-dev</serverId>
<imageName>${docker.image.prefix}/${project.artifactId}:latest</imageName>
<dockerDirectory>${project.basedir}/src/main/dockerwar</dockerDirectory>
<resources>
<resource>
<targetPath>/</targetPath>
<directory>../../</directory>
<include>${project.artifactId}.war</include>
</resource>
</resources>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>3.0.0</version>
<executions>
<execution>
<id>prepare</id>
<configuration>
<executable>cp</executable>
<arguments>
<argument>../../${project.artifactId}.war</argument>
<argument>${project.basedir}/src/main/dockerwar/</argument>
</arguments>
</configuration>
</execution>
<execution>
<id>buildpush</id>
<configuration>
<executable>docker</executable>
<arguments>
<argument>buildx</argument>
<argument>build</argument>
<argument>--platform</argument>
<argument>linux/arm64</argument>
<argument>-t</argument>
<argument>${docker.image.prefix}/${project.artifactId}:latest</argument>
<argument>${project.basedir}/src/main/dockerwar</argument>
<argument>--push</argument>
</arguments>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>
ibzdst-provider/ibzdst-provider-api/src/main/dockerwar/Dockerfile 0 → 100644
浏览文件 @ 9473d716
FROM registry.cn-shanghai.aliyuncs.com/ibizops/tongweb:arm-7.0
ENV TZ Asia/Shanghai
ENV LANG C.UTF-8
WORKDIR /opt/tongtech
ADD ibzdst-provider-api.war .
RUN echo -e 'export LANG="zh_CN.UTF-8"\nexport LC_ALL="zh_CN.UTF-8"' > /etc/locale.conf
RUN unzip -oq ibzdst-provider-api.war -d ./TongWeb7.0/deployment/jcyweb
ENTRYPOINT /opt/tongtech/TongWeb7.0/bin/startserver.sh
ibzdst-provider/ibzdst-provider-api/src/main/java/cn/ibizlab/api/dto/DictCatalogDTO.java
浏览文件 @ 9473d716
......@@ -60,7 +60,7 @@ public class DictCatalogDTO extends DTOBase implements Serializable {
@JSONField(name = "name")
@JsonProperty("name")
@NotBlank(message = "[名称]不允许为空!")
@Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
@Size(min = 0, max = 300, message = "内容长度必须小于等于[300]")
@ApiModelProperty("名称")
private String name;
......
ibzdst-provider/ibzdst-provider-api/src/main/java/cn/ibizlab/api/dto/DictOptionDTO.java
浏览文件 @ 9473d716
......@@ -60,7 +60,7 @@ public class DictOptionDTO extends DTOBase implements Serializable {
@JSONField(name = "catalog_name")
@JsonProperty("catalog_name")
@NotBlank(message = "[目录]不允许为空!")
@Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
@Size(min = 0, max = 300, message = "内容长度必须小于等于[300]")
@ApiModelProperty("目录")
private String catalogName;
......@@ -82,7 +82,7 @@ public class DictOptionDTO extends DTOBase implements Serializable {
@JSONField(name = "label")
@JsonProperty("label")
@NotBlank(message = "[名称]不允许为空!")
@Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
@Size(min = 0, max = 300, message = "内容长度必须小于等于[300]")
@ApiModelProperty("名称")
private String label;
......
ibzdst-provider/ibzdst-provider-api/src/main/java/cn/ibizlab/api/dto/ExecResultDTO.java
浏览文件 @ 9473d716
......@@ -68,8 +68,8 @@ public class ExecResultDTO extends DTOBase implements Serializable {
*/
@JSONField(name = "rule_name")
@JsonProperty("rule_name")
@Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
@ApiModelProperty("规则标识")
@Size(min = 0, max = 300, message = "内容长度必须小于等于[300]")
@ApiModelProperty("规则")
private String ruleName;
/**
......
ibzdst-provider/ibzdst-provider-api/src/main/java/cn/ibizlab/api/dto/MetaEntityDTO.java
浏览文件 @ 9473d716
......@@ -58,7 +58,7 @@ public class MetaEntityDTO extends DTOBase implements Serializable {
*/
@JSONField(name = "logic_name")
@JsonProperty("logic_name")
@Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
@Size(min = 0, max = 300, message = "内容长度必须小于等于[300]")
@ApiModelProperty("逻辑名称")
private String logicName;
......
ibzdst-provider/ibzdst-provider-api/src/main/java/cn/ibizlab/api/dto/MetaFieldDTO.java
浏览文件 @ 9473d716
......@@ -108,7 +108,7 @@ public class MetaFieldDTO extends DTOBase implements Serializable {
*/
@JSONField(name = "field_logic_name")
@JsonProperty("field_logic_name")
@Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
@Size(min = 0, max = 300, message = "内容长度必须小于等于[300]")
@ApiModelProperty("属性逻辑名")
private String fieldLogicName;
......
ibzdst-provider/ibzdst-provider-api/src/main/java/cn/ibizlab/api/dto/RuleItemDTO.java
浏览文件 @ 9473d716
......@@ -48,7 +48,7 @@ public class RuleItemDTO extends DTOBase implements Serializable {
*/
@JSONField(name = "rule_name")
@JsonProperty("rule_name")
@Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
@Size(min = 0, max = 300, message = "内容长度必须小于等于[300]")
@ApiModelProperty("名称")
private String ruleName;
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或