fix 准备合并项目到微服务

xyzc-start/src/main/java/com/xyzc/start/cache/SysParamsCache.java

@@ -59,14 +59,16 @@ public class SysParamsCache {
      * @param paramKey 参数键
      */
     public String get(String paramKey) {
+
         return (String) redisCache.hGet(SYSTEM_PARAMS_KEY, paramKey);
     }
 
     /**
-     *
+     * @param agentMerId 代理商id
      */
-    public AgentConfig getAgentConfig(String agentMerId) {
-        return (AgentConfig) redisCache.hGet(SYSTEM_PARAMS_KEY, agentMerId);
+    public Object getAgentConfig(String agentMerId) {
+
+        return redisCache.hGet(SYSTEM_PARAMS_KEY, agentMerId);
     }
 
     /**

xyzc-start/src/main/java/com/xyzc/start/constant/BaseUserFeedbackConst.java

@@ -0,0 +1,10 @@
+package com.xyzc.start.constant;
+
+public interface BaseUserFeedbackConst {
+
+    /**
+     * 反馈类型；1-用户反馈；2-绘画模型反馈
+     */
+
+
+}

xyzc-start/src/main/java/com/xyzc/start/controller/HelpPageController.java

@@ -4,6 +4,7 @@ import com.xyzc.common.core.utils.Result;
 import com.xyzc.start.domain.HelpContent;
 import com.xyzc.start.domain.bo.HelpFeedbackBo;
 import com.xyzc.start.service.IHelpPageService;
+import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import org.hibernate.validator.constraints.Range;
 import org.springframework.web.bind.annotation.*;
@@ -30,8 +31,9 @@ public class HelpPageController {
      * @return
      */
     @PostMapping("/submit")
-    public Result<Void> submit(@RequestBody HelpFeedbackBo helpFeedbackBo) {
+    public Result<Void> submit(@RequestBody @Valid HelpFeedbackBo helpFeedbackBo) {
         helpPageService.submit(helpFeedbackBo);
+
         return Result.ok();
     }
 

xyzc-start/src/main/java/com/xyzc/start/controller/SchemeController.java

@@ -23,7 +23,7 @@ public class SchemeController {
 
     private final ISchemeService schemeService;
 
-    @DubboReference(mock = "true")
+//    @DubboReference(mock = "true")
 //    private final RemotePayService remotePayService;
 
     /**

xyzc-start/src/main/java/com/xyzc/start/domain/BaseUserFeedback.java

@@ -30,4 +30,9 @@ public class BaseUserFeedback {
      */
     private Long agentId;
 
+    /**
+     * 反馈类型，1：用户反馈，2-绘画模型反馈
+     */
+    private Integer feedbackType;
+
 }

xyzc-start/src/main/java/com/xyzc/start/domain/bo/HelpFeedbackBo.java

@@ -3,16 +3,28 @@ package com.xyzc.start.domain.bo;
 
 import com.xyzc.common.core.validate.AddGroup;
 import com.xyzc.common.core.xss.Xss;
+import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotEmpty;
 import lombok.Data;
 import lombok.RequiredArgsConstructor;
+import org.hibernate.validator.constraints.Range;
 
 @Data
 @RequiredArgsConstructor
 public class HelpFeedbackBo {
 
+    /**
+     * 反馈内容
+     */
     @Xss(message = "用户反馈不能包含脚本字符", groups = AddGroup.class)
+    @NotBlank(message = "反馈内容不能为空")
     private String content;
 
+    /**
+     * 反馈类型；1-用户反馈；2-绘画模型反馈
+     */
+    @Range(min = 1, max = 2, message = "反馈类型不合法")
+    @NotBlank(message = "反馈类型不能为空")
+    private Integer feedbackType;
 
 }

xyzc-start/src/main/java/com/xyzc/start/domain/vo/BaseUserVo.java

@@ -1,5 +1,6 @@
 package com.xyzc.start.domain.vo;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.xyzc.start.domain.BaseUser;
 import io.github.linpeilie.annotations.AutoMapper;
 import io.github.linpeilie.annotations.AutoMapping;
@@ -18,6 +19,7 @@ import java.util.List;
 @NoArgsConstructor
 @AllArgsConstructor
 @AutoMapper(target = BaseUser.class)
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class BaseUserVo {
 
     /**
@@ -67,7 +69,7 @@ public class BaseUserVo {
     private String avatar;
 
     /**
-     * 拥有会员卡个数
+     * 拥有的会员卡
      */
     private List<BaseUserMemberCardVo> memberCardVoList;
 

xyzc-start/src/main/java/com/xyzc/start/service/impl/HelpPageServiceImpl.java

@@ -2,6 +2,7 @@ package com.xyzc.start.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.xyzc.common.core.exception.ServerException;
+import com.xyzc.common.web.security.user.SecurityUser;
 import com.xyzc.start.constant.FeedbackConst;
 import com.xyzc.start.domain.HelpContent;
 import com.xyzc.start.domain.BaseUserFeedback;
@@ -28,10 +29,12 @@ public class HelpPageServiceImpl implements IHelpPageService {
      */
     @Override
     public void submit(HelpFeedbackBo helpFeedbackBo) {
-        BaseUserFeedback helpFeedback = new BaseUserFeedback();
-        //todo ：记得使用 sysUser获取当前用户信息
-        helpFeedback.setContent(helpFeedbackBo.getContent());
-        boolean flag = helpFeedbackmapper.insert(helpFeedback) == 1;
+        BaseUserFeedback baseUserFeedback = new BaseUserFeedback();
+        baseUserFeedback.setBaseUserId(SecurityUser.getUserId());
+        baseUserFeedback.setContent(helpFeedbackBo.getContent());
+        baseUserFeedback.setFeedbackType(helpFeedbackBo.getFeedbackType());
+
+        boolean flag = helpFeedbackmapper.insert(baseUserFeedback) == 1;
         if (!flag) {
             throw new RuntimeException("反馈提交失败");
         }

xyzc-start/src/main/java/com/xyzc/start/service/impl/UserAuthServiceImpl.java

@@ -59,12 +59,8 @@ public class UserAuthServiceImpl implements IUserAuthService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public boolean sendCode(UserMobileLoginBO login) {
-        //todo 后续删除
-        if (login != null) {
-            return true;
-        }
-
         // 验证图形验证码
+        // todo 先关闭图形验证码
         boolean validate = captchaService.validate(login.getKey(), login.getCode());
         AssertUtils.isTrue(validate, ErrorCode.CAPTCHA_ERROR);
 
@@ -164,16 +160,18 @@ public class UserAuthServiceImpl implements IUserAuthService {
         baseUserTokenVo.setUserName(userDetail.getUsername());
         //
         SysOssVo sysOssVo = sysOssMapper.selectVoById(userDetail.getAvatar());
-        baseUserTokenVo.setAvatar(sysOssVo.getUrl());
+        baseUserTokenVo.setAvatar(sysOssVo != null ? sysOssVo.getUrl() : null);
         // TODO 剩余次数，虚拟
         baseUserTokenVo.setUseCount(109);
 
         // 添加用户拥有的会员卡
         List<BaseUserMemberCardVo> memberCardVos = baseUserMapper.queryMyMemberCardByUserId(userDetail.getId());
-        baseUserTokenVo.setMemberCardVoList(memberCardVos);
-
-        // 添加用户会员卡数量
-        baseUserTokenVo.setMemberCardCount(memberCardVos.size());
+        baseUserTokenVo.setMemberCardCount(0);
+        if (memberCardVos != null && !memberCardVos.isEmpty()) {
+            baseUserTokenVo.setMemberCardVoList(memberCardVos);
+            // 添加用户会员卡数量
+            baseUserTokenVo.setMemberCardCount(memberCardVos.size());
+        }
 
         return baseUserTokenVo;
     }

xyzc-start/src/main/java/com/xyzc/start/service/impl/UserInfoServiceImpl.java

@@ -79,11 +79,12 @@ public class UserInfoServiceImpl implements IUserInfoService {
 
         // 添加用户拥有的会员卡
         List<BaseUserMemberCardVo> memberCardVos = baseUserMapper.queryMyMemberCardByUserId(baseUserVo.getId());
-        baseUserVo.setMemberCardVoList(memberCardVos);
-
-        // 添加用户会员卡数量
-        baseUserVo.setMemberCardCount(memberCardVos.size());
-
+        baseUserVo.setMemberCardCount(0);
+        if (memberCardVos != null && !memberCardVos.isEmpty()) {
+            baseUserVo.setMemberCardVoList(memberCardVos);
+            // 添加用户会员卡数量
+            baseUserVo.setMemberCardCount(memberCardVos.size());
+        }
 
         return baseUserVo;
     }

xyzc-start/src/main/java/com/xyzc/start/service/impl/WeiXinAuthServiceImpl.java

@@ -88,7 +88,7 @@ public class WeiXinAuthServiceImpl implements IWeiXinAuthService {
     @Override
     public TicketVo sacn(Long agentId) {
         // 获取商户信息，商户没有微信公众号，就返回错误信息
-        AgentConfig agentConfig = sysParamsCache.getAgentConfig(String.valueOf(agentId));
+        WxConfig agentConfig = (WxConfig) sysParamsCache.getAgentConfig(String.valueOf(agentId));
         AssertUtils.notNull(agentConfig, ErrorCode.COMPANY_NO_OPEN_WEIXIN);
         try {
             // sceneStr 是扫码后微信返回的参数