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

部署

main
王宇航 2024-05-22 14:05:05 +08:00
parent eef33a6983
commit 120d761d89
4 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gan-common/ruoyi-common-core/pom.xml
View File

@ -117,19 +117,6 @@
<groupId>javax.mail</groupId> <groupId>javax.mail</groupId>
<artifactId>mail</artifactId> <artifactId>mail</artifactId>
</dependency> </dependency>
<dependency>
<groupId>org.thymeleaf</groupId>
<artifactId>thymeleaf</artifactId>
</dependency>
<!-- https://mvnrepository.com/artifact/gov.nih.nci.cbiit.scimgmt.i2erest.mailsender/mailclient -->
<dependency>
<groupId>gov.nih.nci.cbiit.scimgmt.i2erest.mailsender</groupId>
<artifactId>mailclient</artifactId>
<version>5.0.1</version>
</dependency>
</dependencies> </dependencies>
</project> </project>

3
gan-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/mail/MailUtil.java
View File

@ -1,9 +1,6 @@
package com.ruoyi.common.core.utils.mail; package com.ruoyi.common.core.utils.mail;
import gov.nih.nci.cbiit.scimgmt.i2erest.mailsender.resttemplate.MailClientRestTemplateHeaderInterceptor;
import org.thymeleaf.context.Context;
import javax.mail.*; import javax.mail.*;
import javax.mail.internet.InternetAddress; import javax.mail.internet.InternetAddress;
import javax.mail.internet.MimeMessage; import javax.mail.internet.MimeMessage;

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

@ -10,6 +10,7 @@ import com.ruoyi.app.mapper.*;
import com.ruoyi.app.utils.TextAutoRoute; import com.ruoyi.app.utils.TextAutoRoute;
import com.ruoyi.common.core.utils.DateUtils; import com.ruoyi.common.core.utils.DateUtils;
import com.ruoyi.common.core.web.domain.AjaxResult; import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.system.api.domain.SysUser;
import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@ -43,6 +44,9 @@ public class AppUserDynamicServiceImpl implements IAppUserDynamicService
@Autowired @Autowired
private AppUserCollectMapper appUserCollectMapper; private AppUserCollectMapper appUserCollectMapper;
@Autowired
private AppUserMapper userMapper;
/** /**
* 查询App用户动态 * 查询App用户动态
* *
@ -164,6 +168,12 @@ public class AppUserDynamicServiceImpl implements IAppUserDynamicService
List ids = Arrays.asList(appUserDynamicVo.getTopicId().split(",")); List ids = Arrays.asList(appUserDynamicVo.getTopicId().split(","));
appUserDynamicVo.setAppTopicList(appTopicMapper.selectByIdsList(ids)); appUserDynamicVo.setAppTopicList(appTopicMapper.selectByIdsList(ids));
} }
// if (appUserDynamicVo.getTownId() != null) {
// // 用户信息
// SysUser sysUser = userMapper.g(appUserDynamicVo.getAppId());
// appUserDynamicVo.setSysUser(sysUser);
// }
// 点赞数 // 点赞数
AppDynamicLike appDynamicLike = new AppDynamicLike(); AppDynamicLike appDynamicLike = new AppDynamicLike();
appDynamicLike.setDynamicId(id); appDynamicLike.setDynamicId(id);

3
gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppUserDynamicMapper.xml
View File

@ -51,6 +51,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
u.end_time as "endTime", u.end_time as "endTime",
u.is_member as "isMember", u.is_member as "isMember",
a.create_time as "createTime", a.create_time as "createTime",
a.town_id as "townId",
a.province_id as "provinceId",
a.city_id as "cityId",
t.name as "cityName" t.name as "cityName"
from app_user_dynamic a from app_user_dynamic a
left join app_user u on u.id = a.user_id left join app_user u on u.id = a.user_id