Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
M
my-yaf-project
Project
Project
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
chenchuanwen
my-yaf-project
Commits
d64c42de
Commit
d64c42de
authored
Aug 23, 2018
by
wwccw0591
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
pc
parent
a7c9ccb3
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
45 additions
and
5 deletions
+45
-5
Authinfo.php
application/controllers/Authinfo.php
+20
-0
User.php
application/controllers/User.php
+15
-4
AbstractApi.php
application/library/Our/Controller/AbstractApi.php
+6
-0
PathConst.php
application/library/Our/PathConst.php
+2
-0
Member.php
application/models/DAO/Member.php
+0
-1
CodeConfig.php
application/models/Error/CodeConfig.php
+2
-0
No files found.
application/controllers/Authinfo.php
View file @
d64c42de
...
...
@@ -26,6 +26,26 @@ class AuthinfoController extends \Our\Controller_Abstract
$name
=
$this
->
req
->
getQuery
(
'name'
);
throw
new
Exception
(
'hello '
,
404
);
}
public
function
otherLoginAction
(){
$this
->
req
=
$this
->
getRequest
()
->
getQuery
();
$postData
[
'key'
]
=
$this
->
req
[
'key'
];
$postData
[
'authSign'
]
=
$this
->
req
[
'authSign'
];
if
(
$postData
[
'authSign'
]
==
md5
(
$postData
[
'key'
]
.
\Our\SecretKeys
::
authKey
)){
session_id
(
$postData
[
'key'
]);
$this
->
sess
=
\Yaf\Session
::
getInstance
();
$this
->
sess
->
start
();
$memberId
=
$this
->
sess
->
get
(
'member_id'
);
if
(
!
empty
(
$memberId
)){
$this
->
sess
->
set
(
'other_login'
,
\Our\ApiConst
::
one
);
}
else
{
}
}
else
{
}
\Yaf\Dispatcher
::
getInstance
()
->
disableView
();
}
public
function
testAction
()
{
...
...
application/controllers/User.php
View file @
d64c42de
...
...
@@ -14,11 +14,18 @@ class UserController extends \Our\Controller_AbstractIndex {
}
p
ublic
function
indexAction
()
{
p
rivate
function
indexAction
()
{
$login
=
LoginV2Model
::
getInstance
();
echo
$login
->
login
();
}
private
function
updateOldLoginKey
(
$token
){
$params
[
'authSign'
]
=
md5
(
$token
.
\Our\SecretKeys
::
authKey
);
$params
[
'key'
]
=
$token
;
$paramsStr
=
http_build_query
(
$params
);
$domain
=
Bootstrap
::
getUrlIniConfig
(
'resourcesHost'
);
$getUrl
=
$domain
.
\Our\PathConst
::
authInfoOtherLogin
.
'?'
.
$paramsStr
;
file_get_contents
(
$getUrl
);
}
/**
* 用户登录
*
...
...
@@ -41,12 +48,15 @@ class UserController extends \Our\Controller_AbstractIndex {
if
(
!
$result
[
'status'
]){
\Error\ErrorModel
::
throwException
(
\Error\CodeConfigModel
::
loginBindUserInfoFailed
);
}
if
(
isset
(
$result
[
'member'
])
&&
$member
){
if
(
isset
(
$result
[
'member'
])
&&
$member
){
$member
=
array_merge
(
$member
,
$result
[
'member'
]);
}
}
$userToken
=
$this
->
memberService
->
findMbUserTokenByMemberId
(
$member
[
'member_id'
]);
$this
->
memberService
->
clearKey
(
$userToken
[
'token'
]);
if
(
!
empty
(
$userToken
[
'token'
])){
$this
->
updateOldLoginKey
(
$userToken
[
'token'
]);
//$this->memberService->clearKey($userToken['token']);
}
if
(
$member
){
$this
->
memberService
->
clearKey
(
$this
->
key
);
$this
->
key
=
Common
::
bulidToken
(
$mobile
,
$password
);
...
...
@@ -129,6 +139,7 @@ class UserController extends \Our\Controller_AbstractIndex {
$this
->
sess
[
'user_type'
]
=
$where
[
'userType'
];
$this
->
sess
[
NameConst
::
sessionKey
]
=
$this
->
key
;
$member
[
NameConst
::
sessionKey
]
=
$this
->
key
;
$member
[
'login_time'
]
=
TIMESTAMP
;
$this
->
memberService
->
saveMember
(
$member
);
$this
->
success
(
array
(
'userFlag'
=>
\Our\ApiConst
::
one
,
'key'
=>
$this
->
key
,
'memberName'
=>
$member
[
'member_name'
],
'memberAvatar'
=>
$member
[
'memberAvatarUrl'
]));
}
else
{
...
...
application/library/Our/Controller/AbstractApi.php
View file @
d64c42de
<?php
namespace
Our
;
use
Business\User\MemberServiceModel
;
use
Error\CodeConfigModel
;
use
Error\ErrorModel
;
/**
...
...
@@ -33,6 +34,11 @@ abstract class Controller_AbstractApi extends \Our\Controller_Abstract {
if
(
empty
(
$this
->
memberId
)){
ErrorModel
::
throwException
(
CodeConfigModel
::
noLogin
);
}
if
(
isset
(
$sess
[
'other_login'
])
&&
$sess
[
'other_login'
]
==
ApiConst
::
one
){
$memberService
=
MemberServiceModel
::
getInstance
();
$memberService
->
clearKey
(
$this
->
req
[
'data'
][
'key'
]);
ErrorModel
::
throwException
(
CodeConfigModel
::
otherDriverLogin
);
}
\Yaf\Dispatcher
::
getInstance
()
->
disableView
();
}
public
function
getAuthKey
(){
...
...
application/library/Our/PathConst.php
View file @
d64c42de
...
...
@@ -39,6 +39,8 @@ class PathConst {
const
orderConfirmTaskAddTime
=
"/orderConfirmTaskAddTime.conf"
;
const
orderId
=
"orderId=
{
0
}
"
;
const
authInfoOtherLogin
=
"/authInfo/otherLogin"
;
//const favoritesStoreFavTimeConf="favoritesStoreFavTime.conf";
...
...
application/models/DAO/Member.php
View file @
d64c42de
...
...
@@ -102,7 +102,6 @@ class MemberModel extends \DAO\AbstractModel
$this
->
setDb
(
\Our\DbNameConst
::
masterDBConnectName
);
$result
=
$this
->
db
->
update
(
$this
->
_tableName
)
->
rows
(
$data
)
->
where
(
array
(
'member_id'
=>
$memberId
))
->
execute
();
if
(
$result
)
{
$memberDb0Redis
=
\Redis\Db0\MemberRedisModel
::
getInstance
();
$member
=
$data
;
if
(
isset
(
$member
[
'member_avatar'
])
&&
$member
[
'member_avatar'
])
{
...
...
application/models/Error/CodeConfig.php
View file @
d64c42de
...
...
@@ -89,6 +89,7 @@ class CodeConfigModel {
const
updateMobileMembmerFailed
=
10076
;
const
updateMobileMembmerMappingFailed
=
10077
;
const
currentMobileHasBeenBind
=
10078
;
const
otherDriverLogin
=
10105
;
//访问错误
const
illegalAccess
=
200001
;
...
...
@@ -743,6 +744,7 @@ class CodeConfigModel {
self
::
updateMobileMembmerFailed
=>
'更新手机号对应会员信息失败'
,
self
::
updateMobileMembmerMappingFailed
=>
'更新手机号码对应会员mapping信息失败'
,
self
::
currentMobileHasBeenBind
=>
'当前手机号码已经绑定其他微信,如需绑定,请先手机号码登录app进行微信解绑'
,
self
::
otherDriverLogin
=>
'当前用户已被其他用户登录,请重新登录'
,
self
::
elasticsError
=>
'全文索引连接出错'
);
}
...
...
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