Commit bc528a97 by guojuxing

去掉Google插件

parent 9f9e7465
......@@ -219,12 +219,6 @@
<artifactId>gic-spark-run-api</artifactId>
<version>${gic-spark-run-api}</version>
</dependency>
<!-- 配置gson -->
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.2.4</version>
</dependency>
</dependencies>
<build>
......
package com.gic.enterprise.web.controller.union;
import com.alibaba.fastjson.JSON;
import com.gic.api.base.commons.Page;
import com.gic.auth.dto.*;
import com.gic.auth.service.*;
import com.gic.download.utils.OperationResultUtils;
import com.gic.enterprise.dto.union.UnionEnterpriseAuthAppDTO;
import com.gic.enterprise.dto.union.UnionEnterpriseAuthDTO;
import com.gic.enterprise.dto.union.UnionEnterpriseAuthResDTO;
import com.gic.enterprise.exception.CommonException;
import com.gic.enterprise.service.UnionEnterpriseAuthApiService;
import com.gic.enterprise.utils.ResultControllerUtils;
import com.gic.enterprise.web.utils.union.UserAeaUtils;
import com.gic.enterprise.web.vo.union.*;
import com.gic.member.config.api.dto.AppletsConfigSimpleOutputDTO;
import com.gic.member.config.api.dto.OwnerMemberCardDTO;
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.ApplicationDTO;
import com.gic.open.api.service.ApplicationApiService;
import com.gic.platform.member.constant.enums.CuTypeEnum;
import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken;
import java.util.*;
import java.util.stream.Collectors;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.LogManager;
......@@ -33,21 +12,39 @@ import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.alibaba.fastjson.JSON;
import com.gic.api.base.commons.ServiceResponse;
import com.gic.auth.dto.*;
import com.gic.auth.service.*;
import com.gic.commons.util.EntityUtil;
import com.gic.commons.webapi.reponse.RestResponse;
import com.gic.download.utils.OperationResultUtils;
import com.gic.enterprise.dto.EnterpriseDTO;
import com.gic.enterprise.dto.union.UnionEnterpriseAuthAppDTO;
import com.gic.enterprise.dto.union.UnionEnterpriseAuthDTO;
import com.gic.enterprise.dto.union.UnionEnterpriseAuthResDTO;
import com.gic.enterprise.error.ErrorCode;
import com.gic.enterprise.exception.CommonException;
import com.gic.enterprise.response.EnterpriseRestResponse;
import com.gic.enterprise.service.EnterpriseApiService;
import com.gic.enterprise.service.UnionEnterpriseAuthApiService;
import com.gic.enterprise.utils.CreateRandomUtils;
import com.gic.enterprise.utils.ResultControllerUtils;
import com.gic.enterprise.utils.UserDetail;
import com.gic.enterprise.utils.UserDetailUtils;
import com.gic.enterprise.web.utils.AuthCodeExpireTimeUtils;
import com.gic.enterprise.web.utils.union.UserAeaUtils;
import com.gic.enterprise.web.vo.union.*;
import com.gic.marketing.process.api.service.sms.SmsSendApiService;
import java.util.*;
import java.util.stream.Collectors;
import com.gic.member.config.api.dto.AppletsConfigSimpleOutputDTO;
import com.gic.member.config.api.dto.OwnerMemberCardDTO;
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.ApplicationDTO;
import com.gic.open.api.service.ApplicationApiService;
import com.gic.platform.member.constant.enums.CuTypeEnum;
@RestController
@RequestMapping("union-enterprise")
......@@ -385,8 +382,6 @@ public class UnionEnterpriseAuthController {
//组装数据
List<UnionAppResourceListVO> result = new ArrayList<>(list.size());
//string to map
Gson gson = new Gson();
for (UnionEnterpriseAuthAppDTO temp : list) {
UnionAppResourceListVO vo = new UnionAppResourceListVO();
......@@ -416,7 +411,8 @@ public class UnionEnterpriseAuthController {
//用户域
String authData = temp.getAuthData();
if (StringUtils.isNotBlank(authData)) {
Map<String, Long[]> authDataArr = gson.fromJson(authData, new TypeToken<Map<String, Long[]>>(){}.getType());
Map<String, Long[]> authDataArr = new HashMap<>();
authDataArr = JSON.parseObject(authData, authDataArr.getClass());
vo.setMemberArea(UserAeaUtils.getUserArea(CuTypeEnum.MCU.getType(), areaMap, authDataArr));
vo.setAppletArea(UserAeaUtils.getUserArea(CuTypeEnum.ACU.getType(), areaMap, authDataArr));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment