1、内容管理增加优选集团内容字段

2、摸查解决未登录问题

citu-module-system/citu-module-system-biz/src/main/java/com/citu/module/system/api/social/SocialClientApiImpl.java

@@ -17,7 +17,6 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
-
 import java.util.List;
 
 import static cn.hutool.core.collection.CollUtil.findOne;
@@ -87,7 +86,7 @@ public class SocialClientApiImpl implements SocialClientApi {
         // 2. 获得社交用户
         SocialUserRespDTO socialUser = socialUserService.getSocialUserByUserId(reqDTO.getUserType(), reqDTO.getUserId(),
                 SocialTypeEnum.WECHAT_MINI_APP.getType());
-        if (StrUtil.isBlankIfStr(socialUser.getOpenid())) {
+        if (null == socialUser || StrUtil.isBlankIfStr(socialUser.getOpenid())) {
             log.warn("[sendWxaSubscribeMessage][reqDTO({}) 发送订阅消息失败，原因：会员 openid 缺失]", reqDTO);
             return success(false);
         }

menduner/menduner-im-biz/src/main/java/com/citu/module/menduner/im/controller/app/WuKongWebhookController.java

@@ -1,6 +1,5 @@
 package com.citu.module.menduner.im.controller.app;
 
-import com.alibaba.fastjson.JSON;
 import com.citu.framework.common.pojo.CommonResult;
 import com.citu.module.menduner.im.service.wukong.WukongWebhookService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -9,9 +8,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.citu.framework.security.core.annotations.PreAuthenticated;
-import java.util.List;
-import java.util.Map;
+import javax.annotation.security.PermitAll;
 
 @RestController
 public class WuKongWebhookController {
@@ -21,14 +18,15 @@ public class WuKongWebhookController {
 
     /**
      * 悟空 web hook 回调
+     *
      * @param event
      * @param reqVo
      * @return
      */
-    @PreAuthenticated
+    @PermitAll
     @PostMapping("/im/wukong/webhook")
-    public CommonResult wukongWebhook(@RequestParam("event")String event, @RequestBody String reqVo){
-            return service.wukongWebhook(event, reqVo);
+    public CommonResult wukongWebhook(@RequestParam("event") String event, @RequestBody String reqVo) {
+        return service.wukongWebhook(event, reqVo);
     }
 
 

menduner/menduner-reward-biz/src/main/java/com/citu/module/menduner/reward/controller/admin/event/EventTrackController.java

@@ -16,6 +16,8 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import com.citu.framework.security.core.annotations.PreAuthenticated;
+
+import javax.annotation.security.PermitAll;
 import javax.validation.Valid;
 import java.util.List;
 
@@ -31,14 +33,14 @@ public class EventTrackController {
     private EventTrackService service;
 
 
-    @PreAuthenticated
+    @PermitAll
     @GetMapping("/list")
     @Operation(summary = "获取规则配置跟踪列表")
     public CommonResult<List<EventTrackUrlRespVO>> list() {
         return success(service.getEventTrackList());
     }
 
-    @PreAuthenticated
+    @PermitAll
     @PostMapping("/click")
     @Operation(summary = "点击")
     public CommonResult<List<EventTrackPointRespVO>> click(@RequestParam("url") String url) throws Exception {

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/common/auth/AppMdeAuthController.java

@@ -25,6 +25,8 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import com.citu.framework.security.core.annotations.PreAuthenticated;
+
+import javax.annotation.security.PermitAll;
 import javax.servlet.http.HttpServletRequest;
 import javax.validation.Valid;
 
@@ -65,7 +67,7 @@ public class AppMdeAuthController {
         return success(true);
     }
 
-    @PreAuthenticated
+    @PermitAll
     @PostMapping("/refresh-token")
     @Operation(summary = "刷新令牌")
     @Parameter(name = "refreshToken", description = "刷新令牌", required = true)

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/app/common/system/SystemController.java

@@ -12,8 +12,7 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.citu.framework.security.core.annotations.PreAuthenticated;
-
+import javax.annotation.security.PermitAll;
 import java.util.Map;
 
 import static com.citu.framework.common.pojo.CommonResult.success;
@@ -34,11 +33,11 @@ public class SystemController {
 
     @GetMapping("/get/version")
     @Operation(summary = "获取系统版本号")
-    @PreAuthenticated
-    public CommonResult<Map<Object,Object>> getVersion() {
+    @PermitAll
+    public CommonResult<Map<Object, Object>> getVersion() {
         return success(MapUtil.builder()
                 .put("version", version)
-                .put("time",  System.currentTimeMillis())
+                .put("time", System.currentTimeMillis())
                 .build());
     }
 }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/base/web/WebContentRespVO.java

@@ -3,6 +3,8 @@ package com.citu.module.menduner.system.controller.base.web;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
 import com.citu.module.menduner.system.dal.dataobject.web.ContentStyle;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
@@ -55,6 +57,10 @@ public class WebContentRespVO {
     @ExcelProperty("pc优选")
     private List<ContentStyle> pcHomePreferred;
 
+    @Schema(description = "pc优选集团")
+    @ExcelProperty("pc优选集团")
+    private Object pcPreferredGroup;
+
     @Schema(description = "手机端首页轮播图")
     @ExcelProperty("手机端首页轮播图")
     private List<ContentStyle> appHomeCarousel;
@@ -67,6 +73,10 @@ public class WebContentRespVO {
     @ExcelProperty("手机端栏目")
     private List<ContentStyle> appHomeColumn;
 
+    @Schema(description = "手机端优选集团")
+    @ExcelProperty("手机端优选集团")
+    private Object appPreferredGroup;
+
     @Schema(description = "状态（0开启 1关闭）", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
     @ExcelProperty("状态（0开启 1关闭）")
     private String status;

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/controller/base/web/WebContentSaveReqVO.java

@@ -41,6 +41,9 @@ public class WebContentSaveReqVO {
     @Schema(description = "pc优选")
     private List<ContentStyle> pcHomePreferred;
 
+    @Schema(description = "pc优选集团")
+    private Object pcPreferredGroup;
+
     @Schema(description = "手机端首页轮播图")
     private List<ContentStyle> appHomeCarousel;
 
@@ -50,6 +53,9 @@ public class WebContentSaveReqVO {
     @Schema(description = "手机端栏目")
     private List<ContentStyle> appHomeColumn;
 
+    @Schema(description = "手机端优选集团")
+    private Object appPreferredGroup;
+
     @Schema(description = "状态（0开启 1关闭）", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
     @NotEmpty(message = "状态（0开启 1关闭）不能为空")
     private String status;

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/dal/dataobject/web/WebContentDO.java

@@ -76,6 +76,11 @@ public class WebContentDO extends TenantBaseDO {
      */
     @TableField(typeHandler = JacksonTypeHandler.class)
     private List<ContentStyle> pcHomePreferred;
+    /**
+     * pc优选集团
+     */
+    @TableField(typeHandler = JacksonTypeHandler.class)
+    private Object pcPreferredGroup;
     /**
      * 手机端首页轮播图
      */
@@ -91,6 +96,11 @@ public class WebContentDO extends TenantBaseDO {
      */
     @TableField(typeHandler = JacksonTypeHandler.class)
     private List<ContentStyle> appHomeColumn;
+    /**
+     * 手机端优选集团
+     */
+    @TableField(typeHandler = JacksonTypeHandler.class)
+    private Object appPreferredGroup;
     /**
      * 状态（0开启 1关闭）
      */