| @@ -1,10 +1,9 @@ | |||||
| package com.iformall.domain.po; | package com.iformall.domain.po; | ||||
| import com.baomidou.mybatisplus.annotation.TableField; | |||||
| import com.baomidou.mybatisplus.annotation.TableName; | import com.baomidou.mybatisplus.annotation.TableName; | ||||
| import com.fasterxml.jackson.annotation.JsonIgnoreProperties; | import com.fasterxml.jackson.annotation.JsonIgnoreProperties; | ||||
| import com.iformall.domain.po.base.BaseCUserEntity; | |||||
| import com.iformall.enums.EnumAppPlat; | |||||
| import com.iformall.utils.Constant; | import com.iformall.utils.Constant; | ||||
| import lombok.Data; | import lombok.Data; | ||||
| import lombok.EqualsAndHashCode; | import lombok.EqualsAndHashCode; | ||||
| @@ -12,9 +11,7 @@ import lombok.ToString; | |||||
| import org.apache.commons.lang3.StringUtils; | import org.apache.commons.lang3.StringUtils; | ||||
| import java.math.BigDecimal; | |||||
| import java.util.Date; | import java.util.Date; | ||||
| import java.util.List; | |||||
| import java.util.UUID; | import java.util.UUID; | ||||
| @TableName(value = "wx_c_user") | @TableName(value = "wx_c_user") | ||||
| @@ -24,6 +21,10 @@ import java.util.UUID; | |||||
| @EqualsAndHashCode(callSuper = true) | @EqualsAndHashCode(callSuper = true) | ||||
| public class WxCUser extends CUser { | public class WxCUser extends CUser { | ||||
| static { | |||||
| appPlat = EnumAppPlat.WX; | |||||
| } | |||||
| public String createToken(Date currentDate,String tenantId) { | public String createToken(Date currentDate,String tenantId) { | ||||
| if(StringUtils.isBlank(tenantId)){ | if(StringUtils.isBlank(tenantId)){ | ||||
| tenantId = "1"; | tenantId = "1"; | ||||
| @@ -1,20 +1,12 @@ | |||||
| package com.iformall.domain.po.base; | package com.iformall.domain.po.base; | ||||
| import com.alibaba.fastjson.JSON; | |||||
| import com.alibaba.fastjson.JSONObject; | |||||
| import com.baomidou.mybatisplus.annotation.TableField; | import com.baomidou.mybatisplus.annotation.TableField; | ||||
| import com.iformall.domain.po.WxCUser; | |||||
| import com.iformall.enums.EnumAppPlat; | import com.iformall.enums.EnumAppPlat; | ||||
| import com.iformall.utils.Constant; | |||||
| import com.iformall.utils.UserUtil; | import com.iformall.utils.UserUtil; | ||||
| import lombok.Data; | |||||
| import lombok.EqualsAndHashCode; | import lombok.EqualsAndHashCode; | ||||
| import org.apache.commons.lang3.StringUtils; | import org.apache.commons.lang3.StringUtils; | ||||
| import java.util.Date; | import java.util.Date; | ||||
| import java.util.LinkedHashMap; | |||||
| import java.util.Map; | |||||
| import java.util.UUID; | |||||
| /** | /** | ||||
| * @author Stormeye | * @author Stormeye | ||||
| @@ -39,7 +31,7 @@ public class BaseCUserEntity extends TenantEntity { | |||||
| protected Object realUser; | protected Object realUser; | ||||
| @TableField(exist = false) | @TableField(exist = false) | ||||
| protected EnumAppPlat appPlat; | |||||
| protected static EnumAppPlat appPlat; | |||||
| /** | /** | ||||
| * 是否是会员 | * 是否是会员 | ||||
| @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableName; | |||||
| import com.fasterxml.jackson.annotation.JsonIgnoreProperties; | import com.fasterxml.jackson.annotation.JsonIgnoreProperties; | ||||
| import com.iformall.domain.po.CUser; | import com.iformall.domain.po.CUser; | ||||
| import com.iformall.domain.po.base.BaseCUserEntity; | import com.iformall.domain.po.base.BaseCUserEntity; | ||||
| import com.iformall.enums.EnumAppPlat; | |||||
| import com.iformall.utils.Constant; | import com.iformall.utils.Constant; | ||||
| import lombok.Data; | import lombok.Data; | ||||
| import lombok.EqualsAndHashCode; | import lombok.EqualsAndHashCode; | ||||
| @@ -23,6 +24,10 @@ import java.util.UUID; | |||||
| @EqualsAndHashCode(callSuper = true) | @EqualsAndHashCode(callSuper = true) | ||||
| public class TtCUser extends CUser { | public class TtCUser extends CUser { | ||||
| static { | |||||
| appPlat = EnumAppPlat.TOUTIAO; | |||||
| } | |||||
| public String createToken(Date currentDate,String tenantId) { | public String createToken(Date currentDate,String tenantId) { | ||||
| if(StringUtils.isBlank(tenantId)){ | if(StringUtils.isBlank(tenantId)){ | ||||
| tenantId = "1"; | tenantId = "1"; | ||||
| @@ -60,7 +60,6 @@ public class TtCUserServiceAdapter extends BasicCUserService implements CUserSer | |||||
| entity.setUserId(ttCUser.getUserId()); | entity.setUserId(ttCUser.getUserId()); | ||||
| entity.setToken(ttCUser.getToken()); | entity.setToken(ttCUser.getToken()); | ||||
| entity.updateTenantInfo(ttCUser); | entity.updateTenantInfo(ttCUser); | ||||
| entity.setAppPlat(EnumAppPlat.TOUTIAO); | |||||
| entity.setRealUser(ttCUser); | entity.setRealUser(ttCUser); | ||||
| return entity; | return entity; | ||||
| } | } | ||||
| @@ -63,7 +63,6 @@ public class WxCUserServiceAdapter extends BasicCUserService implements CUserSer | |||||
| entity.setUserId(wxCUser.getUserId()); | entity.setUserId(wxCUser.getUserId()); | ||||
| entity.setToken(wxCUser.getToken()); | entity.setToken(wxCUser.getToken()); | ||||
| entity.updateTenantInfo(wxCUser); | entity.updateTenantInfo(wxCUser); | ||||
| entity.setAppPlat(EnumAppPlat.WX); | |||||
| entity.setRealUser(wxCUser); | entity.setRealUser(wxCUser); | ||||
| return entity; | return entity; | ||||
| } | } | ||||