🔖 升级版本.

2024-09-27 10:21:17 +08:00
parent 541a9790ad
commit 2a6537c604
15 changed files with 20 additions and 58 deletions
--- a/docker-compose-testing.yml
+++ b/docker-compose-testing.yml
@@ -1,7 +1,7 @@
 version: '3.3'
 services:
  service:
-    image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-service:2.1.6
+    image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-service:2.1.7
    privileged: true
    ports:
      - 1081:80
@@ -32,7 +32,7 @@ services:
      - mysql
      - redis
  mysql:
-    image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-mysql:2.1.6
+    image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-mysql:2.1.7
    privileged: true
    ports:
      - 3307:3306
@@ -52,7 +52,7 @@ services:
      retries: 10
      start_period: 3s
  redis:
-    image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-redis:2.1.6
+    image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-redis:2.1.7
    privileged: true
    ports:
      - 6380:6379
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '3.3'
 services:
  service:
-    image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-service:2.1.6
+    image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-service:2.1.7
    privileged: true
    ports:
      - ${SERVICE_PORT:-1081}:80
@@ -32,7 +32,7 @@ services:
      - mysql
      - redis
  mysql:
-    image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-mysql:2.1.6
+    image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-mysql:2.1.7
    privileged: true
    ports:
      - 3307:3306
@@ -52,7 +52,7 @@ services:
      retries: 15
      start_period: 3s
  redis:
-    image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-redis:2.1.6
+    image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-redis:2.1.7
    privileged: true
    ports:
      - 6380:6379
@@ -68,7 +68,7 @@ services:
      retries: 15
      start_period: 3s
  adminer:
-    image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-adminer:2.1.6
+    image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-adminer:2.1.7
    ports:
      - 8081:8080
    depends_on:
--- a/docker/adminer/build.sh
+++ b/docker/adminer/build.sh
@@ -1,4 +1,4 @@
 #/bin/bash
-version=2.1.6
+version=2.1.7
 docker build -t orion-visor-adminer:${version} .
 docker tag orion-visor-adminer:${version} registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-adminer:${version}
--- a/docker/mysql/build.sh
+++ b/docker/mysql/build.sh
@@ -1,5 +1,5 @@
 #/bin/bash
-version=2.1.6
+version=2.1.7
 cp -r ../../sql ./sql
 docker build -t orion-visor-mysql:${version} .
 rm -rf ./sql
--- a/docker/push.sh
+++ b/docker/push.sh
@@ -1,5 +1,5 @@
 #/bin/bash
-version=2.1.6
+version=2.1.7
 docker push registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-adminer:${version}
 docker push registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-mysql:${version}
 docker push registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-redis:${version}
--- a/docker/redis/build.sh
+++ b/docker/redis/build.sh
@@ -1,4 +1,4 @@
 #/bin/bash
-version=2.1.6
+version=2.1.7
 docker build -t orion-visor-redis:${version} .
 docker tag orion-visor-redis:${version} registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-redis:${version}
--- a/docker/service/build.sh
+++ b/docker/service/build.sh
@@ -1,5 +1,5 @@
 #/bin/bash
-version=2.1.6
+version=2.1.7
 mv ../../orion-visor-launch/target/orion-visor-launch.jar ./orion-visor-launch.jar
 mv ../../orion-visor-ui/dist ./dist
 docker build -t orion-visor-service:${version} .
--- a/orion-visor-dependencies/pom.xml
+++ b/orion-visor-dependencies/pom.xml
@@ -14,7 +14,7 @@
    <url>https://github.com/dromara/orion-visor</url>

    <properties>
-        <revision>2.1.6</revision>
+        <revision>2.1.7</revision>
        <spring.boot.version>2.7.17</spring.boot.version>
        <spring.boot.admin.version>2.7.15</spring.boot.admin.version>
        <flatten.maven.plugin.version>1.5.0</flatten.maven.plugin.version>
--- a/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/utils/Mixes.java
+++ b/orion-visor-framework/orion-visor-framework-common/src/main/java/com/orion/visor/framework/common/utils/Mixes.java
@@ -1,38 +0,0 @@
-package com.orion.visor.framework.common.utils;
-
-import com.orion.lang.utils.Arrays1;
-import com.orion.lang.utils.crypto.Caesars;
-
-/**
- * 混淆工具类
- *
- * @author Jiahang Li
- * @version 1.0.0
- * @since 2024/6/17 18:27
- */
-public class Mixes {
-
-    private Mixes() {
-    }
-
-    /**
-     * 混淆
-     * <p>
-     * 此方法不可修改
-     *
-     * @param str str
-     * @return str
-     */
-    public static String obfuscate(String str) {
-        char[] chars = str.toCharArray();
-        Arrays1.reverse(chars);
-        for (int i = 0; i < chars.length; i += 2) {
-            char temp = chars[i];
-            chars[i] = chars[i + 1];
-            chars[i + 1] = temp;
-        }
-        String res = new String(chars);
-        return new Caesars().encrypt(res);
-    }
-
-}
--- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/define/operator/UploadTaskOperatorType.java
+++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/define/operator/UploadTaskOperatorType.java
@@ -28,7 +28,7 @@ public class UploadTaskOperatorType extends InitializingOperatorTypes {
    @Override
    public OperatorType[] types() {
        return new OperatorType[]{
-                new OperatorType(M, UPLOAD, "批量上传文件 <sb>${count}</sb>个 (${name})"),
+                new OperatorType(M, UPLOAD, "批量上传文件 <sb>${count}</sb> 个 (${name})"),
                new OperatorType(M, CANCEL, "取消上传文件 <sb>${name}</sb>"),
                new OperatorType(H, DELETE, "删除上传记录 <sb>${count}</sb>条"),
                new OperatorType(H, CLEAR, "清理上传记录 <sb>${count}</sb>条"),
--- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/impl/SystemSettingServiceImpl.java
+++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/service/impl/SystemSettingServiceImpl.java
@@ -4,10 +4,10 @@ import com.orion.ext.process.ProcessAwaitExecutor;
 import com.orion.lang.support.Attempt;
 import com.orion.lang.utils.Arrays1;
 import com.orion.lang.utils.Strings;
+import com.orion.lang.utils.crypto.Signatures;
 import com.orion.lang.utils.io.Streams;
 import com.orion.visor.framework.common.constant.AppConst;
 import com.orion.visor.framework.common.constant.Const;
-import com.orion.visor.framework.common.utils.Mixes;
 import com.orion.visor.module.infra.entity.vo.AppInfoVO;
 import com.orion.visor.module.infra.service.SystemSettingService;
 import org.springframework.stereotype.Service;
@@ -70,7 +70,7 @@ public class SystemSettingServiceImpl implements SystemSettingService {
                if (!Strings.isBlank(extraUuid)) {
                    uuid = extraUuid.trim();
                }
-                return this.uuid = Mixes.obfuscate(uuid);
+                return this.uuid = Signatures.md5(uuid);
            } catch (Exception e) {
                // IGNORED
            }
--- a/orion-visor-ui/.env.development
+++ b/orion-visor-ui/.env.development
@@ -1,6 +1,6 @@
 VITE_API_BASE_URL= 'http://127.0.0.1:9200/orion-visor/api'
 VITE_WS_BASE_URL= 'ws://127.0.0.1:9200/orion-visor/keep-alive'
-VITE_APP_VERSION= '2.1.6'
+VITE_APP_VERSION= '2.1.7'
 VITE_APP_RELEASE= 'community'
 VITE_SFTP_PREVIEW_MB= 2
 VITE_DEMO_MODE= false
--- a/orion-visor-ui/.env.production
+++ b/orion-visor-ui/.env.production
@@ -1,6 +1,6 @@
 VITE_API_BASE_URL= '/orion-visor/api'
 VITE_WS_BASE_URL= '/orion-visor/keep-alive'
-VITE_APP_VERSION= '2.1.6'
+VITE_APP_VERSION= '2.1.7'
 VITE_APP_RELEASE= 'community'
 VITE_SFTP_PREVIEW_MB= 2
 VITE_DEMO_MODE= false
--- a/orion-visor-ui/package.json
+++ b/orion-visor-ui/package.json
@@ -1,7 +1,7 @@
 {
  "name": "orion-visor-ui",
  "description": "Orion Visor UI",
-  "version": "2.1.6",
+  "version": "2.1.7",
  "private": true,
  "author": "Jiahang Li",
  "license": "Apache 2.0",
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
    </modules>

    <properties>
-        <revision>2.1.6</revision>
+        <revision>2.1.7</revision>
        <maven.compiler.source>8</maven.compiler.source>
        <maven.compiler.target>8</maven.compiler.target>
        <maven.surefire.plugin.version>3.0.0-M5</maven.surefire.plugin.version>