Skip to content

C
cms
提交 e19a51a8 作者: 刘明祎-运维用途
操作

Merge branch 'develop'

上级 4955922f 6b260e63
流水线 #9026 已通过 于阶段
in 2 分 26 秒
正在显示 包含 117 行增加 和 36 行删除
cms-common/cms-common-model/src/main/java/com/mmc/iuav/user/model/dto/LoginSuccessDTO.java
......@@ -31,4 +31,5 @@ public class LoginSuccessDTO implements Serializable {
private CompanyInfoVO companyInfoVO;
private RoleInfoDTO roleInfo;
private Integer appUserAccountId;
private Integer cooperateTagId;
}
cms-common/cms-common-model/src/main/java/com/mmc/iuav/user/model/qo/MessageUserQO.java
......@@ -29,6 +29,9 @@ public class MessageUserQO implements Serializable {
@Min(value = 1, groups = Page.class)
private Integer pageSize;
@ApiModelProperty(value = "发送方用户ID")
private Integer sendUserId;
@ApiModelProperty(value = "接收方用户ID")
private Integer receiverUserId;
......
cms-common/cms-common-model/src/main/java/com/mmc/iuav/user/model/vo/UserMessageVO.java
......@@ -27,4 +27,6 @@ public class UserMessageVO implements Serializable {
private String content;
@ApiModelProperty(value = "发送的图片")
private String imgUrl;
@ApiModelProperty(value = "发送方用户ID")
private Integer sendUserId;
}
cms-common/cms-common-util/src/main/java/com/mmc/iuav/http/HttpsRequestUtil.java
......@@ -189,7 +189,7 @@ public class HttpsRequestUtil {
String ret = "";
while (ret != null) {
ret = br.readLine();
if (ret != null && !ret.trim().equals("")) {
if (ret != null && !"".equals(ret.trim())) {
str_return = str_return + new String(ret.getBytes("ISO-8859-1"), "utf-8");
}
}
......
csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/auth/AuthHandler.java
......@@ -71,6 +71,7 @@ public class AuthHandler {
public LoginSuccessDTO addPcLoginCache(BackUserAccountVO user) {
// 查询单位信息
CompanyInfoVO companyInfoVO = companyService.getCompanyInfoByAppLoginUserId(user.getId());
companyInfoVO.setCooperationTagId(user.getCooperationTagId());
companyInfoVO.setLeader(1);
// 角色信息
RoleInfoDO roleInfoDO = roleDao.getRoleInfoByUserId(user.getId());
......@@ -78,9 +79,11 @@ public class AuthHandler {
map.put(JwtConstant.USER_ACCOUNT_ID, user.getId());
map.put(JwtConstant.TOKEN_TYPE, JwtConstant.M_TOKEN);
String token = JwtUtil.createJwt(map);
//获取用户的加盟标签信息
LoginSuccessDTO loginSuccessDTO = LoginSuccessDTO.builder().token(token).userAccountId(user.getId()).accountNo(user.getAccountNo()).uid(user.getId() + "")
.userName(user.getUserName()).nickName(user.getUserName()).phoneNum(user.getPhoneNum()).portType(UserTypeEnums.PC.getType())
.companyInfoVO(companyInfoVO == null ? null : companyInfoVO)
.cooperateTagId(user.getCooperationTagId())
.roleInfo(roleInfoDO.buildRoleInfoDTO()).build();
stringRedisTemplate.setValueSerializer(RedisSerializer.json());
stringRedisTemplate.opsForValue().set(
......
csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/auth/BCryptPasswordEncoder.java
......@@ -98,6 +98,7 @@ public class BCryptPasswordEncoder implements PasswordEncoder {
return BCrypt.hashpw(rawPassword.toString(), salt);
}
public boolean matches(CharSequence rawPassword, String encodedPassword) {
if (rawPassword == null) {
throw new IllegalArgumentException("rawPassword cannot be null");
......
csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/controller/MessageController.java
......@@ -76,7 +76,10 @@ public class MessageController extends BaseController{
@ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
@PostMapping("/insertUserMessage")
public ResultBody insertUserMessage(HttpServletRequest request,@RequestBody UserMessageVO messageVO){
return messageService.insertUserMessage(messageVO,this.getUserLoginInfoFromRedis(request).getUserAccountId());
if(messageVO.getSendUserId()== null) {
messageVO.setSendUserId(this.getUserLoginInfoFromRedis(request).getUserAccountId());
}
return messageService.insertUserMessage(messageVO);
}
@ApiOperation(value = "查看用户是否购买聊天")
......@@ -90,14 +93,20 @@ public class MessageController extends BaseController{
@ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
@PostMapping("/selectUserMessage")
public ResultBody selectUserMessage(HttpServletRequest request,@RequestBody MessageUserQO messageQO){
return ResultBody.success(messageService.selectUserMessage(messageQO,this.getUserLoginInfoFromRedis(request).getUserAccountId()));
if(messageQO.getSendUserId() == null) {
messageQO.setSendUserId(this.getUserLoginInfoFromRedis(request).getUserAccountId());;
}
return ResultBody.success(messageService.selectUserMessage(messageQO));
}
@ApiOperation(value = "用户列表")
@ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
@PostMapping("/selectUserList")
public ResultBody selectUserList(HttpServletRequest request){
return messageService.selectUserList(this.getUserLoginInfoFromRedis(request).getUserAccountId());
@GetMapping("/selectUserList")
public ResultBody selectUserList(HttpServletRequest request,@RequestParam(required = false) Integer userAccountId){
if(userAccountId==null){
userAccountId = this.getUserLoginInfoFromRedis(request).getUserAccountId();
}
return messageService.selectUserList(userAccountId);
}
@ApiOperation(value = "用户列表——用户移除")
@ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
......@@ -163,4 +172,20 @@ public class MessageController extends BaseController{
public Integer timeTypeById(@ApiParam(value = "购买聊天时长的类型id，唯一识别id", required = true) Integer typeId, Integer userId){
return messageService.timeTypeById(typeId,userId);
}
@ApiOperation(value = "获取用户商家聊天次数")
@ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
@GetMapping("/getUserMessageNum")
public ResultBody getUserMessageNum(){
return messageService.getUserMessageNum();
}
@ApiOperation(value = "获取用户与用户聊天次数")
@ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
@GetMapping("/getUserAndUserMessageNum")
public ResultBody getUserAndUserMessageNum(){
return messageService.getUserAndUserMessageNum();
}
}
csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/dao/CooperationDao.java
......@@ -164,4 +164,7 @@ public interface CooperationDao {
//查到标签绑定之前的用户
UserApplyTagDO selectTageByUserId(Integer fromUserAccountId);
//根据后台id查找当前商家加盟标签
Integer selectTagIdByBackUserId(Integer backUserId);
}
csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/dao/MessageDao.java
......@@ -118,4 +118,8 @@ public interface MessageDao {
List<MessageTimeVO> listTimeType();
void updateTimeType(MessageTimeVO messageTimeVO);
void insertTimeType(MessageTimeVO messageTimeVO);
Integer getUserMessageNum();
Integer getUserAndUserMessageNum();
}
csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/service/MessageService.java
......@@ -63,7 +63,7 @@ public interface MessageService {
* @param messageVO
* @return
*/
ResultBody insertUserMessage(UserMessageVO messageVO,Integer senderUserId);
ResultBody insertUserMessage(UserMessageVO messageVO);
/**
......@@ -75,7 +75,7 @@ public interface MessageService {
PageResult selectUserMessage(MessageUserQO messageQO,Integer senderUserId);
PageResult selectUserMessage(MessageUserQO messageQO);
ResultBody selectUserList(Integer senderUserId);
......@@ -94,4 +94,8 @@ public interface MessageService {
ResultBody insertTimeType(MessageTimeVO messageTimeVO);
Integer timeTypeById(Integer id,Integer userId);
ResultBody getUserMessageNum();
ResultBody getUserAndUserMessageNum();
}
csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/service/data/impl/UserReportServiceImpl.java
......@@ -59,7 +59,7 @@ public class UserReportServiceImpl implements UserReportService {
@Override
public Integer getUserActiveCount() {
ResultBody resultBody = wxService.getUserPortrait();
if (resultBody != null && resultBody.getCode().equals("200")) {
if (resultBody != null && "200".equals(resultBody.getCode())) {
JSONObject result = JSONObject.parseObject(resultBody.getResult().toString());
JSONArray jsonArray;
//当去微信拿不到日活量时会报空指针就返回null代表没拿到数据，要重新请求
......
csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/service/fdd/impl/SealManageServiceImpl.java
......@@ -53,7 +53,7 @@ public class SealManageServiceImpl implements SealManageService {
@Override
public ResultBody uploadSeal(SealVO sealVO, LoginSuccessDTO loginSuccessDTO) {
ResultBody resultBody = this.checkAuthStatus(sealVO.getPort(), loginSuccessDTO);
if (!resultBody.getCode().equals("200")) {
if (!"200".equals(resultBody.getCode())) {
return resultBody;
}
UserFddDO userFddInfo = (UserFddDO) resultBody.getResult();
......@@ -122,7 +122,7 @@ public class SealManageServiceImpl implements SealManageService {
@Override
public ResultBody removeSeal(String signatureId, Integer port, LoginSuccessDTO loginSuccessDTO) {
ResultBody resultBody = checkAuthStatus(port, loginSuccessDTO);
if (!resultBody.getCode().equals("200")) {
if (!"200".equals(resultBody.getCode())) {
return resultBody;
}
UserFddDO userFddInfo = (UserFddDO) resultBody.getResult();
......@@ -184,7 +184,7 @@ public class SealManageServiceImpl implements SealManageService {
@Transactional(rollbackFor = Exception.class)
public ResultBody defaultSeal(String signatureId, Integer port, LoginSuccessDTO loginSuccessDTO) {
ResultBody resultBody = checkAuthStatus(port, loginSuccessDTO);
if (!resultBody.getCode().equals("200")) {
if (!"200".equals(resultBody.getCode())) {
return resultBody;
}
UserFddDO userFddInfo = (UserFddDO) resultBody.getResult();
......@@ -207,7 +207,7 @@ public class SealManageServiceImpl implements SealManageService {
@Override
public ResultBody getSealInfo(String signatureId, Integer port, LoginSuccessDTO loginSuccessDTO) {
ResultBody resultBody = checkAuthStatus(port, loginSuccessDTO);
if (!resultBody.getCode().equals("200")) {
if (!"200".equals(resultBody.getCode())) {
return resultBody;
}
UserFddDO userFddInfo = (UserFddDO) resultBody.getResult();
......
csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/service/fdd/impl/UserFddAuthServiceImpl.java
......@@ -200,13 +200,13 @@ public class UserFddAuthServiceImpl implements UserFddAuthService {
return ResultBody.error(ResultEnum.NOT_FOUND);
}
//修改认证状态
if (authenticationType.equals("2")) {
if ("2".equals(authenticationType)) {
userFddAuthDao.updateCompanyCertStatus(customerId, status);
} else {
userFddAuthDao.updatePersonCertStatus(customerId, status);
}
//通过需要申请证书
if (("2".equals(authenticationType) && status.equals("4")) || (authenticationType.equals("1") && status.equals("2"))) {
if (("2".equals(authenticationType) && "4".equals(status)) || ("1".equals(authenticationType) && "2".equals(status))) {
fddService.getApplyCert(verifyInfoDO.getCustomerId(), verifyInfoDO.getTransactionNo());
}
return ResultBody.success();
......
csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/service/impl/AuthServiceImpl.java
......@@ -11,10 +11,7 @@ import com.mmc.iuav.user.client.PayClient;
import com.mmc.iuav.user.constant.WxConstant;
import com.mmc.iuav.user.controller.userpoints.config.NumberOfUserPoints;
import com.mmc.iuav.user.controller.userpoints.config.UserPointsEnum;
import com.mmc.iuav.user.dao.CompanyAuthDao;
import com.mmc.iuav.user.dao.RealNameAuthDao;
import com.mmc.iuav.user.dao.RoleDao;
import com.mmc.iuav.user.dao.UserServiceDao;
import com.mmc.iuav.user.dao.*;
import com.mmc.iuav.user.dao.userpoints.UserPointsDao;
import com.mmc.iuav.user.dao.userpoints.UserPointsDetailsDao;
import com.mmc.iuav.user.entity.*;
......@@ -50,6 +47,8 @@ public class AuthServiceImpl implements AuthService {
@Autowired
private UserServiceDao userServiceDao;
@Autowired
private CooperationDao cooperationDao;
@Autowired
private ActivityService activityService;
@Autowired
private UserPointsDao userPointsDao;
......@@ -201,7 +200,9 @@ public class AuthServiceImpl implements AuthService {
if (!loginPwd.equals(user.getPassword())) {
return ResultBody.error(ResultEnum.LOGIN_PASSWORD_ERROR);
}
Integer tagId = cooperationDao.selectTagIdByBackUserId(user.getId());
BackUserAccountVO backUserAccountVO = user.buildBackUserAccountVO();
backUserAccountVO.setCooperationTagId(tagId);
LoginSuccessDTO loginSuccessDTO = authHandler.addPcLoginCache(backUserAccountVO);
return ResultBody.success(loginSuccessDTO);
}
......
csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/service/impl/MessageServiceImpl.java
......@@ -153,8 +153,9 @@ public class MessageServiceImpl implements MessageService {
}
@Override
public ResultBody insertUserMessage(UserMessageVO messageVO,Integer senderUserId) {
public ResultBody insertUserMessage(UserMessageVO messageVO) {
Integer backUserId = messageVO.getBackUserId();
Integer senderUserId = messageVO.getSendUserId();
UserMessageDO userMessageDO = new UserMessageDO(messageVO);
if(senderUserId == null){
return ResultBody.success("消息发送失败,请先登录");
......@@ -212,7 +213,8 @@ public class MessageServiceImpl implements MessageService {
}
@Override
public PageResult selectUserMessage(MessageUserQO messageQO,Integer senderUserId) {
public PageResult selectUserMessage(MessageUserQO messageQO) {
Integer senderUserId = messageQO.getSendUserId();
scheduledTaskUtil.destroy(senderUserId);
int count = messageDao.countUserMessage(messageQO,senderUserId);
if (count == 0) {
......@@ -347,7 +349,7 @@ public class MessageServiceImpl implements MessageService {
MessageTimeVO messageTimeVO1 = messageDao.selectUserMessageTimeType(id);
// 增加聊天时长
String timeValue = redisTemplate.opsForValue().get("Message" + userAccountId);
if (timeValue == null || timeValue.equals("")) {
if (timeValue == null || "".equals(timeValue)) {
redisTemplate.setValueSerializer(RedisSerializer.json());
redisTemplate.opsForValue().set("Message" + userAccountId, userAccountId.toString(), messageTimeVO1.getChatDuration() * 24 * 60 * 60, TimeUnit.SECONDS);
return ResultBody.success("成功购买"+messageTimeVO1.getChatDuration()+"天聊天功能");
......@@ -375,7 +377,7 @@ public class MessageServiceImpl implements MessageService {
}
// 增加聊天时长
String timeValue = redisTemplate.opsForValue().get("Message" + userAccountId);
if (timeValue == null || timeValue.equals("")) {
if (timeValue == null || "".equals(timeValue)) {
redisTemplate.setValueSerializer(RedisSerializer.json());
redisTemplate.opsForValue().set("Message" + userAccountId, userAccountId.toString(), messageTimeVO1.getChatDuration() * 24 * 60 * 60, TimeUnit.SECONDS);
return ResultBody.success("成功购买"+messageTimeVO1.getChatDuration()+"天聊天功能");
......@@ -428,4 +430,16 @@ public class MessageServiceImpl implements MessageService {
// 如果时间差大于 180 秒（即三分钟），返回 true
return secondsDiff > 180;
}
@Override
public ResultBody getUserMessageNum() {
Integer userMessageNum = messageDao.getUserMessageNum();
return ResultBody.success(userMessageNum);
}
@Override
public ResultBody getUserAndUserMessageNum() {
Integer userMessageNum = messageDao.getUserAndUserMessageNum();
return ResultBody.success(userMessageNum);
}
}
csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/service/impl/RealNameAuthServiceImpl.java
......@@ -73,7 +73,7 @@ public class RealNameAuthServiceImpl implements RealNameAuthService {
String faceMsg = JSONObject.parseObject(faceResult.toString()).getString("code");
String backMsg = JSONObject.parseObject(backResult.toString()).getString("code");
// 都解析通过
if (faceMsg.equals("200") && backMsg.equals("200")) {
if ("200".equals(faceMsg) && "200".equals(backMsg)) {
// 处理正面
JSONObject faceResultJson = JSONObject.parseObject(
JSONObject.parseObject(faceResult.toString()).getString("result"));
......@@ -96,9 +96,9 @@ public class RealNameAuthServiceImpl implements RealNameAuthService {
realNameAuthDO.setIssue(backResultJson.getString("issue"));
realNameAuthDO.setUnionId(realNameAuthVO.getUnionId());
if (faceResultJson.getString("sex").equals("男")) {
if ("男".equals(faceResultJson.getString("sex"))) {
realNameAuthDO.setSex(1);
} else if (faceResultJson.getString("sex").equals("女")) {
} else if ("女".equals(faceResultJson.getString("sex"))) {
realNameAuthDO.setSex(2);
} else {
realNameAuthDO.setSex(0);
......@@ -116,7 +116,7 @@ public class RealNameAuthServiceImpl implements RealNameAuthService {
realNameAuthDO.setBirthday(this.getDate(faceResultJson.getString("birth"), "yyyyMMdd"));
realNameAuthDO.setStartDate(this.getDate(backResultJson.getString("start_date"), "yyyyMMdd"));
if (backResultJson.getString("end_date").equals("长期")) {
if ("长期".equals(backResultJson.getString("end_date"))) {
realNameAuthDO.setEndDate(null);
} else {
realNameAuthDO.setEndDate(this.getDate(backResultJson.getString("end_date"), "yyyyMMdd"));
......@@ -168,7 +168,7 @@ public class RealNameAuthServiceImpl implements RealNameAuthService {
RealNameAuthDO realNameAuthDO = realNameAuthDao.getRealNameAuthById(id);
if (realNameAuthDO != null) {
UserAccountDO userAccountById = userServiceDao.getUserAccountById(realNameAuthDO.getUserAccountId());
if(realNameAuthDO.getUnionId() == null || realNameAuthDO.getUnionId().equals("")){
if(realNameAuthDO.getUnionId() == null || "".equals(realNameAuthDO.getUnionId())){
realNameAuthDO.setUnionId(userAccountById.getUnionId());
realNameAuthDao.updateRealNameAuth(realNameAuthDO);
}
......@@ -197,7 +197,7 @@ public class RealNameAuthServiceImpl implements RealNameAuthService {
RealNameAuthDO realNameAuthDO = realNameAuthDao.userDetail(userAccountId);
if (realNameAuthDO != null) {
UserAccountDO userAccountById = userServiceDao.getUserAccountById(realNameAuthDO.getUserAccountId());
if(realNameAuthDO.getUnionId() == null || realNameAuthDO.getUnionId().equals("")){
if(realNameAuthDO.getUnionId() == null || "".equals(realNameAuthDO.getUnionId())){
realNameAuthDO.setUnionId(userAccountById.getUnionId());
realNameAuthDao.updateRealNameAuth(realNameAuthDO);
}
......
csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/service/impl/WxServiceImpl.java
......@@ -329,7 +329,7 @@ public class WxServiceImpl implements WxService {
String url = "https://api.weixin.qq.com/wxa/generate_urllink?access_token=" + accessToken;
String res = HttpHelper.httpPost(url, param.toString());
JSONObject result = JSONObject.parseObject(res);
if (result.getString("errcode").equals("0")) {
if ("0".equals(result.getString("errcode"))) {
return result.getString("url_link");
}
return res;
......@@ -350,7 +350,7 @@ public class WxServiceImpl implements WxService {
JSONObject result = JSONObject.parseObject(res);
log.info("param: id:{}，code:{}", id, code);
log.info("getUserPhoneNumber: " + result.toString());
if (result.getString("errcode").equals("0")) {
if ("0".equals(result.getString("errcode"))) {
String phone_info = result.getString("phone_info");
JSONObject phoneInfoObject = JSONObject.parseObject(phone_info);
return phoneInfoObject.getString("purePhoneNumber");
......
csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/service/xzsz/impl/XzServiceImpl.java
......@@ -134,7 +134,7 @@ public class XzServiceImpl implements XzService {
if (jsonObject1.get("data") != null) {
// 添加认证签约结果
JSONObject signedResult = this.getSignedResult(xzAuthVO);
if (signedResult.get("msg").equals("success")) {
if ("success".equals(signedResult.get("msg"))) {
// log.info("Signed result: {}", signedResult);
List<JSONObject> jsonObjects = JSONArray.parseArray(signedResult.get("data").toString(), JSONObject.class);
// log.info("jsonObjects : {}", com.alibaba.fastjson2.JSONObject.toJSONString(jsonObjects));
......@@ -185,7 +185,7 @@ public class XzServiceImpl implements XzService {
public String xzAuthNotify(JSONObject notify) {
log.info("xzAuthNotify获取到的推送结果：{}", notify.toString());
// 认证成功，修改认证状态
if (notify.get("code").toString().equals("0")) {
if ("0".equals(notify.get("code").toString())) {
XzAuthDO authDO = notify.get("data", XzAuthDO.class);
Integer userAccountId = (Integer) com.alibaba.fastjson2.JSONObject.parseObject(authDO.getCustomParams()).get("userAccountId");
if (userAccountId != null) {
......@@ -301,7 +301,7 @@ public class XzServiceImpl implements XzService {
.frontLogNo(frontLogNo)
.build());
System.out.println(jsonObject.toString());
if (jsonObject.get("isSuccess").toString().equals("T")) {
if ("T".equals(jsonObject.get("isSuccess").toString())) {
return ResultBody.success(jsonObject.get("data"));
} else {
return ResultBody.error(jsonObject.get("errorMessage").toString());
......
csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/util/QccEntAuthUtil.java
......@@ -108,7 +108,7 @@ public class QccEntAuthUtil {
String response = HttpsRequestUtil.httpsRequest(url, method, headers, bodys);
log.info("response11111111111111: " + response);
//获取response的body
if(response.equals("Invalid Result - invalid business license")){
if("Invalid Result - invalid business license".equals(response)){
return null;
}
return response;
......
csm-service/cms-service-user/src/main/resources/mapper/CooperationDao.xml
......@@ -631,6 +631,14 @@
from user_apply_tag
where user_account_id = #{userAccountId}
</select>
<select id="selectTagIdByBackUserId" resultType="java.lang.Integer">
select cooperation_tag_id from user_tag where user_account_id =
(
select user_account_id
from company_member cm inner join company_back_user cbu on cm.company_info_id = cbu.company_info_id
where cbu.back_user_account_id = 252
)
</select>
</mapper>
csm-service/cms-service-user/src/main/resources/mapper/MessageDao.xml
......@@ -122,6 +122,18 @@ ORDER BY create_time desc
from user_message_time_type
</select>
<select id="getUserMessageNum" resultType="java.lang.Integer">
SELECT COUNT(DISTINCT back_user_id)
FROM user_message
WHERE DATE(create_time) = CURDATE() AND back_user_id IS NOT NULL
</select>
<select id="getUserAndUserMessageNum" resultType="java.lang.Integer">
SELECT
COUNT(*) AS count_distinct_pairs
FROM
( SELECT DISTINCT sender_user_id, receiver_user_id FROM user_message WHERE DATE( create_time ) = CURDATE() AND back_user_id IS NULL ) AS distinct_pairs
</select>
<insert id="insertSystemMessage">
insert into message
<trim prefix="(" suffix=")" suffixOverrides=",">
......
kustomization/overlays/dev/kustomization.yaml
......@@ -18,4 +18,4 @@ patches:
images:
- name: REGISTRY/NAMESPACE/IMAGE:TAG
newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/cms
newTag: 01633df2450ffb3f9af6c823ee88f5a7c47974ce
newTag: 74cf9abdbc41aeb21e05fc36104b19aa87e4b89a
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论