shayu/xq-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

init

Browse Source
This commit is contained in:
77
2024-04-27 02:11:06 +08:00
parent 82450212db
commit 77eeb31f7c
13 changed files with 72 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ruoyi-xq/src/main/java/com/ruoyi/xq/config/AliSmsProperties.java
View File

@@ -8,7 +8,7 @@ import org.springframework.stereotype.Component;
@Component
@ConfigurationProperties(prefix = "ali.sms")
public class AliSmsProperties {
private String accessKeyId = "LTAI5tRf2jUyoYmAC9kw4AMF";
private String accessKeySecret = "frvNLpySKxC38eihnWKi3NMFZSume3";
private String signName = "武汉康慧创欣科技";
private String accessKeyId = "LTAI5tAb6pSUHksjV6EKkLyA";
private String accessKeySecret = "EmpYUMG1MfS47ifuAlSGzQOUH2mIZ5";
private String signName = "遇见良缘公众号";
}

2
ruoyi-xq/src/main/java/com/ruoyi/xq/domain/UserInfo.java
View File

@@ -114,7 +114,7 @@ public class UserInfo implements Serializable {
/**
* 择偶条件-学历
*/
private Integer filterEducation;
private String filterEducation;
/**
* 择偶条件-地区
*/

2
ruoyi-xq/src/main/java/com/ruoyi/xq/dto/admin/user/req/UpdateUserinfoFilterReq.java
View File

@@ -26,7 +26,7 @@ public class UpdateUserinfoFilterReq {
/**
* 择偶条件-学历
*/
private Integer filterEducation;
private String filterEducation;
/**
* 择偶条件-地区
*/

2
ruoyi-xq/src/main/java/com/ruoyi/xq/dto/app/user/UpdateUserFullInfoReq.java
View File

@@ -85,7 +85,7 @@ public class UpdateUserFullInfoReq {
@Schema(description = "择偶条件-婚况")
private String filterMarriage;
@Schema(description = "择偶条件-学历")
private Integer filterEducation;
private String filterEducation;
@Schema(description = "择偶条件-地区Code")
private Integer filterResidenceCode;
@Schema(description = "择偶条件-年收入")

2
ruoyi-xq/src/main/java/com/ruoyi/xq/dto/app/user/vo/CurrentUserFullInfoVo.java
View File

@@ -209,7 +209,7 @@ public class CurrentUserFullInfoVo {
* 择偶条件-学历
*/
@Schema(description = "择偶条件-学历")
private Integer filterEducation;
private String filterEducation;
/**
* 择偶条件-地区
*/

2
ruoyi-xq/src/main/java/com/ruoyi/xq/dto/app/user/vo/CurrentUserInfoVo.java
View File

@@ -82,6 +82,8 @@ public class CurrentUserInfoVo {
private Integer vipType;
@Schema(description = "vip到期时间")
private LocalDateTime vipTimeout;
@Schema(description = "微信号")
private String wxCode;
/**
* 收益的余额
*/

2
ruoyi-xq/src/main/java/com/ruoyi/xq/dto/app/user/vo/HomeUserVo.java
View File

@@ -211,7 +211,7 @@ public class HomeUserVo {
* 择偶条件-学历
*/
@Schema(description = "择偶条件-学历")
private Integer filterEducation;
private String filterEducation;
/**
* 择偶条件-地区
*/

4
ruoyi-xq/src/main/java/com/ruoyi/xq/enums/common/CodeEnum.java
View File

@@ -4,8 +4,8 @@ import lombok.Getter;
@Getter
public enum CodeEnum {
LOGIN("登陆短信","SMS_294195165"),
RESET_PASSWORD("重置密码","SMS_294195165"),
LOGIN("登陆短信","SMS_298150567"),
RESET_PASSWORD("重置密码","SMS_298150567"),
;
private final String name;
private final String aliTemplate;

20
ruoyi-xq/src/main/java/com/ruoyi/xq/enums/userinfo/filter/UserFilterCarStatusEnum.java Normal file
View File

@@ -0,0 +1,20 @@
package com.ruoyi.xq.enums.userinfo.filter;
import lombok.Getter;
@Getter
public enum UserFilterCarStatusEnum {
JINJI(1,"要求经济型以上配置车辆"),
ZHONG_XIN(2,"要求中档型以上配置车辆"),
HAO_HUA(3,"要求豪车型车辆"),
;
private final Integer code;
private final String text;
UserFilterCarStatusEnum(Integer code, String text) {
this.code = code;
this.text = text;
}
}

19
ruoyi-xq/src/main/java/com/ruoyi/xq/enums/userinfo/filter/UserFilterChildStatusEnum.java Normal file
View File

@@ -0,0 +1,19 @@
package com.ruoyi.xq.enums.userinfo.filter;
import lombok.Getter;
@Getter
public enum UserFilterChildStatusEnum {
NO_CHILDREN(1,"只接受无小孩"),
HAVE_CHILDREN(2,"不介意小孩，但不能住一起"),
;
private final Integer code;
private final String text;
UserFilterChildStatusEnum(Integer code, String text) {
this.code = code;
this.text = text;
}
}

19
ruoyi-xq/src/main/java/com/ruoyi/xq/enums/userinfo/filter/UserFilterHouseStatusEnum.java Normal file
View File

@@ -0,0 +1,19 @@
package com.ruoyi.xq.enums.userinfo.filter;
import lombok.Getter;
@Getter
public enum UserFilterHouseStatusEnum {
HAVE_HOUSE_AND_NO_LOANS(1,"必须有房无贷款"),
HAVE_HOUSE(2,"必须有房(不介意贷款)"),
;
private final Integer code;
private final String text;
UserFilterHouseStatusEnum(Integer code, String text) {
this.code = code;
this.text = text;
}
}

2
ruoyi-xq/src/main/java/com/ruoyi/xq/kit/AliSmsKit.java
View File

@@ -137,7 +137,7 @@ public class AliSmsKit {
AliSmsProperties config = new AliSmsProperties();
messageSenderUtil.setConfig(config);
messageSenderUtil.init();
messageSenderUtil.batchSendMessagePublic(Arrays.asList("15302786929"), CodeEnum.LOGIN.getAliTemplate());
messageSenderUtil.sendMessage("15302786929", CodeEnum.LOGIN.getAliTemplate(), "123332");
}

1
ruoyi-xq/src/main/java/com/ruoyi/xq/manager/CurrentUserManager.java
View File

@@ -112,6 +112,7 @@ public class CurrentUserManager {
vo.setFinishBaseStatus(user.getFinishBaseStatus());
vo.setBaseStep(user.getBaseStep());
vo.setImToken(user.getImToken());
vo.setWxCode(user.getWxCode());
UserAuth userAuth = userAuthService.getByUserId(userId);
vo.setAlreadyAuthNum(userAuth.getAlreadyAuthNum());
List<UserPictures> userPictures = userPicturesService.listByUserIdAuditingAndSuccess(user.getId());