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

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

上级 39606f5e
...@@ -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>
......
...@@ -1309,16 +1309,16 @@ ...@@ -1309,16 +1309,16 @@
"codeName" : "VMGroup2", "codeName" : "VMGroup2",
"name" : "视图消息组2", "name" : "视图消息组2",
"getPSAppViewMsgGroupDetails" : [ { "getPSAppViewMsgGroupDetails" : [ {
"name" : "视图消息", "name" : "视图消息2",
"getPSAppViewMsg" : { "getPSAppViewMsg" : {
"modelref" : true, "modelref" : true,
"id" : "ViewMsg2" "id" : "ViewMsg3"
} }
}, { }, {
"name" : "视图消息2", "name" : "视图消息",
"getPSAppViewMsg" : { "getPSAppViewMsg" : {
"modelref" : true, "modelref" : true,
"id" : "ViewMsg3" "id" : "ViewMsg2"
} }
} ] } ]
}, { }, {
......
...@@ -302,7 +302,8 @@ ...@@ -302,7 +302,8 @@
"logicName" : "类型", "logicName" : "类型",
"name" : "TYPE", "name" : "TYPE",
"stdDataType" : 25, "stdDataType" : 25,
"stringLength" : 100 "stringLength" : 100,
"enableFrontOnly" : true
}, { }, {
"getAllPSAppDEFUIModes" : [ { "getAllPSAppDEFUIModes" : [ {
"codeName" : "MobileDefault", "codeName" : "MobileDefault",
...@@ -357,6 +358,7 @@ ...@@ -357,6 +358,7 @@
"name" : "BOOKCHILD2ID", "name" : "BOOKCHILD2ID",
"stdDataType" : 25, "stdDataType" : 25,
"stringLength" : 100, "stringLength" : 100,
"enableFrontOnly" : true,
"keyField" : true "keyField" : true
}, { }, {
"getAllPSAppDEFUIModes" : [ { "getAllPSAppDEFUIModes" : [ {
...@@ -410,6 +412,7 @@ ...@@ -410,6 +412,7 @@
"name" : "BOOKCHILD2NAME", "name" : "BOOKCHILD2NAME",
"stdDataType" : 25, "stdDataType" : 25,
"stringLength" : 200, "stringLength" : 200,
"enableFrontOnly" : true,
"enableQuickSearch" : true, "enableQuickSearch" : true,
"majorField" : true "majorField" : true
}, { }, {
...@@ -465,7 +468,8 @@ ...@@ -465,7 +468,8 @@
"logicName" : "建立人", "logicName" : "建立人",
"name" : "CREATEMAN", "name" : "CREATEMAN",
"stdDataType" : 25, "stdDataType" : 25,
"stringLength" : 60 "stringLength" : 60,
"enableFrontOnly" : true
}, { }, {
"getAllPSAppDEFUIModes" : [ { "getAllPSAppDEFUIModes" : [ {
"codeName" : "MobileDefault", "codeName" : "MobileDefault",
...@@ -519,7 +523,8 @@ ...@@ -519,7 +523,8 @@
"logicName" : "更新人", "logicName" : "更新人",
"name" : "UPDATEMAN", "name" : "UPDATEMAN",
"stdDataType" : 25, "stdDataType" : 25,
"stringLength" : 60 "stringLength" : 60,
"enableFrontOnly" : true
}, { }, {
"getAllPSAppDEFUIModes" : [ { "getAllPSAppDEFUIModes" : [ {
"codeName" : "Default", "codeName" : "Default",
...@@ -573,7 +578,8 @@ ...@@ -573,7 +578,8 @@
"logicName" : "建立时间", "logicName" : "建立时间",
"name" : "CREATEDATE", "name" : "CREATEDATE",
"stdDataType" : 5, "stdDataType" : 5,
"valueFormat" : "YYYY-MM-DD HH:mm:ss" "valueFormat" : "YYYY-MM-DD HH:mm:ss",
"enableFrontOnly" : true
}, { }, {
"getAllPSAppDEFUIModes" : [ { "getAllPSAppDEFUIModes" : [ {
"codeName" : "MobileDefault", "codeName" : "MobileDefault",
...@@ -627,7 +633,8 @@ ...@@ -627,7 +633,8 @@
"logicName" : "更新时间", "logicName" : "更新时间",
"name" : "UPDATEDATE", "name" : "UPDATEDATE",
"stdDataType" : 5, "stdDataType" : 5,
"valueFormat" : "YYYY-MM-DD HH:mm:ss" "valueFormat" : "YYYY-MM-DD HH:mm:ss",
"enableFrontOnly" : true
}, { }, {
"getAllPSAppDEFUIModes" : [ { "getAllPSAppDEFUIModes" : [ {
"codeName" : "MobileDefault", "codeName" : "MobileDefault",
...@@ -666,7 +673,8 @@ ...@@ -666,7 +673,8 @@
"logicName" : "书标识", "logicName" : "书标识",
"name" : "BOOKID", "name" : "BOOKID",
"stdDataType" : 25, "stdDataType" : 25,
"stringLength" : 100 "stringLength" : 100,
"enableFrontOnly" : true
} ], } ],
"getAllPSAppDEMethodDTOs" : [ { "getAllPSAppDEMethodDTOs" : [ {
"codeName" : "BOOKCHILD2DTO", "codeName" : "BOOKCHILD2DTO",
...@@ -1099,8 +1107,6 @@ ...@@ -1099,8 +1107,6 @@
"name" : "UPDATE" "name" : "UPDATE"
} ], } ],
"codeName" : "BOOKCHILD2", "codeName" : "BOOKCHILD2",
"dEAPICodeName" : "BOOKCHILD2",
"dEAPITag" : "BOOKCHILD2",
"dataAccCtrlArch" : 1, "dataAccCtrlArch" : 1,
"dataAccCtrlMode" : 1, "dataAccCtrlMode" : 1,
"dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/BOOKCHILD2.json", "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/BOOKCHILD2.json",
...@@ -1123,29 +1129,20 @@ ...@@ -1123,29 +1129,20 @@
}, },
"name" : "BOOKCHILD2", "name" : "BOOKCHILD2",
"getPSDEName" : "BOOKCHILD2", "getPSDEName" : "BOOKCHILD2",
"getPSDEServiceAPI" : {
"modelref" : true,
"id" : "BOOKCHILD2"
},
"getPSDataEntity" : { "getPSDataEntity" : {
"modelref" : true, "modelref" : true,
"path" : "PSMODULES/Test/PSDATAENTITIES/BOOKCHILD2.json" "path" : "PSMODULES/Test/PSDATAENTITIES/BOOKCHILD2.json"
}, },
"getPSSysServiceAPI" : {
"modelref" : true,
"path" : "PSSYSSERVICEAPIS/TrainSys.json"
},
"getQuickSearchPSAppDEFields" : [ { "getQuickSearchPSAppDEFields" : [ {
"name" : "BOOKCHILD2NAME", "name" : "BOOKCHILD2NAME",
"codeName" : "BOOKCHILD2Name" "codeName" : "BOOKCHILD2Name"
} ], } ],
"storageMode" : 0, "storageMode" : 4,
"sysAPITag" : "TrainSys",
"defaultMode" : true, "defaultMode" : true,
"enableFilterActions" : true, "enableFilterActions" : true,
"enableUICreate" : true, "enableUICreate" : true,
"enableUIModify" : true, "enableUIModify" : true,
"enableUIRemove" : true, "enableUIRemove" : true,
"enableWFActions" : false, "enableWFActions" : false,
"major" : false "major" : true
} }
\ No newline at end of file
...@@ -3211,16 +3211,16 @@ ...@@ -3211,16 +3211,16 @@
"codeName" : "VMGroup2", "codeName" : "VMGroup2",
"name" : "视图消息组2", "name" : "视图消息组2",
"getPSAppViewMsgGroupDetails" : [ { "getPSAppViewMsgGroupDetails" : [ {
"name" : "视图消息", "name" : "视图消息2",
"getPSAppViewMsg" : { "getPSAppViewMsg" : {
"modelref" : true, "modelref" : true,
"id" : "ViewMsg2" "id" : "ViewMsg3"
} }
}, { }, {
"name" : "视图消息2", "name" : "视图消息",
"getPSAppViewMsg" : { "getPSAppViewMsg" : {
"modelref" : true, "modelref" : true,
"id" : "ViewMsg3" "id" : "ViewMsg2"
} }
} ] } ]
} ], } ],
...@@ -9343,7 +9343,7 @@ ...@@ -9343,7 +9343,7 @@
"enableDataImport" : true, "enableDataImport" : true,
"major" : true "major" : true
}, { }, {
"aPIMode" : 1, "aPIMode" : 9,
"codeName" : "BOOKCHILD5", "codeName" : "BOOKCHILD5",
"getLNPSLanguageRes" : { "getLNPSLanguageRes" : {
"defaultContent" : "图书子5", "defaultContent" : "图书子5",
...@@ -9499,253 +9499,14 @@ ...@@ -9499,253 +9499,14 @@
"keyField" : false, "keyField" : false,
"majorField" : false "majorField" : false
} ], } ],
"getPSDEServiceAPIMethods" : [ {
"dataAccessAction" : "CREATE",
"methodType" : "DEACTION",
"name" : "Create",
"getPSDEAction" : {
"modelref" : true,
"path" : "PSMODULES/Test/PSDATAENTITIES/BOOKCHILD5/PSDEACTIONS/Create.json"
},
"getPSDEServiceAPIMethodInput" : {
"name" : "输入对象",
"getPSDEMethodDTO" : {
"modelref" : true,
"id" : "BOOKCHILD5DTO"
},
"type" : "DTO"
},
"getPSDEServiceAPIMethodReturn" : {
"name" : "返回对象",
"getPSDEMethodDTO" : {
"modelref" : true,
"id" : "BOOKCHILD5DTO"
},
"type" : "DTO"
},
"requestMethod" : "POST",
"requestParamType" : "ENTITY",
"uniqueTag" : "BOOKCHILD5__DEACTION__CREATE",
"noServiceCodeName" : true
}, {
"dataAccessAction" : "READ",
"methodType" : "DEACTION",
"name" : "Get",
"getPSDEAction" : {
"modelref" : true,
"path" : "PSMODULES/Test/PSDATAENTITIES/BOOKCHILD5/PSDEACTIONS/Get.json"
},
"getPSDEServiceAPIMethodInput" : {
"getKeyPSDEServiceAPIField" : {
"modelref" : true,
"id" : "BOOKCHILD5Id"
},
"name" : "输入对象",
"type" : "KEYFIELD"
},
"getPSDEServiceAPIMethodReturn" : {
"name" : "返回对象",
"getPSDEMethodDTO" : {
"modelref" : true,
"id" : "BOOKCHILD5DTO"
},
"type" : "DTO"
},
"requestField" : "BOOKCHILD5ID",
"requestMethod" : "GET",
"requestParamType" : "FIELD",
"uniqueTag" : "BOOKCHILD5__DEACTION__GET",
"needResourceKey" : true,
"noServiceCodeName" : true
}, {
"dataAccessAction" : "DELETE",
"methodType" : "DEACTION",
"name" : "Remove",
"getPSDEAction" : {
"modelref" : true,
"path" : "PSMODULES/Test/PSDATAENTITIES/BOOKCHILD5/PSDEACTIONS/Remove.json"
},
"getPSDEServiceAPIMethodInput" : {
"getKeyPSDEServiceAPIField" : {
"modelref" : true,
"id" : "BOOKCHILD5Id"
},
"name" : "输入对象",
"type" : "KEYFIELDS"
},
"getPSDEServiceAPIMethodReturn" : {
"name" : "返回对象",
"type" : "VOID"
},
"requestField" : "BOOKCHILD5ID",
"requestMethod" : "DELETE",
"requestParamType" : "FIELD",
"uniqueTag" : "BOOKCHILD5__DEACTION__REMOVE",
"needResourceKey" : true,
"noServiceCodeName" : true
}, {
"dataAccessAction" : "UPDATE",
"methodType" : "DEACTION",
"name" : "Update",
"getPSDEAction" : {
"modelref" : true,
"path" : "PSMODULES/Test/PSDATAENTITIES/BOOKCHILD5/PSDEACTIONS/Update.json"
},
"getPSDEServiceAPIMethodInput" : {
"name" : "输入对象",
"getPSDEMethodDTO" : {
"modelref" : true,
"id" : "BOOKCHILD5DTO"
},
"type" : "DTO"
},
"getPSDEServiceAPIMethodReturn" : {
"name" : "返回对象",
"getPSDEMethodDTO" : {
"modelref" : true,
"id" : "BOOKCHILD5DTO"
},
"type" : "DTO"
},
"requestMethod" : "PUT",
"requestParamType" : "ENTITY",
"uniqueTag" : "BOOKCHILD5__DEACTION__UPDATE",
"needResourceKey" : true,
"noServiceCodeName" : true
}, {
"codeName" : "CheckKey",
"dataAccessAction" : "CREATE",
"methodType" : "DEACTION",
"name" : "CheckKey",
"getPSDEAction" : {
"modelref" : true,
"path" : "PSMODULES/Test/PSDATAENTITIES/BOOKCHILD5/PSDEACTIONS/CheckKey.json"
},
"getPSDEServiceAPIMethodInput" : {
"name" : "输入对象",
"getPSDEMethodDTO" : {
"modelref" : true,
"id" : "BOOKCHILD5DTO"
},
"type" : "DTO"
},
"getPSDEServiceAPIMethodReturn" : {
"name" : "返回对象",
"stdDataType" : 9,
"type" : "SIMPLE"
},
"requestMethod" : "POST",
"requestParamType" : "ENTITY",
"requestPath" : "/checkkey",
"uniqueTag" : "BOOKCHILD5__DEACTION__CHECKKEY"
}, {
"codeName" : "GetDraft",
"dataAccessAction" : "CREATE",
"methodType" : "DEACTION",
"name" : "GetDraft",
"getPSDEAction" : {
"modelref" : true,
"path" : "PSMODULES/Test/PSDATAENTITIES/BOOKCHILD5/PSDEACTIONS/GetDraft.json"
},
"getPSDEServiceAPIMethodInput" : {
"name" : "输入对象",
"getPSDEMethodDTO" : {
"modelref" : true,
"id" : "BOOKCHILD5DTO"
},
"type" : "DTO"
},
"getPSDEServiceAPIMethodReturn" : {
"name" : "返回对象",
"getPSDEMethodDTO" : {
"modelref" : true,
"id" : "BOOKCHILD5DTO"
},
"type" : "DTO"
},
"requestMethod" : "GET",
"requestParamType" : "NONE",
"requestPath" : "/getdraft",
"uniqueTag" : "BOOKCHILD5__DEACTION__GETDRAFT"
}, {
"codeName" : "Save",
"methodType" : "DEACTION",
"name" : "Save",
"getPSDEAction" : {
"modelref" : true,
"path" : "PSMODULES/Test/PSDATAENTITIES/BOOKCHILD5/PSDEACTIONS/Save.json"
},
"getPSDEServiceAPIMethodInput" : {
"name" : "输入对象",
"getPSDEMethodDTO" : {
"modelref" : true,
"id" : "BOOKCHILD5DTO"
},
"type" : "DTO"
},
"getPSDEServiceAPIMethodReturn" : {
"name" : "返回对象",
"type" : "VOID"
},
"requestMethod" : "POST",
"requestParamType" : "ENTITY",
"requestPath" : "/save",
"uniqueTag" : "BOOKCHILD5__DEACTION__SAVE",
"needResourceKey" : true
}, {
"codeName" : "FetchDefault",
"dataAccessAction" : "READ",
"methodType" : "FETCH",
"name" : "FetchDefault",
"getPSDEDataSet" : {
"modelref" : true,
"id" : "Default"
},
"getPSDEServiceAPIMethodInput" : {
"name" : "输入对象",
"getPSDEMethodDTO" : {
"modelref" : true,
"id" : "BOOKCHILD5FilterDTO"
},
"type" : "DTO"
},
"getPSDEServiceAPIMethodReturn" : {
"name" : "返回对象",
"getPSDEMethodDTO" : {
"modelref" : true,
"id" : "BOOKCHILD5DTO"
},
"type" : "PAGE"
},
"requestMethod" : "POST",
"requestParamType" : "ENTITY",
"requestPath" : "/fetchdefault",
"uniqueTag" : "BOOKCHILD5__FETCH__DEFAULT"
}, {
"codeName" : "Select",
"dataAccessAction" : "READ",
"methodType" : "SELECT",
"name" : "Select",
"getPSDEServiceAPIMethodInput" : {
"name" : "输入对象",
"type" : "UNKNOWN"
},
"getPSDEServiceAPIMethodReturn" : {
"name" : "返回对象",
"type" : "UNKNOWN"
},
"requestMethod" : "POST",
"requestParamType" : "ENTITY",
"requestPath" : "/select",
"uniqueTag" : "BOOKCHILD5__SELECT"
} ],
"getPSDataEntity" : { "getPSDataEntity" : {
"modelref" : true, "modelref" : true,
"path" : "PSMODULES/Test/PSDATAENTITIES/BOOKCHILD5.json" "path" : "PSMODULES/Test/PSDATAENTITIES/BOOKCHILD5.json"
}, },
"enableDataExport" : true, "enableDataExport" : true,
"enableDataImport" : true, "enableDataImport" : true,
"major" : true "major" : false,
"nested" : true
}, { }, {
"aPIMode" : 9, "aPIMode" : 9,
"codeName" : "BOOKCHILD2", "codeName" : "BOOKCHILD2",
......
...@@ -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 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册