Skip to content

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

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

上级 3e2f6ed9
隐藏空白字符变更
内嵌 并排
正在显示 包含 136 行增加 和 112 行删除
config.xml
浏览文件 @ 76ead9b4
......@@ -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>
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPUTILVIEWS/AppDataUploadView.json
浏览文件 @ 76ead9b4
......@@ -14,95 +14,164 @@
"getPSControlParam" : { }
} ],
"getPSViewLayoutPanel" : {
"codeName" : "Usr0415952662",
"codeName" : "Usr0417651445",
"controlType" : "VIEWLAYOUTPANEL",
"hookEventNames" : [ "ONCLICK" ],
"layoutMode" : "FLEX",
"logicName" : "应用导入视图布局",
"layoutMode" : "Flex",
"logicName" : "数据导入布局面板",
"name" : "layoutpanel",
"getPSControlLogics" : [ {
"eventNames" : "onClick",
"itemName" : "BUTTON_CALLUILOGIC",
"logicTag" : "layoutpanel",
"logicType" : "SCRIPT",
"name" : "download_template",
"scriptCode" : "console.log(\"下载文档\",view);\r\nview.downloadTemplate()"
"name" : "logic",
"scriptCode" : "view.downloadTemplate()"
}, {
"eventNames" : "onClick",
"itemName" : "STATIC_TEXT",
"itemName" : "STATIC_TEXT2",
"logicTag" : "layoutpanel",
"logicType" : "SCRIPT",
"name" : "select",
"scriptCode" : "console.log('上传文件',view);\r\nview.selectAndImport().then(result=>{\r\n console.log(\"上传结果\",result);\r\n})"
"name" : "logic2",
"scriptCode" : "view.selectAndImport().then(result=>{\r\n console.log(\"上传结果\",result);\r\n})"
} ],
"getPSControlParam" : { },
"getPSLayout" : {
"layout" : "FLEX"
},
"getRootPSPanelItems" : [ {
"caption" : "数据导入",
"contentType" : "RAW",
"itemStyle" : "DEFAULT",
"itemType" : "RAWITEM",
"name" : "data_import",
"getPSLayoutPos" : {
"grow" : -1,
"itemType" : "CONTAINER",
"name" : "page_container",
"getPSLayout" : {
"dir" : "column",
"layout" : "FLEX"
},
"getPSRawItem" : {
"contentType" : "RAW",
"name" : "data_import",
"predefinedType" : "DATA_IMPORT",
"renderMode" : "TEXT"
},
"showCaption" : true
}, {
"actionType" : "NONE",
"buttonStyle" : "DEFAULT",
"buttonWidth" : 200.0,
"caption" : "下载模版",
"contentWidth" : 200.0,
"itemStyle" : "DEFAULT",
"itemType" : "BUTTON",
"name" : "button_calluilogic",
"getPSLayoutPos" : {
"grow" : -1,
"layout" : "FLEX",
"width" : 200,
"widthMode" : "PX"
},
"getPSSysImage" : {
"glyph" : "xf019@FontAwesome",
"cssClass" : "fa fa-download"
},
"tooltip" : "下载模版",
"uIActionTarget" : "NONE",
"width" : 200.0,
"showCaption" : true
}, {
"caption" : "文本",
"contentType" : "RAW",
"itemStyle" : "DEFAULT",
"itemType" : "RAWITEM",
"name" : "static_text",
"getPSLayoutPos" : {
"grow" : -1,
"layout" : "FLEX"
},
"getPSRawItem" : {
"caption" : "点击此处上传文件",
"contentType" : "RAW",
"name" : "static_text",
"predefinedType" : "STATIC_TEXT",
"renderMode" : "TEXT"
},
"rawContent" : "点击此处上传文件",
"showCaption" : true
"getPSPanelItems" : [ {
"caption" : "容器",
"itemStyle" : "DEFAULT",
"itemType" : "CONTAINER",
"name" : "container",
"getPSLayout" : {
"align" : "space-between",
"dir" : "row",
"layout" : "FLEX",
"vAlign" : "center"
},
"getPSLayoutPos" : {
"grow" : -1,
"layout" : "FLEX"
},
"getPSPanelItems" : [ {
"caption" : "下载模板描述",
"contentType" : "HTML",
"htmlContent" : "<p>下载模板</p>\n<p>下载工单导入模板，按照以下规则填写导入数据。</p>",
"itemStyle" : "DEFAULT",
"itemType" : "RAWITEM",
"name" : "static_text",
"getPSLayoutPos" : {
"grow" : -1,
"layout" : "FLEX"
},
"getPSRawItem" : {
"content" : "<p>下载模板</p>\n<p>下载工单导入模板，按照以下规则填写导入数据。</p>",
"contentType" : "HTML",
"name" : "static_text",
"predefinedType" : "STATIC_TEXT"
},
"showCaption" : true
}, {
"actionType" : "NONE",
"buttonStyle" : "DEFAULT",
"caption" : "下载模板",
"itemStyle" : "DEFAULT",
"itemType" : "BUTTON",
"name" : "button_calluilogic",
"getPSLayoutPos" : {
"grow" : -1,
"layout" : "FLEX"
},
"tooltip" : "下载模板",
"uIActionTarget" : "NONE",
"showCaption" : true
} ]
}, {
"caption" : "容器",
"itemStyle" : "DEFAULT",
"itemType" : "CONTAINER",
"name" : "container1",
"getPSLayout" : {
"layout" : "FLEX"
},
"getPSLayoutPos" : {
"grow" : -1,
"layout" : "FLEX"
},
"getPSPanelItems" : [ {
"caption" : "模板规则",
"contentType" : "HTML",
"htmlContent" : "<table style=\"border-collapse: collapse; width: 100%; height: 63px;\" border=\"1\">\n<tbody>\n<tr style=\"height: 21px;\">\n<td style=\"width: 49.5098%; height: 21px;\">属性（带\"<span class=\"text-danger ng-star-inserted\">*</span>\"的为必填项）</td>\n<td style=\"width: 49.5098%; height: 21px;\">填写规则</td>\n</tr>\n<tr style=\"height: 21px;\">\n<td style=\"width: 49.5098%; height: 21px;\">标题<span class=\"text-danger ng-star-inserted\">*</span></td>\n<td style=\"width: 49.5098%; height: 21px;\"><span class=\"text-danger ng-star-inserted\">必填项，</span>不可为空。</td>\n</tr>\n<tr style=\"height: 21px;\">\n<td style=\"width: 49.5098%; height: 21px;\">类型<span class=\"text-danger ng-star-inserted\">*</span></td>\n<td style=\"width: 49.5098%; height: 21px;\"><span class=\"text-danger ng-star-inserted\">必填项，</span>可选值为需要导入工单的产品中「产品设置」-「工单类型」已存在的工单类型。</td>\n</tr>\n</tbody>\n</table>",
"itemStyle" : "DEFAULT",
"itemType" : "RAWITEM",
"name" : "static_label",
"getPSLayoutPos" : {
"grow" : -1,
"layout" : "FLEX"
},
"getPSRawItem" : {
"content" : "<table style=\"border-collapse: collapse; width: 100%; height: 63px;\" border=\"1\">\n<tbody>\n<tr style=\"height: 21px;\">\n<td style=\"width: 49.5098%; height: 21px;\">属性（带\"<span class=\"text-danger ng-star-inserted\">*</span>\"的为必填项）</td>\n<td style=\"width: 49.5098%; height: 21px;\">填写规则</td>\n</tr>\n<tr style=\"height: 21px;\">\n<td style=\"width: 49.5098%; height: 21px;\">标题<span class=\"text-danger ng-star-inserted\">*</span></td>\n<td style=\"width: 49.5098%; height: 21px;\"><span class=\"text-danger ng-star-inserted\">必填项，</span>不可为空。</td>\n</tr>\n<tr style=\"height: 21px;\">\n<td style=\"width: 49.5098%; height: 21px;\">类型<span class=\"text-danger ng-star-inserted\">*</span></td>\n<td style=\"width: 49.5098%; height: 21px;\"><span class=\"text-danger ng-star-inserted\">必填项，</span>可选值为需要导入工单的产品中「产品设置」-「工单类型」已存在的工单类型。</td>\n</tr>\n</tbody>\n</table>",
"contentType" : "HTML",
"name" : "static_label",
"predefinedType" : "STATIC_LABEL"
},
"showCaption" : true
}, {
"caption" : "上传文件描述",
"contentType" : "HTML",
"htmlContent" : "<p>上传文件</p>\n<p>上传需要导入的 Excel 文件，上传文件的表头字段名必须与对应工单属性一致，仅支持 xls 、 xlsx 。</p>",
"itemStyle" : "DEFAULT",
"itemType" : "RAWITEM",
"name" : "static_text1",
"getPSLayoutPos" : {
"grow" : -1,
"layout" : "FLEX"
},
"getPSRawItem" : {
"content" : "<p>上传文件</p>\n<p>上传需要导入的 Excel 文件，上传文件的表头字段名必须与对应工单属性一致，仅支持 xls 、 xlsx 。</p>",
"contentType" : "HTML",
"name" : "static_text1",
"predefinedType" : "STATIC_TEXT"
},
"showCaption" : true
}, {
"caption" : "文本",
"contentType" : "HTML",
"htmlContent" : "<p>点击此处&nbsp;<a>上传文件</a></p>",
"itemStyle" : "DEFAULT",
"itemType" : "RAWITEM",
"name" : "static_text2",
"getPSLayoutPos" : {
"grow" : -1,
"layout" : "FLEX"
},
"getPSRawItem" : {
"content" : "<p>点击此处&nbsp;<a>上传文件</a></p>",
"contentType" : "HTML",
"name" : "static_text2",
"predefinedType" : "STATIC_TEXT"
},
"showCaption" : true
} ]
} ]
} ],
"layoutBodyOnly" : false,
"layoutPanel" : true,
"useDefaultLayout" : false,
"modelid" : "607599F8-B86F-4D55-9E2E-6289DC66EA46",
"modelid" : "96F022AF-9527-4131-8731-77FFAA068077",
"modeltype" : "PSSYSVIEWLAYOUTPANEL"
},
"title" : "应用数据导入视图",
......
trainsys-provider/pom.xml
浏览文件 @ 76ead9b4
......@@ -33,7 +33,7 @@
<profiles>
<profile>
<id>trainsys</id>
<id>runtime</id>
<build>
<resources>
<resource>
......
trainsys-provider/src/main/docker/Dockerfile
浏览文件 @ 76ead9b4
......@@ -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
trainsys-provider/src/main/docker/trainsys-provider-trainsys-k8s.yaml
浏览文件 @ 76ead9b4
......@@ -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
......
trainsys-provider/src/main/docker/trainsys-provider-trainsys.yaml
浏览文件 @ 76ead9b4
......@@ -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 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或