提交 75c4b0bf 编写于 作者: ibizdev's avatar ibizdev

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

上级 0beece18
......@@ -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>
......
......@@ -1500,16 +1500,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"
}
} ]
}, {
......
......@@ -312,12 +312,16 @@
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/SubTest2.json"
},
"getPSEditorItems" : [ {
"name" : "psubtest2id"
} ],
"getPSNavigateParams" : [ {
"key" : "n_condtype_eq",
"name" : "n_condtype_eq",
"value" : "GROUP",
"rawValue" : true
} ],
"valueItemName" : "psubtest2id",
"enableAC" : true,
"enablePickupView" : true,
"forceSelection" : true,
......@@ -328,6 +332,7 @@
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"valueItemName" : "psubtest2id",
"allowEmpty" : true,
"showCaption" : true
} ],
......
......@@ -312,12 +312,16 @@
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/SubTest2.json"
},
"getPSEditorItems" : [ {
"name" : "psubtest2id"
} ],
"getPSNavigateParams" : [ {
"key" : "n_condtype_eq",
"name" : "n_condtype_eq",
"value" : "GROUP",
"rawValue" : true
} ],
"valueItemName" : "psubtest2id",
"enableAC" : true,
"enablePickupView" : true,
"forceSelection" : true,
......@@ -328,6 +332,7 @@
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"valueItemName" : "psubtest2id",
"allowEmpty" : true,
"showCaption" : true
} ],
......
......@@ -706,8 +706,8 @@
"enableQuickSearch" : false,
"enableRemoveData" : false,
"enableViewData" : false,
"expandFirstOnly" : false,
"expanded" : false,
"expandFirstOnly" : true,
"expanded" : true,
"rootNode" : false,
"selectFirstOnly" : false,
"selected" : false,
......@@ -963,7 +963,7 @@
"enableRemoveData" : false,
"enableViewData" : false,
"expandFirstOnly" : false,
"expanded" : true,
"expanded" : false,
"rootNode" : false,
"selectFirstOnly" : false,
"selected" : false,
......@@ -985,7 +985,7 @@
"enableRemoveData" : false,
"enableViewData" : false,
"expandFirstOnly" : false,
"expanded" : false,
"expanded" : true,
"rootNode" : false,
"selectFirstOnly" : false,
"selected" : false,
......
......@@ -440,12 +440,16 @@
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/SubTest2.json"
},
"getPSEditorItems" : [ {
"name" : "psubtest2id"
} ],
"getPSNavigateParams" : [ {
"key" : "n_condtype_eq",
"name" : "n_condtype_eq",
"value" : "GROUP",
"rawValue" : true
} ],
"valueItemName" : "psubtest2id",
"enableAC" : true,
"enablePickupView" : true,
"forceSelection" : true,
......@@ -456,6 +460,7 @@
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"valueItemName" : "psubtest2id",
"allowEmpty" : true,
"showCaption" : true
} ],
......
......@@ -440,12 +440,16 @@
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/SubTest2.json"
},
"getPSEditorItems" : [ {
"name" : "psubtest2id"
} ],
"getPSNavigateParams" : [ {
"key" : "n_condtype_eq",
"name" : "n_condtype_eq",
"value" : "GROUP",
"rawValue" : true
} ],
"valueItemName" : "psubtest2id",
"enableAC" : true,
"enablePickupView" : true,
"forceSelection" : true,
......@@ -456,6 +460,7 @@
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"valueItemName" : "psubtest2id",
"allowEmpty" : true,
"showCaption" : true
} ],
......
......@@ -784,8 +784,8 @@
"enableQuickSearch" : false,
"enableRemoveData" : false,
"enableViewData" : false,
"expandFirstOnly" : false,
"expanded" : false,
"expandFirstOnly" : true,
"expanded" : true,
"rootNode" : false,
"selectFirstOnly" : false,
"selected" : false,
......@@ -1041,7 +1041,7 @@
"enableRemoveData" : false,
"enableViewData" : false,
"expandFirstOnly" : false,
"expanded" : true,
"expanded" : false,
"rootNode" : false,
"selectFirstOnly" : false,
"selected" : false,
......@@ -1063,7 +1063,7 @@
"enableRemoveData" : false,
"enableViewData" : false,
"expandFirstOnly" : false,
"expanded" : false,
"expanded" : true,
"rootNode" : false,
"selectFirstOnly" : false,
"selected" : false,
......
......@@ -852,8 +852,8 @@
"enableQuickSearch" : false,
"enableRemoveData" : false,
"enableViewData" : false,
"expandFirstOnly" : false,
"expanded" : false,
"expandFirstOnly" : true,
"expanded" : true,
"rootNode" : false,
"selectFirstOnly" : false,
"selected" : false,
......@@ -1109,7 +1109,7 @@
"enableRemoveData" : false,
"enableViewData" : false,
"expandFirstOnly" : false,
"expanded" : true,
"expanded" : false,
"rootNode" : false,
"selectFirstOnly" : false,
"selected" : false,
......@@ -1131,7 +1131,7 @@
"enableRemoveData" : false,
"enableViewData" : false,
"expandFirstOnly" : false,
"expanded" : false,
"expanded" : true,
"rootNode" : false,
"selectFirstOnly" : false,
"selected" : false,
......
......@@ -4777,7 +4777,7 @@
"pluginCode" : "ALLORGSELECT",
"pluginType" : "EDITOR_CUSTOMSTYLE",
"rTObjectName" : "IBizOrgSelect",
"rTObjectRepo" : "@ibiz-template-plugin/org-select@0.0.10-alpha.7",
"rTObjectRepo" : "@ibiz-template-plugin/org-select@0.0.10-alpha.11",
"refMode" : "EDITORSTYPE",
"runtimeObject" : true
}, {
......@@ -4790,7 +4790,7 @@
"pluginCode" : "ORGSELECT",
"pluginType" : "EDITOR_CUSTOMSTYLE",
"rTObjectName" : "IBizOrgSelect",
"rTObjectRepo" : "@ibiz-template-plugin/org-select@0.0.10-alpha.7",
"rTObjectRepo" : "@ibiz-template-plugin/org-select@0.0.10-alpha.11",
"refMode" : "EDITORSTYPE",
"runtimeObject" : true
}, {
......@@ -4803,7 +4803,7 @@
"pluginCode" : "DEPATMENTSELECT",
"pluginType" : "EDITOR_CUSTOMSTYLE",
"rTObjectName" : "IBizDepartMent",
"rTObjectRepo" : "@ibiz-template-plugin/department-select@0.0.10-alpha.7",
"rTObjectRepo" : "@ibiz-template-plugin/department-select@0.0.10-alpha.11",
"refMode" : "EDITORSTYPE",
"runtimeObject" : true
}, {
......@@ -4816,7 +4816,7 @@
"pluginCode" : "ALLDEPATMENTSELECT",
"pluginType" : "EDITOR_CUSTOMSTYLE",
"rTObjectName" : "IBizDepartMent",
"rTObjectRepo" : "@ibiz-template-plugin/department-select@0.0.10-alpha.7",
"rTObjectRepo" : "@ibiz-template-plugin/department-select@0.0.10-alpha.11",
"refMode" : "EDITORSTYPE",
"runtimeObject" : true
}, {
......@@ -4829,7 +4829,7 @@
"pluginCode" : "ALLDEPATMENTMULTIPLE",
"pluginType" : "EDITOR_CUSTOMSTYLE",
"rTObjectName" : "IBizDepartMent",
"rTObjectRepo" : "@ibiz-template-plugin/department-select@0.0.10-alpha.7",
"rTObjectRepo" : "@ibiz-template-plugin/department-select@0.0.10-alpha.11",
"refMode" : "EDITORSTYPE",
"runtimeObject" : true
}, {
......@@ -4842,7 +4842,7 @@
"pluginCode" : "ALLORGMULTIPLE",
"pluginType" : "EDITOR_CUSTOMSTYLE",
"rTObjectName" : "IBizOrgSelect",
"rTObjectRepo" : "@ibiz-template-plugin/org-select@0.0.10-alpha.7",
"rTObjectRepo" : "@ibiz-template-plugin/org-select@0.0.10-alpha.11",
"refMode" : "EDITORSTYPE",
"runtimeObject" : true
}, {
......@@ -4855,7 +4855,7 @@
"pluginCode" : "ORGMULTIPLE",
"pluginType" : "EDITOR_CUSTOMSTYLE",
"rTObjectName" : "IBizOrgSelect",
"rTObjectRepo" : "@ibiz-template-plugin/org-select@0.0.10-alpha.7",
"rTObjectRepo" : "@ibiz-template-plugin/org-select@0.0.10-alpha.11",
"refMode" : "EDITORSTYPE",
"runtimeObject" : true
}, {
......@@ -4868,7 +4868,7 @@
"pluginCode" : "DEPATMENTMULTIPLE",
"pluginType" : "EDITOR_CUSTOMSTYLE",
"rTObjectName" : "IBizDepartMent",
"rTObjectRepo" : "@ibiz-template-plugin/department-select@0.0.10-alpha.7",
"rTObjectRepo" : "@ibiz-template-plugin/department-select@0.0.10-alpha.11",
"refMode" : "EDITORSTYPE",
"runtimeObject" : true
}, {
......@@ -4881,7 +4881,7 @@
"pluginCode" : "PERSONSELECT",
"pluginType" : "EDITOR_CUSTOMSTYLE",
"rTObjectName" : "IBizPersonSelect",
"rTObjectRepo" : "@ibiz-template-plugin/person-select@0.0.10-alpha.9",
"rTObjectRepo" : "@ibiz-template-plugin/person-select@0.0.10-alpha.11",
"refMode" : "EDITORSTYPE",
"runtimeObject" : true
}, {
......@@ -12131,16 +12131,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"
}
} ]
}, {
......@@ -12169,10 +12169,10 @@
"codeName" : "VMGroup3",
"name" : "视图消息类型测试",
"getPSAppViewMsgGroupDetails" : [ {
"name" : "消息类型-警告信息",
"name" : "消息类型-常规信息",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg5"
"id" : "ViewMsg4"
}
}, {
"name" : "消息类型-错误信息",
......@@ -12181,10 +12181,10 @@
"id" : "ViewMsg6"
}
}, {
"name" : "消息类型-常规信息",
"name" : "消息类型-警告信息",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg4"
"id" : "ViewMsg5"
}
} ]
}, {
......@@ -12206,12 +12206,6 @@
"modelref" : true,
"id" : "ViewMsg7"
}
}, {
"name" : "消息位置-视图下方",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg8"
}
}, {
"name" : "消息位置-弹出",
"getPSAppViewMsg" : {
......@@ -12219,16 +12213,6 @@
"id" : "ViewMsg10"
}
}, {
"name" : "消息位置-视图内容区",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg9"
}
} ]
}, {
"codeName" : "VMGroup8",
"name" : "【静态测试】",
"getPSAppViewMsgGroupDetails" : [ {
"name" : "消息位置-视图下方",
"getPSAppViewMsg" : {
"modelref" : true,
......@@ -12240,25 +12224,17 @@
"modelref" : true,
"id" : "ViewMsg9"
}
} ]
}, {
"name" : "关闭模式-默认删除-上方-错误",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg12"
}
}, {
"codeName" : "VMGroup8",
"name" : "【静态测试】",
"getPSAppViewMsgGroupDetails" : [ {
"name" : "消息类型-警告信息",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg5"
},
"position" : "POPUP"
}, {
"name" : "关闭模式-本次删除-上方-警告",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg13"
}
}, {
"name" : "消息类型-错误信息",
"getPSAppViewMsg" : {
......@@ -12279,15 +12255,39 @@
"modelref" : true,
"id" : "ViewMsg11"
}
}, {
"name" : "关闭模式-默认删除-上方-错误",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg12"
}
}, {
"name" : "消息位置-视图内容区",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg9"
}
}, {
"name" : "消息位置-视图下方",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg8"
}
}, {
"name" : "关闭模式-本次删除-上方-警告",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg13"
}
} ]
}, {
"codeName" : "VMGroup5",
"name" : "视图消息关闭模式",
"getPSAppViewMsgGroupDetails" : [ {
"name" : "关闭模式-本次删除",
"name" : "关闭模式-默认删除",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg13"
"id" : "ViewMsg12"
}
}, {
"name" : "关闭模式-无删除",
......@@ -12296,10 +12296,10 @@
"id" : "ViewMsg11"
}
}, {
"name" : "关闭模式-默认删除",
"name" : "关闭模式-本次删除",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg12"
"id" : "ViewMsg13"
}
} ]
}, {
......@@ -99,7 +99,7 @@
"pluginCode" : "ALLORGSELECT",
"pluginType" : "EDITOR_CUSTOMSTYLE",
"rTObjectName" : "IBizOrgSelect",
"rTObjectRepo" : "@ibiz-template-plugin/org-select@0.0.10-alpha.7",
"rTObjectRepo" : "@ibiz-template-plugin/org-select@0.0.10-alpha.11",
"refMode" : "EDITORSTYPE",
"runtimeObject" : true
}, {
......@@ -112,7 +112,7 @@
"pluginCode" : "ORGSELECT",
"pluginType" : "EDITOR_CUSTOMSTYLE",
"rTObjectName" : "IBizOrgSelect",
"rTObjectRepo" : "@ibiz-template-plugin/org-select@0.0.10-alpha.7",
"rTObjectRepo" : "@ibiz-template-plugin/org-select@0.0.10-alpha.11",
"refMode" : "EDITORSTYPE",
"runtimeObject" : true
}, {
......@@ -125,7 +125,7 @@
"pluginCode" : "DEPATMENTSELECT",
"pluginType" : "EDITOR_CUSTOMSTYLE",
"rTObjectName" : "IBizDepartMent",
"rTObjectRepo" : "@ibiz-template-plugin/department-select@0.0.10-alpha.7",
"rTObjectRepo" : "@ibiz-template-plugin/department-select@0.0.10-alpha.11",
"refMode" : "EDITORSTYPE",
"runtimeObject" : true
}, {
......@@ -138,7 +138,7 @@
"pluginCode" : "ALLDEPATMENTSELECT",
"pluginType" : "EDITOR_CUSTOMSTYLE",
"rTObjectName" : "IBizDepartMent",
"rTObjectRepo" : "@ibiz-template-plugin/department-select@0.0.10-alpha.7",
"rTObjectRepo" : "@ibiz-template-plugin/department-select@0.0.10-alpha.11",
"refMode" : "EDITORSTYPE",
"runtimeObject" : true
}, {
......@@ -151,7 +151,7 @@
"pluginCode" : "ALLDEPATMENTMULTIPLE",
"pluginType" : "EDITOR_CUSTOMSTYLE",
"rTObjectName" : "IBizDepartMent",
"rTObjectRepo" : "@ibiz-template-plugin/department-select@0.0.10-alpha.7",
"rTObjectRepo" : "@ibiz-template-plugin/department-select@0.0.10-alpha.11",
"refMode" : "EDITORSTYPE",
"runtimeObject" : true
}, {
......@@ -164,7 +164,7 @@
"pluginCode" : "ALLORGMULTIPLE",
"pluginType" : "EDITOR_CUSTOMSTYLE",
"rTObjectName" : "IBizOrgSelect",
"rTObjectRepo" : "@ibiz-template-plugin/org-select@0.0.10-alpha.7",
"rTObjectRepo" : "@ibiz-template-plugin/org-select@0.0.10-alpha.11",
"refMode" : "EDITORSTYPE",
"runtimeObject" : true
}, {
......@@ -177,7 +177,7 @@
"pluginCode" : "ORGMULTIPLE",
"pluginType" : "EDITOR_CUSTOMSTYLE",
"rTObjectName" : "IBizOrgSelect",
"rTObjectRepo" : "@ibiz-template-plugin/org-select@0.0.10-alpha.7",
"rTObjectRepo" : "@ibiz-template-plugin/org-select@0.0.10-alpha.11",
"refMode" : "EDITORSTYPE",
"runtimeObject" : true
}, {
......@@ -190,7 +190,7 @@
"pluginCode" : "DEPATMENTMULTIPLE",
"pluginType" : "EDITOR_CUSTOMSTYLE",
"rTObjectName" : "IBizDepartMent",
"rTObjectRepo" : "@ibiz-template-plugin/department-select@0.0.10-alpha.7",
"rTObjectRepo" : "@ibiz-template-plugin/department-select@0.0.10-alpha.11",
"refMode" : "EDITORSTYPE",
"runtimeObject" : true
}, {
......@@ -203,7 +203,7 @@
"pluginCode" : "PERSONSELECT",
"pluginType" : "EDITOR_CUSTOMSTYLE",
"rTObjectName" : "IBizPersonSelect",
"rTObjectRepo" : "@ibiz-template-plugin/person-select@0.0.10-alpha.9",
"rTObjectRepo" : "@ibiz-template-plugin/person-select@0.0.10-alpha.11",
"refMode" : "EDITORSTYPE",
"runtimeObject" : true
}, {
......
......@@ -33,7 +33,7 @@
<profiles>
<profile>
<id>trainsys</id>
<id>runtime</id>
<build>
<resources>
<resource>
......
......@@ -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
......@@ -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
......
......@@ -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 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册