Merge remote-tracking branch 'origin/wzj-main' into wzj-main

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<List<ArticleVO>> carousel(@RequestBody ArticleBO bo) {
         bo.setType(1);//轮播图
         bo.setCategoryId(1l);

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<AuthUser> bindWechat(@RequestBody SocialLoginBody loginBody) {
+    public R<AuthToken> 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());
     }
 
 }

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<List<ArticleVO>> search(@RequestBody ArticleBO bo,@RequestBody Page<ArticleBO> page) {
+
+//        ProductBo productBo=new ProductBo();
+//        productBo.setNameLike(bo.getTitle());
+//        Page<Product> productPage = productService.page(page, bo.toWrapper());
+//        List<ArticleVO> articleList = productService.getList( bo.toWrapper());
+//        return R.ok(articleList);
+        return null;
+    }
+}

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<SysOssUploadVo> upload(@RequestPart("file") MultipartFile file) {

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