|
|
@@ -19,7 +19,6 @@ import com.izouma.jiashanxia.repo.OrderInfoRepo;
|
|
|
import com.izouma.jiashanxia.repo.UserRepo;
|
|
|
import com.izouma.jiashanxia.security.Authority;
|
|
|
import com.izouma.jiashanxia.security.JwtTokenUtil;
|
|
|
-import com.izouma.jiashanxia.security.JwtUser;
|
|
|
import com.izouma.jiashanxia.security.JwtUserFactory;
|
|
|
import com.izouma.jiashanxia.service.sms.SmsService;
|
|
|
import com.izouma.jiashanxia.service.storage.StorageService;
|
|
|
@@ -160,6 +159,10 @@ public class UserService {
|
|
|
WxMaUserInfo wxUserInfo = wxMaService.getUserService().getUserInfo(sessionKey, encryptedData, iv);
|
|
|
User user = userRepo.findByOpenIdAndDelFalse(wxUserInfo.getOpenId());
|
|
|
|
|
|
+ if (wxUserInfo.getOpenId() == null) {
|
|
|
+ user = SecurityUtils.getAuthenticatedUser();
|
|
|
+ }
|
|
|
+
|
|
|
String avatarUrl = Constants.DEFAULT_AVATAR;
|
|
|
try {
|
|
|
String path = "image/avatar/" +
|
