Skip to content

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

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

上级 241cd958
隐藏空白字符变更
内嵌 并排
正在显示 包含 454 行增加 和 52 行删除
config.xml
浏览文件 @ 224c62f3
...@@ -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/PSMODULES/Test.json
浏览文件 @ 224c62f3
...@@ -14,6 +14,9 @@ ...@@ -14,6 +14,9 @@
}, { }, {
"modelref" : true, "modelref" : true,
"path" : "PSMODULES/Test/PSCODELISTS/WorkFlowWfStep.json" "path" : "PSMODULES/Test/PSCODELISTS/WorkFlowWfStep.json"
}, {
"modelref" : true,
"path" : "PSMODULES/Test/PSCODELISTS/CodeList51.json"
} ], } ],
"getAllPSDataEntities" : [ { "getAllPSDataEntities" : [ {
"modelref" : true, "modelref" : true,
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/Test/PSCODELISTS/CodeList51.json 0 → 100644
浏览文件 @ 224c62f3
{
"codeListTag" : "Test__CodeList51",
"codeListType" : "STATIC",
"codeName" : "CodeList51",
"dynaInstMode" : 0,
"dynaModelFilePath" : "PSMODULES/Test/PSCODELISTS/CodeList51.json",
"emptyText" : "未定义",
"name" : "层级代码表",
"getPSCodeItems" : [ {
"codeName" : "Fu",
"getPSCodeItems" : [ {
"codeName" : "Zi1",
"getPSCodeItems" : [ {
"codeName" : "Sun1",
"text" : "孙1",
"value" : "sun1"
} ],
"text" : "子1",
"value" : "zi1"
} ],
"text" : "父1",
"value" : "fu"
}, {
"codeName" : "Fu2",
"getPSCodeItems" : [ {
"codeName" : "Zi2",
"text" : "子2",
"value" : "zi2"
} ],
"text" : "父2",
"value" : "fu2"
}, {
"codeName" : "Fu3",
"getPSCodeItems" : [ {
"codeName" : "Zi3",
"text" : "子3",
"value" : "zi3"
} ],
"text" : "父3",
"value" : "fu3"
} ],
"getPSSystemModule" : {
"modelref" : true,
"path" : "PSMODULES/Test.json"
},
"refFlag" : true,
"systemTag" : "TrainSys",
"codeItemValueNumber" : false,
"enableCache" : true,
"subSysAsCloud" : false,
"subSysCodeList" : false,
"userScope" : false
}
\ No newline at end of file
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPCODELISTS/CodeList51.json 0 → 100644
浏览文件 @ 224c62f3
{
"codeListTag" : "Test__CodeList51",
"codeListType" : "STATIC",
"codeName" : "CodeList51",
"dynaInstMode" : 0,
"dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPCODELISTS/CodeList51.json",
"emptyText" : "未定义",
"name" : "层级代码表",
"getPSCodeItems" : [ {
"codeName" : "Fu",
"getPSCodeItems" : [ {
"codeName" : "Zi1",
"getPSCodeItems" : [ {
"codeName" : "Sun1",
"text" : "孙1",
"value" : "sun1"
} ],
"text" : "子1",
"value" : "zi1"
} ],
"text" : "父1",
"value" : "fu"
}, {
"codeName" : "Fu2",
"getPSCodeItems" : [ {
"codeName" : "Zi2",
"text" : "子2",
"value" : "zi2"
} ],
"text" : "父2",
"value" : "fu2"
}, {
"codeName" : "Fu3",
"getPSCodeItems" : [ {
"codeName" : "Zi3",
"text" : "子3",
"value" : "zi3"
} ],
"text" : "父3",
"value" : "fu3"
} ],
"enableCache" : true
}
\ No newline at end of file
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST/PSFORMS/Gnqrbdys.json
浏览文件 @ 224c62f3
...@@ -350,6 +350,18 @@ ...@@ -350,6 +350,18 @@
}, { }, {
"id" : "formitem51", "id" : "formitem51",
"dataType" : 25 "dataType" : 25
}, {
"id" : "formitem52",
"dataType" : 25
}, {
"id" : "formitem53",
"dataType" : 25
}, {
"id" : "formitem54",
"dataType" : 25
}, {
"id" : "formitem55",
"dataType" : 25
}, { }, {
"id" : "testid", "id" : "testid",
"hidden" : true, "hidden" : true,
...@@ -2720,6 +2732,144 @@ ...@@ -2720,6 +2732,144 @@
"titleBarCloseMode" : 2, "titleBarCloseMode" : 2,
"infoGroupMode" : false, "infoGroupMode" : false,
"showCaption" : true "showCaption" : true
}, {
"actionGroupExtractMode" : "ITEM",
"caption" : "代码表引用",
"codeName" : "grouppanel21",
"detailStyle" : "DEFAULT",
"detailType" : "GROUPPANEL",
"name" : "grouppanel21",
"getPSDEFormDetails" : [ {
"caption" : "代码表引用",
"codeName" : "formitem52",
"dataType" : 25,
"detailStyle" : "DEFAULT",
"detailType" : "FORMITEM",
"enableCond" : 3,
"ignoreInput" : 0,
"labelPos" : "LEFT",
"labelWidth" : 130,
"name" : "formitem52",
"noPrivDisplayMode" : 1,
"getPSEditor" : {
"editorType" : "DROPDOWNLIST",
"name" : "formitem52",
"getPSAppCodeList" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPCODELISTS/PhoneType.json"
},
"singleSelect" : true
},
"getPSLayoutPos" : {
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"allowEmpty" : true,
"needCodeListConfig" : true,
"showCaption" : true
}, {
"caption" : "转换代码项文本",
"codeName" : "formitem53",
"dataType" : 25,
"detailStyle" : "DEFAULT",
"detailType" : "FORMITEM",
"enableCond" : 3,
"ignoreInput" : 3,
"labelPos" : "LEFT",
"labelWidth" : 130,
"name" : "formitem53",
"noPrivDisplayMode" : 1,
"getPSEditor" : {
"editorType" : "DROPDOWNLIST",
"name" : "formitem53",
"getPSAppCodeList" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPCODELISTS/PhoneType.json"
},
"singleSelect" : true
},
"getPSLayoutPos" : {
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"allowEmpty" : true,
"convertToCodeItemText" : true,
"needCodeListConfig" : true,
"showCaption" : true
}, {
"caption" : "输出代码表配置模式-输出子项",
"codeName" : "formitem54",
"dataType" : 25,
"detailStyle" : "DEFAULT",
"detailType" : "FORMITEM",
"enableCond" : 3,
"ignoreInput" : 0,
"labelPos" : "LEFT",
"labelWidth" : 130,
"name" : "formitem54",
"noPrivDisplayMode" : 1,
"outputCodeListConfigMode" : 2,
"getPSEditor" : {
"editorType" : "DROPDOWNLIST",
"name" : "formitem54",
"getPSAppCodeList" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPCODELISTS/CodeList51.json"
},
"singleSelect" : true
},
"getPSLayoutPos" : {
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"allowEmpty" : true,
"needCodeListConfig" : true,
"showCaption" : true
}, {
"caption" : "输出代码表配置模式只输出选择项",
"codeName" : "formitem55",
"dataType" : 25,
"detailStyle" : "DEFAULT",
"detailType" : "FORMITEM",
"enableCond" : 3,
"ignoreInput" : 0,
"labelPos" : "LEFT",
"labelWidth" : 130,
"name" : "formitem55",
"noPrivDisplayMode" : 1,
"outputCodeListConfigMode" : 1,
"getPSEditor" : {
"editorType" : "DROPDOWNLIST",
"name" : "formitem55",
"getPSAppCodeList" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPCODELISTS/CodeList51.json"
},
"singleSelect" : true
},
"getPSLayoutPos" : {
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"allowEmpty" : true,
"needCodeListConfig" : true,
"showCaption" : true
} ],
"getPSLayout" : {
"childColLG" : -1,
"childColMD" : 24,
"childColSM" : -1,
"childColXS" : -1,
"columnCount" : 24,
"layout" : "TABLE_24COL"
},
"getPSLayoutPos" : {
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"titleBarCloseMode" : 2,
"infoGroupMode" : false,
"showCaption" : true
} ], } ],
"getPSLayout" : { "getPSLayout" : {
"childColLG" : -1, "childColLG" : -1,
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/TESTUsr5EditView.json
浏览文件 @ 224c62f3
...@@ -473,6 +473,18 @@ ...@@ -473,6 +473,18 @@
}, { }, {
"id" : "formitem51", "id" : "formitem51",
"dataType" : 25 "dataType" : 25
}, {
"id" : "formitem52",
"dataType" : 25
}, {
"id" : "formitem53",
"dataType" : 25
}, {
"id" : "formitem54",
"dataType" : 25
}, {
"id" : "formitem55",
"dataType" : 25
}, { }, {
"id" : "testid", "id" : "testid",
"hidden" : true, "hidden" : true,
...@@ -2843,6 +2855,144 @@ ...@@ -2843,6 +2855,144 @@
"titleBarCloseMode" : 2, "titleBarCloseMode" : 2,
"infoGroupMode" : false, "infoGroupMode" : false,
"showCaption" : true "showCaption" : true
}, {
"actionGroupExtractMode" : "ITEM",
"caption" : "代码表引用",
"codeName" : "grouppanel21",
"detailStyle" : "DEFAULT",
"detailType" : "GROUPPANEL",
"name" : "grouppanel21",
"getPSDEFormDetails" : [ {
"caption" : "代码表引用",
"codeName" : "formitem52",
"dataType" : 25,
"detailStyle" : "DEFAULT",
"detailType" : "FORMITEM",
"enableCond" : 3,
"ignoreInput" : 0,
"labelPos" : "LEFT",
"labelWidth" : 130,
"name" : "formitem52",
"noPrivDisplayMode" : 1,
"getPSEditor" : {
"editorType" : "DROPDOWNLIST",
"name" : "formitem52",
"getPSAppCodeList" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPCODELISTS/PhoneType.json"
},
"singleSelect" : true
},
"getPSLayoutPos" : {
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"allowEmpty" : true,
"needCodeListConfig" : true,
"showCaption" : true
}, {
"caption" : "转换代码项文本",
"codeName" : "formitem53",
"dataType" : 25,
"detailStyle" : "DEFAULT",
"detailType" : "FORMITEM",
"enableCond" : 3,
"ignoreInput" : 3,
"labelPos" : "LEFT",
"labelWidth" : 130,
"name" : "formitem53",
"noPrivDisplayMode" : 1,
"getPSEditor" : {
"editorType" : "DROPDOWNLIST",
"name" : "formitem53",
"getPSAppCodeList" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPCODELISTS/PhoneType.json"
},
"singleSelect" : true
},
"getPSLayoutPos" : {
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"allowEmpty" : true,
"convertToCodeItemText" : true,
"needCodeListConfig" : true,
"showCaption" : true
}, {
"caption" : "输出代码表配置模式-输出子项",
"codeName" : "formitem54",
"dataType" : 25,
"detailStyle" : "DEFAULT",
"detailType" : "FORMITEM",
"enableCond" : 3,
"ignoreInput" : 0,
"labelPos" : "LEFT",
"labelWidth" : 130,
"name" : "formitem54",
"noPrivDisplayMode" : 1,
"outputCodeListConfigMode" : 2,
"getPSEditor" : {
"editorType" : "DROPDOWNLIST",
"name" : "formitem54",
"getPSAppCodeList" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPCODELISTS/CodeList51.json"
},
"singleSelect" : true
},
"getPSLayoutPos" : {
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"allowEmpty" : true,
"needCodeListConfig" : true,
"showCaption" : true
}, {
"caption" : "输出代码表配置模式只输出选择项",
"codeName" : "formitem55",
"dataType" : 25,
"detailStyle" : "DEFAULT",
"detailType" : "FORMITEM",
"enableCond" : 3,
"ignoreInput" : 0,
"labelPos" : "LEFT",
"labelWidth" : 130,
"name" : "formitem55",
"noPrivDisplayMode" : 1,
"outputCodeListConfigMode" : 1,
"getPSEditor" : {
"editorType" : "DROPDOWNLIST",
"name" : "formitem55",
"getPSAppCodeList" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPCODELISTS/CodeList51.json"
},
"singleSelect" : true
},
"getPSLayoutPos" : {
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"allowEmpty" : true,
"needCodeListConfig" : true,
"showCaption" : true
} ],
"getPSLayout" : {
"childColLG" : -1,
"childColMD" : 24,
"childColSM" : -1,
"childColXS" : -1,
"columnCount" : 24,
"layout" : "TABLE_24COL"
},
"getPSLayoutPos" : {
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"titleBarCloseMode" : 2,
"infoGroupMode" : false,
"showCaption" : true
} ], } ],
"getPSLayout" : { "getPSLayout" : {
"childColLG" : -1, "childColLG" : -1,
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSSYSAPP.json
浏览文件 @ 224c62f3
...@@ -144,6 +144,48 @@ ...@@ -144,6 +144,48 @@
"value" : "1" "value" : "1"
} ], } ],
"enableCache" : true "enableCache" : true
}, {
"codeListTag" : "Test__CodeList51",
"codeListType" : "STATIC",
"codeName" : "CodeList51",
"dynaInstMode" : 0,
"dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPCODELISTS/CodeList51.json",
"emptyText" : "未定义",
"name" : "层级代码表",
"getPSCodeItems" : [ {
"codeName" : "Fu",
"getPSCodeItems" : [ {
"codeName" : "Zi1",
"getPSCodeItems" : [ {
"codeName" : "Sun1",
"text" : "孙1",
"value" : "sun1"
} ],
"text" : "子1",
"value" : "zi1"
} ],
"text" : "父1",
"value" : "fu"
}, {
"codeName" : "Fu2",
"getPSCodeItems" : [ {
"codeName" : "Zi2",
"text" : "子2",
"value" : "zi2"
} ],
"text" : "父2",
"value" : "fu2"
}, {
"codeName" : "Fu3",
"getPSCodeItems" : [ {
"codeName" : "Zi3",
"text" : "子3",
"value" : "zi3"
} ],
"text" : "父3",
"value" : "fu3"
} ],
"enableCache" : true
}, { }, {
"codeListTag" : "CodeList81", "codeListTag" : "CodeList81",
"codeListType" : "STATIC", "codeListType" : "STATIC",
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSTEM.json
浏览文件 @ 224c62f3
...@@ -336,6 +336,9 @@ ...@@ -336,6 +336,9 @@
}, { }, {
"modelref" : true, "modelref" : true,
"path" : "PSMODULES/Test/PSCODELISTS/WorkFlowWfStep.json" "path" : "PSMODULES/Test/PSCODELISTS/WorkFlowWfStep.json"
}, {
"modelref" : true,
"path" : "PSMODULES/Test/PSCODELISTS/CodeList51.json"
}, { }, {
"modelref" : true, "modelref" : true,
"path" : "PSCODELISTS/CodeList47.json" "path" : "PSCODELISTS/CodeList47.json"
...@@ -955,6 +958,9 @@ ...@@ -955,6 +958,9 @@
}, { }, {
"modelref" : true, "modelref" : true,
"path" : "PSMODULES/Test/PSCODELISTS/WorkFlowWfStep.json" "path" : "PSMODULES/Test/PSCODELISTS/WorkFlowWfStep.json"
}, {
"modelref" : true,
"path" : "PSMODULES/Test/PSCODELISTS/CodeList51.json"
} ], } ],
"getAllPSDataEntities" : [ { "getAllPSDataEntities" : [ {
"modelref" : true, "modelref" : true,
......
trainsys-provider/pom.xml
浏览文件 @ 224c62f3
...@@ -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
浏览文件 @ 224c62f3
...@@ -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
浏览文件 @ 224c62f3
...@@ -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
浏览文件 @ 224c62f3
...@@ -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 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或