Skip to content

I
ibztask
提交 d4508683 编写于 作者: ibizdev's avatar ibizdev
浏览文件
操作

ibiz4j 部署微服务应用

上级 120911a2
显示空白字符变更
内嵌 并排
正在显示 包含 83 行增加 和 83 行删除
app_web/src/locale/lang/en-US.ts
浏览文件 @ d4508683
......@@ -62,9 +62,9 @@ export default {
},
menus: {
taskindexview: {
menuitem3: '注册',
menuitem1: '任务',
menuitem2: '任务调度日志',
menuitem3: '任务注册',
menuitem2: '日志',
},
},
},
......
app_web/src/locale/lang/zh-CN.ts
浏览文件 @ d4508683
......@@ -62,9 +62,9 @@ export default {
},
menus: {
taskindexview: {
menuitem3: '注册',
menuitem1: '任务',
menuitem2: '任务调度日志',
menuitem3: '任务注册',
menuitem2: '日志',
},
},
},
......
app_web/src/mock/app/task-index-view-appmenu/task-index-view-appmenu.ts
浏览文件 @ d4508683
......@@ -11,57 +11,57 @@ mock.onGet('v7/task-index-viewappmenu').reply((config: any) => {
name: 'appmenu',
items: [
{
id: 'B1156652-77DE-48DA-8E60-86D3D70685BE',
name: 'menuitem1',
text: '任务',
id: '535929B8-1901-4DD5-8402-6C4156AFBBC8',
name: 'menuitem3',
text: '注册',
type: 'MENUITEM',
counterid: '',
tooltip: '任务',
tooltip: '注册',
expanded: false,
separator: false,
hidden: false,
hidesidebar: false,
opendefault: false,
iconcls: 'fa fa-tasks',
iconcls: 'fa fa-gear',
icon: '',
textcls: '',
appfunctag: '_4',
appfunctag: '_2',
resourcetag: '',
},
{
id: '0A22F1FE-2628-45EE-B1BD-EA50A4E87157',
name: 'menuitem2',
text: '任务调度日志',
id: 'B1156652-77DE-48DA-8E60-86D3D70685BE',
name: 'menuitem1',
text: '任务',
type: 'MENUITEM',
counterid: '',
tooltip: '任务调度日志',
tooltip: '任务',
expanded: false,
separator: false,
hidden: false,
hidesidebar: false,
opendefault: false,
iconcls: 'fa fa-align-justify',
iconcls: 'fa fa-tasks',
icon: '',
textcls: '',
appfunctag: '_3',
appfunctag: '_4',
resourcetag: '',
},
{
id: '535929B8-1901-4DD5-8402-6C4156AFBBC8',
name: 'menuitem3',
text: '任务注册',
id: '0A22F1FE-2628-45EE-B1BD-EA50A4E87157',
name: 'menuitem2',
text: '日志',
type: 'MENUITEM',
counterid: '',
tooltip: '任务注册',
tooltip: '日志',
expanded: false,
separator: false,
hidden: false,
hidesidebar: false,
opendefault: false,
iconcls: 'fa fa-gear',
iconcls: 'fa fa-align-justify',
icon: '',
textcls: '',
appfunctag: '_2',
appfunctag: '_3',
resourcetag: '',
},
],
......
app_web/src/widgets/app/task-index-view-appmenu/task-index-view-appmenu-base.vue
浏览文件 @ d4508683
......@@ -581,12 +581,12 @@ export default class TaskIndexViewBase extends Vue implements ControlInterface {
case '_4':
this.click_4(item);
return;
case '_2':
this.click_2(item);
return;
case '_3':
this.click_3(item);
return;
case '_2':
this.click_2(item);
return;
default:
console.warn('未指定应用功能');
}
......@@ -618,17 +618,17 @@ export default class TaskIndexViewBase extends Vue implements ControlInterface {
}
/**
* 任务注册
* 任务调度日志
*
* @param {*} [item={}]
* @memberof TaskIndexView
*/
public click_2(item: any = {}) {
public click_3(item: any = {}) {
const viewparam: any = {};
Object.assign(viewparam, {});
const deResParameters: any[] = [];
const parameters: any[] = [
{ pathName: 'jobsregistries', parameterName: 'jobsregistry' },
{ pathName: 'jobslogs', parameterName: 'jobslog' },
{ pathName: 'gridview', parameterName: 'gridview' },
];
const path: string = this.$viewTool.buildUpRoutePath(this.$route, {}, deResParameters, parameters, [], viewparam);
......@@ -641,17 +641,17 @@ export default class TaskIndexViewBase extends Vue implements ControlInterface {
}
/**
* 任务调度日志
* 任务注册
*
* @param {*} [item={}]
* @memberof TaskIndexView
*/
public click_3(item: any = {}) {
public click_2(item: any = {}) {
const viewparam: any = {};
Object.assign(viewparam, {});
const deResParameters: any[] = [];
const parameters: any[] = [
{ pathName: 'jobslogs', parameterName: 'jobslog' },
{ pathName: 'jobsregistries', parameterName: 'jobsregistry' },
{ pathName: 'gridview', parameterName: 'gridview' },
];
const path: string = this.$viewTool.buildUpRoutePath(this.$route, {}, deResParameters, parameters, [], viewparam);
......
app_web/src/widgets/app/task-index-view-appmenu/task-index-view-appmenu-model.ts
浏览文件 @ d4508683
......@@ -15,61 +15,61 @@ export default class TaskIndexViewModel {
*/
public items: any[] = [
{
id: 'B1156652-77DE-48DA-8E60-86D3D70685BE',
name: 'menuitem1',
text: '任务',
id: '535929B8-1901-4DD5-8402-6C4156AFBBC8',
name: 'menuitem3',
text: '注册',
type: 'MENUITEM',
counterid: '',
tooltip: '任务',
tooltip: '注册',
expanded: false,
separator: false,
hidden: false,
hidesidebar: false,
opendefault: false,
iconcls: 'fa fa-tasks',
iconcls: 'fa fa-gear',
icon: '',
textcls: '',
appfunctag: '_4',
appfunctag: '_2',
resourcetag: '',
authtag:'web-TaskIndexView-menuitem1',
authtag:'web-TaskIndexView-menuitem3',
},
{
id: '0A22F1FE-2628-45EE-B1BD-EA50A4E87157',
name: 'menuitem2',
text: '任务调度日志',
id: 'B1156652-77DE-48DA-8E60-86D3D70685BE',
name: 'menuitem1',
text: '任务',
type: 'MENUITEM',
counterid: '',
tooltip: '任务调度日志',
tooltip: '任务',
expanded: false,
separator: false,
hidden: false,
hidesidebar: false,
opendefault: false,
iconcls: 'fa fa-align-justify',
iconcls: 'fa fa-tasks',
icon: '',
textcls: '',
appfunctag: '_3',
appfunctag: '_4',
resourcetag: '',
authtag:'web-TaskIndexView-menuitem2',
authtag:'web-TaskIndexView-menuitem1',
},
{
id: '535929B8-1901-4DD5-8402-6C4156AFBBC8',
name: 'menuitem3',
text: '任务注册',
id: '0A22F1FE-2628-45EE-B1BD-EA50A4E87157',
name: 'menuitem2',
text: '日志',
type: 'MENUITEM',
counterid: '',
tooltip: '任务注册',
tooltip: '日志',
expanded: false,
separator: false,
hidden: false,
hidesidebar: false,
opendefault: false,
iconcls: 'fa fa-gear',
iconcls: 'fa fa-align-justify',
icon: '',
textcls: '',
appfunctag: '_2',
appfunctag: '_3',
resourcetag: '',
authtag:'web-TaskIndexView-menuitem3',
authtag:'web-TaskIndexView-menuitem2',
},
];
......@@ -94,26 +94,26 @@ export default class TaskIndexViewModel {
],
},
{
appfunctag: '_2',
appfunctag: '_3',
appfuncyype: 'APPVIEW',
openmode: '',
codename: 'jobsregistrygridview',
codename: 'jobsloggridview',
deResParameters: [],
routepath: '/taskindexview/:taskindexview?/jobsregistries/:jobsregistry?/gridview/:gridview?',
routepath: '/taskindexview/:taskindexview?/jobslogs/:jobslog?/gridview/:gridview?',
parameters: [
{ pathName: 'jobsregistries', parameterName: 'jobsregistry' },
{ pathName: 'jobslogs', parameterName: 'jobslog' },
{ pathName: 'gridview', parameterName: 'gridview' },
],
},
{
appfunctag: '_3',
appfunctag: '_2',
appfuncyype: 'APPVIEW',
openmode: '',
codename: 'jobsloggridview',
codename: 'jobsregistrygridview',
deResParameters: [],
routepath: '/taskindexview/:taskindexview?/jobslogs/:jobslog?/gridview/:gridview?',
routepath: '/taskindexview/:taskindexview?/jobsregistries/:jobsregistry?/gridview/:gridview?',
parameters: [
{ pathName: 'jobslogs', parameterName: 'jobslog' },
{ pathName: 'jobsregistries', parameterName: 'jobsregistry' },
{ pathName: 'gridview', parameterName: 'gridview' },
],
},
......
config.xml
浏览文件 @ d4508683
......@@ -37,11 +37,11 @@
git clone -b master $para2 ibztask/
export NODE_OPTIONS=--max-old-space-size=4096
cd ibztask/
mvn clean package -Papi
cd ibztask-provider/ibztask-provider-api
mvn -Papi docker:build
mvn -Papi docker:push
docker -H $para1 stack deploy --compose-file=src/main/docker/ibztask-provider-api.yaml ibzlab-rt --with-registry-auth
mvn clean package -Pweb
cd ibztask-app/ibztask-app-web
mvn -Pweb docker:build
mvn -Pweb docker:push
docker -H $para1 stack deploy --compose-file=src/main/docker/ibztask-app-web.yaml ibzlab-rt --with-registry-auth
</command>
</hudson.tasks.Shell>
</builders>
......
ibztask-app/ibztask-app-web/src/main/docker/Dockerfile
浏览文件 @ d4508683
......@@ -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 /ibztask-app-web.jar
EXPOSE 8080
EXPOSE 30005
ADD ibztask-app-web.jar /ibztask-app-web.jar
ibztask-app/ibztask-app-web/src/main/docker/ibztask-app-web.yaml
浏览文件 @ d4508683
......@@ -3,9 +3,22 @@ services:
ibztask-app-web:
image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibztask-app-web:latest
ports:
- "8080:8080"
- "30005:30005"
networks:
- agent_network
environment:
- SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.180.237
- SERVER_PORT=30005
- SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.102.211:8848
- SPRING_REDIS_HOST=172.16.100.243
- SPRING_REDIS_PORT=6379
- SPRING_REDIS_DATABASE=0
- SPRING_DATASOURCE_USERNAME=a_A_5d9d78509
- SPRING_DATASOURCE_PASSWORD=@6dEfb3@
- SPRING_DATASOURCE_URL=jdbc:mysql://172.16.180.232:3306/a_A_5d9d78509?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true
- SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
- SPRING_DATASOURCE_DEFAULTSCHEMA=a_A_5d9d78509
- NACOS=172.16.102.211:8848
deploy:
resources:
limits:
......
ibztask-core/src/main/resources/permission/systemResource.json
浏览文件 @ d4508683
......@@ -41,7 +41,7 @@
{
"appid":"web",
"appname":"任务调度",
"appmenu":[{"menuid":"TaskIndexView", "menuname":"TaskIndexView", "menuitem":[{ "id":"menuitem1" , "name":"任务" },{ "id":"menuitem2" , "name":"任务调度日志" },{ "id":"menuitem3" , "name":"任务注册" }] }]
"appmenu":[{"menuid":"TaskIndexView", "menuname":"TaskIndexView", "menuitem":[{ "id":"menuitem3" , "name":"注册" },{ "id":"menuitem1" , "name":"任务" },{ "id":"menuitem2" , "name":"日志" }] }]
}
]
}
ibztask-provider/ibztask-provider-api/src/main/docker/Dockerfile
浏览文件 @ d4508683
......@@ -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 /ibztask-provider-api.jar
EXPOSE 40005
EXPOSE 8081
ADD ibztask-provider-api.jar /ibztask-provider-api.jar
ibztask-provider/ibztask-provider-api/src/main/docker/ibztask-provider-api.yaml
浏览文件 @ d4508683
......@@ -3,22 +3,9 @@ services:
ibztask-provider-api:
image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibztask-provider-api:latest
ports:
- "40005:40005"
- "8081:8081"
networks:
- agent_network
environment:
- SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.180.237
- SERVER_PORT=40005
- SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.102.211:8848
- SPRING_REDIS_HOST=172.16.100.243
- SPRING_REDIS_PORT=6379
- SPRING_REDIS_DATABASE=0
- SPRING_DATASOURCE_USERNAME=a_A_5d9d78509
- SPRING_DATASOURCE_PASSWORD=@6dEfb3@
- SPRING_DATASOURCE_URL=jdbc:mysql://172.16.180.232:3306/a_A_5d9d78509?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true
- SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
- SPRING_DATASOURCE_DEFAULTSCHEMA=a_A_5d9d78509
- NACOS=172.16.102.211:8848
deploy:
resources:
limits:
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或