⚡ 修改心跳检测时间.
This commit is contained in:
@@ -19,9 +19,9 @@ services:
|
|||||||
- ${VOLUME_BASE:-/data/orion-visor-space/docker-volumes}/service/root-orion:/root/orion
|
- ${VOLUME_BASE:-/data/orion-visor-space/docker-volumes}/service/root-orion:/root/orion
|
||||||
healthcheck:
|
healthcheck:
|
||||||
test: [ "CMD", "curl", "http://127.0.0.1:9200/orion-visor/api/server/bootstrap/health" ]
|
test: [ "CMD", "curl", "http://127.0.0.1:9200/orion-visor/api/server/bootstrap/health" ]
|
||||||
interval: 3s
|
interval: 15s
|
||||||
timeout: 300s
|
timeout: 300s
|
||||||
retries: 200
|
retries: 15
|
||||||
start_period: 3s
|
start_period: 3s
|
||||||
depends_on:
|
depends_on:
|
||||||
mysql:
|
mysql:
|
||||||
@@ -47,9 +47,9 @@ services:
|
|||||||
- ${VOLUME_BASE:-/data/orion-visor-space/docker-volumes}/mysql/etc-mysql:/etc/mysql
|
- ${VOLUME_BASE:-/data/orion-visor-space/docker-volumes}/mysql/etc-mysql:/etc/mysql
|
||||||
healthcheck:
|
healthcheck:
|
||||||
test: [ "CMD", "bash", "-c", "cat < /dev/null > /dev/tcp/127.0.0.1/3306" ]
|
test: [ "CMD", "bash", "-c", "cat < /dev/null > /dev/tcp/127.0.0.1/3306" ]
|
||||||
interval: 3s
|
interval: 15s
|
||||||
timeout: 60s
|
timeout: 60s
|
||||||
retries: 10
|
retries: 15
|
||||||
start_period: 3s
|
start_period: 3s
|
||||||
redis:
|
redis:
|
||||||
image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-redis:2.1.3
|
image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-redis:2.1.3
|
||||||
@@ -63,9 +63,9 @@ services:
|
|||||||
command: sh -c "redis-server /usr/local/redis.conf --requirepass $${REDIS_PASSWORD}"
|
command: sh -c "redis-server /usr/local/redis.conf --requirepass $${REDIS_PASSWORD}"
|
||||||
healthcheck:
|
healthcheck:
|
||||||
test: [ "CMD", "redis-cli", "--raw", "incr", "ping" ]
|
test: [ "CMD", "redis-cli", "--raw", "incr", "ping" ]
|
||||||
interval: 3s
|
interval: 15s
|
||||||
timeout: 60s
|
timeout: 60s
|
||||||
retries: 10
|
retries: 15
|
||||||
start_period: 3s
|
start_period: 3s
|
||||||
adminer:
|
adminer:
|
||||||
image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-adminer:2.1.3
|
image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-adminer:2.1.3
|
||||||
|
|||||||
@@ -29,7 +29,7 @@ server {
|
|||||||
location /orion-visor/api {
|
location /orion-visor/api {
|
||||||
proxy_pass http://localhost:9200/orion-visor/api;
|
proxy_pass http://localhost:9200/orion-visor/api;
|
||||||
proxy_set_header Host $host;
|
proxy_set_header Host $host;
|
||||||
proxy_set_header X-Real-IP $remote_addr;
|
proxy_set_header X-Real-IP $remote_addr;
|
||||||
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||||
proxy_set_header X-Forwarded-Proto $scheme;
|
proxy_set_header X-Forwarded-Proto $scheme;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ package com.orion.visor.framework.mybatis.core.generator.core;
|
|||||||
import com.alibaba.fastjson.JSON;
|
import com.alibaba.fastjson.JSON;
|
||||||
import com.baomidou.mybatisplus.generator.config.po.TableField;
|
import com.baomidou.mybatisplus.generator.config.po.TableField;
|
||||||
import com.baomidou.mybatisplus.generator.config.po.TableInfo;
|
import com.baomidou.mybatisplus.generator.config.po.TableInfo;
|
||||||
|
import com.orion.lang.utils.Exceptions;
|
||||||
import com.orion.lang.utils.Strings;
|
import com.orion.lang.utils.Strings;
|
||||||
import com.orion.visor.framework.common.constant.Const;
|
import com.orion.visor.framework.common.constant.Const;
|
||||||
import com.orion.visor.framework.common.constant.FieldConst;
|
import com.orion.visor.framework.common.constant.FieldConst;
|
||||||
@@ -47,7 +48,7 @@ public class DictParser {
|
|||||||
.stream()
|
.stream()
|
||||||
.filter(s -> variable.equals(s.getName()) || variable.equals(s.getPropertyName()))
|
.filter(s -> variable.equals(s.getName()) || variable.equals(s.getPropertyName()))
|
||||||
.findFirst()
|
.findFirst()
|
||||||
.orElseThrow(() -> new RuntimeException("未查询到字典映射字段 " + variable));
|
.orElseThrow(() -> Exceptions.runtime("未查询到字典映射字段 " + variable));
|
||||||
// 设置字段名称
|
// 设置字段名称
|
||||||
if (meta.getField() == null) {
|
if (meta.getField() == null) {
|
||||||
meta.setField(Strings.firstUpper(tableField.getPropertyName()));
|
meta.setField(Strings.firstUpper(tableField.getPropertyName()));
|
||||||
|
|||||||
@@ -249,7 +249,7 @@
|
|||||||
width: 100%;
|
width: 100%;
|
||||||
height: calc(100% - @ssh-header-height);
|
height: calc(100% - @ssh-header-height);
|
||||||
position: relative;
|
position: relative;
|
||||||
padding: 8px 2px 2px 8px;
|
padding: 8px 4px 4px 8px;
|
||||||
|
|
||||||
.ssh-inst {
|
.ssh-inst {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
|
|||||||
Reference in New Issue
Block a user