Skip to content

X
xyqb-user2
Commit 739b465c authored by 李健华's avatar 李健华
Browse files
Options

神策埋点增加开关配置，默认关闭

parent 59578b77
Hide whitespace changes
Inline Side-by-side
Showing with 69 additions and 55 deletions
src/main/java/cn/quantgroup/xyqb/controller/internal/user/AppController.java
View file @ 739b465c
...@@ -27,6 +27,7 @@ import io.swagger.annotations.ApiOperation; ...@@ -27,6 +27,7 @@ import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.security.core.Authentication; import org.springframework.security.core.Authentication;
import org.springframework.util.ObjectUtils; import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
...@@ -61,6 +62,9 @@ public class AppController implements IBaseController { ...@@ -61,6 +62,9 @@ public class AppController implements IBaseController {
@Autowired @Autowired
private IUserRegisterService userRegisterService; private IUserRegisterService userRegisterService;
@Value("${sc.is.open:false}")
private Boolean scIsOpen;
@IpValidator @IpValidator
@AuthorizationPoint @AuthorizationPoint
@RequestMapping("/auth/v1/login") @RequestMapping("/auth/v1/login")
...@@ -263,39 +267,42 @@ public class AppController implements IBaseController { ...@@ -263,39 +267,42 @@ public class AppController implements IBaseController {
log.info("=setLoginInfo end"); log.info("=setLoginInfo end");
log.info("第三方用户获取信息登录成功 [AppController] loginSuper --> loginFrom:{}, phoneNo:{},appChannel:{},channelId:{}", registerFrom, phoneNo, appChannel, channelId); log.info("第三方用户获取信息登录成功 [AppController] loginSuper --> loginFrom:{}, phoneNo:{},appChannel:{},channelId:{}", registerFrom, phoneNo, appChannel, channelId);
try { // 登陆是否上报神策
String scDeviceId=request.getHeader("scDeviceId"); if (scIsOpen) {
if(!StringUtils.isEmpty(scDeviceId)){ try {
iSensorsAnalytics.trackSignUp( user.getUuid(),scDeviceId); String scDeviceId=request.getHeader("scDeviceId");
} if(!StringUtils.isEmpty(scDeviceId)){
String terminal=request.getHeader("terminal"); iSensorsAnalytics.trackSignUp( user.getUuid(),scDeviceId);
String channel=request.getHeader("channel"); }
log.info("--------手机号{}-------scDeviceId{},terminal{},channel{},是否注册{}",phoneNo,scDeviceId,terminal,channel,isRegister); String terminal=request.getHeader("terminal");
if(!StringUtils.isEmpty(terminal)&&"APP".equals(terminal)||!StringUtils.isEmpty(channel)&&("214".equals(channel)||"217".equals(channel))){ String channel=request.getHeader("channel");
if(isRegister){ log.info("--------手机号{}-------scDeviceId{},terminal{},channel{},是否注册{}",phoneNo,scDeviceId,terminal,channel,isRegister);
EventRecord userRecord = EventRecord.builder().setDistinctId(user.getUuid()).isLoginId(Boolean.TRUE) if(!StringUtils.isEmpty(terminal)&&"APP".equals(terminal)||!StringUtils.isEmpty(channel)&&("214".equals(channel)||"217".equals(channel))){
.setEventName("App_RegisterEvent") if(isRegister){
.build(); EventRecord userRecord = EventRecord.builder().setDistinctId(user.getUuid()).isLoginId(Boolean.TRUE)
iSensorsAnalytics.track(userRecord); .setEventName("App_RegisterEvent")
.build();
iSensorsAnalytics.track(userRecord);
}else {
EventRecord userRecord = EventRecord.builder().setDistinctId(user.getUuid()).isLoginId(Boolean.TRUE)
.setEventName("App_LoginEvent")
.build();
iSensorsAnalytics.track(userRecord);
}
iSensorsAnalytics.flush();
}else { }else {
EventRecord userRecord = EventRecord.builder().setDistinctId(user.getUuid()).isLoginId(Boolean.TRUE) EventRecord userRecord = EventRecord.builder().setDistinctId(user.getUuid()).isLoginId(Boolean.TRUE)
.setEventName("App_LoginEvent") .setEventName("PD_WUXIEC_UserLoginVccorCash")
.addProperty("son_channel_id", user.getRegisteredFrom())
.addProperty("parent_channel_id", -1L)
.addProperty("vcccash_uuid", user.getUuid())
.build(); .build();
iSensorsAnalytics.track(userRecord); iSensorsAnalytics.track(userRecord);
iSensorsAnalytics.flush();
} }
iSensorsAnalytics.flush(); } catch (Exception e) {
}else { log.info("神策埋点出现问题", e);
EventRecord userRecord = EventRecord.builder().setDistinctId(user.getUuid()).isLoginId(Boolean.TRUE)
.setEventName("PD_WUXIEC_UserLoginVccorCash")
.addProperty("son_channel_id", user.getRegisteredFrom())
.addProperty("parent_channel_id", -1L)
.addProperty("vcccash_uuid", user.getUuid())
.build();
iSensorsAnalytics.track(userRecord);
iSensorsAnalytics.flush();
} }
} catch (Exception e) {
log.info("神策埋点出现问题", e);
} }
return JsonResult.buildSuccessResult("登陆成功", loginInfo); return JsonResult.buildSuccessResult("登陆成功", loginInfo);
} }
......
src/main/java/cn/quantgroup/xyqb/service/user/impl/UserServiceImpl.java
View file @ 739b465c
...@@ -31,6 +31,7 @@ import com.sensorsdata.analytics.javasdk.bean.EventRecord; ...@@ -31,6 +31,7 @@ import com.sensorsdata.analytics.javasdk.bean.EventRecord;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.cache.annotation.CacheEvict; import org.springframework.cache.annotation.CacheEvict;
import org.springframework.cache.annotation.Caching; import org.springframework.cache.annotation.Caching;
import org.springframework.context.ApplicationEventPublisher; import org.springframework.context.ApplicationEventPublisher;
...@@ -116,6 +117,9 @@ public class UserServiceImpl implements IUserService, IBaseController { ...@@ -116,6 +117,9 @@ public class UserServiceImpl implements IUserService, IBaseController {
@Resource @Resource
private IGeetestLogService geetestLogService; private IGeetestLogService geetestLogService;
@Value("${sc.is.open:false}")
private Boolean scIsOpen;
@Override @Override
// @Cacheable(value = "usercache", key = "'xyqbuser' + #phone", unless = "#result == null", cacheManager = "cacheManager") // @Cacheable(value = "usercache", key = "'xyqbuser' + #phone", unless = "#result == null", cacheManager = "cacheManager")
public User findByPhoneInDb(String phone) { public User findByPhoneInDb(String phone) {
...@@ -391,40 +395,43 @@ public class UserServiceImpl implements IUserService, IBaseController { ...@@ -391,40 +395,43 @@ public class UserServiceImpl implements IUserService, IBaseController {
if (!wechatRelateUserIfNecessary(user, request)) { if (!wechatRelateUserIfNecessary(user, request)) {
return JsonResult.buildErrorStateResult("登录时微信关联失败", null); return JsonResult.buildErrorStateResult("登录时微信关联失败", null);
} }
try {
String scDeviceId = request.getHeader("scDeviceId"); if (scIsOpen) {
if (!StringUtils.isEmpty(scDeviceId)) { try {
iSensorsAnalytics.trackSignUp(user.getUuid(), scDeviceId); String scDeviceId = request.getHeader("scDeviceId");
} if (!StringUtils.isEmpty(scDeviceId)) {
String terminal = request.getHeader("terminal"); iSensorsAnalytics.trackSignUp(user.getUuid(), scDeviceId);
String channel = request.getHeader("channel"); }
log.info("--------手机号{}-------scDeviceId{},terminal{},channel{},是否注册{}", phoneNo, scDeviceId, terminal, channel, register); String terminal = request.getHeader("terminal");
if (!StringUtils.isEmpty(terminal) && "APP".equals(terminal) || !StringUtils.isEmpty(channel) && ("214".equals(channel) || "217".equals(channel))) { String channel = request.getHeader("channel");
if (register) { log.info("--------手机号{}-------scDeviceId{},terminal{},channel{},是否注册{}", phoneNo, scDeviceId, terminal, channel, register);
EventRecord userRecord = EventRecord.builder().setDistinctId(user.getUuid()).isLoginId(Boolean.TRUE) if (!StringUtils.isEmpty(terminal) && "APP".equals(terminal) || !StringUtils.isEmpty(channel) && ("214".equals(channel) || "217".equals(channel))) {
.setEventName("App_RegisterEvent") if (register) {
.build(); EventRecord userRecord = EventRecord.builder().setDistinctId(user.getUuid()).isLoginId(Boolean.TRUE)
iSensorsAnalytics.track(userRecord); .setEventName("App_RegisterEvent")
.build();
iSensorsAnalytics.track(userRecord);
} else {
EventRecord userRecord = EventRecord.builder().setDistinctId(user.getUuid()).isLoginId(Boolean.TRUE)
.setEventName("App_LoginEvent")
.build();
iSensorsAnalytics.track(userRecord);
}
iSensorsAnalytics.flush();
} else { } else {
log.info("老神策埋点{},{}------------", user.getRegisteredFrom(), user.getUuid());
EventRecord userRecord = EventRecord.builder().setDistinctId(user.getUuid()).isLoginId(Boolean.TRUE) EventRecord userRecord = EventRecord.builder().setDistinctId(user.getUuid()).isLoginId(Boolean.TRUE)
.setEventName("App_LoginEvent") .setEventName("PD_WUXIEC_UserLoginVccorCash")
.addProperty("son_channel_id", user.getRegisteredFrom())
.addProperty("parent_channel_id", -1L)
.addProperty("vcccash_uuid", user.getUuid())
.build(); .build();
iSensorsAnalytics.track(userRecord); iSensorsAnalytics.track(userRecord);
iSensorsAnalytics.flush();
} }
iSensorsAnalytics.flush(); } catch (Exception e) {
} else { log.info("神策埋点出现问题", e);
log.info("老神策埋点{},{}------------", user.getRegisteredFrom(), user.getUuid());
EventRecord userRecord = EventRecord.builder().setDistinctId(user.getUuid()).isLoginId(Boolean.TRUE)
.setEventName("PD_WUXIEC_UserLoginVccorCash")
.addProperty("son_channel_id", user.getRegisteredFrom())
.addProperty("parent_channel_id", -1L)
.addProperty("vcccash_uuid", user.getUuid())
.build();
iSensorsAnalytics.track(userRecord);
iSensorsAnalytics.flush();
} }
} catch (Exception e) {
log.info("神策埋点出现问题", e);
} }
oauthLoginInfoService.addLoginInfo(user, tenantId); oauthLoginInfoService.addLoginInfo(user, tenantId);
......
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