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

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

上级 4e651ab9
......@@ -3,7 +3,7 @@ services:
trainsys-app-web:
image: dstimage
ports:
- "50100:80"
- "80:80"
networks:
- agent_network
environment:
......
......@@ -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>
......
......@@ -1343,6 +1343,12 @@
"name" : "工作流编辑",
"realModelSubType" : "DEEDITVIEW",
"realModelType" : "PSDEVIEWBASE"
}, {
"codeName" : "MobWFDynaActionView",
"logicName" : " 实体移动端工作流动态操作视图",
"name" : " 实体移动端工作流动态操作视图",
"realModelSubType" : "DEMOBWFDYNAACTIONVIEW",
"realModelType" : "PSDEVIEWBASE"
}, {
"codeName" : "WFDynaEditView",
"logicName" : "工作流动态编辑视图",
......@@ -1355,12 +1361,24 @@
"name" : "工作流动态操作视图",
"realModelSubType" : "DEWFDYNAACTIONVIEW",
"realModelType" : "PSDEVIEWBASE"
}, {
"codeName" : "MobWFDynaStartView",
"logicName" : " 实体移动端工作流动态启动视图",
"name" : " 实体移动端工作流动态启动视图",
"realModelSubType" : "DEMOBWFDYNASTARTVIEW",
"realModelType" : "PSDEVIEWBASE"
}, {
"codeName" : "WFDynaEditView3",
"logicName" : "工作流动态编辑视图分页关系",
"name" : "工作流动态编辑视图分页关系",
"realModelSubType" : "DEWFDYNAEDITVIEW3",
"realModelType" : "PSDEVIEWBASE"
}, {
"codeName" : "MobWFDynaEditView3",
"logicName" : " 实体移动端工作流动态编辑视图(分页关系)",
"name" : " 实体移动端工作流动态编辑视图(分页关系)",
"realModelSubType" : "DEMOBWFDYNAEDITVIEW3",
"realModelType" : "PSDEVIEWBASE"
}, {
"codeName" : "MPickupView",
"logicName" : "工作流实体数据多项选择视图",
......@@ -1368,6 +1386,12 @@
"name" : "工作流实体数据多项选择视图",
"realModelSubType" : "DEMPICKUPVIEW",
"realModelType" : "PSDEVIEWBASE"
}, {
"codeName" : "WFMobEditView",
"logicName" : "移动端工作流编辑",
"name" : "移动端工作流编辑",
"realModelSubType" : "DEMOBEDITVIEW",
"realModelType" : "PSDEVIEWBASE"
}, {
"codeName" : "PickupGridView",
"logicName" : "工作流实体选择表格视图(部件视图)",
......@@ -1381,6 +1405,12 @@
"name" : "工作流实体表格视图",
"realModelSubType" : "DEGRIDVIEW",
"realModelType" : "PSDEVIEWBASE"
}, {
"codeName" : "MobWFDynaEditView",
"logicName" : "实体移动端工作流动态编辑视图",
"name" : "实体移动端工作流动态编辑视图",
"realModelSubType" : "DEMOBWFDYNAEDITVIEW",
"realModelType" : "PSDEVIEWBASE"
}, {
"codeName" : "EditView2",
"logicName" : "工作流实体编辑视图(左右关系)",
......
......@@ -12,6 +12,9 @@
<flowable:field name="bookingapps_workflow">
<flowable:string>Web</flowable:string>
</flowable:field>
<flowable:field name="bookingmobs_workflow">
<flowable:string>Mob</flowable:string>
</flowable:field>
<flowable:field name="wfstepfield_workflow">
<flowable:string>wfstep</flowable:string>
</flowable:field>
......
{
"codeName" : "Form",
"controlType" : "FORM",
"getCreatePSControlAction" : {
"modelref" : true,
"id" : "create",
"actionName" : "Create",
"actionType" : "DEACTION",
"dataAccessAction" : "CREATE",
"name" : "create",
"getPSAppDEMethod" : {
"modelref" : true,
"id" : "Create"
},
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Mob/PSAPPDATAENTITIES/WorkFlow.json"
}
},
"defaultLabelWidth" : 130,
"dynaModelFilePath" : "PSSYSAPPS/Mob/PSAPPDATAENTITIES/WorkFlow/PSFORMS/Form.json",
"getGetDraftFromPSControlAction" : {
"modelref" : true,
"id" : "loaddraftfrom",
"actionName" : "GETDRAFTFROM",
"actionType" : "DEACTION",
"dataAccessAction" : "CREATE",
"name" : "loaddraftfrom",
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Mob/PSAPPDATAENTITIES/WorkFlow.json"
}
},
"getGetDraftPSControlAction" : {
"modelref" : true,
"id" : "loaddraft",
"actionName" : "GetDraft",
"actionType" : "DEACTION",
"dataAccessAction" : "CREATE",
"name" : "loaddraft",
"getPSAppDEMethod" : {
"modelref" : true,
"id" : "GetDraft"
},
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Mob/PSAPPDATAENTITIES/WorkFlow.json"
}
},
"getGetPSControlAction" : {
"modelref" : true,
"id" : "load",
"actionName" : "Get",
"actionType" : "DEACTION",
"dataAccessAction" : "READ",
"name" : "load",
"getPSAppDEMethod" : {
"modelref" : true,
"id" : "Get"
},
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Mob/PSAPPDATAENTITIES/WorkFlow.json"
}
},
"hookEventNames" : [ "LOAD", "BEFORELOAD", "SAVE", "BEFORESAVE", "REMOVE" ],
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Mob/PSAPPDATAENTITIES/WorkFlow.json"
},
"getPSControlLogics" : [ {
"eventNames" : "LOAD;BEFORELOAD;SAVE;BEFORESAVE;REMOVE",
"logicTag" : "form",
"logicType" : "APPVIEWENGINE",
"name" : "engine_form",
"getPSAppViewEngine" : {
"modelref" : true,
"id" : "engine"
}
} ],
"getPSLayout" : {
"childColLG" : -1,
"childColMD" : 24,
"childColSM" : -1,
"childColXS" : -1,
"columnCount" : 24,
"layout" : "TABLE_24COL"
},
"getRemovePSControlAction" : {
"modelref" : true,
"id" : "remove",
"actionName" : "Remove",
"actionType" : "DEACTION",
"dataAccessAction" : "DELETE",
"name" : "remove",
"getPSAppDEMethod" : {
"modelref" : true,
"id" : "Remove"
},
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Mob/PSAPPDATAENTITIES/WorkFlow.json"
}
},
"tabHeaderPos" : "TOP",
"getUpdatePSControlAction" : {
"modelref" : true,
"id" : "update",
"actionName" : "Update",
"actionType" : "DEACTION",
"dataAccessAction" : "UPDATE",
"name" : "update",
"getPSAppDEMethod" : {
"modelref" : true,
"id" : "Update"
},
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Mob/PSAPPDATAENTITIES/WorkFlow.json"
}
},
"getWFStartPSControlAction" : {
"modelref" : true,
"id" : "wfstart",
"actionName" : "WFSTART",
"actionType" : "WFACTION",
"name" : "wfstart",
"getPSAppDEMethod" : {
"modelref" : true,
"id" : "WFStart"
},
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Mob/PSAPPDATAENTITIES/WorkFlow.json"
}
},
"getWFSubmitPSControlAction" : {
"modelref" : true,
"id" : "wfsubmit",
"actionName" : "WFSUBMIT",
"actionType" : "WFACTION",
"name" : "wfsubmit",
"getPSAppDEMethod" : {
"modelref" : true,
"id" : "WFSubmit"
},
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Mob/PSAPPDATAENTITIES/WorkFlow.json"
}
},
"noTabHeader" : false,
"modelid" : "42599B82-3BA0-4606-A1B2-B8E0963349F0_form",
"modeltype" : "PSDEFORM_EDITFORM"
}
\ No newline at end of file
......@@ -422,6 +422,34 @@
"uniqueTag" : "TESTDEMobWFDynaEditView3__drtab",
"modelid" : "D577408E-9A50-4CAE-AC3A-8130C1D326CD",
"modeltype" : "PSDEDRTAB"
}, {
"codeName" : "Default",
"controlType" : "DRTAB",
"getEditItemCapPSLanguageRes" : {
"defaultContent" : "工作流",
"lanResTag" : "DE.LNAME.WORKFLOW",
"lanResType" : "DE.LNAME",
"name" : "实体逻辑名称(DE.LNAME.*)[WORKFLOW]",
"refFlag" : true
},
"editItemCaption" : "工作流",
"name" : "drtab",
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Mob/PSAPPDATAENTITIES/WorkFlow.json"
},
"getPSControlHandler" : {
"enableDEFieldPrivilege" : false,
"id" : "drtab"
},
"getPSControlParam" : {
"autoLoad" : true,
"showBusyIndicator" : true,
"id" : "DRTAB"
},
"uniqueTag" : "WorkFlowMobWFDynaEditView3__drtab",
"modelid" : "b60dd761bcd8ddba13ed9888b4eba79d",
"modeltype" : "PSDEDRTAB"
}, {
"codeName" : "DataRelation",
"controlType" : "DRTAB",
......
......@@ -822,6 +822,11 @@
"path" : "PSSYSAPPS/Mob/PSAPPDATAENTITIES/Phone.json",
"name" : "PHONE",
"codeName" : "Phone"
}, {
"modelref" : true,
"path" : "PSSYSAPPS/Mob/PSAPPDATAENTITIES/WorkFlow.json",
"name" : "WORKFLOW",
"codeName" : "WorkFlow"
}, {
"modelref" : true,
"path" : "PSSYSAPPS/Mob/PSAPPDATAENTITIES/Reginfo.json",
......@@ -1004,11 +1009,23 @@
"viewType" : "DEMOBEDITVIEW",
"resource" : "TEST",
"view" : "TestMobEditView"
}, {
"modelref" : true,
"path" : "PSSYSAPPS/Mob/PSAPPDEVIEWS/WorkFlowWFMobEditView.json",
"viewType" : "DEMOBEDITVIEW",
"resource" : "WorkFlow",
"view" : "WFMobEditView"
}, {
"modelref" : true,
"path" : "PSSYSAPPS/Mob/PSAPPPANELVIEWS/AppPanelwwxxwwView.json",
"viewType" : "APPPANELVIEW",
"view" : "AppPanelwwxxwwView"
}, {
"modelref" : true,
"path" : "PSSYSAPPS/Mob/PSAPPDEVIEWS/WorkFlowMobWFDynaEditView.json",
"viewType" : "DEMOBWFDYNAEDITVIEW",
"resource" : "WorkFlow",
"view" : "MobWFDynaEditView"
}, {
"modelref" : true,
"path" : "PSSYSAPPS/Mob/PSAPPDEVIEWS/ReginfoMobEditView.json",
......@@ -1033,6 +1050,12 @@
"viewType" : "DEMOBEDITVIEW9",
"resource" : "TEST",
"view" : "MobEditView9"
}, {
"modelref" : true,
"path" : "PSSYSAPPS/Mob/PSAPPDEVIEWS/WorkFlowMobWFDynaStartView.json",
"viewType" : "DEMOBWFDYNASTARTVIEW",
"resource" : "WorkFlow",
"view" : "MobWFDynaStartView"
}, {
"modelref" : true,
"path" : "PSSYSAPPS/Mob/PSAPPDEVIEWS/TESTMobTreeView.json",
......@@ -1091,12 +1114,24 @@
"viewType" : "DEMOBEDITVIEW",
"resource" : "TEST",
"view" : "DEMobEditViewLayoutPart"
}, {
"modelref" : true,
"path" : "PSSYSAPPS/Mob/PSAPPDEVIEWS/WorkFlowMobWFDynaActionView.json",
"viewType" : "DEMOBWFDYNAACTIONVIEW",
"resource" : "WorkFlow",
"view" : "MobWFDynaActionView"
}, {
"modelref" : true,
"path" : "PSSYSAPPS/Mob/PSAPPDEVIEWS/TESTUsr3MobMPickupView.json",
"viewType" : "DEMOBMPICKUPVIEW",
"resource" : "TEST",
"view" : "Usr3MobMPickupView"
}, {
"modelref" : true,
"path" : "PSSYSAPPS/Mob/PSAPPDEVIEWS/WorkFlowMobWFDynaEditView3.json",
"viewType" : "DEMOBWFDYNAEDITVIEW3",
"resource" : "WorkFlow",
"view" : "MobWFDynaEditView3"
}, {
"modelref" : true,
"path" : "PSSYSAPPS/Mob/PSAPPDEVIEWS/TESTMobMDView9.json",
......@@ -1150,6 +1185,27 @@
"viewType" : "APPPORTALVIEW",
"view" : "AppPortalView"
} ],
"getAllPSAppWFs" : [ {
"codeName" : "WorkFlowWf",
"name" : "测试流程(WorkFlow)",
"getPSAppWFDEs" : [ {
"entityWFState" : "20",
"name" : "WORKFLOW",
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Mob/PSAPPDATAENTITIES/WorkFlow.json"
},
"getPSAppWF" : {
"modelref" : true,
"id" : "WorkFlowWf"
}
} ],
"getPSWorkflow" : {
"modelref" : true,
"path" : "PSMODULES/Test/PSWORKFLOWS/WorkFlowWf.json"
},
"hasPSAppWFVer" : false
} ],
"getAllPSDEOPPrivs" : [ {
"logicName" : "建立",
"name" : "CREATE"
......
......@@ -1240,16 +1240,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"
}
} ]
}, {
......
......@@ -11,6 +11,10 @@
"codeName" : "SysTodoRedirectView",
"dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDEVIEWS/SysTodoRedirectView.json",
"funcViewMode" : "REDIRECTVIEW",
"getGetDataPSAppDEAction" : {
"modelref" : true,
"id" : "GetLinkUrl"
},
"name" : "SysTodoRedirectView",
"getPSAppDataEntity" : {
"modelref" : true,
......@@ -20,6 +24,22 @@
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPMODULES/Test.json"
},
"getPSAppViewNavParams" : [ {
"key" : "srfapptype",
"name" : "srfapptype",
"value" : "pc",
"rawValue" : true
}, {
"key" : "todosubtype",
"name" : "todosubtype",
"value" : "Todo",
"rawValue" : true
}, {
"key" : "todourltype",
"name" : "todourltype",
"value" : "todourltype",
"rawValue" : false
} ],
"getPSControls" : [ {
"getCapPSLanguageRes" : {
"defaultContent" : "待办",
......@@ -93,9 +113,13 @@
"name" : "界面文本(PAGE.*)[TITLE.SYS_TODO.REDIRECTVIEW]",
"refFlag" : true
},
"getTypePSAppDEField" : {
"name" : "TODOID",
"codeName" : "TodoId"
},
"viewStyle" : "DEFAULT",
"viewType" : "DEREDIRECTVIEW",
"enableCustomGetDataAction" : false,
"enableCustomGetDataAction" : true,
"enableDP" : true,
"enableWorkflow" : true,
"redirectView" : true,
......
......@@ -2746,16 +2746,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"
}
} ]
} ],
......
......@@ -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 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册