补充enum

src/main/java/cn/com/duiba/jdactivity/controller/AppController.java

@@ -5,7 +5,7 @@ import cn.com.duiba.jdactivity.common.utils.user.ShopUserCookieDto;
 import cn.com.duiba.jdactivity.common.utils.user.UserUtils;
 import cn.com.duiba.jdactivity.common.vo.Result;
 import cn.com.duiba.jdactivity.common.vo.ResultBuilder;
-import cn.com.duiba.jdactivity.developer.jd.JdAppEnum;
+import cn.com.duiba.jdactivity.developer.jd.constant.JdAppEnum;
 import cn.com.duiba.jdactivity.developer.jd.domain.AccessTokenResponse;
 import cn.com.duiba.jdactivity.developer.jd.domain.JosParameters;
 import cn.com.duiba.jdactivity.developer.jd.utils.AccessTokenUtils;

src/main/java/cn/com/duiba/jdactivity/controller/Open2DuibaController.java

@@ -7,8 +7,9 @@ import cn.com.duiba.jdactivity.common.utils.UrlUtils;
 import cn.com.duiba.jdactivity.common.vo.Result;
 import cn.com.duiba.jdactivity.common.vo.ResultBuilder;
 import cn.com.duiba.jdactivity.developer.duiba.DuibaAppEnum;
-import cn.com.duiba.jdactivity.developer.jd.JdAppEnum;
-import cn.com.duiba.jdactivity.developer.jd.JdShopEnum;
+import cn.com.duiba.jdactivity.developer.jd.constant.JdAppEnum;
+import cn.com.duiba.jdactivity.developer.jd.constant.JdShopEnum;
+import cn.com.duiba.jdactivity.developer.jd.constant.JdTokenSourceEnum;
 import cn.com.duiba.jdactivity.developer.jd.utils.AccessTokenUtils;
 import cn.com.duiba.jdactivity.developer.jd.utils.EncryptUtil;
 import cn.com.duiba.jdactivity.developer.jd.utils.JdApiUtil;
@@ -99,8 +100,7 @@ public class Open2DuibaController {
             String env = autologinParam.getEnv();
 
             if (StringUtils.isBlank(source)) {
-                // 01: 京东 App，02：微信
-                source = "01";
+                source = JdTokenSourceEnum.JD.getSource();
             }
 
             TbShopAccessTokenDto accessToken = accessTokenUtils.getAccessToken(venderId, shopId);

src/main/java/cn/com/duiba/jdactivity/developer/jd/UrlConstants.java

-package cn.com.duiba.jdactivity.developer.jd;
-
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.context.annotation.Configuration;
-
-/**
- * @author zsp (zengshuiping@duiba.com.cn)
- * @date 2021/5/13 15:05
- */
-@Configuration
-@ConfigurationProperties(prefix = "jd.url")
-public class UrlConstants {
-    private String oauthUrl = "https://open-oauth.jd.com/oauth2";
-    private String apiServerUrl = "https://api.jd.com/routerjson";
-    private String logServerUrl = "https://api-log.jd.com/routerjson";
-
-    public String getOauthUrl() {
-        return oauthUrl;
-    }
-
-    public void setOauthUrl(String oauthUrl) {
-        this.oauthUrl = oauthUrl;
-    }
-
-    public String getApiServerUrl() {
-        return apiServerUrl;
-    }
-
-    public void setApiServerUrl(String apiServerUrl) {
-        this.apiServerUrl = apiServerUrl;
-    }
-
-    public String getLogServerUrl() {
-        return logServerUrl;
-    }
-
-    public void setLogServerUrl(String logServerUrl) {
-        this.logServerUrl = logServerUrl;
-    }
-}

src/main/java/cn/com/duiba/jdactivity/developer/jd/JdAppEnum.java → src/main/java/cn/com/duiba/jdactivity/developer/jd/constant/JdAppEnum.java

-package cn.com.duiba.jdactivity.developer.jd;
+package cn.com.duiba.jdactivity.developer.jd.constant;
 
 import java.util.Objects;
 

src/main/java/cn/com/duiba/jdactivity/developer/jd/constant/JdServerUrlEnum.java

+package cn.com.duiba.jdactivity.developer.jd.constant;
+
+public enum JdServerUrlEnum {
+    OAUTH_URL("https://open-oauth.jd.com/oauth2"),
+    API_URL("https://api.jd.com/routerjson"),
+    LOG_URL("https://api-log.jd.com/routerjson"),
+    ;
+
+
+    private final String url;
+
+    JdServerUrlEnum(String url) {
+        this.url = url;
+    }
+
+    public String getUrl() {
+        return url;
+    }
+}

src/main/java/cn/com/duiba/jdactivity/developer/jd/JdShopEnum.java → src/main/java/cn/com/duiba/jdactivity/developer/jd/constant/JdShopEnum.java

-package cn.com.duiba.jdactivity.developer.jd;
+package cn.com.duiba.jdactivity.developer.jd.constant;
 
 public enum JdShopEnum {
     DUIBA("杭州兑吧", 10139787L, 10276497L),

src/main/java/cn/com/duiba/jdactivity/developer/jd/constant/JdTokenSourceEnum.java

+package cn.com.duiba.jdactivity.developer.jd.constant;
+
+/**
+ * 01: 京东 App，02：微信
+ */
+public enum JdTokenSourceEnum {
+    JD("01"),
+    WX("02");
+
+    private final String source;
+
+    JdTokenSourceEnum(String source) {
+        this.source = source;
+    }
+
+    public String getSource() {
+        return source;
+    }
+}

src/main/java/cn/com/duiba/jdactivity/developer/jd/utils/AccessTokenUtils.java

@@ -2,8 +2,8 @@ package cn.com.duiba.jdactivity.developer.jd.utils;
 
 import cn.com.duiba.jdactivity.common.utils.HttpClientUtil;
 import cn.com.duiba.jdactivity.common.utils.UrlUtils;
-import cn.com.duiba.jdactivity.developer.jd.JdAppEnum;
-import cn.com.duiba.jdactivity.developer.jd.UrlConstants;
+import cn.com.duiba.jdactivity.developer.jd.constant.JdAppEnum;
+import cn.com.duiba.jdactivity.developer.jd.constant.JdServerUrlEnum;
 import cn.com.duiba.jdactivity.developer.jd.domain.AccessTokenResponse;
 import cn.com.duiba.jdactivity.dto.TbShopAccessTokenDto;
 import cn.com.duiba.jdactivity.exception.BizException;
@@ -39,8 +39,6 @@ public class AccessTokenUtils {
     private static final String ACCESS_TOKEN_SUFFIX = "/access_token";
     private static final String NULL = "null";
 
-    @Resource
-    private UrlConstants urlConstants;
     @Resource
     private HttpClientUtil httpClientUtil;
     @Resource
@@ -53,7 +51,7 @@ public class AccessTokenUtils {
         param.put("redirect_uri", appKey.getUrl());
         param.put("scope", "snsapi_base");
         param.put("state", state);
-        return UrlUtils.assembleUrl(urlConstants.getOauthUrl() + TO_LOGIN_SUFFIX, param);
+        return UrlUtils.assembleUrl(JdServerUrlEnum.OAUTH_URL.getUrl() + TO_LOGIN_SUFFIX, param);
     }
 
 
@@ -63,7 +61,7 @@ public class AccessTokenUtils {
         param.put("app_secret", appKey.getAppSecret());
         param.put("grant_type", "authorization_code");
         param.put("code", code);
-        String url = UrlUtils.assembleUrl(urlConstants.getOauthUrl() + ACCESS_TOKEN_SUFFIX, param);
+        String url = UrlUtils.assembleUrl(JdServerUrlEnum.OAUTH_URL.getUrl() + ACCESS_TOKEN_SUFFIX, param);
         String s = httpClientUtil.sendGet(url);
 
         LOGGER.info("getAccessTokenByCode,code={},url={},s={}", code, url, s);

src/main/java/cn/com/duiba/jdactivity/developer/jd/utils/EncryptUtil.java

 package cn.com.duiba.jdactivity.developer.jd.utils;
 
-import cn.com.duiba.jdactivity.developer.jd.JdAppEnum;
-import cn.com.duiba.jdactivity.developer.jd.UrlConstants;
+import cn.com.duiba.jdactivity.developer.jd.constant.JdAppEnum;
+import cn.com.duiba.jdactivity.developer.jd.constant.JdServerUrlEnum;
 import com.jd.security.tdeclient.SecretJdClient;
 import com.jd.security.tdeclient.TDEClient;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 
-import javax.annotation.Resource;
-
 /**
  * @author zsp (zengshuiping@duiba.com.cn)
  * @date 2021/5/18 16:04
@@ -18,10 +16,6 @@ import javax.annotation.Resource;
 public class EncryptUtil {
     public static final Logger LOGGER = LoggerFactory.getLogger(EncryptUtil.class);
 
-    @Resource
-    private UrlConstants urlConstants;
-
-
     public String encryptString(JdAppEnum jdAppEnum, String accessToken, String plaintext) {
         try {
             TDEClient tdeClient = getClient(jdAppEnum, accessToken);
@@ -44,6 +38,6 @@ public class EncryptUtil {
     }
 
     private TDEClient getClient(JdAppEnum jdAppEnum, String accessToken) throws Exception {
-        return SecretJdClient.getInstance(urlConstants.getApiServerUrl(), accessToken, jdAppEnum.getAppKey(), jdAppEnum.getAppSecret());
+        return SecretJdClient.getInstance(JdServerUrlEnum.API_URL.getUrl(), accessToken, jdAppEnum.getAppKey(), jdAppEnum.getAppSecret());
     }
 }

src/main/java/cn/com/duiba/jdactivity/developer/jd/utils/JdApiUtil.java

@@ -2,9 +2,9 @@ package cn.com.duiba.jdactivity.developer.jd.utils;
 
 import cn.com.duiba.jdactivity.common.vo.Result;
 import cn.com.duiba.jdactivity.common.vo.ResultBuilder;
-import cn.com.duiba.jdactivity.developer.jd.JdAppEnum;
 import cn.com.duiba.jdactivity.developer.jd.Main;
-import cn.com.duiba.jdactivity.developer.jd.UrlConstants;
+import cn.com.duiba.jdactivity.developer.jd.constant.JdAppEnum;
+import cn.com.duiba.jdactivity.developer.jd.constant.JdServerUrlEnum;
 import com.alibaba.fastjson.JSON;
 import com.jd.open.api.sdk.DefaultJdClient;
 import com.jd.open.api.sdk.JdClient;
@@ -45,7 +45,6 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 
-import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
@@ -65,10 +64,6 @@ public class JdApiUtil {
     private static final String CODE_SUCCESS = "0";
     private static final DateTimeFormatter formatTime = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
 
-    @Resource
-    private UrlConstants urlConstants;
-
-
     /**
      * 查询商家基本信息
      */
@@ -205,7 +200,7 @@ public class JdApiUtil {
     }
 
     private DefaultJdClient getJdClient(JdAppEnum jdAppEnum, String accessToken) {
-        return new DefaultJdClient(urlConstants.getApiServerUrl(), accessToken, jdAppEnum.getAppKey(), jdAppEnum.getAppSecret());
+        return new DefaultJdClient(JdServerUrlEnum.API_URL.getUrl(), accessToken, jdAppEnum.getAppKey(), jdAppEnum.getAppSecret());
     }
 
     /**

src/main/java/cn/com/duiba/jdactivity/developer/jd/utils/LogUtil.java

 package cn.com.duiba.jdactivity.developer.jd.utils;
 
 import cn.com.duiba.jdactivity.common.utils.RequestTool;
-import cn.com.duiba.jdactivity.developer.jd.JdAppEnum;
-import cn.com.duiba.jdactivity.developer.jd.UrlConstants;
+import cn.com.duiba.jdactivity.developer.jd.constant.JdAppEnum;
+import cn.com.duiba.jdactivity.developer.jd.constant.JdServerUrlEnum;
 import com.alibaba.fastjson.JSON;
 import com.jd.open.api.sdk.DefaultJdClient;
 import com.jd.open.api.sdk.JdClient;
@@ -15,7 +15,6 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 
-import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.util.Objects;
 
@@ -28,8 +27,6 @@ import java.util.Objects;
 @Component
 public class LogUtil {
     public static final Logger LOGGER = LoggerFactory.getLogger(LogUtil.class);
-    @Resource
-    private UrlConstants urlConstants;
 
 
     private static String getDeviceId() {
@@ -113,6 +110,6 @@ public class LogUtil {
     }
 
     private DefaultJdClient getClient(JdAppEnum jdAppEnum) {
-        return new DefaultJdClient(urlConstants.getLogServerUrl(), "", jdAppEnum.getAppKey(), jdAppEnum.getAppSecret());
+        return new DefaultJdClient(JdServerUrlEnum.LOG_URL.getUrl(), "", jdAppEnum.getAppKey(), jdAppEnum.getAppSecret());
     }
 }

src/main/resources/application.properties

@@ -18,6 +18,3 @@ spring.thymeleaf.suffix=.html
 spring.thymeleaf.mode=HTML
 spring.thymeleaf.cache=false
 
-#测试店铺 开放运营部测试用店铺一号 todo 后续通过链接做成通用
-jd.bosideng.venderId=10276497
-jd.bosideng.shopId=10139787

src/test/java/cn/com/duiba/jdactivity/controller/Open2DuibaControllerTest.java

 package cn.com.duiba.jdactivity.controller;
 
 import cn.com.duiba.jdactivity.ControllerTest;
-import cn.com.duiba.jdactivity.developer.jd.JdAppEnum;
+import cn.com.duiba.jdactivity.developer.jd.constant.JdAppEnum;
 import org.junit.jupiter.api.Test;
 
 import javax.annotation.Resource;

src/test/java/cn/com/duiba/jdactivity/developer/jd/AccessTokenUtilsTest.java

 package cn.com.duiba.jdactivity.developer.jd;
 
 import cn.com.duiba.jdactivity.BaseTest;
+import cn.com.duiba.jdactivity.developer.jd.constant.JdAppEnum;
 import cn.com.duiba.jdactivity.developer.jd.domain.AccessTokenResponse;
 import cn.com.duiba.jdactivity.developer.jd.utils.AccessTokenUtils;
 import com.alibaba.fastjson.JSON;

src/test/java/cn/com/duiba/jdactivity/developer/jd/utils/EncryptUtilTest.java

 package cn.com.duiba.jdactivity.developer.jd.utils;
 
 import cn.com.duiba.jdactivity.BaseTest;
-import cn.com.duiba.jdactivity.developer.jd.JdAppEnum;
+import cn.com.duiba.jdactivity.developer.jd.constant.JdAppEnum;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 

src/test/java/cn/com/duiba/jdactivity/developer/jd/utils/JdApiUtilTest.java

 package cn.com.duiba.jdactivity.developer.jd.utils;
 
 import cn.com.duiba.jdactivity.BaseTest;
-import cn.com.duiba.jdactivity.developer.jd.JdAppEnum;
+import cn.com.duiba.jdactivity.developer.jd.constant.JdAppEnum;
 import com.alibaba.fastjson.JSON;
 import org.junit.jupiter.api.Test;
 

src/test/java/cn/com/duiba/jdactivity/service/TbShopAccessTokenServiceTest.java

 package cn.com.duiba.jdactivity.service;
 
 import cn.com.duiba.jdactivity.BaseTest;
-import cn.com.duiba.jdactivity.developer.jd.JdAppEnum;
+import cn.com.duiba.jdactivity.developer.jd.constant.JdAppEnum;
 import cn.com.duiba.jdactivity.dto.TbShopAccessTokenDto;
 import com.alibaba.fastjson.JSON;
 import org.junit.jupiter.api.Test;