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

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

上级 8c9c3dc5
......@@ -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>
......
......@@ -2185,6 +2185,18 @@
"name" : "UPDATE"
} ],
"getAllPSModelDatas" : [ {
"codeName" : "Usr08278286GridExpView",
"logicName" : "测试表格导航视图",
"name" : "测试表格导航视图",
"realModelSubType" : "DEGRIDEXPVIEW",
"realModelType" : "PSDEVIEWBASE"
}, {
"codeName" : "Usr08274859GanttTreeExpView",
"logicName" : "测试甘特导航试图",
"name" : "测试甘特导航试图",
"realModelSubType" : "DETREEEXPVIEW",
"realModelType" : "PSDEVIEWBASE"
}, {
"codeName" : "Usr12264106CustomTreeGridNodesExpView",
"logicName" : "自定义树表导航视图",
"name" : "自定义树表导航视图",
......
......@@ -173,7 +173,7 @@
"enableGroup" : false,
"enablePagingBar" : false,
"enableRowEdit" : false,
"enableRowEditOrder" : false,
"enableRowEditOrder" : true,
"enableRowNew" : false,
"forceFit" : false,
"hideHeader" : false,
......
......@@ -2911,6 +2911,10 @@
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/WORKITEMTestKanbanView.json",
"viewType" : "DEKANBANVIEW"
}, {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/WORKITEMUsr08274859GanttTreeExpView.json",
"viewType" : "DETREEEXPVIEW"
}, {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/WORKITEMKanbanEditView.json",
......@@ -2923,6 +2927,10 @@
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/WORKITEMEditView.json",
"viewType" : "DEEDITVIEW"
}, {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/WORKITEMUsr08278286GridExpView.json",
"viewType" : "DEGRIDEXPVIEW"
}, {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/WORKITEMUsr07027406TreeView.json",
......
{
"aggMode" : "NONE",
"codeName" : "Usr08278286GridExpView_Grid",
"columnEnableFilter" : 2,
"columnEnableLink" : 2,
"controlType" : "GRID",
"dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/WORKITEM/PSGRIDS/Usr08278286GridExpView_Grid.json",
"getFetchPSControlAction" : {
"modelref" : true,
"id" : "fetch",
"actionType" : "DEDATASET",
"name" : "fetch",
"getPSAppDEMethod" : {
"modelref" : true,
"id" : "FetchDefault"
},
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/WORKITEM.json"
}
},
"groupMode" : "NONE",
"hookEventNames" : [ "SELECTIONCHANGE", "LOAD" ],
"logicName" : "测试表格导航视图_表格",
"getMovePSControlAction" : {
"actionName" : "Move",
"actionType" : "DEACTION",
"name" : "move",
"getPSAppDEMethod" : {
"modelref" : true,
"id" : "Move"
},
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/WORKITEM.json"
}
},
"getNavPSAppView" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/WORKITEMEditView.json",
"viewType" : "DEEDITVIEW"
},
"getNavPSDER" : {
"codeName" : "WORKITEM",
"dERType" : "DER1N",
"dynaModelFilePath" : "PSMODULES/Test/PSDATAENTITIES/WORKITEM/PSDERS/DER1N_WORKITEM_WORKITEM_PWORKITEMID.json",
"fKeyName" : "F4AFCBB73015D37081",
"logicName" : "名称",
"getMajorPSDataEntity" : {
"modelref" : true,
"path" : "PSMODULES/Test/PSDATAENTITIES/WORKITEM.json"
},
"masterOrder" : -1,
"masterRS" : 0,
"minorCodeName" : "WORKITEMs",
"getMinorPSDataEntity" : {
"modelref" : true,
"path" : "PSMODULES/Test/PSDATAENTITIES/WORKITEM.json"
},
"minorServiceCodeName" : "WORKITEMs",
"name" : "DER1N_WORKITEM_WORKITEM_PWORKITEMID",
"orderValue" : 100,
"getPSPickupDEField" : {
"name" : "PWORKITEMID",
"codeName" : "Pworkitemid"
},
"getPSPickupTextDEField" : {
"name" : "PWORKITEMNAME",
"codeName" : "Pworkitemname"
},
"pickupDEFName" : "PWORKITEMID",
"removeActionType" : -1,
"removeOrder" : 0,
"serviceCodeName" : "WORKITEM",
"enableFKey" : true
},
"getOrderValuePSAppDEField" : {
"name" : "PX",
"codeName" : "PX"
},
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/WORKITEM.json"
},
"getPSControlLogics" : [ {
"eventNames" : "SELECTIONCHANGE",
"logicTag" : "gridexpbar_grid",
"logicType" : "CUSTOM",
"name" : "gridexpbar_selectionchange"
}, {
"eventNames" : "LOAD",
"logicTag" : "gridexpbar_grid",
"logicType" : "CUSTOM",
"name" : "gridexpbar_load"
} ],
"getPSDEGridColumns" : [ {
"align" : "LEFT",
"cLConvertMode" : "NONE",
"getCapPSLanguageRes" : {
"lanResTag" : "DEF.LNAME.WORKITEMNAME"
},
"caption" : "工作项名称",
"codeName" : "workitemname",
"columnType" : "DEFGRIDCOLUMN",
"dataItemName" : "workitemname",
"excelCaption" : "工作项名称",
"name" : "workitemname",
"noPrivDisplayMode" : 1,
"getPSAppDEField" : {
"name" : "WORKITEMNAME",
"codeName" : "WORKITEMName"
},
"width" : 150,
"widthUnit" : "PX",
"enableSort" : true
}, {
"align" : "LEFT",
"cLConvertMode" : "FRONT",
"getCapPSLanguageRes" : {
"lanResTag" : "DEF.LNAME.UPDATEMAN"
},
"caption" : "更新人",
"codeName" : "updateman",
"columnType" : "DEFGRIDCOLUMN",
"dataItemName" : "updateman",
"excelCaption" : "更新人",
"name" : "updateman",
"noPrivDisplayMode" : 1,
"getPSAppCodeList" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPCODELISTS/SysOperator.json"
},
"getPSAppDEField" : {
"name" : "UPDATEMAN",
"codeName" : "UpdateMan"
},
"width" : 150,
"widthUnit" : "PX",
"enableSort" : true
}, {
"align" : "LEFT",
"cLConvertMode" : "NONE",
"getCapPSLanguageRes" : {
"lanResTag" : "DEF.LNAME.UPDATEDATE"
},
"caption" : "更新时间",
"codeName" : "updatedate",
"columnType" : "DEFGRIDCOLUMN",
"dataItemName" : "updatedate",
"excelCaption" : "更新时间",
"name" : "updatedate",
"noPrivDisplayMode" : 1,
"getPSAppDEField" : {
"name" : "UPDATEDATE",
"codeName" : "UpdateDate"
},
"valueFormat" : "YYYY-MM-DD HH:mm:ss",
"width" : 150,
"widthUnit" : "PX",
"enableSort" : true
} ],
"getPSDEGridDataItems" : [ {
"dataType" : 25,
"name" : "workitemname",
"getPSAppDEField" : {
"name" : "WORKITEMNAME",
"codeName" : "WORKITEMName"
}
}, {
"dataType" : 25,
"name" : "updateman",
"getPSAppDEField" : {
"name" : "UPDATEMAN",
"codeName" : "UpdateMan"
}
}, {
"format" : "YYYY-MM-DD HH:mm:ss",
"dataType" : 5,
"name" : "updatedate",
"getPSAppDEField" : {
"name" : "UPDATEDATE",
"codeName" : "UpdateDate"
}
}, {
"dataType" : 25,
"name" : "srfkey",
"getPSAppDEField" : {
"name" : "WORKITEMID",
"codeName" : "WORKITEMId"
}
}, {
"dataType" : 25,
"name" : "srfdataaccaction",
"getPSAppDEField" : {
"name" : "WORKITEMID",
"codeName" : "WORKITEMId"
},
"dataAccessAction" : true
}, {
"dataType" : 25,
"name" : "pworkitemid",
"getPSAppDEField" : {
"name" : "PWORKITEMID",
"codeName" : "Pworkitemid"
}
}, {
"dataType" : 25,
"name" : "srfmajortext",
"getPSAppDEField" : {
"name" : "WORKITEMNAME",
"codeName" : "WORKITEMName"
}
} ],
"getPSDEGridEditItems" : [ {
"caption" : "工作项标识",
"codeName" : "srfkey",
"enableCond" : 3,
"ignoreInput" : 0,
"name" : "srfkey",
"getPSAppDEField" : {
"name" : "WORKITEMID",
"codeName" : "WORKITEMId"
},
"getPSEditor" : {
"editorType" : "HIDDEN",
"name" : "srfkey"
},
"allowEmpty" : true
} ],
"pagingMode" : 1,
"pagingSize" : 20,
"getRemovePSControlAction" : {
"actionName" : "Remove",
"actionType" : "DEACTION",
"dataAccessAction" : "DELETE",
"name" : "remove",
"getPSAppDEMethod" : {
"modelref" : true,
"id" : "Remove"
},
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/WORKITEM.json"
}
},
"sortMode" : "REMOTE",
"hasWFDataItems" : false,
"enableColFilter" : false,
"enableCustomized" : true,
"enableGroup" : false,
"enablePagingBar" : true,
"enableRowEdit" : false,
"enableRowEditOrder" : false,
"enableRowNew" : false,
"forceFit" : false,
"hideHeader" : false,
"noSort" : false,
"singleSelect" : false,
"modelid" : "964BAD37-30CC-44B3-A7DA-34607AA4E476",
"modeltype" : "PSDEGRID"
}
\ No newline at end of file
{
"codeName" : "Usr08274859GanttTreeExpView_TreeView",
"controlType" : "TREEVIEW",
"getCreatePSControlAction" : {
"modelref" : true,
"id" : "create",
"actionName" : "Create",
"actionType" : "DEACTION",
"dataAccessAction" : "CREATE",
"name" : "create",
"getPSAppDEMethod" : {
"modelref" : true,
"id" : "Create"
},
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/WORKITEM.json"
}
},
"dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/WORKITEM/PSTREEVIEWS/Usr08274859GanttTreeExpView_TreeView.json",
"getFetchPSControlAction" : {
"modelref" : true,
"id" : "fetch",
"actionType" : "DEDATASET",
"name" : "fetch",
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/WORKITEM.json"
}
},
"getGetPSControlAction" : {
"modelref" : true,
"id" : "load",
"actionName" : "Get",
"actionType" : "DEACTION",
"dataAccessAction" : "READ",
"name" : "load",
"getPSAppDEMethod" : {
"modelref" : true,
"id" : "Get"
},
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/WORKITEM.json"
}
},
"hookEventNames" : [ "SELECTIONCHANGE", "LOAD" ],
"logicName" : "测试甘特导航试图_树视图",
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/WORKITEM.json"
},
"getPSControlLogics" : [ {
"eventNames" : "SELECTIONCHANGE",
"logicTag" : "treeexpbar_tree",
"logicType" : "CUSTOM",
"name" : "treeexpbar_selectionchange"
}, {
"eventNames" : "LOAD",
"logicTag" : "treeexpbar_tree",
"logicType" : "CUSTOM",
"name" : "treeexpbar_load"
} ],
"getPSDETreeNodes" : [ {
"counterMode" : 0,
"name" : "默认根节点",
"nodeType" : "ROOT",
"nodeValue" : "root",
"text" : "默认根节点",
"treeNodeType" : "STATIC",
"hasPSDETreeNodeRSs" : false,
"appendPNodeId" : false,
"disableSelect" : false,
"enableCheck" : false,
"enableEditData" : false,
"enableNewData" : false,
"enableQuickCreate" : false,
"enableQuickSearch" : false,
"enableRemoveData" : false,
"enableViewData" : false,
"expandFirstOnly" : false,
"expanded" : false,
"rootNode" : true,
"selectFirstOnly" : false,
"selected" : false,
"id" : "ROOT"
} ],
"getRemovePSControlAction" : {
"modelref" : true,
"id" : "remove",
"actionName" : "Remove",
"actionType" : "DEACTION",
"dataAccessAction" : "DELETE",
"name" : "remove",
"getPSAppDEMethod" : {
"modelref" : true,
"id" : "Remove"
},
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/WORKITEM.json"
}
},
"treeGridMode" : 0,
"getUpdatePSControlAction" : {
"modelref" : true,
"id" : "update",
"actionName" : "Update",
"actionType" : "DEACTION",
"dataAccessAction" : "UPDATE",
"name" : "update",
"getPSAppDEMethod" : {
"modelref" : true,
"id" : "Update"
},
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/WORKITEM.json"
}
},
"enableRootSelect" : false,
"outputIconDefault" : true,
"rootVisible" : false,
"modelid" : "41A3F7A3-4C76-4416-BF71-9B20F37EEB9C",
"modeltype" : "PSDETREEVIEW"
}
\ No newline at end of file
......@@ -329,7 +329,7 @@
"enableGroup" : false,
"enablePagingBar" : false,
"enableRowEdit" : false,
"enableRowEditOrder" : false,
"enableRowEditOrder" : true,
"enableRowNew" : false,
"forceFit" : false,
"hideHeader" : false,
......
......@@ -3843,6 +3843,79 @@
"layout" : "TABLE_24COL"
},
"tooltip" : "数据选择自定义下拉测试"
}, {
"accUserMode" : 0,
"caption" : "测试实体通知试图",
"itemType" : "MENUITEM",
"name" : "menuitem326",
"getPSAppMenuItems" : [ {
"accUserMode" : 2,
"caption" : "实体树导航视图",
"itemType" : "MENUITEM",
"name" : "menuitem327",
"getPSAppFunc" : {
"modelref" : true,
"id" : "UsrAppFunc0827060901"
},
"getPSLayout" : {
"childColMD" : 24,
"columnCount" : 24,
"layout" : "TABLE_24COL"
},
"getPSLayoutPos" : {
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"tooltip" : "实体树导航视图"
}, {
"accUserMode" : 2,
"caption" : "测试表格导航视图",
"itemType" : "MENUITEM",
"name" : "menuitem328",
"getPSAppFunc" : {
"modelref" : true,
"id" : "UsrAppFunc0827725439"
},
"getPSLayout" : {
"childColMD" : 24,
"columnCount" : 24,
"layout" : "TABLE_24COL"
},
"getPSLayoutPos" : {
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"tooltip" : "测试表格导航视图"
}, {
"accUserMode" : 2,
"caption" : "看板视图",
"itemType" : "MENUITEM",
"name" : "menuitem329",
"getPSAppFunc" : {
"modelref" : true,
"id" : "UsrAppFunc0827460591"
},
"getPSLayout" : {
"childColMD" : 24,
"columnCount" : 24,
"layout" : "TABLE_24COL"
},
"getPSLayoutPos" : {
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"tooltip" : "看板视图"
} ],
"getPSLayout" : {
"childColMD" : 24,
"columnCount" : 24,
"layout" : "TABLE_24COL"
},
"getPSLayoutPos" : {
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"tooltip" : "测试实体通知试图"
}, {
"accUserMode" : 0,
"caption" : "测试视图",
......
......@@ -1987,6 +1987,43 @@
"id" : "UsrAppFunc1218375454"
},
"tooltip" : "数据选择自定义下拉测试"
}, {
"accUserMode" : 0,
"caption" : "测试实体通知试图",
"itemType" : "MENUITEM",
"name" : "menuitem326",
"getPSAppMenuItems" : [ {
"accUserMode" : 2,
"caption" : "实体树导航视图",
"itemType" : "MENUITEM",
"name" : "menuitem327",
"getPSAppFunc" : {
"modelref" : true,
"id" : "UsrAppFunc0827060901"
},
"tooltip" : "实体树导航视图"
}, {
"accUserMode" : 2,
"caption" : "测试表格导航视图",
"itemType" : "MENUITEM",
"name" : "menuitem328",
"getPSAppFunc" : {
"modelref" : true,
"id" : "UsrAppFunc0827725439"
},
"tooltip" : "测试表格导航视图"
}, {
"accUserMode" : 2,
"caption" : "看板视图",
"itemType" : "MENUITEM",
"name" : "menuitem329",
"getPSAppFunc" : {
"modelref" : true,
"id" : "UsrAppFunc0827460591"
},
"tooltip" : "看板视图"
} ],
"tooltip" : "测试实体通知试图"
}, {
"accUserMode" : 0,
"caption" : "测试视图",
......
......@@ -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 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册