Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
starsw001
ShopXO
提交
8188fe0d
ShopXO
项目概览
starsw001
/
ShopXO
与 Fork 源项目一致
Fork自
纵之格 / ShopXO
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
ShopXO
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
8188fe0d
编写于
1月 07, 2021
作者:
D
Devil
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
一键绑定手机昵称丢失修复
上级
e323f8a6
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
8 addition
and
7 deletion
+8
-7
application/api/controller/User.php
application/api/controller/User.php
+5
-5
application/service/UserService.php
application/service/UserService.php
+1
-1
changelog.txt
changelog.txt
+1
-0
sourcecode/weixin/default/app.js
sourcecode/weixin/default/app.js
+1
-1
未找到文件。
application/api/controller/User.php
浏览文件 @
8188fe0d
...
@@ -142,7 +142,7 @@ class User extends Common
...
@@ -142,7 +142,7 @@ class User extends Common
$user
=
UserService
::
AppUserInfoHandle
(
null
,
'alipay_openid'
,
$this
->
data_post
[
'openid'
]);
$user
=
UserService
::
AppUserInfoHandle
(
null
,
'alipay_openid'
,
$this
->
data_post
[
'openid'
]);
if
(
empty
(
$user
))
if
(
empty
(
$user
))
{
{
$this
->
data_post
[
'nick
_
name'
]
=
isset
(
$this
->
data_post
[
'nickName'
])
?
$this
->
data_post
[
'nickName'
]
:
''
;
$this
->
data_post
[
'nickname'
]
=
isset
(
$this
->
data_post
[
'nickName'
])
?
$this
->
data_post
[
'nickName'
]
:
''
;
$this
->
data_post
[
'gender'
]
=
empty
(
$this
->
data_post
[
'gender'
])
?
0
:
((
$this
->
data_post
[
'gender'
]
==
'f'
)
?
1
:
2
);
$this
->
data_post
[
'gender'
]
=
empty
(
$this
->
data_post
[
'gender'
])
?
0
:
((
$this
->
data_post
[
'gender'
]
==
'f'
)
?
1
:
2
);
return
UserService
::
AuthUserProgram
(
$this
->
data_post
,
'alipay_openid'
);
return
UserService
::
AuthUserProgram
(
$this
->
data_post
,
'alipay_openid'
);
}
else
{
}
else
{
...
@@ -220,7 +220,7 @@ class User extends Common
...
@@ -220,7 +220,7 @@ class User extends Common
$result
=
(
new
\
base\Wechat
(
MyC
(
'common_app_mini_weixin_appid'
),
MyC
(
'common_app_mini_weixin_appsecret'
)))
->
DecryptData
(
$this
->
data_post
[
'encrypted_data'
],
$this
->
data_post
[
'iv'
],
$this
->
data_post
[
'openid'
]);
$result
=
(
new
\
base\Wechat
(
MyC
(
'common_app_mini_weixin_appid'
),
MyC
(
'common_app_mini_weixin_appsecret'
)))
->
DecryptData
(
$this
->
data_post
[
'encrypted_data'
],
$this
->
data_post
[
'iv'
],
$this
->
data_post
[
'openid'
]);
if
(
$result
[
'status'
]
==
0
&&
!
empty
(
$result
[
'data'
]))
if
(
$result
[
'status'
]
==
0
&&
!
empty
(
$result
[
'data'
]))
{
{
$result
[
'nick
_
name'
]
=
isset
(
$result
[
'data'
][
'nickName'
])
?
$result
[
'data'
][
'nickName'
]
:
''
;
$result
[
'nickname'
]
=
isset
(
$result
[
'data'
][
'nickName'
])
?
$result
[
'data'
][
'nickName'
]
:
''
;
$result
[
'avatar'
]
=
isset
(
$result
[
'data'
][
'avatarUrl'
])
?
$result
[
'data'
][
'avatarUrl'
]
:
''
;
$result
[
'avatar'
]
=
isset
(
$result
[
'data'
][
'avatarUrl'
])
?
$result
[
'data'
][
'avatarUrl'
]
:
''
;
$result
[
'gender'
]
=
empty
(
$result
[
'data'
][
'gender'
])
?
0
:
((
$result
[
'data'
][
'gender'
]
==
2
)
?
1
:
2
);
$result
[
'gender'
]
=
empty
(
$result
[
'data'
][
'gender'
])
?
0
:
((
$result
[
'data'
][
'gender'
]
==
2
)
?
1
:
2
);
$result
[
'weixin_unionid'
]
=
isset
(
$result
[
'data'
][
'unionId'
])
?
$result
[
'data'
][
'unionId'
]
:
''
;
$result
[
'weixin_unionid'
]
=
isset
(
$result
[
'data'
][
'unionId'
])
?
$result
[
'data'
][
'unionId'
]
:
''
;
...
@@ -313,7 +313,7 @@ class User extends Common
...
@@ -313,7 +313,7 @@ class User extends Common
if
(
$result
[
'status'
]
==
0
&&
!
empty
(
$result
[
'data'
]))
if
(
$result
[
'status'
]
==
0
&&
!
empty
(
$result
[
'data'
]))
{
{
$result
[
'nick
_
name'
]
=
isset
(
$result
[
'data'
][
'nickname'
])
?
$result
[
'data'
][
'nickname'
]
:
''
;
$result
[
'nickname'
]
=
isset
(
$result
[
'data'
][
'nickname'
])
?
$result
[
'data'
][
'nickname'
]
:
''
;
$result
[
'avatar'
]
=
isset
(
$result
[
'data'
][
'headimgurl'
])
?
$result
[
'data'
][
'headimgurl'
]
:
''
;
$result
[
'avatar'
]
=
isset
(
$result
[
'data'
][
'headimgurl'
])
?
$result
[
'data'
][
'headimgurl'
]
:
''
;
$result
[
'gender'
]
=
empty
(
$result
[
'data'
][
'sex'
])
?
0
:
((
$result
[
'data'
][
'sex'
]
==
2
)
?
1
:
2
);
$result
[
'gender'
]
=
empty
(
$result
[
'data'
][
'sex'
])
?
0
:
((
$result
[
'data'
][
'sex'
]
==
2
)
?
1
:
2
);
$result
[
'openid'
]
=
$result
[
'data'
][
'openid'
];
$result
[
'openid'
]
=
$result
[
'data'
][
'openid'
];
...
@@ -395,7 +395,7 @@ class User extends Common
...
@@ -395,7 +395,7 @@ class User extends Common
$result
=
json_decode
(
htmlspecialchars_decode
(
$this
->
data_post
[
'userinfo'
]),
true
);
$result
=
json_decode
(
htmlspecialchars_decode
(
$this
->
data_post
[
'userinfo'
]),
true
);
if
(
is_array
(
$result
))
if
(
is_array
(
$result
))
{
{
$result
[
'nick
_
name'
]
=
isset
(
$result
[
'nickName'
])
?
$result
[
'nickName'
]
:
''
;
$result
[
'nickname'
]
=
isset
(
$result
[
'nickName'
])
?
$result
[
'nickName'
]
:
''
;
$result
[
'avatar'
]
=
isset
(
$result
[
'avatarUrl'
])
?
$result
[
'avatarUrl'
]
:
''
;
$result
[
'avatar'
]
=
isset
(
$result
[
'avatarUrl'
])
?
$result
[
'avatarUrl'
]
:
''
;
$result
[
'gender'
]
=
empty
(
$result
[
'gender'
])
?
0
:
((
$result
[
'gender'
]
==
2
)
?
1
:
2
);
$result
[
'gender'
]
=
empty
(
$result
[
'gender'
])
?
0
:
((
$result
[
'gender'
]
==
2
)
?
1
:
2
);
$result
[
'openid'
]
=
$this
->
data_post
[
'openid'
];
$result
[
'openid'
]
=
$this
->
data_post
[
'openid'
];
...
@@ -483,7 +483,7 @@ class User extends Common
...
@@ -483,7 +483,7 @@ class User extends Common
$result
=
(
new
\
base\QQ
(
MyC
(
'common_app_mini_qq_appid'
),
MyC
(
'common_app_mini_qq_appsecret'
)))
->
DecryptData
(
$this
->
data_post
[
'encrypted_data'
],
$this
->
data_post
[
'iv'
],
$this
->
data_post
[
'openid'
]);
$result
=
(
new
\
base\QQ
(
MyC
(
'common_app_mini_qq_appid'
),
MyC
(
'common_app_mini_qq_appsecret'
)))
->
DecryptData
(
$this
->
data_post
[
'encrypted_data'
],
$this
->
data_post
[
'iv'
],
$this
->
data_post
[
'openid'
]);
if
(
is_array
(
$result
))
if
(
is_array
(
$result
))
{
{
$result
[
'nick
_
name'
]
=
isset
(
$result
[
'nickName'
])
?
$result
[
'nickName'
]
:
''
;
$result
[
'nickname'
]
=
isset
(
$result
[
'nickName'
])
?
$result
[
'nickName'
]
:
''
;
$result
[
'avatar'
]
=
isset
(
$result
[
'avatarUrl'
])
?
$result
[
'avatarUrl'
]
:
''
;
$result
[
'avatar'
]
=
isset
(
$result
[
'avatarUrl'
])
?
$result
[
'avatarUrl'
]
:
''
;
$result
[
'gender'
]
=
empty
(
$result
[
'gender'
])
?
0
:
((
$result
[
'gender'
]
==
2
)
?
1
:
2
);
$result
[
'gender'
]
=
empty
(
$result
[
'gender'
])
?
0
:
((
$result
[
'gender'
]
==
2
)
?
1
:
2
);
$result
[
'qq_unionid'
]
=
isset
(
$result
[
'unionId'
])
?
$result
[
'unionId'
]
:
''
;
$result
[
'qq_unionid'
]
=
isset
(
$result
[
'unionId'
])
?
$result
[
'unionId'
]
:
''
;
...
...
application/service/UserService.php
浏览文件 @
8188fe0d
...
@@ -1391,7 +1391,7 @@ class UserService
...
@@ -1391,7 +1391,7 @@ class UserService
// 用户信息
// 用户信息
$data
=
[
$data
=
[
$field
=>
$params
[
'openid'
],
$field
=>
$params
[
'openid'
],
'nickname'
=>
empty
(
$params
[
'nick
_name'
])
?
''
:
$params
[
'nick_
name'
],
'nickname'
=>
empty
(
$params
[
'nick
name'
])
?
''
:
$params
[
'nick
name'
],
'avatar'
=>
empty
(
$params
[
'avatar'
])
?
''
:
$params
[
'avatar'
],
'avatar'
=>
empty
(
$params
[
'avatar'
])
?
''
:
$params
[
'avatar'
],
'gender'
=>
empty
(
$params
[
'gender'
])
?
0
:
intval
(
$params
[
'gender'
]),
'gender'
=>
empty
(
$params
[
'gender'
])
?
0
:
intval
(
$params
[
'gender'
]),
'province'
=>
empty
(
$params
[
'province'
])
?
''
:
$params
[
'province'
],
'province'
=>
empty
(
$params
[
'province'
])
?
''
:
$params
[
'province'
],
...
...
changelog.txt
浏览文件 @
8188fe0d
...
@@ -20,6 +20,7 @@ web端
...
@@ -20,6 +20,7 @@ web端
6. 动态数据列表组件条件新增气泡式弹出层、模块引入参数优化
6. 动态数据列表组件条件新增气泡式弹出层、模块引入参数优化
7. 后台插件管理新增排序功能、自定义显示顺序+插件调用顺序
7. 后台插件管理新增排序功能、自定义显示顺序+插件调用顺序
8. 公共接口新增插件配置返回
8. 公共接口新增插件配置返回
9. API接口与插件解耦、扩展性更上一层楼
小程序
小程序
...
...
sourcecode/weixin/default/app.js
浏览文件 @
8188fe0d
...
@@ -74,7 +74,7 @@ App({
...
@@ -74,7 +74,7 @@ App({
// 请求地址
// 请求地址
request_url
:
"
{{request_url}}
"
,
request_url
:
"
{{request_url}}
"
,
request_url
:
'
http://shopxo.com/
'
,
request_url
:
'
http://shopxo.com/
'
,
//
request_url: 'https://dev.shopxo.net/',
request_url
:
'
https://dev.shopxo.net/
'
,
// 基础信息
// 基础信息
application_title
:
"
{{application_title}}
"
,
application_title
:
"
{{application_title}}
"
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录