Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
提交反馈
为 GitLab 提交贡献
登录
切换导航
T
TrainSys
项目
项目
详情
动态
版本
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
苏州培训方案
TrainSys
提交
34bfc6d4
提交
34bfc6d4
编写于
11月 21, 2023
作者:
ibizdev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
lengyuace 发布系统代码 [TrainSys,网页端]
上级
ae1e3e07
变更
13
隐藏空白字符变更
内嵌
并排
正在显示
13 个修改的文件
包含
363 行增加
和
105 行删除
+363
-105
config.xml
config.xml
+0
-6
Phone.json
...izlab/trainsys/PSMODULES/common/PSDATAENTITIES/Phone.json
+3
-3
Xxx.json
...SMODULES/common/PSDATAENTITIES/Phone/PSDEACTIONS/Xxx.json
+1
-1
Xxx.json.exec.bpmn
...ommon/PSDATAENTITIES/Phone/PSDEACTIONS/Xxx.json.exec.bpmn
+3
-3
xxxA.json
...SMODULES/common/PSDATAENTITIES/Phone/PSDELOGICS/xxxA.json
+182
-0
xxxA.json.bpmn
...LES/common/PSDATAENTITIES/Phone/PSDELOGICS/xxxA.json.bpmn
+48
-0
xxxA.json.drl
...ULES/common/PSDATAENTITIES/Phone/PSDELOGICS/xxxA.json.drl
+73
-0
PSSYSAPP.json
.../ibizlab/trainsys/PSSYSAPPS/TemplatePublish/PSSYSAPP.json
+4
-4
PSSYSAPP.json
...ces/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSSYSAPP.json
+42
-42
pom.xml
trainsys-provider/pom.xml
+1
-1
Dockerfile
trainsys-provider/src/main/docker/Dockerfile
+1
-1
trainsys-provider-trainsys-k8s.yaml
...vider/src/main/docker/trainsys-provider-trainsys-k8s.yaml
+4
-29
trainsys-provider-trainsys.yaml
...-provider/src/main/docker/trainsys-provider-trainsys.yaml
+1
-15
未找到文件。
config.xml
浏览文件 @
34bfc6d4
...
@@ -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/common/PSDATAENTITIES/Phone.json
浏览文件 @
34bfc6d4
...
@@ -224,7 +224,7 @@
...
@@ -224,7 +224,7 @@
},
},
"getPSDELogic"
:
{
"getPSDELogic"
:
{
"modelref"
:
true
,
"modelref"
:
true
,
"path"
:
"PSMODULES/common/PSDATAENTITIES/Phone/PSDELOGICS/xxx.json"
"path"
:
"PSMODULES/common/PSDATAENTITIES/Phone/PSDELOGICS/xxx
A
.json"
},
},
"enableFront"
:
false
"enableFront"
:
false
}
],
}
],
...
@@ -2482,10 +2482,10 @@
...
@@ -2482,10 +2482,10 @@
"enableBackend"
:
false
,
"enableBackend"
:
false
,
"enableFront"
:
true
"enableFront"
:
true
},
{
},
{
"codeName"
:
"xxx"
,
"codeName"
:
"xxx
A
"
,
"debugMode"
:
1
,
"debugMode"
:
1
,
"defaultParamName"
:
"Default"
,
"defaultParamName"
:
"Default"
,
"dynaModelFilePath"
:
"PSMODULES/common/PSDATAENTITIES/Phone/PSDELOGICS/xxx.json"
,
"dynaModelFilePath"
:
"PSMODULES/common/PSDATAENTITIES/Phone/PSDELOGICS/xxx
A
.json"
,
"logicName"
:
"xxx"
,
"logicName"
:
"xxx"
,
"name"
:
"xxx"
,
"name"
:
"xxx"
,
"getPSDELogicNodes"
:
[
{
"getPSDELogicNodes"
:
[
{
...
...
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/common/PSDATAENTITIES/Phone/PSDEACTIONS/Xxx.json
浏览文件 @
34bfc6d4
...
@@ -20,7 +20,7 @@
...
@@ -20,7 +20,7 @@
},
},
"getPSDELogic"
:
{
"getPSDELogic"
:
{
"modelref"
:
true
,
"modelref"
:
true
,
"path"
:
"PSMODULES/common/PSDATAENTITIES/Phone/PSDELOGICS/xxx.json"
"path"
:
"PSMODULES/common/PSDATAENTITIES/Phone/PSDELOGICS/xxx
A
.json"
},
},
"enableFront"
:
false
"enableFront"
:
false
}
}
\ No newline at end of file
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/common/PSDATAENTITIES/Phone/PSDEACTIONS/Xxx.json.exec.bpmn
浏览文件 @
34bfc6d4
...
@@ -8,8 +8,8 @@
...
@@ -8,8 +8,8 @@
</extensionElements>
</extensionElements>
<startEvent
id=
"begin"
isInterrupting=
"true"
/>
<startEvent
id=
"begin"
isInterrupting=
"true"
/>
<endEvent
id=
"prepareparam1_end"
name=
"end"
/>
<endEvent
id=
"prepareparam1_end"
name=
"end"
/>
<callActivity
activiti:exclusive=
"true"
calledElement=
"cn.ibizlab.trainsys.core.common.service.logic.phonexxx
"
id=
"xxx"
name=
"xxx
.json.bpmn"
/>
<callActivity
activiti:exclusive=
"true"
calledElement=
"cn.ibizlab.trainsys.core.common.service.logic.phonexxx
a"
id=
"xxxA"
name=
"xxxA
.json.bpmn"
/>
<sequenceFlow
id=
"begin_xxx
"
sourceRef=
"begin"
targetRef=
"xxx
"
/>
<sequenceFlow
id=
"begin_xxx
A"
sourceRef=
"begin"
targetRef=
"xxxA
"
/>
<sequenceFlow
id=
"xxx
_xxx"
sourceRef=
"xxx
"
targetRef=
"prepareparam1_end"
/>
<sequenceFlow
id=
"xxx
A_xxxA"
sourceRef=
"xxxA
"
targetRef=
"prepareparam1_end"
/>
</process>
</process>
</definitions>
</definitions>
\ No newline at end of file
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/common/PSDATAENTITIES/Phone/PSDELOGICS/xxxA.json
0 → 100644
浏览文件 @
34bfc6d4
{
"codeName"
:
"xxxA"
,
"debugMode"
:
1
,
"defaultParamName"
:
"Default"
,
"dynaModelFilePath"
:
"PSMODULES/common/PSDATAENTITIES/Phone/PSDELOGICS/xxxA.json"
,
"logicName"
:
"xxx"
,
"name"
:
"xxx"
,
"getPSDELogicNodes"
:
[
{
"codeName"
:
"Begin"
,
"leftPos"
:
200
,
"logicNodeType"
:
"BEGIN"
,
"name"
:
"开始"
,
"getPSDELogicLinks"
:
[
{
"getDstPSDELogicNode"
:
{
"modelref"
:
true
,
"id"
:
"PREPAREPARAM1"
},
"name"
:
"连接名称"
,
"getSrcPSDELogicNode"
:
{
"modelref"
:
true
,
"id"
:
"Begin"
}
}
],
"topPos"
:
200
,
"parallelOutput"
:
true
},
{
"codeName"
:
"THROWEXCEPTION1"
,
"errorCode"
:
0
,
"leftPos"
:
700
,
"logicNodeType"
:
"THROWEXCEPTION"
,
"name"
:
"抛出异常"
,
"topPos"
:
110
},
{
"codeName"
:
"PREPAREPARAM1"
,
"leftPos"
:
460
,
"logicNodeType"
:
"PREPAREPARAM"
,
"name"
:
"准备参数"
,
"getPSDELogicLinks"
:
[
{
"getDstPSDELogicNode"
:
{
"modelref"
:
true
,
"id"
:
"SUBSYSSAMETHOD1"
},
"name"
:
"连接名称"
,
"getSrcPSDELogicNode"
:
{
"modelref"
:
true
,
"id"
:
"PREPAREPARAM1"
}
},
{
"getDstPSDELogicNode"
:
{
"modelref"
:
true
,
"id"
:
"THROWEXCEPTION1"
},
"name"
:
"error"
,
"getPSDELogicLinkGroupCond"
:
{
"groupOP"
:
"AND"
,
"logicType"
:
"GROUP"
,
"name"
:
"连接条件组"
,
"getPSDELogicLinkConds"
:
[
{
"condOP"
:
"EQ"
,
"dstFieldName"
:
"error"
,
"getDstLogicParam"
:
{
"modelref"
:
true
,
"id"
:
"Default"
},
"logicType"
:
"SINGLE"
,
"name"
:
"Default[error] 等于(=) 1"
,
"paramValue"
:
"1"
}
]
},
"getSrcPSDELogicNode"
:
{
"modelref"
:
true
,
"id"
:
"PREPAREPARAM1"
}
}
],
"getPSDELogicNodeParams"
:
[
{
"dstFieldName"
:
"MONEY"
,
"getDstPSDELogicParam"
:
{
"modelref"
:
true
,
"id"
:
"Default"
},
"name"
:
"直接值[1111] ==> Default[MONEY]"
,
"paramAction"
:
"SETPARAMVALUE"
,
"srcValue"
:
"1111"
,
"srcValueType"
:
"SRCVALUE"
}
],
"topPos"
:
340
},
{
"codeName"
:
"SUBSYSSAMETHOD1"
,
"getDstPSDELogicParam"
:
{
"modelref"
:
true
,
"id"
:
"Default"
},
"leftPos"
:
800
,
"logicNodeType"
:
"SUBSYSSAMETHOD"
,
"name"
:
"外部接口调用"
,
"getPSDELogicLinks"
:
[
{
"getDstPSDELogicNode"
:
{
"modelref"
:
true
,
"id"
:
"BINDPARAM1"
},
"name"
:
"连接名称"
,
"getSrcPSDELogicNode"
:
{
"modelref"
:
true
,
"id"
:
"SUBSYSSAMETHOD1"
}
}
],
"getPSSubSysServiceAPI"
:
{
"modelref"
:
true
,
"path"
:
"PSSUBSYSSERVICEAPIS/iBizRTClient.json"
},
"getPSSubSysServiceAPIDE"
:
{
"modelref"
:
true
,
"id"
:
"test"
},
"getPSSubSysServiceAPIDEMethod"
:
{
"modelref"
:
true
,
"id"
:
"test"
},
"topPos"
:
380
},
{
"codeName"
:
"BINDPARAM1"
,
"getDstPSDELogicParam"
:
{
"modelref"
:
true
,
"id"
:
"simpleVar"
},
"leftPos"
:
420
,
"logicNodeType"
:
"BINDPARAM"
,
"name"
:
"绑定参数"
,
"getPSDELogicLinks"
:
[
{
"getDstPSDELogicNode"
:
{
"modelref"
:
true
,
"id"
:
"END1"
},
"name"
:
"连接名称"
,
"getSrcPSDELogicNode"
:
{
"modelref"
:
true
,
"id"
:
"BINDPARAM1"
}
}
],
"srcFieldName"
:
"MONEY"
,
"getSrcPSDELogicParam"
:
{
"modelref"
:
true
,
"id"
:
"Default"
},
"topPos"
:
420
},
{
"codeName"
:
"END1"
,
"leftPos"
:
440
,
"logicNodeType"
:
"END"
,
"name"
:
"结束"
,
"topPos"
:
580
}
],
"getPSDELogicParams"
:
[
{
"codeName"
:
"Default"
,
"logicName"
:
"传入变量"
,
"name"
:
"传入变量"
,
"getParamPSDataEntity"
:
{
"modelref"
:
true
,
"path"
:
"PSMODULES/common/PSDATAENTITIES/Phone.json"
},
"default"
:
true
,
"entityParam"
:
true
},
{
"codeName"
:
"simpleVar"
,
"logicName"
:
"简单"
,
"name"
:
"简单"
,
"stdDataType"
:
4
,
"simpleParam"
:
true
},
{
"codeName"
:
"simplenum"
,
"logicName"
:
"simplenum"
,
"name"
:
"simplenum"
,
"stdDataType"
:
7
,
"simpleListParam"
:
true
}
],
"getStartPSDELogicNode"
:
{
"modelref"
:
true
,
"id"
:
"Begin"
},
"enableBackend"
:
true
,
"enableFront"
:
false
}
\ No newline at end of file
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/common/PSDATAENTITIES/Phone/PSDELOGICS/xxxA.json.bpmn
0 → 100644
浏览文件 @
34bfc6d4
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<definitions
xmlns=
"http://www.omg.org/spec/BPMN/20100524/MODEL"
xmlns:activiti=
"http://activiti.org/bpmn"
xmlns:bpmndi=
"http://www.omg.org/spec/BPMN/20100524/DI"
xmlns:dc=
"http://www.omg.org/spec/DD/20100524/DC"
xmlns:di=
"http://www.omg.org/spec/DD/20100524/DI"
xmlns:g=
"http://www.jboss.org/drools/flow/gpd"
xmlns:tns=
"http://www.jboss.org/drools"
xmlns:xsd=
"http://www.w3.org/2001/XMLSchema"
xmlns:xsi=
"http://www.w3.org/2001/XMLSchema-instance"
expressionLanguage=
"http://www.mvel.org/2.0"
id=
"Definition"
name=
""
targetNamespace=
"http://www.jboss.org/drools"
typeLanguage=
"http://www.java.com/javaTypes"
>
<process
id=
"cn.ibizlab.trainsys.core.common.service.logic.phonexxxa"
isClosed=
"false"
isExecutable=
"true"
name=
"common_phone_xxxa_ruleFlow"
processType=
"Private"
tns:packageName=
"cn.ibizlab.trainsys.core.common.service.logic.phonexxxa"
>
<extensionElements>
<tns:import
name=
"java.util.Map"
/>
<tns:import
name=
"org.springframework.util.StringUtils"
/>
<tns:import
name=
"cn.ibizlab.trainsys.util.helper.RuleUtils"
/>
<tns:metaData
express=
""
name=
"phonexxxadefault"
type=
"entity"
/>
<tns:metaData
express=
"new HashMap()"
name=
"phonexxxasimplevar"
type=
"refentity"
/>
<tns:metaData
express=
"new HashMap()"
name=
"phonexxxasimplenum"
type=
"refentity"
/>
<tns:metaData
express=
"T(cn.ibizlab.trainsys.util.security.SpringContextHolder).getBean(T(cn.ibizlab.trainsys.core.common.service.IPhoneService))"
name=
"iBzSysPhoneDefaultService"
type=
"service"
/>
<tns:metaData
express=
"T(cn.ibizlab.trainsys.util.security.AuthenticationUser).getAuthenticationUser()"
name=
"curuser"
type=
"session"
/>
<tns:global
identifier=
"phonexxxadefault"
type=
"cn.ibizlab.trainsys.core.common.domain.Phone"
/>
</extensionElements>
<startEvent
id=
"begin"
isInterrupting=
"true"
/>
<businessRuleTask
activiti:exclusive=
"true"
g:ruleFlowGroup=
"phonexxxathrowexception1"
id=
"throwexception1"
implementation=
"http://www.jboss.org/drools/rule"
name=
"抛出异常"
/>
<endEvent
id=
"throwexception1_end"
name=
"end"
/>
<sequenceFlow
id=
"throwexception1_end_line"
sourceRef=
"throwexception1"
targetRef=
"throwexception1_end"
/>
<businessRuleTask
activiti:exclusive=
"true"
g:ruleFlowGroup=
"phonexxxaprepareparam1"
id=
"prepareparam1"
implementation=
"http://www.jboss.org/drools/rule"
name=
"准备参数"
/>
<businessRuleTask
activiti:exclusive=
"true"
g:ruleFlowGroup=
"phonexxxasubsyssamethod1"
id=
"subsyssamethod1"
implementation=
"http://www.jboss.org/drools/rule"
name=
"外部接口调用"
/>
<businessRuleTask
activiti:exclusive=
"true"
g:ruleFlowGroup=
"phonexxxabindparam1"
id=
"bindparam1"
implementation=
"http://www.jboss.org/drools/rule"
name=
"绑定参数"
/>
<businessRuleTask
activiti:exclusive=
"true"
g:ruleFlowGroup=
"phonexxxaend1"
id=
"end1"
implementation=
"http://www.jboss.org/drools/rule"
name=
"结束"
/>
<endEvent
id=
"end1_end"
name=
"end"
/>
<sequenceFlow
id=
"end1_end_line"
sourceRef=
"end1"
targetRef=
"end1_end"
/>
<sequenceFlow
id=
"begin_prepareparam1"
sourceRef=
"begin"
targetRef=
"prepareparam1"
>
</sequenceFlow>
<sequenceFlow
id=
"prepareparam1_subsyssamethod1"
sourceRef=
"prepareparam1"
targetRef=
"subsyssamethod1"
>
</sequenceFlow>
<sequenceFlow
id=
"gateway-prepareparam1_throwexception1"
sourceRef=
"gateway-prepareparam1"
targetRef=
"throwexception1"
>
<conditionExpression
language=
"http://www.jboss.org/drools/rule"
>
<![CDATA[
$phonexxxadefault:Phone();
$phonexxxasimplevar:Map();
$phonexxxasimplenum:Map();
eval($phonexxxadefault==phonexxxadefault && );
eval((RuleUtils.test($phonexxxadefault.get("error"),"EQ","1")))
]]>
</conditionExpression>
</sequenceFlow>
<sequenceFlow
id=
"subsyssamethod1_bindparam1"
sourceRef=
"subsyssamethod1"
targetRef=
"bindparam1"
>
</sequenceFlow>
<sequenceFlow
id=
"bindparam1_end1"
sourceRef=
"bindparam1"
targetRef=
"end1"
>
</sequenceFlow>
<exclusiveGateway
id=
"gateway-prepareparam1"
name=
"Gateway"
gatewayDirection=
"Diverging"
default=
"gateway-prepareparam1_end_line"
></exclusiveGateway>
<sequenceFlow
id=
"prepareparam1_gateway-prepareparam1_gatewayline"
sourceRef=
"prepareparam1"
targetRef=
"gateway-prepareparam1"
></sequenceFlow>
<sequenceFlow
id=
"gateway-prepareparam1_end_line"
sourceRef=
"gateway-prepareparam1"
targetRef=
"gateway-prepareparam1_end"
/>
<endEvent
id=
"gateway-prepareparam1_end"
name=
"end"
/>
</process>
</definitions>
\ No newline at end of file
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/common/PSDATAENTITIES/Phone/PSDELOGICS/xxxA.json.drl
0 → 100644
浏览文件 @
34bfc6d4
package
cn
.
ibizlab
.
trainsys
.
common
.
logic
.
phonelogic
.
xxxa
;
import
java
.
util
.
Map
;
import
java
.
util
.
HashMap
;
import
com
.
alibaba
.
fastjson
.
JSONObject
;
import
org
.
springframework
.
util
.
StringUtils
;
import
org
.
springframework
.
util
.
ObjectUtils
;
import
cn
.
ibizlab
.
trainsys
.
util
.
errors
.
BadRequestAlertException
;
global
cn
.
ibizlab
.
trainsys
.
core
.
common
.
domain
.
Phone
phonexxxadefault
;
global
java
.
util
.
Map
phonexxxasimplevar
;
global
java
.
util
.
Map
phonexxxasimplenum
;
global
cn
.
ibizlab
.
trainsys
.
core
.
common
.
service
.
IPhoneService
iBzSysPhoneDefaultService
;
global
cn
.
ibizlab
.
trainsys
.
util
.
security
.
AuthenticationUser
curuser
;
no
-
loop
//
逻辑处理节点
[
开始
]
rule
"begin"
ruleflow
-
group
"phonexxxabegin"
when
then
end
//
逻辑处理节点
[
抛出异常
]
rule
"throwexception1"
ruleflow
-
group
"phonexxxathrowexception1"
when
then
update
(
phonexxxadefault
);//
更新
fact
中变量值
update
(
phonexxxasimplevar
);//
更新
fact
中变量值
update
(
phonexxxasimplenum
);//
更新
fact
中变量值
end
//
逻辑处理节点
[
准备参数
]
rule
"prepareparam1"
ruleflow
-
group
"phonexxxaprepareparam1"
when
then
phonexxxadefault
.
set
(
"money"
,
"1111"
);
update
(
phonexxxadefault
);//
更新
fact
中变量值
update
(
phonexxxasimplevar
);//
更新
fact
中变量值
update
(
phonexxxasimplenum
);//
更新
fact
中变量值
end
//
逻辑处理节点
[
外部接口调用
]
rule
"subsyssamethod1"
ruleflow
-
group
"phonexxxasubsyssamethod1"
when
then
update
(
phonexxxadefault
);//
更新
fact
中变量值
update
(
phonexxxasimplevar
);//
更新
fact
中变量值
update
(
phonexxxasimplenum
);//
更新
fact
中变量值
end
//
逻辑处理节点
[
绑定参数
]
rule
"bindparam1"
ruleflow
-
group
"phonexxxabindparam1"
when
then
update
(
phonexxxadefault
);//
更新
fact
中变量值
update
(
phonexxxasimplevar
);//
更新
fact
中变量值
update
(
phonexxxasimplenum
);//
更新
fact
中变量值
end
//
逻辑处理节点
[
结束
]
rule
"end1"
ruleflow
-
group
"phonexxxaend1"
when
then
update
(
phonexxxadefault
);//
更新
fact
中变量值
update
(
phonexxxasimplevar
);//
更新
fact
中变量值
update
(
phonexxxasimplenum
);//
更新
fact
中变量值
end
\ No newline at end of file
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/TemplatePublish/PSSYSAPP.json
浏览文件 @
34bfc6d4
...
@@ -1481,16 +1481,16 @@
...
@@ -1481,16 +1481,16 @@
"codeName"
:
"VMGroup2"
,
"codeName"
:
"VMGroup2"
,
"name"
:
"视图消息组2"
,
"name"
:
"视图消息组2"
,
"getPSAppViewMsgGroupDetails"
:
[
{
"getPSAppViewMsgGroupDetails"
:
[
{
"name"
:
"视图消息
2
"
,
"name"
:
"视图消息"
,
"getPSAppViewMsg"
:
{
"getPSAppViewMsg"
:
{
"modelref"
:
true
,
"modelref"
:
true
,
"id"
:
"ViewMsg
3
"
"id"
:
"ViewMsg
2
"
}
}
},
{
},
{
"name"
:
"视图消息"
,
"name"
:
"视图消息
2
"
,
"getPSAppViewMsg"
:
{
"getPSAppViewMsg"
:
{
"modelref"
:
true
,
"modelref"
:
true
,
"id"
:
"ViewMsg
2
"
"id"
:
"ViewMsg
3
"
}
}
}
]
}
]
},
{
},
{
...
...
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSSYSAPP.json
浏览文件 @
34bfc6d4
...
@@ -11261,16 +11261,16 @@
...
@@ -11261,16 +11261,16 @@
"codeName" : "VMGroup2",
"codeName" : "VMGroup2",
"name" : "视图消息组2",
"name" : "视图消息组2",
"getPSAppViewMsgGroupDetails" : [ {
"getPSAppViewMsgGroupDetails" : [ {
"name" : "视图消息
2
",
"name" : "视图消息",
"getPSAppViewMsg" : {
"getPSAppViewMsg" : {
"modelref" : true,
"modelref" : true,
"id" : "ViewMsg
3
"
"id" : "ViewMsg
2
"
}
}
}, {
}, {
"name" : "视图消息",
"name" : "视图消息
2
",
"getPSAppViewMsg" : {
"getPSAppViewMsg" : {
"modelref" : true,
"modelref" : true,
"id" : "ViewMsg
2
"
"id" : "ViewMsg
3
"
}
}
} ]
} ]
}, {
}, {
...
@@ -11299,12 +11299,6 @@
...
@@ -11299,12 +11299,6 @@
"codeName" : "VMGroup3",
"codeName" : "VMGroup3",
"name" : "视图消息类型测试",
"name" : "视图消息类型测试",
"getPSAppViewMsgGroupDetails" : [ {
"getPSAppViewMsgGroupDetails" : [ {
"name" : "消息类型-常规信息",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg4"
}
}, {
"name" : "消息类型-错误信息",
"name" : "消息类型-错误信息",
"getPSAppViewMsg" : {
"getPSAppViewMsg" : {
"modelref" : true,
"modelref" : true,
...
@@ -11316,6 +11310,12 @@
...
@@ -11316,6 +11310,12 @@
"modelref" : true,
"modelref" : true,
"id" : "ViewMsg5"
"id" : "ViewMsg5"
}
}
}, {
"name" : "消息类型-常规信息",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg4"
}
} ]
} ]
}, {
}, {
"codeName" : "VMGroup7",
"codeName" : "VMGroup7",
...
@@ -11331,52 +11331,40 @@
...
@@ -11331,52 +11331,40 @@
"codeName" : "VMGroup4",
"codeName" : "VMGroup4",
"name" : "视图消息位置测试",
"name" : "视图消息位置测试",
"getPSAppViewMsgGroupDetails" : [ {
"getPSAppViewMsgGroupDetails" : [ {
"name" : "消息位置-视图
下
方",
"name" : "消息位置-视图
上
方",
"getPSAppViewMsg" : {
"getPSAppViewMsg" : {
"modelref" : true,
"modelref" : true,
"id" : "ViewMsg
8
"
"id" : "ViewMsg
7
"
}
}
}, {
}, {
"name" : "消息位置-视图
内容区
",
"name" : "消息位置-视图
下方
",
"getPSAppViewMsg" : {
"getPSAppViewMsg" : {
"modelref" : true,
"modelref" : true,
"id" : "ViewMsg
9
"
"id" : "ViewMsg
8
"
}
}
}, {
}, {
"name" : "消息位置-
视图上方
",
"name" : "消息位置-
弹出
",
"getPSAppViewMsg" : {
"getPSAppViewMsg" : {
"modelref" : true,
"modelref" : true,
"id" : "ViewMsg
7
"
"id" : "ViewMsg
10
"
}
}
}, {
}, {
"name" : "消息位置-
弹出
",
"name" : "消息位置-
视图内容区
",
"getPSAppViewMsg" : {
"getPSAppViewMsg" : {
"modelref" : true,
"modelref" : true,
"id" : "ViewMsg
10
"
"id" : "ViewMsg
9
"
}
}
} ]
} ]
}, {
}, {
"codeName" : "VMGroup8",
"codeName" : "VMGroup8",
"name" : "【静态测试】",
"name" : "【静态测试】",
"getPSAppViewMsgGroupDetails" : [ {
"getPSAppViewMsgGroupDetails" : [ {
"name" : "关闭模式-无删除-上方-常规",
"name" : "消息类型-警告信息",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg11"
}
}, {
"name" : "消息类型-常规信息",
"getPSAppViewMsg" : {
"getPSAppViewMsg" : {
"modelref" : true,
"modelref" : true,
"id" : "ViewMsg
4
"
"id" : "ViewMsg
5
"
},
},
"position" : "POPUP"
"position" : "POPUP"
}, {
"name" : "关闭模式-默认删除-上方-错误",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg12"
}
}, {
}, {
"name" : "消息位置-视图内容区",
"name" : "消息位置-视图内容区",
"getPSAppViewMsg" : {
"getPSAppViewMsg" : {
...
@@ -11384,10 +11372,10 @@
...
@@ -11384,10 +11372,10 @@
"id" : "ViewMsg9"
"id" : "ViewMsg9"
}
}
}, {
}, {
"name" : "
消息位置-视图下方
",
"name" : "
关闭模式-默认删除-上方-错误
",
"getPSAppViewMsg" : {
"getPSAppViewMsg" : {
"modelref" : true,
"modelref" : true,
"id" : "ViewMsg
8
"
"id" : "ViewMsg
12
"
}
}
}, {
}, {
"name" : "关闭模式-本次删除-上方-警告",
"name" : "关闭模式-本次删除-上方-警告",
...
@@ -11396,28 +11384,40 @@
...
@@ -11396,28 +11384,40 @@
"id" : "ViewMsg13"
"id" : "ViewMsg13"
}
}
}, {
}, {
"name" : "消息类型-
警告
信息",
"name" : "消息类型-
错误
信息",
"getPSAppViewMsg" : {
"getPSAppViewMsg" : {
"modelref" : true,
"modelref" : true,
"id" : "ViewMsg
5
"
"id" : "ViewMsg
6
"
},
},
"position" : "POPUP"
"position" : "POPUP"
}, {
}, {
"name" : "消息
类型-错误信息
",
"name" : "消息
位置-视图下方
",
"getPSAppViewMsg" : {
"getPSAppViewMsg" : {
"modelref" : true,
"modelref" : true,
"id" : "ViewMsg6"
"id" : "ViewMsg8"
}
}, {
"name" : "消息类型-常规信息",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg4"
},
},
"position" : "POPUP"
"position" : "POPUP"
}, {
"name" : "关闭模式-无删除-上方-常规",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg11"
}
} ]
} ]
}, {
}, {
"codeName" : "VMGroup5",
"codeName" : "VMGroup5",
"name" : "视图消息关闭模式",
"name" : "视图消息关闭模式",
"getPSAppViewMsgGroupDetails" : [ {
"getPSAppViewMsgGroupDetails" : [ {
"name" : "关闭模式-
默认
删除",
"name" : "关闭模式-
本次
删除",
"getPSAppViewMsg" : {
"getPSAppViewMsg" : {
"modelref" : true,
"modelref" : true,
"id" : "ViewMsg1
2
"
"id" : "ViewMsg1
3
"
}
}
}, {
}, {
"name" : "关闭模式-无删除",
"name" : "关闭模式-无删除",
...
@@ -11426,10 +11426,10 @@
...
@@ -11426,10 +11426,10 @@
"id" : "ViewMsg11"
"id" : "ViewMsg11"
}
}
}, {
}, {
"name" : "关闭模式-
本次
删除",
"name" : "关闭模式-
默认
删除",
"getPSAppViewMsg" : {
"getPSAppViewMsg" : {
"modelref" : true,
"modelref" : true,
"id" : "ViewMsg1
3
"
"id" : "ViewMsg1
2
"
}
}
} ]
} ]
}, {
}, {
trainsys-provider/pom.xml
浏览文件 @
34bfc6d4
...
@@ -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
浏览文件 @
34bfc6d4
...
@@ -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
浏览文件 @
34bfc6d4
...
@@ -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
浏览文件 @
34bfc6d4
...
@@ -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
人
到此讨论。请谨慎行事。
先完成此消息的编辑!
取消
想要评论请
注册
或
登录