From 65da753e664fb6e6178e719a9297e00c8cc8e5a4 Mon Sep 17 00:00:00 2001 From: wangqx Date: Sat, 16 Aug 2025 11:17:18 +0800 Subject: [PATCH] =?UTF-8?q?[fix]=E5=88=A0=E9=99=A4member=E5=8F=82=E6=95=B0?= =?UTF-8?q?=EF=BC=8C=E6=94=B9=E4=B8=BA=E4=BB=8Etoken=E4=B8=AD=E8=8E=B7?= =?UTF-8?q?=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/dromara/app/AppArticleController.java | 2 +- .../org/dromara/app/AppMemberController.java | 9 ++-- .../org/dromara/app/AppSearchController.java | 43 +++++++++++++++++++ .../system/controller/SysOssController.java | 1 - script/docker/docker.txt | 17 ++++++++ 5 files changed, 67 insertions(+), 5 deletions(-) create mode 100644 ruoyi-admin/src/main/java/org/dromara/app/AppSearchController.java diff --git a/ruoyi-admin/src/main/java/org/dromara/app/AppArticleController.java b/ruoyi-admin/src/main/java/org/dromara/app/AppArticleController.java index 26de61046..1a5e1472a 100644 --- a/ruoyi-admin/src/main/java/org/dromara/app/AppArticleController.java +++ b/ruoyi-admin/src/main/java/org/dromara/app/AppArticleController.java @@ -21,7 +21,7 @@ public class AppArticleController { private final IArticleService service; @Tag(name = "轮播列表") - @PostMapping("/carousel/") + @PostMapping("/carousel") public R> carousel(@RequestBody ArticleBO bo) { bo.setType(1);//轮播图 bo.setCategoryId(1l); diff --git a/ruoyi-admin/src/main/java/org/dromara/app/AppMemberController.java b/ruoyi-admin/src/main/java/org/dromara/app/AppMemberController.java index 7184e19da..e6ec00b42 100644 --- a/ruoyi-admin/src/main/java/org/dromara/app/AppMemberController.java +++ b/ruoyi-admin/src/main/java/org/dromara/app/AppMemberController.java @@ -22,6 +22,7 @@ import com.wzj.soopin.member.service.IMemberService; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import me.zhyd.oauth.model.AuthResponse; +import me.zhyd.oauth.model.AuthToken; import me.zhyd.oauth.model.AuthUser; import org.dromara.common.core.domain.R; import org.dromara.common.core.domain.model.LoginUser; @@ -117,7 +118,7 @@ public class AppMemberController { @Tag(name = "绑定微信") @PostMapping("/bind/wechat") - public R bindWechat(@RequestBody SocialLoginBody loginBody) { + public R bindWechat(@RequestBody SocialLoginBody loginBody) { //获取用户信息 LoginUser loginUser = LoginHelper.getLoginUser(); @@ -136,10 +137,12 @@ public class AppMemberController { AuthUser authUserData = response.getData(); - Member member = Member.builder().id(memberId).openId(authUserData.getUuid()).build(); + String unionId=authUserData.getToken().getUnionId(); + Member member = Member.builder().id(memberId).openId(unionId).build(); + service.updateById(member); // 更新用户的微信信息 // 返回给前端 - return R.ok(authUserData); + return R.ok(authUserData.getToken()); } } diff --git a/ruoyi-admin/src/main/java/org/dromara/app/AppSearchController.java b/ruoyi-admin/src/main/java/org/dromara/app/AppSearchController.java new file mode 100644 index 000000000..735c70016 --- /dev/null +++ b/ruoyi-admin/src/main/java/org/dromara/app/AppSearchController.java @@ -0,0 +1,43 @@ +package org.dromara.app; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.wzj.soopin.content.domain.bo.ArticleBO; +import com.wzj.soopin.content.domain.vo.ArticleVO; +import com.wzj.soopin.goods.service.ProductService; +import com.wzj.soopin.member.service.IMemberService; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.RequiredArgsConstructor; +import org.dromara.common.core.domain.R; +import org.dromara.system.service.ISysTenantService; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +@RestController +@RequestMapping("/app/common/search") +@Tag(name = "公共检索") +@RequiredArgsConstructor +public class AppSearchController { + + + private final ProductService productService; + + private final ISysTenantService sysTenantService; + + private final IMemberService memberService; + + @Tag(name = "检索") + @PostMapping("/search") + public R> search(@RequestBody ArticleBO bo,@RequestBody Page page) { + +// ProductBo productBo=new ProductBo(); +// productBo.setNameLike(bo.getTitle()); +// Page productPage = productService.page(page, bo.toWrapper()); +// List articleList = productService.getList( bo.toWrapper()); +// return R.ok(articleList); + return null; + } +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/SysOssController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/SysOssController.java index f071463b2..cce6f1b58 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/SysOssController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/SysOssController.java @@ -66,7 +66,6 @@ public class SysOssController extends BaseController { * * @param file 文件 */ - @SaCheckPermission("system:oss:upload") @Log(title = "OSS对象存储", businessType = BusinessType.INSERT) @PostMapping(value = "/upload", consumes = MediaType.MULTIPART_FORM_DATA_VALUE) public R upload(@RequestPart("file") MultipartFile file) { diff --git a/script/docker/docker.txt b/script/docker/docker.txt index 446c90735..4b290e939 100644 --- a/script/docker/docker.txt +++ b/script/docker/docker.txt @@ -77,3 +77,20 @@ docker run -d \ -e "ES_JAVA_OPTS=-Xms512m -Xmx512m" \ -v /var/local/docker/elasticsearch/data:/usr/share/elasticsearch/data \ elasticsearch:7.17.0 + + +docker run -d \ + --name minio \ + -p 9000:9000 \ + -p 9001:9001 \ + -e TZ=Asia/Shanghai \ + -e MINIO_ROOT_USER=wzj \ + -e MINIO_ROOT_PASSWORD=wzj123456 \ + -e MINIO_COMPRESS=off \ + -e MINIO_COMPRESS_EXTENSIONS="" \ + -e MINIO_COMPRESS_MIME_TYPES="" \ + -v /var/local/docker/minio/data:/data \ + -v /var/local/docker/minio/config:/root/.minio/ \ + --privileged \ + minio/minio:RELEASE.2023-04-13T03-08-07Z \ + server --address ':9000' --console-address ':9001' /data