Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
提交反馈
为 GitLab 提交贡献
登录
切换导航
T
TrainSys
项目
项目
详情
动态
版本
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
苏州培训方案
TrainSys
提交
4fa63e42
提交
4fa63e42
编写于
12月 25, 2023
作者:
ibizdev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
tony001 部署微服务接口 [TrainSys,默认服务接口]
上级
d7193109
变更
19
显示空白字符变更
内嵌
并排
正在显示
19 个修改的文件
包含
458 行增加
和
51 行删除
+458
-51
config.xml
config.xml
+6
-30
Main.json
...ys/PSSYSAPPS/Mob/PSAPPDATAENTITIES/TEST/PSFORMS/Main.json
+29
-1
TESTEditView.json
...lab/trainsys/PSSYSAPPS/Mob/PSAPPDEVIEWS/TESTEditView.json
+29
-1
Main.json
.../TemplatePublish/PSAPPDATAENTITIES/TEST/PSFORMS/Main.json
+29
-1
TESTEditView.json
.../PSSYSAPPS/TemplatePublish/PSAPPDEVIEWS/TESTEditView.json
+29
-1
TESTEditView_drawer.json
...PPS/TemplatePublish/PSAPPDEVIEWS/TESTEditView_drawer.json
+29
-1
Usr0526356960EditView_Form.json
...DATAENTITIES/Book/PSFORMS/Usr0526356960EditView_Form.json
+29
-1
Main.json
...ys/PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST/PSFORMS/Main.json
+29
-1
TESTEditView.json
...lab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/TESTEditView.json
+29
-1
TESTEditView_drawer.json
...insys/PSSYSAPPS/Web/PSAPPDEVIEWS/TESTEditView_drawer.json
+29
-1
TESTUsr3EditView.json
...trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/TESTUsr3EditView.json
+29
-1
TESTUsr4EditView.json
...trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/TESTUsr4EditView.json
+29
-1
bookUsr0526356960EditView.json
...PSSYSAPPS/Web/PSAPPDEVIEWS/bookUsr0526356960EditView.json
+29
-1
phoneUsr08223555EditView3.json
...PSSYSAPPS/Web/PSAPPDEVIEWS/phoneUsr08223555EditView3.json
+29
-1
PSSYSAPP.json
...ces/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSSYSAPP.json
+29
-1
pom.xml
trainsys-provider/pom.xml
+1
-1
Dockerfile
trainsys-provider/src/main/docker/Dockerfile
+1
-1
trainsys-provider-trainsys-k8s.yaml
...vider/src/main/docker/trainsys-provider-trainsys-k8s.yaml
+29
-4
trainsys-provider-trainsys.yaml
...-provider/src/main/docker/trainsys-provider-trainsys.yaml
+15
-1
未找到文件。
config.xml
浏览文件 @
4fa63e42
...
@@ -55,36 +55,12 @@
...
@@ -55,36 +55,12 @@
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/
mkdir -p /var/lib/jenkins/appcache/64777BB9-78E2-44DD-AEF6-FF87AC45C1D5
mvn clean package -Ptrainsys
if [ -e app_Mob/.dynamic ]
mvn install -Ptrainsys
then
cd trainsys-provider
cd app_Mob
mvn -Ptrainsys docker:build
else
mvn -Ptrainsys docker:push
cd app_Mob/app
docker -H $para1 stack deploy --compose-file=src/main/docker/trainsys-provider-trainsys.yaml ebsx --with-registry-auth
fi
sed -i "s#dstimage#$para5#g" swarm.yaml
if [[ $para3 = all ]];then
mv Dockerfile-ALL Dockerfile
set +e
sed -i "s#/api#/sztrainsys__mob#g" src/environments/environment.ts
sed -i "s#outputDir#//outputDir#g" vue.config.js
set -e
yarn
ln -s /var/lib/jenkins/appcache/64777BB9-78E2-44DD-AEF6-FF87AC45C1D5 node_modules/.cache
yarn build
else
if [ -e .dynamic ]
then
mv ../trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Mob model
else
mv ../../trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Mob model
fi
sed -i "s#srcimagename#$para4#g" Dockerfile-MODEL
mv Dockerfile-MODEL Dockerfile
fi
docker build -t $para5 .
docker push $para5
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/Mob/PSAPPDATAENTITIES/TEST/PSFORMS/Main.json
浏览文件 @
4fa63e42
...
@@ -511,6 +511,34 @@
...
@@ -511,6 +511,34 @@
}
],
}
],
"relatedDetailNames"
:
[
"testname"
,
"field10"
],
"relatedDetailNames"
:
[
"testname"
,
"field10"
],
"notMode"
:
false
"notMode"
:
false
},
{
"groupOP"
:
"AND"
,
"logicCat"
:
"ITEMBLANK"
,
"logicType"
:
"GROUP"
,
"name"
:
"表单成员[field][表单项空输入]逻辑"
,
"getPSDEFDLogics"
:
[
{
"condOP"
:
"EQ"
,
"dEFDName"
:
"field2"
,
"logicType"
:
"SINGLE"
},
{
"condOP"
:
"EQ"
,
"dEFDName"
:
"field11"
,
"logicType"
:
"SINGLE"
}
],
"relatedDetailNames"
:
[
"field2"
,
"field11"
],
"notMode"
:
false
},
{
"groupOP"
:
"AND"
,
"logicCat"
:
"ITEMENABLE"
,
"logicType"
:
"GROUP"
,
"name"
:
"表单成员[field][表单项启用]逻辑"
,
"getPSDEFDLogics"
:
[
{
"condOP"
:
"EQ"
,
"dEFDName"
:
"testname"
,
"logicType"
:
"SINGLE"
}
],
"relatedDetailNames"
:
[
"testname"
],
"notMode"
:
false
}
],
}
],
"getPSEditor"
:
{
"getPSEditor"
:
{
"editorType"
:
"MOBTEXT"
,
"editorType"
:
"MOBTEXT"
,
...
@@ -526,7 +554,7 @@
...
@@ -526,7 +554,7 @@
"id"
:
"group1"
"id"
:
"group1"
},
},
"showMoreMode"
:
1
,
"showMoreMode"
:
1
,
"allowEmpty"
:
tru
e
,
"allowEmpty"
:
fals
e
,
"showCaption"
:
true
"showCaption"
:
true
}
],
}
],
"getPSLayout"
:
{
"getPSLayout"
:
{
...
...
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Mob/PSAPPDEVIEWS/TESTEditView.json
浏览文件 @
4fa63e42
...
@@ -615,6 +615,34 @@
...
@@ -615,6 +615,34 @@
}
],
}
],
"relatedDetailNames"
:
[
"testname"
,
"field10"
],
"relatedDetailNames"
:
[
"testname"
,
"field10"
],
"notMode"
:
false
"notMode"
:
false
},
{
"groupOP"
:
"AND"
,
"logicCat"
:
"ITEMBLANK"
,
"logicType"
:
"GROUP"
,
"name"
:
"表单成员[field][表单项空输入]逻辑"
,
"getPSDEFDLogics"
:
[
{
"condOP"
:
"EQ"
,
"dEFDName"
:
"field2"
,
"logicType"
:
"SINGLE"
},
{
"condOP"
:
"EQ"
,
"dEFDName"
:
"field11"
,
"logicType"
:
"SINGLE"
}
],
"relatedDetailNames"
:
[
"field2"
,
"field11"
],
"notMode"
:
false
},
{
"groupOP"
:
"AND"
,
"logicCat"
:
"ITEMENABLE"
,
"logicType"
:
"GROUP"
,
"name"
:
"表单成员[field][表单项启用]逻辑"
,
"getPSDEFDLogics"
:
[
{
"condOP"
:
"EQ"
,
"dEFDName"
:
"testname"
,
"logicType"
:
"SINGLE"
}
],
"relatedDetailNames"
:
[
"testname"
],
"notMode"
:
false
}
],
}
],
"getPSEditor"
:
{
"getPSEditor"
:
{
"editorType"
:
"MOBTEXT"
,
"editorType"
:
"MOBTEXT"
,
...
@@ -630,7 +658,7 @@
...
@@ -630,7 +658,7 @@
"id"
:
"group1"
"id"
:
"group1"
},
},
"showMoreMode"
:
1
,
"showMoreMode"
:
1
,
"allowEmpty"
:
tru
e
,
"allowEmpty"
:
fals
e
,
"showCaption"
:
true
"showCaption"
:
true
}
],
}
],
"getPSLayout"
:
{
"getPSLayout"
:
{
...
...
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/TemplatePublish/PSAPPDATAENTITIES/TEST/PSFORMS/Main.json
浏览文件 @
4fa63e42
...
@@ -514,6 +514,34 @@
...
@@ -514,6 +514,34 @@
}
],
}
],
"relatedDetailNames"
:
[
"testname"
,
"field10"
],
"relatedDetailNames"
:
[
"testname"
,
"field10"
],
"notMode"
:
false
"notMode"
:
false
},
{
"groupOP"
:
"AND"
,
"logicCat"
:
"ITEMBLANK"
,
"logicType"
:
"GROUP"
,
"name"
:
"表单成员[field][表单项空输入]逻辑"
,
"getPSDEFDLogics"
:
[
{
"condOP"
:
"EQ"
,
"dEFDName"
:
"field2"
,
"logicType"
:
"SINGLE"
},
{
"condOP"
:
"EQ"
,
"dEFDName"
:
"field11"
,
"logicType"
:
"SINGLE"
}
],
"relatedDetailNames"
:
[
"field2"
,
"field11"
],
"notMode"
:
false
},
{
"groupOP"
:
"AND"
,
"logicCat"
:
"ITEMENABLE"
,
"logicType"
:
"GROUP"
,
"name"
:
"表单成员[field][表单项启用]逻辑"
,
"getPSDEFDLogics"
:
[
{
"condOP"
:
"EQ"
,
"dEFDName"
:
"testname"
,
"logicType"
:
"SINGLE"
}
],
"relatedDetailNames"
:
[
"testname"
],
"notMode"
:
false
}
],
}
],
"getPSEditor"
:
{
"getPSEditor"
:
{
"editorType"
:
"TEXTBOX"
,
"editorType"
:
"TEXTBOX"
,
...
@@ -529,7 +557,7 @@
...
@@ -529,7 +557,7 @@
"id"
:
"group1"
"id"
:
"group1"
},
},
"showMoreMode"
:
1
,
"showMoreMode"
:
1
,
"allowEmpty"
:
tru
e
,
"allowEmpty"
:
fals
e
,
"showCaption"
:
true
"showCaption"
:
true
}
],
}
],
"getPSLayout"
:
{
"getPSLayout"
:
{
...
...
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/TemplatePublish/PSAPPDEVIEWS/TESTEditView.json
浏览文件 @
4fa63e42
...
@@ -618,6 +618,34 @@
...
@@ -618,6 +618,34 @@
}
],
}
],
"relatedDetailNames"
:
[
"testname"
,
"field10"
],
"relatedDetailNames"
:
[
"testname"
,
"field10"
],
"notMode"
:
false
"notMode"
:
false
},
{
"groupOP"
:
"AND"
,
"logicCat"
:
"ITEMBLANK"
,
"logicType"
:
"GROUP"
,
"name"
:
"表单成员[field][表单项空输入]逻辑"
,
"getPSDEFDLogics"
:
[
{
"condOP"
:
"EQ"
,
"dEFDName"
:
"field2"
,
"logicType"
:
"SINGLE"
},
{
"condOP"
:
"EQ"
,
"dEFDName"
:
"field11"
,
"logicType"
:
"SINGLE"
}
],
"relatedDetailNames"
:
[
"field2"
,
"field11"
],
"notMode"
:
false
},
{
"groupOP"
:
"AND"
,
"logicCat"
:
"ITEMENABLE"
,
"logicType"
:
"GROUP"
,
"name"
:
"表单成员[field][表单项启用]逻辑"
,
"getPSDEFDLogics"
:
[
{
"condOP"
:
"EQ"
,
"dEFDName"
:
"testname"
,
"logicType"
:
"SINGLE"
}
],
"relatedDetailNames"
:
[
"testname"
],
"notMode"
:
false
}
],
}
],
"getPSEditor"
:
{
"getPSEditor"
:
{
"editorType"
:
"TEXTBOX"
,
"editorType"
:
"TEXTBOX"
,
...
@@ -633,7 +661,7 @@
...
@@ -633,7 +661,7 @@
"id"
:
"group1"
"id"
:
"group1"
},
},
"showMoreMode"
:
1
,
"showMoreMode"
:
1
,
"allowEmpty"
:
tru
e
,
"allowEmpty"
:
fals
e
,
"showCaption"
:
true
"showCaption"
:
true
}
],
}
],
"getPSLayout"
:
{
"getPSLayout"
:
{
...
...
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/TemplatePublish/PSAPPDEVIEWS/TESTEditView_drawer.json
浏览文件 @
4fa63e42
...
@@ -604,6 +604,34 @@
...
@@ -604,6 +604,34 @@
}
],
}
],
"relatedDetailNames"
:
[
"testname"
,
"field10"
],
"relatedDetailNames"
:
[
"testname"
,
"field10"
],
"notMode"
:
false
"notMode"
:
false
},
{
"groupOP"
:
"AND"
,
"logicCat"
:
"ITEMBLANK"
,
"logicType"
:
"GROUP"
,
"name"
:
"表单成员[field][表单项空输入]逻辑"
,
"getPSDEFDLogics"
:
[
{
"condOP"
:
"EQ"
,
"dEFDName"
:
"field2"
,
"logicType"
:
"SINGLE"
},
{
"condOP"
:
"EQ"
,
"dEFDName"
:
"field11"
,
"logicType"
:
"SINGLE"
}
],
"relatedDetailNames"
:
[
"field2"
,
"field11"
],
"notMode"
:
false
},
{
"groupOP"
:
"AND"
,
"logicCat"
:
"ITEMENABLE"
,
"logicType"
:
"GROUP"
,
"name"
:
"表单成员[field][表单项启用]逻辑"
,
"getPSDEFDLogics"
:
[
{
"condOP"
:
"EQ"
,
"dEFDName"
:
"testname"
,
"logicType"
:
"SINGLE"
}
],
"relatedDetailNames"
:
[
"testname"
],
"notMode"
:
false
}
],
}
],
"getPSEditor"
:
{
"getPSEditor"
:
{
"editorType"
:
"TEXTBOX"
,
"editorType"
:
"TEXTBOX"
,
...
@@ -619,7 +647,7 @@
...
@@ -619,7 +647,7 @@
"id"
:
"group1"
"id"
:
"group1"
},
},
"showMoreMode"
:
1
,
"showMoreMode"
:
1
,
"allowEmpty"
:
tru
e
,
"allowEmpty"
:
fals
e
,
"showCaption"
:
true
"showCaption"
:
true
}
],
}
],
"getPSLayout"
:
{
"getPSLayout"
:
{
...
...
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Book/PSFORMS/Usr0526356960EditView_Form.json
浏览文件 @
4fa63e42
...
@@ -796,6 +796,34 @@
...
@@ -796,6 +796,34 @@
}
],
}
],
"relatedDetailNames"
:
[
"testname"
,
"field10"
],
"relatedDetailNames"
:
[
"testname"
,
"field10"
],
"notMode"
:
false
"notMode"
:
false
},
{
"groupOP"
:
"AND"
,
"logicCat"
:
"ITEMBLANK"
,
"logicType"
:
"GROUP"
,
"name"
:
"表单成员[field][表单项空输入]逻辑"
,
"getPSDEFDLogics"
:
[
{
"condOP"
:
"EQ"
,
"dEFDName"
:
"field2"
,
"logicType"
:
"SINGLE"
},
{
"condOP"
:
"EQ"
,
"dEFDName"
:
"field11"
,
"logicType"
:
"SINGLE"
}
],
"relatedDetailNames"
:
[
"field2"
,
"field11"
],
"notMode"
:
false
},
{
"groupOP"
:
"AND"
,
"logicCat"
:
"ITEMENABLE"
,
"logicType"
:
"GROUP"
,
"name"
:
"表单成员[field][表单项启用]逻辑"
,
"getPSDEFDLogics"
:
[
{
"condOP"
:
"EQ"
,
"dEFDName"
:
"testname"
,
"logicType"
:
"SINGLE"
}
],
"relatedDetailNames"
:
[
"testname"
],
"notMode"
:
false
}
],
}
],
"getPSEditor"
:
{
"getPSEditor"
:
{
"editorType"
:
"TEXTBOX"
,
"editorType"
:
"TEXTBOX"
,
...
@@ -811,7 +839,7 @@
...
@@ -811,7 +839,7 @@
"id"
:
"group1"
"id"
:
"group1"
},
},
"showMoreMode"
:
1
,
"showMoreMode"
:
1
,
"allowEmpty"
:
tru
e
,
"allowEmpty"
:
fals
e
,
"showCaption"
:
true
"showCaption"
:
true
}
],
}
],
"getPSLayout"
:
{
"getPSLayout"
:
{
...
...
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST/PSFORMS/Main.json
浏览文件 @
4fa63e42
...
@@ -514,6 +514,34 @@
...
@@ -514,6 +514,34 @@
}
],
}
],
"relatedDetailNames"
:
[
"testname"
,
"field10"
],
"relatedDetailNames"
:
[
"testname"
,
"field10"
],
"notMode"
:
false
"notMode"
:
false
},
{
"groupOP"
:
"AND"
,
"logicCat"
:
"ITEMBLANK"
,
"logicType"
:
"GROUP"
,
"name"
:
"表单成员[field][表单项空输入]逻辑"
,
"getPSDEFDLogics"
:
[
{
"condOP"
:
"EQ"
,
"dEFDName"
:
"field2"
,
"logicType"
:
"SINGLE"
},
{
"condOP"
:
"EQ"
,
"dEFDName"
:
"field11"
,
"logicType"
:
"SINGLE"
}
],
"relatedDetailNames"
:
[
"field2"
,
"field11"
],
"notMode"
:
false
},
{
"groupOP"
:
"AND"
,
"logicCat"
:
"ITEMENABLE"
,
"logicType"
:
"GROUP"
,
"name"
:
"表单成员[field][表单项启用]逻辑"
,
"getPSDEFDLogics"
:
[
{
"condOP"
:
"EQ"
,
"dEFDName"
:
"testname"
,
"logicType"
:
"SINGLE"
}
],
"relatedDetailNames"
:
[
"testname"
],
"notMode"
:
false
}
],
}
],
"getPSEditor"
:
{
"getPSEditor"
:
{
"editorType"
:
"TEXTBOX"
,
"editorType"
:
"TEXTBOX"
,
...
@@ -529,7 +557,7 @@
...
@@ -529,7 +557,7 @@
"id"
:
"group1"
"id"
:
"group1"
},
},
"showMoreMode"
:
1
,
"showMoreMode"
:
1
,
"allowEmpty"
:
tru
e
,
"allowEmpty"
:
fals
e
,
"showCaption"
:
true
"showCaption"
:
true
}
],
}
],
"getPSLayout"
:
{
"getPSLayout"
:
{
...
...
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/TESTEditView.json
浏览文件 @
4fa63e42
...
@@ -617,6 +617,34 @@
...
@@ -617,6 +617,34 @@
}
],
}
],
"relatedDetailNames"
:
[
"testname"
,
"field10"
],
"relatedDetailNames"
:
[
"testname"
,
"field10"
],
"notMode"
:
false
"notMode"
:
false
},
{
"groupOP"
:
"AND"
,
"logicCat"
:
"ITEMBLANK"
,
"logicType"
:
"GROUP"
,
"name"
:
"表单成员[field][表单项空输入]逻辑"
,
"getPSDEFDLogics"
:
[
{
"condOP"
:
"EQ"
,
"dEFDName"
:
"field2"
,
"logicType"
:
"SINGLE"
},
{
"condOP"
:
"EQ"
,
"dEFDName"
:
"field11"
,
"logicType"
:
"SINGLE"
}
],
"relatedDetailNames"
:
[
"field2"
,
"field11"
],
"notMode"
:
false
},
{
"groupOP"
:
"AND"
,
"logicCat"
:
"ITEMENABLE"
,
"logicType"
:
"GROUP"
,
"name"
:
"表单成员[field][表单项启用]逻辑"
,
"getPSDEFDLogics"
:
[
{
"condOP"
:
"EQ"
,
"dEFDName"
:
"testname"
,
"logicType"
:
"SINGLE"
}
],
"relatedDetailNames"
:
[
"testname"
],
"notMode"
:
false
}
],
}
],
"getPSEditor"
:
{
"getPSEditor"
:
{
"editorType"
:
"TEXTBOX"
,
"editorType"
:
"TEXTBOX"
,
...
@@ -632,7 +660,7 @@
...
@@ -632,7 +660,7 @@
"id"
:
"group1"
"id"
:
"group1"
},
},
"showMoreMode"
:
1
,
"showMoreMode"
:
1
,
"allowEmpty"
:
tru
e
,
"allowEmpty"
:
fals
e
,
"showCaption"
:
true
"showCaption"
:
true
}
],
}
],
"getPSLayout"
:
{
"getPSLayout"
:
{
...
...
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/TESTEditView_drawer.json
浏览文件 @
4fa63e42
...
@@ -603,6 +603,34 @@
...
@@ -603,6 +603,34 @@
}
],
}
],
"relatedDetailNames"
:
[
"testname"
,
"field10"
],
"relatedDetailNames"
:
[
"testname"
,
"field10"
],
"notMode"
:
false
"notMode"
:
false
},
{
"groupOP"
:
"AND"
,
"logicCat"
:
"ITEMBLANK"
,
"logicType"
:
"GROUP"
,
"name"
:
"表单成员[field][表单项空输入]逻辑"
,
"getPSDEFDLogics"
:
[
{
"condOP"
:
"EQ"
,
"dEFDName"
:
"field2"
,
"logicType"
:
"SINGLE"
},
{
"condOP"
:
"EQ"
,
"dEFDName"
:
"field11"
,
"logicType"
:
"SINGLE"
}
],
"relatedDetailNames"
:
[
"field2"
,
"field11"
],
"notMode"
:
false
},
{
"groupOP"
:
"AND"
,
"logicCat"
:
"ITEMENABLE"
,
"logicType"
:
"GROUP"
,
"name"
:
"表单成员[field][表单项启用]逻辑"
,
"getPSDEFDLogics"
:
[
{
"condOP"
:
"EQ"
,
"dEFDName"
:
"testname"
,
"logicType"
:
"SINGLE"
}
],
"relatedDetailNames"
:
[
"testname"
],
"notMode"
:
false
}
],
}
],
"getPSEditor"
:
{
"getPSEditor"
:
{
"editorType"
:
"TEXTBOX"
,
"editorType"
:
"TEXTBOX"
,
...
@@ -618,7 +646,7 @@
...
@@ -618,7 +646,7 @@
"id"
:
"group1"
"id"
:
"group1"
},
},
"showMoreMode"
:
1
,
"showMoreMode"
:
1
,
"allowEmpty"
:
tru
e
,
"allowEmpty"
:
fals
e
,
"showCaption"
:
true
"showCaption"
:
true
}
],
}
],
"getPSLayout"
:
{
"getPSLayout"
:
{
...
...
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/TESTUsr3EditView.json
浏览文件 @
4fa63e42
...
@@ -621,6 +621,34 @@
...
@@ -621,6 +621,34 @@
}
],
}
],
"relatedDetailNames"
:
[
"testname"
,
"field10"
],
"relatedDetailNames"
:
[
"testname"
,
"field10"
],
"notMode"
:
false
"notMode"
:
false
},
{
"groupOP"
:
"AND"
,
"logicCat"
:
"ITEMBLANK"
,
"logicType"
:
"GROUP"
,
"name"
:
"表单成员[field][表单项空输入]逻辑"
,
"getPSDEFDLogics"
:
[
{
"condOP"
:
"EQ"
,
"dEFDName"
:
"field2"
,
"logicType"
:
"SINGLE"
},
{
"condOP"
:
"EQ"
,
"dEFDName"
:
"field11"
,
"logicType"
:
"SINGLE"
}
],
"relatedDetailNames"
:
[
"field2"
,
"field11"
],
"notMode"
:
false
},
{
"groupOP"
:
"AND"
,
"logicCat"
:
"ITEMENABLE"
,
"logicType"
:
"GROUP"
,
"name"
:
"表单成员[field][表单项启用]逻辑"
,
"getPSDEFDLogics"
:
[
{
"condOP"
:
"EQ"
,
"dEFDName"
:
"testname"
,
"logicType"
:
"SINGLE"
}
],
"relatedDetailNames"
:
[
"testname"
],
"notMode"
:
false
}
],
}
],
"getPSEditor"
:
{
"getPSEditor"
:
{
"editorType"
:
"TEXTBOX"
,
"editorType"
:
"TEXTBOX"
,
...
@@ -636,7 +664,7 @@
...
@@ -636,7 +664,7 @@
"id"
:
"group1"
"id"
:
"group1"
},
},
"showMoreMode"
:
1
,
"showMoreMode"
:
1
,
"allowEmpty"
:
tru
e
,
"allowEmpty"
:
fals
e
,
"showCaption"
:
true
"showCaption"
:
true
}
],
}
],
"getPSLayout"
:
{
"getPSLayout"
:
{
...
...
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/TESTUsr4EditView.json
浏览文件 @
4fa63e42
...
@@ -615,6 +615,34 @@
...
@@ -615,6 +615,34 @@
}
],
}
],
"relatedDetailNames"
:
[
"testname"
,
"field10"
],
"relatedDetailNames"
:
[
"testname"
,
"field10"
],
"notMode"
:
false
"notMode"
:
false
},
{
"groupOP"
:
"AND"
,
"logicCat"
:
"ITEMBLANK"
,
"logicType"
:
"GROUP"
,
"name"
:
"表单成员[field][表单项空输入]逻辑"
,
"getPSDEFDLogics"
:
[
{
"condOP"
:
"EQ"
,
"dEFDName"
:
"field2"
,
"logicType"
:
"SINGLE"
},
{
"condOP"
:
"EQ"
,
"dEFDName"
:
"field11"
,
"logicType"
:
"SINGLE"
}
],
"relatedDetailNames"
:
[
"field2"
,
"field11"
],
"notMode"
:
false
},
{
"groupOP"
:
"AND"
,
"logicCat"
:
"ITEMENABLE"
,
"logicType"
:
"GROUP"
,
"name"
:
"表单成员[field][表单项启用]逻辑"
,
"getPSDEFDLogics"
:
[
{
"condOP"
:
"EQ"
,
"dEFDName"
:
"testname"
,
"logicType"
:
"SINGLE"
}
],
"relatedDetailNames"
:
[
"testname"
],
"notMode"
:
false
}
],
}
],
"getPSEditor"
:
{
"getPSEditor"
:
{
"editorType"
:
"TEXTBOX"
,
"editorType"
:
"TEXTBOX"
,
...
@@ -630,7 +658,7 @@
...
@@ -630,7 +658,7 @@
"id"
:
"group1"
"id"
:
"group1"
},
},
"showMoreMode"
:
1
,
"showMoreMode"
:
1
,
"allowEmpty"
:
tru
e
,
"allowEmpty"
:
fals
e
,
"showCaption"
:
true
"showCaption"
:
true
}
],
}
],
"getPSLayout"
:
{
"getPSLayout"
:
{
...
...
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/bookUsr0526356960EditView.json
浏览文件 @
4fa63e42
...
@@ -914,6 +914,34 @@
...
@@ -914,6 +914,34 @@
}
],
}
],
"relatedDetailNames"
:
[
"testname"
,
"field10"
],
"relatedDetailNames"
:
[
"testname"
,
"field10"
],
"notMode"
:
false
"notMode"
:
false
},
{
"groupOP"
:
"AND"
,
"logicCat"
:
"ITEMBLANK"
,
"logicType"
:
"GROUP"
,
"name"
:
"表单成员[field][表单项空输入]逻辑"
,
"getPSDEFDLogics"
:
[
{
"condOP"
:
"EQ"
,
"dEFDName"
:
"field2"
,
"logicType"
:
"SINGLE"
},
{
"condOP"
:
"EQ"
,
"dEFDName"
:
"field11"
,
"logicType"
:
"SINGLE"
}
],
"relatedDetailNames"
:
[
"field2"
,
"field11"
],
"notMode"
:
false
},
{
"groupOP"
:
"AND"
,
"logicCat"
:
"ITEMENABLE"
,
"logicType"
:
"GROUP"
,
"name"
:
"表单成员[field][表单项启用]逻辑"
,
"getPSDEFDLogics"
:
[
{
"condOP"
:
"EQ"
,
"dEFDName"
:
"testname"
,
"logicType"
:
"SINGLE"
}
],
"relatedDetailNames"
:
[
"testname"
],
"notMode"
:
false
}
],
}
],
"getPSEditor"
:
{
"getPSEditor"
:
{
"editorType"
:
"TEXTBOX"
,
"editorType"
:
"TEXTBOX"
,
...
@@ -929,7 +957,7 @@
...
@@ -929,7 +957,7 @@
"id"
:
"group1"
"id"
:
"group1"
},
},
"showMoreMode"
:
1
,
"showMoreMode"
:
1
,
"allowEmpty"
:
tru
e
,
"allowEmpty"
:
fals
e
,
"showCaption"
:
true
"showCaption"
:
true
}
],
}
],
"getPSLayout"
:
{
"getPSLayout"
:
{
...
...
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/phoneUsr08223555EditView3.json
浏览文件 @
4fa63e42
...
@@ -1328,6 +1328,34 @@
...
@@ -1328,6 +1328,34 @@
}
],
}
],
"relatedDetailNames"
:
[
"testname"
,
"field10"
],
"relatedDetailNames"
:
[
"testname"
,
"field10"
],
"notMode"
:
false
"notMode"
:
false
},
{
"groupOP"
:
"AND"
,
"logicCat"
:
"ITEMBLANK"
,
"logicType"
:
"GROUP"
,
"name"
:
"表单成员[field][表单项空输入]逻辑"
,
"getPSDEFDLogics"
:
[
{
"condOP"
:
"EQ"
,
"dEFDName"
:
"field2"
,
"logicType"
:
"SINGLE"
},
{
"condOP"
:
"EQ"
,
"dEFDName"
:
"field11"
,
"logicType"
:
"SINGLE"
}
],
"relatedDetailNames"
:
[
"field2"
,
"field11"
],
"notMode"
:
false
},
{
"groupOP"
:
"AND"
,
"logicCat"
:
"ITEMENABLE"
,
"logicType"
:
"GROUP"
,
"name"
:
"表单成员[field][表单项启用]逻辑"
,
"getPSDEFDLogics"
:
[
{
"condOP"
:
"EQ"
,
"dEFDName"
:
"testname"
,
"logicType"
:
"SINGLE"
}
],
"relatedDetailNames"
:
[
"testname"
],
"notMode"
:
false
}
],
}
],
"getPSEditor"
:
{
"getPSEditor"
:
{
"editorType"
:
"TEXTBOX"
,
"editorType"
:
"TEXTBOX"
,
...
@@ -1343,7 +1371,7 @@
...
@@ -1343,7 +1371,7 @@
"id"
:
"group1"
"id"
:
"group1"
},
},
"showMoreMode"
:
1
,
"showMoreMode"
:
1
,
"allowEmpty"
:
tru
e
,
"allowEmpty"
:
fals
e
,
"showCaption"
:
true
"showCaption"
:
true
}
],
}
],
"getPSLayout"
:
{
"getPSLayout"
:
{
...
...
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSSYSAPP.json
浏览文件 @
4fa63e42
...
@@ -36732,6 +36732,34 @@
...
@@ -36732,6 +36732,34 @@
} ],
} ],
"relatedDetailNames" : [ "testname", "field10" ],
"relatedDetailNames" : [ "testname", "field10" ],
"notMode" : false
"notMode" : false
}, {
"groupOP" : "AND",
"logicCat" : "ITEMBLANK",
"logicType" : "GROUP",
"name" : "表单成员[field][表单项空输入]逻辑",
"getPSDEFDLogics" : [ {
"condOP" : "EQ",
"dEFDName" : "field2",
"logicType" : "SINGLE"
}, {
"condOP" : "EQ",
"dEFDName" : "field11",
"logicType" : "SINGLE"
} ],
"relatedDetailNames" : [ "field2", "field11" ],
"notMode" : false
}, {
"groupOP" : "AND",
"logicCat" : "ITEMENABLE",
"logicType" : "GROUP",
"name" : "表单成员[field][表单项启用]逻辑",
"getPSDEFDLogics" : [ {
"condOP" : "EQ",
"dEFDName" : "testname",
"logicType" : "SINGLE"
} ],
"relatedDetailNames" : [ "testname" ],
"notMode" : false
} ],
} ],
"getPSEditor" : {
"getPSEditor" : {
"editorType" : "TEXTBOX",
"editorType" : "TEXTBOX",
...
@@ -36747,7 +36775,7 @@
...
@@ -36747,7 +36775,7 @@
"id" : "group1"
"id" : "group1"
},
},
"showMoreMode" : 1,
"showMoreMode" : 1,
"allowEmpty" :
tru
e,
"allowEmpty" :
fals
e,
"showCaption" : true
"showCaption" : true
} ],
} ],
"getPSLayout" : {
"getPSLayout" : {
trainsys-provider/pom.xml
浏览文件 @
4fa63e42
...
@@ -33,7 +33,7 @@
...
@@ -33,7 +33,7 @@
<profiles>
<profiles>
<profile>
<profile>
<id>
runtime
</id>
<id>
trainsys
</id>
<build>
<build>
<resources>
<resources>
<resource>
<resource>
...
...
trainsys-provider/src/main/docker/Dockerfile
浏览文件 @
4fa63e42
...
@@ -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
8081
EXPOSE
50000
ADD
trainsys-provider.jar /trainsys-provider.jar
ADD
trainsys-provider.jar /trainsys-provider.jar
trainsys-provider/src/main/docker/trainsys-provider-trainsys-k8s.yaml
浏览文件 @
4fa63e42
...
@@ -22,7 +22,32 @@ spec:
...
@@ -22,7 +22,32 @@ 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
:
8081
-
containerPort
:
50000
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
...
@@ -35,9 +60,9 @@ spec:
...
@@ -35,9 +60,9 @@ spec:
type
:
NodePort
type
:
NodePort
ports
:
ports
:
-
name
:
http
-
name
:
http
port
:
8081
port
:
50000
targetPort
:
8081
targetPort
:
50000
nodePort
:
8081
nodePort
:
50000
protocol
:
TCP
protocol
:
TCP
selector
:
selector
:
app
:
trainsys-provider
app
:
trainsys-provider
...
...
trainsys-provider/src/main/docker/trainsys-provider-trainsys.yaml
浏览文件 @
4fa63e42
...
@@ -3,9 +3,23 @@ services:
...
@@ -3,9 +3,23 @@ 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
:
-
"
8081:8081
"
-
"
50000:50000
"
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
人
到此讨论。请谨慎行事。
先完成此消息的编辑!
取消
想要评论请
注册
或
登录