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

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

上级 30837464
......@@ -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>
......
{
"dBType" : "MYSQL5",
"name" : "MySQL5",
"getPSDEDataQueryCodeConds" : [ {
"condType" : "CUSTOM",
"customCond" : "( <choose><when test=\"ctx.datacontext.aaaa !=null \"> t1.`FIELD9` = #{ctx.datacontext.aaaa} </when><otherwise>1=1</otherwise></choose> AND t1.`FIELD45` > 1111 AND t1.`FIELD9` IS NULL )",
"name" : "查询条件"
} ],
"getPSDEDataQueryCodeExps" : [ {
"expression" : "t1.`FIELD24`",
"name" : "FIELD24"
......
......@@ -130,41 +130,6 @@
"name" : "END",
"codeName" : "End"
}
}, {
"id" : "field",
"dataType" : 25,
"getPSAppDEField" : {
"name" : "FIELD",
"codeName" : "Field"
}
}, {
"id" : "createman",
"dataType" : 25,
"getPSAppDEField" : {
"name" : "CREATEMAN",
"codeName" : "CreateMan"
}
}, {
"id" : "createdate",
"dataType" : 5,
"getPSAppDEField" : {
"name" : "CREATEDATE",
"codeName" : "CreateDate"
}
}, {
"id" : "updateman",
"dataType" : 25,
"getPSAppDEField" : {
"name" : "UPDATEMAN",
"codeName" : "UpdateMan"
}
}, {
"id" : "updatedate",
"dataType" : 5,
"getPSAppDEField" : {
"name" : "UPDATEDATE",
"codeName" : "UpdateDate"
}
}, {
"id" : "bookid",
"hidden" : true,
......@@ -220,190 +185,6 @@
"valueFormat" : "YYYY-MM-DD HH:mm:ss",
"allowEmpty" : true,
"showCaption" : true
}, {
"caption" : "富文本",
"codeName" : "field",
"dataType" : 25,
"detailStyle" : "DEFAULT",
"detailType" : "FORMITEM",
"enableCond" : 3,
"ignoreInput" : 0,
"labelPos" : "LEFT",
"labelWidth" : 130,
"name" : "field",
"noPrivDisplayMode" : 1,
"getPSAppDEField" : {
"name" : "FIELD",
"codeName" : "Field"
},
"getPSEditor" : {
"editorType" : "HTMLEDITOR",
"name" : "field"
},
"getPSLayoutPos" : {
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"allowEmpty" : true,
"showCaption" : true
} ],
"getPSLayout" : {
"childColLG" : -1,
"childColMD" : 24,
"childColSM" : -1,
"childColXS" : -1,
"columnCount" : 24,
"layout" : "TABLE_24COL"
},
"getPSLayoutPos" : {
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"infoGroupMode" : false,
"showCaption" : true
} ],
"getPSLayout" : {
"childColLG" : -1,
"childColMD" : 24,
"childColSM" : -1,
"childColXS" : -1,
"columnCount" : 24,
"layout" : "TABLE_24COL"
},
"infoGroupMode" : false
}, {
"caption" : "其它",
"codeName" : "formpage2",
"detailStyle" : "DEFAULT",
"detailType" : "FORMPAGE",
"name" : "formpage2",
"getPSDEFormDetails" : [ {
"actionGroupExtractMode" : "ITEM",
"caption" : "操作信息",
"codeName" : "group2",
"detailStyle" : "DEFAULT",
"detailType" : "GROUPPANEL",
"name" : "group2",
"getPSDEFormDetails" : [ {
"caption" : "建立人",
"codeName" : "createman",
"dataType" : 25,
"detailStyle" : "DEFAULT",
"detailType" : "FORMITEM",
"enableCond" : 3,
"ignoreInput" : 3,
"labelPos" : "LEFT",
"labelWidth" : 130,
"name" : "createman",
"noPrivDisplayMode" : 1,
"getPSAppDEField" : {
"name" : "CREATEMAN",
"codeName" : "CreateMan"
},
"getPSEditor" : {
"editorType" : "SPAN",
"name" : "createman",
"getPSAppCodeList" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPCODELISTS/SysOperator.json"
},
"enableLinkView" : false
},
"getPSLayoutPos" : {
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"allowEmpty" : true,
"convertToCodeItemText" : true,
"showCaption" : true
}, {
"caption" : "建立时间",
"codeName" : "createdate",
"dataType" : 5,
"detailStyle" : "DEFAULT",
"detailType" : "FORMITEM",
"enableCond" : 3,
"ignoreInput" : 3,
"labelPos" : "LEFT",
"labelWidth" : 130,
"name" : "createdate",
"noPrivDisplayMode" : 1,
"getPSAppDEField" : {
"name" : "CREATEDATE",
"codeName" : "CreateDate"
},
"getPSEditor" : {
"editorType" : "SPAN",
"name" : "createdate",
"enableLinkView" : false
},
"getPSLayoutPos" : {
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"valueFormat" : "YYYY-MM-DD HH:mm:ss",
"allowEmpty" : true,
"showCaption" : true
}, {
"caption" : "更新人",
"codeName" : "updateman",
"dataType" : 25,
"detailStyle" : "DEFAULT",
"detailType" : "FORMITEM",
"enableCond" : 3,
"ignoreInput" : 3,
"labelPos" : "LEFT",
"labelWidth" : 130,
"name" : "updateman",
"noPrivDisplayMode" : 1,
"getPSAppDEField" : {
"name" : "UPDATEMAN",
"codeName" : "UpdateMan"
},
"getPSEditor" : {
"editorType" : "SPAN",
"name" : "updateman",
"getPSAppCodeList" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPCODELISTS/SysOperator.json"
},
"enableLinkView" : false
},
"getPSLayoutPos" : {
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"allowEmpty" : true,
"convertToCodeItemText" : true,
"showCaption" : true
}, {
"caption" : "更新时间",
"codeName" : "updatedate",
"dataType" : 5,
"detailStyle" : "DEFAULT",
"detailType" : "FORMITEM",
"enableCond" : 3,
"ignoreInput" : 3,
"labelPos" : "LEFT",
"labelWidth" : 130,
"name" : "updatedate",
"noPrivDisplayMode" : 1,
"getPSAppDEField" : {
"name" : "UPDATEDATE",
"codeName" : "UpdateDate"
},
"getPSEditor" : {
"editorType" : "SPAN",
"name" : "updatedate",
"enableLinkView" : false
},
"getPSLayoutPos" : {
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"valueFormat" : "YYYY-MM-DD HH:mm:ss",
"allowEmpty" : true,
"showCaption" : true
} ],
"getPSLayout" : {
"childColLG" : -1,
......@@ -501,7 +282,7 @@
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json"
}
},
"noTabHeader" : false,
"noTabHeader" : true,
"modelid" : "6F0DB0AC-6521-4EBA-A6ED-954B88777150",
"modeltype" : "PSDEFORM_EDITFORM"
}
\ No newline at end of file
......@@ -972,41 +972,6 @@
"name" : "END",
"codeName" : "End"
}
}, {
"id" : "field",
"dataType" : 25,
"getPSAppDEField" : {
"name" : "FIELD",
"codeName" : "Field"
}
}, {
"id" : "createman",
"dataType" : 25,
"getPSAppDEField" : {
"name" : "CREATEMAN",
"codeName" : "CreateMan"
}
}, {
"id" : "createdate",
"dataType" : 5,
"getPSAppDEField" : {
"name" : "CREATEDATE",
"codeName" : "CreateDate"
}
}, {
"id" : "updateman",
"dataType" : 25,
"getPSAppDEField" : {
"name" : "UPDATEMAN",
"codeName" : "UpdateMan"
}
}, {
"id" : "updatedate",
"dataType" : 5,
"getPSAppDEField" : {
"name" : "UPDATEDATE",
"codeName" : "UpdateDate"
}
}, {
"id" : "bookid",
"hidden" : true,
......@@ -1062,190 +1027,6 @@
"valueFormat" : "YYYY-MM-DD HH:mm:ss",
"allowEmpty" : true,
"showCaption" : true
}, {
"caption" : "富文本",
"codeName" : "field",
"dataType" : 25,
"detailStyle" : "DEFAULT",
"detailType" : "FORMITEM",
"enableCond" : 3,
"ignoreInput" : 0,
"labelPos" : "LEFT",
"labelWidth" : 130,
"name" : "field",
"noPrivDisplayMode" : 1,
"getPSAppDEField" : {
"name" : "FIELD",
"codeName" : "Field"
},
"getPSEditor" : {
"editorType" : "HTMLEDITOR",
"name" : "field"
},
"getPSLayoutPos" : {
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"allowEmpty" : true,
"showCaption" : true
} ],
"getPSLayout" : {
"childColLG" : -1,
"childColMD" : 24,
"childColSM" : -1,
"childColXS" : -1,
"columnCount" : 24,
"layout" : "TABLE_24COL"
},
"getPSLayoutPos" : {
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"infoGroupMode" : false,
"showCaption" : true
} ],
"getPSLayout" : {
"childColLG" : -1,
"childColMD" : 24,
"childColSM" : -1,
"childColXS" : -1,
"columnCount" : 24,
"layout" : "TABLE_24COL"
},
"infoGroupMode" : false
}, {
"caption" : "其它",
"codeName" : "formpage2",
"detailStyle" : "DEFAULT",
"detailType" : "FORMPAGE",
"name" : "formpage2",
"getPSDEFormDetails" : [ {
"actionGroupExtractMode" : "ITEM",
"caption" : "操作信息",
"codeName" : "group2",
"detailStyle" : "DEFAULT",
"detailType" : "GROUPPANEL",
"name" : "group2",
"getPSDEFormDetails" : [ {
"caption" : "建立人",
"codeName" : "createman",
"dataType" : 25,
"detailStyle" : "DEFAULT",
"detailType" : "FORMITEM",
"enableCond" : 3,
"ignoreInput" : 3,
"labelPos" : "LEFT",
"labelWidth" : 130,
"name" : "createman",
"noPrivDisplayMode" : 1,
"getPSAppDEField" : {
"name" : "CREATEMAN",
"codeName" : "CreateMan"
},
"getPSEditor" : {
"editorType" : "SPAN",
"name" : "createman",
"getPSAppCodeList" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPCODELISTS/SysOperator.json"
},
"enableLinkView" : false
},
"getPSLayoutPos" : {
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"allowEmpty" : true,
"convertToCodeItemText" : true,
"showCaption" : true
}, {
"caption" : "建立时间",
"codeName" : "createdate",
"dataType" : 5,
"detailStyle" : "DEFAULT",
"detailType" : "FORMITEM",
"enableCond" : 3,
"ignoreInput" : 3,
"labelPos" : "LEFT",
"labelWidth" : 130,
"name" : "createdate",
"noPrivDisplayMode" : 1,
"getPSAppDEField" : {
"name" : "CREATEDATE",
"codeName" : "CreateDate"
},
"getPSEditor" : {
"editorType" : "SPAN",
"name" : "createdate",
"enableLinkView" : false
},
"getPSLayoutPos" : {
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"valueFormat" : "YYYY-MM-DD HH:mm:ss",
"allowEmpty" : true,
"showCaption" : true
}, {
"caption" : "更新人",
"codeName" : "updateman",
"dataType" : 25,
"detailStyle" : "DEFAULT",
"detailType" : "FORMITEM",
"enableCond" : 3,
"ignoreInput" : 3,
"labelPos" : "LEFT",
"labelWidth" : 130,
"name" : "updateman",
"noPrivDisplayMode" : 1,
"getPSAppDEField" : {
"name" : "UPDATEMAN",
"codeName" : "UpdateMan"
},
"getPSEditor" : {
"editorType" : "SPAN",
"name" : "updateman",
"getPSAppCodeList" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPCODELISTS/SysOperator.json"
},
"enableLinkView" : false
},
"getPSLayoutPos" : {
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"allowEmpty" : true,
"convertToCodeItemText" : true,
"showCaption" : true
}, {
"caption" : "更新时间",
"codeName" : "updatedate",
"dataType" : 5,
"detailStyle" : "DEFAULT",
"detailType" : "FORMITEM",
"enableCond" : 3,
"ignoreInput" : 3,
"labelPos" : "LEFT",
"labelWidth" : 130,
"name" : "updatedate",
"noPrivDisplayMode" : 1,
"getPSAppDEField" : {
"name" : "UPDATEDATE",
"codeName" : "UpdateDate"
},
"getPSEditor" : {
"editorType" : "SPAN",
"name" : "updatedate",
"enableLinkView" : false
},
"getPSLayoutPos" : {
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"valueFormat" : "YYYY-MM-DD HH:mm:ss",
"allowEmpty" : true,
"showCaption" : true
} ],
"getPSLayout" : {
"childColLG" : -1,
......@@ -1343,7 +1124,7 @@
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Book.json"
}
},
"noTabHeader" : false,
"noTabHeader" : true,
"name" : "form",
"modelid" : "6F0DB0AC-6521-4EBA-A6ED-954B88777150",
"modeltype" : "PSDEFORM_EDITFORM"
......
......@@ -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 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册