Skip to content

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

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

上级 b267fcf8
隐藏空白字符变更
内嵌 并排
正在显示 包含 235 行增加 和 226 行删除
config.xml
浏览文件 @ 01dcf668
......@@ -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/TemplatePublish/PSSYSAPP.json
浏览文件 @ 01dcf668
......@@ -1622,16 +1622,16 @@
"codeName" : "VMGroup2",
"name" : "视图消息组2",
"getPSAppViewMsgGroupDetails" : [ {
"name" : "视图消息2",
"name" : "视图消息",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg3"
"id" : "ViewMsg2"
}
}, {
"name" : "视图消息",
"name" : "视图消息2",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg2"
"id" : "ViewMsg3"
}
} ]
}, {
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Book/PSFORMS/EditorTest.json
浏览文件 @ 01dcf668
......@@ -76,17 +76,17 @@
"id" : "Get"
},
"getPSDEFIUpdateDetails" : [ {
"name" : "field14"
}, {
"name" : "field17"
"name" : "type"
}, {
"name" : "field13"
}, {
"name" : "type"
}, {
"name" : "field8"
}, {
"name" : "field11"
}, {
"name" : "field17"
}, {
"name" : "field14"
} ]
} ],
"getPSDEFormItemVRs" : [ {
......@@ -431,6 +431,13 @@
"name" : "FIELD25",
"codeName" : "Field25"
}
}, {
"id" : "field40",
"dataType" : 25,
"getPSAppDEField" : {
"name" : "FIELD40",
"codeName" : "Field40"
}
}, {
"id" : "field26",
"dataType" : 25,
......@@ -558,14 +565,6 @@
"id" : "formitem12",
"hidden" : true,
"dataType" : 25
}, {
"id" : "field40",
"hidden" : true,
"dataType" : 25,
"getPSAppDEField" : {
"name" : "FIELD40",
"codeName" : "Field40"
}
} ],
"getPSDEFormPages" : [ {
"caption" : "基本信息",
......@@ -2342,8 +2341,8 @@
"allowEmpty" : true,
"showCaption" : true
}, {
"caption" : "数据选择（下拉视图）",
"codeName" : "field26",
"caption" : "数据选择（下拉视图）单选",
"codeName" : "field40",
"dataType" : 25,
"detailStyle" : "DEFAULT",
"detailType" : "FORMITEM",
......@@ -2351,15 +2350,14 @@
"ignoreInput" : 0,
"labelPos" : "LEFT",
"labelWidth" : 130,
"name" : "field26",
"name" : "field40",
"noPrivDisplayMode" : 1,
"getPSAppDEField" : {
"name" : "FIELD26",
"codeName" : "Field26"
"name" : "FIELD40",
"codeName" : "Field40"
},
"getPSEditor" : {
"editorParams" : {
"multiple" : "true",
"DROPDOWNVIEW" : "TRUE",
"AC" : "FALSE",
"TRIGGER" : "TRUE",
......@@ -2367,7 +2365,7 @@
},
"editorType" : "PICKEREX_DROPDOWNVIEW",
"handlerType" : "PickupText",
"name" : "field26",
"name" : "field40",
"getPSAppDEACMode" : {
"modelref" : true,
"id" : "Default"
......@@ -2403,6 +2401,56 @@
"valueItemName" : "field16",
"allowEmpty" : true,
"showCaption" : true
}, {
"caption" : "数据选择（下拉视图）",
"codeName" : "field26",
"dataType" : 25,
"detailStyle" : "DEFAULT",
"detailType" : "FORMITEM",
"enableCond" : 3,
"ignoreInput" : 0,
"labelPos" : "LEFT",
"labelWidth" : 130,
"name" : "field26",
"noPrivDisplayMode" : 1,
"getPSAppDEField" : {
"name" : "FIELD26",
"codeName" : "Field26"
},
"getPSEditor" : {
"editorParams" : {
"multiple" : "true",
"DROPDOWNVIEW" : "TRUE",
"AC" : "FALSE",
"TRIGGER" : "TRUE",
"PICKUPVIEW" : "TRUE"
},
"editorType" : "PICKEREX_DROPDOWNVIEW",
"handlerType" : "PickupText",
"name" : "field26",
"getPSEditorItems" : [ {
"name" : "field16"
} ],
"getPickupPSAppView" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/studentPickupGridView.json",
"viewType" : "DEPICKUPGRIDVIEW"
},
"valueItemName" : "field16",
"dropDownView" : true,
"enableAC" : false,
"enablePickupView" : true,
"forceSelection" : true,
"showTrigger" : true,
"singleSelect" : true
},
"getPSLayoutPos" : {
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"valueItemName" : "field16",
"allowEmpty" : true,
"showCaption" : true
}, {
"caption" : "数据选择（下拉视图、数据链接）",
"codeName" : "field27",
......@@ -3425,36 +3473,6 @@
"allowEmpty" : true,
"hidden" : true,
"showCaption" : true
}, {
"caption" : "属性40",
"codeName" : "field40",
"dataType" : 25,
"detailStyle" : "DEFAULT",
"detailType" : "FORMITEM",
"enableCond" : 3,
"ignoreInput" : 0,
"labelPos" : "LEFT",
"labelWidth" : 130,
"name" : "field40",
"noPrivDisplayMode" : 1,
"getPSAppDEField" : {
"name" : "FIELD40",
"codeName" : "Field40"
},
"getPSEditor" : {
"editorType" : "HIDDEN",
"name" : "field40"
},
"getPSLayoutPos" : {
"colLG" : 23,
"colMD" : 23,
"colSM" : 23,
"colXS" : 23,
"layout" : "TABLE_24COL"
},
"allowEmpty" : true,
"hidden" : true,
"showCaption" : true
} ],
"getPSLayout" : {
"childColLG" : 23,
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/bookBookEditViewEditorTest.json
浏览文件 @ 01dcf668
......@@ -185,17 +185,17 @@
"id" : "Get"
},
"getPSDEFIUpdateDetails" : [ {
"name" : "field14"
}, {
"name" : "field17"
"name" : "type"
}, {
"name" : "field13"
}, {
"name" : "type"
}, {
"name" : "field8"
}, {
"name" : "field11"
}, {
"name" : "field17"
}, {
"name" : "field14"
} ]
} ],
"getPSDEFormItemVRs" : [ {
......@@ -540,6 +540,13 @@
"name" : "FIELD25",
"codeName" : "Field25"
}
}, {
"id" : "field40",
"dataType" : 25,
"getPSAppDEField" : {
"name" : "FIELD40",
"codeName" : "Field40"
}
}, {
"id" : "field26",
"dataType" : 25,
......@@ -667,14 +674,6 @@
"id" : "formitem12",
"hidden" : true,
"dataType" : 25
}, {
"id" : "field40",
"hidden" : true,
"dataType" : 25,
"getPSAppDEField" : {
"name" : "FIELD40",
"codeName" : "Field40"
}
} ],
"getPSDEFormPages" : [ {
"caption" : "基本信息",
......@@ -2451,8 +2450,8 @@
"allowEmpty" : true,
"showCaption" : true
}, {
"caption" : "数据选择（下拉视图）",
"codeName" : "field26",
"caption" : "数据选择（下拉视图）单选",
"codeName" : "field40",
"dataType" : 25,
"detailStyle" : "DEFAULT",
"detailType" : "FORMITEM",
......@@ -2460,15 +2459,14 @@
"ignoreInput" : 0,
"labelPos" : "LEFT",
"labelWidth" : 130,
"name" : "field26",
"name" : "field40",
"noPrivDisplayMode" : 1,
"getPSAppDEField" : {
"name" : "FIELD26",
"codeName" : "Field26"
"name" : "FIELD40",
"codeName" : "Field40"
},
"getPSEditor" : {
"editorParams" : {
"multiple" : "true",
"DROPDOWNVIEW" : "TRUE",
"AC" : "FALSE",
"TRIGGER" : "TRUE",
......@@ -2476,7 +2474,7 @@
},
"editorType" : "PICKEREX_DROPDOWNVIEW",
"handlerType" : "PickupText",
"name" : "field26",
"name" : "field40",
"getPSAppDEACMode" : {
"modelref" : true,
"id" : "Default"
......@@ -2512,6 +2510,56 @@
"valueItemName" : "field16",
"allowEmpty" : true,
"showCaption" : true
}, {
"caption" : "数据选择（下拉视图）",
"codeName" : "field26",
"dataType" : 25,
"detailStyle" : "DEFAULT",
"detailType" : "FORMITEM",
"enableCond" : 3,
"ignoreInput" : 0,
"labelPos" : "LEFT",
"labelWidth" : 130,
"name" : "field26",
"noPrivDisplayMode" : 1,
"getPSAppDEField" : {
"name" : "FIELD26",
"codeName" : "Field26"
},
"getPSEditor" : {
"editorParams" : {
"multiple" : "true",
"DROPDOWNVIEW" : "TRUE",
"AC" : "FALSE",
"TRIGGER" : "TRUE",
"PICKUPVIEW" : "TRUE"
},
"editorType" : "PICKEREX_DROPDOWNVIEW",
"handlerType" : "PickupText",
"name" : "field26",
"getPSEditorItems" : [ {
"name" : "field16"
} ],
"getPickupPSAppView" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/studentPickupGridView.json",
"viewType" : "DEPICKUPGRIDVIEW"
},
"valueItemName" : "field16",
"dropDownView" : true,
"enableAC" : false,
"enablePickupView" : true,
"forceSelection" : true,
"showTrigger" : true,
"singleSelect" : true
},
"getPSLayoutPos" : {
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"valueItemName" : "field16",
"allowEmpty" : true,
"showCaption" : true
}, {
"caption" : "数据选择（下拉视图、数据链接）",
"codeName" : "field27",
......@@ -3534,36 +3582,6 @@
"allowEmpty" : true,
"hidden" : true,
"showCaption" : true
}, {
"caption" : "属性40",
"codeName" : "field40",
"dataType" : 25,
"detailStyle" : "DEFAULT",
"detailType" : "FORMITEM",
"enableCond" : 3,
"ignoreInput" : 0,
"labelPos" : "LEFT",
"labelWidth" : 130,
"name" : "field40",
"noPrivDisplayMode" : 1,
"getPSAppDEField" : {
"name" : "FIELD40",
"codeName" : "Field40"
},
"getPSEditor" : {
"editorType" : "HIDDEN",
"name" : "field40"
},
"getPSLayoutPos" : {
"colLG" : 23,
"colMD" : 23,
"colSM" : 23,
"colXS" : 23,
"layout" : "TABLE_24COL"
},
"allowEmpty" : true,
"hidden" : true,
"showCaption" : true
} ],
"getPSLayout" : {
"childColLG" : 23,
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/bookHoverEditView.json
浏览文件 @ 01dcf668
......@@ -774,17 +774,17 @@
"id" : "Get"
},
"getPSDEFIUpdateDetails" : [ {
"name" : "field14"
}, {
"name" : "field17"
"name" : "type"
}, {
"name" : "field13"
}, {
"name" : "type"
}, {
"name" : "field8"
}, {
"name" : "field11"
}, {
"name" : "field17"
}, {
"name" : "field14"
} ]
} ],
"getPSDEFormItemVRs" : [ {
......@@ -1129,6 +1129,13 @@
"name" : "FIELD25",
"codeName" : "Field25"
}
}, {
"id" : "field40",
"dataType" : 25,
"getPSAppDEField" : {
"name" : "FIELD40",
"codeName" : "Field40"
}
}, {
"id" : "field26",
"dataType" : 25,
......@@ -1256,14 +1263,6 @@
"id" : "formitem12",
"hidden" : true,
"dataType" : 25
}, {
"id" : "field40",
"hidden" : true,
"dataType" : 25,
"getPSAppDEField" : {
"name" : "FIELD40",
"codeName" : "Field40"
}
} ],
"getPSDEFormPages" : [ {
"caption" : "基本信息",
......@@ -3040,8 +3039,8 @@
"allowEmpty" : true,
"showCaption" : true
}, {
"caption" : "数据选择（下拉视图）",
"codeName" : "field26",
"caption" : "数据选择（下拉视图）单选",
"codeName" : "field40",
"dataType" : 25,
"detailStyle" : "DEFAULT",
"detailType" : "FORMITEM",
......@@ -3049,15 +3048,14 @@
"ignoreInput" : 0,
"labelPos" : "LEFT",
"labelWidth" : 130,
"name" : "field26",
"name" : "field40",
"noPrivDisplayMode" : 1,
"getPSAppDEField" : {
"name" : "FIELD26",
"codeName" : "Field26"
"name" : "FIELD40",
"codeName" : "Field40"
},
"getPSEditor" : {
"editorParams" : {
"multiple" : "true",
"DROPDOWNVIEW" : "TRUE",
"AC" : "FALSE",
"TRIGGER" : "TRUE",
......@@ -3065,7 +3063,7 @@
},
"editorType" : "PICKEREX_DROPDOWNVIEW",
"handlerType" : "PickupText",
"name" : "field26",
"name" : "field40",
"getPSAppDEACMode" : {
"modelref" : true,
"id" : "Default"
......@@ -3101,6 +3099,56 @@
"valueItemName" : "field16",
"allowEmpty" : true,
"showCaption" : true
}, {
"caption" : "数据选择（下拉视图）",
"codeName" : "field26",
"dataType" : 25,
"detailStyle" : "DEFAULT",
"detailType" : "FORMITEM",
"enableCond" : 3,
"ignoreInput" : 0,
"labelPos" : "LEFT",
"labelWidth" : 130,
"name" : "field26",
"noPrivDisplayMode" : 1,
"getPSAppDEField" : {
"name" : "FIELD26",
"codeName" : "Field26"
},
"getPSEditor" : {
"editorParams" : {
"multiple" : "true",
"DROPDOWNVIEW" : "TRUE",
"AC" : "FALSE",
"TRIGGER" : "TRUE",
"PICKUPVIEW" : "TRUE"
},
"editorType" : "PICKEREX_DROPDOWNVIEW",
"handlerType" : "PickupText",
"name" : "field26",
"getPSEditorItems" : [ {
"name" : "field16"
} ],
"getPickupPSAppView" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/studentPickupGridView.json",
"viewType" : "DEPICKUPGRIDVIEW"
},
"valueItemName" : "field16",
"dropDownView" : true,
"enableAC" : false,
"enablePickupView" : true,
"forceSelection" : true,
"showTrigger" : true,
"singleSelect" : true
},
"getPSLayoutPos" : {
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"valueItemName" : "field16",
"allowEmpty" : true,
"showCaption" : true
}, {
"caption" : "数据选择（下拉视图、数据链接）",
"codeName" : "field27",
......@@ -4123,36 +4171,6 @@
"allowEmpty" : true,
"hidden" : true,
"showCaption" : true
}, {
"caption" : "属性40",
"codeName" : "field40",
"dataType" : 25,
"detailStyle" : "DEFAULT",
"detailType" : "FORMITEM",
"enableCond" : 3,
"ignoreInput" : 0,
"labelPos" : "LEFT",
"labelWidth" : 130,
"name" : "field40",
"noPrivDisplayMode" : 1,
"getPSAppDEField" : {
"name" : "FIELD40",
"codeName" : "Field40"
},
"getPSEditor" : {
"editorType" : "HIDDEN",
"name" : "field40"
},
"getPSLayoutPos" : {
"colLG" : 23,
"colMD" : 23,
"colSM" : 23,
"colXS" : 23,
"layout" : "TABLE_24COL"
},
"allowEmpty" : true,
"hidden" : true,
"showCaption" : true
} ],
"getPSLayout" : {
"childColLG" : 23,
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSSYSAPP.json
浏览文件 @ 01dcf668
......@@ -13610,16 +13610,16 @@
"codeName" : "VMGroup2",
"name" : "视图消息组2",
"getPSAppViewMsgGroupDetails" : [ {
"name" : "视图消息2",
"name" : "视图消息",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg3"
"id" : "ViewMsg2"
}
}, {
"name" : "视图消息",
"name" : "视图消息2",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg2"
"id" : "ViewMsg3"
}
} ]
}, {
......@@ -13648,16 +13648,16 @@
"codeName" : "VMGroup3",
"name" : "视图消息类型测试",
"getPSAppViewMsgGroupDetails" : [ {
"name" : "消息类型-警告信息",
"name" : "消息类型-错误信息",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg5"
"id" : "ViewMsg6"
}
}, {
"name" : "消息类型-错误信息",
"name" : "消息类型-警告信息",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg6"
"id" : "ViewMsg5"
}
}, {
"name" : "消息类型-常规信息",
......@@ -13708,6 +13708,13 @@
"codeName" : "VMGroup8",
"name" : "【静态测试】",
"getPSAppViewMsgGroupDetails" : [ {
"name" : "消息类型-警告信息",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg5"
},
"position" : "POPUP"
}, {
"name" : "消息位置-视图内容区",
"getPSAppViewMsg" : {
"modelref" : true,
......@@ -13719,12 +13726,6 @@
"modelref" : true,
"id" : "ViewMsg12"
}
}, {
"name" : "消息位置-视图下方",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg8"
}
}, {
"name" : "关闭模式-本次删除-上方-警告",
"getPSAppViewMsg" : {
......@@ -13732,19 +13733,18 @@
"id" : "ViewMsg13"
}
}, {
"name" : "消息类型-警告信息",
"name" : "消息类型-错误信息",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg5"
"id" : "ViewMsg6"
},
"position" : "POPUP"
}, {
"name" : "消息类型-错误信息",
"name" : "消息位置-视图下方",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg6"
},
"position" : "POPUP"
"id" : "ViewMsg8"
}
}, {
"name" : "消息类型-常规信息",
"getPSAppViewMsg" : {
trainsys-provider/pom.xml
浏览文件 @ 01dcf668
......@@ -33,7 +33,7 @@
<profiles>
<profile>
<id>trainsys</id>
<id>runtime</id>
<build>
<resources>
<resource>
......
trainsys-provider/src/main/docker/Dockerfile
浏览文件 @ 01dcf668
......@@ -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
浏览文件 @ 01dcf668
......@@ -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
浏览文件 @ 01dcf668
......@@ -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 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或