From 3289bb4e663209478a040c3ca6cb767b390dfb1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com> Date: Mon, 29 Jul 2024 15:17:26 +0800 Subject: [PATCH] 'commit' --- .../src/main/resources/bootstrap-dev.yml | 83 +++++++++++-------- .../spring-configuration-metadata.json | 22 ----- .../target/classes/bootstrap-dev.yml | 83 +++++++++++-------- .../spring-configuration-metadata.json | 22 ----- .../spring-configuration-metadata.json | 22 ----- Ylt/gw-saas-mgr/target/classes/bootstrap.yml | 2 - .../spring-configuration-metadata.json | 22 ----- .../spring-configuration-metadata.json | 22 ----- .../spring-configuration-metadata.json | 22 ----- .../spring-configuration-metadata.json | 22 ----- .../java/com/net/WebSocketApplication.java | 5 +- 11 files changed, 102 insertions(+), 225 deletions(-) delete mode 100644 Ylt/gw-charge/target/classes/META-INF/spring-configuration-metadata.json delete mode 100644 Ylt/gw-openapi/target/classes/META-INF/spring-configuration-metadata.json delete mode 100644 Ylt/gw-saas-mgr/target/classes/META-INF/spring-configuration-metadata.json delete mode 100644 Ylt/ms-protocol-kstar/target/classes/META-INF/spring-configuration-metadata.json delete mode 100644 Ylt/ms-protocol-shenghong/target/classes/META-INF/spring-configuration-metadata.json delete mode 100644 Ylt/ms-protocol-xingxing/target/classes/META-INF/spring-configuration-metadata.json delete mode 100644 Ylt/ms-protocol/target/classes/META-INF/spring-configuration-metadata.json diff --git a/Ylt/gw-charge/src/main/resources/bootstrap-dev.yml b/Ylt/gw-charge/src/main/resources/bootstrap-dev.yml index 6ff4b65..6403d5c 100644 --- a/Ylt/gw-charge/src/main/resources/bootstrap-dev.yml +++ b/Ylt/gw-charge/src/main/resources/bootstrap-dev.yml @@ -47,121 +47,138 @@ jwt: zuul: #路径配置 routes: - # 用户模块 + # 1、用户模块 # UserInfoController # @RequestMapping("/userapi/user") userapi: # spring cloud gateway的stripPrefix配置 # https://www.jianshu.com/p/6d6b8c148881 stripPrefix: false - path: /userapi/** + path: /userapi/** # 所有匹配/usrerapi/**的路径将被路由到/userapi/** + # sensitiveHeaders是黑名单,且默认不为空。 因此,要使Zuul发送所有标头(忽略的标头除外),您必须将其明确设置为空列表。 如果要将cookie或授权标头传递到后端,则必须这样做。 sensitiveHeaders: - #财务模块 + #2、财务模块 financeapi: stripPrefix: true path: /financeapi/** sensitiveHeaders: - #充电站模块 + #3、充电站模块 stationapi: stripPrefix: true path: /stationapi/** sensitiveHeaders: - #订单模块 + #4、订单模块 orderapi: stripPrefix: false path: /orderapi/** sensitiveHeaders: - #互联互通模块 + #5、互联互通模块 openapi: stripPrefix: true path: /openapi/** sensitiveHeaders: - #订单后台模块 + #6、订单后台模块 orderbkapi: stripPrefix: false path: /orderbkapi/** sensitiveHeaders: - #协议模块 + #7、协议模块 【这个为什么没有路由地址指向呢?】 protocolapi: stripPrefix: false path: /protocolapi/** sensitiveHeaders: - #分发模块 + #8、分发模块 distribute: stripPrefix: false path: /distribute/** sensitiveHeaders: - #通知模块 + #9、通知模块 noticeapi: stripPrefix: false path: /noticeapi/** sensitiveHeaders: - #通知模块 + #10、通知模块 cheweiapi: stripPrefix: false path: /cheweiapi/** sensitiveHeaders: +# https://blog.csdn.net/qq_39470733/article/details/109474782 +# 基于配置的服务器列表:需要在项目配置文件中通过<服务名称>.ribbon.listOfServers进行设置。 +# 如user-service.ribbon.listOfServers=http://127.0.0.1:8082,http://127.0.0.1:8083 +# 订单后台模块 orderbkapi: ribbon: listOfServers: 127.0.0.1:7011 +#分发模块 distribute: ribbon: listOfServers: http://i100c.3322.org:31636 -excelapi: - ribbon: - listOfServers: http://i100c.3322.org:30326 - +# 财务模块 financeapi: ribbon: listOfServers: http://i100c.3322.org:32134 +# 通知模块 noticeapi: ribbon: listOfServers: http://i100c.3322.org:30745 +# 互联互通模块 openapi: ribbon: listOfServers: http://i100c.3322.org:31301 +# 订单模块 orderapi: ribbon: listOfServers: http://i100c.3322.org:30258 -protocolshenghongapi: - ribbon: - listOfServers: http://i100c.3322.org:31766 - +# 充电站模块 stationapi: ribbon: listOfServers: http://i100c.3322.org:30836 -taskapi: - ribbon: - listOfServers: http://i100c.3322.org:31960 +# 用户模块 userapi: ribbon: listOfServers: http://i100c.3322.org:32150 -walletapi: +# 通知模块 +cheweiapi: ribbon: - listOfServers: http://i100c.3322.org:30723 + listOfServers: http://cz.api.cheweiguanjia.com -websocketocppapi: - ribbon: - listOfServers: http://i100c.3322.org:30725 -mgrapi: - ribbon: - listOfServers: http://i100c.3322.org:30115 +#protocolshenghongapi: +# ribbon: +# listOfServers: http://i100c.3322.org:31766 + +#taskapi: +# ribbon: +# listOfServers: http://i100c.3322.org:31960 + + +#walletapi: +# ribbon: +# listOfServers: http://i100c.3322.org:30723 + +#websocketocppapi: +# ribbon: +# listOfServers: http://i100c.3322.org:30725 + +#mgrapi: +# ribbon: +# listOfServers: http://i100c.3322.org:30115 + +#excelapi: +# ribbon: +# listOfServers: http://i100c.3322.org:30326 -cheweiapi: - ribbon: - listOfServers: http://cz.api.cheweiguanjia.com # springcloud系列9——Ribbon脱离Eureka使用 # https://blog.csdn.net/qincidong/article/details/82711648 diff --git a/Ylt/gw-charge/target/classes/META-INF/spring-configuration-metadata.json b/Ylt/gw-charge/target/classes/META-INF/spring-configuration-metadata.json deleted file mode 100644 index 1169ca6..0000000 --- a/Ylt/gw-charge/target/classes/META-INF/spring-configuration-metadata.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "hints": [], - "groups": [ - { - "sourceType": "com.i100c.charge.gw.filter.ZuulPreFilter", - "name": "jwt.filter", - "type": "com.i100c.charge.gw.filter.ZuulPreFilter" - } - ], - "properties": [ - { - "sourceType": "com.i100c.charge.gw.filter.ZuulPreFilter", - "name": "jwt.filter.no-access-filter", - "type": "java.util.List" - }, - { - "sourceType": "com.i100c.charge.gw.filter.ZuulPreFilter", - "name": "jwt.filter.should-not-filter", - "type": "java.util.List" - } - ] -} \ No newline at end of file diff --git a/Ylt/gw-charge/target/classes/bootstrap-dev.yml b/Ylt/gw-charge/target/classes/bootstrap-dev.yml index 6ff4b65..6403d5c 100644 --- a/Ylt/gw-charge/target/classes/bootstrap-dev.yml +++ b/Ylt/gw-charge/target/classes/bootstrap-dev.yml @@ -47,121 +47,138 @@ jwt: zuul: #路径配置 routes: - # 用户模块 + # 1、用户模块 # UserInfoController # @RequestMapping("/userapi/user") userapi: # spring cloud gateway的stripPrefix配置 # https://www.jianshu.com/p/6d6b8c148881 stripPrefix: false - path: /userapi/** + path: /userapi/** # 所有匹配/usrerapi/**的路径将被路由到/userapi/** + # sensitiveHeaders是黑名单,且默认不为空。 因此,要使Zuul发送所有标头(忽略的标头除外),您必须将其明确设置为空列表。 如果要将cookie或授权标头传递到后端,则必须这样做。 sensitiveHeaders: - #财务模块 + #2、财务模块 financeapi: stripPrefix: true path: /financeapi/** sensitiveHeaders: - #充电站模块 + #3、充电站模块 stationapi: stripPrefix: true path: /stationapi/** sensitiveHeaders: - #订单模块 + #4、订单模块 orderapi: stripPrefix: false path: /orderapi/** sensitiveHeaders: - #互联互通模块 + #5、互联互通模块 openapi: stripPrefix: true path: /openapi/** sensitiveHeaders: - #订单后台模块 + #6、订单后台模块 orderbkapi: stripPrefix: false path: /orderbkapi/** sensitiveHeaders: - #协议模块 + #7、协议模块 【这个为什么没有路由地址指向呢?】 protocolapi: stripPrefix: false path: /protocolapi/** sensitiveHeaders: - #分发模块 + #8、分发模块 distribute: stripPrefix: false path: /distribute/** sensitiveHeaders: - #通知模块 + #9、通知模块 noticeapi: stripPrefix: false path: /noticeapi/** sensitiveHeaders: - #通知模块 + #10、通知模块 cheweiapi: stripPrefix: false path: /cheweiapi/** sensitiveHeaders: +# https://blog.csdn.net/qq_39470733/article/details/109474782 +# 基于配置的服务器列表:需要在项目配置文件中通过<服务名称>.ribbon.listOfServers进行设置。 +# 如user-service.ribbon.listOfServers=http://127.0.0.1:8082,http://127.0.0.1:8083 +# 订单后台模块 orderbkapi: ribbon: listOfServers: 127.0.0.1:7011 +#分发模块 distribute: ribbon: listOfServers: http://i100c.3322.org:31636 -excelapi: - ribbon: - listOfServers: http://i100c.3322.org:30326 - +# 财务模块 financeapi: ribbon: listOfServers: http://i100c.3322.org:32134 +# 通知模块 noticeapi: ribbon: listOfServers: http://i100c.3322.org:30745 +# 互联互通模块 openapi: ribbon: listOfServers: http://i100c.3322.org:31301 +# 订单模块 orderapi: ribbon: listOfServers: http://i100c.3322.org:30258 -protocolshenghongapi: - ribbon: - listOfServers: http://i100c.3322.org:31766 - +# 充电站模块 stationapi: ribbon: listOfServers: http://i100c.3322.org:30836 -taskapi: - ribbon: - listOfServers: http://i100c.3322.org:31960 +# 用户模块 userapi: ribbon: listOfServers: http://i100c.3322.org:32150 -walletapi: +# 通知模块 +cheweiapi: ribbon: - listOfServers: http://i100c.3322.org:30723 + listOfServers: http://cz.api.cheweiguanjia.com -websocketocppapi: - ribbon: - listOfServers: http://i100c.3322.org:30725 -mgrapi: - ribbon: - listOfServers: http://i100c.3322.org:30115 +#protocolshenghongapi: +# ribbon: +# listOfServers: http://i100c.3322.org:31766 + +#taskapi: +# ribbon: +# listOfServers: http://i100c.3322.org:31960 + + +#walletapi: +# ribbon: +# listOfServers: http://i100c.3322.org:30723 + +#websocketocppapi: +# ribbon: +# listOfServers: http://i100c.3322.org:30725 + +#mgrapi: +# ribbon: +# listOfServers: http://i100c.3322.org:30115 + +#excelapi: +# ribbon: +# listOfServers: http://i100c.3322.org:30326 -cheweiapi: - ribbon: - listOfServers: http://cz.api.cheweiguanjia.com # springcloud系列9——Ribbon脱离Eureka使用 # https://blog.csdn.net/qincidong/article/details/82711648 diff --git a/Ylt/gw-openapi/target/classes/META-INF/spring-configuration-metadata.json b/Ylt/gw-openapi/target/classes/META-INF/spring-configuration-metadata.json deleted file mode 100644 index 9b47ecb..0000000 --- a/Ylt/gw-openapi/target/classes/META-INF/spring-configuration-metadata.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "hints": [], - "groups": [ - { - "sourceType": "com.charge.gwopenapi.filter.ZuulPreFilter", - "name": "jwt.filter", - "type": "com.charge.gwopenapi.filter.ZuulPreFilter" - } - ], - "properties": [ - { - "sourceType": "com.charge.gwopenapi.filter.ZuulPreFilter", - "name": "jwt.filter.no-access-filter", - "type": "java.util.List" - }, - { - "sourceType": "com.charge.gwopenapi.filter.ZuulPreFilter", - "name": "jwt.filter.should-not-filter", - "type": "java.util.List" - } - ] -} \ No newline at end of file diff --git a/Ylt/gw-saas-mgr/target/classes/META-INF/spring-configuration-metadata.json b/Ylt/gw-saas-mgr/target/classes/META-INF/spring-configuration-metadata.json deleted file mode 100644 index 25eff0d..0000000 --- a/Ylt/gw-saas-mgr/target/classes/META-INF/spring-configuration-metadata.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "hints": [], - "groups": [ - { - "sourceType": "com.charge.gwmgr.filter.ZuulPreFilter", - "name": "jwt.filter", - "type": "com.charge.gwmgr.filter.ZuulPreFilter" - } - ], - "properties": [ - { - "sourceType": "com.charge.gwmgr.filter.ZuulPreFilter", - "name": "jwt.filter.no-access-filter", - "type": "java.util.List" - }, - { - "sourceType": "com.charge.gwmgr.filter.ZuulPreFilter", - "name": "jwt.filter.should-not-filter", - "type": "java.util.List" - } - ] -} \ No newline at end of file diff --git a/Ylt/gw-saas-mgr/target/classes/bootstrap.yml b/Ylt/gw-saas-mgr/target/classes/bootstrap.yml index ae416e4..7da3372 100644 --- a/Ylt/gw-saas-mgr/target/classes/bootstrap.yml +++ b/Ylt/gw-saas-mgr/target/classes/bootstrap.yml @@ -15,8 +15,6 @@ spring: max-request-size: 100MB # 设置最大的请求文件的大小 max-file-size: 100MB # 设置单个文件的最大长度 - - server: port: 7003 diff --git a/Ylt/ms-protocol-kstar/target/classes/META-INF/spring-configuration-metadata.json b/Ylt/ms-protocol-kstar/target/classes/META-INF/spring-configuration-metadata.json deleted file mode 100644 index 9579ccb..0000000 --- a/Ylt/ms-protocol-kstar/target/classes/META-INF/spring-configuration-metadata.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "hints": [], - "groups": [ - { - "sourceType": "com.charge.kstar.model.ProtocolConfig", - "name": "protocol_servers", - "type": "com.charge.kstar.model.ProtocolConfig" - } - ], - "properties": [ - { - "sourceType": "com.charge.kstar.model.ProtocolConfig", - "name": "protocol_servers.list", - "type": "java.util.List" - }, - { - "sourceType": "com.charge.kstar.model.ProtocolConfig", - "name": "protocol_servers.name", - "type": "java.lang.String" - } - ] -} \ No newline at end of file diff --git a/Ylt/ms-protocol-shenghong/target/classes/META-INF/spring-configuration-metadata.json b/Ylt/ms-protocol-shenghong/target/classes/META-INF/spring-configuration-metadata.json deleted file mode 100644 index b79fcb2..0000000 --- a/Ylt/ms-protocol-shenghong/target/classes/META-INF/spring-configuration-metadata.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "hints": [], - "groups": [ - { - "sourceType": "com.charge.protocol.model.ProtocolConfig", - "name": "protocol_servers", - "type": "com.charge.protocol.model.ProtocolConfig" - } - ], - "properties": [ - { - "sourceType": "com.charge.protocol.model.ProtocolConfig", - "name": "protocol_servers.list", - "type": "java.util.List" - }, - { - "sourceType": "com.charge.protocol.model.ProtocolConfig", - "name": "protocol_servers.name", - "type": "java.lang.String" - } - ] -} \ No newline at end of file diff --git a/Ylt/ms-protocol-xingxing/target/classes/META-INF/spring-configuration-metadata.json b/Ylt/ms-protocol-xingxing/target/classes/META-INF/spring-configuration-metadata.json deleted file mode 100644 index b79fcb2..0000000 --- a/Ylt/ms-protocol-xingxing/target/classes/META-INF/spring-configuration-metadata.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "hints": [], - "groups": [ - { - "sourceType": "com.charge.protocol.model.ProtocolConfig", - "name": "protocol_servers", - "type": "com.charge.protocol.model.ProtocolConfig" - } - ], - "properties": [ - { - "sourceType": "com.charge.protocol.model.ProtocolConfig", - "name": "protocol_servers.list", - "type": "java.util.List" - }, - { - "sourceType": "com.charge.protocol.model.ProtocolConfig", - "name": "protocol_servers.name", - "type": "java.lang.String" - } - ] -} \ No newline at end of file diff --git a/Ylt/ms-protocol/target/classes/META-INF/spring-configuration-metadata.json b/Ylt/ms-protocol/target/classes/META-INF/spring-configuration-metadata.json deleted file mode 100644 index b79fcb2..0000000 --- a/Ylt/ms-protocol/target/classes/META-INF/spring-configuration-metadata.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "hints": [], - "groups": [ - { - "sourceType": "com.charge.protocol.model.ProtocolConfig", - "name": "protocol_servers", - "type": "com.charge.protocol.model.ProtocolConfig" - } - ], - "properties": [ - { - "sourceType": "com.charge.protocol.model.ProtocolConfig", - "name": "protocol_servers.list", - "type": "java.util.List" - }, - { - "sourceType": "com.charge.protocol.model.ProtocolConfig", - "name": "protocol_servers.name", - "type": "java.lang.String" - } - ] -} \ No newline at end of file diff --git a/Ylt/ms-websocket-ocpp/src/main/java/com/net/WebSocketApplication.java b/Ylt/ms-websocket-ocpp/src/main/java/com/net/WebSocketApplication.java index 8852cf8..0980f0b 100644 --- a/Ylt/ms-websocket-ocpp/src/main/java/com/net/WebSocketApplication.java +++ b/Ylt/ms-websocket-ocpp/src/main/java/com/net/WebSocketApplication.java @@ -1,7 +1,6 @@ package com.net; import com.net.filter.CorsFilter; -import org.apache.catalina.servlet4preview.http.HttpServletRequest; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.boot.SpringApplication; @@ -9,7 +8,6 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.web.servlet.FilterRegistrationBean; import org.springframework.cloud.netflix.feign.EnableFeignClients; import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.ComponentScan; import org.springframework.scheduling.annotation.EnableAsync; import org.springframework.scheduling.annotation.EnableScheduling; import org.springframework.transaction.annotation.EnableTransactionManagement; @@ -18,6 +16,8 @@ import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter; +import javax.servlet.http.HttpServletRequest; + /** * Created by Administrator on 2017/8/15. */ @@ -26,7 +26,6 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter @EnableScheduling @EnableTransactionManagement @EnableFeignClients -@ComponentScan("com.net") @EnableAsync @RestController public class WebSocketApplication extends WebMvcConfigurerAdapter {