切换导航条
此项目
正在载入...
登录
王晓刚
/
advertising
·
提交
转到一个项目
GitLab
转到仪表盘
项目
活动
文件
提交
管道
0
构建
0
图表
里程碑
问题
0
合并请求
0
成员
标记
维基
派生
网络
创建新的问题
下载为
邮件补丁
差异文件
浏览文件
作者
王晓刚
5 years ago
提交
b90a020782383e29e76907f2d4e169138c2a6e65
1 个父辈
c08133e4
1 个管道 的构建
通过
耗费 1 秒
调试授权登录
变更
2
构建
1
显示空白字符变更
内嵌
并排对比
正在显示
2 个修改的文件
包含
99 行增加
和
63 行删除
.idea/workspace.xml
application/home/controller/User.php
.idea/workspace.xml
查看文件 @
b90a020
...
...
@@ -3,7 +3,7 @@
<component
name=
"ChangeListManager"
>
<list
default=
"true"
id=
"309ad746-5b2a-4c29-af46-e7925a35765c"
name=
"默认的"
comment=
""
>
<change
beforePath=
"$PROJECT_DIR$/.idea/workspace.xml"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/.idea/workspace.xml"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/application/home/controller/
Goods.php"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/application/home/controller/Goods
.php"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/application/home/controller/
User.php"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/application/home/controller/User
.php"
afterDir=
"false"
/>
</list>
<option
name=
"EXCLUDED_CONVERTED_TO_IGNORED"
value=
"true"
/>
<option
name=
"TRACKING_ENABLED"
value=
"true"
/>
...
...
@@ -29,8 +29,8 @@
<file
leaf-file-name=
"authorization_view.html"
pinned=
"false"
current-in-tab=
"false"
>
<entry
file=
"file://$PROJECT_DIR$/application/home/view/user/authorization_view.html"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"374"
>
<caret
line=
"67"
column=
"65"
selection-start-line=
"67"
selection-start-column=
"65"
selection-end-line=
"67"
selection-end-column=
"65"
/>
<state
relative-caret-position=
"238"
>
<caret
line=
"59"
column=
"43"
selection-start-line=
"59"
selection-start-column=
"43"
selection-end-line=
"59"
selection-end-column=
"43"
/>
<folding>
<element
signature=
"n#style#0;n#html#0;n#!!top"
/>
</folding>
...
...
@@ -38,11 +38,20 @@
</provider>
</entry>
</file>
<file
leaf-file-name=
"User.php"
pinned=
"false"
current-in-tab=
"
fals
e"
>
<file
leaf-file-name=
"User.php"
pinned=
"false"
current-in-tab=
"
tru
e"
>
<entry
file=
"file://$PROJECT_DIR$/application/home/controller/User.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"283"
>
<caret
line=
"154"
column=
"33"
selection-start-line=
"154"
selection-start-column=
"20"
selection-end-line=
"154"
selection-end-column=
"33"
/>
<state
relative-caret-position=
"198"
>
<caret
line=
"143"
column=
"11"
selection-start-line=
"143"
selection-start-column=
"11"
selection-end-line=
"143"
selection-end-column=
"11"
/>
</state>
</provider>
</entry>
</file>
<file
leaf-file-name=
"WechatBase.php"
pinned=
"false"
current-in-tab=
"false"
>
<entry
file=
"file://$PROJECT_DIR$/application/common/controller/WechatBase.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"708"
>
<caret
line=
"86"
column=
"46"
selection-start-line=
"86"
selection-start-column=
"46"
selection-end-line=
"86"
selection-end-column=
"46"
/>
</state>
</provider>
</entry>
...
...
@@ -56,11 +65,29 @@
</provider>
</entry>
</file>
<file
leaf-file-name=
"Goods.php"
pinned=
"false"
current-in-tab=
"
tru
e"
>
<file
leaf-file-name=
"Goods.php"
pinned=
"false"
current-in-tab=
"
fals
e"
>
<entry
file=
"file://$PROJECT_DIR$/application/home/controller/Goods.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"306"
>
<caret
line=
"26"
column=
"85"
selection-start-line=
"26"
selection-start-column=
"74"
selection-end-line=
"26"
selection-end-column=
"85"
/>
</state>
</provider>
</entry>
</file>
<file
leaf-file-name=
"Jump.php"
pinned=
"false"
current-in-tab=
"false"
>
<entry
file=
"file://$PROJECT_DIR$/thinkphp/library/traits/controller/Jump.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"341"
>
<caret
line=
"142"
column=
"45"
selection-start-line=
"142"
selection-start-column=
"38"
selection-end-line=
"142"
selection-end-column=
"45"
/>
</state>
</provider>
</entry>
</file>
<file
leaf-file-name=
"helper.php"
pinned=
"false"
current-in-tab=
"false"
>
<entry
file=
"file://$PROJECT_DIR$/thinkphp/helper.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"289"
>
<caret
line=
"2
5"
column=
"39"
selection-start-line=
"25"
selection-start-column=
"39"
selection-end-line=
"25"
selection-end-column=
"39
"
/>
<caret
line=
"2
79"
column=
"63"
selection-start-line=
"279"
selection-start-column=
"56"
selection-end-line=
"279"
selection-end-column=
"63
"
/>
</state>
</provider>
</entry>
...
...
@@ -83,15 +110,6 @@
</provider>
</entry>
</file>
<file
leaf-file-name=
"head.html"
pinned=
"false"
current-in-tab=
"false"
>
<entry
file=
"file://$PROJECT_DIR$/application/home/view/public/head.html"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"85"
>
<caret
line=
"5"
column=
"76"
selection-start-line=
"5"
selection-start-column=
"76"
selection-end-line=
"5"
selection-end-column=
"76"
/>
</state>
</provider>
</entry>
</file>
</leaf>
</component>
<component
name=
"FileTemplateManagerImpl"
>
...
...
@@ -118,8 +136,6 @@
<component
name=
"IdeDocumentHistory"
>
<option
name=
"CHANGED_PATHS"
>
<list>
<option
value=
"$PROJECT_DIR$/public/assets/js/backend/wechat/pay.js"
/>
<option
value=
"$PROJECT_DIR$/application/admin/view/pay/index.html"
/>
<option
value=
"$PROJECT_DIR$/public/assets/js/backend/pay.js"
/>
<option
value=
"$PROJECT_DIR$/application/admin/view/pay_view/index.html"
/>
<option
value=
"$PROJECT_DIR$/public/assets/js/backend/pay_view.js"
/>
...
...
@@ -165,10 +181,12 @@
<option
value=
"$PROJECT_DIR$/application/home/view/public/nav.html"
/>
<option
value=
"$PROJECT_DIR$/application/home/view/public/js.html"
/>
<option
value=
"$PROJECT_DIR$/application/home/controller/Index.php"
/>
<option
value=
"$PROJECT_DIR$/application/home/view/user/authorization_view.html"
/>
<option
value=
"$PROJECT_DIR$/application/home/view/public/head.html"
/>
<option
value=
"$PROJECT_DIR$/application/home/view/index/index.html"
/>
<option
value=
"$PROJECT_DIR$/application/home/controller/Goods.php"
/>
<option
value=
"$PROJECT_DIR$/application/home/view/user/authorization_view.html"
/>
<option
value=
"$PROJECT_DIR$/application/common/controller/WechatBase.php"
/>
<option
value=
"$PROJECT_DIR$/application/home/controller/User.php"
/>
</list>
</option>
</component>
...
...
@@ -377,7 +395,7 @@
<component
name=
"PropertiesComponent"
>
<property
name=
"DefaultHtmlFileTemplate"
value=
"HTML File"
/>
<property
name=
"WebServerToolWindowFactoryState"
value=
"false"
/>
<property
name=
"last_opened_file_path"
value=
"D:/phpStudy/WWW/
bank
"
/>
<property
name=
"last_opened_file_path"
value=
"D:/phpStudy/WWW/
shengbao
"
/>
<property
name=
"nodejs_interpreter_path.stuck_in_default_project"
value=
"undefined stuck path"
/>
<property
name=
"nodejs_npm_path_reset_for_default_project"
value=
"true"
/>
<property
name=
"settings.editor.selected.configurable"
value=
"terminal"
/>
...
...
@@ -431,7 +449,7 @@
<workItem
from=
"1572223206994"
duration=
"28857000"
/>
<workItem
from=
"1572309778506"
duration=
"26117000"
/>
<workItem
from=
"1572395935540"
duration=
"28313000"
/>
<workItem
from=
"1572483209367"
duration=
"1
1705
000"
/>
<workItem
from=
"1572483209367"
duration=
"1
2597
000"
/>
</task>
<task
id=
"LOCAL-00001"
summary=
"数据库配置"
>
<created>
1571972429395
</created>
...
...
@@ -741,11 +759,25 @@
<option
name=
"project"
value=
"LOCAL"
/>
<updated>
1572502485108
</updated>
</task>
<option
name=
"localTasksCounter"
value=
"45"
/>
<task
id=
"LOCAL-00045"
summary=
"调试授权登录"
>
<created>
1572502565105
</created>
<option
name=
"number"
value=
"00045"
/>
<option
name=
"presentableId"
value=
"LOCAL-00045"
/>
<option
name=
"project"
value=
"LOCAL"
/>
<updated>
1572502565105
</updated>
</task>
<task
id=
"LOCAL-00046"
summary=
"调试授权登录"
>
<created>
1572503340201
</created>
<option
name=
"number"
value=
"00046"
/>
<option
name=
"presentableId"
value=
"LOCAL-00046"
/>
<option
name=
"project"
value=
"LOCAL"
/>
<updated>
1572503340201
</updated>
</task>
<option
name=
"localTasksCounter"
value=
"47"
/>
<servers
/>
</component>
<component
name=
"TimeTrackingManager"
>
<option
name=
"totallyTimeSpent"
value=
"22
5243
000"
/>
<option
name=
"totallyTimeSpent"
value=
"22
6135
000"
/>
</component>
<component
name=
"ToolWindowManager"
>
<frame
x=
"-8"
y=
"-8"
width=
"1936"
height=
"1056"
extended-state=
"6"
/>
...
...
@@ -818,25 +850,6 @@
<option
name=
"LAST_COMMIT_MESSAGE"
value=
"调试授权登录"
/>
</component>
<component
name=
"editorHistoryManager"
>
<entry
file=
"file://$PROJECT_DIR$/application/admin/view/goods_audit/index.html"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"510"
>
<caret
line=
"30"
column=
"33"
selection-start-line=
"24"
selection-start-column=
"24"
selection-end-line=
"30"
selection-end-column=
"33"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/application/admin/controller/Users.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"-306"
/>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/application/admin/model/GoodsAudit.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"119"
>
<caret
line=
"7"
column=
"6"
selection-start-line=
"7"
selection-start-column=
"6"
selection-end-line=
"7"
selection-end-column=
"6"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/public/assets/js/backend/goods_audit.js"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"408"
>
...
...
@@ -1120,13 +1133,6 @@
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/application/home/controller/User.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"283"
>
<caret
line=
"154"
column=
"33"
selection-start-line=
"154"
selection-start-column=
"20"
selection-end-line=
"154"
selection-end-column=
"33"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/application/home/view/public/head.html"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"85"
>
...
...
@@ -1148,41 +1154,69 @@
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/application/home/view/index/index.html"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"357"
>
<caret
line=
"36"
column=
"20"
selection-start-line=
"36"
selection-start-column=
"20"
selection-end-line=
"36"
selection-end-column=
"20"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/thinkphp/helper.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"289"
>
<caret
line=
"279"
column=
"71"
selection-start-line=
"279"
selection-start-column=
"66"
selection-end-line=
"279"
selection-end-column=
"71"
/>
<caret
line=
"279"
column=
"63"
selection-start-line=
"279"
selection-start-column=
"56"
selection-end-line=
"279"
selection-end-column=
"63"
/>
</state>
</provider>
</entry>
<entry
file=
"jar://$APPLICATION_HOME_DIR$/plugins/php/lib/php.jar!/stubs/standard/standard_2.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"204"
>
<caret
line=
"505"
column=
"28"
lean-forward=
"true"
selection-start-line=
"505"
selection-start-column=
"28"
selection-end-line=
"505"
selection-end-column=
"28"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/application/home/controller/Index.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"334"
>
<caret
line=
"78"
column=
"13"
selection-start-line=
"78"
selection-start-column=
"13"
selection-end-line=
"78"
selection-end-column=
"13"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/application/common/controller/WechatBase.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"708"
>
<caret
line=
"86"
column=
"46"
selection-start-line=
"86"
selection-start-column=
"46"
selection-end-line=
"86"
selection-end-column=
"46"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/application/home/view/user/authorization_view.html"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"374"
>
<caret
line=
"67"
column=
"65"
selection-start-line=
"67"
selection-start-column=
"65"
selection-end-line=
"67"
selection-end-column=
"65"
/>
<state
relative-caret-position=
"238"
>
<caret
line=
"59"
column=
"43"
selection-start-line=
"59"
selection-start-column=
"43"
selection-end-line=
"59"
selection-end-column=
"43"
/>
<folding>
<element
signature=
"n#style#0;n#html#0;n#!!top"
/>
</folding>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/
application/home/view/index/index.html
"
>
<entry
file=
"file://$PROJECT_DIR$/
thinkphp/library/traits/controller/Jump.php
"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"357"
>
<caret
line=
"36"
column=
"20"
selection-start-line=
"36"
selection-start-column=
"20"
selection-end-line=
"36"
selection-end-column=
"20"
/>
<state
relative-caret-position=
"341"
>
<caret
line=
"142"
column=
"45"
selection-start-line=
"142"
selection-start-column=
"38"
selection-end-line=
"142"
selection-end-column=
"45"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/application/home/controller/
Index
.php"
>
<entry
file=
"file://$PROJECT_DIR$/application/home/controller/
Goods
.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"334"
>
<caret
line=
"78"
column=
"13"
selection-start-line=
"78"
selection-start-column=
"13"
selection-end-line=
"78"
selection-end-column=
"13"
/>
<state
relative-caret-position=
"306"
>
<caret
line=
"26"
column=
"85"
selection-start-line=
"26"
selection-start-column=
"74"
selection-end-line=
"26"
selection-end-column=
"85"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/application/home/controller/
Goods
.php"
>
<entry
file=
"file://$PROJECT_DIR$/application/home/controller/
User
.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"289"
>
<caret
line=
"25"
column=
"39"
selection-start-line=
"25"
selection-start-column=
"39"
selection-end-line=
"25"
selection-end-column=
"39"
/>
<state
relative-caret-position=
"198"
>
<caret
line=
"143"
column=
"11"
selection-start-line=
"143"
selection-start-column=
"11"
selection-end-line=
"143"
selection-end-column=
"11"
/>
</state>
</provider>
</entry>
...
...
application/home/controller/User.php
查看文件 @
b90a020
...
...
@@ -142,10 +142,12 @@ class User extends WechatBase
/**
* 授权页面
* @param null $target_url
* @return mixed
*/
public
function
authorization_view
(){
public
function
authorization_view
(
$target_url
=
null
){
$this
->
assign
(
'title'
,
'授权页'
);
$this
->
assign
(
'target_url'
,
$target_url
);
return
$this
->
fetch
();
}
...
...
请
注册
或
登录
后发表评论