Skip to content

T
TrainSys
提交 8e6fbef8 编写于 作者: ibizdev's avatar ibizdev
浏览文件
操作

lxm1993 发布系统代码 [TrainSys，网页端]

上级 c4779e93
展开全部 隐藏空白字符变更
内嵌 并排
正在显示 包含 411 行增加 和 450 行删除
app_Web/src/components/editor/date-picker/ibiz-date-picker/ibiz-date-picker.tsx
浏览文件 @ 8e6fbef8
...@@ -38,6 +38,12 @@ export const IBizDatePicker = defineComponent({ ...@@ -38,6 +38,12 @@ export const IBizDatePicker = defineComponent({
// 值格式化 // 值格式化
const valueFormat = c!.valueFormat; const valueFormat = c!.valueFormat;
if (valueFormat) { if (valueFormat) {
// 根据值格式化改变type
if (valueFormat === 'YYYY-MM') {
type.value = 'month';
} else if (valueFormat === 'YYYY') {
type.value = 'year';
}
const tempFormat: string = valueFormat const tempFormat: string = valueFormat
.replace('YYYY', 'yyyy') .replace('YYYY', 'yyyy')
.replace('DD', 'dd'); .replace('DD', 'dd');
......
config.xml
浏览文件 @ 8e6fbef8
...@@ -55,12 +55,6 @@ ...@@ -55,12 +55,6 @@
git clone -b master $para2 trainsys/ git clone -b master $para2 trainsys/
export NODE_OPTIONS=--max-old-space-size=4096 export NODE_OPTIONS=--max-old-space-size=4096
cd trainsys/ cd trainsys/
mvn clean package -Ptrainsys
mvn install -Ptrainsys
cd trainsys-provider
mvn -Ptrainsys docker:build
mvn -Ptrainsys docker:push
docker -H $para1 stack deploy --compose-file=src/main/docker/trainsys-provider-trainsys.yaml ebsx --with-registry-auth
</command> </command>
</hudson.tasks.Shell> </hudson.tasks.Shell>
</builders> </builders>
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Book/PSGRIDS/InfoGrid.json
浏览文件 @ 8e6fbef8
...@@ -19,35 +19,35 @@ ...@@ -19,35 +19,35 @@
"getPSAppViewLogics" : [ { "getPSAppViewLogics" : [ {
"logicTrigger" : "CUSTOM", "logicTrigger" : "CUSTOM",
"logicType" : "APPVIEWUIACTION", "logicType" : "APPVIEWUIACTION",
"name" : "grid_uagridcolumn1_u1feafb4_click", "name" : "grid_uagridcolumn1_u4c6267d_click",
"getPSAppViewUIAction" : { "getPSAppViewUIAction" : {
"modelref" : true, "modelref" : true,
"id" : "表格界面_编辑操作" "id" : "表格界面_删除操作"
} }
}, { }, {
"logicTrigger" : "CUSTOM", "logicTrigger" : "CUSTOM",
"logicType" : "APPVIEWUIACTION", "logicType" : "APPVIEWUIACTION",
"name" : "grid_uagridcolumn1_u4c6267d_click", "name" : "grid_uagridcolumn1_u1feafb4_click",
"getPSAppViewUIAction" : { "getPSAppViewUIAction" : {
"modelref" : true, "modelref" : true,
"id" : "表格界面_删除操作" "id" : "表格界面_编辑操作"
} }
} ], } ],
"getPSAppViewUIActions" : [ { "getPSAppViewUIActions" : [ {
"name" : "表格界面_编辑操作", "name" : "表格界面_删除操作",
"getPSUIAction" : { "getPSUIAction" : {
"modelref" : true, "modelref" : true,
"id" : "Edit" "id" : "Remove"
}, },
"uIActionTarget" : "SINGLEKEY", "uIActionTarget" : "MULTIKEY",
"xDataControlName" : "grid" "xDataControlName" : "grid"
}, { }, {
"name" : "表格界面_删除操作", "name" : "表格界面_编辑操作",
"getPSUIAction" : { "getPSUIAction" : {
"modelref" : true, "modelref" : true,
"id" : "Remove" "id" : "Edit"
}, },
"uIActionTarget" : "MULTIKEY", "uIActionTarget" : "SINGLEKEY",
"xDataControlName" : "grid" "xDataControlName" : "grid"
} ], } ],
"getPSControlLogics" : [ { "getPSControlLogics" : [ {
...@@ -168,48 +168,6 @@ ...@@ -168,48 +168,6 @@
"getPSDEUIActionGroup" : { "getPSDEUIActionGroup" : {
"name" : "界面行为组", "name" : "界面行为组",
"getPSUIActionGroupDetails" : [ { "getPSUIActionGroupDetails" : [ {
"detailType" : "DEUIACTION",
"name" : "u1feafb4",
"getPSUIAction" : {
"actionTarget" : "SINGLEKEY",
"getCapPSLanguageRes" : {
"defaultContent" : "编辑",
"lanResTag" : "TBB.TEXT.*.EDIT",
"lanResType" : "TBB.TEXT",
"mOSFilePath" : "pslanguageres/Auto253",
"name" : "工具栏按钮文本[*.EDIT]",
"rTMOSFilePath" : "pslanguageres/Auto253",
"refFlag" : true
},
"caption" : "编辑",
"codeName" : "Edit",
"fullCodeName" : "Edit",
"mOSFilePath" : "pssysapps/Web/pssysappdeuiactions/Edit",
"name" : "表格界面_编辑操作",
"getPSSysImage" : {
"glyph" : "xf044@FontAwesome",
"cssClass" : "fa fa-edit"
},
"predefinedType" : "GRIDVIEW_EDITACTION",
"rTMOSFilePath" : "pssysapps/Web/pssysappdeuiactions/Edit",
"timeout" : 60000,
"getTooltipPSLanguageRes" : {
"defaultContent" : "编辑",
"lanResTag" : "TBB.TOOLTIP.*.EDIT",
"lanResType" : "TBB.TOOLTIP",
"mOSFilePath" : "pslanguageres/Auto130",
"name" : "工具栏按钮提示[*.EDIT]",
"rTMOSFilePath" : "pslanguageres/Auto130",
"refFlag" : true
},
"uIActionMode" : "SYS",
"uIActionTag" : "Edit",
"uIActionType" : "DEUIACTION"
},
"addSeparator" : true,
"showCaption" : true,
"showIcon" : false
}, {
"detailType" : "DEUIACTION", "detailType" : "DEUIACTION",
"name" : "u4c6267d", "name" : "u4c6267d",
"getPSUIAction" : { "getPSUIAction" : {
...@@ -251,6 +209,48 @@ ...@@ -251,6 +209,48 @@
"addSeparator" : true, "addSeparator" : true,
"showCaption" : false, "showCaption" : false,
"showIcon" : true "showIcon" : true
}, {
"detailType" : "DEUIACTION",
"name" : "u1feafb4",
"getPSUIAction" : {
"actionTarget" : "SINGLEKEY",
"getCapPSLanguageRes" : {
"defaultContent" : "编辑",
"lanResTag" : "TBB.TEXT.*.EDIT",
"lanResType" : "TBB.TEXT",
"mOSFilePath" : "pslanguageres/Auto253",
"name" : "工具栏按钮文本[*.EDIT]",
"rTMOSFilePath" : "pslanguageres/Auto253",
"refFlag" : true
},
"caption" : "编辑",
"codeName" : "Edit",
"fullCodeName" : "Edit",
"mOSFilePath" : "pssysapps/Web/pssysappdeuiactions/Edit",
"name" : "表格界面_编辑操作",
"getPSSysImage" : {
"glyph" : "xf044@FontAwesome",
"cssClass" : "fa fa-edit"
},
"predefinedType" : "GRIDVIEW_EDITACTION",
"rTMOSFilePath" : "pssysapps/Web/pssysappdeuiactions/Edit",
"timeout" : 60000,
"getTooltipPSLanguageRes" : {
"defaultContent" : "编辑",
"lanResTag" : "TBB.TOOLTIP.*.EDIT",
"lanResType" : "TBB.TOOLTIP",
"mOSFilePath" : "pslanguageres/Auto130",
"name" : "工具栏按钮提示[*.EDIT]",
"rTMOSFilePath" : "pslanguageres/Auto130",
"refFlag" : true
},
"uIActionMode" : "SYS",
"uIActionTag" : "Edit",
"uIActionType" : "DEUIACTION"
},
"addSeparator" : true,
"showCaption" : true,
"showIcon" : false
} ] } ]
}, },
"rTMOSFilePath" : "psdegridcols/uagridcolumn1", "rTMOSFilePath" : "psdegridcols/uagridcolumn1",
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo/PSFORMS/Main.json
浏览文件 @ 8e6fbef8
...@@ -69,23 +69,6 @@ ...@@ -69,23 +69,6 @@
} }
} ], } ],
"getPSDEFormItemVRs" : [ { "getPSDEFormItemVRs" : [ {
"checkMode" : 3,
"name" : "表单项值规则",
"getPSDEFormItemName" : "Name",
"getPSSysValueRule" : {
"codeName" : "ValueRule14",
"dynaModelFilePath" : "PSSYSVALUERULES/ValueRule14.json",
"mOSFilePath" : "pssysvaluerules/ValueRule14",
"name" : "由26个英文字母组成的字符串",
"rTMOSFilePath" : "pssysvaluerules/ValueRule14",
"regExCode" : "[A-Za-z]+",
"ruleInfo" : "内容必须为26个英文字母组成的字符串",
"ruleType" : "REG",
"enableBackend" : true,
"enableFront" : true
},
"valueRuleType" : "SYSVALUERULE"
}, {
"checkMode" : 3, "checkMode" : 3,
"name" : "表单项值规则", "name" : "表单项值规则",
"getPSDEFValueRule" : { "getPSDEFValueRule" : {
...@@ -117,6 +100,23 @@ ...@@ -117,6 +100,23 @@
}, },
"getPSDEFormItemName" : "StuNo", "getPSDEFormItemName" : "StuNo",
"valueRuleType" : "DEFVALUERULE" "valueRuleType" : "DEFVALUERULE"
}, {
"checkMode" : 3,
"name" : "表单项值规则",
"getPSDEFormItemName" : "Name",
"getPSSysValueRule" : {
"codeName" : "ValueRule14",
"dynaModelFilePath" : "PSSYSVALUERULES/ValueRule14.json",
"mOSFilePath" : "pssysvaluerules/ValueRule14",
"name" : "由26个英文字母组成的字符串",
"rTMOSFilePath" : "pssysvaluerules/ValueRule14",
"regExCode" : "[A-Za-z]+",
"ruleInfo" : "内容必须为26个英文字母组成的字符串",
"ruleType" : "REG",
"enableBackend" : true,
"enableFront" : true
},
"valueRuleType" : "SYSVALUERULE"
} ], } ],
"getPSDEFormItems" : [ { "getPSDEFormItems" : [ {
"id" : "srfupdatedate", "id" : "srfupdatedate",
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Student/PSLISTS/StudentList.json
浏览文件 @ 8e6fbef8
...@@ -25,35 +25,35 @@ ...@@ -25,35 +25,35 @@
"getPSAppViewLogics" : [ { "getPSAppViewLogics" : [ {
"logicTrigger" : "CUSTOM", "logicTrigger" : "CUSTOM",
"logicType" : "APPVIEWUIACTION", "logicType" : "APPVIEWUIACTION",
"name" : "db_sysportlet2_list_field_u1feafb4_click", "name" : "db_sysportlet2_list_field_u4c6267d_click",
"getPSAppViewUIAction" : { "getPSAppViewUIAction" : {
"modelref" : true, "modelref" : true,
"id" : "表格界面_编辑操作" "id" : "表格界面_删除操作"
} }
}, { }, {
"logicTrigger" : "CUSTOM", "logicTrigger" : "CUSTOM",
"logicType" : "APPVIEWUIACTION", "logicType" : "APPVIEWUIACTION",
"name" : "db_sysportlet2_list_field_u4c6267d_click", "name" : "db_sysportlet2_list_field_u1feafb4_click",
"getPSAppViewUIAction" : { "getPSAppViewUIAction" : {
"modelref" : true, "modelref" : true,
"id" : "表格界面_删除操作" "id" : "表格界面_编辑操作"
} }
} ], } ],
"getPSAppViewUIActions" : [ { "getPSAppViewUIActions" : [ {
"name" : "表格界面_编辑操作", "name" : "表格界面_删除操作",
"getPSUIAction" : { "getPSUIAction" : {
"modelref" : true, "modelref" : true,
"id" : "Edit" "id" : "Remove"
}, },
"uIActionTarget" : "SINGLEKEY", "uIActionTarget" : "MULTIKEY",
"xDataControlName" : "db_sysportlet2_list" "xDataControlName" : "db_sysportlet2_list"
}, { }, {
"name" : "表格界面_删除操作", "name" : "表格界面_编辑操作",
"getPSUIAction" : { "getPSUIAction" : {
"modelref" : true, "modelref" : true,
"id" : "Remove" "id" : "Edit"
}, },
"uIActionTarget" : "MULTIKEY", "uIActionTarget" : "SINGLEKEY",
"xDataControlName" : "db_sysportlet2_list" "xDataControlName" : "db_sysportlet2_list"
} ], } ],
"getPSDEListDataItems" : [ { "getPSDEListDataItems" : [ {
...@@ -104,48 +104,6 @@ ...@@ -104,48 +104,6 @@
"getPSDEUIActionGroup" : { "getPSDEUIActionGroup" : {
"name" : "界面行为组", "name" : "界面行为组",
"getPSUIActionGroupDetails" : [ { "getPSUIActionGroupDetails" : [ {
"detailType" : "DEUIACTION",
"name" : "u1feafb4",
"getPSUIAction" : {
"actionTarget" : "SINGLEKEY",
"getCapPSLanguageRes" : {
"defaultContent" : "编辑",
"lanResTag" : "TBB.TEXT.*.EDIT",
"lanResType" : "TBB.TEXT",
"mOSFilePath" : "pslanguageres/Auto253",
"name" : "工具栏按钮文本[*.EDIT]",
"rTMOSFilePath" : "pslanguageres/Auto253",
"refFlag" : true
},
"caption" : "编辑",
"codeName" : "Edit",
"fullCodeName" : "Edit",
"mOSFilePath" : "pssysapps/Web/pssysappdeuiactions/Edit",
"name" : "表格界面_编辑操作",
"getPSSysImage" : {
"glyph" : "xf044@FontAwesome",
"cssClass" : "fa fa-edit"
},
"predefinedType" : "GRIDVIEW_EDITACTION",
"rTMOSFilePath" : "pssysapps/Web/pssysappdeuiactions/Edit",
"timeout" : 60000,
"getTooltipPSLanguageRes" : {
"defaultContent" : "编辑",
"lanResTag" : "TBB.TOOLTIP.*.EDIT",
"lanResType" : "TBB.TOOLTIP",
"mOSFilePath" : "pslanguageres/Auto130",
"name" : "工具栏按钮提示[*.EDIT]",
"rTMOSFilePath" : "pslanguageres/Auto130",
"refFlag" : true
},
"uIActionMode" : "SYS",
"uIActionTag" : "Edit",
"uIActionType" : "DEUIACTION"
},
"addSeparator" : true,
"showCaption" : true,
"showIcon" : false
}, {
"detailType" : "DEUIACTION", "detailType" : "DEUIACTION",
"name" : "u4c6267d", "name" : "u4c6267d",
"getPSUIAction" : { "getPSUIAction" : {
...@@ -187,6 +145,48 @@ ...@@ -187,6 +145,48 @@
"addSeparator" : true, "addSeparator" : true,
"showCaption" : false, "showCaption" : false,
"showIcon" : true "showIcon" : true
}, {
"detailType" : "DEUIACTION",
"name" : "u1feafb4",
"getPSUIAction" : {
"actionTarget" : "SINGLEKEY",
"getCapPSLanguageRes" : {
"defaultContent" : "编辑",
"lanResTag" : "TBB.TEXT.*.EDIT",
"lanResType" : "TBB.TEXT",
"mOSFilePath" : "pslanguageres/Auto253",
"name" : "工具栏按钮文本[*.EDIT]",
"rTMOSFilePath" : "pslanguageres/Auto253",
"refFlag" : true
},
"caption" : "编辑",
"codeName" : "Edit",
"fullCodeName" : "Edit",
"mOSFilePath" : "pssysapps/Web/pssysappdeuiactions/Edit",
"name" : "表格界面_编辑操作",
"getPSSysImage" : {
"glyph" : "xf044@FontAwesome",
"cssClass" : "fa fa-edit"
},
"predefinedType" : "GRIDVIEW_EDITACTION",
"rTMOSFilePath" : "pssysapps/Web/pssysappdeuiactions/Edit",
"timeout" : 60000,
"getTooltipPSLanguageRes" : {
"defaultContent" : "编辑",
"lanResTag" : "TBB.TOOLTIP.*.EDIT",
"lanResType" : "TBB.TOOLTIP",
"mOSFilePath" : "pslanguageres/Auto130",
"name" : "工具栏按钮提示[*.EDIT]",
"rTMOSFilePath" : "pslanguageres/Auto130",
"refFlag" : true
},
"uIActionMode" : "SYS",
"uIActionTag" : "Edit",
"uIActionType" : "DEUIACTION"
},
"addSeparator" : true,
"showCaption" : true,
"showIcon" : false
} ] } ]
}, },
"width" : 150, "width" : 150,
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/ReginfoEditView.json
浏览文件 @ 8e6fbef8
...@@ -1253,23 +1253,6 @@ ...@@ -1253,23 +1253,6 @@
"id" : "FORM" "id" : "FORM"
}, },
"getPSDEFormItemVRs" : [ { "getPSDEFormItemVRs" : [ {
"checkMode" : 3,
"name" : "表单项值规则",
"getPSDEFormItemName" : "Name",
"getPSSysValueRule" : {
"codeName" : "ValueRule14",
"dynaModelFilePath" : "PSSYSVALUERULES/ValueRule14.json",
"mOSFilePath" : "pssysvaluerules/ValueRule14",
"name" : "由26个英文字母组成的字符串",
"rTMOSFilePath" : "pssysvaluerules/ValueRule14",
"regExCode" : "[A-Za-z]+",
"ruleInfo" : "内容必须为26个英文字母组成的字符串",
"ruleType" : "REG",
"enableBackend" : true,
"enableFront" : true
},
"valueRuleType" : "SYSVALUERULE"
}, {
"checkMode" : 3, "checkMode" : 3,
"name" : "表单项值规则", "name" : "表单项值规则",
"getPSDEFValueRule" : { "getPSDEFValueRule" : {
...@@ -1301,6 +1284,23 @@ ...@@ -1301,6 +1284,23 @@
}, },
"getPSDEFormItemName" : "StuNo", "getPSDEFormItemName" : "StuNo",
"valueRuleType" : "DEFVALUERULE" "valueRuleType" : "DEFVALUERULE"
}, {
"checkMode" : 3,
"name" : "表单项值规则",
"getPSDEFormItemName" : "Name",
"getPSSysValueRule" : {
"codeName" : "ValueRule14",
"dynaModelFilePath" : "PSSYSVALUERULES/ValueRule14.json",
"mOSFilePath" : "pssysvaluerules/ValueRule14",
"name" : "由26个英文字母组成的字符串",
"rTMOSFilePath" : "pssysvaluerules/ValueRule14",
"regExCode" : "[A-Za-z]+",
"ruleInfo" : "内容必须为26个英文字母组成的字符串",
"ruleType" : "REG",
"enableBackend" : true,
"enableFront" : true
},
"valueRuleType" : "SYSVALUERULE"
} ], } ],
"getPSDEFormItems" : [ { "getPSDEFormItems" : [ {
"id" : "srfupdatedate", "id" : "srfupdatedate",
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/bookUsr3GridView.json
浏览文件 @ 8e6fbef8
...@@ -379,35 +379,35 @@ ...@@ -379,35 +379,35 @@
"getPSAppViewLogics" : [ { "getPSAppViewLogics" : [ {
"logicTrigger" : "CUSTOM", "logicTrigger" : "CUSTOM",
"logicType" : "APPVIEWUIACTION", "logicType" : "APPVIEWUIACTION",
"name" : "grid_uagridcolumn1_u1feafb4_click", "name" : "grid_uagridcolumn1_u4c6267d_click",
"getPSAppViewUIAction" : { "getPSAppViewUIAction" : {
"modelref" : true, "modelref" : true,
"id" : "表格界面_编辑操作" "id" : "表格界面_删除操作"
} }
}, { }, {
"logicTrigger" : "CUSTOM", "logicTrigger" : "CUSTOM",
"logicType" : "APPVIEWUIACTION", "logicType" : "APPVIEWUIACTION",
"name" : "grid_uagridcolumn1_u4c6267d_click", "name" : "grid_uagridcolumn1_u1feafb4_click",
"getPSAppViewUIAction" : { "getPSAppViewUIAction" : {
"modelref" : true, "modelref" : true,
"id" : "表格界面_删除操作" "id" : "表格界面_编辑操作"
} }
} ], } ],
"getPSAppViewUIActions" : [ { "getPSAppViewUIActions" : [ {
"name" : "表格界面_编辑操作", "name" : "表格界面_删除操作",
"getPSUIAction" : { "getPSUIAction" : {
"modelref" : true, "modelref" : true,
"id" : "Edit" "id" : "Remove"
}, },
"uIActionTarget" : "SINGLEKEY", "uIActionTarget" : "MULTIKEY",
"xDataControlName" : "grid" "xDataControlName" : "grid"
}, { }, {
"name" : "表格界面_删除操作", "name" : "表格界面_编辑操作",
"getPSUIAction" : { "getPSUIAction" : {
"modelref" : true, "modelref" : true,
"id" : "Remove" "id" : "Edit"
}, },
"uIActionTarget" : "MULTIKEY", "uIActionTarget" : "SINGLEKEY",
"xDataControlName" : "grid" "xDataControlName" : "grid"
} ], } ],
"getPSControlHandler" : { "getPSControlHandler" : {
...@@ -615,48 +615,6 @@ ...@@ -615,48 +615,6 @@
"getPSDEUIActionGroup" : { "getPSDEUIActionGroup" : {
"name" : "界面行为组", "name" : "界面行为组",
"getPSUIActionGroupDetails" : [ { "getPSUIActionGroupDetails" : [ {
"detailType" : "DEUIACTION",
"name" : "u1feafb4",
"getPSUIAction" : {
"actionTarget" : "SINGLEKEY",
"getCapPSLanguageRes" : {
"defaultContent" : "编辑",
"lanResTag" : "TBB.TEXT.*.EDIT",
"lanResType" : "TBB.TEXT",
"mOSFilePath" : "pslanguageres/Auto253",
"name" : "工具栏按钮文本[*.EDIT]",
"rTMOSFilePath" : "pslanguageres/Auto253",
"refFlag" : true
},
"caption" : "编辑",
"codeName" : "Edit",
"fullCodeName" : "Edit",
"mOSFilePath" : "pssysapps/Web/pssysappdeuiactions/Edit",
"name" : "表格界面_编辑操作",
"getPSSysImage" : {
"glyph" : "xf044@FontAwesome",
"cssClass" : "fa fa-edit"
},
"predefinedType" : "GRIDVIEW_EDITACTION",
"rTMOSFilePath" : "pssysapps/Web/pssysappdeuiactions/Edit",
"timeout" : 60000,
"getTooltipPSLanguageRes" : {
"defaultContent" : "编辑",
"lanResTag" : "TBB.TOOLTIP.*.EDIT",
"lanResType" : "TBB.TOOLTIP",
"mOSFilePath" : "pslanguageres/Auto130",
"name" : "工具栏按钮提示[*.EDIT]",
"rTMOSFilePath" : "pslanguageres/Auto130",
"refFlag" : true
},
"uIActionMode" : "SYS",
"uIActionTag" : "Edit",
"uIActionType" : "DEUIACTION"
},
"addSeparator" : true,
"showCaption" : true,
"showIcon" : false
}, {
"detailType" : "DEUIACTION", "detailType" : "DEUIACTION",
"name" : "u4c6267d", "name" : "u4c6267d",
"getPSUIAction" : { "getPSUIAction" : {
...@@ -698,6 +656,48 @@ ...@@ -698,6 +656,48 @@
"addSeparator" : true, "addSeparator" : true,
"showCaption" : false, "showCaption" : false,
"showIcon" : true "showIcon" : true
}, {
"detailType" : "DEUIACTION",
"name" : "u1feafb4",
"getPSUIAction" : {
"actionTarget" : "SINGLEKEY",
"getCapPSLanguageRes" : {
"defaultContent" : "编辑",
"lanResTag" : "TBB.TEXT.*.EDIT",
"lanResType" : "TBB.TEXT",
"mOSFilePath" : "pslanguageres/Auto253",
"name" : "工具栏按钮文本[*.EDIT]",
"rTMOSFilePath" : "pslanguageres/Auto253",
"refFlag" : true
},
"caption" : "编辑",
"codeName" : "Edit",
"fullCodeName" : "Edit",
"mOSFilePath" : "pssysapps/Web/pssysappdeuiactions/Edit",
"name" : "表格界面_编辑操作",
"getPSSysImage" : {
"glyph" : "xf044@FontAwesome",
"cssClass" : "fa fa-edit"
},
"predefinedType" : "GRIDVIEW_EDITACTION",
"rTMOSFilePath" : "pssysapps/Web/pssysappdeuiactions/Edit",
"timeout" : 60000,
"getTooltipPSLanguageRes" : {
"defaultContent" : "编辑",
"lanResTag" : "TBB.TOOLTIP.*.EDIT",
"lanResType" : "TBB.TOOLTIP",
"mOSFilePath" : "pslanguageres/Auto130",
"name" : "工具栏按钮提示[*.EDIT]",
"rTMOSFilePath" : "pslanguageres/Auto130",
"refFlag" : true
},
"uIActionMode" : "SYS",
"uIActionTag" : "Edit",
"uIActionType" : "DEUIACTION"
},
"addSeparator" : true,
"showCaption" : true,
"showIcon" : false
} ] } ]
}, },
"rTMOSFilePath" : "psdegridcols/uagridcolumn1", "rTMOSFilePath" : "psdegridcols/uagridcolumn1",
......
trainsys-provider/pom.xml
浏览文件 @ 8e6fbef8
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
<profiles> <profiles>
<profile> <profile>
<id>trainsys</id> <id>runtime</id>
<build> <build>
<resources> <resources>
<resource> <resource>
......
trainsys-provider/src/main/docker/Dockerfile
浏览文件 @ 8e6fbef8
...@@ -10,6 +10,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \ ...@@ -10,6 +10,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
sleep ${IBIZ_SLEEP} && \ sleep ${IBIZ_SLEEP} && \
java ${JAVA_OPTS} -Duser.timezone=$TZ -Djava.security.egd=file:/dev/./urandom -jar /trainsys-provider.jar java ${JAVA_OPTS} -Duser.timezone=$TZ -Djava.security.egd=file:/dev/./urandom -jar /trainsys-provider.jar
EXPOSE 50000 EXPOSE 8081
ADD trainsys-provider.jar /trainsys-provider.jar ADD trainsys-provider.jar /trainsys-provider.jar
trainsys-provider/src/main/docker/trainsys-provider-trainsys-k8s.yaml
浏览文件 @ 8e6fbef8
...@@ -22,32 +22,7 @@ spec: ...@@ -22,32 +22,7 @@ spec:
image: registry.cn-shanghai.aliyuncs.com/ibizsys/trainsys-provider:latest image: registry.cn-shanghai.aliyuncs.com/ibizsys/trainsys-provider:latest
imagePullPolicy: Always imagePullPolicy: Always
ports: ports:
- containerPort: 50000 - containerPort: 8081
env:
- name: SPRING_CLOUD_NACOS_DISCOVERY_IP
value: "172.16.240.140"
- name: SERVER_PORT
value: "50000"
- name: SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR
value: "172.16.240.140:8848"
- name: SPRING_REDIS_HOST
value: "127.0.0.1"
- name: SPRING_REDIS_PORT
value: "6379"
- name: SPRING_REDIS_DATABASE
value: "0"
- name: SPRING_DATASOURCE_USERNAME
value: "a_LAB01_d23cc850e"
- name: SPRING_DATASOURCE_PASSWORD
value: "f9Df4556"
- name: SPRING_DATASOURCE_URL
value: "jdbc:mysql://172.16.186.185:3306/a_LAB01_d23cc850e?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&serverTimezone=Asia/Shanghai&allowMultiQueries=true&serverTimezone=GMT%2B8"
- name: SPRING_DATASOURCE_DRIVER-CLASS-NAME
value: "com.mysql.jdbc.Driver"
- name: SPRING_DATASOURCE_DEFAULTSCHEMA
value: "a_LAB01_d23cc850e"
- name: NACOS
value: "172.16.240.140:8848"
--- ---
apiVersion: v1 apiVersion: v1
...@@ -60,9 +35,9 @@ spec: ...@@ -60,9 +35,9 @@ spec:
type: NodePort type: NodePort
ports: ports:
- name: http - name: http
port: 50000 port: 8081
targetPort: 50000 targetPort: 8081
nodePort: 50000 nodePort: 8081
protocol: TCP protocol: TCP
selector: selector:
app: trainsys-provider app: trainsys-provider
......
trainsys-provider/src/main/docker/trainsys-provider-trainsys.yaml
浏览文件 @ 8e6fbef8
...@@ -3,23 +3,9 @@ services: ...@@ -3,23 +3,9 @@ services:
trainsys-provider: trainsys-provider:
image: registry.cn-shanghai.aliyuncs.com/ibizsys/trainsys-provider:latest image: registry.cn-shanghai.aliyuncs.com/ibizsys/trainsys-provider:latest
ports: ports:
- "50000:50000" - "8081:8081"
networks: networks:
- agent_network - agent_network
environment:
- SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.240.140
- SERVER_PORT=50000
- SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.240.140:8848
- SPRING_CLOUD_NACOS_CONFIG_SERVER-ADDR=172.16.240.140:8848
- SPRING_REDIS_HOST=127.0.0.1
- SPRING_REDIS_PORT=6379
- SPRING_REDIS_DATABASE=0
- SPRING_DATASOURCE_USERNAME=a_LAB01_d23cc850e
- SPRING_DATASOURCE_PASSWORD=f9Df4556
- SPRING_DATASOURCE_URL=jdbc:mysql://172.16.186.185:3306/a_LAB01_d23cc850e?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&serverTimezone=Asia/Shanghai&allowMultiQueries=true&serverTimezone=GMT%2B8
- SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
- SPRING_DATASOURCE_DEFAULTSCHEMA=a_LAB01_d23cc850e
- NACOS=172.16.240.140:8848
deploy: deploy:
resources: resources:
limits: limits:
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或