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

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

上级 cafe6461
...@@ -55,12 +55,6 @@ ...@@ -55,12 +55,6 @@
git clone -b master $para2 trainsys/ git clone -b master $para2 trainsys/
export NODE_OPTIONS=--max-old-space-size=4096 export NODE_OPTIONS=--max-old-space-size=4096
cd trainsys/ 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> </command>
</hudson.tasks.Shell> </hudson.tasks.Shell>
</builders> </builders>
......
...@@ -1110,6 +1110,10 @@ ...@@ -1110,6 +1110,10 @@
"modelref" : true, "modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/ExpenseSheetEditView.json", "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/ExpenseSheetEditView.json",
"viewType" : "DEEDITVIEW" "viewType" : "DEEDITVIEW"
}, {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/ExpenseSheetGridView.json",
"viewType" : "DEGRIDVIEW"
} ], } ],
"getAllPSDEOPPrivs" : [ { "getAllPSDEOPPrivs" : [ {
"logicName" : "建立", "logicName" : "建立",
......
{
"aggMode" : "NONE",
"codeName" : "Main",
"columnEnableFilter" : 2,
"columnEnableLink" : 2,
"controlType" : "GRID",
"dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/ExpenseSheet/PSGRIDS/Main.json",
"getFetchPSControlAction" : {
"modelref" : true,
"id" : "fetch",
"actionType" : "DEDATASET",
"name" : "fetch",
"getPSAppDEMethod" : {
"modelref" : true,
"id" : "FetchDefault"
},
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/ExpenseSheet.json"
}
},
"groupMode" : "NONE",
"logicName" : "主表格",
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/ExpenseSheet.json"
},
"getPSDEGridColumns" : [ {
"align" : "LEFT",
"cLConvertMode" : "NONE",
"getCapPSLanguageRes" : {
"defaultContent" : "报销单名称",
"lanResTag" : "DEF.LNAME.EXPENSESHEETNAME",
"lanResType" : "DEF.LNAME",
"name" : "属性逻辑名称(DEF.LNAME.*)[EXPENSESHEETNAME]",
"refFlag" : true
},
"caption" : "报销单名称",
"codeName" : "expensesheetname",
"columnType" : "DEFGRIDCOLUMN",
"dataItemName" : "expensesheetname",
"excelCaption" : "报销单名称",
"name" : "expensesheetname",
"noPrivDisplayMode" : 1,
"getPSAppDEField" : {
"name" : "EXPENSESHEETNAME",
"codeName" : "ExpenseSheetName"
},
"width" : 150,
"widthUnit" : "PX",
"enableSort" : true
}, {
"align" : "LEFT",
"cLConvertMode" : "FRONT",
"getCapPSLanguageRes" : {
"defaultContent" : "更新人",
"lanResTag" : "DEF.LNAME.UPDATEMAN",
"lanResType" : "DEF.LNAME",
"name" : "属性逻辑名称(DEF.LNAME.*)[UPDATEMAN]",
"refFlag" : true
},
"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" : {
"defaultContent" : "更新时间",
"lanResTag" : "DEF.LNAME.UPDATEDATE",
"lanResType" : "DEF.LNAME",
"name" : "属性逻辑名称(DEF.LNAME.*)[UPDATEDATE]",
"refFlag" : true
},
"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" : "expensesheetname",
"getPSAppDEField" : {
"name" : "EXPENSESHEETNAME",
"codeName" : "ExpenseSheetName"
}
}, {
"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" : "EXPENSESHEETID",
"codeName" : "ExpenseSheetId"
}
}, {
"dataType" : 25,
"name" : "srfdataaccaction",
"getPSAppDEField" : {
"name" : "EXPENSESHEETID",
"codeName" : "ExpenseSheetId"
},
"dataAccessAction" : true
}, {
"dataType" : 25,
"name" : "srfmajortext",
"getPSAppDEField" : {
"name" : "EXPENSESHEETNAME",
"codeName" : "ExpenseSheetName"
}
} ],
"getPSDEGridEditItems" : [ {
"caption" : "报销单标识",
"codeName" : "srfkey",
"enableCond" : 3,
"ignoreInput" : 0,
"name" : "srfkey",
"getPSAppDEField" : {
"name" : "EXPENSESHEETID",
"codeName" : "ExpenseSheetId"
},
"getPSEditor" : {
"editorType" : "HIDDEN",
"name" : "srfkey"
},
"allowEmpty" : true
} ],
"pagingSize" : 20,
"getRemovePSControlAction" : {
"actionName" : "Remove",
"actionType" : "DEACTION",
"dataAccessAction" : "DELETE",
"name" : "remove",
"getPSAppDEMethod" : {
"modelref" : true,
"id" : "Remove"
},
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/ExpenseSheet.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" : "5a84aafce1b53d8a7adfdfc9f1d1ac08",
"modeltype" : "PSDEGRID"
}
\ No newline at end of file
{
"codeName" : "Default",
"controlType" : "SEARCHFORM",
"defaultLabelWidth" : 130,
"dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/ExpenseSheet/PSSEARCHFORMS/Default.json",
"logicName" : "默认搜索表单",
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/ExpenseSheet.json"
},
"getPSDEFormPages" : [ {
"getCapPSLanguageRes" : {
"defaultContent" : "常规条件",
"lanResTag" : "CONTROL.DEFORM.EXPENSESHEET.DEFAULT.FORMPAGE.FORMPAGE1",
"lanResType" : "CONTROL",
"name" : "控件文本(CONTROL.*)[DEFORM.EXPENSESHEET.DEFAULT.FORMPAGE.FORMPAGE1]",
"refFlag" : true
},
"caption" : "常规条件",
"codeName" : "formpage1",
"detailStyle" : "DEFAULT",
"detailType" : "FORMPAGE",
"name" : "formpage1",
"getPSLayout" : {
"childColLG" : -1,
"childColMD" : 24,
"childColSM" : -1,
"childColXS" : -1,
"columnCount" : 24,
"layout" : "TABLE_24COL"
},
"infoGroupMode" : false
} ],
"getPSLayout" : {
"childColLG" : -1,
"childColMD" : 24,
"childColSM" : -1,
"childColXS" : -1,
"columnCount" : 24,
"layout" : "TABLE_24COL"
},
"searchButtonStyle" : "DEFAULT",
"tabHeaderPos" : "TOP",
"enableAdvanceSearch" : false,
"enableAutoSearch" : false,
"enableFilterSave" : false,
"noTabHeader" : true,
"modelid" : "6cad8edf7ad93c8303871e066817e007",
"modeltype" : "PSDEFORM_SEARCHFORM"
}
\ No newline at end of file
...@@ -2495,6 +2495,28 @@ ...@@ -2495,6 +2495,28 @@
"layout" : "TABLE_24COL" "layout" : "TABLE_24COL"
}, },
"tooltip" : "报销单实体编辑视图" "tooltip" : "报销单实体编辑视图"
}, {
"accUserMode" : 2,
"caption" : "报销单实体表格视图",
"itemType" : "MENUITEM",
"name" : "menuitem117",
"getPSAppFunc" : {
"modelref" : true,
"id" : "UsrAppFunc0908092476"
},
"getPSLayout" : {
"childColLG" : -1,
"childColMD" : 24,
"childColSM" : -1,
"childColXS" : -1,
"columnCount" : 24,
"layout" : "TABLE_24COL"
},
"getPSLayoutPos" : {
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"tooltip" : "报销单实体表格视图"
} ], } ],
"getPSLayout" : { "getPSLayout" : {
"childColLG" : -1, "childColLG" : -1,
......
...@@ -1099,6 +1099,16 @@ ...@@ -1099,6 +1099,16 @@
"id" : "UsrAppFunc0908437818" "id" : "UsrAppFunc0908437818"
}, },
"tooltip" : "报销单实体编辑视图" "tooltip" : "报销单实体编辑视图"
}, {
"accUserMode" : 2,
"caption" : "报销单实体表格视图",
"itemType" : "MENUITEM",
"name" : "menuitem117",
"getPSAppFunc" : {
"modelref" : true,
"id" : "UsrAppFunc0908092476"
},
"tooltip" : "报销单实体表格视图"
} ], } ],
"tooltip" : "报销单" "tooltip" : "报销单"
} ], } ],
......
...@@ -2584,6 +2584,16 @@ ...@@ -2584,6 +2584,16 @@
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/studentEditView3.json", "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/studentEditView3.json",
"viewType" : "DEEDITVIEW3" "viewType" : "DEEDITVIEW3"
} }
}, {
"appFuncType" : "APPVIEW",
"codeName" : "UsrAppFunc0908092476",
"name" : "报销单实体表格视图",
"openMode" : "INDEXVIEWTAB",
"getPSAppView" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/ExpenseSheetGridView.json",
"viewType" : "DEGRIDVIEW"
}
}, { }, {
"appFuncType" : "APPVIEW", "appFuncType" : "APPVIEW",
"codeName" : "UsrAppFunc0807102103", "codeName" : "UsrAppFunc0807102103",
...@@ -4953,6 +4963,12 @@ ...@@ -4953,6 +4963,12 @@
"viewType" : "DEKANBANVIEW", "viewType" : "DEKANBANVIEW",
"resource" : "TEST", "resource" : "TEST",
"view" : "KanbanView" "view" : "KanbanView"
}, {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/ExpenseSheetGridView.json",
"viewType" : "DEGRIDVIEW",
"resource" : "ExpenseSheet",
"view" : "GridView"
}, { }, {
"modelref" : true, "modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/ReginfoUsr0301474927ChartView.json", "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/ReginfoUsr0301474927ChartView.json",
...@@ -7951,6 +7967,28 @@ ...@@ -7951,6 +7967,28 @@
"layout" : "TABLE_24COL" "layout" : "TABLE_24COL"
}, },
"tooltip" : "报销单实体编辑视图" "tooltip" : "报销单实体编辑视图"
}, {
"accUserMode" : 2,
"caption" : "报销单实体表格视图",
"itemType" : "MENUITEM",
"name" : "menuitem117",
"getPSAppFunc" : {
"modelref" : true,
"id" : "UsrAppFunc0908092476"
},
"getPSLayout" : {
"childColLG" : -1,
"childColMD" : 24,
"childColSM" : -1,
"childColXS" : -1,
"columnCount" : 24,
"layout" : "TABLE_24COL"
},
"getPSLayoutPos" : {
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"tooltip" : "报销单实体表格视图"
} ], } ],
"getPSLayout" : { "getPSLayout" : {
"childColLG" : -1, "childColLG" : -1,
...@@ -496,7 +496,8 @@ ...@@ -496,7 +496,8 @@
"defaultContent" : "常规条件", "defaultContent" : "常规条件",
"lanResTag" : "CONTROL.DEFORM.EXPENSESHEET.DEFAULT.FORMPAGE.FORMPAGE1", "lanResTag" : "CONTROL.DEFORM.EXPENSESHEET.DEFAULT.FORMPAGE.FORMPAGE1",
"lanResType" : "CONTROL", "lanResType" : "CONTROL",
"name" : "控件文本(CONTROL.*)[DEFORM.EXPENSESHEET.DEFAULT.FORMPAGE.FORMPAGE1]" "name" : "控件文本(CONTROL.*)[DEFORM.EXPENSESHEET.DEFAULT.FORMPAGE.FORMPAGE1]",
"refFlag" : true
}, { }, {
"defaultContent" : "基本信息", "defaultContent" : "基本信息",
"lanResTag" : "CONTROL.DEFORM.EXPENSESHEET.MAIN.FORMPAGE.FORMPAGE1", "lanResTag" : "CONTROL.DEFORM.EXPENSESHEET.MAIN.FORMPAGE.FORMPAGE1",
...@@ -1039,7 +1040,8 @@ ...@@ -1039,7 +1040,8 @@
"defaultContent" : "报销单表格视图", "defaultContent" : "报销单表格视图",
"lanResTag" : "PAGE.TITLE.EXPENSESHEET.GRIDVIEW", "lanResTag" : "PAGE.TITLE.EXPENSESHEET.GRIDVIEW",
"lanResType" : "PAGE", "lanResType" : "PAGE",
"name" : "界面文本(PAGE.*)[TITLE.EXPENSESHEET.GRIDVIEW]" "name" : "界面文本(PAGE.*)[TITLE.EXPENSESHEET.GRIDVIEW]",
"refFlag" : true
}, { }, {
"defaultContent" : "报销单数据多项选择视图", "defaultContent" : "报销单数据多项选择视图",
"lanResTag" : "PAGE.TITLE.EXPENSESHEET.MPICKUPVIEW", "lanResTag" : "PAGE.TITLE.EXPENSESHEET.MPICKUPVIEW",
......
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
<profiles> <profiles>
<profile> <profile>
<id>trainsys</id> <id>runtime</id>
<build> <build>
<resources> <resources>
<resource> <resource>
......
...@@ -10,6 +10,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \ ...@@ -10,6 +10,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
sleep ${IBIZ_SLEEP} && \ sleep ${IBIZ_SLEEP} && \
java ${JAVA_OPTS} -Duser.timezone=$TZ -Djava.security.egd=file:/dev/./urandom -jar /trainsys-provider.jar 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 ADD trainsys-provider.jar /trainsys-provider.jar
...@@ -22,32 +22,7 @@ spec: ...@@ -22,32 +22,7 @@ spec:
image: registry.cn-shanghai.aliyuncs.com/ibizsys/trainsys-provider:latest image: registry.cn-shanghai.aliyuncs.com/ibizsys/trainsys-provider:latest
imagePullPolicy: Always imagePullPolicy: Always
ports: ports:
- containerPort: 50000 - containerPort: 8081
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"
--- ---
apiVersion: v1 apiVersion: v1
...@@ -60,9 +35,9 @@ spec: ...@@ -60,9 +35,9 @@ spec:
type: NodePort type: NodePort
ports: ports:
- name: http - name: http
port: 50000 port: 8081
targetPort: 50000 targetPort: 8081
nodePort: 50000 nodePort: 8081
protocol: TCP protocol: TCP
selector: selector:
app: trainsys-provider app: trainsys-provider
......
...@@ -3,23 +3,9 @@ services: ...@@ -3,23 +3,9 @@ services:
trainsys-provider: trainsys-provider:
image: registry.cn-shanghai.aliyuncs.com/ibizsys/trainsys-provider:latest image: registry.cn-shanghai.aliyuncs.com/ibizsys/trainsys-provider:latest
ports: ports:
- "50000:50000" - "8081:8081"
networks: networks:
- agent_network - 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: deploy:
resources: resources:
limits: limits:
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册