diff --git a/docker-compose.yml b/docker-compose.yml
index 1d957cc2..56c809f3 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -4,7 +4,7 @@ services:
build:
context: .
dockerfile: docker/orion-ops-pro/Dockerfile
- image: orion-ops-pro:1.0.0
+ image: orion-ops-pro:1.0.0-beta.1
ports:
- 1081:80
environment:
@@ -12,7 +12,8 @@ services:
- MYSQL_HOST=orion-ops-pro-db
- MYSQL_USER=orion
- MYSQL_PASSWORD=Data@123456
- - SECRET_KEY=secret-key
+ - REDIS_PASSWORD=Data@123456
+ - SECRET_KEY=uQeacXV8b3isvKLK
volumes:
- /data/orion-ops-pro-space/docker-volumes/orion-ops-pro/logs:/root/orion/logs/orion-ops-pro
depends_on:
diff --git a/docker/orion-ops-pro/Dockerfile b/docker/orion-ops-pro/Dockerfile
index d16a5c53..a2c11c17 100644
--- a/docker/orion-ops-pro/Dockerfile
+++ b/docker/orion-ops-pro/Dockerfile
@@ -10,6 +10,6 @@ RUN rm -rf /etc/nginx/conf.d/*
WORKDIR /app
COPY orion-ops-launch/target/orion-ops-launch.jar /app/app.jar
COPY orion-ops-ui/dist /usr/share/nginx/html
-ADD docker/orion-ops-pro/entrypoint.sh /app/entrypoint.sh
-ADD docker/orion-ops-pro/nginx.conf /etc/nginx/conf.d
+COPY docker/orion-ops-pro/entrypoint.sh /app/entrypoint.sh
+COPY docker/orion-ops-pro/nginx.conf /etc/nginx/conf.d
ENTRYPOINT [ "sh", "/app/entrypoint.sh" ]
diff --git a/docker/orion-ops-pro/nginx.conf b/docker/orion-ops-pro/nginx.conf
index cd23ac2f..91f5de58 100644
--- a/docker/orion-ops-pro/nginx.conf
+++ b/docker/orion-ops-pro/nginx.conf
@@ -1,6 +1,7 @@
server {
listen 80;
server_name localhost;
+ client_max_body_size 1024m;
# 是否启动 gzip 压缩
gzip on;
diff --git a/orion-ops-dependencies/pom.xml b/orion-ops-dependencies/pom.xml
index 38473e11..2bbd6c61 100644
--- a/orion-ops-dependencies/pom.xml
+++ b/orion-ops-dependencies/pom.xml
@@ -14,7 +14,7 @@
https://github.com/lijiahangmax/orion-ops-pro
- 1.0.0
+ 1.0.0-beta.1
2.7.17
2.7.15
1.5.0
diff --git a/orion-ops-framework/orion-ops-framework-common/src/main/java/com/orion/ops/framework/common/constant/OrionOpsProConst.java b/orion-ops-framework/orion-ops-framework-common/src/main/java/com/orion/ops/framework/common/constant/OrionOpsProConst.java
index fe7e37e6..e127afca 100644
--- a/orion-ops-framework/orion-ops-framework-common/src/main/java/com/orion/ops/framework/common/constant/OrionOpsProConst.java
+++ b/orion-ops-framework/orion-ops-framework-common/src/main/java/com/orion/ops/framework/common/constant/OrionOpsProConst.java
@@ -12,7 +12,7 @@ public interface OrionOpsProConst {
/**
* 同 ${orion.version} 迭代时候需要手动更改
*/
- String VERSION = "1.0.0";
+ String VERSION = "1.0.0-beta.1";
String GITHUB = "https://github.com/lijiahangmax/orion-ops-pro";
diff --git a/orion-ops-launch/src/main/resources/application-prod.yaml b/orion-ops-launch/src/main/resources/application-prod.yaml
index 4f4ace5f..00859bdc 100644
--- a/orion-ops-launch/src/main/resources/application-prod.yaml
+++ b/orion-ops-launch/src/main/resources/application-prod.yaml
@@ -1,7 +1,7 @@
spring:
datasource:
druid:
- url: jdbc:mysql://${MYSQL_HOST:127.0.0.1}:3306/orion-ops-pro?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowPublicKeyRetrieval=true&useSSL=false&serverTimezone=Asia/Shanghai&autoReconnect=true
+ url: jdbc:mysql://${MYSQL_HOST:127.0.0.1}:${MYSQL_PORT:3306}/orion-ops-pro?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowPublicKeyRetrieval=true&useSSL=false&serverTimezone=Asia/Shanghai&autoReconnect=true
username: ${MYSQL_USER:root}
password: ${MYSQL_PASSWORD:Data@123456}
# 初始连接数
diff --git a/orion-ops-launch/src/main/resources/application.yaml b/orion-ops-launch/src/main/resources/application.yaml
index a160aba2..21611fbd 100644
--- a/orion-ops-launch/src/main/resources/application.yaml
+++ b/orion-ops-launch/src/main/resources/application.yaml
@@ -14,7 +14,7 @@ spring:
multipart:
# 单个文件大小
max-file-size: 16MB
- # 设置总上传的文件大小
+ # 消息体大小
max-request-size: 32MB
mvc:
pathmatch:
diff --git a/orion-ops-ui/package.json b/orion-ops-ui/package.json
index 12a9d4d8..baa0f632 100644
--- a/orion-ops-ui/package.json
+++ b/orion-ops-ui/package.json
@@ -1,7 +1,7 @@
{
"name": "orion-ops-pro-ui",
"description": "Orion Ops Pro for Vue",
- "version": "1.0.0",
+ "version": "1.0.0-beta.1",
"private": true,
"author": "Jiahang Li",
"license": "Apache 2.0",
diff --git a/orion-ops-ui/src/views/host/terminal/handler/sftp-transfer-uploader.ts b/orion-ops-ui/src/views/host/terminal/handler/sftp-transfer-uploader.ts
index 93e75cd7..32f38947 100644
--- a/orion-ops-ui/src/views/host/terminal/handler/sftp-transfer-uploader.ts
+++ b/orion-ops-ui/src/views/host/terminal/handler/sftp-transfer-uploader.ts
@@ -2,7 +2,8 @@ import type { ISftpTransferUploader, SftpTransferItem } from '../types/terminal.
import { TransferOperatorType, TransferStatus } from '../types/terminal.const';
import { getPath } from '@/utils/file';
-export const BLOCK_SIZE = 1024 * 1024;
+// 512 KB
+export const BLOCK_SIZE = 512 * 1024;
// sftp 上传器实现
export default class SftpTransferUploader implements ISftpTransferUploader {
diff --git a/pom.xml b/pom.xml
index 3bdfad5e..db5fcb8e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
- 1.0.0
+ 1.0.0-beta.1
8
8
3.0.0-M5