From 552bea3173a19c31b14bb84bebeff193213275de Mon Sep 17 00:00:00 2001 From: FeelMoose Date: Thu, 4 Jan 2024 17:43:27 +0800 Subject: [PATCH] feat update sast-link-sdk --- lib/SastLink-Java-SDK-0.0.1.jar | Bin 60399 -> 0 bytes pom.xml | 16 ++++++++-------- .../typehandler/OrganizationTypeHandler.java | 2 +- .../evento/config/SastLinkServiceConfig.java | 10 +++++----- .../sast/evento/controller/LoginController.java | 5 ++--- .../sast/evento/controller/TestController.java | 13 +++++++------ src/main/java/sast/evento/entitiy/User.java | 2 +- .../java/sast/evento/service/LoginService.java | 4 ++-- .../evento/service/impl/LoginServiceImpl.java | 9 +++++---- 9 files changed, 31 insertions(+), 30 deletions(-) delete mode 100644 lib/SastLink-Java-SDK-0.0.1.jar diff --git a/lib/SastLink-Java-SDK-0.0.1.jar b/lib/SastLink-Java-SDK-0.0.1.jar deleted file mode 100644 index 4c225d8c18ea51debbcf0d2720dff090d90657e1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 60399 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 P9`NG`cQy_JAcylmZ)dHG diff --git a/pom.xml b/pom.xml index 280d7b3..6391d0c 100644 --- a/pom.xml +++ b/pom.xml @@ -17,14 +17,7 @@ 17 - - link.sast - SastLink-Java-SDK - jar - 0.0.1 - system - ${pom.basedir}/lib/SastLink-Java-SDK-0.0.1.jar - + org.springframework.boot spring-boot-starter-web @@ -38,6 +31,13 @@ spring-boot-starter-cache + + + fun.feellmoose + sast-link-SDK + 0.1.2 + + org.springframework.boot diff --git a/src/main/java/sast/evento/common/typehandler/OrganizationTypeHandler.java b/src/main/java/sast/evento/common/typehandler/OrganizationTypeHandler.java index 9dc3246..ec72730 100644 --- a/src/main/java/sast/evento/common/typehandler/OrganizationTypeHandler.java +++ b/src/main/java/sast/evento/common/typehandler/OrganizationTypeHandler.java @@ -1,8 +1,8 @@ package sast.evento.common.typehandler; +import fun.feellmoose.enums.Organization; import org.apache.ibatis.type.BaseTypeHandler; import org.apache.ibatis.type.JdbcType; -import sast.sastlink.sdk.enums.Organization; import java.sql.CallableStatement; import java.sql.PreparedStatement; diff --git a/src/main/java/sast/evento/config/SastLinkServiceConfig.java b/src/main/java/sast/evento/config/SastLinkServiceConfig.java index 5e5e988..a8f884d 100644 --- a/src/main/java/sast/evento/config/SastLinkServiceConfig.java +++ b/src/main/java/sast/evento/config/SastLinkServiceConfig.java @@ -3,8 +3,8 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import sast.sastlink.sdk.service.SastLinkService; -import sast.sastlink.sdk.test.RestTemplateTestSastLinkService; +import fun.feellmoose.service.SastLinkService; +import fun.feellmoose.test.TestSastLinkServiceAdapter; /** * @projectName: sast-evento-backend @@ -40,7 +40,7 @@ public class SastLinkServiceConfig { @Bean public SastLinkService sastLinkService() { - return RestTemplateTestSastLinkService.builder() + return new TestSastLinkServiceAdapter.Builder() .setRedirectUri(redirectUri) .setClientId(clientId) .setClientSecret(clientSecret) @@ -51,7 +51,7 @@ public SastLinkService sastLinkService() { @Bean public SastLinkService sastLinkServiceWeb() { - return RestTemplateTestSastLinkService.builder() + return new TestSastLinkServiceAdapter.Builder() .setRedirectUri(redirectUri_web) .setClientId(clientId_web) .setClientSecret(clientSecret_web) @@ -62,7 +62,7 @@ public SastLinkService sastLinkServiceWeb() { @Bean public SastLinkService sastLinkServiceMobileDev() { - return RestTemplateTestSastLinkService.builder() + return new TestSastLinkServiceAdapter.Builder() .setRedirectUri(redirectUri_mobile_dev) .setClientId(clientId_mobile_dev) .setClientSecret(clientSecret_mobile_dev) diff --git a/src/main/java/sast/evento/controller/LoginController.java b/src/main/java/sast/evento/controller/LoginController.java index 13c643d..7a0167e 100644 --- a/src/main/java/sast/evento/controller/LoginController.java +++ b/src/main/java/sast/evento/controller/LoginController.java @@ -1,18 +1,17 @@ package sast.evento.controller; +import fun.feellmoose.exception.SastLinkException; import jakarta.annotation.Resource; import org.springframework.web.bind.annotation.*; import sast.evento.annotation.DefaultActionState; import sast.evento.annotation.OperateLog; import sast.evento.common.enums.ActionState; import sast.evento.common.enums.ErrorEnum; -import sast.evento.common.enums.Platform; -import sast.evento.entitiy.User; import sast.evento.exception.LocalRunTimeException; import sast.evento.interceptor.HttpInterceptor; import sast.evento.model.UserModel; import sast.evento.service.LoginService; -import sast.sastlink.sdk.exception.SastLinkException; + import java.util.Map; diff --git a/src/main/java/sast/evento/controller/TestController.java b/src/main/java/sast/evento/controller/TestController.java index d15a321..67737ba 100644 --- a/src/main/java/sast/evento/controller/TestController.java +++ b/src/main/java/sast/evento/controller/TestController.java @@ -1,6 +1,8 @@ package sast.evento.controller; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import fun.feellmoose.test.TestSastLinkServiceAdapter; +import fun.feellmoose.test.data.Token; import jakarta.annotation.Resource; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; @@ -22,8 +24,7 @@ import sast.evento.model.Action; import sast.evento.model.UserModel; import sast.evento.service.PermissionService; -import sast.sastlink.sdk.test.RestTemplateTestSastLinkService; -import sast.sastlink.sdk.test.data.Token; + import java.util.List; import java.util.stream.Collectors; @@ -38,11 +39,11 @@ public class TestController { private String method; @Resource - private RestTemplateTestSastLinkService sastLinkService; + private TestSastLinkServiceAdapter sastLinkService; @Resource - private RestTemplateTestSastLinkService sastLinkServiceWeb; + private TestSastLinkServiceAdapter sastLinkServiceWeb; @Resource - private RestTemplateTestSastLinkService sastLinkServiceMobileDev; + private TestSastLinkServiceAdapter sastLinkServiceMobileDev; @Resource private PermissionService permissionService; @Resource @@ -57,7 +58,7 @@ public class TestController { public String linkLogin(@RequestParam Integer type, @RequestParam String email, @RequestParam String password) { - RestTemplateTestSastLinkService service = switch (type) { + TestSastLinkServiceAdapter service = switch (type) { case 0 -> sastLinkService; case 1 -> sastLinkServiceWeb; case 2 -> sastLinkServiceMobileDev; diff --git a/src/main/java/sast/evento/entitiy/User.java b/src/main/java/sast/evento/entitiy/User.java index b1049a2..bc0ed03 100644 --- a/src/main/java/sast/evento/entitiy/User.java +++ b/src/main/java/sast/evento/entitiy/User.java @@ -7,11 +7,11 @@ import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler; import com.fasterxml.jackson.annotation.JsonAlias; import com.fasterxml.jackson.annotation.JsonIgnore; +import fun.feellmoose.model.UserInfo; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; import sast.evento.common.typehandler.OrganizationTypeHandler; -import sast.sastlink.sdk.model.UserInfo; import java.util.List; diff --git a/src/main/java/sast/evento/service/LoginService.java b/src/main/java/sast/evento/service/LoginService.java index 7091cd4..cf01eb3 100644 --- a/src/main/java/sast/evento/service/LoginService.java +++ b/src/main/java/sast/evento/service/LoginService.java @@ -1,7 +1,7 @@ package sast.evento.service; -import jakarta.annotation.Nullable; -import sast.sastlink.sdk.exception.SastLinkException; + +import fun.feellmoose.exception.SastLinkException; import java.util.Map; diff --git a/src/main/java/sast/evento/service/impl/LoginServiceImpl.java b/src/main/java/sast/evento/service/impl/LoginServiceImpl.java index 35c71be..b4e3455 100644 --- a/src/main/java/sast/evento/service/impl/LoginServiceImpl.java +++ b/src/main/java/sast/evento/service/impl/LoginServiceImpl.java @@ -1,6 +1,10 @@ package sast.evento.service.impl; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import fun.feellmoose.exception.SastLinkException; +import fun.feellmoose.model.UserInfo; +import fun.feellmoose.model.response.data.AccessToken; +import fun.feellmoose.service.SastLinkService; import jakarta.annotation.Nonnull; import jakarta.annotation.Nullable; import jakarta.annotation.Resource; @@ -17,10 +21,7 @@ import sast.evento.service.LoginService; import sast.evento.service.WxService; import sast.evento.utils.*; -import sast.sastlink.sdk.exception.SastLinkException; -import sast.sastlink.sdk.model.UserInfo; -import sast.sastlink.sdk.model.response.data.AccessToken; -import sast.sastlink.sdk.service.SastLinkService; + import java.util.HashMap; import java.util.Map;