Skip to content

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

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

上级 9a4c6fca
隐藏空白字符变更
内嵌 并排
正在显示 包含 247 行增加 和 83 行删除
config.xml
浏览文件 @ b1150e82
......@@ -55,12 +55,6 @@
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/PSSYSAPPS/Web/PSAPPCODELISTS/CondType.json 0 → 100644
浏览文件 @ b1150e82
{
"codeListTag" : "Test__CondType",
"codeListType" : "STATIC",
"codeName" : "CondType",
"dynaInstMode" : 0,
"dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPCODELISTS/CondType.json",
"emptyText" : "未定义",
"name" : "条件类型",
"getPSCodeItems" : [ {
"codeName" : "Group",
"text" : "条件组",
"value" : "GROUP"
}, {
"codeName" : "Single",
"text" : "单个条件",
"value" : "SINGLE"
} ],
"enableCache" : true
}
\ No newline at end of file
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Book/PSCALENDARS/TestCtrlPlugCalendarView_Calendar.json
浏览文件 @ b1150e82
......@@ -217,7 +217,8 @@
} ],
"getPSSysPFPlugin" : {
"pluginType" : "CUSTOM",
"pluginCode" : "LIGHT_CALENDAR"
"pluginCode" : "LIGHT_CALENDAR",
"runtimeObject" : true
},
"enableGroup" : false,
"modelid" : "56F6024E-D9F7-4A95-A422-5AEC791F397C",
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Book/PSCALENDARS/TestCtrlPlugDayCalendarView_Calendar.json
浏览文件 @ b1150e82
......@@ -552,7 +552,8 @@
} ],
"getPSSysPFPlugin" : {
"pluginType" : "CUSTOM",
"pluginCode" : "LIGHT_CALENDAR"
"pluginCode" : "LIGHT_CALENDAR",
"runtimeObject" : true
},
"enableGroup" : false,
"modelid" : "48CB0996-1395-41B4-8529-1E98C1B9FB62",
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Book/PSCALENDARS/Timeline_CalendarView_Calendar.json
浏览文件 @ b1150e82
......@@ -125,7 +125,8 @@
} ],
"getPSSysPFPlugin" : {
"pluginType" : "CUSTOM",
"pluginCode" : "LIGHT_CALENDAR"
"pluginCode" : "LIGHT_CALENDAR",
"runtimeObject" : true
},
"enableGroup" : false,
"modelid" : "CBCB0EF8-7840-42CD-A7F5-ED7182AC1BAF",
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Book/PSCALENDARS/WeekCalendarView_Calendar.json
浏览文件 @ b1150e82
......@@ -217,7 +217,8 @@
} ],
"getPSSysPFPlugin" : {
"pluginType" : "CUSTOM",
"pluginCode" : "LIGHT_CALENDAR"
"pluginCode" : "LIGHT_CALENDAR",
"runtimeObject" : true
},
"enableGroup" : false,
"modelid" : "22B2AC4A-938D-40C0-9B62-817EFB5631E7",
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/SubTest2/PSFORMS/Main.json
浏览文件 @ b1150e82
......@@ -130,6 +130,13 @@
}, {
"id" : "formitem",
"dataType" : 25
}, {
"id" : "condtype",
"dataType" : 25,
"getPSAppDEField" : {
"name" : "CONDTYPE",
"codeName" : "CondType"
}
}, {
"id" : "createman",
"dataType" : 25,
......@@ -315,6 +322,38 @@
"valueItemName" : "testid",
"allowEmpty" : true,
"showCaption" : true
}, {
"caption" : "条件类型",
"codeName" : "condtype",
"dataType" : 25,
"detailStyle" : "DEFAULT",
"detailType" : "FORMITEM",
"enableCond" : 3,
"ignoreInput" : 0,
"labelPos" : "LEFT",
"labelWidth" : 130,
"name" : "condtype",
"noPrivDisplayMode" : 1,
"getPSAppDEField" : {
"name" : "CONDTYPE",
"codeName" : "CondType"
},
"getPSEditor" : {
"editorType" : "DROPDOWNLIST",
"name" : "condtype",
"getPSAppCodeList" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPCODELISTS/CondType.json"
},
"singleSelect" : true
},
"getPSLayoutPos" : {
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"allowEmpty" : true,
"needCodeListConfig" : true,
"showCaption" : true
} ],
"getPSLayout" : {
"childColLG" : -1,
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/SubTest2/PSFORMS/SingleCondEditView_Form.json
浏览文件 @ b1150e82
......@@ -112,6 +112,13 @@
"id" : "srfsourcekey",
"hidden" : true,
"dataType" : 25
}, {
"id" : "condtype",
"dataType" : 25,
"getPSAppDEField" : {
"name" : "CONDTYPE",
"codeName" : "CondType"
}
}, {
"id" : "subtest2name",
"dataType" : 25,
......@@ -164,12 +171,44 @@
"name" : "formpage1",
"getPSDEFormDetails" : [ {
"actionGroupExtractMode" : "ITEM",
"caption" : "子测试实体基本信息",
"caption" : "单个条件",
"codeName" : "group1",
"detailStyle" : "DEFAULT",
"detailType" : "GROUPPANEL",
"name" : "group1",
"getPSDEFormDetails" : [ {
"caption" : "条件类型",
"codeName" : "condtype",
"dataType" : 25,
"detailStyle" : "DEFAULT",
"detailType" : "FORMITEM",
"enableCond" : 3,
"ignoreInput" : 0,
"labelPos" : "LEFT",
"labelWidth" : 130,
"name" : "condtype",
"noPrivDisplayMode" : 1,
"getPSAppDEField" : {
"name" : "CONDTYPE",
"codeName" : "CondType"
},
"getPSEditor" : {
"editorType" : "DROPDOWNLIST",
"name" : "condtype",
"getPSAppCodeList" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPCODELISTS/CondType.json"
},
"singleSelect" : true
},
"getPSLayoutPos" : {
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"allowEmpty" : true,
"needCodeListConfig" : true,
"showCaption" : true
}, {
"getCapPSLanguageRes" : {
"defaultContent" : "子测试实体名称",
"lanResTag" : "DEF.LNAME.SUBTEST2NAME",
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/SubTest2EditView.json
浏览文件 @ b1150e82
......@@ -242,6 +242,13 @@
}, {
"id" : "formitem",
"dataType" : 25
}, {
"id" : "condtype",
"dataType" : 25,
"getPSAppDEField" : {
"name" : "CONDTYPE",
"codeName" : "CondType"
}
}, {
"id" : "createman",
"dataType" : 25,
......@@ -427,6 +434,38 @@
"valueItemName" : "testid",
"allowEmpty" : true,
"showCaption" : true
}, {
"caption" : "条件类型",
"codeName" : "condtype",
"dataType" : 25,
"detailStyle" : "DEFAULT",
"detailType" : "FORMITEM",
"enableCond" : 3,
"ignoreInput" : 0,
"labelPos" : "LEFT",
"labelWidth" : 130,
"name" : "condtype",
"noPrivDisplayMode" : 1,
"getPSAppDEField" : {
"name" : "CONDTYPE",
"codeName" : "CondType"
},
"getPSEditor" : {
"editorType" : "DROPDOWNLIST",
"name" : "condtype",
"getPSAppCodeList" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPCODELISTS/CondType.json"
},
"singleSelect" : true
},
"getPSLayoutPos" : {
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"allowEmpty" : true,
"needCodeListConfig" : true,
"showCaption" : true
} ],
"getPSLayout" : {
"childColLG" : -1,
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/SubTest2SingleCondEditView.json
浏览文件 @ b1150e82
......@@ -239,6 +239,13 @@
"id" : "srfsourcekey",
"hidden" : true,
"dataType" : 25
}, {
"id" : "condtype",
"dataType" : 25,
"getPSAppDEField" : {
"name" : "CONDTYPE",
"codeName" : "CondType"
}
}, {
"id" : "subtest2name",
"dataType" : 25,
......@@ -291,12 +298,44 @@
"name" : "formpage1",
"getPSDEFormDetails" : [ {
"actionGroupExtractMode" : "ITEM",
"caption" : "子测试实体基本信息",
"caption" : "单个条件",
"codeName" : "group1",
"detailStyle" : "DEFAULT",
"detailType" : "GROUPPANEL",
"name" : "group1",
"getPSDEFormDetails" : [ {
"caption" : "条件类型",
"codeName" : "condtype",
"dataType" : 25,
"detailStyle" : "DEFAULT",
"detailType" : "FORMITEM",
"enableCond" : 3,
"ignoreInput" : 0,
"labelPos" : "LEFT",
"labelWidth" : 130,
"name" : "condtype",
"noPrivDisplayMode" : 1,
"getPSAppDEField" : {
"name" : "CONDTYPE",
"codeName" : "CondType"
},
"getPSEditor" : {
"editorType" : "DROPDOWNLIST",
"name" : "condtype",
"getPSAppCodeList" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPCODELISTS/CondType.json"
},
"singleSelect" : true
},
"getPSLayoutPos" : {
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"allowEmpty" : true,
"needCodeListConfig" : true,
"showCaption" : true
}, {
"getCapPSLanguageRes" : {
"defaultContent" : "子测试实体名称",
"lanResTag" : "DEF.LNAME.SUBTEST2NAME",
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/bookTestCtrlPlugCalendarView.json
浏览文件 @ b1150e82
......@@ -274,7 +274,8 @@
} ],
"getPSSysPFPlugin" : {
"pluginType" : "CUSTOM",
"pluginCode" : "LIGHT_CALENDAR"
"pluginCode" : "LIGHT_CALENDAR",
"runtimeObject" : true
},
"enableGroup" : false,
"name" : "calendar",
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/bookTestCtrlPlugDayCalendarView.json
浏览文件 @ b1150e82
......@@ -617,7 +617,8 @@
} ],
"getPSSysPFPlugin" : {
"pluginType" : "CUSTOM",
"pluginCode" : "LIGHT_CALENDAR"
"pluginCode" : "LIGHT_CALENDAR",
"runtimeObject" : true
},
"enableGroup" : false,
"name" : "calendar",
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/booktimeline_CalendarView.json
浏览文件 @ b1150e82
......@@ -182,7 +182,8 @@
} ],
"getPSSysPFPlugin" : {
"pluginType" : "CUSTOM",
"pluginCode" : "LIGHT_CALENDAR"
"pluginCode" : "LIGHT_CALENDAR",
"runtimeObject" : true
},
"enableGroup" : false,
"name" : "calendar",
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/bookweekCalendarView.json
浏览文件 @ b1150e82
......@@ -274,7 +274,8 @@
} ],
"getPSSysPFPlugin" : {
"pluginType" : "CUSTOM",
"pluginCode" : "LIGHT_CALENDAR"
"pluginCode" : "LIGHT_CALENDAR",
"runtimeObject" : true
},
"enableGroup" : false,
"name" : "calendar",
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSSYSAPP.json
浏览文件 @ b1150e82
......@@ -376,6 +376,24 @@
"value" : "CANCELED"
} ],
"enableCache" : true
}, {
"codeListTag" : "Test__CondType",
"codeListType" : "STATIC",
"codeName" : "CondType",
"dynaInstMode" : 0,
"dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPCODELISTS/CondType.json",
"emptyText" : "未定义",
"name" : "条件类型",
"getPSCodeItems" : [ {
"codeName" : "Group",
"text" : "条件组",
"value" : "GROUP"
}, {
"codeName" : "Single",
"text" : "单个条件",
"value" : "SINGLE"
} ],
"enableCache" : true
}, {
"codeListTag" : "Test__FileType",
"codeListType" : "STATIC",
......@@ -5103,12 +5121,16 @@
"name" : "轻量级日历部件插件",
"getPSSysPFPlugin" : {
"pluginType" : "CUSTOM",
"pluginCode" : "LIGHT_CALENDAR"
"pluginCode" : "LIGHT_CALENDAR",
"runtimeObject" : true
},
"pluginCode" : "LIGHT_CALENDAR",
"pluginType" : "CUSTOM",
"rTObjectName" : "IBizLightCalendar",
"rTObjectRepo" : "@ibiz-template-plugin/light-calendar@0.0.10-alpha.15",
"refMode" : "CONTROL",
"refTag" : "CALENDAR"
"refTag" : "CALENDAR",
"runtimeObject" : true
}, {
"name" : "运行时部件(出来)",
"getPSSysPFPlugin" : {
......@@ -12169,6 +12191,12 @@
"codeName" : "VMGroup4",
"name" : "视图消息位置测试",
"getPSAppViewMsgGroupDetails" : [ {
"name" : "消息位置-视图上方",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg7"
}
}, {
"name" : "消息位置-弹出",
"getPSAppViewMsg" : {
"modelref" : true,
......@@ -12186,17 +12214,18 @@
"modelref" : true,
"id" : "ViewMsg9"
}
}, {
"name" : "消息位置-视图上方",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg7"
}
} ]
}, {
"codeName" : "VMGroup8",
"name" : "【静态测试】",
"getPSAppViewMsgGroupDetails" : [ {
"name" : "消息类型-警告信息",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg5"
},
"position" : "POPUP"
}, {
"name" : "消息类型-错误信息",
"getPSAppViewMsg" : {
"modelref" : true,
......@@ -12240,13 +12269,6 @@
"modelref" : true,
"id" : "ViewMsg13"
}
}, {
"name" : "消息类型-警告信息",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg5"
},
"position" : "POPUP"
} ]
}, {
"codeName" : "VMGroup5",
......@@ -12274,16 +12296,16 @@
"codeName" : "VMGroup6",
"name" : "视图消息动态模式测试",
"getPSAppViewMsgGroupDetails" : [ {
"name" : "动态模式-实体数据集",
"name" : "动态模式-静态内容",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg14"
"id" : "ViewMsg15"
}
}, {
"name" : "动态模式-静态内容",
"name" : "动态模式-实体数据集",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg15"
"id" : "ViewMsg14"
}
} ]
} ],
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSSYSAPP.simple.json
浏览文件 @ b1150e82
......@@ -453,12 +453,16 @@
"name" : "轻量级日历部件插件",
"getPSSysPFPlugin" : {
"pluginType" : "CUSTOM",
"pluginCode" : "LIGHT_CALENDAR"
"pluginCode" : "LIGHT_CALENDAR",
"runtimeObject" : true
},
"pluginCode" : "LIGHT_CALENDAR",
"pluginType" : "CUSTOM",
"rTObjectName" : "IBizLightCalendar",
"rTObjectRepo" : "@ibiz-template-plugin/light-calendar@0.0.10-alpha.15",
"refMode" : "CONTROL",
"refTag" : "CALENDAR"
"refTag" : "CALENDAR",
"runtimeObject" : true
}, {
"name" : "运行时部件(出来)",
"getPSSysPFPlugin" : {
......
trainsys-provider/pom.xml
浏览文件 @ b1150e82
......@@ -33,7 +33,7 @@
<profiles>
<profile>
<id>trainsys</id>
<id>runtime</id>
<build>
<resources>
<resource>
......
trainsys-provider/src/main/docker/Dockerfile
浏览文件 @ b1150e82
......@@ -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 50000
EXPOSE 8081
ADD trainsys-provider.jar /trainsys-provider.jar
trainsys-provider/src/main/docker/trainsys-provider-trainsys-k8s.yaml
浏览文件 @ b1150e82
......@@ -22,32 +22,7 @@ spec:
image: registry.cn-shanghai.aliyuncs.com/ibizsys/trainsys-provider:latest
imagePullPolicy: Always
ports:
- 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"
- containerPort: 8081
---
apiVersion: v1
......@@ -60,9 +35,9 @@ spec:
type: NodePort
ports:
- name: http
port: 50000
targetPort: 50000
nodePort: 50000
port: 8081
targetPort: 8081
nodePort: 8081
protocol: TCP
selector:
app: trainsys-provider
......
trainsys-provider/src/main/docker/trainsys-provider-trainsys.yaml
浏览文件 @ b1150e82
......@@ -3,23 +3,9 @@ services:
trainsys-provider:
image: registry.cn-shanghai.aliyuncs.com/ibizsys/trainsys-provider:latest
ports:
- "50000:50000"
- "8081:8081"
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 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或