Skip to content

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

chitanda 部署微服务应用 [TrainSys，网页端]

上级 7f3f37bd
隐藏空白字符变更
内嵌 并排
正在显示 包含 416 行增加 和 452 行删除
app_Web/swarm.yaml
浏览文件 @ 9a450563
...@@ -3,7 +3,7 @@ services: ...@@ -3,7 +3,7 @@ services:
trainsys-app-web: trainsys-app-web:
image: dstimage image: dstimage
ports: ports:
- "80:80" - "50100:80"
networks: networks:
- agent_network - agent_network
environment: environment:
......
config.xml
浏览文件 @ 9a450563
...@@ -55,12 +55,15 @@ ...@@ -55,12 +55,15 @@
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 mkdir -p /var/lib/jenkins/appcache/A3064A91-F42D-4D7F-BC1C-4173A4F5772C
mvn install -Ptrainsys if [ -e app_Web/.dynamic ]
cd trainsys-provider then
mvn -Ptrainsys docker:build cd app_Web
mvn -Ptrainsys docker:push else
docker -H $para1 stack deploy --compose-file=src/main/docker/trainsys-provider-trainsys.yaml ebsx --with-registry-auth cd app_Web/app
fi
sed -i "s#dstimage#registry.cn-shanghai.aliyuncs.com/ibizsys/ibizcloud-standardsys-app-webapp:2022.09.01.001#g" swarm.yaml
docker -H $para1 stack deploy --compose-file=swarm.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/TEST/PSFORMS/TestRules.json
浏览文件 @ 9a450563
...@@ -37,6 +37,139 @@ ...@@ -37,6 +37,139 @@
} }
} ], } ],
"getPSDEFormItemVRs" : [ { "getPSDEFormItemVRs" : [ {
"checkMode" : 3,
"name" : "表单项值规则",
"getPSDEFValueRule" : {
"codeName" : "ValueRule4",
"mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD3/psdefvaluerules/ValueRule4",
"name" : "field3值规则",
"getPSDEFVRGroupCondition" : {
"condOp" : "AND",
"condType" : "GROUP",
"name" : "默认组",
"getPSDEFVRConditions" : [ {
"condType" : "STRINGLENGTH",
"dEFName" : "FIELD3",
"maxValue" : 15,
"minValue" : 5,
"name" : "[字符长度] 大于等于 5 且 小于等于 15",
"ruleInfo" : "5<=field3字符长度<=15",
"includeMaxValue" : true,
"includeMinValue" : true
} ],
"ruleInfo" : "5<=field3字符长度<=15"
},
"rTMOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD3/psdefvaluerules/ValueRule4",
"ruleInfo" : "5<=field3字符长度<=15",
"checkDefault" : false,
"defaultMode" : false,
"enableBackend" : true,
"enableFront" : true
},
"getPSDEFormItemName" : "field3",
"valueRuleType" : "DEFVALUERULE"
}, {
"checkMode" : 3,
"name" : "表单项值规则",
"getPSDEFValueRule" : {
"codeName" : "ValueRule6",
"mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD5/psdefvaluerules/ValueRule6",
"name" : "field5值规则",
"getPSDEFVRGroupCondition" : {
"condOp" : "AND",
"condType" : "GROUP",
"name" : "默认组",
"getPSDEFVRConditions" : [ {
"condType" : "SYSVALUERULE",
"dEFName" : "FIELD5",
"name" : "[系统值规则]脚本值规则测试",
"getPSSysValueRule" : {
"codeName" : "ValueRule20",
"dynaModelFilePath" : "PSSYSVALUERULES/ValueRule20.json",
"mOSFilePath" : "pssysvaluerules/ValueRule20",
"name" : "脚本值规则测试",
"rTMOSFilePath" : "pssysvaluerules/ValueRule20",
"ruleInfo" : "脚本校验",
"ruleType" : "SCRIPT",
"scriptCode" : "console.log(data);\nconsole.log(value);\nreturn false;",
"enableBackend" : true,
"enableFront" : true
},
"ruleInfo" : "脚本校验"
} ],
"ruleInfo" : "脚本校验"
},
"rTMOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD5/psdefvaluerules/ValueRule6",
"ruleInfo" : "脚本校验",
"checkDefault" : false,
"defaultMode" : false,
"enableBackend" : true,
"enableFront" : true
},
"getPSDEFormItemName" : "field5",
"valueRuleType" : "DEFVALUERULE"
}, {
"checkMode" : 3,
"name" : "表单项值规则",
"getPSDEFValueRule" : {
"codeName" : "ValueRule2",
"mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD/psdefvaluerules/ValueRule2",
"name" : "field值规则",
"getPSDEFVRGroupCondition" : {
"condOp" : "AND",
"condType" : "GROUP",
"name" : "默认组",
"getPSDEFVRConditions" : [ {
"condType" : "VALUERANGE2",
"dEFName" : "FIELD",
"maxValue" : 20.0,
"minValue" : 10.0,
"name" : "[数值范围] 大于等于 10.0 且 小于等于 20.0",
"ruleInfo" : "10<=field<=20",
"includeMaxValue" : true,
"includeMinValue" : true
} ],
"ruleInfo" : "10<=field<=20"
},
"rTMOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD/psdefvaluerules/ValueRule2",
"ruleInfo" : "10<=field<=20",
"checkDefault" : false,
"defaultMode" : false,
"enableBackend" : true,
"enableFront" : true
},
"getPSDEFormItemName" : "field",
"valueRuleType" : "DEFVALUERULE"
}, {
"checkMode" : 3,
"name" : "表单项值规则",
"getPSDEFValueRule" : {
"codeName" : "ValueRule3",
"mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD2/psdefvaluerules/ValueRule3",
"name" : "field2值规则",
"getPSDEFVRGroupCondition" : {
"condOp" : "AND",
"condType" : "GROUP",
"name" : "默认组",
"getPSDEFVRConditions" : [ {
"condType" : "REGEX",
"dEFName" : "FIELD2",
"name" : "[正则式](^[0-9]*$)",
"regExCode" : "^[0-9]*$",
"ruleInfo" : "只能写数字"
} ],
"ruleInfo" : "只能写数字"
},
"rTMOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD2/psdefvaluerules/ValueRule3",
"ruleInfo" : "只能写数字",
"checkDefault" : false,
"defaultMode" : false,
"enableBackend" : true,
"enableFront" : true
},
"getPSDEFormItemName" : "field2",
"valueRuleType" : "DEFVALUERULE"
}, {
"checkMode" : 3, "checkMode" : 3,
"name" : "表单项值规则", "name" : "表单项值规则",
"getPSDEFValueRule" : { "getPSDEFValueRule" : {
...@@ -258,139 +391,6 @@ ...@@ -258,139 +391,6 @@
}, },
"getPSDEFormItemName" : "field7", "getPSDEFormItemName" : "field7",
"valueRuleType" : "DEFVALUERULE" "valueRuleType" : "DEFVALUERULE"
}, {
"checkMode" : 3,
"name" : "表单项值规则",
"getPSDEFValueRule" : {
"codeName" : "ValueRule4",
"mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD3/psdefvaluerules/ValueRule4",
"name" : "field3值规则",
"getPSDEFVRGroupCondition" : {
"condOp" : "AND",
"condType" : "GROUP",
"name" : "默认组",
"getPSDEFVRConditions" : [ {
"condType" : "STRINGLENGTH",
"dEFName" : "FIELD3",
"maxValue" : 15,
"minValue" : 5,
"name" : "[字符长度] 大于等于 5 且 小于等于 15",
"ruleInfo" : "5<=field3字符长度<=15",
"includeMaxValue" : true,
"includeMinValue" : true
} ],
"ruleInfo" : "5<=field3字符长度<=15"
},
"rTMOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD3/psdefvaluerules/ValueRule4",
"ruleInfo" : "5<=field3字符长度<=15",
"checkDefault" : false,
"defaultMode" : false,
"enableBackend" : true,
"enableFront" : true
},
"getPSDEFormItemName" : "field3",
"valueRuleType" : "DEFVALUERULE"
}, {
"checkMode" : 3,
"name" : "表单项值规则",
"getPSDEFValueRule" : {
"codeName" : "ValueRule6",
"mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD5/psdefvaluerules/ValueRule6",
"name" : "field5值规则",
"getPSDEFVRGroupCondition" : {
"condOp" : "AND",
"condType" : "GROUP",
"name" : "默认组",
"getPSDEFVRConditions" : [ {
"condType" : "SYSVALUERULE",
"dEFName" : "FIELD5",
"name" : "[系统值规则]脚本值规则测试",
"getPSSysValueRule" : {
"codeName" : "ValueRule20",
"dynaModelFilePath" : "PSSYSVALUERULES/ValueRule20.json",
"mOSFilePath" : "pssysvaluerules/ValueRule20",
"name" : "脚本值规则测试",
"rTMOSFilePath" : "pssysvaluerules/ValueRule20",
"ruleInfo" : "脚本校验",
"ruleType" : "SCRIPT",
"scriptCode" : "console.log(data);\nconsole.log(value);\nreturn false;",
"enableBackend" : true,
"enableFront" : true
},
"ruleInfo" : "脚本校验"
} ],
"ruleInfo" : "脚本校验"
},
"rTMOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD5/psdefvaluerules/ValueRule6",
"ruleInfo" : "脚本校验",
"checkDefault" : false,
"defaultMode" : false,
"enableBackend" : true,
"enableFront" : true
},
"getPSDEFormItemName" : "field5",
"valueRuleType" : "DEFVALUERULE"
}, {
"checkMode" : 3,
"name" : "表单项值规则",
"getPSDEFValueRule" : {
"codeName" : "ValueRule2",
"mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD/psdefvaluerules/ValueRule2",
"name" : "field值规则",
"getPSDEFVRGroupCondition" : {
"condOp" : "AND",
"condType" : "GROUP",
"name" : "默认组",
"getPSDEFVRConditions" : [ {
"condType" : "VALUERANGE2",
"dEFName" : "FIELD",
"maxValue" : 20.0,
"minValue" : 10.0,
"name" : "[数值范围] 大于等于 10.0 且 小于等于 20.0",
"ruleInfo" : "10<=field<=20",
"includeMaxValue" : true,
"includeMinValue" : true
} ],
"ruleInfo" : "10<=field<=20"
},
"rTMOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD/psdefvaluerules/ValueRule2",
"ruleInfo" : "10<=field<=20",
"checkDefault" : false,
"defaultMode" : false,
"enableBackend" : true,
"enableFront" : true
},
"getPSDEFormItemName" : "field",
"valueRuleType" : "DEFVALUERULE"
}, {
"checkMode" : 3,
"name" : "表单项值规则",
"getPSDEFValueRule" : {
"codeName" : "ValueRule3",
"mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD2/psdefvaluerules/ValueRule3",
"name" : "field2值规则",
"getPSDEFVRGroupCondition" : {
"condOp" : "AND",
"condType" : "GROUP",
"name" : "默认组",
"getPSDEFVRConditions" : [ {
"condType" : "REGEX",
"dEFName" : "FIELD2",
"name" : "[正则式](^[0-9]*$)",
"regExCode" : "^[0-9]*$",
"ruleInfo" : "只能写数字"
} ],
"ruleInfo" : "只能写数字"
},
"rTMOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD2/psdefvaluerules/ValueRule3",
"ruleInfo" : "只能写数字",
"checkDefault" : false,
"defaultMode" : false,
"enableBackend" : true,
"enableFront" : true
},
"getPSDEFormItemName" : "field2",
"valueRuleType" : "DEFVALUERULE"
} ], } ],
"getPSDEFormItems" : [ { "getPSDEFormItems" : [ {
"id" : "srfupdatedate", "id" : "srfupdatedate",
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/TESTTestRulesEditView.json
浏览文件 @ 9a450563
...@@ -166,6 +166,139 @@ ...@@ -166,6 +166,139 @@
"id" : "FORM" "id" : "FORM"
}, },
"getPSDEFormItemVRs" : [ { "getPSDEFormItemVRs" : [ {
"checkMode" : 3,
"name" : "表单项值规则",
"getPSDEFValueRule" : {
"codeName" : "ValueRule4",
"mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD3/psdefvaluerules/ValueRule4",
"name" : "field3值规则",
"getPSDEFVRGroupCondition" : {
"condOp" : "AND",
"condType" : "GROUP",
"name" : "默认组",
"getPSDEFVRConditions" : [ {
"condType" : "STRINGLENGTH",
"dEFName" : "FIELD3",
"maxValue" : 15,
"minValue" : 5,
"name" : "[字符长度] 大于等于 5 且 小于等于 15",
"ruleInfo" : "5<=field3字符长度<=15",
"includeMaxValue" : true,
"includeMinValue" : true
} ],
"ruleInfo" : "5<=field3字符长度<=15"
},
"rTMOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD3/psdefvaluerules/ValueRule4",
"ruleInfo" : "5<=field3字符长度<=15",
"checkDefault" : false,
"defaultMode" : false,
"enableBackend" : true,
"enableFront" : true
},
"getPSDEFormItemName" : "field3",
"valueRuleType" : "DEFVALUERULE"
}, {
"checkMode" : 3,
"name" : "表单项值规则",
"getPSDEFValueRule" : {
"codeName" : "ValueRule6",
"mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD5/psdefvaluerules/ValueRule6",
"name" : "field5值规则",
"getPSDEFVRGroupCondition" : {
"condOp" : "AND",
"condType" : "GROUP",
"name" : "默认组",
"getPSDEFVRConditions" : [ {
"condType" : "SYSVALUERULE",
"dEFName" : "FIELD5",
"name" : "[系统值规则]脚本值规则测试",
"getPSSysValueRule" : {
"codeName" : "ValueRule20",
"dynaModelFilePath" : "PSSYSVALUERULES/ValueRule20.json",
"mOSFilePath" : "pssysvaluerules/ValueRule20",
"name" : "脚本值规则测试",
"rTMOSFilePath" : "pssysvaluerules/ValueRule20",
"ruleInfo" : "脚本校验",
"ruleType" : "SCRIPT",
"scriptCode" : "console.log(data);\nconsole.log(value);\nreturn false;",
"enableBackend" : true,
"enableFront" : true
},
"ruleInfo" : "脚本校验"
} ],
"ruleInfo" : "脚本校验"
},
"rTMOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD5/psdefvaluerules/ValueRule6",
"ruleInfo" : "脚本校验",
"checkDefault" : false,
"defaultMode" : false,
"enableBackend" : true,
"enableFront" : true
},
"getPSDEFormItemName" : "field5",
"valueRuleType" : "DEFVALUERULE"
}, {
"checkMode" : 3,
"name" : "表单项值规则",
"getPSDEFValueRule" : {
"codeName" : "ValueRule2",
"mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD/psdefvaluerules/ValueRule2",
"name" : "field值规则",
"getPSDEFVRGroupCondition" : {
"condOp" : "AND",
"condType" : "GROUP",
"name" : "默认组",
"getPSDEFVRConditions" : [ {
"condType" : "VALUERANGE2",
"dEFName" : "FIELD",
"maxValue" : 20.0,
"minValue" : 10.0,
"name" : "[数值范围] 大于等于 10.0 且 小于等于 20.0",
"ruleInfo" : "10<=field<=20",
"includeMaxValue" : true,
"includeMinValue" : true
} ],
"ruleInfo" : "10<=field<=20"
},
"rTMOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD/psdefvaluerules/ValueRule2",
"ruleInfo" : "10<=field<=20",
"checkDefault" : false,
"defaultMode" : false,
"enableBackend" : true,
"enableFront" : true
},
"getPSDEFormItemName" : "field",
"valueRuleType" : "DEFVALUERULE"
}, {
"checkMode" : 3,
"name" : "表单项值规则",
"getPSDEFValueRule" : {
"codeName" : "ValueRule3",
"mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD2/psdefvaluerules/ValueRule3",
"name" : "field2值规则",
"getPSDEFVRGroupCondition" : {
"condOp" : "AND",
"condType" : "GROUP",
"name" : "默认组",
"getPSDEFVRConditions" : [ {
"condType" : "REGEX",
"dEFName" : "FIELD2",
"name" : "[正则式](^[0-9]*$)",
"regExCode" : "^[0-9]*$",
"ruleInfo" : "只能写数字"
} ],
"ruleInfo" : "只能写数字"
},
"rTMOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD2/psdefvaluerules/ValueRule3",
"ruleInfo" : "只能写数字",
"checkDefault" : false,
"defaultMode" : false,
"enableBackend" : true,
"enableFront" : true
},
"getPSDEFormItemName" : "field2",
"valueRuleType" : "DEFVALUERULE"
}, {
"checkMode" : 3, "checkMode" : 3,
"name" : "表单项值规则", "name" : "表单项值规则",
"getPSDEFValueRule" : { "getPSDEFValueRule" : {
...@@ -387,139 +520,6 @@ ...@@ -387,139 +520,6 @@
}, },
"getPSDEFormItemName" : "field7", "getPSDEFormItemName" : "field7",
"valueRuleType" : "DEFVALUERULE" "valueRuleType" : "DEFVALUERULE"
}, {
"checkMode" : 3,
"name" : "表单项值规则",
"getPSDEFValueRule" : {
"codeName" : "ValueRule4",
"mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD3/psdefvaluerules/ValueRule4",
"name" : "field3值规则",
"getPSDEFVRGroupCondition" : {
"condOp" : "AND",
"condType" : "GROUP",
"name" : "默认组",
"getPSDEFVRConditions" : [ {
"condType" : "STRINGLENGTH",
"dEFName" : "FIELD3",
"maxValue" : 15,
"minValue" : 5,
"name" : "[字符长度] 大于等于 5 且 小于等于 15",
"ruleInfo" : "5<=field3字符长度<=15",
"includeMaxValue" : true,
"includeMinValue" : true
} ],
"ruleInfo" : "5<=field3字符长度<=15"
},
"rTMOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD3/psdefvaluerules/ValueRule4",
"ruleInfo" : "5<=field3字符长度<=15",
"checkDefault" : false,
"defaultMode" : false,
"enableBackend" : true,
"enableFront" : true
},
"getPSDEFormItemName" : "field3",
"valueRuleType" : "DEFVALUERULE"
}, {
"checkMode" : 3,
"name" : "表单项值规则",
"getPSDEFValueRule" : {
"codeName" : "ValueRule6",
"mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD5/psdefvaluerules/ValueRule6",
"name" : "field5值规则",
"getPSDEFVRGroupCondition" : {
"condOp" : "AND",
"condType" : "GROUP",
"name" : "默认组",
"getPSDEFVRConditions" : [ {
"condType" : "SYSVALUERULE",
"dEFName" : "FIELD5",
"name" : "[系统值规则]脚本值规则测试",
"getPSSysValueRule" : {
"codeName" : "ValueRule20",
"dynaModelFilePath" : "PSSYSVALUERULES/ValueRule20.json",
"mOSFilePath" : "pssysvaluerules/ValueRule20",
"name" : "脚本值规则测试",
"rTMOSFilePath" : "pssysvaluerules/ValueRule20",
"ruleInfo" : "脚本校验",
"ruleType" : "SCRIPT",
"scriptCode" : "console.log(data);\nconsole.log(value);\nreturn false;",
"enableBackend" : true,
"enableFront" : true
},
"ruleInfo" : "脚本校验"
} ],
"ruleInfo" : "脚本校验"
},
"rTMOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD5/psdefvaluerules/ValueRule6",
"ruleInfo" : "脚本校验",
"checkDefault" : false,
"defaultMode" : false,
"enableBackend" : true,
"enableFront" : true
},
"getPSDEFormItemName" : "field5",
"valueRuleType" : "DEFVALUERULE"
}, {
"checkMode" : 3,
"name" : "表单项值规则",
"getPSDEFValueRule" : {
"codeName" : "ValueRule2",
"mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD/psdefvaluerules/ValueRule2",
"name" : "field值规则",
"getPSDEFVRGroupCondition" : {
"condOp" : "AND",
"condType" : "GROUP",
"name" : "默认组",
"getPSDEFVRConditions" : [ {
"condType" : "VALUERANGE2",
"dEFName" : "FIELD",
"maxValue" : 20.0,
"minValue" : 10.0,
"name" : "[数值范围] 大于等于 10.0 且 小于等于 20.0",
"ruleInfo" : "10<=field<=20",
"includeMaxValue" : true,
"includeMinValue" : true
} ],
"ruleInfo" : "10<=field<=20"
},
"rTMOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD/psdefvaluerules/ValueRule2",
"ruleInfo" : "10<=field<=20",
"checkDefault" : false,
"defaultMode" : false,
"enableBackend" : true,
"enableFront" : true
},
"getPSDEFormItemName" : "field",
"valueRuleType" : "DEFVALUERULE"
}, {
"checkMode" : 3,
"name" : "表单项值规则",
"getPSDEFValueRule" : {
"codeName" : "ValueRule3",
"mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD2/psdefvaluerules/ValueRule3",
"name" : "field2值规则",
"getPSDEFVRGroupCondition" : {
"condOp" : "AND",
"condType" : "GROUP",
"name" : "默认组",
"getPSDEFVRConditions" : [ {
"condType" : "REGEX",
"dEFName" : "FIELD2",
"name" : "[正则式](^[0-9]*$)",
"regExCode" : "^[0-9]*$",
"ruleInfo" : "只能写数字"
} ],
"ruleInfo" : "只能写数字"
},
"rTMOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD2/psdefvaluerules/ValueRule3",
"ruleInfo" : "只能写数字",
"checkDefault" : false,
"defaultMode" : false,
"enableBackend" : true,
"enableFront" : true
},
"getPSDEFormItemName" : "field2",
"valueRuleType" : "DEFVALUERULE"
} ], } ],
"getPSDEFormItems" : [ { "getPSDEFormItems" : [ {
"id" : "srfupdatedate", "id" : "srfupdatedate",
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSSYSAPP.json
浏览文件 @ 9a450563
...@@ -16861,6 +16861,139 @@ ...@@ -16861,6 +16861,139 @@
"id" : "FORM" "id" : "FORM"
}, },
"getPSDEFormItemVRs" : [ { "getPSDEFormItemVRs" : [ {
"checkMode" : 3,
"name" : "表单项值规则",
"getPSDEFValueRule" : {
"codeName" : "ValueRule4",
"mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD3/psdefvaluerules/ValueRule4",
"name" : "field3值规则",
"getPSDEFVRGroupCondition" : {
"condOp" : "AND",
"condType" : "GROUP",
"name" : "默认组",
"getPSDEFVRConditions" : [ {
"condType" : "STRINGLENGTH",
"dEFName" : "FIELD3",
"maxValue" : 15,
"minValue" : 5,
"name" : "[字符长度] 大于等于 5 且 小于等于 15",
"ruleInfo" : "5<=field3字符长度<=15",
"includeMaxValue" : true,
"includeMinValue" : true
} ],
"ruleInfo" : "5<=field3字符长度<=15"
},
"rTMOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD3/psdefvaluerules/ValueRule4",
"ruleInfo" : "5<=field3字符长度<=15",
"checkDefault" : false,
"defaultMode" : false,
"enableBackend" : true,
"enableFront" : true
},
"getPSDEFormItemName" : "field3",
"valueRuleType" : "DEFVALUERULE"
}, {
"checkMode" : 3,
"name" : "表单项值规则",
"getPSDEFValueRule" : {
"codeName" : "ValueRule6",
"mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD5/psdefvaluerules/ValueRule6",
"name" : "field5值规则",
"getPSDEFVRGroupCondition" : {
"condOp" : "AND",
"condType" : "GROUP",
"name" : "默认组",
"getPSDEFVRConditions" : [ {
"condType" : "SYSVALUERULE",
"dEFName" : "FIELD5",
"name" : "[系统值规则]脚本值规则测试",
"getPSSysValueRule" : {
"codeName" : "ValueRule20",
"dynaModelFilePath" : "PSSYSVALUERULES/ValueRule20.json",
"mOSFilePath" : "pssysvaluerules/ValueRule20",
"name" : "脚本值规则测试",
"rTMOSFilePath" : "pssysvaluerules/ValueRule20",
"ruleInfo" : "脚本校验",
"ruleType" : "SCRIPT",
"scriptCode" : "console.log(data);\nconsole.log(value);\nreturn false;",
"enableBackend" : true,
"enableFront" : true
},
"ruleInfo" : "脚本校验"
} ],
"ruleInfo" : "脚本校验"
},
"rTMOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD5/psdefvaluerules/ValueRule6",
"ruleInfo" : "脚本校验",
"checkDefault" : false,
"defaultMode" : false,
"enableBackend" : true,
"enableFront" : true
},
"getPSDEFormItemName" : "field5",
"valueRuleType" : "DEFVALUERULE"
}, {
"checkMode" : 3,
"name" : "表单项值规则",
"getPSDEFValueRule" : {
"codeName" : "ValueRule2",
"mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD/psdefvaluerules/ValueRule2",
"name" : "field值规则",
"getPSDEFVRGroupCondition" : {
"condOp" : "AND",
"condType" : "GROUP",
"name" : "默认组",
"getPSDEFVRConditions" : [ {
"condType" : "VALUERANGE2",
"dEFName" : "FIELD",
"maxValue" : 20.0,
"minValue" : 10.0,
"name" : "[数值范围] 大于等于 10.0 且 小于等于 20.0",
"ruleInfo" : "10<=field<=20",
"includeMaxValue" : true,
"includeMinValue" : true
} ],
"ruleInfo" : "10<=field<=20"
},
"rTMOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD/psdefvaluerules/ValueRule2",
"ruleInfo" : "10<=field<=20",
"checkDefault" : false,
"defaultMode" : false,
"enableBackend" : true,
"enableFront" : true
},
"getPSDEFormItemName" : "field",
"valueRuleType" : "DEFVALUERULE"
}, {
"checkMode" : 3,
"name" : "表单项值规则",
"getPSDEFValueRule" : {
"codeName" : "ValueRule3",
"mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD2/psdefvaluerules/ValueRule3",
"name" : "field2值规则",
"getPSDEFVRGroupCondition" : {
"condOp" : "AND",
"condType" : "GROUP",
"name" : "默认组",
"getPSDEFVRConditions" : [ {
"condType" : "REGEX",
"dEFName" : "FIELD2",
"name" : "[正则式](^[0-9]*$)",
"regExCode" : "^[0-9]*$",
"ruleInfo" : "只能写数字"
} ],
"ruleInfo" : "只能写数字"
},
"rTMOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD2/psdefvaluerules/ValueRule3",
"ruleInfo" : "只能写数字",
"checkDefault" : false,
"defaultMode" : false,
"enableBackend" : true,
"enableFront" : true
},
"getPSDEFormItemName" : "field2",
"valueRuleType" : "DEFVALUERULE"
}, {
"checkMode" : 3, "checkMode" : 3,
"name" : "表单项值规则", "name" : "表单项值规则",
"getPSDEFValueRule" : { "getPSDEFValueRule" : {
...@@ -17082,139 +17215,6 @@ ...@@ -17082,139 +17215,6 @@
}, },
"getPSDEFormItemName" : "field7", "getPSDEFormItemName" : "field7",
"valueRuleType" : "DEFVALUERULE" "valueRuleType" : "DEFVALUERULE"
}, {
"checkMode" : 3,
"name" : "表单项值规则",
"getPSDEFValueRule" : {
"codeName" : "ValueRule4",
"mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD3/psdefvaluerules/ValueRule4",
"name" : "field3值规则",
"getPSDEFVRGroupCondition" : {
"condOp" : "AND",
"condType" : "GROUP",
"name" : "默认组",
"getPSDEFVRConditions" : [ {
"condType" : "STRINGLENGTH",
"dEFName" : "FIELD3",
"maxValue" : 15,
"minValue" : 5,
"name" : "[字符长度] 大于等于 5 且 小于等于 15",
"ruleInfo" : "5<=field3字符长度<=15",
"includeMaxValue" : true,
"includeMinValue" : true
} ],
"ruleInfo" : "5<=field3字符长度<=15"
},
"rTMOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD3/psdefvaluerules/ValueRule4",
"ruleInfo" : "5<=field3字符长度<=15",
"checkDefault" : false,
"defaultMode" : false,
"enableBackend" : true,
"enableFront" : true
},
"getPSDEFormItemName" : "field3",
"valueRuleType" : "DEFVALUERULE"
}, {
"checkMode" : 3,
"name" : "表单项值规则",
"getPSDEFValueRule" : {
"codeName" : "ValueRule6",
"mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD5/psdefvaluerules/ValueRule6",
"name" : "field5值规则",
"getPSDEFVRGroupCondition" : {
"condOp" : "AND",
"condType" : "GROUP",
"name" : "默认组",
"getPSDEFVRConditions" : [ {
"condType" : "SYSVALUERULE",
"dEFName" : "FIELD5",
"name" : "[系统值规则]脚本值规则测试",
"getPSSysValueRule" : {
"codeName" : "ValueRule20",
"dynaModelFilePath" : "PSSYSVALUERULES/ValueRule20.json",
"mOSFilePath" : "pssysvaluerules/ValueRule20",
"name" : "脚本值规则测试",
"rTMOSFilePath" : "pssysvaluerules/ValueRule20",
"ruleInfo" : "脚本校验",
"ruleType" : "SCRIPT",
"scriptCode" : "console.log(data);\nconsole.log(value);\nreturn false;",
"enableBackend" : true,
"enableFront" : true
},
"ruleInfo" : "脚本校验"
} ],
"ruleInfo" : "脚本校验"
},
"rTMOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD5/psdefvaluerules/ValueRule6",
"ruleInfo" : "脚本校验",
"checkDefault" : false,
"defaultMode" : false,
"enableBackend" : true,
"enableFront" : true
},
"getPSDEFormItemName" : "field5",
"valueRuleType" : "DEFVALUERULE"
}, {
"checkMode" : 3,
"name" : "表单项值规则",
"getPSDEFValueRule" : {
"codeName" : "ValueRule2",
"mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD/psdefvaluerules/ValueRule2",
"name" : "field值规则",
"getPSDEFVRGroupCondition" : {
"condOp" : "AND",
"condType" : "GROUP",
"name" : "默认组",
"getPSDEFVRConditions" : [ {
"condType" : "VALUERANGE2",
"dEFName" : "FIELD",
"maxValue" : 20.0,
"minValue" : 10.0,
"name" : "[数值范围] 大于等于 10.0 且 小于等于 20.0",
"ruleInfo" : "10<=field<=20",
"includeMaxValue" : true,
"includeMinValue" : true
} ],
"ruleInfo" : "10<=field<=20"
},
"rTMOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD/psdefvaluerules/ValueRule2",
"ruleInfo" : "10<=field<=20",
"checkDefault" : false,
"defaultMode" : false,
"enableBackend" : true,
"enableFront" : true
},
"getPSDEFormItemName" : "field",
"valueRuleType" : "DEFVALUERULE"
}, {
"checkMode" : 3,
"name" : "表单项值规则",
"getPSDEFValueRule" : {
"codeName" : "ValueRule3",
"mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD2/psdefvaluerules/ValueRule3",
"name" : "field2值规则",
"getPSDEFVRGroupCondition" : {
"condOp" : "AND",
"condType" : "GROUP",
"name" : "默认组",
"getPSDEFVRConditions" : [ {
"condType" : "REGEX",
"dEFName" : "FIELD2",
"name" : "[正则式](^[0-9]*$)",
"regExCode" : "^[0-9]*$",
"ruleInfo" : "只能写数字"
} ],
"ruleInfo" : "只能写数字"
},
"rTMOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/FIELD2/psdefvaluerules/ValueRule3",
"ruleInfo" : "只能写数字",
"checkDefault" : false,
"defaultMode" : false,
"enableBackend" : true,
"enableFront" : true
},
"getPSDEFormItemName" : "field2",
"valueRuleType" : "DEFVALUERULE"
} ], } ],
"getPSDEFormItems" : [ { "getPSDEFormItems" : [ {
"id" : "srfupdatedate", "id" : "srfupdatedate",
......
trainsys-provider/pom.xml
浏览文件 @ 9a450563
...@@ -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
浏览文件 @ 9a450563
...@@ -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
浏览文件 @ 9a450563
...@@ -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
浏览文件 @ 9a450563
...@@ -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 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或