From 49e772e1687fd36493b7892735fb901d86a38243 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=AE=87=E8=88=AA?= <653809315@qq.com> Date: Fri, 31 May 2024 14:18:22 +0800 Subject: [PATCH] =?UTF-8?q?=E5=89=8D=E7=AB=AF=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/controller/AppInformController.java | 2 - .../app/controller/AppMessageController.java | 6 - .../app/controller/AppOrderController.java | 5 +- .../controller/AppUserDynamicController.java | 10 + .../ruoyi/app/controller/PayController.java | 3 +- .../app/controller/PhoneCodeController.java | 2 +- .../com/ruoyi/app/domain/AppExchangeCode.java | 11 + .../java/com/ruoyi/app/domain/AppMessage.java | 4 + .../com/ruoyi/app/domain/AppUserDynamic.java | 6 +- .../app/service/IAppUserDynamicService.java | 3 + .../service/impl/AppRegisterServiceImpl.java | 24 +- .../impl/AppUserDynamicServiceImpl.java | 6 + .../app/service/impl/AppUserServiceImpl.java | 8 +- .../app/utils/aliyun/sms/SendNoteUtil.java | 34 +- .../mapper/app/AppExchangeCodeMapper.xml | 6 +- .../resources/mapper/app/AppMessageMapper.xml | 14 +- .../resources/mapper/app/AppUserMapper.xml | 2 +- gan-ui/src/api/app/dynamic.js | 13 + gan-ui/src/api/app/gener.js | 6 +- gan-ui/src/api/app/message.js | 44 +++ gan-ui/src/views/app/dynamic/index.vue | 76 ++--- gan-ui/src/views/app/inform/index.vue | 32 ++ gan-ui/src/views/app/message/index.vue | 318 ++++++++++++++++++ gan-ui/src/views/app/order/index.vue | 46 +-- gan-ui/src/views/app/register/index.vue | 8 - gan-ui/src/views/app/user/index.vue | 12 +- gan-ui/src/views/app/vip/gener/index.vue | 50 ++- gan-ui/src/views/app/vip/index.vue | 85 +++-- gan-ui/src/views/index.vue | 74 ++-- 29 files changed, 659 insertions(+), 251 deletions(-) create mode 100644 gan-ui/src/api/app/message.js create mode 100644 gan-ui/src/views/app/message/index.vue diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/AppInformController.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/AppInformController.java index 1b24d49..12929ea 100644 --- a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/AppInformController.java +++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/AppInformController.java @@ -69,7 +69,6 @@ public class AppInformController extends BaseController /** * 获取举报详细信息 */ - @RequiresPermissions("app:inform:query") @GetMapping(value = "/{id}") @ApiOperation(value = "获取举报详细信息", notes = "获取举报详细信息", httpMethod = "GET") public AjaxResult getInfo(@PathVariable("id") Long id) @@ -80,7 +79,6 @@ public class AppInformController extends BaseController /** * 新增举报 */ - @RequiresPermissions("app:inform:add") @ApiOperation(value = "新增举报", notes = "新增举报", httpMethod = "POST") @Log(title = "举报", businessType = BusinessType.INSERT) @PostMapping("/add") diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/AppMessageController.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/AppMessageController.java index d23f171..90d8113 100644 --- a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/AppMessageController.java +++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/AppMessageController.java @@ -43,7 +43,6 @@ public class AppMessageController extends BaseController /** * 查询系统消息列表 */ - @RequiresPermissions("app:message:list") @GetMapping("/list") @ApiOperation(value = "查询系统消息", notes = "查询系统消息", httpMethod = "GET") public TableDataInfo list(AppMessage appMessage) @@ -56,7 +55,6 @@ public class AppMessageController extends BaseController /** * 导出系统消息列表 */ - @RequiresPermissions("app:message:export") @Log(title = "系统消息", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, AppMessage appMessage) @@ -69,7 +67,6 @@ public class AppMessageController extends BaseController /** * 获取系统消息详细信息 */ - @RequiresPermissions("app:message:query") @GetMapping(value = "/{id}") @ApiOperation(value = "获取系统消息详细信息", notes = "获取系统消息详细信息", httpMethod = "GET") public AjaxResult getInfo(@PathVariable("id") Long id) @@ -80,7 +77,6 @@ public class AppMessageController extends BaseController /** * 新增系统消息 */ - @RequiresPermissions("app:message:add") @ApiOperation(value = "新增系统消息", notes = "新增系统消息", httpMethod = "POST") @Log(title = "系统消息", businessType = BusinessType.INSERT) @PostMapping("/add") @@ -92,7 +88,6 @@ public class AppMessageController extends BaseController /** * 修改系统消息 */ - @RequiresPermissions("app:message:edit") @ApiOperation(value = "修改系统消息", notes = "修改系统消息", httpMethod = "PUT") @Log(title = "系统消息", businessType = BusinessType.UPDATE) @PutMapping("/edit") @@ -104,7 +99,6 @@ public class AppMessageController extends BaseController /** * 删除系统消息 */ - @RequiresPermissions("app:message:remove") @Log(title = "系统消息", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public AjaxResult remove(@PathVariable Long[] ids) diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/AppOrderController.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/AppOrderController.java index f7fe9d2..af5f4dc 100644 --- a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/AppOrderController.java +++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/AppOrderController.java @@ -51,7 +51,10 @@ public class AppOrderController extends BaseController { startPage(); List list = appOrderService.selectAppOrderList(appOrder); - return getDataTable(list); + + TableDataInfo dataTable = getDataTable(list); + dataTable.setTotal(appOrderService.selectAppOrderList(new AppOrder()).size()); + return dataTable; } /** diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/AppUserDynamicController.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/AppUserDynamicController.java index 2d265ba..5dac6d9 100644 --- a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/AppUserDynamicController.java +++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/AppUserDynamicController.java @@ -5,6 +5,8 @@ import java.io.IOException; import javax.servlet.http.HttpServletResponse; import com.ruoyi.app.domain.vo.AppUserDynamicVo; +import com.ruoyi.common.security.utils.SecurityUtils; +import com.ruoyi.system.api.domain.SysUser; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; @@ -122,4 +124,12 @@ public class AppUserDynamicController extends BaseController { return toAjax(appUserDynamicService.deleteAppUserDynamicByIds(ids)); } + + + @PutMapping("/changeStatus") + public AjaxResult changeStatus(@RequestBody AppUserDynamic appUserDynamic) + { + return toAjax(appUserDynamicService.updateAppUserDynamicStatus(appUserDynamic)); + } + } diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/PayController.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/PayController.java index e5f528f..10fd8bf 100644 --- a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/PayController.java +++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/PayController.java @@ -79,7 +79,8 @@ public class PayController extends BaseController @RequestMapping("/generateCode") @ApiOperation(value = "生成兑换码", notes = "生成兑换码", httpMethod = "GET") - public String generateCode(Integer num,Integer level,HttpServletResponse response){ + public String generateCode(@RequestParam("num") Integer num, + @RequestParam("level") Integer level,HttpServletResponse response){ if(num>10000){ return "------num error------"; } diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/PhoneCodeController.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/PhoneCodeController.java index ba5a024..f2fb0f2 100644 --- a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/PhoneCodeController.java +++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/controller/PhoneCodeController.java @@ -42,7 +42,7 @@ public class PhoneCodeController { } send = sendNoteUtil.sendNoteMessgae(phoneNum); }else { - send = sendNoteUtil.sendMessage(phoneNum); + send = sendNoteUtil.sendNoteMessgae(phoneNum); } if ("OK".equals(send)) { diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/AppExchangeCode.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/AppExchangeCode.java index 883b6a7..c9f570f 100644 --- a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/AppExchangeCode.java +++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/AppExchangeCode.java @@ -38,6 +38,8 @@ public class AppExchangeCode extends BaseEntity @Excel(name = "会员等级，1-7天，2-一个月，3-一年") private Integer level; + private String userName; + public void setId(Long id) { this.id = id; @@ -75,6 +77,14 @@ public class AppExchangeCode extends BaseEntity return userTime; } + public String getUserName() { + return userName; + } + + public void setUserName(String userName) { + this.userName = userName; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) @@ -87,6 +97,7 @@ public class AppExchangeCode extends BaseEntity .append("updateBy", getUpdateBy()) .append("remark", getRemark()) .append("userTime", getUserTime()) + .append("userName", getUserName()) .toString(); } } diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/AppMessage.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/AppMessage.java index e93a5f1..eb6bbf5 100644 --- a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/AppMessage.java +++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/AppMessage.java @@ -24,6 +24,8 @@ public class AppMessage extends BaseEntity @Excel(name = "管理员id") private Long userId; + private String title; + /** 通知内容 */ @Excel(name = "通知内容") private String content; @@ -32,6 +34,8 @@ public class AppMessage extends BaseEntity @Excel(name = "图片") private String imgUrl; + private Integer type; + @Excel(name = "头像") private String avatarUrl; diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/AppUserDynamic.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/AppUserDynamic.java index cfe61fe..8ddfd1b 100644 --- a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/AppUserDynamic.java +++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/AppUserDynamic.java @@ -54,7 +54,7 @@ public class AppUserDynamic extends BaseEntity /** 是否置顶：0是1否 */ @Excel(name = "是否置顶：0是1否") - private Long isTop; + private Boolean isTop; @Excel(name = "用户名字") private String username; @@ -80,12 +80,12 @@ public class AppUserDynamic extends BaseEntity private Boolean isOwner; - public void setIsTop(Long isTop) + public void setIsTop(Boolean isTop) { this.isTop = isTop; } - public Long getIsTop() + public Boolean getIsTop() { return isTop; } diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/IAppUserDynamicService.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/IAppUserDynamicService.java index eae7dc4..5c4c98b 100644 --- a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/IAppUserDynamicService.java +++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/IAppUserDynamicService.java @@ -61,4 +61,7 @@ public interface IAppUserDynamicService * @return 结果 */ public int deleteAppUserDynamicById(Long id); + + int updateAppUserDynamicStatus(AppUserDynamic appUserDynamic); + } diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppRegisterServiceImpl.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppRegisterServiceImpl.java index 4054099..4b9a10a 100644 --- a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppRegisterServiceImpl.java +++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppRegisterServiceImpl.java @@ -10,13 +10,11 @@ import com.ruoyi.app.domain.AppUser; import com.ruoyi.app.domain.vo.AppRegisterVo; import com.ruoyi.app.mapper.AppSchoolMapper; import com.ruoyi.app.mapper.AppUserMapper; +import com.ruoyi.app.utils.aliyun.sms.SendNoteUtil; import com.ruoyi.common.core.utils.DateUtils; import com.ruoyi.common.core.utils.StringUtils; import com.ruoyi.common.core.utils.bean.BeanUtils; -import com.ruoyi.common.core.utils.mail.ALiYunMailUtil; import com.ruoyi.common.core.utils.mail.AliMailUtil; -import com.ruoyi.common.core.utils.mail.MailUtil; -import com.ruoyi.common.core.utils.uuid.IdUtils; import org.apache.http.HttpResponse; import org.apache.http.client.HttpClient; import org.apache.http.client.methods.HttpGet; @@ -47,6 +45,9 @@ public class AppRegisterServiceImpl implements IAppRegisterService { @Autowired private AppUserMapper appUserMapper; + @Autowired + private SendNoteUtil sendNoteUtil; + /** * 查询注册审核 * @@ -161,6 +162,7 @@ public class AppRegisterServiceImpl implements IAppRegisterService { appUser.setCityId(appRegister.getCityId() != null ? appRegister.getCityId() : null); appUser.setTownId(appRegister.getTownId() != null ? appRegister.getTownId() : null); appUserMapper.insertAppUser(appUser); + sendNoteUtil.sendMessage(appRegister.getPhone()); HttpClient httpClient = HttpClients.createDefault(); String pushId = appRegister.getPushId() != null ? appRegister.getPushId() : null; String url = "https://tcb-am7ffkwasxkewhf-3cpy096b83a1.service.tcloudbase.com/urlPush/pushId?pushId=" + pushId + "&title=审核完成&content=审核已通过！"; @@ -223,19 +225,7 @@ public class AppRegisterServiceImpl implements IAppRegisterService { } public static void main(String[] args) { - - String token = "4e290542-53f3-4a33-96ff-9510dd050100"; - String email = "653809315@qq.com"; - String EM = "

欢迎来到我们的服务！！

" - + "

请点击下面的网址确认您的注册:

" - + "

http://127.0.0.1:9204/app/activation/" + token + "/" + email + "

" - + ""; - try { - AliMailUtil.sendMail(EM, email); - } catch (MessagingException e) { - throw new RuntimeException(e); - } catch (Exception e) { - throw new RuntimeException(e); - } + SendNoteUtil sendNoteUtil = new SendNoteUtil(); + sendNoteUtil.sendMessage("17647557909"); } } diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppUserDynamicServiceImpl.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppUserDynamicServiceImpl.java index bbe7158..4309f9a 100644 --- a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppUserDynamicServiceImpl.java +++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppUserDynamicServiceImpl.java @@ -155,6 +155,12 @@ public class AppUserDynamicServiceImpl implements IAppUserDynamicService return appUserDynamicMapper.deleteAppUserDynamicById(id); } + @Override + public int updateAppUserDynamicStatus(AppUserDynamic appUserDynamic) { + + return appUserDynamicMapper.updateAppUserDynamic(appUserDynamic); + } + @Override public List selectDynamicList(AppUserDynamic appUserDynamic) { // 收藏评论 diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppUserServiceImpl.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppUserServiceImpl.java index a92eb5a..519cb24 100644 --- a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppUserServiceImpl.java +++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppUserServiceImpl.java @@ -51,8 +51,6 @@ public class AppUserServiceImpl implements IAppUserService { @Autowired private AppProvinceMapper appProvinceMapper; - @Autowired - private AppProvinceMapper appProvinceMapper; @Autowired private AppCityMapper appCityMapper; @@ -152,9 +150,9 @@ public class AppUserServiceImpl implements IAppUserService { appUserVo.setSchoolName(appSchool.getName()); } } - AppProvince appProvince = appProvinceMapper.selectAppProvinceById(appUserSource.getProvinceId()); - AppCity appCity = appCityMapper.selectAppCityById(Long.valueOf(appUserSource.getCityId())); - AppTown appTown = appTownMapper.selectAppTownById(Long.valueOf(appUserSource.getTownId())); + AppProvince appProvince = appProvinceMapper.selectAppProvinceById(Objects.nonNull(appUserSource.getProvinceId()) ? appUserSource.getProvinceId() : 0); + AppCity appCity = appCityMapper.selectAppCityById(Objects.nonNull(appUserSource.getCityId()) ? Long.valueOf(appUserSource.getCityId()) : 0L); + AppTown appTown = appTownMapper.selectAppTownById(Objects.nonNull(appUserSource.getTownId()) ? Long.valueOf(appUserSource.getTownId()) : 0L); String province = appProvince != null ? appProvince.getName() + "-" : ""; String cityName = appCity != null ? appCity.getName() + "-" : ""; String townName = appTown != null ? appTown.getName() : ""; diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/utils/aliyun/sms/SendNoteUtil.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/utils/aliyun/sms/SendNoteUtil.java index 31b7f4f..dbb4180 100644 --- a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/utils/aliyun/sms/SendNoteUtil.java +++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/utils/aliyun/sms/SendNoteUtil.java @@ -39,13 +39,13 @@ public class SendNoteUtil { * 阿里云签名 */ // @Value("${alisms.signName}") - private String signName = "丙煜"; + private String signName = "干杯GoBig"; /** * 阿里云短信模板Code */ // @Value("${alisms.templateCode}") - private String templateCode = "SMS_465690552"; + private String templateCode = "SMS_299115021"; /** @@ -58,7 +58,7 @@ public class SendNoteUtil { //验证平台信息 开发者无需任何更改 private static final String dysmsapi = "dysmsapi.aliyuncs.com"; - DefaultProfile profile = DefaultProfile.getProfile("default","LTAI5tM1LeE2pkiS3qEFQkfb", "fEZZyFvWkETS8Clm73f7qmY9ohcTpc"); + DefaultProfile profile = DefaultProfile.getProfile("default","LTAI5tQMf7PG2rH4U2mZBQnK", "3l8t7cVJGTGGu89AepWtq0CddgZNfU"); IAcsClient client = new DefaultAcsClient(profile); //这一步的两个参数,一个是要发送验证码的手机号 一个是模板Code用来区分登录注册 @@ -83,12 +83,12 @@ public class SendNoteUtil { //模板代码,我暂时用的参数,你可以直接写成模板码,模板码参考第八步 request.putQueryParameter("TemplateCode", templateCode); //用户定义的验证码内容 - request.putQueryParameter("TemplateParam", "{\"code\": 1234}"); + request.putQueryParameter("TemplateParam", "{\"code\": \"" + randomNumber + "\"}"); try { -// redisService.setCacheObject(PhoneNumber, randomNumber, 300L, TimeUnit.SECONDS); -// if (!redisService.hasKey(PhoneNumber)) { -// return "Redis存入失败"; -// } + redisService.setCacheObject(PhoneNumber, randomNumber, 300L, TimeUnit.SECONDS); + if (!redisService.hasKey(PhoneNumber)) { + return "Redis存入失败"; + } CommonResponse response = client.getCommonResponse(request); String returnStr = response.getData(); System.out.println(returnStr); @@ -109,14 +109,14 @@ public class SendNoteUtil { * @return 返回校验结果 */ public String check(String phoneNumber, String code) { -// String verification = redisService.getCacheObject(phoneNumber); -// // 手机号不存在,从新发送验证码 -// if (verification == null) { -// return null; -// } - if ("1234".equals(code)) { + String verification = redisService.getCacheObject(phoneNumber); + // 手机号不存在,从新发送验证码 + if (verification == null) { + return null; + } + if (verification.equals(code)) { // 校验通过后删除Redis中的验证码缓存 -// redisService.deleteObject(phoneNumber); + redisService.deleteObject(phoneNumber); return "OK"; } // 验证码校验错误 @@ -150,9 +150,9 @@ public class SendNoteUtil { request.putQueryParameter("PhoneNumbers", PhoneNumber);//接受验证码的手机号 request.putQueryParameter("SignName", signName);//签名 //模板代码,我暂时用的参数,你可以直接写成模板码,模板码参考第八步,此模板代码是发送通过申请的模板代码 - request.putQueryParameter("TemplateCode", "20042795554"); + request.putQueryParameter("TemplateCode", "SMS_467520300"); - request.putQueryParameter("TemplateParam", "{\"phone\":\"17647557909\"}"); + request.putQueryParameter("TemplateParam", "{\"phone\":\"" + PhoneNumber + "\"}"); try { CommonResponse response = client.getCommonResponse(request); String returnStr = response.getData(); diff --git a/gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppExchangeCodeMapper.xml b/gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppExchangeCodeMapper.xml index 0b06c09..d3ae4a3 100644 --- a/gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppExchangeCodeMapper.xml +++ b/gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppExchangeCodeMapper.xml @@ -22,9 +22,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" @@ -28,13 +28,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"