From a59b11c1d68c1d5311edeef0d764798ad4b5182c Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期二, 12 四月 2022 09:34:07 +0800
Subject: [PATCH] Merge branch 'huacheng' into huacheng_dev
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/resources/bootstrap.yml | 8
springcloud_k8s_panzhihuazhihuishequ/auth/src/main/resources/logback-spring.xml | 2
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/ComDataStatisticsFeign.java | 2
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/message/McsOrderMessage.java | 2
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/bootstrap.yml | 8
springcloud_k8s_panzhihuazhihuishequ/shop_backstage/src/main/resources/bootstrap.yml | 2
springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/resources/bootstrap.yml | 2
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActReserveMapper.xml | 6
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java | 2
springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/resources/bootstrap.yml | 2
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/bootstrap.yml | 8
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActReserveApi.java | 22 ++-
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/ComActEasyPhotoHandlerFeign.java | 2
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActReserveAnswerContentMapper.xml | 40 ++++++
springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/netty/NettyServerHandler.java | 2
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/bootstrap.yml | 2
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActivityVO.java | 4
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/resources/logback-spring.xml | 2
springcloud_k8s_panzhihuazhihuishequ/zuul/src/main/resources/bootstrap.yml | 10
springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/resources/logback-spring.xml | 2
springcloud_k8s_panzhihuazhihuishequ/zuul/src/main/java/com/panzhihua/zuul/config/AppletWebSecurityConfigurationAdapter.java | 2
springcloud_k8s_panzhihuazhihuishequ/deploy-file/config-server.yaml | 6
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/logback-spring.xml | 2
springcloud_k8s_panzhihuazhihuishequ/auth/src/main/resources/bootstrap.yml | 8
springcloud_k8s_panzhihuazhihuishequ/zuul/src/main/resources/logback-spring.xml | 2
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/reserve/FiveCount.java | 15 ++
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActReserveAnswerContentMapper.java | 8 +
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/auth/TokenService.java | 2
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/message/OrderMessage.java | 2
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveRecordServiceImpl.java | 10 +
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActEasyPhotoServiceImpl.java | 4
springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/resources/bootstrap.yml | 8
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/RentingHourseOrderServiceImpl.java | 4
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/reserve/PageReserveRegisterDetailedAdminDTO.java | 6 +
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java | 5
springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/resources/bootstrap.yml | 2
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/PartyBuildingApi.java | 1
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActReserveRecordService.java | 6 +
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/resources/logback-spring.xml | 2
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/config/RabbitmqConfig.java | 24 ++--
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/ComPbCheckUnitFeign.java | 2
springcloud_k8s_panzhihuazhihuishequ/service_api/src/main/resources/bootstrap.yml | 2
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveAnswerContentServiceImpl.java | 9 +
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/resources/logback-spring.xml | 2
springcloud_k8s_panzhihuazhihuishequ/config_server/src/main/resources/logback-spring.xml | 2
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/AssemblyUtils.java | 2
springcloud_k8s_panzhihuazhihuishequ/timejob/src/main/resources/bootstrap.yml | 4
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/resources/bootstrap.yml | 8
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActActivityDO.java | 4
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/logback-spring.xml | 2
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/message/PreOrderMessage.java | 2
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/McsOrderServiceImpl.java | 2
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActReserveApi.java | 5
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/resources/bootstrap.yml | 8
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActRaffleServiceImpl.java | 2
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/message/RaffleMessage.java | 8
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/PartyBuildingService.java | 2
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/ComActEasyPhotoEvaluateFeign.java | 2
springcloud_k8s_panzhihuazhihuishequ/config_server/src/main/resources/application.yml | 8
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/property/PropertyService.java | 2
60 files changed, 216 insertions(+), 111 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/PartyBuildingApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/PartyBuildingApi.java
index 9969167..2e49d68 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/PartyBuildingApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/PartyBuildingApi.java
@@ -276,7 +276,6 @@
}
return pbCheckUnitFeign.queryByList(comPbCheckUnit);
}
-
@OperLog(operModul = "党员管理", operType = 1)
@ApiOperation(value = "新增党员")
@PostMapping("addpartybuildingmember")
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/resources/bootstrap.yml b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/resources/bootstrap.yml
index 6e1590b..b2fa9bc 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/resources/bootstrap.yml
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/resources/bootstrap.yml
@@ -1,13 +1,13 @@
spring:
application:
- name: applets
+ name: huacheng-applets
cloud:
config:
discovery:
enabled: true
- service-id: config # 注册中心的服务名
+ service-id: huacheng-config # 注册中心的服务名
profile: ${ENV:dev} # 指定配置文件的环境
- uri: http://${CONFIG_URL:localhost}:8193/
+ uri: http://${CONFIG_URL:localhost}:6193/
profiles:
active: ${ENV:dev}
servlet:
@@ -41,5 +41,5 @@
metrics:
tags:
- application: applets
+ application: huacheng-applets
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/resources/logback-spring.xml b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/resources/logback-spring.xml
index 9f9bb56..99cb522 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/resources/logback-spring.xml
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/resources/logback-spring.xml
@@ -19,7 +19,7 @@
<appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<!--日志文件输出的文件名-->
- <FileNamePattern>${LOG_HOME}/applets.log.%d{yyyy-MM-dd}.log</FileNamePattern>
+ <FileNamePattern>${LOG_HOME}/huachengapplets.log.%d{yyyy-MM-dd}.log</FileNamePattern>
<!--日志文件保留天数-->
<MaxHistory>30</MaxHistory>
</rollingPolicy>
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/resources/bootstrap.yml b/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/resources/bootstrap.yml
index 0ec1fd5..9175a3d 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/resources/bootstrap.yml
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/resources/bootstrap.yml
@@ -1,13 +1,13 @@
spring:
application:
- name: appletsbackstage
+ name: huacheng-appletsbackstage
cloud:
config:
discovery:
enabled: true
- service-id: config # 注册中心的服务名
+ service-id: huacheng-config # 注册中心的服务名
profile: ${ENV:dev} # 指定配置文件的环境
- uri: http://${CONFIG_URL:localhost}:8193/
+ uri: http://${CONFIG_URL:localhost}:6193/
profiles:
active: ${ENV:dev}
servlet:
@@ -32,7 +32,7 @@
metrics:
tags:
- application: appletsbackstage
+ application: huacheng-appletsbackstage
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/resources/logback-spring.xml b/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/resources/logback-spring.xml
index d4d42cb..9fc7e80 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/resources/logback-spring.xml
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/resources/logback-spring.xml
@@ -19,7 +19,7 @@
<appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<!--日志文件输出的文件名-->
- <FileNamePattern>${LOG_HOME}/applets_backstage.log.%d{yyyy-MM-dd}.log</FileNamePattern>
+ <FileNamePattern>${LOG_HOME}/huachengapplets_backstage.log.%d{yyyy-MM-dd}.log</FileNamePattern>
<!--日志文件保留天数-->
<MaxHistory>30</MaxHistory>
</rollingPolicy>
diff --git a/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/resources/bootstrap.yml b/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/resources/bootstrap.yml
index de1c248..b15cdd5 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/resources/bootstrap.yml
+++ b/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/resources/bootstrap.yml
@@ -1,13 +1,13 @@
spring:
application:
- name: auth
+ name: huacheng-auth
cloud:
config:
discovery:
enabled: true
- service-id: config # 注册中心的服务名
+ service-id: huacheng-config # 注册中心的服务名
profile: ${ENV:dev} # 指定配置文件的环境
- uri: http://${CONFIG_URL:localhost}:8193/
+ uri: http://${CONFIG_URL:localhost}:6193/
profiles:
active: ${ENV:dev}
@@ -29,4 +29,4 @@
metrics:
tags:
- application: auth
\ No newline at end of file
+ application: huacheng-auth
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/resources/logback-spring.xml b/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/resources/logback-spring.xml
index 69a0126..8b7fc35 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/resources/logback-spring.xml
+++ b/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/resources/logback-spring.xml
@@ -19,7 +19,7 @@
<appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<!--日志文件输出的文件名-->
- <FileNamePattern>${LOG_HOME}/auth.log.%d{yyyy-MM-dd}.log</FileNamePattern>
+ <FileNamePattern>${LOG_HOME}/huachengauth.log.%d{yyyy-MM-dd}.log</FileNamePattern>
<!--日志文件保留天数-->
<MaxHistory>30</MaxHistory>
</rollingPolicy>
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/reserve/PageReserveRegisterDetailedAdminDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/reserve/PageReserveRegisterDetailedAdminDTO.java
index c6f085b..bead420 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/reserve/PageReserveRegisterDetailedAdminDTO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/reserve/PageReserveRegisterDetailedAdminDTO.java
@@ -37,4 +37,10 @@
@ApiModelProperty(value = "类型 1燃气 2防火")
private Integer pdfType;
+ @ApiModelProperty(value = "省市区")
+ private String area;
+
+ @ApiModelProperty(value = "出发地")
+ private String from;
+
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActivityVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActivityVO.java
index 14b95fb..ed9a645 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActivityVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActivityVO.java
@@ -285,4 +285,8 @@
private Integer signCount;
private Integer registerCount;
+
+ private Integer isArticle;
+
+ private String jumpArticleUrl;
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/reserve/FiveCount.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/reserve/FiveCount.java
new file mode 100644
index 0000000..bd60573
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/reserve/FiveCount.java
@@ -0,0 +1,15 @@
+package com.panzhihua.common.model.vos.community.reserve;
+
+import lombok.Data;
+
+/**
+ * @author zzj
+ */
+@Data
+public class FiveCount {
+ private Integer allCount;
+ private Integer dangerCount;
+ private Integer redMark;
+ private Integer yellowMark;
+ private Integer greenMark;
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/auth/TokenService.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/auth/TokenService.java
index ccd4d75..8aea73b 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/auth/TokenService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/auth/TokenService.java
@@ -12,7 +12,7 @@
* @author: huang.hongfa weixin hhf9596 qq 959656820
* @create: 2020-11-24 09:18
**/
-@FeignClient(name = "auth")
+@FeignClient(name = "huacheng-auth")
public interface TokenService {
/**
* 小程序用户登录
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/ComActEasyPhotoEvaluateFeign.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/ComActEasyPhotoEvaluateFeign.java
index 8f3a6c0..c86b569 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/ComActEasyPhotoEvaluateFeign.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/ComActEasyPhotoEvaluateFeign.java
@@ -16,7 +16,7 @@
* @author lyq
* @date 2022-03-01 13:44:43
*/
-@FeignClient(name = Constants.SERVICE_COMMUNITY, contextId = "comActEasyPhotoEvaluate", path = "comActEasyPhotoEvaluate")
+@FeignClient(name = "huacheng-community", contextId = "comActEasyPhotoEvaluate", path = "comActEasyPhotoEvaluate")
public interface ComActEasyPhotoEvaluateFeign {
/**
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/ComActEasyPhotoHandlerFeign.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/ComActEasyPhotoHandlerFeign.java
index fc99bac..744a2f1 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/ComActEasyPhotoHandlerFeign.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/ComActEasyPhotoHandlerFeign.java
@@ -16,7 +16,7 @@
* @author lyq
* @date 2022-03-01 13:45:12
*/
-@FeignClient(name = Constants.SERVICE_COMMUNITY, contextId = "comActEasyPhotoHandler", path = "comActEasyPhotoHandler")
+@FeignClient(name = "huacheng-community", contextId = "comActEasyPhotoHandler", path = "comActEasyPhotoHandler")
public interface ComActEasyPhotoHandlerFeign {
/**
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
index 710b157..e872e3f 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
@@ -420,7 +420,7 @@
* @author: huang.hongfa weixin hhf9596 qq 959656820
* @create: 2020-12-07 15:59
**/
-@FeignClient(name = "community")
+@FeignClient(name = "huacheng-community")
public interface CommunityService {
/**
* 新增社区活动
@@ -9496,6 +9496,9 @@
@PostMapping("/comActEasyPhotoHandler/edit")
R editEasyPhotoHandler(@RequestBody EditComActEasyPhotoHandlerDto comActEasyPhotoHandler);
+ @GetMapping("/reserve/fiveCount")
+ R fiveCount(@RequestParam("reserveId") Long reserveId);
+
/**
* 分页查询所有数据
*
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/ComDataStatisticsFeign.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/ComDataStatisticsFeign.java
index c18f285..8d1219c 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/ComDataStatisticsFeign.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/ComDataStatisticsFeign.java
@@ -21,7 +21,7 @@
* @author lyq
* @date 2022-02-16 16:22:48
*/
-@FeignClient(name = Constants.SERVICE_PARTYBUILDING, contextId = "comDataStatistics", path = "comDataStatistics")
+@FeignClient(name = "huacheng-partybuilding", contextId = "comDataStatistics", path = "comDataStatistics")
public interface ComDataStatisticsFeign {
/**
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/ComPbCheckUnitFeign.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/ComPbCheckUnitFeign.java
index 874c113..de63dc1 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/ComPbCheckUnitFeign.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/ComPbCheckUnitFeign.java
@@ -19,7 +19,7 @@
* @author lyq
* @date 2022-02-16 16:22:48
*/
-@FeignClient(name = Constants.SERVICE_PARTYBUILDING, contextId = "comPbCheckUnit", path = "comPbCheckUnit")
+@FeignClient(name = "huacheng-partybuilding", contextId = "comPbCheckUnit", path = "comPbCheckUnit")
public interface ComPbCheckUnitFeign {
/**
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/PartyBuildingService.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/PartyBuildingService.java
index eded3bb..ee328b3 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/PartyBuildingService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/PartyBuildingService.java
@@ -19,7 +19,7 @@
* @author: huang.hongfa weixin hhf9596 qq 959656820
* @create: 2020-11-30 09:50
**/
-@FeignClient(value = "partybuilding")
+@FeignClient(value = "huacheng-partybuilding")
public interface PartyBuildingService {
/**
* 新增党员
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/property/PropertyService.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/property/PropertyService.java
index 1ff01ec..80d1fae 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/property/PropertyService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/property/PropertyService.java
@@ -11,7 +11,7 @@
/**
* 物业接口
*/
-@FeignClient(name = "property")
+@FeignClient(name = "huacheng-property")
public interface PropertyService {
/**
* 分页查询所有数据
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java
index 81bd154..aaefa08 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java
@@ -29,7 +29,7 @@
* @author: huang.hongfa weixin hhf9596 qq 959656820
* @create: 2020-11-24 08:58
**/
-@FeignClient(name = "user")
+@FeignClient(name = "huacheng-user")
public interface UserService {
/**
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/AssemblyUtils.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/AssemblyUtils.java
index d973a61..8e2fda9 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/AssemblyUtils.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/AssemblyUtils.java
@@ -33,7 +33,7 @@
//构建单个用户数据
List<Object> userData = new ArrayList<>();
- String noExport = "以上信息仅用于";
+ String noExport = "本人对信息内容";
//遍历答案列表
Long reserveRecordId = 0L;
Long reserveSubId = 0L;
diff --git a/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActReserveApi.java b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActReserveApi.java
index 6a071f4..897b4c4 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActReserveApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComActReserveApi.java
@@ -499,14 +499,14 @@
if (loginUserInfo == null) {
return R.fail("请先登录");
}
- String regionCode = communityService.getActBelongRegionCode(loginUserInfo.getCommunityId());
- if (regionCode.equals("510411")) {
- ComActReserveDetailAdminVO reserverRecord =
- communityService.detailReserveAdmin(pageReserveRegisterDetailedAdminDTO.getReserveId()).getData();
- if (reserverRecord.getTitle().equals("返攀登记")) {
- return renheExportRegister(pageReserveRegisterDetailedAdminDTO);
- }
- }
+// String regionCode = communityService.getActBelongRegionCode(loginUserInfo.getCommunityId());
+// if (regionCode.equals("510411")) {
+// ComActReserveDetailAdminVO reserverRecord =
+// communityService.detailReserveAdmin(pageReserveRegisterDetailedAdminDTO.getReserveId()).getData();
+// if (reserverRecord.getTitle().equals("返攀登记")) {
+// return renheExportRegister(pageReserveRegisterDetailedAdminDTO);
+// }
+// }
String ftpUrl = "/mnt/data/web/excel/";
String name = "登记明细导出数据.xlsx";
String noHaed = "承诺";
@@ -1061,4 +1061,10 @@
public R deleteRecord(@RequestParam("recordId") Long recordId) {
return communityService.deleteRecord(recordId);
}
+
+ @ApiOperation("5个常规查询")
+ @GetMapping("/fiveCount")
+ public R fiveCount(@RequestParam("reserveId") Long reserveId){
+ return communityService.fiveCount(reserveId);
+ }
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/resources/bootstrap.yml b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/resources/bootstrap.yml
index 7f4e139..2649eab 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/resources/bootstrap.yml
+++ b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/resources/bootstrap.yml
@@ -1,13 +1,13 @@
spring:
application:
- name: communitybackstage
+ name: huacheng-communitybackstage
cloud:
config:
discovery:
enabled: true
- service-id: config # 注册中心的服务名
+ service-id: huacheng-config # 注册中心的服务名
profile: ${ENV:dev} # 指定配置文件的环境
- uri: http://${CONFIG_URL:localhost}:8193/
+ uri: http://${CONFIG_URL:localhost}:6193/
profiles:
active: ${ENV:dev}
servlet:
@@ -32,4 +32,4 @@
metrics:
tags:
- application: communitybackstage
\ No newline at end of file
+ application: huacheng-communitybackstage
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/resources/logback-spring.xml b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/resources/logback-spring.xml
index dd1f87e..55f0540 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/resources/logback-spring.xml
+++ b/springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/resources/logback-spring.xml
@@ -19,7 +19,7 @@
<appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<!--日志文件输出的文件名-->
- <FileNamePattern>${LOG_HOME}/community_backstage.log.%d{yyyy-MM-dd}.log</FileNamePattern>
+ <FileNamePattern>${LOG_HOME}/huachengcommunity_backstage.log.%d{yyyy-MM-dd}.log</FileNamePattern>
<!--日志文件保留天数-->
<MaxHistory>30</MaxHistory>
</rollingPolicy>
diff --git a/springcloud_k8s_panzhihuazhihuishequ/config_server/src/main/resources/application.yml b/springcloud_k8s_panzhihuazhihuishequ/config_server/src/main/resources/application.yml
index 183a9f7..0caf088 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/config_server/src/main/resources/application.yml
+++ b/springcloud_k8s_panzhihuazhihuishequ/config_server/src/main/resources/application.yml
@@ -1,6 +1,5 @@
-
server:
- port: 8193
+ port: 6193
servlet:
encoding:
force-response: true #中文乱码
@@ -14,7 +13,7 @@
spring:
application:
- name: config
+ name: huacheng-config
cloud:
config:
@@ -24,6 +23,7 @@
# search-paths: adminConfig
username: huanghongfa
password: huanghongfa123456
+ default-label: huacheng
# basedir: F:\nahan\config-repo\config-repo
#spring:
@@ -49,4 +49,4 @@
metrics:
tags:
- application: config
\ No newline at end of file
+ application: huacheng-config
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/config_server/src/main/resources/logback-spring.xml b/springcloud_k8s_panzhihuazhihuishequ/config_server/src/main/resources/logback-spring.xml
index 6fa8c40..5fd1d7b 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/config_server/src/main/resources/logback-spring.xml
+++ b/springcloud_k8s_panzhihuazhihuishequ/config_server/src/main/resources/logback-spring.xml
@@ -19,7 +19,7 @@
<appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<!--日志文件输出的文件名-->
- <FileNamePattern>${LOG_HOME}/config_server.log.%d{yyyy-MM-dd}.log</FileNamePattern>
+ <FileNamePattern>${LOG_HOME}/huachengconfig_server.log.%d{yyyy-MM-dd}.log</FileNamePattern>
<!--日志文件保留天数-->
<MaxHistory>30</MaxHistory>
</rollingPolicy>
diff --git a/springcloud_k8s_panzhihuazhihuishequ/deploy-file/config-server.yaml b/springcloud_k8s_panzhihuazhihuishequ/deploy-file/config-server.yaml
index 1dcce2f..da1980e 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/deploy-file/config-server.yaml
+++ b/springcloud_k8s_panzhihuazhihuishequ/deploy-file/config-server.yaml
@@ -36,7 +36,7 @@
ports:
- - containerPort: 8193
+ - containerPort: 6193
env:
- name: EUREKA_URL
value: eureka-server
@@ -51,8 +51,8 @@
name: config-server
spec:
ports:
- - port: 8193
- targetPort: 8193
+ - port: 6193
+ targetPort: 6193
name: http
#nodePort: 31072
selector:
diff --git a/springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/resources/bootstrap.yml b/springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/resources/bootstrap.yml
index 0c315f2..1d6c32a 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/resources/bootstrap.yml
+++ b/springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/resources/bootstrap.yml
@@ -7,7 +7,7 @@
enabled: true
service-id: config # 注册中心的服务名
profile: ${ENV:dev} # 指定配置文件的环境
- uri: http://${CONFIG_URL:localhost}:8193/
+ uri: http://${CONFIG_URL:localhost}:6193/
profiles:
active: ${ENV:dev}
servlet:
diff --git a/springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/resources/bootstrap.yml b/springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/resources/bootstrap.yml
index cc427c1..3e9c6b5 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/resources/bootstrap.yml
+++ b/springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/resources/bootstrap.yml
@@ -7,7 +7,7 @@
enabled: true
service-id: config # 注册中心的服务名
profile: ${ENV:dev} # 指定配置文件的环境
- uri: http://${CONFIG_URL:localhost}:8193/
+ uri: http://${CONFIG_URL:localhost}:6193/
profiles:
active: ${ENV:dev}
servlet:
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_api/src/main/resources/bootstrap.yml b/springcloud_k8s_panzhihuazhihuishequ/service_api/src/main/resources/bootstrap.yml
index 7379ba7..dd47d64 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_api/src/main/resources/bootstrap.yml
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_api/src/main/resources/bootstrap.yml
@@ -7,7 +7,7 @@
enabled: true
service-id: config # 注册中心的服务名
profile: ${ENV:dev} # 指定配置文件的环境
- uri: http://${CONFIG_URL:localhost}:8193/
+ uri: http://${CONFIG_URL:localhost}:6193/
profiles:
active: ${ENV:dev}
servlet:
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActReserveApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActReserveApi.java
index 476aa48..59127d5 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActReserveApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActReserveApi.java
@@ -378,4 +378,9 @@
public R deleteRecord(@RequestParam("recordId")Long recordId){
return R.ok(comActReserveRecordService.removeById(recordId));
}
+
+ @GetMapping("/fiveCount")
+ public R fiveCount(@RequestParam("reserveId") Long reserveId){
+ return comActReserveRecordService.fiveCount(reserveId);
+ }
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/config/RabbitmqConfig.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/config/RabbitmqConfig.java
index 0f405e8..279e017 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/config/RabbitmqConfig.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/config/RabbitmqConfig.java
@@ -13,21 +13,21 @@
public class RabbitmqConfig {
- public static final String PreOrder_QUEUE="preOrder.queue";
- public static final String PreOrder_ROUTING_KEY="preOrder.key";
- public static final String PreOrder_EXCHANGE="preOrder.exchange";
+ public static final String PreOrder_QUEUE="huacheng.preOrder.queue";
+ public static final String PreOrder_ROUTING_KEY="huacheng.preOrder.key";
+ public static final String PreOrder_EXCHANGE="huacheng.preOrder.exchange";
- public static final String Order_QUEUE="order.queue";
- public static final String Order_ROUTING_KEY="order.key";
- public static final String Order_EXCHANGE="order.exchange";
+ public static final String Order_QUEUE="huacheng.order.queue";
+ public static final String Order_ROUTING_KEY="huacheng.order.key";
+ public static final String Order_EXCHANGE="huacheng.order.exchange";
- public static final String RAFFLE_QUEUE="raffle.queue";
- public static final String RAFFLE_ROUTING_KEY="raffle.key";
- public static final String RAFFLE_EXCHANGE="raffle.exchange";
+ public static final String RAFFLE_QUEUE="huacheng.raffle.queue";
+ public static final String RAFFLE_ROUTING_KEY="huacheng.raffle.key";
+ public static final String RAFFLE_EXCHANGE="huacheng.raffle.exchange";
- public static final String McsOrder_QUEUE="mcsOrder.queue";
- public static final String McsOrder_ROUTING_KEY="mcsOrder.key";
- public static final String McsOrder_EXCHANGE="mcsOrder.exchange";
+ public static final String McsOrder_QUEUE="huacheng.mcsOrder.queue";
+ public static final String McsOrder_ROUTING_KEY="huacheng.mcsOrder.key";
+ public static final String McsOrder_EXCHANGE="huacheng.mcsOrder.exchange";
@Bean
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActReserveAnswerContentMapper.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActReserveAnswerContentMapper.java
index 113b6e1..8ef30db 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActReserveAnswerContentMapper.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActReserveAnswerContentMapper.java
@@ -7,6 +7,7 @@
import com.panzhihua.common.model.vos.community.ComActQuestnaireAnswerContentVO;
import com.panzhihua.common.model.vos.community.reserve.ComActReserveRegisterDetailedAnswerVO;
import com.panzhihua.common.model.vos.community.reserve.ComActReserveRegisterDetailedVO;
+import com.panzhihua.common.model.vos.community.reserve.FiveCount;
import com.panzhihua.common.model.vos.community.reserve.HomeQuarantineRegisterStatisticsVO;
import com.panzhihua.service_community.model.dos.ComActReserveAnswerContentDO;
import org.apache.ibatis.annotations.Mapper;
@@ -68,4 +69,11 @@
* @return
*/
List<String> exportHomeQuarantine(@Param("detailedAdminDTO") PageReserveRegisterDetailedAdminDTO detailedAdminDTO);
+
+ /**
+ * 5个常规数据查询
+ * @param reserveId
+ * @return
+ */
+ FiveCount fiveCount(Long reserveId);
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/message/McsOrderMessage.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/message/McsOrderMessage.java
index 198e412..a31bab0 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/message/McsOrderMessage.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/message/McsOrderMessage.java
@@ -12,7 +12,7 @@
*/
@Component
public class McsOrderMessage {
- public static final String DELAYED_QUEUE="mcsOrder.queue";
+ public static final String DELAYED_QUEUE="huacheng.mcsOrder.queue";
@Resource
private McsOrderDao mcsOrderDao;
@RabbitListener(queues=DELAYED_QUEUE)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/message/OrderMessage.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/message/OrderMessage.java
index ca19cb9..a39863e 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/message/OrderMessage.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/message/OrderMessage.java
@@ -17,7 +17,7 @@
*/
@Component
public class OrderMessage {
- public static final String DELAYED_QUEUE="order.queue";
+ public static final String DELAYED_QUEUE="huacheng.order.queue";
@Resource
private RentingHourseOrderDao rentingHourseOrderDao;
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/message/PreOrderMessage.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/message/PreOrderMessage.java
index 35fe51d..a9132f1 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/message/PreOrderMessage.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/message/PreOrderMessage.java
@@ -15,7 +15,7 @@
*/
@Component
public class PreOrderMessage {
- public static final String DELAYED_QUEUE="preOrder.queue";
+ public static final String DELAYED_QUEUE="huacheng.preOrder.queue";
@Resource
private RentingHoursePreOrderDao rentingHoursePreOrderDao;
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/message/RaffleMessage.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/message/RaffleMessage.java
index bc446b7..bae83ae 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/message/RaffleMessage.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/message/RaffleMessage.java
@@ -26,7 +26,7 @@
*/
@Component
public class RaffleMessage {
- public static final String DELAYED_QUEUE="raffle.queue";
+ public static final String DELAYED_QUEUE="huacheng.raffle.queue";
@Resource
private ComActRaffleDao comActRaffleDao;
@@ -66,7 +66,7 @@
}
comActRaffle.setStatus(3);
comActRaffleDao.updateById(comActRaffle);
- rabbitTemplate.convertAndSend("raffle.exchange", "raffle.key", comActRaffleVO, message -> {
+ rabbitTemplate.convertAndSend("huacheng.raffle.exchange", "huacheng.raffle.key", comActRaffleVO, message -> {
message.getMessageProperties().setHeader("x-delay", dateToSecond(comActRaffle.getRaffleStopTime()));
return message;
});
@@ -74,7 +74,7 @@
if(comActRaffle!=null&&comActRaffle.getStatus()==0&&comActRaffle.getStartTime().before(new Date())){
comActRaffle.setStatus(1);
comActRaffleDao.updateById(comActRaffle);
- rabbitTemplate.convertAndSend("raffle.exchange", "raffle.key", comActRaffleVO, message -> {
+ rabbitTemplate.convertAndSend("huacheng.raffle.exchange", "huacheng.raffle.key", comActRaffleVO, message -> {
message.getMessageProperties().setHeader("x-delay", dateToSecond(comActRaffle.getStopTime()));
return message;
});
@@ -82,7 +82,7 @@
if(comActRaffle!=null&&comActRaffle.getStatus()==1&&comActRaffle.getStopTime().before(new Date())){
comActRaffle.setStatus(2);
comActRaffleDao.updateById(comActRaffle);
- rabbitTemplate.convertAndSend("raffle.exchange", "raffle.key", comActRaffleVO, message -> {
+ rabbitTemplate.convertAndSend("huacheng.raffle.exchange", "huacheng.raffle.key", comActRaffleVO, message -> {
message.getMessageProperties().setHeader("x-delay", dateToSecond(comActRaffle.getLotteryTime()));
return message;
});
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActActivityDO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActActivityDO.java
index 63c01a5..f1e9970 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActActivityDO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActActivityDO.java
@@ -243,4 +243,8 @@
* 单次活动时长（小时）
*/
private Integer duration;
+
+ private Integer isArticle;
+
+ private String jumpArticleUrl;
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActReserveRecordService.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActReserveRecordService.java
index 72afb21..78e716e 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActReserveRecordService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActReserveRecordService.java
@@ -82,4 +82,10 @@
R registerDetailedDetailAdmin(Long reserveRecordId);
+ /**
+ * 5个常规查询
+ * @param reserveId
+ * @return
+ */
+ R fiveCount(Long reserveId);
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActEasyPhotoServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActEasyPhotoServiceImpl.java
index ad39714..cdd0400 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActEasyPhotoServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActEasyPhotoServiceImpl.java
@@ -309,7 +309,6 @@
} else {
cmActEasyPhotoDO.setIsReportUrban(ComActEasyPhotoVO.isReportUrban.no);
}
- cmActEasyPhotoDO.setHandlerId(comActEasyPhotoVO.getHandlerId());
cmActEasyPhotoDO.setExamineAt(nowDate);
cmActEasyPhotoDO.setActivityType(comActEasyPhotoVO.getActivityType());
if (StringUtils.isNotEmpty(comActEasyPhotoVO.getHandleResult())
@@ -330,7 +329,8 @@
//添加分配人员
if(comActEasyPhotoVO.getHandleList() != null && comActEasyPhotoVO.getHandleList().size() > 0){
comActEasyPhotoVO.getHandleList().forEach(handle -> {
- easyPhotoHandlerService.addHandleRecord(cmActEasyPhotoDO.getCommunityId(),comActEasyPhotoVO.getUserId()
+ cmActEasyPhotoDO.setHandlerId(handle.getUserId());
+ easyPhotoHandlerService.addHandleRecord(cmActEasyPhotoDO.getCommunityId(),handle.getUserId()
,cmActEasyPhotoDO.getId(),handle.getType(), ComActEasyPhotoHandler.ServiceType.SSP,comActEasyPhotoVO.getSponsorId());
});
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActRaffleServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActRaffleServiceImpl.java
index 08139d6..fb6bddf 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActRaffleServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActRaffleServiceImpl.java
@@ -59,7 +59,7 @@
comActRaffle.setStatus(0);
int count= this.baseMapper.insert(comActRaffle);
if(count>0){
- rabbitTemplate.convertAndSend("raffle.exchange", "raffle.key", comActRaffle, message -> {
+ rabbitTemplate.convertAndSend("huacheng.raffle.exchange", "huacheng.raffle.key", comActRaffle, message -> {
message.getMessageProperties().setHeader("x-delay", dateToSecond(comActRaffle.getStartTime()));
return message;
});
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveAnswerContentServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveAnswerContentServiceImpl.java
index ffb9ec1..1ba4fac 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveAnswerContentServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveAnswerContentServiceImpl.java
@@ -69,6 +69,11 @@
//查询用户回答
List<ComActQuestnaireAnswerContentVO> vos = this.baseMapper.export(pageReserveRegisterDetailedAdminDTO);
+ vos.forEach(vo->{
+ if(vo.getType()==4){
+ vo.setAnswerContent(vo.getAnswerContent().replaceAll("(?<=\\w{3})\\w(?=\\w{4})", "*"));
+ }
+ });
result.setAnswers(vos);
return R.ok(result);
@@ -104,6 +109,9 @@
List<ComActReserveRegisterDetailedAnswerVO> registerDetailedAnswerList = this.baseMapper.getRegisterDetailedAnswerList(registerDetailed.getId());
if(!registerDetailedAnswerList.isEmpty()){
for (ComActReserveRegisterDetailedAnswerVO detailed:registerDetailedAnswerList) {
+ if(detailed.getType()==4){
+ detailed.setAnswerContent(detailed.getAnswerContent().replaceAll("(?<=\\w{3})\\w(?=\\w{4})", "*"));
+ }
if(!detailed.getType().equals(5)){
if(detailed.getType().equals(1)){
String key = detailed.getReserveSubId() + "";
@@ -118,6 +126,7 @@
map.put(detailed.getReserveSubId() + "",detailed.getAnswerContent());
}
}
+
}
}
//渲染登记流水号
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveRecordServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveRecordServiceImpl.java
index 47f3403..b3b11ef 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveRecordServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActReserveRecordServiceImpl.java
@@ -327,9 +327,19 @@
registerDetailedVO.setIdentity(identity.substring(0,identity.length()-1));
//查询答题数据
List<ComActReserveRegisterDetailedAnswerVO> answerList = comActReserveAnswerContentMapper.getRegisterDetailedAnswerList(reserveRecordId);
+ answerList.forEach(answer ->{
+ if(answer.getType()==4){
+ answer.setAnswerContent(answer.getAnswerContent().replaceAll("(?<=\\w{3})\\w(?=\\w{4})", "*"));
+ }
+ });
registerDetailedVO.setAnswerList(answerList);
}
return R.ok(registerDetailedVO);
}
+ @Override
+ public R fiveCount(Long reserveId) {
+ return R.ok(comActReserveAnswerContentMapper.fiveCount(reserveId));
+ }
+
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/McsOrderServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/McsOrderServiceImpl.java
index d519b32..b8c4da8 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/McsOrderServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/McsOrderServiceImpl.java
@@ -80,7 +80,7 @@
mcsOrder.setCreateTime(new Date());
mcsOrder.setOrderNo(DateUtils.getCurrentDateStrNoSignal());
this.baseMapper.insert(mcsOrder);
- rabbitTemplate.convertAndSend("mcsOrder.exchange", "mcsOrder.key", mcsOrder, message -> {
+ rabbitTemplate.convertAndSend("huacheng.mcsOrder.exchange", "huacheng.mcsOrder.key", mcsOrder, message -> {
message.getMessageProperties().setHeader("x-delay", 1000 * 1800);
return message;
});
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/RentingHourseOrderServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/RentingHourseOrderServiceImpl.java
index 2b7eaa2..784653e 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/RentingHourseOrderServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/RentingHourseOrderServiceImpl.java
@@ -115,7 +115,7 @@
rentingHourseRegister.setStatus(2);
rentingHourseRegister.setDetailStatus(4);
rentingHourseRegisterDao.updateById(rentingHourseRegister);
- rabbitTemplate.convertAndSend("order.exchange", "order.key", rentingHourseOrder, message -> {
+ rabbitTemplate.convertAndSend("huacheng.order.exchange", "huacheng.order.key", rentingHourseOrder, message -> {
message.getMessageProperties().setHeader("x-delay", dateToSecond(DateUtil.endOfDay(DateUtil.date())) * 1000 * 3600);
return message;
});
@@ -128,7 +128,7 @@
rentingHourseRegister.setStatus(2);
rentingHourseRegister.setDetailStatus(4);
rentingHourseRegisterDao.updateById(rentingHourseRegister);
- rabbitTemplate.convertAndSend("preOrder.exchange", "preOrder.key", rentingHoursePreOrder, message -> {
+ rabbitTemplate.convertAndSend("huacheng.preOrder.exchange", "huacheng.preOrder.key", rentingHoursePreOrder, message -> {
message.getMessageProperties().setHeader("x-delay", dateToSecond(rentingHoursePreOrder.getExpireDate()) * 1000 * 3600);
return message;
});
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/bootstrap.yml b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/bootstrap.yml
index 4fb0fc1..71111a2 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/bootstrap.yml
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/bootstrap.yml
@@ -1,13 +1,13 @@
spring:
application:
- name: community
+ name: huacheng-community
cloud:
config:
discovery:
enabled: true
- service-id: config # 注册中心的服务名
+ service-id: huacheng-config # 注册中心的服务名
profile: ${ENV:dev} # 指定配置文件的环境
- uri: http://${CONFIG_URL:localhost}:8193/
+ uri: http://${CONFIG_URL:localhost}:6193/
profiles:
active: ${ENV:dev}
servlet:
@@ -40,4 +40,4 @@
metrics:
tags:
- application: community
\ No newline at end of file
+ application: huacheng-community
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/logback-spring.xml b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/logback-spring.xml
index a9d9b88..3289870 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/logback-spring.xml
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/logback-spring.xml
@@ -19,7 +19,7 @@
<appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<!--日志文件输出的文件名-->
- <FileNamePattern>${LOG_HOME}/service_community.log.%d{yyyy-MM-dd}.log</FileNamePattern>
+ <FileNamePattern>${LOG_HOME}/huachengservice_community.log.%d{yyyy-MM-dd}.log</FileNamePattern>
<!--日志文件保留天数-->
<MaxHistory>30</MaxHistory>
</rollingPolicy>
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActReserveAnswerContentMapper.xml b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActReserveAnswerContentMapper.xml
index e8813fe..dd3611f 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActReserveAnswerContentMapper.xml
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActReserveAnswerContentMapper.xml
@@ -62,7 +62,13 @@
AND STR_TO_DATE(carac.answer_content,'%Y-%m-%d %H:%i:%s') <![CDATA[ <= ]]> #{detailedAdminDTO.stopTime}
</if>
<if test="detailedAdminDTO.keyword!=null and detailedAdminDTO.keyword != """>
- AND carac.answer_content like concat ('%',#{detailedAdminDTO.keyword},'%')
+ AND carr.json_object like concat ('%',#{detailedAdminDTO.keyword},'%')
+ </if>
+ <if test="detailedAdminDTO.area!=null and detailedAdminDTO.area != """>
+ AND JSON_EXTRACT(json_object, '$[6].values') like concat ('%',#{detailedAdminDTO.area},'%')
+ </if>
+ <if test="detailedAdminDTO.from!=null and detailedAdminDTO.from != """>
+ AND JSON_EXTRACT(json_object, '$[3].values') like concat ('%',#{detailedAdminDTO.from},'%')
</if>
group by carr.id order by carr.id desc
</select>
@@ -92,7 +98,10 @@
AND STR_TO_DATE(carac.answer_content,'%Y-%m-%d %H:%i:%s') <![CDATA[ <= ]]> #{detailedAdminDTO.stopTime}
</if>
<if test="detailedAdminDTO.keyword!=null and detailedAdminDTO.keyword != """>
- AND carac.answer_content like concat ('%',#{detailedAdminDTO.keyword},'%')
+ AND carr.json_object like concat ('%',#{detailedAdminDTO.keyword},'%')
+ </if>
+ <if test="detailedAdminDTO.area!=null and detailedAdminDTO.area != """>
+ AND carr.json_object like concat ('%',#{detailedAdminDTO.area},'%')
</if>
group by carr.id order by carr.id desc
</select>
@@ -142,8 +151,15 @@
AND STR_TO_DATE(ac.answer_content,'%Y-%m-%d %H:%i:%s') <![CDATA[ <= ]]> #{detailedAdminDTO.stopTime}
</if>
<if test="detailedAdminDTO.keyword!=null and detailedAdminDTO.keyword != """>
- AND ac.answer_content like concat ('%',#{detailedAdminDTO.keyword},'%')
- </if>)
+ AND carr.json_object like concat ('%',#{detailedAdminDTO.keyword},'%')
+ </if>
+ <if test="detailedAdminDTO.area!=null and detailedAdminDTO.area != """>
+ AND JSON_EXTRACT(json_object, '$[6].values') like concat ('%',#{detailedAdminDTO.area},'%')
+ </if>
+ <if test="detailedAdminDTO.from!=null and detailedAdminDTO.from != """>
+ AND JSON_EXTRACT(json_object, '$[3].values') like concat ('%',#{detailedAdminDTO.from},'%')
+ </if>
+ )
order by ac.reserve_record_id DESC,ac.id ASC
</select>
<select id="pageRegisterHomeQuarantine" resultType="java.lang.String">
@@ -200,4 +216,20 @@
</if>
GROUP BY answer_content ORDER BY id DESC
</select>
+
+ <select id="fiveCount" resultType="com.panzhihua.common.model.vos.community.reserve.FiveCount">
+ select (
+ select count(*) from com_act_reserve_record where reserve_id = #{reserveId}
+ and JSON_EXTRACT(json_object, '$[9].values') = 0
+
+ ) redMark,(
+ select count(*) from com_act_reserve_record where reserve_id = #{reserveId}
+ and JSON_EXTRACT(json_object, '$[9].values') = 1
+ ) yellowMark,(
+ select count(*) from com_act_reserve_record where reserve_id = #{reserveId}
+ and JSON_EXTRACT(json_object, '$[9].values') = 2
+ ) greenMark,(select count(*) from com_act_reserve_record where reserve_id = #{reserveId}
+ and JSON_EXTRACT(json_object, '$[10].values') = 0 ) dangerCount,
+ ( select count(*) from com_act_reserve_record where reserve_id = #{reserveId}) allCount
+ </select>
</mapper>
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActReserveMapper.xml b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActReserveMapper.xml
index 017f496..17c5ce5 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActReserveMapper.xml
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActReserveMapper.xml
@@ -47,9 +47,7 @@
select id,title,type,img_type, img_url,adver_position_top, adver_position_application from com_act_reserve
<where>
status = 2 and adver_position_application = 1
- <if test="communityId !=null">
- and community_id = ${communityId}
- </if>
+ and community_id = 1
</where>
</select>
@@ -79,7 +77,7 @@
<if test="pageReserveDTO.communityId != null and pageReserveDTO.communityId !=0">
and t.community_id = ${pageReserveDTO.communityId}
</if>
- <if test="pageReserveDTO.areaCode !=null">
+ <if test="pageReserveDTO.areaCode !=null and pageReserveDTO.communityId !=1">
and t1.area_code = #{pageReserveDTO.areaCode}
</if>
<if test="pageReserveDTO.type != null and pageReserveDTO.type.size > 0">
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/bootstrap.yml b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/bootstrap.yml
index 38ecc3c..8210c59 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/bootstrap.yml
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/resources/bootstrap.yml
@@ -7,7 +7,7 @@
enabled: true
service-id: config # 注册中心的服务名
profile: ${ENV:dev} # 指定配置文件的环境
- uri: http://${CONFIG_URL:localhost}:8193/
+ uri: http://${CONFIG_URL:localhost}:6193/
profiles:
active: ${ENV:dev}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/bootstrap.yml b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/bootstrap.yml
index fd3279c..72e2d7a 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/bootstrap.yml
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/bootstrap.yml
@@ -1,13 +1,13 @@
spring:
application:
- name: partybuilding
+ name: huacheng-partybuilding
cloud:
config:
discovery:
enabled: true
- service-id: config # 注册中心的服务名
+ service-id: huacheng-config # 注册中心的服务名
profile: ${ENV:dev} # 指定配置文件的环境
- uri: http://${CONFIG_URL:localhost}:8193/
+ uri: http://${CONFIG_URL:localhost}:6193/
profiles:
active: ${ENV:dev}
@@ -28,4 +28,4 @@
metrics:
tags:
- application: partybuilding
\ No newline at end of file
+ application: huacheng-partybuilding
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/logback-spring.xml b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/logback-spring.xml
index 1e35cfd..af38b65 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/logback-spring.xml
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/logback-spring.xml
@@ -19,7 +19,7 @@
<appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<!--日志文件输出的文件名-->
- <FileNamePattern>${LOG_HOME}/service_partybuilding.log.%d{yyyy-MM-dd}.log</FileNamePattern>
+ <FileNamePattern>${LOG_HOME}/huachengservice_partybuilding.log.%d{yyyy-MM-dd}.log</FileNamePattern>
<!--日志文件保留天数-->
<MaxHistory>30</MaxHistory>
</rollingPolicy>
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/netty/NettyServerHandler.java b/springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/netty/NettyServerHandler.java
index 0eed1ef..d9f7b8f 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/netty/NettyServerHandler.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/netty/NettyServerHandler.java
@@ -113,7 +113,7 @@
nettyServerHandler.stringRedisTemplate.boundValueOps(serial).set(JSONObject.toJSONString(comPropertyEquipment));
}
int finalDuration = duration;
- nettyServerHandler.rabbitTemplate.convertAndSend("delayed.exchange", "delayed.key", comPropertyEquipment, message -> {
+ nettyServerHandler.rabbitTemplate.convertAndSend("huacheng.delayed.exchange", "huacheng.delayed.key", comPropertyEquipment, message -> {
message.getMessageProperties().setHeader("x-delay", finalDuration * 1000 * 3601);
return message;
});
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/resources/bootstrap.yml b/springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/resources/bootstrap.yml
index 1b70c66..d0cb607 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/resources/bootstrap.yml
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/resources/bootstrap.yml
@@ -7,7 +7,7 @@
enabled: true
service-id: config # 注册中心的服务名
profile: ${ENV:dev} # 指定配置文件的环境
- uri: http://${CONFIG_URL:localhost}:8193/
+ uri: http://${CONFIG_URL:localhost}:6193/
profiles:
active: ${ENV:dev}
servlet:
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/resources/bootstrap.yml b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/resources/bootstrap.yml
index 7e3de73..d122944 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/resources/bootstrap.yml
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/resources/bootstrap.yml
@@ -1,13 +1,13 @@
spring:
application:
- name: user
+ name: huacheng-user
cloud:
config:
discovery:
enabled: true
- service-id: config # 注册中心的服务名
+ service-id: huacheng-config # 注册中心的服务名
profile: ${ENV:dev} # 指定配置文件的环境
- uri: http://${CONFIG_URL:localhost}:8193/
+ uri: http://${CONFIG_URL:localhost}:6193/
profiles:
active: ${ENV:dev}
@@ -28,4 +28,4 @@
metrics:
tags:
- application: user
\ No newline at end of file
+ application: huacheng-user
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/resources/logback-spring.xml b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/resources/logback-spring.xml
index 12cb9aa..ec9f113 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/resources/logback-spring.xml
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/resources/logback-spring.xml
@@ -19,7 +19,7 @@
<appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<!--日志文件输出的文件名-->
- <FileNamePattern>${LOG_HOME}/service_user.log.%d{yyyy-MM-dd}.log</FileNamePattern>
+ <FileNamePattern>${LOG_HOME}/huachengservice_user.log.%d{yyyy-MM-dd}.log</FileNamePattern>
<!--日志文件保留天数-->
<MaxHistory>30</MaxHistory>
</rollingPolicy>
diff --git a/springcloud_k8s_panzhihuazhihuishequ/shop_backstage/src/main/resources/bootstrap.yml b/springcloud_k8s_panzhihuazhihuishequ/shop_backstage/src/main/resources/bootstrap.yml
index 093e51a..c16eb3d 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/shop_backstage/src/main/resources/bootstrap.yml
+++ b/springcloud_k8s_panzhihuazhihuishequ/shop_backstage/src/main/resources/bootstrap.yml
@@ -7,7 +7,7 @@
enabled: true
service-id: config # 注册中心的服务名
profile: ${ENV:dev} # 指定配置文件的环境
- uri: http://${CONFIG_URL:localhost}:8193/
+ uri: http://${CONFIG_URL:localhost}:6193/
profiles:
active: ${ENV:dev}
servlet:
diff --git a/springcloud_k8s_panzhihuazhihuishequ/timejob/src/main/resources/bootstrap.yml b/springcloud_k8s_panzhihuazhihuishequ/timejob/src/main/resources/bootstrap.yml
index f987477..034c58b 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/timejob/src/main/resources/bootstrap.yml
+++ b/springcloud_k8s_panzhihuazhihuishequ/timejob/src/main/resources/bootstrap.yml
@@ -1,13 +1,13 @@
spring:
application:
- name: timejob
+ name: huacheng-timejob
cloud:
config:
discovery:
enabled: true
service-id: config # 注册中心的服务名
profile: ${ENV:dev} # 指定配置文件的环境
- uri: http://${CONFIG_URL:localhost}:8193/
+ uri: http://${CONFIG_URL:localhost}:6193/
profiles:
active: ${ENV:dev}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/zuul/src/main/java/com/panzhihua/zuul/config/AppletWebSecurityConfigurationAdapter.java b/springcloud_k8s_panzhihuazhihuishequ/zuul/src/main/java/com/panzhihua/zuul/config/AppletWebSecurityConfigurationAdapter.java
index 6ced5d7..1372336 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/zuul/src/main/java/com/panzhihua/zuul/config/AppletWebSecurityConfigurationAdapter.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/zuul/src/main/java/com/panzhihua/zuul/config/AppletWebSecurityConfigurationAdapter.java
@@ -21,7 +21,7 @@
public class AppletWebSecurityConfigurationAdapter extends WebSecurityConfigurerAdapter {
@Override
protected void configure(HttpSecurity http) throws Exception {
- http.antMatcher("/api/applets/**").authorizeRequests().anyRequest().authenticated().and()
+ http.antMatcher("/api/huacheng-applets/**").authorizeRequests().anyRequest().authenticated().and()
.addFilterAfter(new AppletAuthenticationFilter(), AnonymousAuthenticationFilter.class);
}
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/zuul/src/main/resources/bootstrap.yml b/springcloud_k8s_panzhihuazhihuishequ/zuul/src/main/resources/bootstrap.yml
index 63bf779..016490a 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/zuul/src/main/resources/bootstrap.yml
+++ b/springcloud_k8s_panzhihuazhihuishequ/zuul/src/main/resources/bootstrap.yml
@@ -1,6 +1,6 @@
server:
- port: 8194
+ port: 6194
servlet:
encoding:
force-response: true #中文乱码
@@ -8,14 +8,14 @@
spring:
application:
- name: zuul
+ name: huacheng-zuul
cloud:
config:
discovery:
enabled: true
- service-id: config # 注册中心的服务名
+ service-id: huacheng-config # 注册中心的服务名
profile: ${ENV:dev} # 指定配置文件的环境
- uri: http://${CONFIG_URL:localhost}:8193/
+ uri: http://${CONFIG_URL:localhost}:6193/
profiles:
active: ${ENV:dev}
servlet:
@@ -100,4 +100,4 @@
metrics:
tags:
- application: zuul
\ No newline at end of file
+ application: huacheng-zuul
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/zuul/src/main/resources/logback-spring.xml b/springcloud_k8s_panzhihuazhihuishequ/zuul/src/main/resources/logback-spring.xml
index 21f452a..b861d60 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/zuul/src/main/resources/logback-spring.xml
+++ b/springcloud_k8s_panzhihuazhihuishequ/zuul/src/main/resources/logback-spring.xml
@@ -19,7 +19,7 @@
<appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<!--日志文件输出的文件名-->
- <FileNamePattern>${LOG_HOME}/zuul.log.%d{yyyy-MM-dd}.log</FileNamePattern>
+ <FileNamePattern>${LOG_HOME}/huachengzuul.log.%d{yyyy-MM-dd}.log</FileNamePattern>
<!--日志文件保留天数-->
<MaxHistory>30</MaxHistory>
</rollingPolicy>
--
Gitblit v1.7.1