diff --git a/jhinno-openapi-java-sdk/pom.xml b/jhinno-openapi-java-sdk/pom.xml index 422ca5d..36e55f3 100644 --- a/jhinno-openapi-java-sdk/pom.xml +++ b/jhinno-openapi-java-sdk/pom.xml @@ -5,7 +5,7 @@ 4.0.0 jhinno-openapi-java-sdk - 2.0.2 + 2.0.3 jar Jhinno OpenAPI SDK for Java The Jhinno OpenAPI SDK for Java used for accessing Jhinno OpenApi Service @@ -14,7 +14,7 @@ com.jhinno jhinno-openapi-java-sdk-parent - 2.0.2 + 2.0.3 @@ -77,13 +77,6 @@ - - - jhinno-releases - http://192.168.87.22:8081/repository/maven-releases - - - diff --git a/jhinno-openapi-java-sdk/src/test/java/com/jhinno/sdk/openapi/test/JHClientConfig.java b/jhinno-openapi-java-sdk/src/test/java/com/jhinno/sdk/openapi/test/JHClientConfig.java index 83154a0..ddd70e5 100644 --- a/jhinno-openapi-java-sdk/src/test/java/com/jhinno/sdk/openapi/test/JHClientConfig.java +++ b/jhinno-openapi-java-sdk/src/test/java/com/jhinno/sdk/openapi/test/JHClientConfig.java @@ -24,13 +24,13 @@ public class JHClientConfig { /** * 初始化JHApi客户端 */ - public static final JHApiClient client = new JHApiClient("https://192.168.38.160/appform"); + public static final JHApiClient client = new JHApiClient("https://172.17.0.5/appform"); public static final Map, JHApiExecution> jhApiClientMap = new HashMap<>(); - public static final String ACCESS_KEY = "35154207caa94be582e75da31ec8e9f2"; + public static final String ACCESS_KEY = "3f03747f147942bd8debd81b6c9c6a80"; - public static final String ACCESS_KEY_SECRET = "2cdb5ecbe51543ad9a08ad21c32e2dd9"; + public static final String ACCESS_KEY_SECRET = "e0681859b91c499eb1d2c8e09cea3242"; static { client.initDefaultApiClient(); diff --git a/jhinno-openapi-sdk-spring-boot-starter/pom.xml b/jhinno-openapi-sdk-spring-boot-starter/pom.xml index 4f3ca95..d63d38f 100644 --- a/jhinno-openapi-sdk-spring-boot-starter/pom.xml +++ b/jhinno-openapi-sdk-spring-boot-starter/pom.xml @@ -5,7 +5,7 @@ 4.0.0 jhinno-openapi-sdk-spring-boot-starter - 2.0.2 + 2.0.3 jar Jhinno OpenAPI SDK for Java SpringBoot Starter The Jhinno OpenAPI SDK for Java used for accessing Jhinno OpenApi Service @@ -14,7 +14,7 @@ com.jhinno jhinno-openapi-java-sdk-parent - 2.0.2 + 2.0.3 @@ -22,7 +22,7 @@ com.jhinno jhinno-openapi-java-sdk - 2.0.2 + 2.0.3 @@ -44,16 +44,8 @@ true - - - - jhinno-releases - http://192.168.87.22:8081/repository/maven-releases - - - diff --git a/jhinno-openapi-sdk-spring-boot-starter/src/main/java/com/jhinno/sdk/openapi/autoconfigure/JHOpenapiExecutionAutoconfigure.java b/jhinno-openapi-sdk-spring-boot-starter/src/main/java/com/jhinno/sdk/openapi/autoconfigure/JHOpenapiExecutionAutoconfigure.java index bf89188..716bc07 100644 --- a/jhinno-openapi-sdk-spring-boot-starter/src/main/java/com/jhinno/sdk/openapi/autoconfigure/JHOpenapiExecutionAutoconfigure.java +++ b/jhinno-openapi-sdk-spring-boot-starter/src/main/java/com/jhinno/sdk/openapi/autoconfigure/JHOpenapiExecutionAutoconfigure.java @@ -1,13 +1,12 @@ package com.jhinno.sdk.openapi.autoconfigure; -import com.jhinno.sdk.openapi.api.JHApiExecution; import com.jhinno.sdk.openapi.api.app.JHAppApiExecution; import com.jhinno.sdk.openapi.api.data.JHDataApiExecution; import com.jhinno.sdk.openapi.api.file.JHFileApiExecution; import com.jhinno.sdk.openapi.api.job.JHJobApiExecution; import com.jhinno.sdk.openapi.api.organization.JHDepartmentApiExecution; import com.jhinno.sdk.openapi.api.organization.JHUserApiExecution; -import com.jhinno.sdk.openapi.client.JHApiClient; +import com.jhinno.sdk.openapi.utils.JHOpenApiConfig; import lombok.RequiredArgsConstructor; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -23,61 +22,34 @@ import org.springframework.context.annotation.Configuration; public class JHOpenapiExecutionAutoconfigure { - private final JHOpenapiProperties properties; - private final JHApiClient client; - - - public void init(JHApiExecution apiExecution) { - apiExecution.setJhApiClient(client); - apiExecution.setForceGetToken(properties.isForceGetToken()); - apiExecution.setAuthType(properties.getAuthType()); - apiExecution.setAccessKey(properties.getAccessKey()); - apiExecution.setAccessKeySecret(properties.getAccessKeySecret()); - apiExecution.setTokenTimeout(properties.getTokenTimeout()); - apiExecution.setTokenResidueTime(properties.getTokenResidueTime()); - apiExecution.setUsedServerTime(properties.isUsedServerTime()); + @Bean + public JHAppApiExecution appApiExecution(JHOpenApiConfig jhOpenApiConfig) { + return jhOpenApiConfig.configJHApiExecution(new JHAppApiExecution()); } @Bean - public JHAppApiExecution appApiExecution() { - JHAppApiExecution jhAppApiExecution = new JHAppApiExecution(); - init(jhAppApiExecution); - return jhAppApiExecution; - } - - @Bean - public JHDataApiExecution dataApiExecution() { - JHDataApiExecution dataApiExecution = new JHDataApiExecution(); - init(dataApiExecution); - return dataApiExecution; + public JHDataApiExecution dataApiExecution(JHOpenApiConfig jhOpenApiConfig) { + return jhOpenApiConfig.configJHApiExecution(new JHDataApiExecution()); } @Bean - public JHFileApiExecution fileApiExecution() { - JHFileApiExecution fileApiExecution = new JHFileApiExecution(); - init(fileApiExecution); - return fileApiExecution; + public JHFileApiExecution fileApiExecution(JHOpenApiConfig jhOpenApiConfig) { + return jhOpenApiConfig.configJHApiExecution(new JHFileApiExecution()); } @Bean - public JHJobApiExecution jobApiExecution() { - JHJobApiExecution jobApiExecution = new JHJobApiExecution(); - init(jobApiExecution); - return jobApiExecution; + public JHJobApiExecution jobApiExecution(JHOpenApiConfig jhOpenApiConfig) { + return jhOpenApiConfig.configJHApiExecution(new JHJobApiExecution()); } @Bean - public JHDepartmentApiExecution departmentApiExecution() { - JHDepartmentApiExecution departmentApiExecution = new JHDepartmentApiExecution(); - init(departmentApiExecution); - return departmentApiExecution; + public JHDepartmentApiExecution departmentApiExecution(JHOpenApiConfig jhOpenApiConfig) { + return jhOpenApiConfig.configJHApiExecution(new JHDepartmentApiExecution()); } @Bean - public JHUserApiExecution userApiExecution() { - JHUserApiExecution userApiExecution = new JHUserApiExecution(); - init(userApiExecution); - return userApiExecution; + public JHUserApiExecution userApiExecution(JHOpenApiConfig jhOpenApiConfig) { + return jhOpenApiConfig.configJHApiExecution(new JHUserApiExecution()); } } diff --git a/jhinno-openapi-sdk-spring-boot-starter/src/main/java/com/jhinno/sdk/openapi/utils/JHOpenApiConfig.java b/jhinno-openapi-sdk-spring-boot-starter/src/main/java/com/jhinno/sdk/openapi/utils/JHOpenApiConfig.java index e809905..7b08580 100644 --- a/jhinno-openapi-sdk-spring-boot-starter/src/main/java/com/jhinno/sdk/openapi/utils/JHOpenApiConfig.java +++ b/jhinno-openapi-sdk-spring-boot-starter/src/main/java/com/jhinno/sdk/openapi/utils/JHOpenApiConfig.java @@ -13,7 +13,14 @@ public class JHOpenApiConfig { private final JHApiClient client; private final JHOpenapiProperties properties; - public T initJHApiExecution(T execution) { + /** + * 配置执行器 + * + * @param execution 执行器 + * @param 执行器类型 + * @return 配置的执行器 + */ + public T configJHApiExecution(T execution) { execution.setJhApiClient(client); execution.setForceGetToken(properties.isForceGetToken()); execution.setAuthType(properties.getAuthType()); diff --git a/jhinno-openapi-sdk-spring-boot-starter/src/main/resources/META-INF/spring.factories b/jhinno-openapi-sdk-spring-boot-starter/src/main/resources/META-INF/spring.factories index b7d5802..af1c87a 100644 --- a/jhinno-openapi-sdk-spring-boot-starter/src/main/resources/META-INF/spring.factories +++ b/jhinno-openapi-sdk-spring-boot-starter/src/main/resources/META-INF/spring.factories @@ -1,3 +1,4 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ com.jhinno.sdk.openapi.autoconfigure.JHOpenapiClientAutoConfigure,\ + com.jhinno.sdk.openapi.utils.JHOpenApiConfig,\ com.jhinno.sdk.openapi.autoconfigure.JHOpenapiExecutionAutoconfigure \ No newline at end of file diff --git a/jhinno-openapi-sdk-spring-boot-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/jhinno-openapi-sdk-spring-boot-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index b3a4867..bc5dd67 100644 --- a/jhinno-openapi-sdk-spring-boot-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/jhinno-openapi-sdk-spring-boot-starter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1,2 +1,3 @@ com.jhinno.sdk.openapi.autoconfigure.JHOpenapiClientAutoConfigure +com.jhinno.sdk.openapi.utils.JHOpenApiConfig com.jhinno.sdk.openapi.autoconfigure.JHOpenapiExecutionAutoconfigure \ No newline at end of file diff --git a/pom.xml b/pom.xml index 74664a5..ecf905d 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.jhinno jhinno-openapi-java-sdk-parent - 2.0.2 + 2.0.3 pom Jhinno OpenAPI SDK for Java parent The Jhinno OpenAPI SDK for Java used for accessing Jhinno OpenApi Service @@ -30,9 +30,13 @@ - jhinno-releases - http://192.168.87.22:8081/repository/maven-releases + yuchat + http://mirrors.yuchat.top/repository/maven-releases/ + + + +