提交 1ec2e705 编写于 作者: ibizdev's avatar ibizdev

xignzi006 部署微服务应用

上级 cd874362
......@@ -7,6 +7,33 @@
"appdedataset":"",
"items": []
},
{
"srfkey": "ContentType",
"emptytext": "未定义",
"codelisttype":"static",
"items": [
{
"id": "CONTENT",
"label": "内容",
"text": "内容",
"data":"",
"codename":"Content",
"value": "CONTENT",
"disabled": false
}
, {
"id": "LINK",
"label": "链接",
"text": "链接",
"data":"",
"codename":"Link",
"value": "LINK",
"disabled": false
}
]
},
{
"srfkey": "YesNo",
"emptytext": "未定义",
......
......@@ -2,6 +2,11 @@ export default {
SysOperator: {
"empty": "",
},
ContentType: {
"CONTENT": "内容",
"LINK": "链接",
"empty": ""
},
YesNo: {
"1": "是",
"0": "否",
......
......@@ -2,6 +2,11 @@ export default {
SysOperator: {
"empty": "",
},
ContentType: {
"CONTENT": "内容",
"LINK": "链接",
"empty": "",
},
YesNo: {
"1": "是",
"0": "否",
......
......@@ -101,33 +101,41 @@ export default {
},
},
editviewtoolbar_toolbar: {
deuiaction4: {
caption: "Edit",
tip: "Edit {0}",
tbitem3: {
caption: "Save",
tip: "Save",
},
tbitem4: {
caption: "Save And New",
tip: "Save And New",
},
seperator4: {
caption: "",
tbitem5: {
caption: "Save And Close",
tip: "Save And Close Window",
},
tbitem6: {
caption: "-",
tip: "",
},
deuiaction1: {
tbitem7: {
caption: "Remove And Close",
tip: "Remove And Close Window",
},
seperator2: {
caption: "",
tbitem8: {
caption: "-",
tip: "",
},
deuiaction2: {
caption: "刷新",
tip: "刷新",
tbitem12: {
caption: "New",
tip: "New",
},
seperator1: {
caption: "",
tbitem13: {
caption: "-",
tip: "",
},
tbitem12: {
caption: "关闭",
tip: "关闭",
tbitem14: {
caption: "Copy",
tip: "Copy {0}",
},
},
};
\ No newline at end of file
......@@ -100,33 +100,41 @@ export default {
},
},
editviewtoolbar_toolbar: {
deuiaction4: {
caption: "编辑",
tip: "编辑",
tbitem3: {
caption: "保存",
tip: "保存",
},
tbitem4: {
caption: "保存并新建",
tip: "保存并新建",
},
seperator4: {
caption: "",
tbitem5: {
caption: "保存并关闭",
tip: "保存并关闭",
},
tbitem6: {
caption: "-",
tip: "",
},
deuiaction1: {
tbitem7: {
caption: "删除并关闭",
tip: "删除并关闭",
},
seperator2: {
caption: "",
tbitem8: {
caption: "-",
tip: "",
},
deuiaction2: {
caption: "刷新",
tip: "刷新",
tbitem12: {
caption: "新建",
tip: "新建",
},
seperator1: {
caption: "",
tbitem13: {
caption: "-",
tip: "",
},
tbitem12: {
caption: "关闭",
tip: "关闭",
tbitem14: {
caption: "拷贝",
tip: "拷贝",
},
},
};
\ No newline at end of file
......@@ -75,33 +75,41 @@ export default {
},
},
editviewtoolbar_toolbar: {
deuiaction4: {
caption: "Edit",
tip: "Edit {0}",
tbitem3: {
caption: "Save",
tip: "Save",
},
tbitem4: {
caption: "Save And New",
tip: "Save And New",
},
seperator4: {
caption: "",
tbitem5: {
caption: "Save And Close",
tip: "Save And Close Window",
},
tbitem6: {
caption: "-",
tip: "",
},
deuiaction1: {
tbitem7: {
caption: "Remove And Close",
tip: "Remove And Close Window",
},
seperator2: {
caption: "",
tbitem8: {
caption: "-",
tip: "",
},
deuiaction2: {
caption: "刷新",
tip: "刷新",
tbitem12: {
caption: "New",
tip: "New",
},
seperator1: {
caption: "",
tbitem13: {
caption: "-",
tip: "",
},
tbitem12: {
caption: "关闭",
tip: "关闭",
tbitem14: {
caption: "Copy",
tip: "Copy {0}",
},
},
gridviewtoolbar_toolbar: {
......
......@@ -74,33 +74,41 @@ export default {
},
},
editviewtoolbar_toolbar: {
deuiaction4: {
caption: "编辑",
tip: "编辑",
tbitem3: {
caption: "保存",
tip: "保存",
},
tbitem4: {
caption: "保存并新建",
tip: "保存并新建",
},
seperator4: {
caption: "",
tbitem5: {
caption: "保存并关闭",
tip: "保存并关闭",
},
tbitem6: {
caption: "-",
tip: "",
},
deuiaction1: {
tbitem7: {
caption: "删除并关闭",
tip: "删除并关闭",
},
seperator2: {
caption: "",
tbitem8: {
caption: "-",
tip: "",
},
deuiaction2: {
caption: "刷新",
tip: "刷新",
tbitem12: {
caption: "新建",
tip: "新建",
},
seperator1: {
caption: "",
tbitem13: {
caption: "-",
tip: "",
},
tbitem12: {
caption: "关闭",
tip: "关闭",
tbitem14: {
caption: "拷贝",
tip: "拷贝",
},
},
gridviewtoolbar_toolbar: {
......
......@@ -87,33 +87,41 @@ export default {
},
},
editviewtoolbar_toolbar: {
deuiaction4: {
caption: "Edit",
tip: "Edit {0}",
tbitem3: {
caption: "Save",
tip: "Save",
},
tbitem4: {
caption: "Save And New",
tip: "Save And New",
},
seperator4: {
caption: "",
tbitem5: {
caption: "Save And Close",
tip: "Save And Close Window",
},
tbitem6: {
caption: "-",
tip: "",
},
deuiaction1: {
tbitem7: {
caption: "Remove And Close",
tip: "Remove And Close Window",
},
seperator2: {
caption: "",
tbitem8: {
caption: "-",
tip: "",
},
deuiaction2: {
caption: "刷新",
tip: "刷新",
tbitem12: {
caption: "New",
tip: "New",
},
seperator1: {
caption: "",
tbitem13: {
caption: "-",
tip: "",
},
tbitem12: {
caption: "关闭",
tip: "关闭",
tbitem14: {
caption: "Copy",
tip: "Copy {0}",
},
},
};
\ No newline at end of file
......@@ -86,33 +86,41 @@ export default {
},
},
editviewtoolbar_toolbar: {
deuiaction4: {
caption: "编辑",
tip: "编辑",
tbitem3: {
caption: "保存",
tip: "保存",
},
tbitem4: {
caption: "保存并新建",
tip: "保存并新建",
},
seperator4: {
caption: "",
tbitem5: {
caption: "保存并关闭",
tip: "保存并关闭",
},
tbitem6: {
caption: "-",
tip: "",
},
deuiaction1: {
tbitem7: {
caption: "删除并关闭",
tip: "删除并关闭",
},
seperator2: {
caption: "",
tbitem8: {
caption: "-",
tip: "",
},
deuiaction2: {
caption: "刷新",
tip: "刷新",
tbitem12: {
caption: "新建",
tip: "新建",
},
seperator1: {
caption: "",
tbitem13: {
caption: "-",
tip: "",
},
tbitem12: {
caption: "关闭",
tip: "关闭",
tbitem14: {
caption: "拷贝",
tip: "拷贝",
},
},
};
\ No newline at end of file
......@@ -67,33 +67,41 @@ export default {
},
},
editviewtoolbar_toolbar: {
deuiaction4: {
caption: "Edit",
tip: "Edit {0}",
tbitem3: {
caption: "Save",
tip: "Save",
},
tbitem4: {
caption: "Save And New",
tip: "Save And New",
},
seperator4: {
caption: "",
tbitem5: {
caption: "Save And Close",
tip: "Save And Close Window",
},
tbitem6: {
caption: "-",
tip: "",
},
deuiaction1: {
tbitem7: {
caption: "Remove And Close",
tip: "Remove And Close Window",
},
seperator2: {
caption: "",
tbitem8: {
caption: "-",
tip: "",
},
deuiaction2: {
caption: "刷新",
tip: "刷新",
tbitem12: {
caption: "New",
tip: "New",
},
seperator1: {
caption: "",
tbitem13: {
caption: "-",
tip: "",
},
tbitem12: {
caption: "关闭",
tip: "关闭",
tbitem14: {
caption: "Copy",
tip: "Copy {0}",
},
},
gridviewtoolbar_toolbar: {
......
......@@ -66,33 +66,41 @@ export default {
},
},
editviewtoolbar_toolbar: {
deuiaction4: {
caption: "编辑",
tip: "编辑",
tbitem3: {
caption: "保存",
tip: "保存",
},
tbitem4: {
caption: "保存并新建",
tip: "保存并新建",
},
seperator4: {
caption: "",
tbitem5: {
caption: "保存并关闭",
tip: "保存并关闭",
},
tbitem6: {
caption: "-",
tip: "",
},
deuiaction1: {
tbitem7: {
caption: "删除并关闭",
tip: "删除并关闭",
},
seperator2: {
caption: "",
tbitem8: {
caption: "-",
tip: "",
},
deuiaction2: {
caption: "刷新",
tip: "刷新",
tbitem12: {
caption: "新建",
tip: "新建",
},
seperator1: {
caption: "",
tbitem13: {
caption: "-",
tip: "",
},
tbitem12: {
caption: "关闭",
tip: "关闭",
tbitem14: {
caption: "拷贝",
tip: "拷贝",
},
},
gridviewtoolbar_toolbar: {
......
......@@ -15,6 +15,33 @@ mock.onGet('./assets/json/data-dictionary.json').reply((config: any) => {
"appdedataset":"",
"items": []
},
{
srfkey: "ContentType",
emptytext: "未定义",
"codelisttype":"static",
items: [
{
id: "CONTENT",
label: "内容",
text: "内容",
"data":"",
"codename":"Content",
value: "CONTENT",
disabled: false,
},
{
id: "LINK",
label: "链接",
text: "链接",
"data":"",
"codename":"Link",
value: "LINK",
disabled: false,
},
]
},
{
srfkey: "YesNo",
emptytext: "未定义",
......
......@@ -195,6 +195,14 @@ export class MainGridBase extends GridControllerBase {
*/
public async formatExcelData(filterVal: any, jsonData: any, codelistColumns?: any[]): Promise<any> {
return super.formatExcelData(filterVal, jsonData, [
{
name: 'contenttype',
srfkey: 'ContentType',
codelistType : 'STATIC',
renderMode: 'other',
textSeparator: '、',
valueSeparator: ',',
},
{
name: 'validflag',
srfkey: 'YesNo',
......
......@@ -79,7 +79,9 @@
</span>
</template>
<template v-slot="{row,column,$index}">
<span>{{row.contenttype}}</span>
<template >
<codelist :value="row.contenttype" tag='ContentType' codelistType='STATIC' ></codelist>
</template>
</template>
</el-table-column>
</template>
......
......@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
sleep ${IBIZ_SLEEP} && \
java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /businesscentral-app-crm.jar
EXPOSE 8080
EXPOSE 10324
ADD businesscentral-app-crm.jar /businesscentral-app-crm.jar
......@@ -3,9 +3,23 @@ services:
businesscentral-app-crm:
image: registry.cn-shanghai.aliyuncs.com/ibizsys/businesscentral-app-crm:latest
ports:
- "8080:8080"
- "10324:10324"
networks:
- agent_network
environment:
- SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.240.110
- SERVER_PORT=10324
- SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.240.110:8848
- SPRING_REDIS_HOST=172.16.240.110
- SPRING_REDIS_PORT=6379
- SPRING_REDIS_DATABASE=0
- SPRING_DATASOURCE_USERNAME=a_LAB01_e85d8801c
- SPRING_DATASOURCE_PASSWORD=b1@@@772
- SPRING_DATASOURCE_URL=jdbc:mysql://172.16.186.185:3306/a_LAB01_e85d8801c?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true
- SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
- SPRING_DATASOURCE_DEFAULTSCHEMA=a_LAB01_e85d8801c
- CAS=https://passport.ibizlab.cn
- NACOS=172.16.240.110:8848
deploy:
resources:
limits:
......
......@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
sleep ${IBIZ_SLEEP} && \
java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /businesscentral-app-website.jar
EXPOSE 8080
EXPOSE 10324
ADD businesscentral-app-website.jar /businesscentral-app-website.jar
......@@ -3,9 +3,23 @@ services:
businesscentral-app-website:
image: registry.cn-shanghai.aliyuncs.com/ibizsys/businesscentral-app-website:latest
ports:
- "8080:8080"
- "10324:10324"
networks:
- agent_network
environment:
- SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.240.110
- SERVER_PORT=10324
- SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.240.110:8848
- SPRING_REDIS_HOST=172.16.240.110
- SPRING_REDIS_PORT=6379
- SPRING_REDIS_DATABASE=0
- SPRING_DATASOURCE_USERNAME=a_LAB01_e85d8801c
- SPRING_DATASOURCE_PASSWORD=b1@@@772
- SPRING_DATASOURCE_URL=jdbc:mysql://172.16.186.185:3306/a_LAB01_e85d8801c?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true
- SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
- SPRING_DATASOURCE_DEFAULTSCHEMA=a_LAB01_e85d8801c
- CAS=https://passport.ibizlab.cn
- NACOS=172.16.240.110:8848
deploy:
resources:
limits:
......
......@@ -10853,7 +10853,7 @@
<!--输出实体[WEBSITE]数据结构 -->
<changeSet author="a_LAB01_e85d8801c" id="tab-website-21-128">
<changeSet author="a_LAB01_e85d8801c" id="tab-website-22-128">
<createTable tableName="WEBSITE">
<column name="WEBSITENAME" remarks="" type="VARCHAR(200)">
</column>
......@@ -10879,7 +10879,7 @@
<!--输出实体[WEBSITECHANNEL]数据结构 -->
<changeSet author="a_LAB01_e85d8801c" id="tab-websitechannel-30-129">
<changeSet author="a_LAB01_e85d8801c" id="tab-websitechannel-31-129">
<createTable tableName="WEBSITECHANNEL">
<column name="WEBSITECHANNELID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_WEBSITECHANNEL_WEBSITECHANN"/>
......@@ -10913,7 +10913,7 @@
<!--输出实体[WEBSITECONTENT]数据结构 -->
<changeSet author="a_LAB01_e85d8801c" id="tab-websitecontent-29-130">
<changeSet author="a_LAB01_e85d8801c" id="tab-websitecontent-31-130">
<createTable tableName="WEBSITECONTENT">
<column name="WEBSITECONTENTID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_WEBSITECONTENT_WEBSITECONTE"/>
......@@ -10957,7 +10957,7 @@
<!--输出实体[WEBSITERESOURCE]数据结构 -->
<changeSet author="a_LAB01_e85d8801c" id="tab-websiteresource-11-131">
<changeSet author="a_LAB01_e85d8801c" id="tab-websiteresource-12-131">
<createTable tableName="WEBSITERESOURCE">
<column name="WEBSITERESOURCEID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_WEBSITERESOURCE_WEBSITERESO"/>
......@@ -11904,21 +11904,21 @@
<!--输出实体[UOMSCHEDULE]外键关系 -->
<!--输出实体[WEBSITE]外键关系 -->
<!--输出实体[WEBSITECHANNEL]外键关系 -->
<changeSet author="a_LAB01_e85d8801c" id="fk-websitechannel-30-427">
<changeSet author="a_LAB01_e85d8801c" id="fk-websitechannel-31-427">
<addForeignKeyConstraint baseColumnNames="PWEBSITECHANNELID" baseTableName="WEBSITECHANNEL" constraintName="DER1N_WEBSITECHANNEL_WEBSITECH" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="WEBSITECHANNELID" referencedTableName="WEBSITECHANNEL" validate="true"/>
</changeSet>
<changeSet author="a_LAB01_e85d8801c" id="fk-websitechannel-30-428">
<changeSet author="a_LAB01_e85d8801c" id="fk-websitechannel-31-428">
<addForeignKeyConstraint baseColumnNames="WEBSITEID" baseTableName="WEBSITECHANNEL" constraintName="DER1N_WEBSITECHANNEL_WEBSITE_W" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="WEBSITEID" referencedTableName="WEBSITE" validate="true"/>
</changeSet>
<!--输出实体[WEBSITECONTENT]外键关系 -->
<changeSet author="a_LAB01_e85d8801c" id="fk-websitecontent-29-429">
<changeSet author="a_LAB01_e85d8801c" id="fk-websitecontent-31-429">
<addForeignKeyConstraint baseColumnNames="WEBSITECHANNELID" baseTableName="WEBSITECONTENT" constraintName="DER1N_WEBSITECONTENT_WEBSITECH" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="WEBSITECHANNELID" referencedTableName="WEBSITECHANNEL" validate="true"/>
</changeSet>
<changeSet author="a_LAB01_e85d8801c" id="fk-websitecontent-29-430">
<changeSet author="a_LAB01_e85d8801c" id="fk-websitecontent-31-430">
<addForeignKeyConstraint baseColumnNames="WEBSITEID" baseTableName="WEBSITECONTENT" constraintName="DER1N_WEBSITECONTENT_WEBSITE_W" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="WEBSITEID" referencedTableName="WEBSITE" validate="true"/>
</changeSet>
<!--输出实体[WEBSITERESOURCE]外键关系 -->
<changeSet author="a_LAB01_e85d8801c" id="fk-websiteresource-11-431">
<changeSet author="a_LAB01_e85d8801c" id="fk-websiteresource-12-431">
<addForeignKeyConstraint baseColumnNames="WEBSITEID" baseTableName="WEBSITERESOURCE" constraintName="DER1N_WEBSITERESOURCE_WEBSITE_" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="WEBSITEID" referencedTableName="WEBSITE" validate="true"/>
</changeSet>
......
......@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
sleep ${IBIZ_SLEEP} && \
java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /businesscentral-provider-centralapi.jar
EXPOSE 10310
EXPOSE 8081
ADD businesscentral-provider-centralapi.jar /businesscentral-provider-centralapi.jar
......@@ -3,23 +3,9 @@ services:
businesscentral-provider-centralapi:
image: registry.cn-shanghai.aliyuncs.com/ibizsys/businesscentral-provider-centralapi:latest
ports:
- "10310:10310"
- "8081:8081"
networks:
- agent_network
environment:
- SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.240.110
- SERVER_PORT=10310
- SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.240.110:8848
- SPRING_REDIS_HOST=172.16.240.110
- SPRING_REDIS_PORT=6379
- SPRING_REDIS_DATABASE=0
- SPRING_DATASOURCE_USERNAME=a_LAB01_e85d8801c
- SPRING_DATASOURCE_PASSWORD=b1@@@772
- SPRING_DATASOURCE_URL=jdbc:mysql://172.16.186.185:3306/a_LAB01_e85d8801c?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true
- SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
- SPRING_DATASOURCE_DEFAULTSCHEMA=a_LAB01_e85d8801c
- CAS=https://passport.ibizlab.cn
- NACOS=172.16.240.110:8848
deploy:
resources:
limits:
......
......@@ -37,11 +37,11 @@
git clone -b master $para2 ibizbusinesscentral/
export NODE_OPTIONS=--max-old-space-size=4096
cd ibizbusinesscentral/
mvn clean package -Pcentralapi
cd businesscentral-provider/businesscentral-provider-centralapi
mvn -Pcentralapi docker:build
mvn -Pcentralapi docker:push
docker -H $para1 stack deploy --compose-file=src/main/docker/businesscentral-provider-centralapi.yaml iBizEE --with-registry-auth
mvn clean package -Pwebsite
cd businesscentral-app/businesscentral-app-website
mvn -Pwebsite docker:build
mvn -Pwebsite docker:push
docker -H $para1 stack deploy --compose-file=src/main/docker/businesscentral-app-website.yaml iBizEE --with-registry-auth
</command>
</hudson.tasks.Shell>
</builders>
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册