From 0275498af38bc1c8fbc5bfea54f3cce3550fd6ab Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 11 二月 2025 09:57:54 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile into 1.1
---
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/feignClient/AppUserClient.java | 33 ++++++++++++++++++++++++++++++---
1 files changed, 30 insertions(+), 3 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/feignClient/AppUserClient.java b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/feignClient/AppUserClient.java
index 3cc881d..fc74025 100644
--- a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/feignClient/AppUserClient.java
+++ b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/feignClient/AppUserClient.java
@@ -1,6 +1,7 @@
package com.ruoyi.account.api.feignClient;
import com.ruoyi.account.api.dto.GiveVipDto;
+import com.ruoyi.account.api.dto.SendMessageDTO;
import com.ruoyi.account.api.model.TAppCoupon;
import com.ruoyi.account.api.model.TAppUser;
import com.ruoyi.account.api.model.TAppUserAddress;
@@ -47,6 +48,8 @@
*/
@PostMapping(value = "/t-app-user/user/getUserById/{id}")
R<TAppUser> getUserById(@PathVariable("id") Long id);
+ @PostMapping(value = "/t-app-user/user/getAllUser")
+ R<List<TAppUser>> getAllUser();
@PostMapping(value = "/t-app-user/user/coupon/getById")
@@ -57,8 +60,8 @@
@PostMapping("/t-app-user/user/updateAppUser")
R updateAppUser(@RequestBody TAppUser appUser);
- @PostMapping("/t-app-user/user/points/change")
- R change(@RequestBody PointChangeDto points);
+// @PostMapping("/t-app-user/user/points/change")
+// R change(@RequestBody PointChangeDto points);
@PostMapping("/t-app-user/user/points/change/down")
R changeDown(@RequestBody PointChangeDto points);
@@ -83,6 +86,30 @@
@PostMapping(value = "/t-app-user/refundPoints/{param}")
public R refundPoints(@PathVariable("param")String param);
- @PostMapping(value = "/t-app-user/user/give/vip")
+ @PostMapping(value = "/t-app-user/user/give/vip1")
public R giveVip(@RequestBody GiveVipDto giveVipDto);
+
+
+ /**
+ * 获取微信token
+ * @return
+ */
+ @PostMapping("/wxLogin/getWXToken")
+ R<String> getWXToken();
+
+ /**
+ * 敏感词检测
+ * @param content
+ * @param openid
+ * @return
+ */
+ @PostMapping("/wxLogin/sensitiveWordDetection")
+ R<Boolean> sensitiveWordDetection (@RequestParam("content") String content, @RequestParam("openid") String openid);
+
+ /**
+ * 短信发送
+ * @return
+ */
+ @PostMapping("/t-app-user/sendMessage")
+ R<String> sendMessage(@RequestBody SendMessageDTO sendMessageDTO);
}
--
Gitblit v1.7.1