pmd

gic-platform-auth-api/pom.xml

@@ -42,6 +42,12 @@
             <artifactId>javax.el</artifactId>
             <version>3.0.1-b09</version>
         </dependency>
+
+        <dependency>
+            <groupId>com.gic</groupId>
+            <artifactId>gic-commons</artifactId>
+            <version>${gic-commons}</version>
+        </dependency>
     </dependencies>
 
     <build>

gic-platform-auth-api/src/main/java/com/gic/auth/constant/MenuPlatformTypeEnum.java

@@ -7,10 +7,25 @@ package com.gic.auth.constant;
  * @date 2020/10/23 9:52 AM

  */
 public enum MenuPlatformTypeEnum {
+    /**
+     * gic"),
+     */
     GIC(0, "gic"),
+    /**
+     * 好办后台"),
+     */
     HAOBAN_PC(1, "好办后台"),
+    /**
+     * 好办小程序"),
+     */
     HAOBAN_APPLET(3, "好办小程序"),
+    /**
+     * 好办应用"),
+     */
     HAOBAN_APP(2, "好办应用"),
+    /**
+     * 好办小程序应用");
+     */
     HAOBAN_APPLET_APP(4, "好办小程序应用");
 
     private Integer code;

gic-platform-auth-api/src/main/java/com/gic/auth/dto/GoodsResourceDTO.java

@@ -82,4 +82,15 @@ public class GoodsResourceDTO implements Serializable{
         this.goodsResourceEntMapSelectId = goodsResourceEntMapSelectId;
         return this;
     }
+
+    @Override
+    public String toString() {
+        return "GoodsResourceDTO{" +
+                "goodsResourceId=" + goodsResourceId +
+                ", type=" + type +
+                ", goodsResourceAuth=" + goodsResourceAuth +
+                ", goodsResourceConfig='" + goodsResourceConfig + '\'' +
+                ", goodsResourceEntMapSelectId=" + goodsResourceEntMapSelectId +
+                '}';
+    }
 }

gic-platform-auth-api/src/main/java/com/gic/auth/dto/ResourceGroupCustomUserDTO.java

@@ -66,4 +66,14 @@ public class ResourceGroupCustomUserDTO implements Serializable{
         this.cuSelectId = cuSelectId;
         return this;
     }
+
+    @Override
+    public String toString() {
+        return "ResourceGroupCustomUserDTO{" +
+                "type=" + type +
+                ", sort=" + sort +
+                ", areaValue='" + areaValue + '\'' +
+                ", cuSelectId=" + cuSelectId +
+                '}';
+    }
 }

gic-platform-auth-api/src/main/java/com/gic/auth/dto/wechat/WechatUserDTO.java

 package com.gic.auth.dto.wechat;
 
+import com.gic.commons.annotation.SkipNamingCheck;
+
 import java.io.Serializable;
 /**
  * 服务号关注用户
@@ -8,6 +10,7 @@ import java.io.Serializable;
  * @author guojuxing

  * @date 2021/1/26 10:20 AM

  */
+@SkipNamingCheck
 public class WechatUserDTO implements Serializable{
     private static final long serialVersionUID = -2148969953172055593L;
 

gic-platform-auth-api/src/main/java/com/gic/auth/service/ResourceGroupApiService.java

@@ -3,6 +3,7 @@ package com.gic.auth.service;
 import com.gic.api.base.commons.Page;
 import com.gic.api.base.commons.ServiceResponse;
 import com.gic.auth.dto.*;
+import com.gic.commons.annotation.SkipNamingCheck;
 
 import java.util.List;
 
@@ -13,6 +14,7 @@ import java.util.List;
  * @author guojuxing

  * @date 2021/1/8 4:36 PM

  */
+@SkipNamingCheck
 public interface ResourceGroupApiService {
 
     /**

gic-platform-auth-service/src/main/java/com/gic/auth/dao/mapper/TabSysUserMapper.java

@@ -226,6 +226,7 @@ public interface TabSysUserMapper {
     /**
      * 查询
      * @param openId
+     * @param enterpriseId
      * @return
      */
     TabSysUser getUserByOpenId(@Param("openId") String openId, @Param("enterpriseId") Integer enterpriseId);

gic-platform-auth-service/src/main/java/com/gic/auth/service/outer/impl/ResourceGroupApiServiceImpl.java

@@ -79,7 +79,8 @@ public class ResourceGroupApiServiceImpl implements ResourceGroupApiService{
         //有效的才会重新授权。如果是已解除、待解除、解除中，不再重新授权
         if (unionEnterpriseAuthDTO != null && unionEnterpriseAuthDTO.getStatusFlag() == 1) {
             //验证码验证
-            if (!"hasValid".equals(resourceGroup.getAuthCode())) {
+            boolean isUnionEnterpriseAuthResourceGroup = "hasValid".endsWith(resourceGroup.getAuthCode());
+            if (!isUnionEnterpriseAuthResourceGroup) {
                 return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "验证码未通过");
             }
 

gic-platform-auth-service/src/main/java/com/gic/auth/utils/menu/MenuOperationUtils.java

@@ -36,8 +36,6 @@ public class MenuOperationUtils {
         test.setTarget(1);
 
         String result = map.get(SAVE_FIRST_PAGE).operate(test);
-        System.out.println(result);
-        System.out.println(test.toString());
         return result;
     }