Merge branch 'developer' into 'master'

Developer

See merge request !21

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

@@ -36,4 +36,14 @@ public class MenuProjectConstants {
      * 好办小程序
      */
     public final static String HAO_BAN_WECHAT_PROJECT = "haobanWechat";
+
+    /**
+     * 应用后台
+     */
+    public final static String HAO_BAN_PC_PROJECT = "haobanPC";
+
+    /**
+     * 好办小程序应用
+     */
+    public final static String HAO_BAN_WECHAT_APP_PROJECT = "haobanWechatApp";
 }

gic-platform-auth-api/src/main/java/com/gic/auth/qo/MenuListQO.java

@@ -51,7 +51,7 @@ public class MenuListQO extends PageQO{
     private List<Integer> authTypeList;
 
     /**
-     * 0:gic 1:好办后台 2：好办小程序
+     * 0:gic 1:好办后台 2：好办小程序 3:好办应用 4：好办小程序应用
      */
     private Integer platformType;
 

gic-platform-auth-api/src/main/java/com/gic/auth/qo/MenuOperationItemListQO.java

@@ -20,7 +20,7 @@ public class MenuOperationItemListQO extends PageQO{
     private Integer isGIC;
 
     /**
-     * 0:gic 1:好办后台 2：好办小程序
+     * 0:gic 1:好办后台 2：好办小程序 3:应用后台 4：好办小程序应用
      */
     private Integer platformType = 0;
 

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

@@ -4,6 +4,7 @@ import com.gic.api.base.commons.Page;
 import com.gic.api.base.commons.ServiceResponse;
 import com.gic.auth.dto.AuthItemListDTO;
 import com.gic.auth.dto.MenuDTO;
+import com.gic.auth.dto.MenuItemDTO;
 import com.gic.auth.qo.AuthItemSaveQO;
 import com.gic.auth.qo.MenuListQO;
 import com.gic.auth.qo.MenuOperationItemListQO;
@@ -169,4 +170,14 @@ public interface MenuForHaoBanApiService {
      * @return  com.gic.api.base.commons.ServiceResponse<java.util.List<com.gic.auth.dto.MenuDTO>>

     
*/
     ServiceResponse<List<MenuDTO>> listMenuItemByParentId(Integer parentId);
+
+    /**
+     * 查询权限项下面的操作项数据
+     * @Title: listMenuItemByMenuId

+     * @Description:
+    
* @author guojuxing
+     * @param menuId
权限项ID
+     * @return  com.gic.api.base.commons.ServiceResponse<java.util.List<com.gic.auth.dto.MenuItemDTO>>

+    
*/
+    ServiceResponse<List<MenuItemDTO>> listMenuItemByMenuId(Integer menuId);
 }

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

@@ -127,6 +127,18 @@ public interface UserApiService {
 
     ServiceResponse<UserDTO> listUserByPhoneNumber(String nationCode, String phoneNumber, Integer enterpriseId);
 
+    /**
+     * 获取运维账号
+     * @Title: getUserByPhoneNumber

+     * @Description:
+    
* @author guojuxing
+     * @param nationCode 手机区号
+     * @param phoneNumber 手机号码
+     * @param enterpriseId 商户ID
+     * @return  com.gic.api.base.commons.ServiceResponse<com.gic.auth.dto.UserDTO>

+    
*/
+    ServiceResponse<UserDTO> getUserByPhoneNumber(String nationCode, String phoneNumber, Integer enterpriseId);
+
     ServiceResponse<UserDTO> login(String nationCode, String phoneNumber, Integer enterpriseId, String password);
 
     /**

gic-platform-auth-api/src/main/java/com/gic/auth/utils/ValidSplitUtils.java

@@ -20,7 +20,6 @@ public class ValidSplitUtils {
 
     public static boolean isNumericZidai(String str) {
         for (int i = 0; i < str.length(); i++) {
-            System.out.println(str.charAt(i));
             if (!Character.isDigit(str.charAt(i))) {
                 return false;
             }

gic-platform-auth-service/src/main/java/com/gic/auth/filter/ProviderFilter.java

@@ -8,8 +8,6 @@ import org.apache.dubbo.rpc.*;
 public class ProviderFilter implements Filter {
     @Override
     public Result invoke(Invoker<?> invoker, Invocation invocation) throws RpcException {
-        System.out.println("进入自定义filter");
-        System.out.println(RpcContext.getContext().getAttachments());
         return invoker.invoke(invocation);
     }
 }

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

@@ -322,7 +322,6 @@ public class AuditorApiServiceImpl implements AuditorApiService {
 
     private String getTempQrCodeUrl(Integer auditorId) {
         logger.info("生成临时带参二维码 auditorId:{}", auditorId);
-        System.out.println(config.getAppkey());
         ServiceResponse<String> serviceResponse = weixinBaseFunService.getTemporaryQRcodeURL(config.getAppkey(), "auditor_" + auditorId, 300);
         if (serviceResponse.isSuccess()) {
             logger.info("临时带参二维码生成成功:{}", serviceResponse.getResult());

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

@@ -43,7 +43,6 @@ public class AuthCodeApiServiceImpl implements AuthCodeApiService {
 
     @Override
     public ServiceResponse<AuthCodeDTO> getAuthCode(Integer authCodeId) {
-        System.out.println("authCodeApiService:"+JSON.toJSONString(RpcContext.getContext().getAttachments()));
         TabSysAuthCode sysAuthCode = this.authCodeService.getAuthCode(authCodeId);
         return ServiceResponse.success(EntityUtil.changeEntityByJSON(AuthCodeDTO.class, sysAuthCode));
     }

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

@@ -324,14 +324,29 @@ public class MenuApiServiceImpl implements MenuApiService {
     @Override
     public ServiceResponse<Void> savePageForHaoban(MenuDTO menuDTO) {
         Integer platformType = menuDTO.getPlatformType();
-        boolean isRight = platformType != null && (platformType.intValue() == 1 || platformType.intValue() == 2);
+        boolean isRight = platformType != null && (
+                platformType.intValue() == 1
+                || platformType.intValue() == 2
+                || platformType.intValue() == 3
+                || platformType.intValue() == 4);
         if (!isRight) {
             return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "菜单平台类型值非法");
         }
-        if (platformType.intValue() == 1) {
+        switch (platformType) {
+            case 1:
                 menuDTO.setProject(MenuProjectConstants.HAO_BAN_PROJECT);
-        } else {
+                break;
+            case 2:
                 menuDTO.setProject(MenuProjectConstants.HAO_BAN_WECHAT_PROJECT);
+                break;
+            case 3:
+                menuDTO.setProject(MenuProjectConstants.HAO_BAN_PC_PROJECT);
+                break;
+            case 4:
+                menuDTO.setProject(MenuProjectConstants.HAO_BAN_WECHAT_APP_PROJECT);
+                break;
+            default:
+                menuDTO.setProject(MenuProjectConstants.HAO_BAN_PROJECT);
         }
         return savePage(menuDTO, MenuDTO.SavePageValid.class);
     }

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

@@ -4,11 +4,13 @@ import com.gic.api.base.commons.Page;
 import com.gic.api.base.commons.ServiceResponse;
 import com.gic.auth.dto.AuthItemListDTO;
 import com.gic.auth.dto.MenuDTO;
+import com.gic.auth.dto.MenuItemDTO;
 import com.gic.auth.qo.AuthItemSaveQO;
 import com.gic.auth.qo.MenuListQO;
 import com.gic.auth.qo.MenuOperationItemListQO;
 import com.gic.auth.service.MenuApiService;
 import com.gic.auth.service.MenuForHaoBanApiService;
+import com.gic.auth.service.MenuItemApiService;
 import com.gic.enterprise.error.ErrorCode;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -18,6 +20,8 @@ import java.util.List;
 public class MenuForHaoBanApiServiceImpl implements MenuForHaoBanApiService{
     @Autowired
     private MenuApiService menuApiService;
+    @Autowired
+    private MenuItemApiService menuItemApiService;
 
     @Override
     public ServiceResponse<Void> savePage(MenuDTO menuDTO) {
@@ -107,7 +111,15 @@ public class MenuForHaoBanApiServiceImpl implements MenuForHaoBanApiService{
         return menuApiService.listMenuItemByParentId(parentId);
     }
 
+    @Override
+    public ServiceResponse<List<MenuItemDTO>> listMenuItemByMenuId(Integer menuId) {
+        return menuItemApiService.listMenuItemByMenuId(menuId);
+    }
+
     private static boolean isRightPlatformType(Integer platformType) {
-        return platformType != null && (platformType.intValue() == 1 || platformType.intValue() == 2);
+        return platformType != null && (platformType.intValue() == 1
+                || platformType.intValue() == 2
+                || platformType.intValue() == 3
+                || platformType.intValue() == 4);
     }
 }

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

@@ -17,6 +17,7 @@ import com.gic.commons.util.EntityUtil;
 import com.gic.commons.util.PageHelperUtils;
 import com.gic.enterprise.error.ErrorCode;
 import com.gic.enterprise.response.EnterpriseServiceResponse;
+import com.gic.enterprise.service.EnterpriseApiService;
 import com.gic.member.config.api.dto.AppletsConfigSimpleOutputDTO;
 import com.gic.member.config.api.dto.OwnerMemberCardDTO;
 import com.gic.member.config.api.dto.ServiceConfigSimpleOutputDTO;
@@ -25,6 +26,7 @@ import com.gic.member.config.api.service.MemberCardApiService;
 import com.gic.member.config.api.service.ServiceConfigApiService;
 import com.gic.member.filter.api.dto.CrowdWidgetDTO;
 import com.gic.member.filter.api.service.CrowdWidgetApiService;
+import com.gic.open.api.service.EnterpriseLicenseApiService;
 import com.gic.store.service.StoreWidgetApiService;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -69,6 +71,10 @@ public class ResourceApiServiceImpl implements ResourceApiService {
     private StoreWidgetApiService storeWidgetApiService;
     @Autowired
     private CrowdWidgetApiService crowdWidgetApiService;
+    @Autowired
+    private EnterpriseLicenseApiService enterpriseLicenseApiService;
+    @Autowired
+    private EnterpriseApiService enterpriseApiService;
 
     @Override
     @Transactional
@@ -276,7 +282,7 @@ public class ResourceApiServiceImpl implements ResourceApiService {
             return EnterpriseServiceResponse.failure(ErrorCode.NOTEXISTS);
         }
 
-        if (user.getSuperAdmin() == 1) {
+        if (user.getSuperAdmin() == 1 || "basic".equals(enterpriseApiService.getEnterpriseById(user.getEnterpriseId()).getResult().getVersionCode())) {
             List<OwnerMemberCardDTO> memberCardList = memberCardApiService.getAllContainDel(user.getEnterpriseId()).getResult();
             List<AppletsConfigSimpleOutputDTO> appletList = appletsConfigApiService.listAppletConfigAppIdContainDel(user.getEnterpriseId()).getResult();
             List<ServiceConfigSimpleOutputDTO> serviceList = serviceConfigApiService.listServiceConfigAppIdContainDel(user.getEnterpriseId()).getResult();

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

@@ -358,6 +358,23 @@ public class UserApiServiceImpl implements UserApiService {
     }
 
     @Override
+    public ServiceResponse<UserDTO> getUserByPhoneNumber(String nationCode, String phoneNumber, Integer enterpriseId) {
+        if (enterpriseId == null) {
+            return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "商户数据为空");
+        }
+        List<TabSysUser> list = this.userService.listUserByPhoneNumberAndEnterprise(phoneNumber, nationCode,
+                enterpriseId);
+        if (CollectionUtils.isNotEmpty(list)) {
+            for (TabSysUser tabSysUser : list) {
+                if (tabSysUser.getLoginType() == 1) {
+                    return ServiceResponse.success(EntityUtil.changeEntityNew(UserDTO.class, tabSysUser));
+                }
+            }
+        }
+        return ServiceResponse.success();
+    }
+
+    @Override
     public ServiceResponse<UserDTO> login(String nationCode, String phoneNumber, Integer enterpriseId,
             String password) {
         TabSysUser user = this.userService.login(nationCode, phoneNumber, enterpriseId, password);

gic-platform-auth-service/src/main/resources/dubbo-gic-platform-auth-service.xml

@@ -54,6 +54,7 @@
     <dubbo:reference interface="com.gic.enterprise.service.EnterpriseApiService" id="enterpriseApiService" timeout="6000"/>
     <dubbo:service interface="com.gic.auth.service.UserResourceApiService" ref="userResourceApiService" timeout="6000" />
     <dubbo:service interface="com.gic.auth.service.BusinessFrontResApiService" ref="businessFrontResApiService" timeout="6000" />
+    <dubbo:service interface="com.gic.auth.service.MenuForHaoBanApiService" ref="menuForHaoBanApiService" timeout="6000" />
     <dubbo:reference interface="com.gic.application.center.api.service.AuthorizeService" id="authorizeService" timeout="6000" />
 
     <!-- 渠道资源 -->
@@ -72,4 +73,5 @@
     <dubbo:reference interface="com.gic.authcenter.api.service.GicUserService" id="gicUserService" timeout="6000" />
     <dubbo:reference interface="com.gic.authcenter.api.service.GicDepartmentService" id="gicDepartmentService" timeout="6000" />
     <dubbo:reference interface="com.gic.member.filter.api.service.CrowdWidgetApiService" id="crowdWidgetApiService" timeout="6000" />
+    <dubbo:reference interface="com.gic.open.api.service.EnterpriseLicenseApiService" id="enterpriseLicenseApiService" timeout="6000" />
 </beans>

gic-platform-auth-service/src/main/resources/mapper/TabAuditorMapper.xml

@@ -211,8 +211,9 @@
     <if test="openid != null and openid != '' ">
         and openid = #{openid}
     </if>
+    </where>
       and is_use = 1
       and status = 1
-    </where>
+      limit 1
   </select>
 </mapper>
\ No newline at end of file

gic-platform-auth-web/src/main/java/com/gic/auth/web/controller/ResourceController.java

@@ -27,7 +27,9 @@ import com.gic.member.config.api.dto.ServiceConfigSimpleOutputDTO;
 import com.gic.member.config.api.service.AppletsConfigApiService;
 import com.gic.member.config.api.service.MemberCardApiService;
 import com.gic.member.config.api.service.ServiceConfigApiService;
+import com.gic.open.api.dto.EnterpriseServeInfoDTO;
 import com.gic.open.api.service.AppTokenApiService;
+import com.gic.open.api.service.EnterpriseLicenseApiService;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -64,6 +66,8 @@ public class ResourceController {
     private ServiceConfigApiService serviceConfigApiService;
     @Autowired
     private ShopApiService shopApiService;
+    @Autowired
+    private EnterpriseLicenseApiService enterpriseLicenseApiService;
 
 
     @RequestMapping("/list-sms-sign")
@@ -171,4 +175,10 @@ public class ResourceController {
         ServiceResponse<List<ShopDTO>> serviceResponse = shopApiService.getAllShopByEnterpriseIdAndName(UserDetailUtils.getUserDetail().getEnterpriseId(), null, ShopTypeEnum.MALL_SHOP.getCode());
         return ResultControllerUtils.commonResult(serviceResponse);
     }
+
+    @RequestMapping("/single-version")
+    public RestResponse isSingle() {
+        ServiceResponse<EnterpriseServeInfoDTO> serveInfo = enterpriseLicenseApiService.getServeInfo(UserDetailUtils.getUserDetail().getEnterpriseId(), "gic");
+        return RestResponse.success("basic".equals(serveInfo.getResult().getVersionCode()));
+    }
  }

gic-platform-auth-web/src/main/resources/dubbo-gic-platform-auth-web.xml

@@ -79,5 +79,7 @@
     <!-- 微商城 -->
     <dubbo:reference interface="com.gic.mall.share.api.service.ShopApiService" id="ShopApiService" timeout="6000" />
 
+    <dubbo:reference interface="com.gic.open.api.service.EnterpriseLicenseApiService" id="enterpriseLicenseApiService" timeout="6000" />
+
 
 </beans>
\ No newline at end of file