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

tony001 发布系统代码 [TrainSys,Mob]

上级 ff73cf9c
......@@ -76,6 +76,25 @@ export const viewstate: any = {
refviews: [
],
},
{
viewtag: '5bb966a86798a0aeb3fbde3b42d0c1d3',
viewmodule: 'Test',
viewname: 'TESTMobPickupTreeView',
viewaction: '',
viewdatachange: false,
refviews: [
],
},
{
viewtag: '6e16bc0d8de66d6238b48f624caa7911',
viewmodule: 'Test',
viewname: 'TESTUsr2MobMPickupView',
viewaction: '',
viewdatachange: false,
refviews: [
'5bb966a86798a0aeb3fbde3b42d0c1d3',
],
},
{
viewtag: '753676DB-2531-4A22-AA4E-FB9EA9BF8B3F',
viewmodule: 'Test',
......@@ -112,6 +131,7 @@ export const viewstate: any = {
'cf108dcc6825ab45f18c8c242be1d923',
'BFE57DB2-95D0-4432-8851-BCDAD09ECD59',
'5b0adc6008e49c23a960417dc8b3d9f3',
'6e16bc0d8de66d6238b48f624caa7911',
],
},
{
......
......@@ -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>
......
......@@ -3079,6 +3079,12 @@
"name" : " 实体移动端编辑视图(分页关系)",
"realModelSubType" : "DEMOBEDITVIEW3",
"realModelType" : "PSDEVIEWBASE"
}, {
"codeName" : "Usr2MobMPickupView",
"logicName" : "测试实体实体移动端多数据选择视图(树)",
"name" : "测试实体实体移动端多数据选择视图(树)",
"realModelSubType" : "DEMOBMPICKUPVIEW",
"realModelType" : "PSDEVIEWBASE"
}, {
"codeName" : "MobPickupView",
"logicName" : "测试实体实体移动端数据选择视图",
......
......@@ -2912,6 +2912,10 @@
"modelref" : true,
"path" : "PSSYSAPPS/Mob/PSAPPDEVIEWS/TESTMobPickupTreeView.json",
"viewType" : "DEMOBPICKUPTREEVIEW"
}, {
"modelref" : true,
"path" : "PSSYSAPPS/Mob/PSAPPDEVIEWS/TESTUsr2MobMPickupView.json",
"viewType" : "DEMOBMPICKUPVIEW"
}, {
"modelref" : true,
"path" : "PSSYSAPPS/Mob/PSAPPDEVIEWS/TESTDEMobWFDynaEditView3.json",
......
......@@ -447,7 +447,6 @@
"layoutPanel" : true,
"useDefaultLayout" : true
},
"refFlag" : false,
"title" : "测试实体移动端选择树视图",
"viewStyle" : "DEFAULT",
"viewType" : "DEMOBPICKUPTREEVIEW",
......
......@@ -213,6 +213,28 @@
"layout" : "TABLE_24COL"
},
"tooltip" : "树"
}, {
"accUserMode" : 2,
"caption" : "选择树",
"itemType" : "MENUITEM",
"name" : "menuitem10",
"getPSAppFunc" : {
"modelref" : true,
"id" : "AppFunc5"
},
"getPSLayout" : {
"childColLG" : -1,
"childColMD" : 24,
"childColSM" : -1,
"childColXS" : -1,
"columnCount" : 24,
"layout" : "TABLE_24COL"
},
"getPSLayoutPos" : {
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"tooltip" : "选择树"
} ],
"getPSControlHandler" : {
"enableDEFieldPrivilege" : false,
......
......@@ -93,6 +93,16 @@
"id" : "AppFunc4"
},
"tooltip" : "树"
}, {
"accUserMode" : 2,
"caption" : "选择树",
"itemType" : "MENUITEM",
"name" : "menuitem10",
"getPSAppFunc" : {
"modelref" : true,
"id" : "AppFunc5"
},
"tooltip" : "选择树"
} ],
"enableCustomize" : false,
"name" : "appindexview",
......
......@@ -1240,16 +1240,16 @@
"codeName" : "VMGroup2",
"name" : "视图消息组2",
"getPSAppViewMsgGroupDetails" : [ {
"name" : "视图消息",
"name" : "视图消息2",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg2"
"id" : "ViewMsg3"
}
}, {
"name" : "视图消息2",
"name" : "视图消息",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg3"
"id" : "ViewMsg2"
}
} ]
}, {
......
......@@ -2552,16 +2552,16 @@
"codeName" : "VMGroup2",
"name" : "视图消息组2",
"getPSAppViewMsgGroupDetails" : [ {
"name" : "视图消息",
"name" : "视图消息2",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg2"
"id" : "ViewMsg3"
}
}, {
"name" : "视图消息2",
"name" : "视图消息",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg3"
"id" : "ViewMsg2"
}
} ]
} ],
......
......@@ -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 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册