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

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

上级 d7cf8b2a
...@@ -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>
......
...@@ -45,38 +45,16 @@ ...@@ -45,38 +45,16 @@
"getPSDEGridColumns" : [ { "getPSDEGridColumns" : [ {
"align" : "LEFT", "align" : "LEFT",
"cLConvertMode" : "NONE", "cLConvertMode" : "NONE",
"caption" : "书籍类别名称", "caption" : "组织机构标识",
"codeName" : "booktypename", "codeName" : "orgid",
"columnType" : "DEFGRIDCOLUMN",
"dataItemName" : "booktypename",
"excelCaption" : "书籍类别名称",
"name" : "booktypename",
"noPrivDisplayMode" : 1,
"getPSAppDEField" : {
"name" : "BOOKTYPENAME",
"codeName" : "BookTypeName"
},
"width" : 150,
"widthUnit" : "PX",
"enableRowEdit" : true,
"enableSort" : true
}, {
"align" : "LEFT",
"cLConvertMode" : "FRONT",
"caption" : "更新人",
"codeName" : "updateman",
"columnType" : "DEFGRIDCOLUMN", "columnType" : "DEFGRIDCOLUMN",
"dataItemName" : "updateman", "dataItemName" : "orgid",
"excelCaption" : "更新人", "excelCaption" : "组织机构标识",
"name" : "updateman", "name" : "orgid",
"noPrivDisplayMode" : 1, "noPrivDisplayMode" : 1,
"getPSAppCodeList" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPCODELISTS/SysOperator.json"
},
"getPSAppDEField" : { "getPSAppDEField" : {
"name" : "UPDATEMAN", "name" : "ORGID",
"codeName" : "UpdateMan" "codeName" : "OrgId"
}, },
"width" : 150, "width" : 150,
"widthUnit" : "PX", "widthUnit" : "PX",
...@@ -85,18 +63,17 @@ ...@@ -85,18 +63,17 @@
}, { }, {
"align" : "LEFT", "align" : "LEFT",
"cLConvertMode" : "NONE", "cLConvertMode" : "NONE",
"caption" : "更新时间", "caption" : "书籍类别名称",
"codeName" : "updatedate", "codeName" : "booktypename",
"columnType" : "DEFGRIDCOLUMN", "columnType" : "DEFGRIDCOLUMN",
"dataItemName" : "updatedate", "dataItemName" : "booktypename",
"excelCaption" : "更新时间", "excelCaption" : "书籍类别名称",
"name" : "updatedate", "name" : "booktypename",
"noPrivDisplayMode" : 1, "noPrivDisplayMode" : 1,
"getPSAppDEField" : { "getPSAppDEField" : {
"name" : "UPDATEDATE", "name" : "BOOKTYPENAME",
"codeName" : "UpdateDate" "codeName" : "BookTypeName"
}, },
"valueFormat" : "YYYY-MM-DD HH:mm:ss",
"width" : 150, "width" : 150,
"widthUnit" : "PX", "widthUnit" : "PX",
"enableRowEdit" : true, "enableRowEdit" : true,
...@@ -104,25 +81,17 @@ ...@@ -104,25 +81,17 @@
} ], } ],
"getPSDEGridDataItems" : [ { "getPSDEGridDataItems" : [ {
"dataType" : 25, "dataType" : 25,
"name" : "booktypename", "name" : "orgid",
"getPSAppDEField" : { "getPSAppDEField" : {
"name" : "BOOKTYPENAME", "name" : "ORGID",
"codeName" : "BookTypeName" "codeName" : "OrgId"
} }
}, { }, {
"dataType" : 25, "dataType" : 25,
"name" : "updateman", "name" : "booktypename",
"getPSAppDEField" : {
"name" : "UPDATEMAN",
"codeName" : "UpdateMan"
}
}, {
"format" : "YYYY-MM-DD HH:mm:ss",
"dataType" : 5,
"name" : "updatedate",
"getPSAppDEField" : { "getPSAppDEField" : {
"name" : "UPDATEDATE", "name" : "BOOKTYPENAME",
"codeName" : "UpdateDate" "codeName" : "BookTypeName"
} }
}, { }, {
"dataType" : 25, "dataType" : 25,
...@@ -148,6 +117,23 @@ ...@@ -148,6 +117,23 @@
} }
} ], } ],
"getPSDEGridEditItems" : [ { "getPSDEGridEditItems" : [ {
"caption" : "组织机构标识",
"codeName" : "orgid",
"enableCond" : 3,
"ignoreInput" : 0,
"name" : "orgid",
"getPSAppDEField" : {
"name" : "ORGID",
"codeName" : "OrgId"
},
"getPSEditor" : {
"editorType" : "TEXTAREA",
"maxLength" : 60,
"name" : "orgid",
"showMaxLength" : true
},
"allowEmpty" : true
}, {
"caption" : "书籍类别名称", "caption" : "书籍类别名称",
"codeName" : "booktypename", "codeName" : "booktypename",
"enableCond" : 3, "enableCond" : 3,
...@@ -163,38 +149,6 @@ ...@@ -163,38 +149,6 @@
"name" : "booktypename" "name" : "booktypename"
}, },
"allowEmpty" : true "allowEmpty" : true
}, {
"caption" : "更新人",
"codeName" : "updateman",
"enableCond" : 3,
"ignoreInput" : 3,
"name" : "updateman",
"getPSAppDEField" : {
"name" : "UPDATEMAN",
"codeName" : "UpdateMan"
},
"getPSEditor" : {
"editorType" : "TEXTBOX",
"maxLength" : 60,
"name" : "updateman"
},
"allowEmpty" : false,
"convertToCodeItemText" : true
}, {
"caption" : "更新时间",
"codeName" : "updatedate",
"enableCond" : 3,
"ignoreInput" : 0,
"name" : "updatedate",
"getPSAppDEField" : {
"name" : "UPDATEDATE",
"codeName" : "UpdateDate"
},
"getPSEditor" : {
"editorType" : "NUMBER",
"name" : "updatedate"
},
"allowEmpty" : false
}, { }, {
"caption" : "书籍类别标识", "caption" : "书籍类别标识",
"codeName" : "srfkey", "codeName" : "srfkey",
......
...@@ -217,38 +217,16 @@ ...@@ -217,38 +217,16 @@
"getPSDEGridColumns" : [ { "getPSDEGridColumns" : [ {
"align" : "LEFT", "align" : "LEFT",
"cLConvertMode" : "NONE", "cLConvertMode" : "NONE",
"caption" : "书籍类别名称", "caption" : "组织机构标识",
"codeName" : "booktypename", "codeName" : "orgid",
"columnType" : "DEFGRIDCOLUMN",
"dataItemName" : "booktypename",
"excelCaption" : "书籍类别名称",
"name" : "booktypename",
"noPrivDisplayMode" : 1,
"getPSAppDEField" : {
"name" : "BOOKTYPENAME",
"codeName" : "BookTypeName"
},
"width" : 150,
"widthUnit" : "PX",
"enableRowEdit" : true,
"enableSort" : true
}, {
"align" : "LEFT",
"cLConvertMode" : "FRONT",
"caption" : "更新人",
"codeName" : "updateman",
"columnType" : "DEFGRIDCOLUMN", "columnType" : "DEFGRIDCOLUMN",
"dataItemName" : "updateman", "dataItemName" : "orgid",
"excelCaption" : "更新人", "excelCaption" : "组织机构标识",
"name" : "updateman", "name" : "orgid",
"noPrivDisplayMode" : 1, "noPrivDisplayMode" : 1,
"getPSAppCodeList" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPCODELISTS/SysOperator.json"
},
"getPSAppDEField" : { "getPSAppDEField" : {
"name" : "UPDATEMAN", "name" : "ORGID",
"codeName" : "UpdateMan" "codeName" : "OrgId"
}, },
"width" : 150, "width" : 150,
"widthUnit" : "PX", "widthUnit" : "PX",
...@@ -257,18 +235,17 @@ ...@@ -257,18 +235,17 @@
}, { }, {
"align" : "LEFT", "align" : "LEFT",
"cLConvertMode" : "NONE", "cLConvertMode" : "NONE",
"caption" : "更新时间", "caption" : "书籍类别名称",
"codeName" : "updatedate", "codeName" : "booktypename",
"columnType" : "DEFGRIDCOLUMN", "columnType" : "DEFGRIDCOLUMN",
"dataItemName" : "updatedate", "dataItemName" : "booktypename",
"excelCaption" : "更新时间", "excelCaption" : "书籍类别名称",
"name" : "updatedate", "name" : "booktypename",
"noPrivDisplayMode" : 1, "noPrivDisplayMode" : 1,
"getPSAppDEField" : { "getPSAppDEField" : {
"name" : "UPDATEDATE", "name" : "BOOKTYPENAME",
"codeName" : "UpdateDate" "codeName" : "BookTypeName"
}, },
"valueFormat" : "YYYY-MM-DD HH:mm:ss",
"width" : 150, "width" : 150,
"widthUnit" : "PX", "widthUnit" : "PX",
"enableRowEdit" : true, "enableRowEdit" : true,
...@@ -276,25 +253,17 @@ ...@@ -276,25 +253,17 @@
} ], } ],
"getPSDEGridDataItems" : [ { "getPSDEGridDataItems" : [ {
"dataType" : 25, "dataType" : 25,
"name" : "booktypename", "name" : "orgid",
"getPSAppDEField" : { "getPSAppDEField" : {
"name" : "BOOKTYPENAME", "name" : "ORGID",
"codeName" : "BookTypeName" "codeName" : "OrgId"
} }
}, { }, {
"dataType" : 25, "dataType" : 25,
"name" : "updateman", "name" : "booktypename",
"getPSAppDEField" : {
"name" : "UPDATEMAN",
"codeName" : "UpdateMan"
}
}, {
"format" : "YYYY-MM-DD HH:mm:ss",
"dataType" : 5,
"name" : "updatedate",
"getPSAppDEField" : { "getPSAppDEField" : {
"name" : "UPDATEDATE", "name" : "BOOKTYPENAME",
"codeName" : "UpdateDate" "codeName" : "BookTypeName"
} }
}, { }, {
"dataType" : 25, "dataType" : 25,
...@@ -320,6 +289,23 @@ ...@@ -320,6 +289,23 @@
} }
} ], } ],
"getPSDEGridEditItems" : [ { "getPSDEGridEditItems" : [ {
"caption" : "组织机构标识",
"codeName" : "orgid",
"enableCond" : 3,
"ignoreInput" : 0,
"name" : "orgid",
"getPSAppDEField" : {
"name" : "ORGID",
"codeName" : "OrgId"
},
"getPSEditor" : {
"editorType" : "TEXTAREA",
"maxLength" : 60,
"name" : "orgid",
"showMaxLength" : true
},
"allowEmpty" : true
}, {
"caption" : "书籍类别名称", "caption" : "书籍类别名称",
"codeName" : "booktypename", "codeName" : "booktypename",
"enableCond" : 3, "enableCond" : 3,
...@@ -335,38 +321,6 @@ ...@@ -335,38 +321,6 @@
"name" : "booktypename" "name" : "booktypename"
}, },
"allowEmpty" : true "allowEmpty" : true
}, {
"caption" : "更新人",
"codeName" : "updateman",
"enableCond" : 3,
"ignoreInput" : 3,
"name" : "updateman",
"getPSAppDEField" : {
"name" : "UPDATEMAN",
"codeName" : "UpdateMan"
},
"getPSEditor" : {
"editorType" : "TEXTBOX",
"maxLength" : 60,
"name" : "updateman"
},
"allowEmpty" : false,
"convertToCodeItemText" : true
}, {
"caption" : "更新时间",
"codeName" : "updatedate",
"enableCond" : 3,
"ignoreInput" : 0,
"name" : "updatedate",
"getPSAppDEField" : {
"name" : "UPDATEDATE",
"codeName" : "UpdateDate"
},
"getPSEditor" : {
"editorType" : "NUMBER",
"name" : "updatedate"
},
"allowEmpty" : false
}, { }, {
"caption" : "书籍类别标识", "caption" : "书籍类别标识",
"codeName" : "srfkey", "codeName" : "srfkey",
......
...@@ -1025,38 +1025,16 @@ ...@@ -1025,38 +1025,16 @@
"getPSDEGridColumns" : [ { "getPSDEGridColumns" : [ {
"align" : "LEFT", "align" : "LEFT",
"cLConvertMode" : "NONE", "cLConvertMode" : "NONE",
"caption" : "书籍类别名称", "caption" : "组织机构标识",
"codeName" : "booktypename", "codeName" : "orgid",
"columnType" : "DEFGRIDCOLUMN",
"dataItemName" : "booktypename",
"excelCaption" : "书籍类别名称",
"name" : "booktypename",
"noPrivDisplayMode" : 1,
"getPSAppDEField" : {
"name" : "BOOKTYPENAME",
"codeName" : "BookTypeName"
},
"width" : 150,
"widthUnit" : "PX",
"enableRowEdit" : true,
"enableSort" : true
}, {
"align" : "LEFT",
"cLConvertMode" : "FRONT",
"caption" : "更新人",
"codeName" : "updateman",
"columnType" : "DEFGRIDCOLUMN", "columnType" : "DEFGRIDCOLUMN",
"dataItemName" : "updateman", "dataItemName" : "orgid",
"excelCaption" : "更新人", "excelCaption" : "组织机构标识",
"name" : "updateman", "name" : "orgid",
"noPrivDisplayMode" : 1, "noPrivDisplayMode" : 1,
"getPSAppCodeList" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPCODELISTS/SysOperator.json"
},
"getPSAppDEField" : { "getPSAppDEField" : {
"name" : "UPDATEMAN", "name" : "ORGID",
"codeName" : "UpdateMan" "codeName" : "OrgId"
}, },
"width" : 150, "width" : 150,
"widthUnit" : "PX", "widthUnit" : "PX",
...@@ -1065,18 +1043,17 @@ ...@@ -1065,18 +1043,17 @@
}, { }, {
"align" : "LEFT", "align" : "LEFT",
"cLConvertMode" : "NONE", "cLConvertMode" : "NONE",
"caption" : "更新时间", "caption" : "书籍类别名称",
"codeName" : "updatedate", "codeName" : "booktypename",
"columnType" : "DEFGRIDCOLUMN", "columnType" : "DEFGRIDCOLUMN",
"dataItemName" : "updatedate", "dataItemName" : "booktypename",
"excelCaption" : "更新时间", "excelCaption" : "书籍类别名称",
"name" : "updatedate", "name" : "booktypename",
"noPrivDisplayMode" : 1, "noPrivDisplayMode" : 1,
"getPSAppDEField" : { "getPSAppDEField" : {
"name" : "UPDATEDATE", "name" : "BOOKTYPENAME",
"codeName" : "UpdateDate" "codeName" : "BookTypeName"
}, },
"valueFormat" : "YYYY-MM-DD HH:mm:ss",
"width" : 150, "width" : 150,
"widthUnit" : "PX", "widthUnit" : "PX",
"enableRowEdit" : true, "enableRowEdit" : true,
...@@ -1084,25 +1061,17 @@ ...@@ -1084,25 +1061,17 @@
} ], } ],
"getPSDEGridDataItems" : [ { "getPSDEGridDataItems" : [ {
"dataType" : 25, "dataType" : 25,
"name" : "booktypename", "name" : "orgid",
"getPSAppDEField" : { "getPSAppDEField" : {
"name" : "BOOKTYPENAME", "name" : "ORGID",
"codeName" : "BookTypeName" "codeName" : "OrgId"
} }
}, { }, {
"dataType" : 25, "dataType" : 25,
"name" : "updateman", "name" : "booktypename",
"getPSAppDEField" : {
"name" : "UPDATEMAN",
"codeName" : "UpdateMan"
}
}, {
"format" : "YYYY-MM-DD HH:mm:ss",
"dataType" : 5,
"name" : "updatedate",
"getPSAppDEField" : { "getPSAppDEField" : {
"name" : "UPDATEDATE", "name" : "BOOKTYPENAME",
"codeName" : "UpdateDate" "codeName" : "BookTypeName"
} }
}, { }, {
"dataType" : 25, "dataType" : 25,
...@@ -1128,6 +1097,23 @@ ...@@ -1128,6 +1097,23 @@
} }
} ], } ],
"getPSDEGridEditItems" : [ { "getPSDEGridEditItems" : [ {
"caption" : "组织机构标识",
"codeName" : "orgid",
"enableCond" : 3,
"ignoreInput" : 0,
"name" : "orgid",
"getPSAppDEField" : {
"name" : "ORGID",
"codeName" : "OrgId"
},
"getPSEditor" : {
"editorType" : "TEXTAREA",
"maxLength" : 60,
"name" : "orgid",
"showMaxLength" : true
},
"allowEmpty" : true
}, {
"caption" : "书籍类别名称", "caption" : "书籍类别名称",
"codeName" : "booktypename", "codeName" : "booktypename",
"enableCond" : 3, "enableCond" : 3,
...@@ -1143,38 +1129,6 @@ ...@@ -1143,38 +1129,6 @@
"name" : "booktypename" "name" : "booktypename"
}, },
"allowEmpty" : true "allowEmpty" : true
}, {
"caption" : "更新人",
"codeName" : "updateman",
"enableCond" : 3,
"ignoreInput" : 3,
"name" : "updateman",
"getPSAppDEField" : {
"name" : "UPDATEMAN",
"codeName" : "UpdateMan"
},
"getPSEditor" : {
"editorType" : "TEXTBOX",
"maxLength" : 60,
"name" : "updateman"
},
"allowEmpty" : false,
"convertToCodeItemText" : true
}, {
"caption" : "更新时间",
"codeName" : "updatedate",
"enableCond" : 3,
"ignoreInput" : 0,
"name" : "updatedate",
"getPSAppDEField" : {
"name" : "UPDATEDATE",
"codeName" : "UpdateDate"
},
"getPSEditor" : {
"editorType" : "NUMBER",
"name" : "updatedate"
},
"allowEmpty" : false
}, { }, {
"caption" : "书籍类别标识", "caption" : "书籍类别标识",
"codeName" : "srfkey", "codeName" : "srfkey",
......
...@@ -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 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册