Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
X
xyqb-user2
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
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
head_group
xyqb-user2
Commits
57333873
Commit
57333873
authored
Jul 18, 2023
by
王亮
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix some issues.
parent
fb9417cd
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
1 deletion
+8
-1
AppletController.java
...xyqb/controller/middleoffice/applet/AppletController.java
+6
-1
LoginModule.java
...group/xyqb/controller/middleoffice/login/LoginModule.java
+2
-0
No files found.
src/main/java/cn/quantgroup/xyqb/controller/middleoffice/applet/AppletController.java
View file @
57333873
...
...
@@ -10,6 +10,7 @@ import cn.quantgroup.xyqb.exception.DataException;
import
cn.quantgroup.xyqb.model.JsonResult
;
import
cn.quantgroup.xyqb.model.WechatConfigBean
;
import
cn.quantgroup.xyqb.service.middleoffice.applet.IAppletService
;
import
cn.quantgroup.xyqb.util.StringUtils
;
import
com.alibaba.fastjson.JSON
;
import
lombok.extern.slf4j.Slf4j
;
import
org.springframework.beans.factory.annotation.Autowired
;
...
...
@@ -57,10 +58,14 @@ public class AppletController {
if
(!
containsAppName
(
appletParamEntry
.
getAppName
()))
{
throw
new
DataException
(
"appName不合法"
);
}
if
(
StringUtils
.
isEmpty
(
appletParamEntry
.
getTenantId
())){
appletParamEntry
.
setTenantId
(
UserConstant
.
defaultTenantId
);
}
Long
userId
=
iAppletService
.
relevance
(
appletParamEntry
);
LoginVo
loginVo
=
loginModule
.
loginByUserId
(
appletParamEntry
.
getChannelId
(),
appletParamEntry
.
getUtmSource
(),
userId
,
null
);
appletParamEntry
.
getUtmSource
(),
userId
,
appletParamEntry
.
getTenantId
()
);
return
JsonResult
.
buildSuccessResultGeneric
(
loginVo
);
...
...
src/main/java/cn/quantgroup/xyqb/controller/middleoffice/login/LoginModule.java
View file @
57333873
...
...
@@ -63,6 +63,8 @@ public class LoginModule implements ILoginModule {
.
appChannel
(
appChannel
)
.
channelId
(
channelId
)
.
merchantName
(
"xyqb"
)
.
createdFrom
(
channelId
)
.
tenantId
(
tenantId
)
.
build
();
AuthBean
session
=
sessionService
.
createSession
(
user
,
loginProperties
,
LoginType
.
ACCOUNTPASSWORD
.
ordinal
(),
tenantId
);
return
LoginVo
.
builder
()
...
...
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