Commit bc9a9107 authored by wzp's avatar wzp

修改bug

parent 98c3fbb5
...@@ -423,6 +423,10 @@ public class ChinaMobileRestApiController extends BaseController { ...@@ -423,6 +423,10 @@ public class ChinaMobileRestApiController extends BaseController {
assetQueryWrapper.eq(Asset::getPublished, true); assetQueryWrapper.eq(Asset::getPublished, true);
assetQueryWrapper.eq(Asset::getFileCat, FileCatEnum.VIDEO_CONTENT.name()); assetQueryWrapper.eq(Asset::getFileCat, FileCatEnum.VIDEO_CONTENT.name());
List<Asset> videoList = this.assetService.list(assetQueryWrapper); List<Asset> videoList = this.assetService.list(assetQueryWrapper);
for (Asset asset : videoList) {
asset.setExhibitionBoardName(exhibitionBoard.getName());
asset.setExhibitionBoardId(exhibitionBoard.getId());
}
assetQueryWrapper.clear(); assetQueryWrapper.clear();
assetQueryWrapper = Wrappers.<Asset>lambdaQuery().eq(Asset::getRefItemId, exhibitionBoard.getId()); assetQueryWrapper = Wrappers.<Asset>lambdaQuery().eq(Asset::getRefItemId, exhibitionBoard.getId());
...@@ -431,6 +435,7 @@ public class ChinaMobileRestApiController extends BaseController { ...@@ -431,6 +435,7 @@ public class ChinaMobileRestApiController extends BaseController {
List<Asset> datumList = this.assetService.list(assetQueryWrapper); List<Asset> datumList = this.assetService.list(assetQueryWrapper);
for (Asset asset : datumList) { for (Asset asset : datumList) {
asset.setExhibitionBoardName(exhibitionBoard.getName()); asset.setExhibitionBoardName(exhibitionBoard.getName());
asset.setExhibitionBoardId(exhibitionBoard.getId());
} }
exhibitionBoard.setDatumList(datumList); exhibitionBoard.setDatumList(datumList);
......
...@@ -42,6 +42,7 @@ spring.datasource.druid.test-on-return=false ...@@ -42,6 +42,7 @@ spring.datasource.druid.test-on-return=false
spring.datasource.druid.test-while-idle=true spring.datasource.druid.test-while-idle=true
spring.datasource.druid.time-between-eviction-runs-millis=60000 spring.datasource.druid.time-between-eviction-runs-millis=60000
spring.datasource.druid.url=jdbc:mysql://192.168.110.93:3306/chnmuseum-party?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false&serverTimezone=Asia/Shanghai spring.datasource.druid.url=jdbc:mysql://192.168.110.93:3306/chnmuseum-party?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false&serverTimezone=Asia/Shanghai
#spring.datasource.druid.url=jdbc:mysql://10.18.121.26:3306/chnmuseum-party?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false&serverTimezone=Asia/Shanghai
spring.datasource.druid.username=root spring.datasource.druid.username=root
spring.datasource.druid.password=password spring.datasource.druid.password=password
spring.datasource.druid.validation-query=SELECT 1 FROM DUAL spring.datasource.druid.validation-query=SELECT 1 FROM DUAL
...@@ -55,7 +56,7 @@ spring.datasource.druid.validation-query-timeout=20 ...@@ -55,7 +56,7 @@ spring.datasource.druid.validation-query-timeout=20
spring.redis.database=0 spring.redis.database=0
# Redis\u670D\u52A1\u5668\u5730\u5740 # Redis\u670D\u52A1\u5668\u5730\u5740
spring.redis.host=192.168.110.93 spring.redis.host=192.168.110.93
#spring.redis.host=42.159.83.54 #spring.redis.host=10.18.121.26
# Redis\u670D\u52A1\u5668\u8FDE\u63A5\u7AEF\u53E3 # Redis\u670D\u52A1\u5668\u8FDE\u63A5\u7AEF\u53E3
spring.redis.port=6379 spring.redis.port=6379
# Redis\u670D\u52A1\u5668\u8FDE\u63A5\u5BC6\u7801\uFF08\u9ED8\u8BA4\u4E3A\u7A7A\uFF09 # Redis\u670D\u52A1\u5668\u8FDE\u63A5\u5BC6\u7801\uFF08\u9ED8\u8BA4\u4E3A\u7A7A\uFF09
......
...@@ -37,6 +37,12 @@ prefixPat=/data/fastdfs/data ...@@ -37,6 +37,12 @@ prefixPat=/data/fastdfs/data
IMAGE_BASE_URL=http://111.203.232.175:8085/ IMAGE_BASE_URL=http://111.203.232.175:8085/
#fdfs.tracker-list[0]=10.18.121.26:22122
#dfsFileAccessBasePath=http://10.18.121.26:9999
#prefixPat=/home/guobo/fastdfs/fastdfs_storage_data
#IMAGE_BASE_URL=http://10.18.121.26:9999/
######################################################## ########################################################
###Shiro ###Shiro
######################################################## ########################################################
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment