Skip to content

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

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

上级 2b9baad7
隐藏空白字符变更
内嵌 并排
正在显示 包含 164 行增加 和 28 行删除
config.xml
浏览文件 @ 6c933e75
......@@ -55,15 +55,12 @@
git clone -b master $para2 trainsys/
export NODE_OPTIONS=--max-old-space-size=4096
cd trainsys/
mkdir -p /var/lib/jenkins/appcache/A3064A91-F42D-4D7F-BC1C-4173A4F5772C
if [ -e app_Web/.dynamic ]
then
cd app_Web
else
cd app_Web/app
fi
sed -i "s#dstimage#registry.cn-shanghai.aliyuncs.com/ibizsys/ibizcloud-standardsys-app-webapp:2022.09.01.001#g" swarm.yaml
docker -H $para1 stack deploy --compose-file=swarm.yaml ebsx --with-registry-auth
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/PSAPPDEVIEWS/TESTUsr04196190EditView.json
浏览文件 @ 6c933e75
......@@ -214,11 +214,28 @@
"itemType" : "FIELD",
"name" : "field_text_dynamic",
"getPSEditor" : {
"editorType" : "SPAN",
"editorParams" : {
"USERINSCRIPT" : "value.replaceAll(/\\@\\{\\\"(user)?id\\\":\\\"(.+?)\\\",\\\"name\\\":\\\"(.+?)\\\"\\}/g,(x, user, id, name) => {return controller.getNodeInfo({ id, name })}).replaceAll(/\\@\\{userid=(.+?),name=(.+?)\\}/g,(x, id, name) => {return controller.getNodeInfo({ id, name })})",
"QUOTECODELISTMAP" : "{\"type\":\"plmweb.base__recent_visite\"}",
"QUOTEFIELDMAP" : "{\"identifier\":\"show_identifier\",\"name\":\"name\",\"id\":\"id\",\"type\":\"owner_subtype\"}",
"QUOTEPARAMS" : "{\"page\":0,\"size\":20,\"sort\":\"update_time,desc\"}",
"QUOTEINSCRIPT" : "value.replaceAll(/\\#\\{\\\"id\\\":\\\"(.+?)\\\",\\\"name\\\":\\\"(.+?)\\\",\\\"identifier\\\":\\\"(.+?)\\\",\\\"icon\\\":\\\"((.|[\\t\\r\\f\\n\\s])+?)\\\"\\}/g,(x, id, name, identifier, icon) => {return controller.getNodeInfo({ id, name, identifier, icon })}).replaceAll(/\\#\\{id=(.+?),name=(.+?),identifier=(.+?),icon=((.|[\\t\\r\\f\\n\\s])+?)\\}/g,(x, id, name, identifier, icon) => {return controller.getNodeInfo({ id, name, identifier, icon })})",
"USERSCRIPT" : "`@{\"id\":\"${data.id}\",\"name\":\"${data.name}\"}`",
"QUOTESCRIPT" : "`#{\"id\":\"${data.id}\",\"name\":\"${data.name}\",\"identifier\":\"${data.identifier}\",\"icon\":\"${data.icon}\"}`",
"REPLYSCRIPT" : "value?.replace(/@{[^,]*,\"name\":\"(.*?)\"}/g,\"<span class=\\'comment-tag\\'>@$1</span>\").replace(/@{[^,]*,name=(.*?)}/g,\"<span class=\\'comment-tag\\'>@$1</span>\").replace(/#{\"id\":\"(.+?)\",\"name\":\"(.+?)\",\"identifier\":\"(.+?)\",\"icon\":\"((.|[\\t\\r\\f\\n\\s])+?)\"}/g, \"<span class=\\'comment-tag\\'>$4 $3 $2</span>\").replace(/#{id=(.+?),name=(.+?),identifier=(.+?),icon=((.|[\\t\\r\\f\\n\\s])+?)}/g, \"<span class=\\'comment-tag\\'>$4 $3 $2</span>\")",
"USERFIELDMAP" : "{\"id\":\"user_id\",\"name\":\"name\"}",
"USERURL" : "`projects/${context.project}/project_members/fetch_default`",
"QUOTEURL" : "`recents/fetch_recent_access`"
},
"editorStyle" : "COMMENT_PROJECT",
"editorType" : "HTMLEDITOR",
"name" : "field_text_dynamic",
"predefinedType" : "FIELD_TEXT_DYNAMIC",
"renderMode" : "TEXT_DYNAMIC",
"enableLinkView" : false
"getPSSysPFPlugin" : {
"pluginType" : "EDITOR_CUSTOMSTYLE",
"pluginCode" : "COMMENT",
"runtimeObject" : true
},
"predefinedType" : "FIELD_TEXT_DYNAMIC"
},
"getPSLayoutPos" : {
"grow" : 8,
......@@ -284,13 +301,18 @@
"showCaption" : true
}, {
"caption" : "图片",
"contentHeight" : 48.0,
"contentType" : "IMAGE",
"height" : 48.0,
"itemStyle" : "DEFAULT",
"itemType" : "RAWITEM",
"name" : "static_image",
"getPSLayoutPos" : {
"grow" : -1,
"layout" : "FLEX"
"height" : 48,
"heightMode" : "PX",
"layout" : "FLEX",
"shrink" : 0
},
"getPSRawItem" : {
"contentType" : "IMAGE",
......@@ -299,12 +321,14 @@
"glyph" : "xf18e@FontAwesome",
"cssClass" : "fa fa-arrow-circle-o-right"
},
"predefinedType" : "STATIC_IMAGE"
"predefinedType" : "STATIC_IMAGE",
"rawItemHeight" : 48.0
},
"getPSSysImage" : {
"glyph" : "xf18e@FontAwesome",
"cssClass" : "fa fa-arrow-circle-o-right"
},
"rawItemHeight" : 48.0,
"showCaption" : true
} ]
} ]
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSSYSAPP.json
浏览文件 @ 6c933e75
......@@ -2679,6 +2679,18 @@
},
"pluginCode" : "CLIP_BOARD_SPAN",
"styleCode" : "CLIP_BOARD_SPAN"
}, {
"codeName" : "COMMENT_PROJECT",
"containerType" : "PANELFIELD",
"editorType" : "HTMLEDITOR",
"name" : "HTML（评论）（项目）",
"getPSSysPFPlugin" : {
"pluginType" : "EDITOR_CUSTOMSTYLE",
"pluginCode" : "COMMENT",
"runtimeObject" : true
},
"pluginCode" : "COMMENT",
"styleCode" : "COMMENT_PROJECT"
}, {
"codeName" : "CRM_IMAGE_UPLOAD",
"containerType" : "PANELFIELD",
......@@ -6173,6 +6185,19 @@
"refTag" : "VIEWLAYOUTPANEL",
"refTag2" : "BUTTON",
"runtimeObject" : true
}, {
"name" : "HTML（评论）",
"getPSSysPFPlugin" : {
"pluginType" : "EDITOR_CUSTOMSTYLE",
"pluginCode" : "COMMENT",
"runtimeObject" : true
},
"pluginCode" : "COMMENT",
"pluginType" : "EDITOR_CUSTOMSTYLE",
"rTObjectName" : "IBizHtmlComment",
"rTObjectRepo" : "@ibiz-template-plm/html-comment@0.0.3-dev.59",
"refMode" : "EDITORSTYPE",
"runtimeObject" : true
}, {
"name" : "LuckySheet编辑",
"getPSSysPFPlugin" : {
......@@ -68589,11 +68614,28 @@
"itemType" : "FIELD",
"name" : "field_text_dynamic",
"getPSEditor" : {
"editorType" : "SPAN",
"editorParams" : {
"USERINSCRIPT" : "value.replaceAll(/\\@\\{\\\"(user)?id\\\":\\\"(.+?)\\\",\\\"name\\\":\\\"(.+?)\\\"\\}/g,(x, user, id, name) => {return controller.getNodeInfo({ id, name })}).replaceAll(/\\@\\{userid=(.+?),name=(.+?)\\}/g,(x, id, name) => {return controller.getNodeInfo({ id, name })})",
"QUOTECODELISTMAP" : "{\"type\":\"plmweb.base__recent_visite\"}",
"QUOTEFIELDMAP" : "{\"identifier\":\"show_identifier\",\"name\":\"name\",\"id\":\"id\",\"type\":\"owner_subtype\"}",
"QUOTEPARAMS" : "{\"page\":0,\"size\":20,\"sort\":\"update_time,desc\"}",
"QUOTEINSCRIPT" : "value.replaceAll(/\\#\\{\\\"id\\\":\\\"(.+?)\\\",\\\"name\\\":\\\"(.+?)\\\",\\\"identifier\\\":\\\"(.+?)\\\",\\\"icon\\\":\\\"((.|[\\t\\r\\f\\n\\s])+?)\\\"\\}/g,(x, id, name, identifier, icon) => {return controller.getNodeInfo({ id, name, identifier, icon })}).replaceAll(/\\#\\{id=(.+?),name=(.+?),identifier=(.+?),icon=((.|[\\t\\r\\f\\n\\s])+?)\\}/g,(x, id, name, identifier, icon) => {return controller.getNodeInfo({ id, name, identifier, icon })})",
"USERSCRIPT" : "`@{\"id\":\"${data.id}\",\"name\":\"${data.name}\"}`",
"QUOTESCRIPT" : "`#{\"id\":\"${data.id}\",\"name\":\"${data.name}\",\"identifier\":\"${data.identifier}\",\"icon\":\"${data.icon}\"}`",
"REPLYSCRIPT" : "value?.replace(/@{[^,]*,\"name\":\"(.*?)\"}/g,\"<span class=\\'comment-tag\\'>@$1</span>\").replace(/@{[^,]*,name=(.*?)}/g,\"<span class=\\'comment-tag\\'>@$1</span>\").replace(/#{\"id\":\"(.+?)\",\"name\":\"(.+?)\",\"identifier\":\"(.+?)\",\"icon\":\"((.|[\\t\\r\\f\\n\\s])+?)\"}/g, \"<span class=\\'comment-tag\\'>$4 $3 $2</span>\").replace(/#{id=(.+?),name=(.+?),identifier=(.+?),icon=((.|[\\t\\r\\f\\n\\s])+?)}/g, \"<span class=\\'comment-tag\\'>$4 $3 $2</span>\")",
"USERFIELDMAP" : "{\"id\":\"user_id\",\"name\":\"name\"}",
"USERURL" : "`projects/${context.project}/project_members/fetch_default`",
"QUOTEURL" : "`recents/fetch_recent_access`"
},
"editorStyle" : "COMMENT_PROJECT",
"editorType" : "HTMLEDITOR",
"name" : "field_text_dynamic",
"predefinedType" : "FIELD_TEXT_DYNAMIC",
"renderMode" : "TEXT_DYNAMIC",
"enableLinkView" : false
"getPSSysPFPlugin" : {
"pluginType" : "EDITOR_CUSTOMSTYLE",
"pluginCode" : "COMMENT",
"runtimeObject" : true
},
"predefinedType" : "FIELD_TEXT_DYNAMIC"
},
"getPSLayoutPos" : {
"grow" : 8,
......@@ -68659,13 +68701,18 @@
"showCaption" : true
}, {
"caption" : "图片",
"contentHeight" : 48.0,
"contentType" : "IMAGE",
"height" : 48.0,
"itemStyle" : "DEFAULT",
"itemType" : "RAWITEM",
"name" : "static_image",
"getPSLayoutPos" : {
"grow" : -1,
"layout" : "FLEX"
"height" : 48,
"heightMode" : "PX",
"layout" : "FLEX",
"shrink" : 0
},
"getPSRawItem" : {
"contentType" : "IMAGE",
......@@ -68674,12 +68721,14 @@
"glyph" : "xf18e@FontAwesome",
"cssClass" : "fa fa-arrow-circle-o-right"
},
"predefinedType" : "STATIC_IMAGE"
"predefinedType" : "STATIC_IMAGE",
"rawItemHeight" : 48.0
},
"getPSSysImage" : {
"glyph" : "xf18e@FontAwesome",
"cssClass" : "fa fa-arrow-circle-o-right"
},
"rawItemHeight" : 48.0,
"showCaption" : true
} ]
} ]
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSSYSAPP.simple.json
浏览文件 @ 6c933e75
......@@ -44,6 +44,19 @@
"refTag" : "VIEWLAYOUTPANEL",
"refTag2" : "BUTTON",
"runtimeObject" : true
}, {
"name" : "HTML（评论）",
"getPSSysPFPlugin" : {
"pluginType" : "EDITOR_CUSTOMSTYLE",
"pluginCode" : "COMMENT",
"runtimeObject" : true
},
"pluginCode" : "COMMENT",
"pluginType" : "EDITOR_CUSTOMSTYLE",
"rTObjectName" : "IBizHtmlComment",
"rTObjectRepo" : "@ibiz-template-plm/html-comment@0.0.3-dev.59",
"refMode" : "EDITORSTYPE",
"runtimeObject" : true
}, {
"name" : "LuckySheet编辑",
"getPSSysPFPlugin" : {
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSTEM.json
浏览文件 @ 6c933e75
......@@ -981,6 +981,20 @@
},
"styleCode" : "CUSTOMEDIT",
"replaceDefault" : false
}, {
"codeName" : "COMMENT_PROJECT",
"dynaModelFilePath" : "PSSYSEDITORSTYLES/COMMENT_PROJECT.json",
"editorHeight" : -1.0,
"editorType" : "HTMLEDITOR",
"editorWidth" : -1.0,
"name" : "HTML（评论）（项目）",
"getPSSysPFPlugin" : {
"pluginType" : "EDITOR_CUSTOMSTYLE",
"pluginCode" : "COMMENT",
"runtimeObject" : true
},
"styleCode" : "COMMENT_PROJECT",
"replaceDefault" : false
}, {
"codeName" : "LUCKYSHEET",
"dynaModelFilePath" : "PSSYSEDITORSTYLES/LUCKYSHEET.json",
......
trainsys-provider/pom.xml
浏览文件 @ 6c933e75
......@@ -33,7 +33,7 @@
<profiles>
<profile>
<id>runtime</id>
<id>trainsys</id>
<build>
<resources>
<resource>
......
trainsys-provider/src/main/docker/Dockerfile
浏览文件 @ 6c933e75
......@@ -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 8081
EXPOSE 50000
ADD trainsys-provider.jar /trainsys-provider.jar
trainsys-provider/src/main/docker/trainsys-provider-trainsys-k8s.yaml
浏览文件 @ 6c933e75
......@@ -22,7 +22,32 @@ spec:
image: registry.cn-shanghai.aliyuncs.com/ibizsys/trainsys-provider:latest
imagePullPolicy: Always
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
......@@ -35,9 +60,9 @@ spec:
type: NodePort
ports:
- name: http
port: 8081
targetPort: 8081
nodePort: 8081
port: 50000
targetPort: 50000
nodePort: 50000
protocol: TCP
selector:
app: trainsys-provider
......
trainsys-provider/src/main/docker/trainsys-provider-trainsys.yaml
浏览文件 @ 6c933e75
......@@ -3,9 +3,23 @@ services:
trainsys-provider:
image: registry.cn-shanghai.aliyuncs.com/ibizsys/trainsys-provider:latest
ports:
- "8081:8081"
- "50000:50000"
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 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或