Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Z
zuiketang
Project
Project
Details
Activity
Releases
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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
夏彬
zuiketang
Commits
5c78db44
Commit
5c78db44
authored
Oct 20, 2016
by
汪波
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/dev' into dev
parents
93ac30f9
e59e6cc4
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
29 additions
and
30 deletions
+29
-30
main-local.php
src/environments/dev/common/config/main-local.php
+2
-5
params-local.php
src/environments/dev/common/config/params-local.php
+1
-1
main-local.php
src/environments/dev/frontend/config/main-local.php
+11
-5
main-local.php
src/environments/prod/common/config/main-local.php
+2
-5
main-local.php
src/environments/prod/frontend/config/main-local.php
+13
-5
main.php
src/frontend/config/main.php
+0
-9
No files found.
src/environments/dev/common/config/main-local.php
View file @
5c78db44
...
@@ -3,11 +3,8 @@ return [
...
@@ -3,11 +3,8 @@ return [
'components'
=>
[
'components'
=>
[
'cache'
=>
[
'cache'
=>
[
'class'
=>
'yii\redis\Cache'
,
'class'
=>
'yii\redis\Cache'
,
'redis'
=>
[
'redis'
=>
'redis'
,
'hostname'
=>
'192.168.1.185'
,
'keyPrefix'
=>
'yunya::'
'port'
=>
6379
,
'database'
=>
0
,
]
],
],
'db'
=>
[
'db'
=>
[
'class'
=>
'yii\db\Connection'
,
'class'
=>
'yii\db\Connection'
,
...
...
src/environments/dev/common/config/params-local.php
View file @
5c78db44
...
@@ -9,7 +9,7 @@ return [
...
@@ -9,7 +9,7 @@ return [
'msg.userid'
=>
'78'
,
'msg.userid'
=>
'78'
,
'msg.account'
=>
'276147613x'
,
'msg.account'
=>
'276147613x'
,
'msg.password'
=>
'276147613'
,
'msg.password'
=>
'276147613'
,
'msg.signature'
=>
'【
最课堂
】'
,
'msg.signature'
=>
'【
云涯
】'
,
'alipay'
=>
[
'alipay'
=>
[
'partner'
=>
'2088701843067550'
,
'partner'
=>
'2088701843067550'
,
'seller_id'
=>
'2088701843067550'
,
'seller_id'
=>
'2088701843067550'
,
...
...
src/environments/dev/frontend/config/main-local.php
View file @
5c78db44
...
@@ -14,11 +14,17 @@ $config = [
...
@@ -14,11 +14,17 @@ $config = [
'timeout'
=>
3600
,
'timeout'
=>
3600
,
'name'
=>
'zuiektang-frontend'
,
'name'
=>
'zuiektang-frontend'
,
'class'
=>
'yii\redis\Session'
,
'class'
=>
'yii\redis\Session'
,
'redis'
=>
[
'redis'
=>
'redis'
'hostname'
=>
'192.168.1.185'
,
],
'port'
=>
6379
,
'log'
=>
[
'database'
=>
0
,
'traceLevel'
=>
YII_DEBUG
?
3
:
0
,
]
'targets'
=>
[
[
'class'
=>
'yii\log\FileTarget'
,
'levels'
=>
[
'error'
,
'warning'
],
'logFile'
=>
'@runtime/logs/app-'
.
date
(
'Y-m-d'
,
time
())
.
'.log'
,
],
],
],
],
],
],
];
];
...
...
src/environments/prod/common/config/main-local.php
View file @
5c78db44
...
@@ -3,11 +3,8 @@ return [
...
@@ -3,11 +3,8 @@ return [
'components'
=>
[
'components'
=>
[
'cache'
=>
[
'cache'
=>
[
'class'
=>
'yii\redis\Cache'
,
'class'
=>
'yii\redis\Cache'
,
'redis'
=>
[
'redis'
=>
'redis'
,
'hostname'
=>
'192.168.1.21'
,
'keyPrefix'
=>
'yunya::'
'port'
=>
6380
,
'database'
=>
2
,
]
],
],
'db'
=>
[
'db'
=>
[
'class'
=>
'yii\db\Connection'
,
'class'
=>
'yii\db\Connection'
,
...
...
src/environments/prod/frontend/config/main-local.php
View file @
5c78db44
...
@@ -13,11 +13,19 @@ $config = [
...
@@ -13,11 +13,19 @@ $config = [
'timeout'
=>
3600
,
'timeout'
=>
3600
,
'name'
=>
'zuiektang-frontend'
,
'name'
=>
'zuiektang-frontend'
,
'class'
=>
'yii\redis\Session'
,
'class'
=>
'yii\redis\Session'
,
'redis'
=>
[
'redis'
=>
'redis'
'hostname'
=>
'192.168.1.21'
,
],
'port'
=>
6380
,
'log'
=>
[
'database'
=>
2
,
'traceLevel'
=>
YII_DEBUG
?
3
:
0
,
]
'targets'
=>
[
[
'class'
=>
'yii\log\FileTarget'
,
'levels'
=>
[
'error'
,
'warning'
],
'except'
=>
[
'yii\web\HttpException:*'
,
'yii\i18n\I18N\*'
],
'logFile'
=>
'@runtime/logs/app-'
.
date
(
'Y-m-d'
,
time
())
.
'.log'
,
'logVars'
=>
[],
],
],
],
],
],
],
];
];
...
...
src/frontend/config/main.php
View file @
5c78db44
...
@@ -35,15 +35,6 @@ return [
...
@@ -35,15 +35,6 @@ return [
$user
->
save
();
$user
->
save
();
}
}
],
],
'log'
=>
[
'traceLevel'
=>
YII_DEBUG
?
3
:
0
,
'targets'
=>
[
[
'class'
=>
'yii\log\FileTarget'
,
'levels'
=>
[
'error'
,
'warning'
],
],
],
],
'errorHandler'
=>
[
'errorHandler'
=>
[
'errorAction'
=>
'site/error'
,
'errorAction'
=>
'site/error'
,
],
],
...
...
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