Skip to content

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

lxm1993 部署微服务接口 [TrainSys，默认服务接口]

上级 8765b5ca
隐藏空白字符变更
内嵌 并排
正在显示 包含 366 行增加 和 11 行删除
config.xml
浏览文件 @ 0ce77ab5
...@@ -55,6 +55,12 @@ ...@@ -55,6 +55,12 @@
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/TEST/PSGRIDS/ExpGrid_4586.json 0 → 100644
浏览文件 @ 0ce77ab5
{
"aggMode" : "NONE",
"codeName" : "ExpGrid_4586",
"columnEnableFilter" : 2,
"columnEnableLink" : 2,
"controlType" : "GRID",
"dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST/PSGRIDS/ExpGrid_4586.json",
"getFetchPSControlAction" : {
"modelref" : true,
"id" : "fetch",
"actionType" : "DEDATASET",
"name" : "fetch",
"getPSAppDEMethod" : {
"modelref" : true,
"id" : "FetchDefault"
},
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
}
},
"groupMode" : "NONE",
"hookEventNames" : [ "SELECTIONCHANGE", "LOAD" ],
"logicName" : "导航表格_1620",
"getNavPSAppView" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTEditView.json",
"viewType" : "DEEDITVIEW"
},
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
},
"getPSControlLogics" : [ {
"eventNames" : "SELECTIONCHANGE",
"logicTag" : "gridexpbar_grid",
"logicType" : "CUSTOM",
"name" : "gridexpbar_selectionchange"
}, {
"eventNames" : "LOAD",
"logicTag" : "gridexpbar_grid",
"logicType" : "CUSTOM",
"name" : "gridexpbar_load"
} ],
"getPSDEGridColumns" : [ {
"align" : "LEFT",
"cLConvertMode" : "NONE",
"caption" : "名称",
"codeName" : "testname",
"columnType" : "DEFGRIDCOLUMN",
"dataItemName" : "testname",
"excelCaption" : "名称",
"name" : "testname",
"noPrivDisplayMode" : 1,
"getPSAppDEField" : {
"name" : "TESTNAME",
"codeName" : "TESTName"
},
"width" : 150,
"widthUnit" : "PX",
"enableSort" : true
} ],
"getPSDEGridDataItems" : [ {
"dataType" : 25,
"name" : "testname",
"getPSAppDEField" : {
"name" : "TESTNAME",
"codeName" : "TESTName"
}
}, {
"dataType" : 25,
"name" : "srfkey",
"getPSAppDEField" : {
"name" : "TESTID",
"codeName" : "TESTId"
}
}, {
"dataType" : 25,
"name" : "srfdataaccaction",
"getPSAppDEField" : {
"name" : "TESTID",
"codeName" : "TESTId"
},
"dataAccessAction" : true
}, {
"dataType" : 25,
"name" : "srfmajortext",
"getPSAppDEField" : {
"name" : "TESTNAME",
"codeName" : "TESTName"
}
} ],
"getPSDEGridEditItems" : [ {
"caption" : "测试实体标识",
"codeName" : "srfkey",
"enableCond" : 3,
"ignoreInput" : 0,
"name" : "srfkey",
"getPSAppDEField" : {
"name" : "TESTID",
"codeName" : "TESTId"
},
"getPSEditor" : {
"editorType" : "HIDDEN",
"name" : "srfkey"
},
"allowEmpty" : true
} ],
"pagingSize" : 20,
"getRemovePSControlAction" : {
"actionName" : "Remove",
"actionType" : "DEACTION",
"dataAccessAction" : "DELETE",
"name" : "remove",
"getPSAppDEMethod" : {
"modelref" : true,
"id" : "Remove"
},
"getPSAppDataEntity" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
}
},
"sortMode" : "REMOTE",
"hasWFDataItems" : false,
"enableColFilter" : false,
"enableCustomized" : true,
"enableGroup" : false,
"enablePagingBar" : true,
"enableRowEdit" : false,
"enableRowEditOrder" : false,
"enableRowNew" : false,
"forceFit" : false,
"hideHeader" : false,
"noSort" : false,
"singleSelect" : false,
"modelid" : "337FF476-7FFA-43B3-AC46-B633E807E6C5",
"modeltype" : "PSDEGRID"
}
\ No newline at end of file
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/TESTUsr2GridExpView.json
浏览文件 @ 0ce77ab5
...@@ -41,6 +41,11 @@ ...@@ -41,6 +41,11 @@
"editMode" : true "editMode" : true
} }
} ], } ],
"getPSAppViewParams" : [ {
"key" : "EXPMODE",
"name" : "EXPMODE",
"value" : "NO_ROUTE"
} ],
"getPSControls" : [ { "getPSControls" : [ {
"codeName" : "Usr2GridExpViewgridexpbar", "codeName" : "Usr2GridExpViewgridexpbar",
"controlType" : "GRIDEXPBAR", "controlType" : "GRIDEXPBAR",
...@@ -49,6 +54,15 @@ ...@@ -49,6 +54,15 @@
"modelref" : true, "modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json" "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
}, },
"getPSAppViewRefs" : [ {
"name" : "EXPITEM:DEFAULT",
"realTitle" : "测试实体编辑视图",
"getRefPSAppView" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTEditView.json",
"viewType" : "DEEDITVIEW"
}
} ],
"getPSControlHandler" : { "getPSControlHandler" : {
"enableDEFieldPrivilege" : false, "enableDEFieldPrivilege" : false,
"id" : "gridexpbar" "id" : "gridexpbar"
...@@ -60,11 +74,11 @@ ...@@ -60,11 +74,11 @@
}, },
"getPSControls" : [ { "getPSControls" : [ {
"aggMode" : "NONE", "aggMode" : "NONE",
"codeName" : "Gridexpbar_grid", "codeName" : "ExpGrid_4586",
"columnEnableFilter" : 2, "columnEnableFilter" : 2,
"columnEnableLink" : 2, "columnEnableLink" : 2,
"controlType" : "GRID", "controlType" : "GRID",
"dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST/PSGRIDS/Gridexpbar_grid.json", "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST/PSGRIDS/ExpGrid_4586.json",
"getFetchPSControlAction" : { "getFetchPSControlAction" : {
"modelref" : true, "modelref" : true,
"id" : "fetch", "id" : "fetch",
...@@ -81,6 +95,12 @@ ...@@ -81,6 +95,12 @@
}, },
"groupMode" : "NONE", "groupMode" : "NONE",
"hookEventNames" : [ "SELECTIONCHANGE", "LOAD" ], "hookEventNames" : [ "SELECTIONCHANGE", "LOAD" ],
"logicName" : "导航表格_1620",
"getNavPSAppView" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTEditView.json",
"viewType" : "DEEDITVIEW"
},
"getPSAppDataEntity" : { "getPSAppDataEntity" : {
"modelref" : true, "modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json" "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST.json"
...@@ -183,6 +203,70 @@ ...@@ -183,6 +203,70 @@
"showBusyIndicator" : true, "showBusyIndicator" : true,
"id" : "gridexpbar_grid" "id" : "gridexpbar_grid"
}, },
"getPSDEGridColumns" : [ {
"align" : "LEFT",
"cLConvertMode" : "NONE",
"caption" : "名称",
"codeName" : "testname",
"columnType" : "DEFGRIDCOLUMN",
"dataItemName" : "testname",
"excelCaption" : "名称",
"name" : "testname",
"noPrivDisplayMode" : 1,
"getPSAppDEField" : {
"name" : "TESTNAME",
"codeName" : "TESTName"
},
"width" : 150,
"widthUnit" : "PX",
"enableSort" : true
} ],
"getPSDEGridDataItems" : [ {
"dataType" : 25,
"name" : "testname",
"getPSAppDEField" : {
"name" : "TESTNAME",
"codeName" : "TESTName"
}
}, {
"dataType" : 25,
"name" : "srfkey",
"getPSAppDEField" : {
"name" : "TESTID",
"codeName" : "TESTId"
}
}, {
"dataType" : 25,
"name" : "srfdataaccaction",
"getPSAppDEField" : {
"name" : "TESTID",
"codeName" : "TESTId"
},
"dataAccessAction" : true
}, {
"dataType" : 25,
"name" : "srfmajortext",
"getPSAppDEField" : {
"name" : "TESTNAME",
"codeName" : "TESTName"
}
} ],
"getPSDEGridEditItems" : [ {
"caption" : "测试实体标识",
"codeName" : "srfkey",
"enableCond" : 3,
"ignoreInput" : 0,
"name" : "srfkey",
"getPSAppDEField" : {
"name" : "TESTID",
"codeName" : "TESTId"
},
"getPSEditor" : {
"editorType" : "HIDDEN",
"name" : "srfkey"
},
"allowEmpty" : true
} ],
"pagingSize" : 20, "pagingSize" : 20,
"getRemovePSControlAction" : { "getRemovePSControlAction" : {
"actionName" : "Remove", "actionName" : "Remove",
...@@ -203,7 +287,7 @@ ...@@ -203,7 +287,7 @@
"enableColFilter" : false, "enableColFilter" : false,
"enableCustomized" : true, "enableCustomized" : true,
"enableGroup" : false, "enableGroup" : false,
"enablePagingBar" : false, "enablePagingBar" : true,
"enableRowEdit" : false, "enableRowEdit" : false,
"enableRowEditOrder" : false, "enableRowEditOrder" : false,
"enableRowNew" : false, "enableRowNew" : false,
...@@ -212,7 +296,7 @@ ...@@ -212,7 +296,7 @@
"noSort" : false, "noSort" : false,
"singleSelect" : false, "singleSelect" : false,
"name" : "gridexpbar_grid", "name" : "gridexpbar_grid",
"modelid" : "a03e0fe98aff117e34112ca4658821c3_gridexpbar_grid", "modelid" : "337FF476-7FFA-43B3-AC46-B633E807E6C5",
"modeltype" : "PSDEGRID" "modeltype" : "PSDEGRID"
} ], } ],
"xDataControlName" : "gridexpbar_grid", "xDataControlName" : "gridexpbar_grid",
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPINDEXVIEWS/AppIndex.json
浏览文件 @ 0ce77ab5
...@@ -2022,6 +2022,43 @@ ...@@ -2022,6 +2022,43 @@
"layout" : "TABLE_24COL" "layout" : "TABLE_24COL"
}, },
"tooltip" : "树导航视图" "tooltip" : "树导航视图"
}, {
"accUserMode" : 0,
"caption" : "路由模式",
"itemType" : "MENUITEM",
"name" : "menuitem127",
"getPSAppMenuItems" : [ {
"accUserMode" : 0,
"caption" : "非路由",
"itemType" : "MENUITEM",
"name" : "menuitem128",
"getPSLayout" : {
"childColLG" : -1,
"childColMD" : 24,
"childColSM" : -1,
"childColXS" : -1,
"columnCount" : 24,
"layout" : "TABLE_24COL"
},
"getPSLayoutPos" : {
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"tooltip" : "非路由"
} ],
"getPSLayout" : {
"childColLG" : -1,
"childColMD" : 24,
"childColSM" : -1,
"childColXS" : -1,
"columnCount" : 24,
"layout" : "TABLE_24COL"
},
"getPSLayoutPos" : {
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"tooltip" : "路由模式"
} ], } ],
"getPSLayout" : { "getPSLayout" : {
"childColLG" : -1, "childColLG" : -1,
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPMENUS/AppIndex.json
浏览文件 @ 0ce77ab5
...@@ -902,6 +902,19 @@ ...@@ -902,6 +902,19 @@
"id" : "UsrAppFunc0810578965" "id" : "UsrAppFunc0810578965"
}, },
"tooltip" : "树导航视图" "tooltip" : "树导航视图"
}, {
"accUserMode" : 0,
"caption" : "路由模式",
"itemType" : "MENUITEM",
"name" : "menuitem127",
"getPSAppMenuItems" : [ {
"accUserMode" : 0,
"caption" : "非路由",
"itemType" : "MENUITEM",
"name" : "menuitem128",
"tooltip" : "非路由"
} ],
"tooltip" : "路由模式"
} ], } ],
"tooltip" : "导航视图" "tooltip" : "导航视图"
}, { }, {
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSSYSAPP.json
浏览文件 @ 0ce77ab5
...@@ -13912,6 +13912,43 @@ ...@@ -13912,6 +13912,43 @@
"layout" : "TABLE_24COL" "layout" : "TABLE_24COL"
}, },
"tooltip" : "树导航视图" "tooltip" : "树导航视图"
}, {
"accUserMode" : 0,
"caption" : "路由模式",
"itemType" : "MENUITEM",
"name" : "menuitem127",
"getPSAppMenuItems" : [ {
"accUserMode" : 0,
"caption" : "非路由",
"itemType" : "MENUITEM",
"name" : "menuitem128",
"getPSLayout" : {
"childColLG" : -1,
"childColMD" : 24,
"childColSM" : -1,
"childColXS" : -1,
"columnCount" : 24,
"layout" : "TABLE_24COL"
},
"getPSLayoutPos" : {
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"tooltip" : "非路由"
} ],
"getPSLayout" : {
"childColLG" : -1,
"childColMD" : 24,
"childColSM" : -1,
"childColXS" : -1,
"columnCount" : 24,
"layout" : "TABLE_24COL"
},
"getPSLayoutPos" : {
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"tooltip" : "路由模式"
} ], } ],
"getPSLayout" : { "getPSLayout" : {
"childColLG" : -1, "childColLG" : -1,
trainsys-provider/pom.xml
浏览文件 @ 0ce77ab5
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
<profiles> <profiles>
<profile> <profile>
<id>runtime</id> <id>trainsys</id>
<build> <build>
<resources> <resources>
<resource> <resource>
......
trainsys-provider/src/main/docker/Dockerfile
浏览文件 @ 0ce77ab5
...@@ -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 8081 EXPOSE 50000
ADD trainsys-provider.jar /trainsys-provider.jar ADD trainsys-provider.jar /trainsys-provider.jar
trainsys-provider/src/main/docker/trainsys-provider-trainsys-k8s.yaml
浏览文件 @ 0ce77ab5
...@@ -22,7 +22,32 @@ spec: ...@@ -22,7 +22,32 @@ 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: 8081 - 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"
--- ---
apiVersion: v1 apiVersion: v1
...@@ -35,9 +60,9 @@ spec: ...@@ -35,9 +60,9 @@ spec:
type: NodePort type: NodePort
ports: ports:
- name: http - name: http
port: 8081 port: 50000
targetPort: 8081 targetPort: 50000
nodePort: 8081 nodePort: 50000
protocol: TCP protocol: TCP
selector: selector:
app: trainsys-provider app: trainsys-provider
......
trainsys-provider/src/main/docker/trainsys-provider-trainsys.yaml
浏览文件 @ 0ce77ab5
...@@ -3,9 +3,23 @@ services: ...@@ -3,9 +3,23 @@ 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:
- "8081:8081" - "50000:50000"
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 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或