Commit e7dadea9 authored by 郝增润's avatar 郝增润

兼容微信端

parent a5eba71a
...@@ -180,12 +180,10 @@ public class Open2DuibaController { ...@@ -180,12 +180,10 @@ public class Open2DuibaController {
try { try {
LOGGER.info("autologin,autologinParam={}", JSON.toJSONString(autologinParam)); LOGGER.info("autologin,autologinParam={}", JSON.toJSONString(autologinParam));
String token = autologinParam.getToken(); String token = autologinParam.getToken();
// String source = JdTokenSourceEnum.JD.getSource();
String source = Optional.ofNullable(autologinParam.getSource()).orElse(JdTokenSourceEnum.JD.getSource()); String source = Optional.ofNullable(autologinParam.getSource()).orElse(JdTokenSourceEnum.JD.getSource());
LOGGER.info("source,source={}", source); LOGGER.info("source,source={}", source);
String redirectUrl = autologinParam.getRedirectUrl(); String redirectUrl = autologinParam.getRedirectUrl();
String env = autologinParam.getEnv(); String env = autologinParam.getEnv();
Long venderId = autologinParam.getVenderId(); Long venderId = autologinParam.getVenderId();
Long shopId = autologinParam.getShopId(); Long shopId = autologinParam.getShopId();
if (venderId == null && shopId == null) { if (venderId == null && shopId == null) {
...@@ -236,6 +234,11 @@ public class Open2DuibaController { ...@@ -236,6 +234,11 @@ public class Open2DuibaController {
* 生成免登url * 生成免登url
*/ */
private String autologin(DuibaAppEnum duibaApp, String uid, String nickName, String avatar, String redirectUrl, String env, String credits) { private String autologin(DuibaAppEnum duibaApp, String uid, String nickName, String avatar, String redirectUrl, String env, String credits) {
if (env.equals("taobao")) {
return redirectUrl + "&avatar=" + avatar + "&nickname=" + nickName + "&uid=" + uid;
}
CreditTool tool = new CreditTool(duibaApp.getAppKey(), duibaApp.getAppSecret()); CreditTool tool = new CreditTool(duibaApp.getAppKey(), duibaApp.getAppSecret());
Map<String, String> params = new HashMap<>(); Map<String, String> params = new HashMap<>();
......
spring.application.name=jd-activity spring.application.name=jd-activity
spring.profiles.active=prod spring.profiles.active=dev
# 先排除一些autoconfigure # 先排除一些autoconfigure
spring.autoconfigure.exclude= spring.autoconfigure.exclude=
# tomcat # tomcat
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment