切换导航条
此项目
正在载入...
登录
王晓刚
/
advertising
·
提交
转到一个项目
GitLab
转到仪表盘
项目
活动
文件
提交
管道
0
构建
0
图表
里程碑
问题
0
合并请求
0
成员
标记
维基
派生
网络
创建新的问题
下载为
邮件补丁
差异文件
浏览文件
作者
王晓刚
5 years ago
提交
ac11a5939037455d8cd02eaf40de051c7a978aa5
1 个父辈
95c37886
1 个管道 的构建
通过
耗费 0 秒
微信公众平台配置
变更
3
构建
1
隐藏空白字符变更
内嵌
并排对比
正在显示
3 个修改的文件
包含
67 行增加
和
91 行删除
.idea/workspace.xml
application/home/controller/Index.php
public/MP_verify_4KFkEP03TkXO6gP2.txt
.idea/workspace.xml
查看文件 @
ac11a59
...
...
@@ -2,55 +2,8 @@
<project
version=
"4"
>
<component
name=
"ChangeListManager"
>
<list
default=
"true"
id=
"309ad746-5b2a-4c29-af46-e7925a35765c"
name=
"默认的"
comment=
""
>
<change
afterPath=
"$PROJECT_DIR$/.gitlab-ci.yml"
afterDir=
"false"
/>
<change
afterPath=
"$PROJECT_DIR$/application/common/controller/WechatBase.php"
afterDir=
"false"
/>
<change
afterPath=
"$PROJECT_DIR$/application/extra/wechat.php"
afterDir=
"false"
/>
<change
afterPath=
"$PROJECT_DIR$/application/home/controller/Collect.php"
afterDir=
"false"
/>
<change
afterPath=
"$PROJECT_DIR$/application/home/controller/Goods.php"
afterDir=
"false"
/>
<change
afterPath=
"$PROJECT_DIR$/application/home/controller/Index.php"
afterDir=
"false"
/>
<change
afterPath=
"$PROJECT_DIR$/application/home/controller/Member.php"
afterDir=
"false"
/>
<change
afterPath=
"$PROJECT_DIR$/application/home/controller/Question.php"
afterDir=
"false"
/>
<change
afterPath=
"$PROJECT_DIR$/application/home/controller/Server.php"
afterDir=
"false"
/>
<change
afterPath=
"$PROJECT_DIR$/application/home/controller/Share.php"
afterDir=
"false"
/>
<change
afterPath=
"$PROJECT_DIR$/application/home/controller/Upload.php"
afterDir=
"false"
/>
<change
afterPath=
"$PROJECT_DIR$/application/home/controller/User.php"
afterDir=
"false"
/>
<change
afterPath=
"$PROJECT_DIR$/application/home/model/Goods.php"
afterDir=
"false"
/>
<change
afterPath=
"$PROJECT_DIR$/application/home/model/Question.php"
afterDir=
"false"
/>
<change
afterPath=
"$PROJECT_DIR$/application/home/model/Slide.php"
afterDir=
"false"
/>
<change
afterPath=
"$PROJECT_DIR$/application/home/model/User.php"
afterDir=
"false"
/>
<change
afterPath=
"$PROJECT_DIR$/application/home/model/UserQuestionAnswer.php"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/.idea/advertising.iml"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/.idea/advertising.iml"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/.idea/php.xml"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/.idea/php.xml"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/.idea/workspace.xml"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/.idea/workspace.xml"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/application/common.php"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/application/common.php"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/application/config.php"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/application/config.php"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/composer.json"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/composer.json"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/vendor/autoload.php"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/vendor/autoload.php"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/vendor/composer/ClassLoader.php"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/vendor/composer/ClassLoader.php"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/vendor/composer/LICENSE"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/vendor/composer/LICENSE"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/vendor/composer/autoload_files.php"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/vendor/composer/autoload_files.php"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/vendor/composer/autoload_psr4.php"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/vendor/composer/autoload_psr4.php"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/vendor/composer/autoload_real.php"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/vendor/composer/autoload_real.php"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/vendor/composer/autoload_static.php"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/vendor/composer/autoload_static.php"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/vendor/composer/installed.json"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/vendor/composer/installed.json"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/vendor/symfony/psr-http-message-bridge/.php_cs.dist"
beforeDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/vendor/symfony/psr-http-message-bridge/.travis.yml"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/vendor/symfony/psr-http-message-bridge/.travis.yml"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/vendor/symfony/psr-http-message-bridge/Factory/DiactorosFactory.php"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/vendor/symfony/psr-http-message-bridge/Factory/DiactorosFactory.php"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/vendor/symfony/psr-http-message-bridge/Factory/HttpFoundationFactory.php"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/vendor/symfony/psr-http-message-bridge/Factory/HttpFoundationFactory.php"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/vendor/symfony/psr-http-message-bridge/Factory/PsrHttpFactory.php"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/vendor/symfony/psr-http-message-bridge/Factory/PsrHttpFactory.php"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/vendor/symfony/psr-http-message-bridge/HttpFoundationFactoryInterface.php"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/vendor/symfony/psr-http-message-bridge/HttpFoundationFactoryInterface.php"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/vendor/symfony/psr-http-message-bridge/HttpMessageFactoryInterface.php"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/vendor/symfony/psr-http-message-bridge/HttpMessageFactoryInterface.php"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/vendor/symfony/psr-http-message-bridge/README.md"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/vendor/symfony/psr-http-message-bridge/README.md"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/vendor/symfony/psr-http-message-bridge/Tests/Factory/AbstractHttpMessageFactoryTest.php"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/vendor/symfony/psr-http-message-bridge/Tests/Factory/AbstractHttpMessageFactoryTest.php"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/vendor/symfony/psr-http-message-bridge/Tests/Factory/DiactorosFactoryTest.php"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/vendor/symfony/psr-http-message-bridge/Tests/Factory/DiactorosFactoryTest.php"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/vendor/symfony/psr-http-message-bridge/Tests/Factory/HttpFoundationFactoryTest.php"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/vendor/symfony/psr-http-message-bridge/Tests/Factory/HttpFoundationFactoryTest.php"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/vendor/symfony/psr-http-message-bridge/Tests/Factory/PsrHttpFactoryTest.php"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/vendor/symfony/psr-http-message-bridge/Tests/Factory/PsrHttpFactoryTest.php"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/vendor/symfony/psr-http-message-bridge/Tests/Fixtures/Message.php"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/vendor/symfony/psr-http-message-bridge/Tests/Fixtures/Message.php"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/vendor/symfony/psr-http-message-bridge/Tests/Fixtures/Response.php"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/vendor/symfony/psr-http-message-bridge/Tests/Fixtures/Response.php"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/vendor/symfony/psr-http-message-bridge/Tests/Fixtures/ServerRequest.php"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/vendor/symfony/psr-http-message-bridge/Tests/Fixtures/ServerRequest.php"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/vendor/symfony/psr-http-message-bridge/Tests/Fixtures/Stream.php"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/vendor/symfony/psr-http-message-bridge/Tests/Fixtures/Stream.php"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/vendor/symfony/psr-http-message-bridge/Tests/Functional/CovertTest.php"
beforeDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/vendor/symfony/psr-http-message-bridge/composer.json"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/vendor/symfony/psr-http-message-bridge/composer.json"
afterDir=
"false"
/>
<change
beforePath=
"$PROJECT_DIR$/application/home/controller/Index.php"
beforeDir=
"false"
afterPath=
"$PROJECT_DIR$/application/home/controller/Index.php"
afterDir=
"false"
/>
</list>
<option
name=
"EXCLUDED_CONVERTED_TO_IGNORED"
value=
"true"
/>
<option
name=
"TRACKING_ENABLED"
value=
"true"
/>
...
...
@@ -64,11 +17,11 @@
</component>
<component
name=
"FileEditorManager"
>
<leaf
SIDE_TABS_SIZE_LIMIT_KEY=
"300"
>
<file
leaf-file-name=
"Index.php"
pinned=
"false"
current-in-tab=
"
fals
e"
>
<file
leaf-file-name=
"Index.php"
pinned=
"false"
current-in-tab=
"
tru
e"
>
<entry
file=
"file://$PROJECT_DIR$/application/home/controller/Index.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"1258"
>
<caret
line=
"82"
column=
"9"
selection-start-line=
"82"
selection-start-column=
"9"
selection-end-line=
"82"
selection-end-column=
"9"
/>
<state
relative-caret-position=
"357"
>
<caret
line=
"38"
column=
"34"
lean-forward=
"true"
selection-start-line=
"38"
selection-start-column=
"34"
selection-end-line=
"38"
selection-end-column=
"34"
/>
<folding>
<element
signature=
"e#128#165#0#PHP"
expanded=
"true"
/>
</folding>
...
...
@@ -88,15 +41,6 @@
</provider>
</entry>
</file>
<file
leaf-file-name=
".gitlab-ci.yml"
pinned=
"false"
current-in-tab=
"true"
>
<entry
file=
"file://$PROJECT_DIR$/.gitlab-ci.yml"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"136"
>
<caret
line=
"8"
column=
"38"
selection-start-line=
"8"
selection-start-column=
"38"
selection-end-line=
"8"
selection-end-column=
"38"
/>
</state>
</provider>
</entry>
</file>
<file
leaf-file-name=
"Goods.php"
pinned=
"false"
current-in-tab=
"false"
>
<entry
file=
"file://$PROJECT_DIR$/application/home/controller/Goods.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
...
...
@@ -193,7 +137,6 @@
<option
value=
"$PROJECT_DIR$/application/home/model/User.php"
/>
<option
value=
"$PROJECT_DIR$/application/home/model/User_question_answer.php"
/>
<option
value=
"$PROJECT_DIR$/application/home/model/UserQuestionAnswer.php"
/>
<option
value=
"$PROJECT_DIR$/application/home/controller/Index.php"
/>
<option
value=
"$PROJECT_DIR$/application/home/controller/Goods.php"
/>
<option
value=
"$PROJECT_DIR$/application/home/controller/Collect.php"
/>
<option
value=
"$PROJECT_DIR$/application/home/controller/Upload.php"
/>
...
...
@@ -203,6 +146,8 @@
<option
value=
"$PROJECT_DIR$/application/home/controller/Question.php"
/>
<option
value=
"$PROJECT_DIR$/application/home/controller/Member.php"
/>
<option
value=
"$PROJECT_DIR$/.gitlab-ci.yml"
/>
<option
value=
"$PROJECT_DIR$/application/database.php"
/>
<option
value=
"$PROJECT_DIR$/application/home/controller/Index.php"
/>
</list>
</option>
</component>
...
...
@@ -283,6 +228,24 @@
<item
name=
"advertising"
type=
"b2602c69:ProjectViewProjectNode"
/>
<item
name=
"advertising"
type=
"462c0819:PsiDirectoryNode"
/>
</path>
<path>
<item
name=
"advertising"
type=
"b2602c69:ProjectViewProjectNode"
/>
<item
name=
"advertising"
type=
"462c0819:PsiDirectoryNode"
/>
<item
name=
"application"
type=
"462c0819:PsiDirectoryNode"
/>
</path>
<path>
<item
name=
"advertising"
type=
"b2602c69:ProjectViewProjectNode"
/>
<item
name=
"advertising"
type=
"462c0819:PsiDirectoryNode"
/>
<item
name=
"application"
type=
"462c0819:PsiDirectoryNode"
/>
<item
name=
"home"
type=
"462c0819:PsiDirectoryNode"
/>
</path>
<path>
<item
name=
"advertising"
type=
"b2602c69:ProjectViewProjectNode"
/>
<item
name=
"advertising"
type=
"462c0819:PsiDirectoryNode"
/>
<item
name=
"application"
type=
"462c0819:PsiDirectoryNode"
/>
<item
name=
"home"
type=
"462c0819:PsiDirectoryNode"
/>
<item
name=
"controller"
type=
"462c0819:PsiDirectoryNode"
/>
</path>
</expand>
<select
/>
</subPane>
...
...
@@ -336,12 +299,20 @@
<workItem
from=
"1571705047810"
duration=
"3754000"
/>
<workItem
from=
"1571790358186"
duration=
"28939000"
/>
<workItem
from=
"1571877780953"
duration=
"28080000"
/>
<workItem
from=
"1571963886703"
duration=
"7057000"
/>
<workItem
from=
"1571963886703"
duration=
"7537000"
/>
</task>
<task
id=
"LOCAL-00001"
summary=
"数据库配置"
>
<created>
1571972429395
</created>
<option
name=
"number"
value=
"00001"
/>
<option
name=
"presentableId"
value=
"LOCAL-00001"
/>
<option
name=
"project"
value=
"LOCAL"
/>
<updated>
1571972429395
</updated>
</task>
<option
name=
"localTasksCounter"
value=
"2"
/>
<servers
/>
</component>
<component
name=
"TimeTrackingManager"
>
<option
name=
"totallyTimeSpent"
value=
"77
39
8000"
/>
<option
name=
"totallyTimeSpent"
value=
"77
87
8000"
/>
</component>
<component
name=
"ToolWindowManager"
>
<frame
x=
"-8"
y=
"-8"
width=
"1936"
height=
"1056"
extended-state=
"6"
/>
...
...
@@ -376,14 +347,11 @@
<component
name=
"VcsContentAnnotationSettings"
>
<option
name=
"myLimit"
value=
"2678400000"
/>
</component>
<component
name=
"VcsManagerConfiguration"
>
<MESSAGE
value=
"数据库配置"
/>
<option
name=
"LAST_COMMIT_MESSAGE"
value=
"数据库配置"
/>
</component>
<component
name=
"editorHistoryManager"
>
<entry
file=
"file://$PROJECT_DIR$/application/home/model/User.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"153"
>
<caret
line=
"14"
column=
"1"
selection-start-line=
"14"
selection-start-column=
"1"
selection-end-line=
"14"
selection-end-column=
"1"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/application/common.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"7803"
>
...
...
@@ -569,13 +537,6 @@
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/application/config.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"204"
>
<caret
line=
"20"
column=
"58"
selection-start-line=
"20"
selection-start-column=
"58"
selection-end-line=
"20"
selection-end-column=
"58"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/application/admin/validate/Category.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
/>
</entry>
...
...
@@ -638,16 +599,6 @@
</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=
"1258"
>
<caret
line=
"82"
column=
"9"
selection-start-line=
"82"
selection-start-column=
"9"
selection-end-line=
"82"
selection-end-column=
"9"
/>
<folding>
<element
signature=
"e#128#165#0#PHP"
expanded=
"true"
/>
</folding>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/application/home/controller/Collect.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"708"
>
...
...
@@ -712,6 +663,27 @@
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/.gitlab-ci.yml"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"153"
>
<caret
line=
"9"
column=
"14"
lean-forward=
"true"
selection-start-line=
"9"
selection-start-column=
"14"
selection-end-line=
"9"
selection-end-column=
"14"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/application/database.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"442"
>
<caret
line=
"34"
column=
"41"
selection-start-line=
"34"
selection-start-column=
"41"
selection-end-line=
"34"
selection-end-column=
"41"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/application/config.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"-255"
>
<caret
line=
"20"
column=
"58"
selection-start-line=
"20"
selection-start-column=
"58"
selection-end-line=
"20"
selection-end-column=
"58"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/application/home/controller/Member.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"1218"
>
...
...
@@ -722,10 +694,13 @@
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/
.gitlab-ci.yml
"
>
<entry
file=
"file://$PROJECT_DIR$/
application/home/controller/Index.php
"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"136"
>
<caret
line=
"8"
column=
"38"
selection-start-line=
"8"
selection-start-column=
"38"
selection-end-line=
"8"
selection-end-column=
"38"
/>
<state
relative-caret-position=
"357"
>
<caret
line=
"38"
column=
"34"
lean-forward=
"true"
selection-start-line=
"38"
selection-start-column=
"34"
selection-end-line=
"38"
selection-end-column=
"34"
/>
<folding>
<element
signature=
"e#128#165#0#PHP"
expanded=
"true"
/>
</folding>
</state>
</provider>
</entry>
...
...
application/home/controller/Index.php
查看文件 @
ac11a59
...
...
@@ -37,7 +37,7 @@ class Index extends WechatBase
}
}
$goodsModel
=
new
Goods
();
$data
=
$goodsModel
->
selectPageData
([
'
goods_
id'
=>
[
'not in'
,
$goods_ids
]],
1
,
5
);
$data
=
$goodsModel
->
selectPageData
([
'id'
=>
[
'not in'
,
$goods_ids
]],
1
,
5
);
foreach
(
$data
as
$key
=>
$vo
){
if
(
!
empty
(
$vo
[
'video'
])){
$data
[
$key
][
'video'
]
=
$domain_name
.
$vo
[
'video'
];
...
...
public/MP_verify_4KFkEP03TkXO6gP2.txt
0 → 100644
查看文件 @
ac11a59
4KFkEP03TkXO6gP2
\ No newline at end of file
...
...
请
注册
或
登录
后发表评论