:zap: 优化代码

src/main/java/com/ifast/common/base/CoreService.java

@@ -16,32 +16,28 @@ import java.util.Map;
  * @param <T>
  */
 public interface CoreService<T> extends IService<T> {
+
+    @Deprecated
     List<T> findByKv(Object... param);
 
+    @Deprecated
     T findOneByKv(Object... param);
 
     /**
      * <pre>
-     *
      * </pre>
-     *
      * <small> 2018/6/14 17:32 | Aron</small>
-     * @param [clazz, param]
      * @return java.util.Map<java.lang.String,java.lang.Object>
-     *
      */
-
+    @Deprecated
     Map<String, Object> convertToMap(Object... param);
 
     /**
      * <pre>
-     *
      * </pre>
-     *
      * <small> 2018/6/14 17:14 | Aron</small>
-     * @param [clazz, params]
      * @return java.util.Map<java.lang.String,java.lang.Object>
-     *
      */
+    @Deprecated
     EntityWrapper<T> convertToEntityWrapper(Object... params);
 }

src/main/java/com/ifast/common/component/oss/support/qiniu/QiNiuProperties.java

@@ -1,23 +0,0 @@
-package com.ifast.common.component.oss.support.qiniu;
-
-import lombok.Data;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.stereotype.Component;
-
-/**
- * <pre>
- * 七牛对象存储配置
- * </pre>
- * 
- * <small> 2018年4月6日 | Aron</small>
- */
-@Data
-@Component
-@ConfigurationProperties(prefix = "ifast.oss.qiniu")
-public class QiNiuProperties {
-    private String accessKey;
-    private String secretKey;
-    private String bucket;
-    private String accessURL;
-
-}

src/main/java/com/ifast/wxmp/domain/MpArticleDO.java

@@ -2,6 +2,7 @@ package com.ifast.wxmp.domain;
 
 import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.annotations.TableName;
+import lombok.Builder;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -16,6 +17,7 @@ import java.util.Date;
  */
 @Data
 @TableName("wx_mp_article")
+@Builder
 public class MpArticleDO implements Serializable {
 	@TableId
 	private Long id;

src/main/java/com/ifast/wxmp/domain/MpConfigDO.java

@@ -3,6 +3,7 @@ package com.ifast.wxmp.domain;
 import com.baomidou.mybatisplus.annotations.TableField;
 import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.annotations.TableName;
+import lombok.Builder;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -19,6 +20,7 @@ import java.util.Date;
  */
  @TableName("wx_mp_config")
  @Data
+ @Builder
 public class MpConfigDO implements Serializable {
     @TableField(exist = false)
     private static final long serialVersionUID = 1L;

src/main/java/com/ifast/wxmp/domain/MpFansDO.java

@@ -3,7 +3,9 @@ package com.ifast.wxmp.domain;
 import com.baomidou.mybatisplus.annotations.TableField;
 import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.annotations.TableName;
+import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -18,6 +20,7 @@ import java.util.Date;
  */
  @TableName("wx_mp_fans")
  @Data
+ @Builder
 public class MpFansDO implements Serializable {
     @TableField(exist = false)
     private static final long serialVersionUID = 1L;

src/main/java/com/ifast/wxmp/domain/MpMenuDO.java

@@ -2,6 +2,7 @@ package com.ifast.wxmp.domain;
 
 import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.annotations.TableName;
+import lombok.Builder;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -16,6 +17,7 @@ import java.util.Date;
  */
 @Data
 @TableName("wx_mp_menu")
+@Builder
 public class MpMenuDO implements Serializable {
 	@TableId
 	private Long id;

src/main/java/com/ifast/wxmp/service/impl/MpFansServiceImpl.java

@@ -1,9 +1,11 @@
 package com.ifast.wxmp.service.impl;
 
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.ifast.common.base.CoreServiceImpl;
 import com.ifast.common.exception.IFastException;
 import com.ifast.common.type.EnumErrorCode;
 import com.ifast.wxmp.dao.MpFansDao;
+import com.ifast.wxmp.domain.MpConfigDO;
 import com.ifast.wxmp.domain.MpFansDO;
 import com.ifast.wxmp.pojo.type.Const;
 import com.ifast.wxmp.service.MpConfigService;
@@ -42,7 +44,7 @@ public class MpFansServiceImpl extends CoreServiceImpl<MpFansDao, MpFansDO> impl
 
     @Override
     public void sync(MpFansDO fans) {
-        MpFansDO one = findOneByKv("openid", fans.getOpenid());
+        MpFansDO one = baseMapper.selectOne(MpFansDO.builder().openid(fans.getOpenid()).build());
         if (one == null) {
             log.debug("新用户保存信息到db");
             insert(fans);
@@ -75,7 +77,7 @@ public class MpFansServiceImpl extends CoreServiceImpl<MpFansDao, MpFansDO> impl
         if (StringUtils.isBlank(appId)) {
             appId = WxMpConfigHolder.getCurrentAppId();
         }
-        fans.setMpId(mpConfigService.findOneByKv("appId", appId).getId());
+        fans.setMpId(mpConfigService.selectOne(new EntityWrapper(MpConfigDO.builder().appId(appId))).getId());
 
         log.debug("convert return :{}", fans);
 
@@ -121,7 +123,7 @@ public class MpFansServiceImpl extends CoreServiceImpl<MpFansDao, MpFansDO> impl
     }
 
     private void syncToDb(final String appId, WxMpUserList wxMpUserList2) {
-        wxMpUserList2.getOpenids().stream().filter(openid -> Objects.isNull(findOneByKv("openid", openid))).forEach(openid -> {
+        wxMpUserList2.getOpenids().stream().filter(openid -> Objects.isNull(baseMapper.selectOne(MpFansDO.builder().openid(openid).build()))).forEach(openid -> {
             if(log.isDebugEnabled()){
                 log.debug("sync openid {}", openid);
             }
@@ -135,7 +137,7 @@ public class MpFansServiceImpl extends CoreServiceImpl<MpFansDao, MpFansDO> impl
 
             if (userWxInfo != null) {
                 this.log.debug("同步微信用户信息数据 from 微信服务器");
-                MpFansDO fans = new MpFansDO();
+                MpFansDO fans = MpFansDO.builder().build();
                 convert(userWxInfo, fans, appId);
                 insert(fans);
 

src/main/java/com/ifast/wxmp/service/impl/MpMenuServiceImpl.java

@@ -1,5 +1,6 @@
 package com.ifast.wxmp.service.impl;
 
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.ifast.common.base.CoreServiceImpl;
 import com.ifast.common.domain.Tree;
 import com.ifast.common.exception.IFastException;
@@ -35,6 +36,8 @@ public class MpMenuServiceImpl extends CoreServiceImpl<MpMenuDao, MpMenuDO> impl
     private static final int MAIN_MENU_SIZE = 3;
     private static final int SUB_MENU_SIZE = 5;
     private static final String TEXT_KEY = "TEXT_";
+    private static final Long MENU_ROOT_IDX = 0L;
+
 
     @Autowired
     private MpConfigService mpConfigService;
@@ -58,15 +61,15 @@ public class MpMenuServiceImpl extends CoreServiceImpl<MpMenuDao, MpMenuDO> impl
     @Override
     public void saveMenu(MpMenuDO mpMenu, String appId) {
         Long parentIdx = mpMenu.getParentidx();
-        MpConfigDO mpConfig = mpConfigService.findOneByKv("appId", appId);
-        if(Objects.isNull(parentIdx) || parentIdx.equals(0L)){
-            int count = this.selectCount(convertToEntityWrapper("parentidx", parentIdx, "mpId", mpConfig.getId()));
+        MpConfigDO mpConfig = mpConfigService.selectOne(new EntityWrapper<>(MpConfigDO.builder().appId(appId).build()));
+        if(Objects.isNull(parentIdx) || parentIdx.equals(MENU_ROOT_IDX)){
+            int count = this.selectCount(new EntityWrapper<>(MpMenuDO.builder().parentidx(parentIdx).mpid(mpConfig.getId()).build()));
             if(count >= MAIN_MENU_SIZE){
                 log.info("主菜单不能超过3个");
                 throw new IFastException(EnumErrorCode.wxmpMenuSaveMainError.getCodeStr());
             }
         }else{
-            int count = this.selectCount(convertToEntityWrapper("parentidx", parentIdx, "mpId", mpConfig.getId()));
+            int count = this.selectCount(new EntityWrapper<>(MpMenuDO.builder().parentidx(parentIdx).mpid(mpConfig.getId()).build()));
             if(count >= SUB_MENU_SIZE){
                 log.info("子菜单不能超过5个");
                 throw new IFastException(EnumErrorCode.wxmpMenuSaveSubError.getCodeStr());