diff --git a/flossom-modules/flossom-mini-program/pom.xml b/flossom-modules/flossom-mini-program/pom.xml index 5de6e7c..4811904 100644 --- a/flossom-modules/flossom-mini-program/pom.xml +++ b/flossom-modules/flossom-mini-program/pom.xml @@ -101,15 +101,6 @@ spring-boot-starter-test test - - - - com.shuyun.open - open-platform-sdk - 1.0.2 - system - ${project.basedir}/src/main/resources/lib/open-platform-sdk.jar - @@ -118,17 +109,6 @@ org.springframework.boot spring-boot-maven-plugin - - - true - - - - - repackage - - - diff --git a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/utils/shuyun/ShuYunApiUtils.java b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/utils/shuyun/ShuYunApiUtils.java deleted file mode 100644 index 000c4d3..0000000 --- a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/utils/shuyun/ShuYunApiUtils.java +++ /dev/null @@ -1,73 +0,0 @@ -package com.flossom.miniProgram.utils.shuyun; - -import com.fasterxml.jackson.databind.ObjectMapper; -import com.flossom.common.core.constant.CacheConstants; -import com.flossom.common.core.utils.StringUtils; -import com.flossom.common.redis.service.RedisService; -import com.flossom.miniProgram.utils.HttpClientUtils; -import com.shuyun.open.sdk.bean.HttpMethod; -import com.shuyun.open.sdk.core.GateWayClient; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - -import java.util.LinkedHashMap; -import java.util.Map; - - -/** - * 数云工具类 - */ -@Component -public class ShuYunApiUtils { - - protected final static Logger logger = LoggerFactory.getLogger(ShuYunApiUtils.class); - - private static ShuYunConfig shuYunConfig; - - private static RedisService redisService; - - @Autowired - public void setShuYunConfig(ShuYunConfig shuYunConfig) { - ShuYunApiUtils.shuYunConfig = shuYunConfig; - } - - @Autowired - public void setRedisService(RedisService redisService) { - ShuYunApiUtils.redisService = redisService; - } - - public static void refreshAccessToken() throws Exception { - String url = "https://open-client.shuyun.com/client/callback/token/" + shuYunConfig.getAppid() + "/v2"; - logger.info(url); - logger.info(HttpClientUtils.get(url)); - } - - - public static String getAccessToken(String appid, String secret) throws Exception { - String accessToken = redisService.getCacheObject(CacheConstants.SHUYUN_ACCESS_TOKEN_CACHE); - if (StringUtils.isBlank(accessToken)) { - Map params = new LinkedHashMap<>(); - params.put("platCode", "OFFLINE"); // 暂时固定 - params.put("shopId", "9005"); // 暂时固定 - params.put("id", "001"); - params.put("mobile", "13500000001"); - - String requestBody = new ObjectMapper().writeValueAsString(params); - String result = GateWayClient.askGateWay(HttpMethod.POST, - shuYunConfig.getUrl(), - null, - requestBody, - shuYunConfig.getAppid(), - shuYunConfig.getSecurity(), - null, - "shuyun.loyalty.member.register"); - - - } - return accessToken; - } - - -} diff --git a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/utils/shuyun/ShuYunConfig.java b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/utils/shuyun/ShuYunConfig.java deleted file mode 100644 index 7ed7bd6..0000000 --- a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/utils/shuyun/ShuYunConfig.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.flossom.miniProgram.utils.shuyun; - -import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.cloud.context.config.annotation.RefreshScope; -import org.springframework.context.annotation.Configuration; - -/** - * 数云接口配置 - * - * @author flossom - */ -@Configuration -@RefreshScope -@ConfigurationProperties(prefix = "shuyun") -public class ShuYunConfig { - - /** - * 接口地址 - */ - private String url; - - /** - * 数云 appid - */ - private String appid; - - /** - * 数云 security - */ - private String security; - - - public String getUrl() { - return url; - } - - public void setUrl(String url) { - this.url = url; - } - - public String getAppid() { - return appid; - } - - public void setAppid(String appid) { - this.appid = appid; - } - - public String getSecurity() { - return security; - } - - public void setSecurity(String security) { - this.security = security; - } -} diff --git a/flossom-modules/flossom-mini-program/src/main/resources/lib/open-platform-sdk.jar b/flossom-modules/flossom-mini-program/src/main/resources/lib/open-platform-sdk.jar deleted file mode 100644 index 6230e1a..0000000 Binary files a/flossom-modules/flossom-mini-program/src/main/resources/lib/open-platform-sdk.jar and /dev/null differ diff --git a/flossom-modules/flossom-system/pom.xml b/flossom-modules/flossom-system/pom.xml index a37e6ac..6536d3d 100644 --- a/flossom-modules/flossom-system/pom.xml +++ b/flossom-modules/flossom-system/pom.xml @@ -104,9 +104,9 @@ com.shuyun.open open-platform-sdk - 1.0.2 + 1.0.1 system - ${project.basedir}/src/main/resources/lib/open-platform-sdk.jar + ${project.basedir}/src/main/resources/lib/open-platform-sdk-1.0.1.jar diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/utils/shuyun/ShuYunApiUtils.java b/flossom-modules/flossom-system/src/main/java/com/flossom/system/utils/shuyun/ShuYunApiUtils.java index 88378ed..ff744a8 100644 --- a/flossom-modules/flossom-system/src/main/java/com/flossom/system/utils/shuyun/ShuYunApiUtils.java +++ b/flossom-modules/flossom-system/src/main/java/com/flossom/system/utils/shuyun/ShuYunApiUtils.java @@ -3,7 +3,6 @@ package com.flossom.system.utils.shuyun; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.map.MapUtil; import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.TypeReference; import com.flossom.common.core.constant.CacheConstants; import com.flossom.common.core.domain.R; diff --git a/flossom-modules/flossom-system/src/main/resources/lib/open-platform-sdk-1.0.1.jar b/flossom-modules/flossom-system/src/main/resources/lib/open-platform-sdk-1.0.1.jar new file mode 100644 index 0000000..45e534e Binary files /dev/null and b/flossom-modules/flossom-system/src/main/resources/lib/open-platform-sdk-1.0.1.jar differ diff --git a/flossom-modules/flossom-system/src/main/resources/lib/open-platform-sdk.jar b/flossom-modules/flossom-system/src/main/resources/lib/open-platform-sdk.jar deleted file mode 100644 index 6230e1a..0000000 Binary files a/flossom-modules/flossom-system/src/main/resources/lib/open-platform-sdk.jar and /dev/null differ