From 4a697b66a554f84f26ebcf17e8e3c05e827ee8ef Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期一, 11 四月 2022 13:56:22 +0800
Subject: [PATCH] Merge branch 'huacheng' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into huacheng
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/ComPbCheckUnitFeign.java | 2 +-
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/bootstrap.yml | 4 ++--
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/resources/bootstrap.yml | 4 ++--
springcloud_k8s_panzhihuazhihuishequ/auth/src/main/resources/logback-spring.xml | 2 +-
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/auth/TokenService.java | 2 +-
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/ComDataStatisticsFeign.java | 2 +-
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/resources/logback-spring.xml | 2 +-
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/ComActEasyPhotoHandlerFeign.java | 2 +-
springcloud_k8s_panzhihuazhihuishequ/config_server/src/main/resources/logback-spring.xml | 2 +-
springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/resources/bootstrap.yml | 4 ++--
springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/resources/logback-spring.xml | 2 +-
springcloud_k8s_panzhihuazhihuishequ/zuul/src/main/resources/bootstrap.yml | 6 +++---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java | 2 +-
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/logback-spring.xml | 2 +-
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/service_user/src/main/resources/logback-spring.xml | 2 +-
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/logback-spring.xml | 2 +-
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/partybuilding/PartyBuildingService.java | 2 +-
springcloud_k8s_panzhihuazhihuishequ/zuul/src/main/resources/logback-spring.xml | 2 +-
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/ComActEasyPhotoEvaluateFeign.java | 2 +-
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java | 2 +-
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/property/PropertyService.java | 2 +-
23 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/resources/bootstrap.yml b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/resources/bootstrap.yml
index e7de7aa..b2fa9bc 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/resources/bootstrap.yml
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/resources/bootstrap.yml
@@ -5,7 +5,7 @@
config:
discovery:
enabled: true
- service-id: config # 注册中心的服务名
+ service-id: huacheng-config # 注册中心的服务名
profile: ${ENV:dev} # 指定配置文件的环境
uri: http://${CONFIG_URL:localhost}:6193/
profiles:
@@ -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 72582f4..9175a3d 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/resources/bootstrap.yml
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets_backstage/src/main/resources/bootstrap.yml
@@ -5,7 +5,7 @@
config:
discovery:
enabled: true
- service-id: config # 注册中心的服务名
+ service-id: huacheng-config # 注册中心的服务名
profile: ${ENV:dev} # 指定配置文件的环境
uri: http://${CONFIG_URL:localhost}:6193/
profiles:
@@ -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/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/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 b71df41..516efee 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
@@ -430,7 +430,7 @@
* @author: huang.hongfa weixin hhf9596 qq 959656820
* @create: 2020-12-07 15:59
**/
-@FeignClient(name = "community")
+@FeignClient(name = "huacheng-community")
public interface CommunityService {
/**
* 新增社区活动
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/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/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/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_partybuilding/src/main/resources/bootstrap.yml b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/bootstrap.yml
index d189eb4..72e2d7a 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/bootstrap.yml
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/bootstrap.yml
@@ -5,7 +5,7 @@
config:
discovery:
enabled: true
- service-id: config # 注册中心的服务名
+ service-id: huacheng-config # 注册中心的服务名
profile: ${ENV:dev} # 指定配置文件的环境
uri: http://${CONFIG_URL:localhost}:6193/
profiles:
@@ -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_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/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 c7d6002..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 #中文乱码
@@ -13,7 +13,7 @@
config:
discovery:
enabled: true
- service-id: config # 注册中心的服务名
+ service-id: huacheng-config # 注册中心的服务名
profile: ${ENV:dev} # 指定配置文件的环境
uri: http://${CONFIG_URL:localhost}:6193/
profiles:
@@ -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