Преглед изворни кода

修改数据库以及mq配置

shenhao пре 5 година
родитељ
комит
475d5f764e

+ 3 - 4
src/main/java/com/ssj/weixin/api/reading/controller/ReadingCuratorController.java

@@ -1334,13 +1334,12 @@ public class ReadingCuratorController extends BaseController{
 
 			int maxDay = calendar.getActualMaximum(Calendar.DAY_OF_MONTH);
 			int minDay = 1;
-
+			List<VipSignDayDetailOutDto> list = libUserHistoryService.vipSignInfoList(params);
 			for (int i = minDay; i <= maxDay; i++) {
 				VipSignDetailOutDto pdto = new VipSignDetailOutDto();
 				pdto.setSignDate(month+"-"+(i<10?("0"+i):i));
 				pdto.setHasData(2);
 				List<VipSignDayDetailOutDto> cList = new ArrayList<>();
-				List<VipSignDayDetailOutDto> list = libUserHistoryService.vipSignInfoList(params);
 				if(Collections3.isNotEmpty(list)){
 					for (VipSignDayDetailOutDto dto :list){
 						if(dto.getSignDate().equals(pdto.getSignDate())){
@@ -1617,7 +1616,7 @@ public class ReadingCuratorController extends BaseController{
 			BeanUtils.copyProperties(vip,dto);
 			TbLibSubscribe sub = subService.findByVipIdAndStat(vip.getId(),"1");
 			if(sub != null ){
-				Integer ptCount2 =  libVipServiceService.getVipIdPTServiceCount(req.getVipId(),req.getVipId());
+				Integer ptCount2 =  libVipServiceService.getVipIdPTServiceCount(req.getVipId(),req.getLibId());
 				if(ptCount2 == 0){
 					dto.setHasService(2);
 				}else{
@@ -1625,7 +1624,7 @@ public class ReadingCuratorController extends BaseController{
 				}
 				dto.setType(2);
 			}else{
-				Integer ptCount2 =  libVipServiceService.getVipIdPTServiceCount(req.getVipId(),req.getVipId());
+				Integer ptCount2 =  libVipServiceService.getVipIdPTServiceCount(req.getVipId(),req.getLibId());
 				if(ptCount2 == 0){
 					dto.setHasService(2);
 				}else{

+ 2 - 2
src/main/resources/application-common-dev.properties

@@ -1,6 +1,6 @@
 #\u5F00\u53D1\u73AF\u5883\u6253\u5305\u65B9\u5F0F-\u914D\u7F6E\uFF08\u9ED8\u8BA4\uFF09
 
-spring.datasource.url=jdbc:mysql://47.112.200.206:8066/aijia?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&rewriteBatchedStatements=true
+spring.datasource.url=jdbc:mysql://172.18.106.198:8066/aijia?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&rewriteBatchedStatements=true
 spring.datasource.username=root
 spring.datasource.password=ssj1QAZxsw2!@
 #spring.datasource.url=jdbc:mysql://120.79.215.176:8066/ssj?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
@@ -51,7 +51,7 @@ spring.redis.cluster.pool.min-idle=0
 
 spring.jmx.enabled=false
 
-spring.rabbitmq.host=192.168.1.153
+spring.rabbitmq.host=172.18.121.4
 spring.rabbitmq.port=5672
 spring.rabbitmq.username=admin1
 spring.rabbitmq.password=admin1