Skip to content

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

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

上级 aaad0f6f
展开全部 隐藏空白字符变更
内嵌 并排
正在显示 包含 1343 行增加 和 60 行删除
config.xml
浏览文件 @ a64d1322
......@@ -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/PSMODULES/common/PSDATAENTITIES/Phone.json
浏览文件 @ a64d1322
......@@ -3255,6 +3255,12 @@
"name" : "手机实体树视图",
"realModelSubType" : "DETREEVIEW",
"realModelType" : "PSDEVIEWBASE"
}, {
"codeName" : "Usr08214390EditView",
"logicName" : "分割面板",
"name" : "分割面板",
"realModelSubType" : "DEEDITVIEW",
"realModelType" : "PSDEVIEWBASE"
}, {
"codeName" : "TreeView9",
"logicName" : "手机实体树视图（部件视图）",
......@@ -3342,6 +3348,13 @@
"name" : "ex_x3",
"realModelSubType" : "EDITFORM",
"realModelType" : "PSDEFORM"
}, {
"codeName" : "Usr08214390EditView_Form",
"logicName" : "分割面板_表单",
"modelTag2" : "0",
"name" : "分割面板_表单",
"realModelSubType" : "EDITFORM",
"realModelType" : "PSDEFORM"
} ],
"codeName" : "Phone",
"dEType" : 1,
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/TemplatePublish/PSSYSAPP.json
浏览文件 @ a64d1322
......@@ -1279,16 +1279,16 @@
"codeName" : "VMGroup2",
"name" : "视图消息组2",
"getPSAppViewMsgGroupDetails" : [ {
"name" : "视图消息2",
"name" : "视图消息",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg3"
"id" : "ViewMsg2"
}
}, {
"name" : "视图消息",
"name" : "视图消息2",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg2"
"id" : "ViewMsg3"
}
} ]
}, {
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Phone.json
浏览文件 @ a64d1322
......@@ -2529,6 +2529,10 @@
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/phoneEditView.json",
"viewType" : "DEEDITVIEW"
}, {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/phoneUsr08214390EditView.json",
"viewType" : "DEEDITVIEW"
}, {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/phoneUsr0505414736PickupTreeView.json",
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPINDEXVIEWS/AppIndex.json
浏览文件 @ a64d1322
......@@ -2147,6 +2147,47 @@
},
"tooltip" : "测试隐藏项",
"hidden" : true
}, {
"accUserMode" : 0,
"caption" : "分割面板",
"itemType" : "MENUITEM",
"name" : "menuitem100",
"getPSAppMenuItems" : [ {
"accUserMode" : 2,
"caption" : "水平",
"itemType" : "MENUITEM",
"name" : "menuitem101",
"getPSAppFunc" : {
"modelref" : true,
"id" : "UsrAppFunc0821315325"
},
"getPSLayout" : {
"childColLG" : -1,
"childColMD" : 24,
"childColSM" : -1,
"childColXS" : -1,
"columnCount" : 24,
"layout" : "TABLE_24COL"
},
"getPSLayoutPos" : {
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"tooltip" : "水平"
} ],
"getPSLayout" : {
"childColLG" : -1,
"childColMD" : 24,
"childColSM" : -1,
"childColXS" : -1,
"columnCount" : 24,
"layout" : "TABLE_24COL"
},
"getPSLayoutPos" : {
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"tooltip" : "分割面板"
} ],
"getPSControlHandler" : {
"enableDEFieldPrivilege" : false,
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPMENUS/AppIndex.json
浏览文件 @ a64d1322
......@@ -945,6 +945,23 @@
"name" : "menuitem83",
"tooltip" : "测试隐藏项",
"hidden" : true
}, {
"accUserMode" : 0,
"caption" : "分割面板",
"itemType" : "MENUITEM",
"name" : "menuitem100",
"getPSAppMenuItems" : [ {
"accUserMode" : 2,
"caption" : "水平",
"itemType" : "MENUITEM",
"name" : "menuitem101",
"getPSAppFunc" : {
"modelref" : true,
"id" : "UsrAppFunc0821315325"
},
"tooltip" : "水平"
} ],
"tooltip" : "分割面板"
} ],
"enableCustomize" : false,
"name" : "appindex",
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSSYSAPP.json
浏览文件 @ a64d1322
......@@ -2371,6 +2371,16 @@
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/bookBookEditViewEditorTest.json",
"viewType" : "DEEDITVIEW"
}
}, {
"appFuncType" : "APPVIEW",
"codeName" : "UsrAppFunc0821315325",
"name" : "功能名称",
"openMode" : "INDEXVIEWTAB",
"getPSAppView" : {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/phoneUsr08214390EditView.json",
"viewType" : "DEEDITVIEW"
}
}, {
"appFuncType" : "APPVIEW",
"codeName" : "UsrAppFunc0804536999",
......@@ -3014,16 +3024,16 @@
"codeName" : "VMGroup2",
"name" : "视图消息组2",
"getPSAppViewMsgGroupDetails" : [ {
"name" : "视图消息2",
"name" : "视图消息",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg3"
"id" : "ViewMsg2"
}
}, {
"name" : "视图消息",
"name" : "视图消息2",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg2"
"id" : "ViewMsg3"
}
} ]
} ],
......@@ -3721,6 +3731,12 @@
"viewType" : "DEEDITVIEW",
"resource" : "SysRole",
"view" : "EditView"
}, {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/phoneUsr08214390EditView.json",
"viewType" : "DEEDITVIEW",
"resource" : "Phone",
"view" : "Usr08214390EditView"
}, {
"modelref" : true,
"path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/TESTEditView3_modal.json",
......@@ -6697,6 +6713,47 @@
},
"tooltip" : "测试隐藏项",
"hidden" : true
}, {
"accUserMode" : 0,
"caption" : "分割面板",
"itemType" : "MENUITEM",
"name" : "menuitem100",
"getPSAppMenuItems" : [ {
"accUserMode" : 2,
"caption" : "水平",
"itemType" : "MENUITEM",
"name" : "menuitem101",
"getPSAppFunc" : {
"modelref" : true,
"id" : "UsrAppFunc0821315325"
},
"getPSLayout" : {
"childColLG" : -1,
"childColMD" : 24,
"childColSM" : -1,
"childColXS" : -1,
"columnCount" : 24,
"layout" : "TABLE_24COL"
},
"getPSLayoutPos" : {
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"tooltip" : "水平"
} ],
"getPSLayout" : {
"childColLG" : -1,
"childColMD" : 24,
"childColSM" : -1,
"childColXS" : -1,
"columnCount" : 24,
"layout" : "TABLE_24COL"
},
"getPSLayoutPos" : {
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"tooltip" : "分割面板"
} ],
"getPSControlHandler" : {
"enableDEFieldPrivilege" : false,
......
trainsys-provider/pom.xml
浏览文件 @ a64d1322
......@@ -33,7 +33,7 @@
<profiles>
<profile>
<id>trainsys</id>
<id>runtime</id>
<build>
<resources>
<resource>
......
trainsys-provider/src/main/docker/Dockerfile
浏览文件 @ a64d1322
......@@ -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
浏览文件 @ a64d1322
......@@ -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
浏览文件 @ a64d1322
......@@ -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 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或