调整海思服务端口

pom.xml

@@ -10,7 +10,6 @@
     </parent>
     <packaging>pom</packaging>
     <modules>
-        <module>sikey-hisi-ephemeris-assistance-business</module>
         <module>sikey-hmd-business</module>
         <module>sikey-tools-business</module>
         <module>sikey-mcdisk-business</module>

sikey-hisi-ephemeris-assistance-business/pom.xml

@@ -1,164 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>cn.sikey.cloud</groupId>
-        <artifactId>sikey-business</artifactId>
-        <version>2.3.0-SNAPSHOT</version>
-    </parent>
-    <packaging>pom</packaging>
-    <modules>
-        <module>sikey-hisi-ephemeris-assistance-business-api</module>
-        <module>sikey-hisi-ephemeris-assistance-business-biz</module>
-    </modules>
-
-    <artifactId>sikey-hisi-ephemeris-assistance-business</artifactId>
-    <name>${project.artifactId}</name>
-
-    <description>
-        业务组件，Maven 名字会包含 biz
-    </description>
-
-    <properties>
-        <java.version>23</java.version>
-        <maven.compiler.source>${java.version}</maven.compiler.source>
-        <maven.compiler.target>${java.version}</maven.compiler.target>
-        <consul.version>4.2.0</consul.version>
-        <lombok.version>1.18.36</lombok.version>
-        <logback.version>1.2.12</logback.version>
-        <mapstruct.version>1.6.2</mapstruct.version>
-        <spring.cloud.version>2024.0.0</spring.cloud.version>
-        <spring.boot.version>3.4.0</spring.boot.version>
-        <skywalking.version>9.0.0</skywalking.version>
-        <opentracing.version>0.33.0</opentracing.version>
-        <revision>2.3.0-SNAPSHOT</revision>
-
-        <maven-surefire-plugin.version>3.2.2</maven-surefire-plugin.version>
-        <maven-compiler-plugin.version>3.13.0</maven-compiler-plugin.version>
-        <flatten-maven-plugin.version>1.6.0</flatten-maven-plugin.version>
-        <okhttp3.version>4.12.0</okhttp3.version>
-        <hutool.version>5.8.28</hutool.version>
-        <google.zxing.version>3.5.2</google.zxing.version>
-        <alipay.v3.version>3.0.0.ALL</alipay.v3.version>
-        <wechat.v3.version>0.2.16</wechat.v3.version>
-        <gson.version>2.11.0</gson.version>
-        <security.version>3.4.4</security.version>
-    </properties>
-
-    <dependencyManagement>
-    <dependencies>
-
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-dependencies</artifactId>
-            <version>${spring.cloud.version}</version>
-            <type>pom</type>
-            <scope>import</scope>
-        </dependency>
-
-        <!-- Web 开发基础依赖 -->
-        <dependency>
-            <groupId>cn.sikey.cloud</groupId>
-            <artifactId>sikey-spring-boot-starter-web</artifactId>
-            <version>${revision}</version>
-        </dependency>
-
-        <!-- Spring Cloud Consul 配置中心 -->
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-consul-config</artifactId>
-            <version>${consul.version}</version>
-        </dependency>
-
-        <!-- Spring Cloud Consul 服务发现 -->
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-consul-discovery</artifactId>
-            <version>${consul.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-            <version>${lombok.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.mapstruct</groupId>
-            <artifactId>mapstruct</artifactId>
-            <version>${mapstruct.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.mapstruct</groupId>
-            <artifactId>mapstruct-jdk8</artifactId>
-            <version>${mapstruct.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.mapstruct</groupId>
-            <artifactId>mapstruct-processor</artifactId>
-            <version>${mapstruct.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.skywalking</groupId>
-            <artifactId>apm-toolkit-trace</artifactId>
-            <version>${skywalking.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.skywalking</groupId>
-            <artifactId>apm-toolkit-logback-1.x</artifactId>
-            <version>${skywalking.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.skywalking</groupId>
-            <artifactId>apm-toolkit-opentracing</artifactId>
-            <version>${skywalking.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>io.opentracing</groupId>
-            <artifactId>opentracing-api</artifactId>
-            <version>${opentracing.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>io.opentracing</groupId>
-            <artifactId>opentracing-util</artifactId>
-            <version>${opentracing.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>io.opentracing</groupId>
-            <artifactId>opentracing-noop</artifactId>
-            <version>${opentracing.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>com.squareup.okhttp3</groupId>
-            <artifactId>okhttp</artifactId>
-            <version>4.12.0</version>
-        </dependency>
-
-        <!-- Hutool 核心库 -->
-        <dependency>
-            <groupId>cn.hutool</groupId>
-            <artifactId>hutool-all</artifactId>
-            <version>${hutool.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>cn.hutool</groupId>
-            <artifactId>hutool-core</artifactId>
-            <version>${hutool.version}</version>
-        </dependency>
-
-        <!-- 参数校验 -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-validation</artifactId>
-            <version>${spring.boot.version}</version>
-        </dependency>
-    </dependencies>
-    </dependencyManagement>
-
-</project>

sikey-hisi-ephemeris-assistance-business/sikey-hisi-ephemeris-assistance-business-api/pom.xml

@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <groupId>cn.sikey.cloud</groupId>
-        <artifactId>sikey-hisi-ephemeris-assistance-business</artifactId>
-        <version>2.3.0-SNAPSHOT</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>sikey-hisi-ephemeris-assistance-business-api</artifactId>
-    <packaging>jar</packaging>
-
-    <name>${project.artifactId}</name>
-    <description>
-        hisi 模块 API，暴露给其它模块调用
-    </description>
-
-    <dependencies>
-        <dependency>
-            <groupId>cn.sikey.cloud</groupId>
-            <artifactId>sikey-common</artifactId>
-            <version>2.3.0-SNAPSHOT</version>
-        </dependency>
-
-        <!-- 参数校验 -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-validation</artifactId>
-        </dependency>
-
-        <!-- RPC 远程调用相关 -->
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-openfeign</artifactId>
-        </dependency>
-    </dependencies>
-
-</project>

sikey-hisi-ephemeris-assistance-business/sikey-hisi-ephemeris-assistance-business-api/src/main/java/cn/sikey/hisi/enums/ApiConstants.java

@@ -1,22 +0,0 @@
-package cn.sikey.hisi.enums;
-
-
-/**
- * API 相关的枚举
- *
- * @author qin
- */
-public class ApiConstants {
-
-    /**
-     * 服务名
-     * <p>
-     * 注意，需要保证和 spring.application.name 保持一致
-     */
-    public static final String NAME = "sikey-ephemeris-assistance";
-
-    //  public static final String PREFIX = RpcConstants.RPC_API_PREFIX + "/test";
-
-    public static final String VERSION = "1.0.0";
-
-}

sikey-hisi-ephemeris-assistance-business/sikey-hisi-ephemeris-assistance-business-biz/.gitignore

@@ -1,86 +0,0 @@
-
-# 查看更多 .gitignore 配置 -> https://help.github.com/articles/ignoring-files/
-
-target/
-!.mvn/wrapper/maven-wrapper.jar
-
-.flattened-pom.xml
-
-### STS ###
-.apt_generated
-.classpath
-.factorypath
-.project
-.settings
-.springBeans
-.sts4-cache
-
-### IntelliJ IDEA ###
-.idea
-*.iws
-*.iml
-*.ipr
-*.class
-target/*
-
-### NetBeans ###
-/nbproject/private/
-/nbbuild/
-/dist/
-/nbdist/
-/.nb-gradle/
-/build/
-
-
-
-### admin-web ###
-
-# dependencies
-**/node_modules
-
-# roadhog-api-doc ignore
-/src/utils/request-temp.js
-_roadhog-api-doc
-
-# production
-/dist
-/.vscode
-
-# misc
-.DS_Store
-npm-debug.log*
-yarn-error.log
-
-/coverage
-.idea
-yarn.lock
-package-lock.json
-*bak
-.vscode
-
-# visual studio code
-.history
-*.log
-
-functions/mock
-.temp/**
-
-# umi
-.umi
-.umi-production
-
-# screenshot
-screenshot
-.firebase
-sessionStore
-
-# 忽略所有的图片文件类型
-*.jpg
-*.jpeg
-*.png
-*.gif
-*.bmp
-*.tiff
-*.svg
-*.webp
-

sikey-hisi-ephemeris-assistance-business/sikey-hisi-ephemeris-assistance-business-biz/Dockerfile

@@ -1,24 +0,0 @@
-## 使用 Eclipse Temurin 的 JDK23 镜像
-FROM eclipse-temurin:23-jdk
-
-## 创建目录，并使用它作为工作目录
-RUN mkdir -p /sikey-ephemeris-assistance-biz
-WORKDIR /sikey-ephemeris-assistance-biz
-## 将后端项目的 Jar 文件，复制到镜像中
-COPY ./sikey-ephemeris-assistance-biz.jar sikey-ephemeris-assistance-biz.jar
-
-## 设置 TZ 时区
-ENV TZ=Asia/Shanghai JAVA_OPTS="-Xms512m -Xmx512m"
-
-## 创建日志目录并配置权限
-RUN mkdir -p /mnt/data/api-server/log && \
-    chmod 777 /mnt/data/api-server/log  # 确保容器用户有写入权限
-
-## 声明数据卷（与配置的日志路径一致）
-VOLUME /mnt/data/api-server/log
-
-## 暴露后端项目的 20002 端口
-EXPOSE 20002
-
-## 启动后端项目（保持原有启动命令）
-CMD java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar sikey-ephemeris-assistance-biz.jar

sikey-hisi-ephemeris-assistance-business/sikey-hisi-ephemeris-assistance-business-biz/lombok.config

@@ -1,4 +0,0 @@
-config.stopBubbling = true
-lombok.tostring.callsuper=CALL
-lombok.equalsandhashcode.callsuper=CALL
-lombok.accessors.chain=true

sikey-hisi-ephemeris-assistance-business/sikey-hisi-ephemeris-assistance-business-biz/pom.xml

@@ -1,212 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <!-- Spring Boot 父级依赖 -->
-    <parent>
-        <groupId>cn.sikey.cloud</groupId>
-        <artifactId>sikey-hisi-ephemeris-assistance-business</artifactId>
-        <version>2.3.0-SNAPSHOT</version>
-    </parent>
-
-    <artifactId>sikey-hisi-ephemeris-assistance-business-biz</artifactId>
-    <version>2.3.0-SNAPSHOT</version>
-    <packaging>jar</packaging>
-
-    <description>
-        sikey-hisi-ephemeris-assistance-business-biz
-    </description>
-
-    <dependencies>
-        <!-- Web 开发基础依赖 -->
-        <dependency>
-            <groupId>cn.sikey.cloud</groupId>
-            <artifactId>sikey-spring-boot-starter-web</artifactId>
-        </dependency>
-
-        <!-- Spring Cloud Consul 配置中心 -->
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-consul-config</artifactId>
-        </dependency>
-
-        <!-- Spring Cloud Consul 服务发现 -->
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-consul-discovery</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.mapstruct</groupId>
-            <artifactId>mapstruct</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.mapstruct</groupId>
-            <artifactId>mapstruct-jdk8</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.mapstruct</groupId>
-            <artifactId>mapstruct-processor</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.skywalking</groupId>
-            <artifactId>apm-toolkit-trace</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.skywalking</groupId>
-            <artifactId>apm-toolkit-logback-1.x</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.skywalking</groupId>
-            <artifactId>apm-toolkit-opentracing</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>io.opentracing</groupId>
-            <artifactId>opentracing-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.opentracing</groupId>
-            <artifactId>opentracing-util</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.opentracing</groupId>
-            <artifactId>opentracing-noop</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>com.squareup.okhttp3</groupId>
-            <artifactId>okhttp</artifactId>
-            <version>4.12.0</version>
-        </dependency>
-
-        <!-- Hutool 核心库 -->
-        <dependency>
-            <groupId>cn.hutool</groupId>
-            <artifactId>hutool-all</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>cn.hutool</groupId>
-            <artifactId>hutool-core</artifactId>
-        </dependency>
-
-        <!-- 参数校验 -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-validation</artifactId>
-        </dependency>
-
-        <!-- RPC 远程调用相关 -->
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-loadbalancer</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-openfeign</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.github.openfeign</groupId>
-            <artifactId>feign-okhttp</artifactId>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <!-- 设置构建的 jar 包名 -->
-        <finalName>${project.artifactId}</finalName>
-        <pluginManagement>
-            <plugins>
-                <!-- maven-surefire-plugin 插件，用于运行单元测试。 -->
-                <!-- 注意，需要使用 3.0.X+，因为要支持 Junit 5 版本 -->
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-surefire-plugin</artifactId>
-                    <version>${maven-surefire-plugin.version}</version>
-                </plugin>
-                <!-- maven-compiler-plugin 插件，解决 Lombok + MapStruct 组合 -->
-                <!-- https://stackoverflow.com/questions/33483697/re-run-spring-boot-configuration-annotation-processor-to-update-generated-metada -->
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-compiler-plugin</artifactId>
-                    <version>${maven-compiler-plugin.version}</version>
-                    <configuration>
-                        <annotationProcessorPaths>
-                            <path>
-                                <groupId>org.springframework.boot</groupId>
-                                <artifactId>spring-boot-configuration-processor</artifactId>
-                                <version>${spring.boot.version}</version>
-                            </path>
-                            <path>
-                                <groupId>org.projectlombok</groupId>
-                                <artifactId>lombok</artifactId>
-                                <version>${lombok.version}</version>
-                            </path>
-                            <path>
-                                <groupId>org.mapstruct</groupId>
-                                <artifactId>mapstruct-processor</artifactId>
-                                <version>${mapstruct.version}</version>
-                            </path>
-                        </annotationProcessorPaths>
-                        <!-- 编译参数写在 arg 内，解决 Spring Boot 3.2 的 Parameter Name Discovery 问题 -->
-                        <debug>false</debug>
-                        <compilerArgs>
-                            <arg>-parameters</arg>
-                        </compilerArgs>
-                    </configuration>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-
-        <plugins>
-            <!-- 统一 revision 版本 -->
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>flatten-maven-plugin</artifactId>
-                <version>${flatten-maven-plugin.version}</version>
-                <configuration>
-                    <flattenMode>oss</flattenMode>
-                    <updatePomFile>true</updatePomFile>
-                </configuration>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>flatten</goal>
-                        </goals>
-                        <id>flatten</id>
-                        <phase>process-resources</phase>
-                    </execution>
-                    <execution>
-                        <goals>
-                            <goal>clean</goal>
-                        </goals>
-                        <id>flatten.clean</id>
-                        <phase>clean</phase>
-                    </execution>
-                </executions>
-            </plugin>
-            <!-- 关键：添加 spring-boot-maven-plugin -->
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-                <version>${spring.boot.version}</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>repackage</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-
-        </plugins>
-    </build>
-
-</project>

sikey-hisi-ephemeris-assistance-business/sikey-hisi-ephemeris-assistance-business-biz/src/main/java/cn/sikey/hisi/EphemerisAssistanceApplication.java

@@ -1,25 +0,0 @@
-package cn.sikey.hisi;
-
-
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
-
-/**
- * 项目的启动类
- * <p>
- *
- * @author qin
- */
-@SpringBootApplication
-@EnableDiscoveryClient
-@Slf4j
-public class EphemerisAssistanceApplication {
-
-    public static void main(String[] args) {
-        log.info("Starting Ephemeris Assistance Application");
-        SpringApplication.run(EphemerisAssistanceApplication.class, args);
-    }
-
-}

sikey-hisi-ephemeris-assistance-business/sikey-hisi-ephemeris-assistance-business-biz/src/main/java/cn/sikey/hisi/config/OkHttpConfig.java

@@ -1,127 +0,0 @@
-package cn.sikey.hisi.config;
-
-import cn.sikey.framework.common.exception.ServiceException;
-import okhttp3.ConnectionPool;
-import okhttp3.OkHttpClient;
-import org.apache.http.HttpStatus;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-import javax.net.ssl.*;
-import java.security.SecureRandom;
-import java.security.cert.CertificateException;
-import java.security.cert.X509Certificate;
-import java.util.concurrent.TimeUnit;
-
-/**
- * @Author: qin
- * @Date: 2025/3/26
- * @Description: OkHttpConfig
- */
-@Configuration
-@EnableConfigurationProperties(OkHttpProperties.class)
-public class OkHttpConfig {
-    /**
-     * 配置全局 OkHttpClient (可自定义多个不同配置的客户端)
-     */
-    @Bean(value = "okHttpClientHttps")
-    public OkHttpClient okHttpClientHttps(OkHttpProperties properties) {
-        return new OkHttpClient.Builder().connectTimeout(properties.getConnectTimeout(), TimeUnit.SECONDS).readTimeout(properties.getReadTimeout(), TimeUnit.SECONDS).writeTimeout(properties.getWriteTimeout(), TimeUnit.SECONDS).retryOnConnectionFailure(properties.isRetryOnFailure()).connectionPool(connectionPool(properties)).sslSocketFactory(createSSLSocketFactory(), new TrustAllCerts()).hostnameVerifier(new TrustAllHostnameVerifier()).build();
-    }
-
-    /**
-     * 配置全局 OkHttpClient (可自定义多个不同配置的客户端)
-     */
-    /*@Bean(value = "okHttpClientHttpsSignature")
-    public OkHttpClient okHttpClientSignature(OkHttpProperties properties, SignatureInterceptor signatureInterceptor) {
-        return new OkHttpClient.Builder().connectTimeout(properties.getConnectTimeout(), TimeUnit.SECONDS).readTimeout(properties.getReadTimeout(), TimeUnit.SECONDS).writeTimeout(properties.getWriteTimeout(), TimeUnit.SECONDS).retryOnConnectionFailure(properties.isRetryOnFailure()).connectionPool(connectionPool(properties)).addInterceptor(signatureInterceptor) // 添加签名拦截器
-                .sslSocketFactory(sslSocketFactory(), x509TrustManager()) // SSL配置
-                .hostnameVerifier((hostname, session) -> true) // 主机名验证（生产环境需严格配置）
-                .build();
-    }*/
-
-    /**
-     * 配置全局 OkHttpClient (可自定义多个不同配置的客户端)
-     */
-    @Bean(value = "okHttpClient")
-    public OkHttpClient okHttpClient(OkHttpProperties properties) {
-        return new OkHttpClient.Builder().connectTimeout(properties.getConnectTimeout(), TimeUnit.SECONDS).readTimeout(properties.getReadTimeout(), TimeUnit.SECONDS).writeTimeout(properties.getWriteTimeout(), TimeUnit.SECONDS).retryOnConnectionFailure(properties.isRetryOnFailure()).connectionPool(connectionPool(properties)).build();
-    }
-
-
-    // 证书配置
-    private static class TrustAllCerts implements X509TrustManager {
-        public void checkClientTrusted(X509Certificate[] chain, String authType) throws CertificateException {
-        }
-
-        public void checkServerTrusted(X509Certificate[] chain, String authType) throws CertificateException {
-        }
-
-        public X509Certificate[] getAcceptedIssuers() {
-            return new X509Certificate[0];
-        }
-    }
-
-    private static class TrustAllHostnameVerifier implements HostnameVerifier {
-        public boolean verify(String hostname, SSLSession session) {
-            return true;
-        }
-    }
-
-    private static SSLSocketFactory createSSLSocketFactory() {
-        SSLSocketFactory ssfFactory;
-        try {
-            SSLContext sc = SSLContext.getInstance("TLS");
-            sc.init(null, new TrustManager[]{new TrustAllCerts()}, new SecureRandom());
-            ssfFactory = sc.getSocketFactory();
-        } catch (Exception e) {
-            throw new ServiceException(HttpStatus.SC_INTERNAL_SERVER_ERROR, "SSL配置失败");
-        }
-        return ssfFactory;
-    }
-
-
-    /**
-     * 连接池配置 (提升性能)
-     */
-    @Bean
-    public ConnectionPool connectionPool(OkHttpProperties properties) {
-        return new ConnectionPool(properties.getMaxIdleConnections(), properties.getKeepAliveDuration(), TimeUnit.SECONDS);
-    }
-
-    /**
-     * SSL 安全配置 (生产环境需替换为正式证书)
-     */
-    /*@Bean
-    public SSLSocketFactory sslSocketFactory() {
-        try {
-            SSLContext sslContext = SSLContext.getInstance("TLS");
-            sslContext.init(null, new TrustManager[]{x509TrustManager()}, new SecureRandom());
-            return sslContext.getSocketFactory();
-        } catch (Exception e) {
-            throw new ServiceException(HttpStatus.SC_INTERNAL_SERVER_ERROR, "SSL配置失败");
-        }
-    }*/
-
-    /**
-     * 信任管理器 (仅限测试环境，生产环境需严格管理)
-     */
-    /*@Bean
-    public X509TrustManager x509TrustManager() {
-        return new X509TrustManager() {
-            @Override
-            public void checkClientTrusted(java.security.cert.X509Certificate[] chain, String authType) {
-            }
-
-            @Override
-            public void checkServerTrusted(java.security.cert.X509Certificate[] chain, String authType) {
-            }
-
-            @Override
-            public java.security.cert.X509Certificate[] getAcceptedIssuers() {
-                throw new ServiceException(HttpStatus.SC_INTERNAL_SERVER_ERROR, "X509TrustManager失败");
-            }
-        };
-    }*/
-}

sikey-hisi-ephemeris-assistance-business/sikey-hisi-ephemeris-assistance-business-biz/src/main/java/cn/sikey/hisi/config/OkHttpProperties.java

@@ -1,20 +0,0 @@
-package cn.sikey.hisi.config;
-
-import lombok.Data;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-
-/**
- * @Author: qin
- * @Date: 2025/3/26
- * @Description: OkHttpProperties
- */
-@Data
-@ConfigurationProperties(prefix = "okhttp")
-public class OkHttpProperties {
-    private int connectTimeout = 10;      // 连接超时(秒)
-    private int readTimeout = 30;         // 读取超时(秒)
-    private int writeTimeout = 30;        // 写入超时(秒)
-    private boolean retryOnFailure = true;// 自动重试
-    private int maxIdleConnections = 50;  // 最大空闲连接数
-    private int keepAliveDuration = 300;  // 保持活动时间(秒)
-}

sikey-hisi-ephemeris-assistance-business/sikey-hisi-ephemeris-assistance-business-biz/src/main/java/cn/sikey/hisi/enums/StatusEnum.java

@@ -1,36 +0,0 @@
-package cn.sikey.hisi.enums;
-
-import cn.sikey.framework.common.core.IntArrayValuable;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-import java.util.Arrays;
-
-/**
- * @Author: qin
- * @Date: 2025/4/18
- * @Description: 状态值
- */
-@Getter
-@AllArgsConstructor
-public enum StatusEnum implements IntArrayValuable {
-    REQUEST_PARAMETER_ERROR(400, "请求参数错误"),
-    USER_AUTHENTICATION_FAILED(401, "用户认证失败"),
-    THE_ACCESS_LIMIT_HAS_BEEN_EXCEEDED(503, "超过访问次数限制，服务不可用");
-
-    public static final int[] ARRAYS = Arrays.stream(values()).mapToInt(StatusEnum::getStatus).toArray();
-
-    /**
-     * 状态值
-     */
-    private final Integer status;
-    /**
-     * 状态名
-     */
-    private final String name;
-
-    @Override
-    public int[] array() {
-        return ARRAYS;
-    }
-}

sikey-hisi-ephemeris-assistance-business/sikey-hisi-ephemeris-assistance-business-biz/src/main/resources/application.yaml

@@ -1,86 +0,0 @@
-server:
-  port: 20002
-
-spring:
-  application:
-    name: sikey-ephemeris-assistance
-  profiles:
-    active: "test"
-  main:
-    allow-circular-references: true # 允许循环依赖，因为项目是三层架构，无法避免这个情况。
-    allow-bean-definition-overriding: true # 允许 Bean 覆盖，例如说 Feign 等会存在重复定义的服务
-  config:
-    import: "consul:"
-    # Servlet 配置
-  servlet:
-    # 文件上传相关配置项
-    multipart:
-      max-file-size: 16MB # 单个文件大小
-      max-request-size: 32MB # 设置总上传的文件大小
-  # Jackson 配置项
-  jackson:
-    serialization:
-      write-dates-as-timestamps: true # 设置 LocalDateTime 的格式，使用时间戳
-      write-date-timestamps-as-nanoseconds: false # 设置不使用 nanoseconds 的格式。例如说 1611460870.401，而是直接 1611460870401
-      write-durations-as-timestamps: true # 设置 Duration 的格式，使用时间戳
-      fail-on-empty-beans: false # 允许序列化无属性的 Bean
-  # Consul 集成配置
-  cloud:
-    consul:
-      #    host: 127.0.0.1
-      host: 106.75.230.4
-      port: 8500
-      # discovery
-      discovery:
-        enabled: true
-        prefer-ip-address: true
-        instance-id: ${spring.application.name}:${spring.cloud.client.ip-address}:${server.port}
-      # config
-      config:
-        enabled: true
-        format: YAML
-        data-key: data
-
-  #file:
-    #name: /var/log/sikey/${spring.application.name}.log # 日志文件名，全路径
-
-  # Lock4j 配置项
-  #lock4j:
-  # acquire-timeout: 3000 # 获取分布式锁超时时间，默认为 3000 毫秒
-  # expire: 30000 # 分布式锁的超时时间，默认为 30 毫秒
-
-sikey:
-  info:
-    version: 1.0.0
-    base-package: cn.sikey.hisi
-
-#海思辅助定位
-hisi:
-  url: https://geo-drcn.platform.dbankcloud.cn
-  appId: sikey
-  appSecret: 211EF40FCA92254AC2B71D39B193C93B13509678DA6CF2BE49F3A3604ABE4A78
-
-okhttp:
-  connect-timeout: 10
-  read-timeout: 30
-  write-timeout: 30
-  max-idle-connections: 50
-  keep-alive-duration: 300
-
-management:
-  endpoints:
-    web:
-      exposure:
-        include: health
-
-
-
-
-
-
-
-
-
-
-
-

sikey-hisi-ephemeris-assistance-business/sikey-hisi-ephemeris-assistance-business-biz/src/main/resources/logback-spring-test.xml

@@ -1,76 +0,0 @@
-<configuration>
-    <!-- 引用 Spring Boot 的 logback 基础配置 -->
-    <include resource="org/springframework/boot/logging/logback/defaults.xml" />
-    <!-- 变量 sikey.info.base-package，基础业务包 -->
-    <springProperty scope="context" name="sikey.info.base-package" source="sikey.info.base-package"/>
-    <!-- 格式化输出：%d 表示日期，%X{tid} SkWalking 链路追踪编号，%thread 表示线程名，%-5level：级别从左显示 5 个字符宽度，%msg：日志消息，%n是换行符 -->
-    <property name="PATTERN_DEFAULT" value="%d{${LOG_DATEFORMAT_PATTERN:-yyyy-MM-dd HH:mm:ss.SSS}} | %highlight(${LOG_LEVEL_PATTERN:-%5p} ${PID:- }) | %boldYellow(%thread [%tid]) %boldGreen(%-40.40logger{39}) | %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}"/>
-
-    <!-- 控制台 Appender -->
-    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">　　　　　
-        <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-            <layout class="org.apache.skywalking.apm.toolkit.log.logback.v1.x.TraceIdPatternLogbackLayout">
-                <pattern>${PATTERN_DEFAULT}</pattern>
-            </layout>
-        </encoder>
-    </appender>
-
-    <!-- 文件 Appender -->
-    <!-- 参考 Spring Boot 的 file-appender.xml 编写 -->
-    <appender name="FILE"  class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-            <layout class="org.apache.skywalking.apm.toolkit.log.logback.v1.x.TraceIdPatternLogbackLayout">
-                <pattern>${PATTERN_DEFAULT}</pattern>
-            </layout>
-        </encoder>
-        <!-- 日志文件名 -->
-        <file>${LOG_FILE}</file>
-        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            <!-- 滚动后的日志文件名 -->
-            <fileNamePattern>${LOGBACK_ROLLINGPOLICY_FILE_NAME_PATTERN:-${LOG_FILE}.%d{yyyy-MM-dd}.%i.gz}</fileNamePattern>
-            <!-- 启动服务时，是否清理历史日志，一般不建议清理 -->
-            <cleanHistoryOnStart>${LOGBACK_ROLLINGPOLICY_CLEAN_HISTORY_ON_START:-false}</cleanHistoryOnStart>
-            <!-- 日志文件，到达多少容量，进行滚动 -->
-            <maxFileSize>${LOGBACK_ROLLINGPOLICY_MAX_FILE_SIZE:-10MB}</maxFileSize>
-            <!-- 日志文件的总大小，0 表示不限制 -->
-            <totalSizeCap>${LOGBACK_ROLLINGPOLICY_TOTAL_SIZE_CAP:-0}</totalSizeCap>
-            <!-- 日志文件的保留天数 -->
-            <maxHistory>${LOGBACK_ROLLINGPOLICY_MAX_HISTORY:-30}</maxHistory>
-        </rollingPolicy>
-    </appender>
-    <!-- 异步写入日志，提升性能 -->
-    <appender name="ASYNC" class="ch.qos.logback.classic.AsyncAppender">
-        <!-- 不丢失日志。默认的，如果队列的 80% 已满,则会丢弃 TRACT、DEBUG、INFO 级别的日志 -->
-        <discardingThreshold>0</discardingThreshold>
-        <!-- 更改默认的队列的深度，该值会影响性能。默认值为 256 -->
-        <queueSize>256</queueSize>
-        <appender-ref ref="FILE"/>
-    </appender>
-
-    <!-- SkyWalking GRPC 日志收集，实现日志中心。注意：SkyWalking 8.4.0 版本开始支持 -->
-    <appender name="GRPC" class="org.apache.skywalking.apm.toolkit.log.logback.v1.x.log.GRPCLogClientAppender">
-        <encoder class="ch.qos.logback.core.encoder.LayoutWrappingEncoder">
-            <layout class="org.apache.skywalking.apm.toolkit.log.logback.v1.x.TraceIdPatternLogbackLayout">
-                <pattern>${PATTERN_DEFAULT}</pattern>
-            </layout>
-        </encoder>
-    </appender>
-
-    <!-- 本地环境 -->
-    <springProfile name="local">
-        <root level="INFO">
-            <appender-ref ref="STDOUT"/>
-            <appender-ref ref="GRPC"/> <!-- 本地环境下，如果不想接入 SkyWalking 日志服务，可以注释掉本行 -->
-            <appender-ref ref="ASYNC"/>  <!-- 本地环境下，如果不想打印日志，可以注释掉本行 -->
-        </root>
-    </springProfile>
-    <!-- 其它环境 -->
-    <springProfile name="dev,test,stage,prod,default">
-        <root level="INFO">
-            <appender-ref ref="STDOUT"/>
-            <appender-ref ref="ASYNC"/>
-            <appender-ref ref="GRPC"/>
-        </root>
-    </springProfile>
-
-</configuration>

sikey-hisi-ephemeris-assistance-business/sikey-hisi-ephemeris-assistance-business-biz/src/main/java/cn/sikey/hisi/bo/AssistedPositioning.java → sikey-tools-business/sikey-tools-business-biz/src/main/java/cn/sikey/tools/bo/AssistedPositioning.java

@@ -1,4 +1,4 @@
-package cn.sikey.hisi.bo;
+package cn.sikey.tools.bo;
 
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;

sikey-hisi-ephemeris-assistance-business/sikey-hisi-ephemeris-assistance-business-biz/src/main/java/cn/sikey/hisi/controller/HisiController.java → sikey-tools-business/sikey-tools-business-biz/src/main/java/cn/sikey/tools/controller/app/hisi/HisiController.java

@@ -1,7 +1,8 @@
-package cn.sikey.hisi.controller;
+package cn.sikey.tools.controller.app.hisi;
 
-import cn.sikey.hisi.bo.AssistedPositioning;
-import cn.sikey.hisi.service.HisiService;
+
+import cn.sikey.tools.bo.AssistedPositioning;
+import cn.sikey.tools.service.hisi.HisiService;
 import jakarta.annotation.Resource;
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.extern.slf4j.Slf4j;
@@ -14,7 +15,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 @Slf4j
 @RestController
-@RequestMapping("/hisi")
+@RequestMapping("/tools/hisi")
 @Service
 public class HisiController {
 

sikey-hisi-ephemeris-assistance-business/sikey-hisi-ephemeris-assistance-business-biz/src/main/java/cn/sikey/hisi/service/HisiService.java → sikey-tools-business/sikey-tools-business-biz/src/main/java/cn/sikey/tools/service/hisi/HisiService.java

@@ -1,7 +1,6 @@
-package cn.sikey.hisi.service;
+package cn.sikey.tools.service.hisi;
 
-import cn.sikey.framework.common.pojo.CommonResult;
-import cn.sikey.hisi.bo.AssistedPositioning;
+import cn.sikey.tools.bo.AssistedPositioning;
 import jakarta.servlet.http.HttpServletResponse;
 
 /**

sikey-hisi-ephemeris-assistance-business/sikey-hisi-ephemeris-assistance-business-biz/src/main/java/cn/sikey/hisi/service/impl/HisiServiceImpl.java → sikey-tools-business/sikey-tools-business-biz/src/main/java/cn/sikey/tools/service/hisi/HisiServiceImpl.java

@@ -1,10 +1,9 @@
-package cn.sikey.hisi.service.impl;
+package cn.sikey.tools.service.hisi;
 
 import cn.sikey.framework.common.exception.ServiceException;
-import cn.sikey.hisi.bo.AssistedPositioning;
-import cn.sikey.hisi.service.HisiService;
-import cn.sikey.hisi.util.HisiUtils;
-import cn.sikey.hisi.util.OkHttpUtil;
+import cn.sikey.tools.bo.AssistedPositioning;
+import cn.sikey.tools.util.HisiUtils;
+import cn.sikey.tools.util.OkHttpUtil;
 import jakarta.annotation.Resource;
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.extern.slf4j.Slf4j;

sikey-hisi-ephemeris-assistance-business/sikey-hisi-ephemeris-assistance-business-biz/src/main/java/cn/sikey/hisi/util/HisiUtils.java → sikey-tools-business/sikey-tools-business-biz/src/main/java/cn/sikey/tools/util/HisiUtils.java

@@ -1,4 +1,4 @@
-package cn.sikey.hisi.util;
+package cn.sikey.tools.util;
 
 import cn.sikey.framework.common.exception.ServiceException;
 import lombok.experimental.UtilityClass;

sikey-hisi-ephemeris-assistance-business/sikey-hisi-ephemeris-assistance-business-biz/src/main/java/cn/sikey/hisi/util/OkHttpUtil.java → sikey-tools-business/sikey-tools-business-biz/src/main/java/cn/sikey/tools/util/OkHttpUtil.java

@@ -1,4 +1,4 @@
-package cn.sikey.hisi.util;
+package cn.sikey.tools.util;
 
 import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;

sikey-tools-business/sikey-tools-business-biz/src/main/resources/application.yml

@@ -133,6 +133,12 @@ aqgora:
   apiKey: 60d40761f9434438accbe88c83b6688e
   secret: 2eb98628dc364fe184a333da0c7e5b86
 
+#海思辅助定位
+hisi:
+  url: https://geo-drcn.platform.dbankcloud.cn
+  appId: sikey
+  appSecret: 211EF40FCA92254AC2B71D39B193C93B13509678DA6CF2BE49F3A3604ABE4A78
+
 ---
 #熔断器配置
 feign: