Merge pull request #84 from dromara/dev

Dev

Author: lijiahangmax

docker/adminer/build.sh

@@ -1,5 +1,5 @@
 #/bin/bash
-version=2.2.3
+version=2.3.0
 docker build -t orion-visor-adminer:${version} .
 docker tag orion-visor-adminer:${version} registry.cn-hangzhou.aliyuncs.com/orionsec/orion-visor-adminer:${version}
 docker tag orion-visor-adminer:${version} registry.cn-hangzhou.aliyuncs.com/orionsec/orion-visor-adminer:latest

docker/mysql/build.sh

@@ -1,5 +1,5 @@
 #/bin/bash
-version=2.2.3
+version=2.3.0
 cp -r ../../sql ./sql
 docker build -t orion-visor-mysql:${version} .
 rm -rf ./sql

docker/push.sh

@@ -1,5 +1,5 @@
 #/bin/bash
-version=2.2.3
+version=2.3.0
 docker push registry.cn-hangzhou.aliyuncs.com/orionsec/orion-visor-adminer:${version}
 docker push registry.cn-hangzhou.aliyuncs.com/orionsec/orion-visor-mysql:${version}
 docker push registry.cn-hangzhou.aliyuncs.com/orionsec/orion-visor-redis:${version}

docker/redis/build.sh

@@ -1,5 +1,5 @@
 #/bin/bash
-version=2.2.3
+version=2.3.0
 docker build -t orion-visor-redis:${version} .
 docker tag orion-visor-redis:${version} registry.cn-hangzhou.aliyuncs.com/orionsec/orion-visor-redis:${version}
 docker tag orion-visor-redis:${version} registry.cn-hangzhou.aliyuncs.com/orionsec/orion-visor-redis:latest

docker/service/build.sh

@@ -1,5 +1,5 @@
 #/bin/bash
-version=2.2.3
+version=2.3.0
 mv ../../orion-visor-launch/target/orion-visor-launch.jar ./orion-visor-launch.jar
 mv ../../orion-visor-ui/dist ./dist
 docker build --no-cache -t orion-visor-service:${version} .

orion-visor-framework/orion-visor-framework-common/pom.xml renamed to orion-visor-common/pom.xml

@@ -4,12 +4,12 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <groupId>org.dromara.visor</groupId>
-        <artifactId>orion-visor-framework</artifactId>
+        <artifactId>orion-visor</artifactId>
         <version>${revision}</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>orion-visor-framework-common</artifactId>
+    <artifactId>orion-visor-common</artifactId>
     <name>${project.artifactId}</name>
     <packaging>jar</packaging>
 

orion-visor-common/src/main/java/org/dromara/visor/common/config/ConfigRef.java

@@ -0,0 +1,80 @@
+/*
+ * Copyright (c) 2023 - present Dromara, All rights reserved.
+ *
+ *   https://visor.dromara.org
+ *   https://visor.dromara.org.cn
+ *   https://visor.orionsec.cn
+ *
+ * Members:
+ *   Jiahang Li - [email protected] - author
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.dromara.visor.common.config;
+
+import lombok.extern.slf4j.Slf4j;
+
+import java.util.function.BiConsumer;
+import java.util.function.Function;
+
+/**
+ * 配置引用
+ *
+ * @author Jiahang Li
+ * @version 1.0.0
+ * @since 2025/1/6 18:01
+ */
+@Slf4j
+public abstract class ConfigRef<T> {
+
+    public final String key;
+
+    public T value;
+
+    protected final Function<String, T> convert;
+
+    public ConfigRef(String key, Function<String, T> convert) {
+        this.key = key;
+        this.convert = convert;
+    }
+
+    /**
+     * 覆盖配置
+     *
+     * @param value value
+     */
+    public abstract void override(String value);
+
+    /**
+     * 修改配置
+     *
+     * @param value value
+     */
+    public abstract void set(T value);
+
+    /**
+     * 获取配置
+     *
+     * @return value
+     */
+    public abstract T get();
+
+    /**
+     * 修改回调
+     *
+     * @param changeEvent changeEvent
+     * @return this
+     */
+    public abstract ConfigRef<T> onChange(BiConsumer<T, T> changeEvent);
+
+}

orion-visor-common/src/main/java/org/dromara/visor/common/config/ConfigStore.java

@@ -0,0 +1,265 @@
+/*
+ * Copyright (c) 2023 - present Dromara, All rights reserved.
+ *
+ *   https://visor.dromara.org
+ *   https://visor.dromara.org.cn
+ *   https://visor.orionsec.cn
+ *
+ * Members:
+ *   Jiahang Li - [email protected] - author
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.dromara.visor.common.config;
+
+import java.util.function.Function;
+
+/**
+ * 配置中心
+ *
+ * @author Jiahang Li
+ * @version 1.0.0
+ * @since 2025/1/5 21:30
+ */
+public interface ConfigStore {
+
+    /**
+     * 获取 string 配置
+     *
+     * @param key key
+     * @return config
+     */
+    String getString(String key);
+
+    /**
+     * 获取 string 配置
+     *
+     * @param key          key
+     * @param defaultValue defaultValue
+     * @return config
+     */
+    String getString(String key, String defaultValue);
+
+    /**
+     * 获取 int 配置
+     *
+     * @param key key
+     * @return config
+     */
+    Integer getInteger(String key);
+
+    /**
+     * 获取 int 配置
+     *
+     * @param key          key
+     * @param defaultValue defaultValue
+     * @return config
+     */
+    Integer getInteger(String key, Integer defaultValue);
+
+    /**
+     * 获取 long 配置
+     *
+     * @param key key
+     * @return config
+     */
+    Long getLong(String key);
+
+    /**
+     * 获取 long 配置
+     *
+     * @param key          key
+     * @param defaultValue defaultValue
+     * @return config
+     */
+    Long getLong(String key, Long defaultValue);
+
+    /**
+     * 获取 double 配置
+     *
+     * @param key key
+     * @return config
+     */
+    Double getDouble(String key);
+
+    /**
+     * 获取 double 配置
+     *
+     * @param key          key
+     * @param defaultValue defaultValue
+     * @return config
+     */
+    Double getDouble(String key, Double defaultValue);
+
+    /**
+     * 获取 boolean 配置
+     *
+     * @param key key
+     * @return config
+     */
+    Boolean getBoolean(String key);
+
+    /**
+     * 获取 boolean 配置
+     *
+     * @param key          key
+     * @param defaultValue defaultValue
+     * @return config
+     */
+    Boolean getBoolean(String key, Boolean defaultValue);
+
+    /**
+     * 获取配置
+     *
+     * @param key key
+     * @return conf
+     */
+    String getConfig(String key);
+
+    /**
+     * 获取配置
+     *
+     * @param key          key
+     * @param defaultValue defaultValue
+     * @return conf
+     */
+    String getConfig(String key, String defaultValue);
+
+    /**
+     * 获取配置
+     *
+     * @param key     key
+     * @param convert convert
+     * @param <T>     T
+     * @return conf
+     */
+    <T> T getConfig(String key, Function<String, T> convert);
+
+    /**
+     * 获取配置
+     *
+     * @param key          key
+     * @param convert      convert
+     * @param defaultValue defaultValue
+     * @param <T>          T
+     * @return conf
+     */
+    <T> T getConfig(String key, Function<String, T> convert, T defaultValue);
+
+    /**
+     * 获取 string 配置
+     *
+     * @param key key
+     * @return ref
+     */
+    ConfigRef<String> string(String key);
+
+    /**
+     * 获取 string 配置
+     *
+     * @param key          key
+     * @param defaultValue defaultValue
+     * @return ref
+     */
+    ConfigRef<String> string(String key, String defaultValue);
+
+    /**
+     * 获取 int 配置
+     *
+     * @param key key
+     * @return ref
+     */
+    ConfigRef<Integer> int32(String key);
+
+    /**
+     * 获取 int 配置
+     *
+     * @param key          key
+     * @param defaultValue defaultValue
+     * @return ref
+     */
+    ConfigRef<Integer> int32(String key, Integer defaultValue);
+
+    /**
+     * 获取 long 配置
+     *
+     * @param key key
+     * @return ref
+     */
+    ConfigRef<Long> int64(String key);
+
+    /**
+     * 获取 long 配置
+     *
+     * @param key          key
+     * @param defaultValue defaultValue
+     * @return ref
+     */
+    ConfigRef<Long> int64(String key, Long defaultValue);
+
+    /**
+     * 获取 double 配置
+     *
+     * @param key key
+     * @return ref
+     */
+    ConfigRef<Double> float64(String key);
+
+    /**
+     * 获取 double 配置
+     *
+     * @param key          key
+     * @param defaultValue defaultValue
+     * @return ref
+     */
+    ConfigRef<Double> float64(String key, Double defaultValue);
+
+    /**
+     * 获取 boolean 配置
+     *
+     * @param key key
+     * @return ref
+     */
+    ConfigRef<Boolean> bool(String key);
+
+    /**
+     * 获取 boolean 配置
+     *
+     * @param key          key
+     * @param defaultValue defaultValue
+     * @return ref
+     */
+    ConfigRef<Boolean> bool(String key, Boolean defaultValue);
+
+    /**
+     * 获取配置
+     *
+     * @param key     key
+     * @param convert convert
+     * @param <T>     T
+     * @return ref
+     */
+    <T> ConfigRef<T> ref(String key, Function<String, T> convert);
+
+    /**
+     * 获取配置
+     *
+     * @param key          key
+     * @param convert      convert
+     * @param defaultValue defaultValue
+     * @param <T>          T
+     * @return ref
+     */
+    <T> ConfigRef<T> ref(String key, Function<String, T> convert, T defaultValue);
+
+}