Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
提交反馈
为 GitLab 提交贡献
登录
切换导航
I
iBiz企业中心
项目
项目
详情
动态
版本
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
iBiz企业套件
iBiz企业中心
提交
1ec2e705
提交
1ec2e705
编写于
7月 06, 2020
作者:
ibizdev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
xignzi006 部署微服务应用
上级
cd874362
变更
27
展开全部
显示空白字符变更
内嵌
并排
正在显示
27 个修改的文件
包含
1789 行增加
和
381 行删除
+1789
-381
data-dictionary.json
app_WebSite/public/assets/json/data-dictionary.json
+27
-0
codelist_en_US.ts
app_WebSite/src/locale/lanres/codelist/codelist_en_US.ts
+5
-0
codelist_zh_CN.ts
app_WebSite/src/locale/lanres/codelist/codelist_zh_CN.ts
+5
-0
web-site-channel_en_US.ts
...anres/entities/web-site-channel/web-site-channel_en_US.ts
+24
-16
web-site-channel_zh_CN.ts
...anres/entities/web-site-channel/web-site-channel_zh_CN.ts
+24
-16
web-site-content_en_US.ts
...anres/entities/web-site-content/web-site-content_en_US.ts
+24
-16
web-site-content_zh_CN.ts
...anres/entities/web-site-content/web-site-content_zh_CN.ts
+24
-16
web-site-resource_en_US.ts
...res/entities/web-site-resource/web-site-resource_en_US.ts
+24
-16
web-site-resource_zh_CN.ts
...res/entities/web-site-resource/web-site-resource_zh_CN.ts
+24
-16
web-site_en_US.ts
...ite/src/locale/lanres/entities/web-site/web-site_en_US.ts
+24
-16
web-site_zh_CN.ts
...ite/src/locale/lanres/entities/web-site/web-site_zh_CN.ts
+24
-16
codelist.ts
app_WebSite/src/mock/codelist/codelist.ts
+27
-0
web-site-channel-edit-view-base.tsx
...ite-channel-edit-view/web-site-channel-edit-view-base.tsx
+356
-42
web-site-content-edit-view-base.tsx
...ite-content-edit-view/web-site-content-edit-view-base.tsx
+356
-42
web-site-edit-view-base.tsx
...s/web-site/web-site-edit-view/web-site-edit-view-base.tsx
+356
-42
web-site-resource-edit-view-base.tsx
...e-resource-edit-view/web-site-resource-edit-view-base.tsx
+356
-42
web-site-service-base.ts
app_WebSite/src/service/web-site/web-site-service-base.ts
+50
-50
main-grid-base.tsx
...src/widgets/web-site-content/main-grid/main-grid-base.tsx
+8
-0
main-grid.html
...ite/src/widgets/web-site-content/main-grid/main-grid.html
+3
-1
Dockerfile
...al-app/businesscentral-app-crm/src/main/docker/Dockerfile
+1
-1
businesscentral-app-crm.yaml
...tral-app-crm/src/main/docker/businesscentral-app-crm.yaml
+15
-1
Dockerfile
...pp/businesscentral-app-website/src/main/docker/Dockerfile
+1
-1
businesscentral-app-website.yaml
...-website/src/main/docker/businesscentral-app-website.yaml
+15
-1
h2_table.xml
...esscentral-core/src/main/resources/liquibase/h2_table.xml
+9
-9
Dockerfile
...esscentral-provider-centralapi/src/main/docker/Dockerfile
+1
-1
businesscentral-provider-centralapi.yaml
.../src/main/docker/businesscentral-provider-centralapi.yaml
+1
-15
config.xml
config.xml
+5
-5
未找到文件。
app_WebSite/public/assets/json/data-dictionary.json
浏览文件 @
1ec2e705
...
...
@@ -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"
:
"未定义"
,
...
...
app_WebSite/src/locale/lanres/codelist/codelist_en_US.ts
浏览文件 @
1ec2e705
...
...
@@ -2,6 +2,11 @@ export default {
SysOperator
:
{
"empty"
:
""
,
},
ContentType
:
{
"CONTENT"
:
"内容"
,
"LINK"
:
"链接"
,
"empty"
:
""
},
YesNo
:
{
"1"
:
"是"
,
"0"
:
"否"
,
...
...
app_WebSite/src/locale/lanres/codelist/codelist_zh_CN.ts
浏览文件 @
1ec2e705
...
...
@@ -2,6 +2,11 @@ export default {
SysOperator
:
{
"empty"
:
""
,
},
ContentType
:
{
"CONTENT"
:
"内容"
,
"LINK"
:
"链接"
,
"empty"
:
""
,
},
YesNo
:
{
"1"
:
"是"
,
"0"
:
"否"
,
...
...
app_WebSite/src/locale/lanres/entities/web-site-channel/web-site-channel_en_US.ts
浏览文件 @
1ec2e705
...
...
@@ -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
:
""
,
},
deuiaction
2
:
{
caption
:
"
刷新
"
,
tip
:
"
刷新
"
,
tbitem1
2
:
{
caption
:
"
New
"
,
tip
:
"
New
"
,
},
seperator1
:
{
caption
:
""
,
tbitem13
:
{
caption
:
"
-
"
,
tip
:
""
,
},
tbitem1
2
:
{
caption
:
"
关闭
"
,
tip
:
"
关闭
"
,
tbitem1
4
:
{
caption
:
"
Copy
"
,
tip
:
"
Copy {0}
"
,
},
},
};
\ No newline at end of file
app_WebSite/src/locale/lanres/entities/web-site-channel/web-site-channel_zh_CN.ts
浏览文件 @
1ec2e705
...
...
@@ -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
:
""
,
},
deuiaction
2
:
{
caption
:
"
刷新
"
,
tip
:
"
刷新
"
,
tbitem1
2
:
{
caption
:
"
新建
"
,
tip
:
"
新建
"
,
},
seperator1
:
{
caption
:
""
,
tbitem13
:
{
caption
:
"
-
"
,
tip
:
""
,
},
tbitem1
2
:
{
caption
:
"
关闭
"
,
tip
:
"
关闭
"
,
tbitem1
4
:
{
caption
:
"
拷贝
"
,
tip
:
"
拷贝
"
,
},
},
};
\ No newline at end of file
app_WebSite/src/locale/lanres/entities/web-site-content/web-site-content_en_US.ts
浏览文件 @
1ec2e705
...
...
@@ -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
:
""
,
},
deuiaction
2
:
{
caption
:
"
刷新
"
,
tip
:
"
刷新
"
,
tbitem1
2
:
{
caption
:
"
New
"
,
tip
:
"
New
"
,
},
seperator1
:
{
caption
:
""
,
tbitem13
:
{
caption
:
"
-
"
,
tip
:
""
,
},
tbitem1
2
:
{
caption
:
"
关闭
"
,
tip
:
"
关闭
"
,
tbitem1
4
:
{
caption
:
"
Copy
"
,
tip
:
"
Copy {0}
"
,
},
},
gridviewtoolbar_toolbar
:
{
...
...
app_WebSite/src/locale/lanres/entities/web-site-content/web-site-content_zh_CN.ts
浏览文件 @
1ec2e705
...
...
@@ -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
:
""
,
},
deuiaction
2
:
{
caption
:
"
刷新
"
,
tip
:
"
刷新
"
,
tbitem1
2
:
{
caption
:
"
新建
"
,
tip
:
"
新建
"
,
},
seperator1
:
{
caption
:
""
,
tbitem13
:
{
caption
:
"
-
"
,
tip
:
""
,
},
tbitem1
2
:
{
caption
:
"
关闭
"
,
tip
:
"
关闭
"
,
tbitem1
4
:
{
caption
:
"
拷贝
"
,
tip
:
"
拷贝
"
,
},
},
gridviewtoolbar_toolbar
:
{
...
...
app_WebSite/src/locale/lanres/entities/web-site-resource/web-site-resource_en_US.ts
浏览文件 @
1ec2e705
...
...
@@ -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
:
""
,
},
deuiaction
2
:
{
caption
:
"
刷新
"
,
tip
:
"
刷新
"
,
tbitem1
2
:
{
caption
:
"
New
"
,
tip
:
"
New
"
,
},
seperator1
:
{
caption
:
""
,
tbitem13
:
{
caption
:
"
-
"
,
tip
:
""
,
},
tbitem1
2
:
{
caption
:
"
关闭
"
,
tip
:
"
关闭
"
,
tbitem1
4
:
{
caption
:
"
Copy
"
,
tip
:
"
Copy {0}
"
,
},
},
};
\ No newline at end of file
app_WebSite/src/locale/lanres/entities/web-site-resource/web-site-resource_zh_CN.ts
浏览文件 @
1ec2e705
...
...
@@ -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
:
""
,
},
deuiaction
2
:
{
caption
:
"
刷新
"
,
tip
:
"
刷新
"
,
tbitem1
2
:
{
caption
:
"
新建
"
,
tip
:
"
新建
"
,
},
seperator1
:
{
caption
:
""
,
tbitem13
:
{
caption
:
"
-
"
,
tip
:
""
,
},
tbitem1
2
:
{
caption
:
"
关闭
"
,
tip
:
"
关闭
"
,
tbitem1
4
:
{
caption
:
"
拷贝
"
,
tip
:
"
拷贝
"
,
},
},
};
\ No newline at end of file
app_WebSite/src/locale/lanres/entities/web-site/web-site_en_US.ts
浏览文件 @
1ec2e705
...
...
@@ -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
:
""
,
},
deuiaction
2
:
{
caption
:
"
刷新
"
,
tip
:
"
刷新
"
,
tbitem1
2
:
{
caption
:
"
New
"
,
tip
:
"
New
"
,
},
seperator1
:
{
caption
:
""
,
tbitem13
:
{
caption
:
"
-
"
,
tip
:
""
,
},
tbitem1
2
:
{
caption
:
"
关闭
"
,
tip
:
"
关闭
"
,
tbitem1
4
:
{
caption
:
"
Copy
"
,
tip
:
"
Copy {0}
"
,
},
},
gridviewtoolbar_toolbar
:
{
...
...
app_WebSite/src/locale/lanres/entities/web-site/web-site_zh_CN.ts
浏览文件 @
1ec2e705
...
...
@@ -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
:
""
,
},
deuiaction
2
:
{
caption
:
"
刷新
"
,
tip
:
"
刷新
"
,
tbitem1
2
:
{
caption
:
"
新建
"
,
tip
:
"
新建
"
,
},
seperator1
:
{
caption
:
""
,
tbitem13
:
{
caption
:
"
-
"
,
tip
:
""
,
},
tbitem1
2
:
{
caption
:
"
关闭
"
,
tip
:
"
关闭
"
,
tbitem1
4
:
{
caption
:
"
拷贝
"
,
tip
:
"
拷贝
"
,
},
},
gridviewtoolbar_toolbar
:
{
...
...
app_WebSite/src/mock/codelist/codelist.ts
浏览文件 @
1ec2e705
...
...
@@ -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
:
"未定义"
,
...
...
app_WebSite/src/pages/web-site/web-site-channel-edit-view/web-site-channel-edit-view-base.tsx
浏览文件 @
1ec2e705
此差异已折叠。
点击以展开。
app_WebSite/src/pages/web-site/web-site-content-edit-view/web-site-content-edit-view-base.tsx
浏览文件 @
1ec2e705
此差异已折叠。
点击以展开。
app_WebSite/src/pages/web-site/web-site-edit-view/web-site-edit-view-base.tsx
浏览文件 @
1ec2e705
此差异已折叠。
点击以展开。
app_WebSite/src/pages/web-site/web-site-resource-edit-view/web-site-resource-edit-view-base.tsx
浏览文件 @
1ec2e705
此差异已折叠。
点击以展开。
app_WebSite/src/service/web-site/web-site-service-base.ts
浏览文件 @
1ec2e705
此差异已折叠。
点击以展开。
app_WebSite/src/widgets/web-site-content/main-grid/main-grid-base.tsx
浏览文件 @
1ec2e705
...
...
@@ -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'
,
...
...
app_WebSite/src/widgets/web-site-content/main-grid/main-grid.html
浏览文件 @
1ec2e705
...
...
@@ -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>
...
...
businesscentral-app/businesscentral-app-crm/src/main/docker/Dockerfile
浏览文件 @
1ec2e705
...
...
@@ -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
businesscentral-app/businesscentral-app-crm/src/main/docker/businesscentral-app-crm.yaml
浏览文件 @
1ec2e705
...
...
@@ -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
:
...
...
businesscentral-app/businesscentral-app-website/src/main/docker/Dockerfile
浏览文件 @
1ec2e705
...
...
@@ -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
businesscentral-app/businesscentral-app-website/src/main/docker/businesscentral-app-website.yaml
浏览文件 @
1ec2e705
...
...
@@ -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
:
...
...
businesscentral-core/src/main/resources/liquibase/h2_table.xml
浏览文件 @
1ec2e705
...
...
@@ -10853,7 +10853,7 @@
<!--输出实体[WEBSITE]数据结构 -->
<changeSet
author=
"a_LAB01_e85d8801c"
id=
"tab-website-2
1
-128"
>
<changeSet
author=
"a_LAB01_e85d8801c"
id=
"tab-website-2
2
-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-3
0
-129"
>
<changeSet
author=
"a_LAB01_e85d8801c"
id=
"tab-websitechannel-3
1
-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-1
1
-131"
>
<changeSet
author=
"a_LAB01_e85d8801c"
id=
"tab-websiteresource-1
2
-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-3
0
-427"
>
<changeSet
author=
"a_LAB01_e85d8801c"
id=
"fk-websitechannel-3
1
-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-3
0
-428"
>
<changeSet
author=
"a_LAB01_e85d8801c"
id=
"fk-websitechannel-3
1
-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-1
1
-431"
>
<changeSet
author=
"a_LAB01_e85d8801c"
id=
"fk-websiteresource-1
2
-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>
...
...
businesscentral-provider/businesscentral-provider-centralapi/src/main/docker/Dockerfile
浏览文件 @
1ec2e705
...
...
@@ -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
businesscentral-provider/businesscentral-provider-centralapi/src/main/docker/businesscentral-provider-centralapi.yaml
浏览文件 @
1ec2e705
...
...
@@ -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
:
...
...
config.xml
浏览文件 @
1ec2e705
...
...
@@ -37,11 +37,11 @@
git clone -b master $para2 ibizbusinesscentral/
export NODE_OPTIONS=--max-old-space-size=4096
cd ibizbusinesscentral/
mvn clean package -P
centralapi
cd businesscentral-
provider/businesscentral-provider-centralapi
mvn -P
centralapi
docker:build
mvn -P
centralapi
docker:push
docker -H $para1 stack deploy --compose-file=src/main/docker/businesscentral-
provider-centralapi.yaml iBizEE --with-registry-auth
mvn clean package -P
website
cd businesscentral-
app/businesscentral-app-website
mvn -P
website
docker:build
mvn -P
website
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
人
到此讨论。请谨慎行事。
先完成此消息的编辑!
取消
想要评论请
注册
或
登录