Merge branch 'dev' into 'mp-server-test'

优化

See merge request quanshu/mp-server!531

mp-admin/src/main/java/com/qs/mp/web/controller/api/user/MarketingHitPrizeController.java

@@ -16,6 +16,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiResponse;
 import io.swagger.annotations.ApiResponses;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -50,6 +51,14 @@ public class MarketingHitPrizeController extends BaseApiController {
         queryWrapper.eq("t1.marketing_id",userMarketingHitPrizeQueryParam.getMarketingId());
         queryWrapper.orderByAsc("t2.sort");
         List<UserMarketingHitPrizeListVO> marketingHitPrizeListVOList = marketingHitPrizeService.listHitPrizeByQueryWrapper(queryWrapper);
+        if (CollectionUtils.isNotEmpty(marketingHitPrizeListVOList)) {
+            for (UserMarketingHitPrizeListVO userMarketingHitPrizeListVO : marketingHitPrizeListVOList) {
+                String nickName = userMarketingHitPrizeListVO.getNickName();
+                if (StringUtils.isNotBlank(nickName)) {
+                    userMarketingHitPrizeListVO.setNickName(nickName.charAt(0) + "**");
+                }
+            }
+        }
         return getDataTable(marketingHitPrizeListVOList);
     }
 
@@ -57,10 +66,7 @@ public class MarketingHitPrizeController extends BaseApiController {
     @ApiOperation("判断当前用户是否中奖")
     public AjaxResult isHit(@PathVariable("marketingId") Long marketingId) {
 
-        Long userId = 0L;
-        if (hostHolder.getUser() != null) {
-            userId = hostHolder.getUser().getUserId();
-        }
+        Long userId = SecurityUtils.getLoginUser().getUserId();
 
         UserMarketingHitPrizeDetailVO userMarketingHitPrizeDetailVO = new UserMarketingHitPrizeDetailVO();
         userMarketingHitPrizeDetailVO.setIsHit(0);

mp-framework/src/main/java/com/qs/mp/framework/config/SecurityConfig.java

@@ -142,9 +142,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
                     "/api/v1/mp/user/exchange/category/list",
                     "/api/v1/mp/user/exchange/activity/list",
                     "/api/v1/mp/user/marketing/list",
-                    "/api/v1/mp/user/marketing/detail/*",
-                    "/api/v1/mp/user/marketing/hit/prize/list",
-                    "/api/v1/mp/user/marketing/hit/prize/isHit/*"
+                    "/api/v1/mp/user/marketing/detail/*"
                 ).permitAll()
                 // 除上面外的所有请求全部需要鉴权认证
                 .anyRequest().authenticated()