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

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

上级 1d94ed24
......@@ -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>
......
......@@ -1146,7 +1146,7 @@
"getPSDEUILogicLinks" : [ {
"getDstPSDEUILogicNode" : {
"modelref" : true,
"id" : "PREPAREPARAM1"
"id" : "PREPAREJSPARAM1"
},
"linkMode" : 0,
"name" : "连接名称",
......@@ -1158,20 +1158,20 @@
"topPos" : 200,
"parallelOutput" : true
}, {
"codeName" : "PREPAREPARAM1",
"leftPos" : 488,
"logicNodeType" : "PREPAREPARAM",
"codeName" : "PREPAREJSPARAM1",
"leftPos" : 557,
"logicNodeType" : "PREPAREJSPARAM",
"name" : "准备参数",
"getPSDEUILogicLinks" : [ {
"getDstPSDEUILogicNode" : {
"modelref" : true,
"id" : "RAWSFCODE1"
"id" : "RAWJSCODE1"
},
"linkMode" : 0,
"name" : "连接名称",
"getSrcPSDEUILogicNode" : {
"modelref" : true,
"id" : "PREPAREPARAM1"
"id" : "PREPAREJSPARAM1"
}
} ],
"getPSDEUILogicNodeParams" : [ {
......@@ -1180,30 +1180,31 @@
"modelref" : true,
"id" : "DataFlow"
},
"name" : "直接值[test-flow] ==> DataFlow[type]",
"name" : "直接值[type-xxx] ==> DataFlow[type]",
"paramAction" : "SETPARAMVALUE",
"srcValue" : "test-flow",
"srcValue" : "type-xxx",
"srcValueType" : "SRCVALUE"
} ],
"topPos" : 208
}, {
"codeName" : "RAWSFCODE1",
"leftPos" : 910,
"logicNodeType" : "RAWSFCODE",
"name" : "执行脚本代码",
"code" : "alert(this.DataFlow.type);",
"codeName" : "RAWJSCODE1",
"leftPos" : 955,
"logicNodeType" : "RAWJSCODE",
"name" : "注入脚本代码",
"topPos" : 208
} ],
"getPSDEUILogicParams" : [ {
"codeName" : "DataFlow",
"logicName" : "数据流程",
"name" : "数据流程",
"entityParam" : true
}, {
"codeName" : "Default",
"logicName" : "传入变量",
"name" : "传入变量",
"default" : true,
"entityParam" : true
}, {
"codeName" : "DataFlow",
"logicName" : "数据流程",
"name" : "数据流程",
"entityParam" : true
} ],
"getStartPSDEUILogicNode" : {
"modelref" : true,
......
......@@ -11780,10 +11780,10 @@
"codeName" : "VMGroup3",
"name" : "视图消息类型测试",
"getPSAppViewMsgGroupDetails" : [ {
"name" : "消息类型-常规信息",
"name" : "消息类型-警告信息",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg4"
"id" : "ViewMsg5"
}
}, {
"name" : "消息类型-错误信息",
......@@ -11792,10 +11792,10 @@
"id" : "ViewMsg6"
}
}, {
"name" : "消息类型-警告信息",
"name" : "消息类型-常规信息",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg5"
"id" : "ViewMsg4"
}
} ]
}, {
......@@ -11812,10 +11812,10 @@
"codeName" : "VMGroup4",
"name" : "视图消息位置测试",
"getPSAppViewMsgGroupDetails" : [ {
"name" : "消息位置-视图方",
"name" : "消息位置-视图方",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg7"
"id" : "ViewMsg8"
}
}, {
"name" : "消息位置-弹出",
......@@ -11824,81 +11824,81 @@
"id" : "ViewMsg10"
}
}, {
"name" : "消息位置-视图下方",
"name" : "消息位置-视图内容区",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg8"
"id" : "ViewMsg9"
}
}, {
"name" : "消息位置-视图内容区",
"name" : "消息位置-视图上方",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg9"
"id" : "ViewMsg7"
}
} ]
}, {
"codeName" : "VMGroup8",
"name" : "【静态测试】",
"getPSAppViewMsgGroupDetails" : [ {
"name" : "消息类型-警告信息",
"name" : "消息位置-视图内容区",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg5"
},
"position" : "POPUP"
"id" : "ViewMsg9"
}
}, {
"name" : "消息类型-错误信息",
"name" : "关闭模式-默认删除-上方-错误",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg6"
},
"position" : "POPUP"
"id" : "ViewMsg12"
}
}, {
"name" : "消息类型-常规信息",
"name" : "关闭模式-本次删除-上方-警告",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg4"
},
"position" : "POPUP"
"id" : "ViewMsg13"
}
}, {
"name" : "关闭模式-无删除-上方-常规",
"name" : "消息类型-错误信息",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg11"
}
"id" : "ViewMsg6"
},
"position" : "POPUP"
}, {
"name" : "消息位置-视图内容区",
"name" : "消息位置-视图下方",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg9"
"id" : "ViewMsg8"
}
}, {
"name" : "关闭模式-默认删除-上方-错误",
"name" : "消息类型-常规信息",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg12"
}
"id" : "ViewMsg4"
},
"position" : "POPUP"
}, {
"name" : "消息位置-视图下方",
"name" : "关闭模式-无删除-上方-常规",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg8"
"id" : "ViewMsg11"
}
}, {
"name" : "关闭模式-本次删除-上方-警告",
"name" : "消息类型-警告信息",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg13"
}
"id" : "ViewMsg5"
},
"position" : "POPUP"
} ]
}, {
"codeName" : "VMGroup5",
"name" : "视图消息关闭模式",
"getPSAppViewMsgGroupDetails" : [ {
"name" : "关闭模式-默认删除",
"name" : "关闭模式-本次删除",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg12"
"id" : "ViewMsg13"
}
}, {
"name" : "关闭模式-无删除",
......@@ -11907,26 +11907,26 @@
"id" : "ViewMsg11"
}
}, {
"name" : "关闭模式-本次删除",
"name" : "关闭模式-默认删除",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg13"
"id" : "ViewMsg12"
}
} ]
}, {
"codeName" : "VMGroup6",
"name" : "视图消息动态模式测试",
"getPSAppViewMsgGroupDetails" : [ {
"name" : "动态模式-静态内容",
"name" : "动态模式-实体数据集",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg15"
"id" : "ViewMsg14"
}
}, {
"name" : "动态模式-实体数据集",
"name" : "动态模式-静态内容",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg14"
"id" : "ViewMsg15"
}
} ]
} ],
......@@ -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 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册