diff --git a/jnpf-java-boot/jnpf-admin/src/main/resources/application-dev.yml b/jnpf-java-boot/jnpf-admin/src/main/resources/application-dev.yml index 5dd44cc..578443d 100644 --- a/jnpf-java-boot/jnpf-admin/src/main/resources/application-dev.yml +++ b/jnpf-java-boot/jnpf-admin/src/main/resources/application-dev.yml @@ -70,9 +70,9 @@ spring: # redis单机模式 redis: database: 1 #缓存库编号 - host: 127.0.0.1 + host: 222.71.165.188 port: 6379 -# password: 123456 # 密码为空时,请将本行注释 + password: qweasd,.123 # 密码为空时,请将本行注释 timeout: 3000 #超时时间(单位:秒) lettuce: #Lettuce为Redis的Java驱动包 pool: diff --git a/jnpf-java-boot/jnpf-web/src/views/onlineDev/integrate/log/Detail.vue b/jnpf-java-boot/jnpf-web/src/views/onlineDev/integrate/log/Detail.vue new file mode 100644 index 0000000..3c364c0 --- /dev/null +++ b/jnpf-java-boot/jnpf-web/src/views/onlineDev/integrate/log/Detail.vue @@ -0,0 +1,209 @@ + + + + + + + + {{ item.nodeName }} + + + + + + + {{ item.endTime|toDate('yyyy-MM-dd HH:mm') }} + + + + + + {{ activeItem.nodeName }} + + 去修改节点 + + {{ redoNodesLoading ? '正在修复中...' : '节点重试' }} + + + + 开始时间:{{ activeItem.startTime|toDate('yyyy-MM-dd HH:mm') }} + 结束时间:{{ activeItem.endTime|toDate('yyyy-MM-dd HH:mm') }} + + + 输入 + 错误 + + + + + + + + + + \ No newline at end of file diff --git a/jnpf-java-boot/jnpf-web/src/views/onlineDev/integrate/log/index.vue b/jnpf-java-boot/jnpf-web/src/views/onlineDev/integrate/log/index.vue new file mode 100644 index 0000000..3cc8b0a --- /dev/null +++ b/jnpf-java-boot/jnpf-web/src/views/onlineDev/integrate/log/index.vue @@ -0,0 +1,235 @@ + + + + + + + {{$t('common.cancelButton')}} + + + + + + + + + + + + + + + + + + + + + + {{$t('common.search')}} + {{$t('common.reset')}} + + + + + + + + + + {{ scope.row.processId }}{{' '}} + 重试{{' '}} + + + 原实例ID:{{ scope.row.parentId }}原实例执行时间:{{ scope.row.parentTime|toDate('yyyy-MM-dd HH:mm')}} + + + + + + {{ scope.row.processId }} + + + + + + {{scope.row.resultType==1?'成功':'失败'}} + + + + + + + 详情 + + 删除 + + 重试 + + + + + + + + + + + + \ No newline at end of file