Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
提交反馈
为 GitLab 提交贡献
登录
切换导航
T
TrainSys
项目
项目
详情
动态
版本
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
苏州培训方案
TrainSys
提交
bfc5ebd9
提交
bfc5ebd9
编写于
3月 20, 2024
作者:
ibizdev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
tony001 部署微服务接口 [TrainSys,默认服务接口]
上级
b803b4d2
变更
16
隐藏空白字符变更
内嵌
并排
正在显示
16 个修改的文件
包含
341 行增加
和
70 行删除
+341
-70
config.xml
config.xml
+6
-0
BXD2.json
.../ibizlab/trainsys/PSMODULES/Test/PSDATAENTITIES/BXD2.json
+120
-9
MYSQL5.json
...NTITIES/BXD2/PSDEDATAQUERIES/View/PSDEDQCODES/MYSQL5.json
+4
-1
BXD2.json
...bizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/BXD2.json
+56
-3
FormMDctrlLocal_Form.json
.../PSAPPDATAENTITIES/BXD2/PSFORMS/FormMDctrlLocal_Form.json
+1
-1
Main.json
...ys/PSSYSAPPS/Web/PSAPPDATAENTITIES/BXD2/PSFORMS/Main.json
+1
-1
Test2.json
...s/PSSYSAPPS/Web/PSAPPDATAENTITIES/BXD2/PSFORMS/Test2.json
+1
-1
BXD2EditView.json
...lab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/BXD2EditView.json
+1
-1
BXD2EditView_Test.json
...rainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/BXD2EditView_Test.json
+1
-1
BXD2FormMDctrlLocal.json
...insys/PSSYSAPPS/Web/PSAPPDEVIEWS/BXD2FormMDctrlLocal.json
+1
-1
PSSYSAPP.json
...ces/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSSYSAPP.json
+95
-42
DEFAULT.json
...ces/model/cn/ibizlab/trainsys/PSSYSDBSCHEMES/DEFAULT.json
+8
-2
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
浏览文件 @
bfc5ebd9
...
...
@@ -55,6 +55,12 @@
git clone -b master $para2 trainsys/
export NODE_OPTIONS=--max-old-space-size=4096
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>
</hudson.tasks.Shell>
</builders>
...
...
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSDATAENTITIES/BXD2.json
浏览文件 @
bfc5ebd9
...
...
@@ -507,6 +507,9 @@
},
{
"name"
:
"UPDATEMAN"
,
"codeName"
:
"UpdateMan"
},
{
"name"
:
"DESCRIPTION"
,
"codeName"
:
"Description"
}
],
"codeName"
:
"Table"
,
"name"
:
"T_BXD2"
,
...
...
@@ -798,6 +801,12 @@
"queryCodeExp"
:
"t1.`TYPE`"
,
"standardColumnName"
:
"`TYPE`"
}
],
"getAllPSDEFSearchModes"
:
[
{
"codeName"
:
"N_TYPE_EQ"
,
"name"
:
"N_TYPE_EQ"
,
"stdDataType"
:
25
,
"valueOP"
:
"EQ"
}
],
"getAllPSDEFUIModes"
:
[
{
"codeName"
:
"Default"
,
"name"
:
"[TYPE][报销类型]"
,
...
...
@@ -1093,7 +1102,7 @@
"codeName"
:
"MobileDefault"
,
"editorType"
:
"MOBTEXTAREA"
,
"name"
:
"[BXD2NAME][报销单2名称]移动端默认"
,
"stringLength"
:
10
0000
,
"stringLength"
:
10
48576
,
"uIMode"
:
"MOBILEDEFAULT"
,
"mobileMode"
:
true
},
...
...
@@ -1109,7 +1118,7 @@
"codeName"
:
"Default"
,
"editorType"
:
"TEXTAREA_10"
,
"name"
:
"[BXD2NAME][报销单2名称]"
,
"stringLength"
:
10
0000
,
"stringLength"
:
10
48576
,
"uIMode"
:
"DEFAULT"
},
"type"
:
"DEFAULT"
...
...
@@ -1124,16 +1133,16 @@
"getPSDEFVRConditions"
:
[
{
"condType"
:
"STRINGLENGTH"
,
"dEFName"
:
"BXD2NAME"
,
"maxValue"
:
10
0000
,
"maxValue"
:
10
48576
,
"name"
:
"默认字符串长度"
,
"ruleInfo"
:
"内容长度必须小于等于[10
0000
]"
,
"ruleInfo"
:
"内容长度必须小于等于[10
48576
]"
,
"includeMaxValue"
:
true
,
"includeMinValue"
:
false
,
"keyCond"
:
true
}
],
"ruleInfo"
:
"内容长度必须小于等于[10
0000
]"
"ruleInfo"
:
"内容长度必须小于等于[10
48576
]"
},
"ruleInfo"
:
"内容长度必须小于等于[10
0000
]"
,
"ruleInfo"
:
"内容长度必须小于等于[10
48576
]"
,
"checkDefault"
:
true
,
"defaultMode"
:
true
,
"enableBackend"
:
true
,
...
...
@@ -1146,7 +1155,7 @@
"getLNPSLanguageRes"
:
{
"lanResTag"
:
"DEF.LNAME.BXD2NAME"
},
"length"
:
10
0000
,
"length"
:
10
48576
,
"logicName"
:
"报销单2名称"
,
"name"
:
"BXD2NAME"
,
"getPSDEDBTable"
:
{
...
...
@@ -1159,7 +1168,7 @@
},
"serviceCodeName"
:
"BXD2Name"
,
"stdDataType"
:
21
,
"stringLength"
:
10
0000
,
"stringLength"
:
10
48576
,
"valueFormat"
:
"%1$s"
,
"enableQuickSearch"
:
true
,
"majorDEField"
:
true
,
...
...
@@ -1417,6 +1426,83 @@
"valueFormat"
:
"%1$s"
,
"allowEmpty"
:
false
,
"systemReserver"
:
true
},
{
"getAllPSDEFDTColumns"
:
[
{
"columnName"
:
"DESCRIPTION"
,
"dBType"
:
"MYSQL5"
,
"name"
:
"DESCRIPTION"
,
"standardColumnName"
:
"`DESCRIPTION`"
}
],
"getAllPSDEFUIModes"
:
[
{
"codeName"
:
"MobileDefault"
,
"name"
:
"[DESCRIPTION][描述]移动端默认"
,
"getPSDEFFormItem"
:
{
"codeName"
:
"MobileDefault"
,
"editorType"
:
"MOBTEXTAREA"
,
"name"
:
"[DESCRIPTION][描述]移动端默认"
,
"stringLength"
:
1048576
,
"uIMode"
:
"MOBILEDEFAULT"
,
"mobileMode"
:
true
},
"type"
:
"MOBILEDEFAULT"
,
"mobileMode"
:
true
},
{
"codeName"
:
"Default"
,
"name"
:
"[DESCRIPTION][描述]"
,
"getPSDEFFormItem"
:
{
"codeName"
:
"Default"
,
"editorType"
:
"TEXTAREA_10"
,
"name"
:
"[DESCRIPTION][描述]"
,
"stringLength"
:
1048576
,
"uIMode"
:
"DEFAULT"
},
"type"
:
"DEFAULT"
}
],
"getAllPSDEFValueRules"
:
[
{
"codeName"
:
"Default"
,
"name"
:
"默认规则"
,
"getPSDEFVRGroupCondition"
:
{
"condOp"
:
"AND"
,
"condType"
:
"GROUP"
,
"name"
:
"默认组"
,
"getPSDEFVRConditions"
:
[
{
"condType"
:
"STRINGLENGTH"
,
"dEFName"
:
"DESCRIPTION"
,
"maxValue"
:
1048576
,
"name"
:
"默认字符串长度"
,
"ruleInfo"
:
"内容长度必须小于等于[1048576]"
,
"includeMaxValue"
:
true
,
"includeMinValue"
:
false
,
"keyCond"
:
true
}
],
"ruleInfo"
:
"内容长度必须小于等于[1048576]"
},
"ruleInfo"
:
"内容长度必须小于等于[1048576]"
,
"checkDefault"
:
true
,
"defaultMode"
:
true
,
"enableBackend"
:
true
,
"enableFront"
:
true
}
],
"codeName"
:
"Description"
,
"dEFType"
:
1
,
"dataType"
:
"LONGTEXT"
,
"importOrder"
:
1000
,
"length"
:
1048576
,
"logicName"
:
"描述"
,
"name"
:
"DESCRIPTION"
,
"getPSDEDBTable"
:
{
"modelref"
:
true
,
"id"
:
"Table"
},
"getPSSysDBColumn"
:
{
"modelref"
:
true
,
"id"
:
"DESCRIPTION"
},
"serviceCodeName"
:
"Description"
,
"stdDataType"
:
21
,
"stringLength"
:
1048576
,
"valueFormat"
:
"%1$s"
,
"queryColumn"
:
false
}
],
"getAllPSDELogics"
:
[
{
"codeName"
:
"test3"
,
...
...
@@ -1577,7 +1663,7 @@
},
"sourceType"
:
"DEFIELD"
,
"stdDataType"
:
21
,
"stringLength"
:
10
0000
,
"stringLength"
:
10
48576
,
"type"
:
"SIMPLE"
},
{
"jsonFormat"
:
"yyyy-MM-dd HH:mm:ss"
,
...
...
@@ -1605,6 +1691,17 @@
"type"
:
"SIMPLE"
,
"allowEmpty"
:
false
,
"readOnly"
:
true
},
{
"logicName"
:
"描述"
,
"name"
:
"Description"
,
"getPSDEField"
:
{
"name"
:
"DESCRIPTION"
,
"codeName"
:
"Description"
},
"sourceType"
:
"DEFIELD"
,
"stdDataType"
:
21
,
"stringLength"
:
1048576
,
"type"
:
"SIMPLE"
},
{
"jsonFormat"
:
"yyyy-MM-dd HH:mm:ss"
,
"logicName"
:
"更新时间"
,
...
...
@@ -1681,6 +1778,20 @@
"sourceType"
:
"DEFSEARCHMODE"
,
"stdDataType"
:
21
,
"type"
:
"SIMPLE"
},
{
"logicName"
:
"报销类型"
,
"name"
:
"N_TYPE_EQ"
,
"getPSDEFSearchMode"
:
{
"modelref"
:
true
,
"id"
:
"N_TYPE_EQ"
},
"getPSDEField"
:
{
"name"
:
"TYPE"
,
"codeName"
:
"Type"
},
"sourceType"
:
"DEFSEARCHMODE"
,
"stdDataType"
:
25
,
"type"
:
"SIMPLE"
}
],
"sourceType"
:
"DE"
,
"type"
:
"DEFILTER"
,
...
...
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSDATAENTITIES/BXD2/PSDEDATAQUERIES/View/PSDEDQCODES/MYSQL5.json
浏览文件 @
bfc5ebd9
...
...
@@ -13,6 +13,9 @@
},
{
"expression"
:
"t1.`CREATEMAN`"
,
"name"
:
"CREATEMAN"
},
{
"expression"
:
"t1.`DESCRIPTION`"
,
"name"
:
"DESCRIPTION"
},
{
"expression"
:
"t1.`MXCOUNT`"
,
"name"
:
"MXCOUNT"
...
...
@@ -26,6 +29,6 @@
"expression"
:
"t1.`UPDATEMAN`"
,
"name"
:
"UPDATEMAN"
}
],
"queryCode"
:
"SELECT
\n
t1.`BXD2ID`,
\n
t1.`BXD2NAME`,
\n
t1.`CREATEDATE`,
\n
t1.`CREATEMAN`,
\n
t1.`MXCOUNT`,
\n
t1.`TYPE`,
\n
t1.`UPDATEDATE`,
\n
t1.`UPDATEMAN`
\n
FROM `T_BXD2` t1
\n
"
,
"queryCode"
:
"SELECT
\n
t1.`BXD2ID`,
\n
t1.`BXD2NAME`,
\n
t1.`CREATEDATE`,
\n
t1.`CREATEMAN`,
\n
t1.`
DESCRIPTION`,
\n
t1.`
MXCOUNT`,
\n
t1.`TYPE`,
\n
t1.`UPDATEDATE`,
\n
t1.`UPDATEMAN`
\n
FROM `T_BXD2` t1
\n
"
,
"id"
:
"PSMODULES/Test/PSDATAENTITIES/BXD2/PSDEDATAQUERIES/View/PSDEDQCODES/MYSQL5.json"
}
\ No newline at end of file
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/BXD2.json
浏览文件 @
bfc5ebd9
...
...
@@ -940,7 +940,7 @@
"codeName"
:
"MobileDefault"
,
"editorType"
:
"MOBTEXTAREA"
,
"name"
:
"[BXD2NAME][报销单2名称]移动端默认"
,
"stringLength"
:
10
0000
,
"stringLength"
:
10
48576
,
"uIMode"
:
"MOBILEDEFAULT"
,
"mobileMode"
:
true
},
...
...
@@ -956,7 +956,7 @@
"codeName"
:
"Default"
,
"editorType"
:
"TEXTAREA_10"
,
"name"
:
"[BXD2NAME][报销单2名称]"
,
"stringLength"
:
10
0000
,
"stringLength"
:
10
48576
,
"uIMode"
:
"DEFAULT"
},
"type"
:
"DEFAULT"
...
...
@@ -968,7 +968,7 @@
"logicName"
:
"报销单2名称"
,
"name"
:
"BXD2NAME"
,
"stdDataType"
:
21
,
"stringLength"
:
10
0000
,
"stringLength"
:
10
48576
,
"enableQuickSearch"
:
true
,
"majorField"
:
true
},
{
...
...
@@ -1097,6 +1097,37 @@
"name"
:
"UPDATEMAN"
,
"stdDataType"
:
25
,
"stringLength"
:
60
},
{
"getAllPSAppDEFUIModes"
:
[
{
"codeName"
:
"MobileDefault"
,
"name"
:
"[DESCRIPTION][描述]移动端默认"
,
"getPSDEFFormItem"
:
{
"codeName"
:
"MobileDefault"
,
"editorType"
:
"MOBTEXTAREA"
,
"name"
:
"[DESCRIPTION][描述]移动端默认"
,
"stringLength"
:
1048576
,
"uIMode"
:
"MOBILEDEFAULT"
,
"mobileMode"
:
true
},
"type"
:
"MOBILEDEFAULT"
,
"mobileMode"
:
true
},
{
"codeName"
:
"Default"
,
"name"
:
"[DESCRIPTION][描述]"
,
"getPSDEFFormItem"
:
{
"codeName"
:
"Default"
,
"editorType"
:
"TEXTAREA_10"
,
"name"
:
"[DESCRIPTION][描述]"
,
"stringLength"
:
1048576
,
"uIMode"
:
"DEFAULT"
},
"type"
:
"DEFAULT"
}
],
"codeName"
:
"Description"
,
"logicName"
:
"描述"
,
"name"
:
"DESCRIPTION"
,
"stdDataType"
:
21
,
"stringLength"
:
1048576
}
],
"getAllPSAppDELogics"
:
[
{
"codeName"
:
"testAsyncAction"
,
...
...
@@ -1260,6 +1291,17 @@
"stdDataType"
:
25
,
"type"
:
"SIMPLE"
,
"allowEmpty"
:
false
},
{
"codeName"
:
"Description"
,
"logicName"
:
"描述"
,
"name"
:
"Description"
,
"getPSAppDEField"
:
{
"name"
:
"DESCRIPTION"
,
"codeName"
:
"Description"
},
"sourceType"
:
"DEFIELD"
,
"stdDataType"
:
21
,
"type"
:
"SIMPLE"
},
{
"codeName"
:
"UpdateDate"
,
"jsonFormat"
:
"yyyy-MM-dd HH:mm:ss"
,
...
...
@@ -1330,6 +1372,17 @@
"sourceType"
:
"DEFSEARCHMODE"
,
"stdDataType"
:
21
,
"type"
:
"SIMPLE"
},
{
"codeName"
:
"N_TYPE_EQ"
,
"logicName"
:
"报销类型"
,
"name"
:
"N_TYPE_EQ"
,
"getPSAppDEField"
:
{
"name"
:
"TYPE"
,
"codeName"
:
"Type"
},
"sourceType"
:
"DEFSEARCHMODE"
,
"stdDataType"
:
25
,
"type"
:
"SIMPLE"
}
],
"sourceType"
:
"DE"
,
"type"
:
"DEFILTER"
...
...
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/BXD2/PSFORMS/FormMDctrlLocal_Form.json
浏览文件 @
bfc5ebd9
...
...
@@ -202,7 +202,7 @@
"HEIGHT"
:
"200"
},
"editorType"
:
"TEXTAREA_10"
,
"maxLength"
:
10
0000
,
"maxLength"
:
10
48576
,
"name"
:
"bxd2name"
,
"showMaxLength"
:
true
},
...
...
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/BXD2/PSFORMS/Main.json
浏览文件 @
bfc5ebd9
...
...
@@ -215,7 +215,7 @@
},
"getPSEditor"
:
{
"editorType"
:
"TEXTAREA"
,
"maxLength"
:
10
0000
,
"maxLength"
:
10
48576
,
"name"
:
"formitem"
,
"showMaxLength"
:
true
},
...
...
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/BXD2/PSFORMS/Test2.json
浏览文件 @
bfc5ebd9
...
...
@@ -396,7 +396,7 @@
"HEIGHT"
:
"200"
},
"editorType"
:
"TEXTAREA_10"
,
"maxLength"
:
10
0000
,
"maxLength"
:
10
48576
,
"name"
:
"bxd2name"
,
"showMaxLength"
:
true
},
...
...
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/BXD2EditView.json
浏览文件 @
bfc5ebd9
...
...
@@ -802,7 +802,7 @@
},
"getPSEditor"
:
{
"editorType"
:
"TEXTAREA"
,
"maxLength"
:
10
0000
,
"maxLength"
:
10
48576
,
"name"
:
"formitem"
,
"showMaxLength"
:
true
},
...
...
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/BXD2EditView_Test.json
浏览文件 @
bfc5ebd9
...
...
@@ -999,7 +999,7 @@
"HEIGHT"
:
"200"
},
"editorType"
:
"TEXTAREA_10"
,
"maxLength"
:
10
0000
,
"maxLength"
:
10
48576
,
"name"
:
"bxd2name"
,
"showMaxLength"
:
true
},
...
...
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/BXD2FormMDctrlLocal.json
浏览文件 @
bfc5ebd9
...
...
@@ -309,7 +309,7 @@
"HEIGHT"
:
"200"
},
"editorType"
:
"TEXTAREA_10"
,
"maxLength"
:
10
0000
,
"maxLength"
:
10
48576
,
"name"
:
"bxd2name"
,
"showMaxLength"
:
true
},
...
...
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSSYSAPP.json
浏览文件 @
bfc5ebd9
...
...
@@ -13528,28 +13528,28 @@
"codeName" : "VMGroup4",
"name" : "视图消息位置测试",
"getPSAppViewMsgGroupDetails" : [ {
"name" : "消息位置-
弹出
",
"name" : "消息位置-
视图上方
",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg
10
"
"id" : "ViewMsg
7
"
}
}, {
"name" : "消息位置-视图
内容区
",
"name" : "消息位置-视图
下方
",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg
9
"
"id" : "ViewMsg
8
"
}
}, {
"name" : "消息位置-
视图上方
",
"name" : "消息位置-
弹出
",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg
7
"
"id" : "ViewMsg
10
"
}
}, {
"name" : "消息位置-视图
下方
",
"name" : "消息位置-视图
内容区
",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg
8
"
"id" : "ViewMsg
9
"
}
} ],
"uniqueTag" : "VMGroup4"
...
...
@@ -13557,6 +13557,25 @@
"codeName" : "VMGroup8",
"name" : "【静态测试】",
"getPSAppViewMsgGroupDetails" : [ {
"name" : "消息类型-警告信息",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg5"
},
"position" : "POPUP"
}, {
"name" : "消息位置-视图内容区",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg9"
}
}, {
"name" : "关闭模式-默认删除-上方-错误",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg12"
}
}, {
"name" : "关闭模式-本次删除-上方-警告",
"getPSAppViewMsg" : {
"modelref" : true,
...
...
@@ -13575,12 +13594,6 @@
"modelref" : true,
"id" : "ViewMsg8"
}
}, {
"name" : "关闭模式-无删除-上方-常规",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg11"
}
}, {
"name" : "消息类型-常规信息",
"getPSAppViewMsg" : {
...
...
@@ -13589,23 +13602,10 @@
},
"position" : "POPUP"
}, {
"name" : "消息类型-警告信息",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg5"
},
"position" : "POPUP"
}, {
"name" : "关闭模式-默认删除-上方-错误",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg12"
}
}, {
"name" : "消息位置-视图内容区",
"name" : "关闭模式-无删除-上方-常规",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg
9
"
"id" : "ViewMsg
11
"
}
} ],
"uniqueTag" : "VMGroup8"
...
...
@@ -13613,22 +13613,22 @@
"codeName" : "VMGroup5",
"name" : "视图消息关闭模式",
"getPSAppViewMsgGroupDetails" : [ {
"name" : "关闭模式-
无
删除",
"name" : "关闭模式-
本次
删除",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg1
1
"
"id" : "ViewMsg1
3
"
}
}, {
"name" : "关闭模式-
默认
删除",
"name" : "关闭模式-
无
删除",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg1
2
"
"id" : "ViewMsg1
1
"
}
}, {
"name" : "关闭模式-
本次
删除",
"name" : "关闭模式-
默认
删除",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg1
3
"
"id" : "ViewMsg1
2
"
}
} ],
"uniqueTag" : "VMGroup5"
...
...
@@ -13636,16 +13636,16 @@
"codeName" : "VMGroup6",
"name" : "视图消息动态模式测试",
"getPSAppViewMsgGroupDetails" : [ {
"name" : "动态模式-
实体数据集
",
"name" : "动态模式-
静态内容
",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg1
4
"
"id" : "ViewMsg1
5
"
}
}, {
"name" : "动态模式-
静态内容
",
"name" : "动态模式-
实体数据集
",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg1
5
"
"id" : "ViewMsg1
4
"
}
} ],
"uniqueTag" : "VMGroup6"
...
...
@@ -66760,7 +66760,7 @@
"codeName" : "MobileDefault",
"editorType" : "MOBTEXTAREA",
"name" : "[BXD2NAME][报销单2名称]移动端默认",
"stringLength" : 10
0000
,
"stringLength" : 10
48576
,
"uIMode" : "MOBILEDEFAULT",
"mobileMode" : true
},
...
...
@@ -66776,7 +66776,7 @@
"codeName" : "Default",
"editorType" : "TEXTAREA_10",
"name" : "[BXD2NAME][报销单2名称]",
"stringLength" : 10
0000
,
"stringLength" : 10
48576
,
"uIMode" : "DEFAULT"
},
"type" : "DEFAULT"
...
...
@@ -66788,7 +66788,7 @@
"logicName" : "报销单2名称",
"name" : "BXD2NAME",
"stdDataType" : 21,
"stringLength" : 10
0000
,
"stringLength" : 10
48576
,
"enableQuickSearch" : true,
"majorField" : true
}, {
...
...
@@ -66917,6 +66917,37 @@
"name" : "UPDATEMAN",
"stdDataType" : 25,
"stringLength" : 60
}, {
"getAllPSAppDEFUIModes" : [ {
"codeName" : "MobileDefault",
"name" : "[DESCRIPTION][描述]移动端默认",
"getPSDEFFormItem" : {
"codeName" : "MobileDefault",
"editorType" : "MOBTEXTAREA",
"name" : "[DESCRIPTION][描述]移动端默认",
"stringLength" : 1048576,
"uIMode" : "MOBILEDEFAULT",
"mobileMode" : true
},
"type" : "MOBILEDEFAULT",
"mobileMode" : true
}, {
"codeName" : "Default",
"name" : "[DESCRIPTION][描述]",
"getPSDEFFormItem" : {
"codeName" : "Default",
"editorType" : "TEXTAREA_10",
"name" : "[DESCRIPTION][描述]",
"stringLength" : 1048576,
"uIMode" : "DEFAULT"
},
"type" : "DEFAULT"
} ],
"codeName" : "Description",
"logicName" : "描述",
"name" : "DESCRIPTION",
"stdDataType" : 21,
"stringLength" : 1048576
} ],
"getAllPSAppDELogics" : [ {
"codeName" : "testAsyncAction",
...
...
@@ -67080,6 +67111,17 @@
"stdDataType" : 25,
"type" : "SIMPLE",
"allowEmpty" : false
}, {
"codeName" : "Description",
"logicName" : "描述",
"name" : "Description",
"getPSAppDEField" : {
"name" : "DESCRIPTION",
"codeName" : "Description"
},
"sourceType" : "DEFIELD",
"stdDataType" : 21,
"type" : "SIMPLE"
}, {
"codeName" : "UpdateDate",
"jsonFormat" : "yyyy-MM-dd HH:mm:ss",
...
...
@@ -67150,6 +67192,17 @@
"sourceType" : "DEFSEARCHMODE",
"stdDataType" : 21,
"type" : "SIMPLE"
}, {
"codeName" : "N_TYPE_EQ",
"logicName" : "报销类型",
"name" : "N_TYPE_EQ",
"getPSAppDEField" : {
"name" : "TYPE",
"codeName" : "Type"
},
"sourceType" : "DEFSEARCHMODE",
"stdDataType" : 25,
"type" : "SIMPLE"
} ],
"sourceType" : "DE",
"type" : "DEFILTER"
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSDBSCHEMES/DEFAULT.json
浏览文件 @
bfc5ebd9
...
...
@@ -1054,10 +1054,9 @@
"pKey"
:
true
},
{
"codeName"
:
"BXD2NAME"
,
"length"
:
200
,
"logicName"
:
"报销单2名称"
,
"name"
:
"BXD2NAME"
,
"stdDataType"
:
2
5
,
"stdDataType"
:
2
1
,
"nullable"
:
true
},
{
"codeName"
:
"CREATEDATE"
,
...
...
@@ -1073,6 +1072,13 @@
"name"
:
"CREATEMAN"
,
"stdDataType"
:
25
,
"nullable"
:
true
},
{
"codeName"
:
"DESCRIPTION"
,
"length"
:
1048576
,
"logicName"
:
"描述"
,
"name"
:
"DESCRIPTION"
,
"stdDataType"
:
21
,
"nullable"
:
true
},
{
"codeName"
:
"MXCOUNT"
,
"length"
:
100
,
...
...
trainsys-provider/pom.xml
浏览文件 @
bfc5ebd9
...
...
@@ -33,7 +33,7 @@
<profiles>
<profile>
<id>
runtime
</id>
<id>
trainsys
</id>
<build>
<resources>
<resource>
...
...
trainsys-provider/src/main/docker/Dockerfile
浏览文件 @
bfc5ebd9
...
...
@@ -10,6 +10,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
sleep ${IBIZ_SLEEP} && \
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
trainsys-provider/src/main/docker/trainsys-provider-trainsys-k8s.yaml
浏览文件 @
bfc5ebd9
...
...
@@ -22,7 +22,32 @@ spec:
image
:
registry.cn-shanghai.aliyuncs.com/ibizsys/trainsys-provider:latest
imagePullPolicy
:
Always
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
...
...
@@ -35,9 +60,9 @@ spec:
type
:
NodePort
ports
:
-
name
:
http
port
:
8081
targetPort
:
8081
nodePort
:
8081
port
:
50000
targetPort
:
50000
nodePort
:
50000
protocol
:
TCP
selector
:
app
:
trainsys-provider
...
...
trainsys-provider/src/main/docker/trainsys-provider-trainsys.yaml
浏览文件 @
bfc5ebd9
...
...
@@ -3,9 +3,23 @@ services:
trainsys-provider
:
image
:
registry.cn-shanghai.aliyuncs.com/ibizsys/trainsys-provider:latest
ports
:
-
"
8081:8081
"
-
"
50000:50000
"
networks
:
-
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
:
resources
:
limits
:
...
...
编辑
预览
Markdown
格式
0%
请重试
or
添加新附件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
先完成此消息的编辑!
取消
想要评论请
注册
或
登录