Skip to content

T
TrainSys
提交 564ba4de 编写于 作者: ibizdev's avatar ibizdev
浏览文件
操作

lengyuace 发布系统代码 [TrainSys，网页端]

上级 8cc8646e
显示空白字符变更
内嵌 并排
正在显示 包含 127 行增加 和 103 行删除
config.xml
浏览文件 @ 564ba4de
...@@ -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>
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/WORKITEM/PSKANBANS/TestKanbanView_KanBan.json
浏览文件 @ 564ba4de
...@@ -244,6 +244,21 @@ ...@@ -244,6 +244,21 @@
"name" : "PX", "name" : "PX",
"codeName" : "PX" "codeName" : "PX"
}, },
"getMovePSControlAction" : {
"modelref" : true,
"id" : "move",
"actionName" : "Save",
"actionType" : "DEACTION",
"name" : "move",
"getPSAppDEMethod" : {
"modelref" : true,
"id" : "Save"
},
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/WORKITEM.json"
}
},
"getPSAppDataEntity" : { "getPSAppDataEntity" : {
"modelref" : true, "modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/WORKITEM.json" "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/WORKITEM.json"
...@@ -343,6 +358,13 @@ ...@@ -343,6 +358,13 @@
"modeltype" : "PSDETOOLBAR" "modeltype" : "PSDETOOLBAR"
} ], } ],
"getPSDEDataViewDataItems" : [ { "getPSDEDataViewDataItems" : [ {
"dataType" : 25,
"name" : "pworkitemname",
"getPSAppDEField" : {
"name" : "PWORKITEMNAME",
"codeName" : "Pworkitemname"
}
}, {
"dataType" : 25, "dataType" : 25,
"getFrontPSCodeList" : { "getFrontPSCodeList" : {
"modelref" : true, "modelref" : true,
...@@ -353,13 +375,6 @@ ...@@ -353,13 +375,6 @@
"name" : "TYPE", "name" : "TYPE",
"codeName" : "TYPE" "codeName" : "TYPE"
} }
}, {
"dataType" : 25,
"name" : "pworkitemname",
"getPSAppDEField" : {
"name" : "PWORKITEMNAME",
"codeName" : "Pworkitemname"
}
}, { }, {
"dataType" : 25, "dataType" : 25,
"name" : "srfkey", "name" : "srfkey",
...@@ -383,6 +398,16 @@ ...@@ -383,6 +398,16 @@
} }
} ], } ],
"getPSDEDataViewItems" : [ { "getPSDEDataViewItems" : [ {
"caption" : "工作项名称",
"dataItemName" : "pworkitemname",
"itemType" : "DATAITEM",
"name" : "PWORKITEMNAME",
"getPSAppDEField" : {
"name" : "PWORKITEMNAME",
"codeName" : "Pworkitemname"
},
"enableSort" : true
}, {
"cLConvertMode" : "FRONT", "cLConvertMode" : "FRONT",
"caption" : "类型", "caption" : "类型",
"dataItemName" : "type", "dataItemName" : "type",
...@@ -397,16 +422,6 @@ ...@@ -397,16 +422,6 @@
"path" : "PSSYSAPPS/Web/PSAPPCODELISTS/Test__WorkItemType.json" "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/Test__WorkItemType.json"
}, },
"enableSort" : true "enableSort" : true
}, {
"caption" : "工作项名称",
"dataItemName" : "pworkitemname",
"itemType" : "DATAITEM",
"name" : "PWORKITEMNAME",
"getPSAppDEField" : {
"name" : "PWORKITEMNAME",
"codeName" : "Pworkitemname"
},
"enableSort" : true
} ], } ],
"pagingSize" : 1000, "pagingSize" : 1000,
"getRemovePSControlAction" : { "getRemovePSControlAction" : {
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/WORKITEMTestKanbanView.json
浏览文件 @ 564ba4de
...@@ -500,6 +500,21 @@ ...@@ -500,6 +500,21 @@
"name" : "PX", "name" : "PX",
"codeName" : "PX" "codeName" : "PX"
}, },
"getMovePSControlAction" : {
"modelref" : true,
"id" : "move",
"actionName" : "Save",
"actionType" : "DEACTION",
"name" : "move",
"getPSAppDEMethod" : {
"modelref" : true,
"id" : "Save"
},
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/WORKITEM.json"
}
},
"getPSAppDataEntity" : { "getPSAppDataEntity" : {
"modelref" : true, "modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/WORKITEM.json" "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/WORKITEM.json"
...@@ -570,6 +585,18 @@ ...@@ -570,6 +585,18 @@
"modelref" : true, "modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/WORKITEM.json" "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/WORKITEM.json"
} }
}, {
"actionName" : "Save",
"actionType" : "DEACTION",
"name" : "move",
"getPSAppDEMethod" : {
"modelref" : true,
"id" : "Save"
},
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/WORKITEM.json"
}
}, { }, {
"actionType" : "DEDATASET", "actionType" : "DEDATASET",
"name" : "fetch", "name" : "fetch",
...@@ -686,6 +713,13 @@ ...@@ -686,6 +713,13 @@
"modeltype" : "PSDETOOLBAR" "modeltype" : "PSDETOOLBAR"
} ], } ],
"getPSDEDataViewDataItems" : [ { "getPSDEDataViewDataItems" : [ {
"dataType" : 25,
"name" : "pworkitemname",
"getPSAppDEField" : {
"name" : "PWORKITEMNAME",
"codeName" : "Pworkitemname"
}
}, {
"dataType" : 25, "dataType" : 25,
"getFrontPSCodeList" : { "getFrontPSCodeList" : {
"modelref" : true, "modelref" : true,
...@@ -696,13 +730,6 @@ ...@@ -696,13 +730,6 @@
"name" : "TYPE", "name" : "TYPE",
"codeName" : "TYPE" "codeName" : "TYPE"
} }
}, {
"dataType" : 25,
"name" : "pworkitemname",
"getPSAppDEField" : {
"name" : "PWORKITEMNAME",
"codeName" : "Pworkitemname"
}
}, { }, {
"dataType" : 25, "dataType" : 25,
"name" : "srfkey", "name" : "srfkey",
...@@ -726,6 +753,16 @@ ...@@ -726,6 +753,16 @@
} }
} ], } ],
"getPSDEDataViewItems" : [ { "getPSDEDataViewItems" : [ {
"caption" : "工作项名称",
"dataItemName" : "pworkitemname",
"itemType" : "DATAITEM",
"name" : "PWORKITEMNAME",
"getPSAppDEField" : {
"name" : "PWORKITEMNAME",
"codeName" : "Pworkitemname"
},
"enableSort" : true
}, {
"cLConvertMode" : "FRONT", "cLConvertMode" : "FRONT",
"caption" : "类型", "caption" : "类型",
"dataItemName" : "type", "dataItemName" : "type",
...@@ -740,16 +777,6 @@ ...@@ -740,16 +777,6 @@
"path" : "PSSYSAPPS/Web/PSAPPCODELISTS/Test__WorkItemType.json" "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/Test__WorkItemType.json"
}, },
"enableSort" : true "enableSort" : true
}, {
"caption" : "工作项名称",
"dataItemName" : "pworkitemname",
"itemType" : "DATAITEM",
"name" : "PWORKITEMNAME",
"getPSAppDEField" : {
"name" : "PWORKITEMNAME",
"codeName" : "Pworkitemname"
},
"enableSort" : true
} ], } ],
"pagingSize" : 1000, "pagingSize" : 1000,
"getRemovePSControlAction" : { "getRemovePSControlAction" : {
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSSYSAPP.json
浏览文件 @ 564ba4de
...@@ -68205,6 +68205,21 @@ ...@@ -68205,6 +68205,21 @@
"name" : "PX", "name" : "PX",
"codeName" : "PX" "codeName" : "PX"
}, },
"getMovePSControlAction" : {
"modelref" : true,
"id" : "move",
"actionName" : "Save",
"actionType" : "DEACTION",
"name" : "move",
"getPSAppDEMethod" : {
"modelref" : true,
"id" : "Save"
},
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/WORKITEM.json"
}
},
"getPSAppDataEntity" : { "getPSAppDataEntity" : {
"modelref" : true, "modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/WORKITEM.json" "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/WORKITEM.json"
...@@ -68275,6 +68290,18 @@ ...@@ -68275,6 +68290,18 @@
"modelref" : true, "modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/WORKITEM.json" "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/WORKITEM.json"
} }
}, {
"actionName" : "Save",
"actionType" : "DEACTION",
"name" : "move",
"getPSAppDEMethod" : {
"modelref" : true,
"id" : "Save"
},
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/WORKITEM.json"
}
}, { }, {
"actionType" : "DEDATASET", "actionType" : "DEDATASET",
"name" : "fetch", "name" : "fetch",
...@@ -68391,6 +68418,13 @@ ...@@ -68391,6 +68418,13 @@
"modeltype" : "PSDETOOLBAR" "modeltype" : "PSDETOOLBAR"
} ], } ],
"getPSDEDataViewDataItems" : [ { "getPSDEDataViewDataItems" : [ {
"dataType" : 25,
"name" : "pworkitemname",
"getPSAppDEField" : {
"name" : "PWORKITEMNAME",
"codeName" : "Pworkitemname"
}
}, {
"dataType" : 25, "dataType" : 25,
"getFrontPSCodeList" : { "getFrontPSCodeList" : {
"modelref" : true, "modelref" : true,
...@@ -68401,13 +68435,6 @@ ...@@ -68401,13 +68435,6 @@
"name" : "TYPE", "name" : "TYPE",
"codeName" : "TYPE" "codeName" : "TYPE"
} }
}, {
"dataType" : 25,
"name" : "pworkitemname",
"getPSAppDEField" : {
"name" : "PWORKITEMNAME",
"codeName" : "Pworkitemname"
}
}, { }, {
"dataType" : 25, "dataType" : 25,
"name" : "srfkey", "name" : "srfkey",
...@@ -68431,6 +68458,16 @@ ...@@ -68431,6 +68458,16 @@
} }
} ], } ],
"getPSDEDataViewItems" : [ { "getPSDEDataViewItems" : [ {
"caption" : "工作项名称",
"dataItemName" : "pworkitemname",
"itemType" : "DATAITEM",
"name" : "PWORKITEMNAME",
"getPSAppDEField" : {
"name" : "PWORKITEMNAME",
"codeName" : "Pworkitemname"
},
"enableSort" : true
}, {
"cLConvertMode" : "FRONT", "cLConvertMode" : "FRONT",
"caption" : "类型", "caption" : "类型",
"dataItemName" : "type", "dataItemName" : "type",
...@@ -68445,16 +68482,6 @@ ...@@ -68445,16 +68482,6 @@
"path" : "PSSYSAPPS/Web/PSAPPCODELISTS/Test__WorkItemType.json" "path" : "PSSYSAPPS/Web/PSAPPCODELISTS/Test__WorkItemType.json"
}, },
"enableSort" : true "enableSort" : true
}, {
"caption" : "工作项名称",
"dataItemName" : "pworkitemname",
"itemType" : "DATAITEM",
"name" : "PWORKITEMNAME",
"getPSAppDEField" : {
"name" : "PWORKITEMNAME",
"codeName" : "Pworkitemname"
},
"enableSort" : true
} ], } ],
"pagingSize" : 1000, "pagingSize" : 1000,
"getRemovePSControlAction" : { "getRemovePSControlAction" : {
trainsys-provider/pom.xml
浏览文件 @ 564ba4de
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
<profiles> <profiles>
<profile> <profile>
<id>trainsys</id> <id>runtime</id>
<build> <build>
<resources> <resources>
<resource> <resource>
......
trainsys-provider/src/main/docker/Dockerfile
浏览文件 @ 564ba4de
...@@ -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
trainsys-provider/src/main/docker/trainsys-provider-trainsys-k8s.yaml
浏览文件 @ 564ba4de
...@@ -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
......
trainsys-provider/src/main/docker/trainsys-provider-trainsys.yaml
浏览文件 @ 564ba4de
...@@ -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 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或