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
84aff275
Commit
84aff275
authored
Jan 07, 2019
by
zhz
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
店铺关注
parent
8bad6034
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
107 additions
and
126 deletions
+107
-126
StoreService.php
application/models/Business/Store/StoreService.php
+28
-28
application.ini
conf/application.ini
+69
-82
url.ini
conf/url.ini
+10
-16
No files found.
application/models/Business/Store/StoreService.php
View file @
84aff275
...
...
@@ -572,34 +572,34 @@ class StoreServiceModel extends \Business\AbstractModel{
* @param $memberId
*/
public
function
updateFavoritesStore
(
$param
,
$memberId
){
if
(
!
(
isset
(
$param
[
'storeId'
])
&&
$param
[
'storeId'
])){
\Error\ErrorModel
::
throwException
(
\Error\CodeConfigModel
::
emptyScanStoreId
);
}
$storeId
=
trim
(
$param
[
'storeId'
]);
$storeInfo
=
\DAO\StoreModel
::
getInstance
()
->
get
(
$storeId
,
false
);
if
(
!
$storeInfo
){
\Error\ErrorModel
::
throwException
(
\Error\CodeConfigModel
::
emptyScanStoreInfo
);
}
$storeMembers
=
array
();
$storeMember
=
array
();
$storeMember
[
'store_id'
]
=
$storeId
;
$storeMember
[
'member_id'
]
=
$memberId
;
$storeMember
[
'fav_from'
]
=
\Our\ApiConst
::
scanFavor
;
$storeMember
[
'fav_type'
]
=
\Our\ApiConst
::
one
;
$storeMembers
[]
=
$storeMember
;
$favoritesStoreDao
=
\DAO\FavoritesStoreModel
::
getInstance
();
$one
=
$favoritesStoreDao
->
getOne
(
'store_id'
,
array
(
'store_id'
=>
$storeId
,
'member_id'
=>
$memberId
,
'fav_type'
=>
\Our\ApiConst
::
one
,
'fav_from'
=>
\Our\ApiConst
::
scanFavor
),
''
);
if
(
!
$one
)
{
$result
=
$favoritesStoreDao
->
insertAll
(
$storeMembers
);
if
(
!
$result
){
\Error\ErrorModel
::
throwException
(
\Error\CodeConfigModel
::
saveScanStoreInfoFailed
);
}
$favoritesStoreDao
->
updateStoreCollecitonsCache
(
array
(
$storeId
),
$memberId
,
2
);
$favoritesDao
=
\DAO\FavoritesStoreModel
::
getInstance
();
\Our\RedisHelper
::
delCachedFunction
(
\Redis\Db6\FavoritesStoreRedisModel
::
getInstance
(),
array
(
&
$favoritesDao
,
'getOne'
),
array
(),
array
(
$memberId
));
}
//
if(!(isset($param['storeId'])&&$param['storeId'])){
//
\Error\ErrorModel::throwException(\Error\CodeConfigModel::emptyScanStoreId);
//
}
//
$storeId = trim($param['storeId']);
//
$storeInfo = \DAO\StoreModel::getInstance()->get($storeId,false);
//
if(!$storeInfo){
//
\Error\ErrorModel::throwException(\Error\CodeConfigModel::emptyScanStoreInfo);
//
}
//
$storeMembers = array();
//
$storeMember = array();
//
$storeMember['store_id'] = $storeId;
//
$storeMember['member_id'] = $memberId;
//
$storeMember['fav_from'] = \Our\ApiConst::scanFavor;
//
$storeMember['fav_type'] = \Our\ApiConst::one;
//
$storeMembers[] = $storeMember;
//
$favoritesStoreDao = \DAO\FavoritesStoreModel::getInstance();
//
// $one = $favoritesStoreDao->getOne('store_id',array('store_id'=>$storeId,'member_id'=>$memberId,'fav_type'=>\Our\ApiConst::one
),'');
//
if(!$one) {
//
$result = $favoritesStoreDao->insertAll($storeMembers);
//
if(!$result){
//
\Error\ErrorModel::throwException(\Error\CodeConfigModel::saveScanStoreInfoFailed);
//
}
//
$favoritesStoreDao->updateStoreCollecitonsCache(array($storeId),$memberId,2);
//
$favoritesDao = \DAO\FavoritesStoreModel::getInstance();
//
\Our\RedisHelper::delCachedFunction(\Redis\Db6\FavoritesStoreRedisModel::getInstance(),array(&$favoritesDao, 'getOne'),array(),array($memberId));
//
//
}
return
true
;
...
...
conf/application.ini
View file @
84aff275
...
...
@@ -12,25 +12,23 @@ application.dispatcher.catchException = true
; Admin模块用于后台管理
application.modules
=
Index,Api,Admin,Client
redis.redisPublishName
=
'redisPublish'
;
[productone : common]
; 数据库配置
resources.database.params.driver
=
"pdo_mysql"
resources.database.params.hostname
=
"
rm-bp1j835zol35h2nm0.mysql.rds.aliyuncs.com
"
resources.database.params.hostname
=
"
172.16.142.15
"
resources.database.params.port
=
3306
resources.database.params.database
=
"qmcs"
resources.database.params.username
=
"
chenchuanwen
"
resources.database.params.username
=
"
root
"
resources.database.params.password
=
"!@#$%12345werty"
resources.database.params.charset
=
"UTF8"
resources.database.params.driver_options.1002
=
"SET NAMES utf8"
;
; ; 从库配置
resources.database.slave.params.driver
=
"pdo_mysql"
resources.database.slave.params.hostname
=
"
rm-bp1j835zol35h2nm0.mysql.rds.aliyuncs.com
"
resources.database.slave.params.hostname
=
"
172.16.142.13
"
resources.database.slave.params.port
=
3306
resources.database.slave.params.database
=
"qmcs"
resources.database.slave.params.username
=
"
chenchuanwen
"
resources.database.slave.params.username
=
"
root
"
resources.database.slave.params.password
=
"!@#$%12345werty"
resources.database.slave.params.charset
=
"UTF8"
resources.database.slave.params.driver_options.1002
=
"SET NAMES utf8"
...
...
@@ -60,24 +58,24 @@ elastic.master.port="9200"
elastic.master.scheme
=
"http"
;
password.key
=
'~!@#$`1234qwertasdfgzxcvb'
;
;
生产环境
//
生产环境
[product : common]
; 数据库配置
resources.database.params.driver
=
"pdo_mysql"
resources.database.params.hostname
=
"
rm-bp1j835zol35h2nm0.mysql.rds.aliyuncs.com
"
resources.database.params.hostname
=
"
127.0.0.1
"
resources.database.params.port
=
3306
resources.database.params.database
=
"qmcs"
resources.database.params.username
=
"
chenchuanwen
"
resources.database.params.username
=
"
root
"
resources.database.params.password
=
"!@#$%12345werty"
resources.database.params.charset
=
"UTF8"
resources.database.params.driver_options.1002
=
"SET NAMES utf8"
; 从库配置
resources.database.slave.params.driver
=
"pdo_mysql"
resources.database.slave.params.hostname
=
"
rm-bp1j835zol35h2nm0.mysql.rds.aliyuncs.com
"
resources.database.slave.params.hostname
=
"
172.16.142.13
"
resources.database.slave.params.port
=
3306
resources.database.slave.params.database
=
"qmcs"
resources.database.slave.params.username
=
"
chenchuanwen
"
resources.database.slave.params.username
=
"
root
"
resources.database.slave.params.password
=
"!@#$%12345werty"
resources.database.slave.params.charset
=
"UTF8"
resources.database.slave.params.driver_options.1002
=
"SET NAMES utf8"
...
...
@@ -226,73 +224,68 @@ push.open=1
push.user.service.id
=
293
push.user.service.type
=
7
password.key
=
'~!@#$`1234qwertasdfgzxcvb'
[develop : common]
; 数据库配置
;resources.database.params.driver = "pdo_mysql"
;resources.database.params.hostname = "192.168.1.201"
;resources.database.params.port = 3306
;resources.database.params.database = "qmcs"
;resources.database.params.username = "root"
;resources.database.params.password = "123456"
;resources.database.params.charset = "UTF8"
;resources.database.params.driver_options.1002 = "SET NAMES utf8"
resources.database.params.driver
=
"pdo_mysql"
resources.database.params.hostname
=
"1
92.168.1.201
"
resources.database.params.hostname
=
"1
06.14.14.233
"
resources.database.params.port
=
3306
resources.database.params.database
=
"qmcs"
resources.database.params.username
=
"root"
resources.database.params.password
=
"
123456
"
resources.database.params.password
=
"
!@#$%12345werty
"
resources.database.params.charset
=
"UTF8"
resources.database.params.driver_options.1002
=
"SET NAMES utf8"
; 从库配置
;resources.database.slave.params.driver = "pdo_mysql"
;resources.database.slave.params.hostname = "192.168.1.201"
;resources.database.slave.params.port = 3306
;resources.database.slave.params.database = "qmcs"
;resources.database.slave.params.username = "root"
;resources.database.slave.params.password = "123456"
;resources.database.slave.params.charset = "UTF8"
;resources.database.slave.params.driver_options.1002 = "SET NAMES utf8"
resources.database.slave.params.driver
=
"pdo_mysql"
resources.database.slave.params.hostname
=
"1
92.168.1.201
"
resources.database.slave.params.hostname
=
"1
06.14.14.233
"
resources.database.slave.params.port
=
3306
resources.database.slave.params.database
=
"qmcs"
resources.database.slave.params.username
=
"root"
resources.database.slave.params.password
=
"
123456
"
resources.database.slave.params.password
=
"
!@#$%12345werty
"
resources.database.slave.params.charset
=
"UTF8"
resources.database.slave.params.driver_options.1002
=
"SET NAMES utf8"
; mongodb
resources.database.mongo.params.driver
=
"scram"
resources.database.mongo.params.hostname
=
"192.168.1.201"
resources.database.mongo.params.port
=
27017
resources.database.mongo.params.database
=
"qmcs"
resources.database.mongo.params.username
=
"qmcs"
resources.database.mongo.params.password
=
"123456asdfgh"
resources.database.mongo.params.charset
=
"UTF8"
resources.database.mongo.params.driver_options.1002
=
"SET NAMES utf8"
password.key
=
'~!@#$`1234qwertasdfgzxcvb'
;
redis.database.params.host
=
"192.168.1.201"
push.clientHost
=
"ws://192.168.80.18:9502"
;redis.database.params.host = "127.0.0.1"
;redis.database.params.port = "6379"
;redis.database.params.prefix = "qm_"
redis.database.params.host
=
"106.14.14.233"
redis.database.params.port
=
"6379"
redis.database.params.prefix
=
"qm_"
redis.database.params.password
=
""
out.config
=
"/data/config"
;
;锁文件
out.locks="/data/locks";
redis.database.params.password
=
"23456ertyu"
out.config
=
"/data/config"
; redis配置
push.user.service.id
=
293
push.user.service.type
=
7
;redis.database.params.password = "test"
;推送配置
push.clientHost
=
"ws://192.168.
1.201
:9502"
push.host
=
"192.168.
1.201
"
push.clientHost
=
"ws://192.168.
80.18
:9502"
push.host
=
"192.168.
80.18
"
push.port
=
"9503"
push.open
=
1
push.user.service.id
=
293
push.user.service.type
=
7
elastic.master.host
=
"192.168.1.201"
elastic.master.port
=
"9200"
elastic.master.scheme
=
"http"
;
;resources.database.params.hostname = "127.0.0.1"
;resources.database.params.database = "database"
;resources.database.params.username = "username"
;resources.database.params.password = "password"
password.key
=
'~!@#$`1234qwertasdfgzxcvb'
;
[ccwdevelop : common]
; 数据库配置
resources.database.params.driver
=
"pdo_mysql"
resources.database.params.hostname
=
"192.168.
1.201
"
resources.database.params.hostname
=
"192.168.
80.18
"
resources.database.params.port
=
3306
resources.database.params.database
=
"qmcs
_ccw
"
resources.database.params.database
=
"qmcs"
resources.database.params.username
=
"root"
resources.database.params.password
=
"123456"
resources.database.params.charset
=
"UTF8"
...
...
@@ -300,9 +293,9 @@ resources.database.params.driver_options.1002 = "SET NAMES utf8"
; 从库配置
resources.database.slave.params.driver
=
"pdo_mysql"
resources.database.slave.params.hostname
=
"192.168.
1.201
"
resources.database.slave.params.hostname
=
"192.168.
80.18
"
resources.database.slave.params.port
=
3306
resources.database.slave.params.database
=
"qmcs
_ccw
"
resources.database.slave.params.database
=
"qmcs"
resources.database.slave.params.username
=
"root"
resources.database.slave.params.password
=
"123456"
resources.database.slave.params.charset
=
"UTF8"
...
...
@@ -310,11 +303,11 @@ resources.database.slave.params.driver_options.1002 = "SET NAMES utf8"
; 从库配置
resources.database.drawSource.params.driver
=
"pdo_mysql"
resources.database.drawSource.params.hostname
=
"192.168.
1.201
"
resources.database.drawSource.params.hostname
=
"192.168.
80.18
"
resources.database.drawSource.params.port
=
3306
resources.database.drawSource.params.database
=
"drawSource"
resources.database.drawSource.params.username
=
"root"
resources.database.drawSource.params.password
=
"1
11111
"
resources.database.drawSource.params.password
=
"1
23456
"
resources.database.drawSource.params.charset
=
"UTF8"
resources.database.drawSource.params.driver_options.1002
=
"SET NAMES utf8"
...
...
@@ -330,10 +323,10 @@ resources.database.mongo.params.driver_options.1002 = "SET NAMES utf8"
password.key
=
'~!@#$`1234qwertasdfgzxcvb'
;
redis.database.params.host
=
"1
92.168.1.20
1"
redis.database.params.host
=
"1
27.0.0.
1"
redis.database.params.port
=
"6379"
redis.database.params.prefix
=
"qm_"
redis.database.params.password
=
""
redis.database.params.password
=
"
23456ertyu
"
out.config
=
"/data/config"
;
;锁文件
...
...
@@ -342,8 +335,8 @@ out.locks="/data/locks";
;redis.database.params.password = "test"
;推送配置
push.clientHost
=
"ws://192.168.
1.201
:9502"
push.host
=
"192.168.
1.201
"
push.clientHost
=
"ws://192.168.
80.18
:9502"
push.host
=
"192.168.
80.18
"
push.port
=
"9503"
push.open
=
1
push.user.service.id
=
293
...
...
@@ -401,12 +394,12 @@ elastic.master.host="192.168.1.201"
elastic.master.port
=
"9200"
elastic.master.scheme
=
"http"
;
[lyz
test
: common]
[lyz : common]
; 数据库配置
resources.database.params.driver
=
"pdo_mysql"
resources.database.params.hostname
=
"127.0.0.1"
resources.database.params.port
=
3306
resources.database.params.database
=
"
test
qmcs"
resources.database.params.database
=
"qmcs"
resources.database.params.username
=
"root"
resources.database.params.password
=
"123456"
resources.database.params.charset
=
"UTF8"
...
...
@@ -416,7 +409,7 @@ resources.database.params.driver_options.1002 = "SET NAMES utf8"
resources.database.slave.params.driver
=
"pdo_mysql"
resources.database.slave.params.hostname
=
"127.0.0.1"
resources.database.slave.params.port
=
3306
resources.database.slave.params.database
=
"
test
qmcs"
resources.database.slave.params.database
=
"qmcs"
resources.database.slave.params.username
=
"root"
resources.database.slave.params.password
=
"123456"
resources.database.slave.params.charset
=
"UTF8"
...
...
@@ -448,58 +441,52 @@ elastic.master.host="192.168.1.201"
elastic.master.port
=
"9200"
elastic.master.scheme
=
"http"
;
[lyz : common]
[lyz
test
: common]
; 数据库配置
resources.database.params.driver
=
"pdo_mysql"
resources.database.params.hostname
=
"1
06.14.14.233
"
resources.database.params.hostname
=
"1
27.0.0.1
"
resources.database.params.port
=
3306
resources.database.params.database
=
"qmcs"
resources.database.params.database
=
"
test
qmcs"
resources.database.params.username
=
"root"
resources.database.params.password
=
"
!@#$%12345werty
"
resources.database.params.password
=
"
123456
"
resources.database.params.charset
=
"UTF8"
resources.database.params.driver_options.1002
=
"SET NAMES utf8"
; 从库配置
resources.database.slave.params.driver
=
"pdo_mysql"
resources.database.slave.params.hostname
=
"1
06.14.14.233
"
resources.database.slave.params.hostname
=
"1
27.0.0.1
"
resources.database.slave.params.port
=
3306
resources.database.slave.params.database
=
"qmcs"
resources.database.slave.params.database
=
"
test
qmcs"
resources.database.slave.params.username
=
"root"
resources.database.slave.params.password
=
"
!@#$%12345werty
"
resources.database.slave.params.password
=
"
123456
"
resources.database.slave.params.charset
=
"UTF8"
resources.database.slave.params.driver_options.1002
=
"SET NAMES utf8"
; mongodb
resources.database.mongo.params.driver
=
"scram"
resources.database.mongo.params.hostname
=
"106.14.14.233"
resources.database.mongo.params.port
=
27017
resources.database.mongo.params.database
=
"qmcs"
resources.database.mongo.params.username
=
"qmcs"
resources.database.mongo.params.password
=
"123456asdfgh"
resources.database.mongo.params.charset
=
"UTF8"
resources.database.mongo.params.driver_options.1002
=
"SET NAMES utf8"
password.key
=
'~!@#$`1234qwertasdfgzxcvb'
redis.database.params.host
=
"127.0.0.1"
redis.database.params.port
=
"6379"
redis.database.params.prefix
=
"qm_"
redis.database.params.password
=
"23456ertyu"
out.config
=
"/data/config"
;redis.database.params.password = "23456ertyu"
out.config
=
"/data/config"
;
;锁文件
out.locks="/data/locks";
; redis配置
;redis.database.params.password = "test"
;推送配置
push.clientHost
=
"ws://192.168.80.1
8
:9502"
push.host
=
"1
27.0.0.1
"
push.clientHost
=
"ws://192.168.80.1
34
:9502"
push.host
=
"1
92.168.134.18
"
push.port
=
"9503"
push.open
=
1
push.user.service.id
=
293
push.user.service.type
=
7
password.key
=
'~!@#$`1234qwertasdfgzxcvb'
elastic.master.host
=
"192.168.1.201"
elastic.master.port
=
"9200"
elastic.master.scheme
=
"http"
;
[linqing : common]
; 数据库配置
...
...
conf/url.ini
View file @
84aff275
...
...
@@ -12,8 +12,7 @@ config.url.resourcesHost = "http://api.shenbd.com"
config.url.userHost
=
""
;
; ; oss 域名
config.url.ossHost
=
"https://img.shenbd.com"
;config.url.ossHost = "https://qmoss-01.oss-cn-hangzhou.aliyuncs.com"
config.url.ossHost
=
"https://qmoss-01.oss-cn-hangzhou.aliyuncs.com"
;
; ;推送域名
config.url.pushHost
=
"172.16.142.15:9503"
;
...
...
@@ -37,8 +36,8 @@ config.url.resourcesHost = "http://api.shenbd.com"
; 用户中心host
config.url.userHost
=
""
config.url.ossHost
=
"https://img.shenbd.com"
;
config.url.ossHost = "https://qmoss-01.oss-cn-hangzhou.aliyuncs.com"
; oss 域名
config.url.ossHost
=
"https://qmoss-01.oss-cn-hangzhou.aliyuncs.com"
;推送域名
config.url.pushHost
=
"127.0.0.1:9503"
;
...
...
@@ -55,9 +54,9 @@ config.url.convert=/usr/local/bin/wkhtmltoimage
config.url.resourcesHost
=
"http://apitest.shenbd.com"
; 用户中心host
config.url.userHost
=
""
config.url.ossHost
=
"https://imgpre.shenbd.com"
; oss 域名
;
config.url.ossHost = "https://qmoss-01.oss-cn-hangzhou.aliyuncs.com"
config.url.ossHost
=
"https://qmoss-01.oss-cn-hangzhou.aliyuncs.com"
;推送域名
config.url.pushHost
=
"127.0.0.1:9503"
;
...
...
@@ -75,9 +74,9 @@ config.url.source="/www/web/testadmin_shenbd_com/public_html/data/upload/"
config.url.resourcesHost
=
"http://apitest.qm.com"
; 用户中心host
config.url.userHost
=
""
config.url.ossHost
=
"https://img.shenbd.com"
; oss 域名
;
config.url.ossHost = "http://qmoss-01.oss-cn-hangzhou.aliyuncs.com"
config.url.ossHost
=
"http://qmoss-01.oss-cn-hangzhou.aliyuncs.com"
;推送域名
config.url.pushHost
=
"127.0.0.1:9503"
;
...
...
@@ -91,16 +90,11 @@ config.url.resourcesHost = "http://test.qm.com"
config.url.userHost
=
""
; oss 域名
config.url.ossHost
=
"http
s://img.shenbd
.com"
config.url.ossHost
=
"http
://qmoss-01.oss-cn-hangzhou.aliyuncs
.com"
;推送域名
config.url.pushHost
=
"127.0.0.1:9503"
;
config.url.indexUrl
=
"/www/web/test_qm_com/application/library/React"
config.url.libary
=
"/www/web/test_qm_com/application/library"
config.url.source
=
"/www/web/test_qm_com/public_html/data/upload/"
;config.url.source="E:/WAMP/www/www.qm.com/data/upload/"
; 文件目录
;店铺图片报错目录
...
...
@@ -122,10 +116,10 @@ config.url.resourcesHost = "http://local.qm.com"
config.url.userHost
=
""
; oss 域名
config.url.ossHost
=
"http
s://imgpre.shenbd
.com"
config.url.ossHost
=
"http
://qmoss-01.oss-cn-hangzhou.aliyuncs
.com"
;推送域名
config.url.pushHost
=
"1
92.168.1.20
1:9503"
;
config.url.pushHost
=
"1
27.0.0.
1:9503"
;
config.url.convert
=
"/usr/local/bin/wkhtmltoimage"
;
...
...
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