Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gic-platform-enterprise
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
base_platform_enterprise
gic-platform-enterprise
Commits
bc528a97
Commit
bc528a97
authored
Feb 07, 2021
by
guojuxing
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
去掉Google插件
parent
9f9e7465
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
26 additions
and
36 deletions
+26
-36
pom.xml
gic-platform-enterprise-web/pom.xml
+0
-6
UnionEnterpriseAuthController.java
...e/web/controller/union/UnionEnterpriseAuthController.java
+26
-30
No files found.
gic-platform-enterprise-web/pom.xml
View file @
bc528a97
...
...
@@ -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>
...
...
gic-platform-enterprise-web/src/main/java/com/gic/enterprise/web/controller/union/UnionEnterpriseAuthController.java
View file @
bc528a97
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
));
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment