wyh
/
gan
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

~C

main
linhw 2024-06-06 15:55:49 +08:00
parent aeb5b7fda8
commit 15f62d87db
3 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/AppLoginController.java
View File

@ -142,6 +142,7 @@ public class AppLoginController {
if (appUser == null) { if (appUser == null) {
Assert.isNull(appUser, "手机号未注册");
AppRegister register = appRegisterService.selectAppRegisterByphone(loginForm.getPhoneNumber()); AppRegister register = appRegisterService.selectAppRegisterByphone(loginForm.getPhoneNumber());
if (register != null && register.getStatus() != null) { if (register != null && register.getStatus() != null) {

12
gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppUserDynamicServiceImpl.java
View File

@ -51,6 +51,9 @@ public class AppUserDynamicServiceImpl implements IAppUserDynamicService
@Autowired @Autowired
private AppUserFriendMapper appUserFriendMapper; private AppUserFriendMapper appUserFriendMapper;
@Autowired
private AppUserFansMapper appUserFansMapper;
/** /**
* 查询App用户动态 * 查询App用户动态
* *
@ -222,7 +225,7 @@ public class AppUserDynamicServiceImpl implements IAppUserDynamicService
appDynamicComment.setDynamicId(id); appDynamicComment.setDynamicId(id);
appUserDynamicVo.setCountComment(appDynamicCommentMapper.selectAppDynamicCommentList(appDynamicComment).size()); appUserDynamicVo.setCountComment(appDynamicCommentMapper.selectAppDynamicCommentList(appDynamicComment).size());
AppUserFriend appUserFriend = new AppUserFriend(); /*AppUserFriend appUserFriend = new AppUserFriend();
appUserFriend.setUserId(appUserDynamic.getUserId()); appUserFriend.setUserId(appUserDynamic.getUserId());
appUserFriend.setStatus(0l); appUserFriend.setStatus(0l);
List<AppUserFriend> friends = appUserFriendMapper.selectAppUserFriendList(appUserFriend); List<AppUserFriend> friends = appUserFriendMapper.selectAppUserFriendList(appUserFriend);
@ -230,7 +233,12 @@ public class AppUserDynamicServiceImpl implements IAppUserDynamicService
appUserDynamicVo.setIsFans(0); appUserDynamicVo.setIsFans(0);
}else { }else {
appUserDynamicVo.setIsFans(1); appUserDynamicVo.setIsFans(1);
} }*/
AppUserFans appUserFans = new AppUserFans();
appUserFans.setUserId(appUserDynamic.getAppId());
List<AppUserFans> userFans = appUserFansMapper.selectAppUserFansList(appUserFans);
List<Long> friends = userFans.stream().map(x->x.getFriendId()).collect(Collectors.toList());
appUserDynamicVo.setIsFans(friends.contains(appUserDynamicVo.getUserId()) ? 0 : 1);
} }
List<AppUserDynamicVo> collect = new ArrayList<>(); List<AppUserDynamicVo> collect = new ArrayList<>();

14
gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/utils/AlipayConstant.java
View File

@ -22,14 +22,16 @@ public class AlipayConstant {
public static final String SUBJECT = "订单充值"; public static final String SUBJECT = "订单充值";
// public static final String CERT_PATH = "/opt/jar/gan/cert/appCertPublicKey_2021004144677656.crt"; /*public static final String CERT_PATH = "/Users/wyh/Documents/证书20240524173546/appCertPublicKey_2021004144677656.crt";
public static final String CERT_PATH = "/Users/wyh/Documents/证书20240524173546/appCertPublicKey_2021004144677656.crt";
// public static final String ALIPAY_PUBLIC_CERT_PATH = "/opt/jar/gan/cert/alipayCertPublicKey_RSA2.crt";
public static final String ALIPAY_PUBLIC_CERT_PATH = "/Users/wyh/Documents/证书20240524173546/alipayCertPublicKey_RSA2.crt"; public static final String ALIPAY_PUBLIC_CERT_PATH = "/Users/wyh/Documents/证书20240524173546/alipayCertPublicKey_RSA2.crt";
public static final String ROOT_CERT_PATH = "/Users/wyh/Documents/证书20240524173546/alipayRootCert.crt";*/
public static final String CERT_PATH = "/opt/jar/gan/cert/appCertPublicKey_2021004144677656.crt";
public static final String ALIPAY_PUBLIC_CERT_PATH = "/opt/jar/gan/cert/alipayCertPublicKey_RSA2.crt";
public static final String ROOT_CERT_PATH = "/opt/jar/gan/cert/alipayRootCert.crt";
// public static final String ROOT_CERT_PATH = "/opt/jar/gan/cert/alipayRootCert.crt";
public static final String ROOT_CERT_PATH = "/Users/wyh/Documents/证书20240524173546/alipayRootCert.crt";