🐳 添加 docker 配置.

docker-compose.yml

@@ -35,11 +35,6 @@ services:
       - /data/orion-ops-pro-space/docker-volumes/mysql/var-lib-mysql-files:/var/lib/mysql-files
       - /data/orion-ops-pro-space/docker-volumes/mysql/etc-mysql:/etc/mysql
     image: orion-ops-pro-db:8.0
-  orion-adminer:
-    image: adminer
-    restart: always
-    ports:
-      - 8081:8080
   orion-ops-pro-redis:
     image: redis:6.0.16-alpine
     command: redis-server --requirepass Data@123456
@@ -48,6 +43,7 @@ services:
     volumes:
       - /data/orion-ops-pro-space/docker-volumes/redis/var-lib-mysql:/etc/redis
       - /data/orion-ops-pro-space/docker-volumes/redis/data:/data
-
-
-:
+  orion-ops-pro-adminer:
+    image: adminer
+    ports:
+      - 8081:8080

docker/mysql/my.cnf

@@ -23,3 +23,7 @@ collation_server=utf8mb4_general_ci
 default-storage-engine=InnoDB 
 # 禁止 DNS 解析
 skip-name-resolve
+# 默认加密方式
+default_authentication_plugin=mysql_native_password
+# sql模式
+sql_mode=STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION

docker/orion-ops-pro/Dockerfile

@@ -1,5 +1,10 @@
 FROM nginx:alpine
 USER root
+RUN \
+  echo "" > /etc/apk/repositories && \
+  echo "http://mirrors.aliyun.com/alpine/v3.8/main" >> /etc/apk/repositories &&\
+  echo "http://mirrors.aliyun.com/alpine/v3.8/community" >> /etc/apk/repositories && \
+  apk update
 RUN apk add openjdk8
 RUN rm -rf /etc/nginx/conf.d/*
 WORKDIR /app

docker/orion-ops-pro/entrypoint.sh

@@ -1,4 +1,4 @@
 #!/bin/bash
-nginx
 cd /app
-java -jar app.jar --spring.profiles.active=prod
+nohup java -jar app.jar --spring.profiles.active=prod 2>&1 &
+nginx -g 'daemon off;'

orion-ops-launch/src/main/resources/application-dev.yaml

@@ -1,7 +1,7 @@
 spring:
   datasource:
     druid:
-      url: jdbc:mysql://127.0.0.1:3306/orion-ops-pro?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=Asia/Shanghai&autoReconnect=true
+      url: jdbc:mysql://127.0.0.1:3306/orion-ops-pro?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowPublicKeyRetrieval=true&useSSL=false&serverTimezone=Asia/Shanghai&autoReconnect=true
       username: root
       password: Data@123456
       initial-size: 0

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&useSSL=false&serverTimezone=Asia/Shanghai&autoReconnect=true
+      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
       username: ${MYSQL_USER:root}
       password: ${MYSQL_PASSWORD:Data@123456}
       # 初始连接数

orion-ops-ui/components.d.ts

@@ -3,13 +3,13 @@
 // @ts-nocheck
 // Generated by unplugin-vue-components
 // Read more: https://github.com/vuejs/core/pull/3399
-import '@vue/runtime-core';
+import '@vue/runtime-core'
 
-export {};
+export {}
 
 declare module '@vue/runtime-core' {
   export interface GlobalComponents {
-    RouterLink: typeof import('vue-router')['RouterLink'];
-    RouterView: typeof import('vue-router')['RouterView'];
+    RouterLink: typeof import('vue-router')['RouterLink']
+    RouterView: typeof import('vue-router')['RouterView']
   }
 }

orion-ops-ui/src/views/host/terminal/components/sftp/sftp-chmod-modal.vue

@@ -66,8 +66,8 @@
   });
 
   // 修改预览
-  const updatePreview = (v: number) => {
-    formModel.value.permission = permission10toString(v);
+  const updatePreview = (v: number|undefined) => {
+    formModel.value.permission = permission10toString(v as number);
   };
 
   // 打开新增

orion-ops-ui/src/views/host/terminal/components/transfer/transfer-drawer.vue

@@ -6,7 +6,7 @@
             :footer="false">
     <a-spin class="full" :loading="loading">
       <a-list class="hosts-list-container"
-              size="smail"
+              size="small"
               max-height="100%"
               :hoverable="true"
               :bordered="false"
@@ -153,6 +153,10 @@
   @item-right-width: 42px;
   @item-center-width: 388px - @item-left-width - @item-right-width;
 
+  :deep(.transfer-item-wrapper) {
+    padding: 0 !important;
+  }
+
   .transfer-item {
     min-height: 36px;
     padding: 8px 0;