From e8a368c35fa8c6d65ca09ee023ce490bc11b2ea3 Mon Sep 17 00:00:00 2001
From: SZH <szh_hello@163.com>
Date: 星期二, 09 八月 2022 16:42:11 +0800
Subject: [PATCH] 更新配置文件，解决接入网关之后的跨域问题
---
safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/minioDemo/utils/FileUtil.java | 1
safePlatfrom-out-web/src/main/resources/config/application-guotai-demo.yaml | 129 +++++++++++++++++++++
/dev/null | 53 --------
safePlatfrom-out-web/src/main/resources/config/application.yaml | 6
safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/config/security/CorsConfig.java | 8 +
safePlatfrom-out-web/pom.xml | 7 +
safePlatfrom-out-web/src/main/resources/config/application-dev.yaml | 3
safePlatfrom-out-web/src/main/resources/config/application-out-dev.yaml | 3
safePlatfrom-out-web/src/main/resources/config/application-test.yaml | 94 ++++++++++++++-
pom.xml | 4
10 files changed, 240 insertions(+), 68 deletions(-)
diff --git a/pom.xml b/pom.xml
index 164b1d2..d2da4fc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,6 +14,10 @@
<module>goal-manage/goal-manage-rpc-provider</module>
<module>emergency/emergency-service</module>
<module>emergency/emergency-rpc-provider</module>
+ <module>equipment/equipment-service</module>
+ <module>equipment/equipment-rpc-provider</module>
+ <module>incident-manage/incident-manage-service</module>
+ <module>incident-manage/incident-manage-rpc-provider</module>
<module>safePlatfrom-out-web</module>
</modules>
diff --git a/safePlatfrom-out-web/pom.xml b/safePlatfrom-out-web/pom.xml
index 7055f3c..a281acf 100644
--- a/safePlatfrom-out-web/pom.xml
+++ b/safePlatfrom-out-web/pom.xml
@@ -38,9 +38,14 @@
<artifactId>goal-manage-rpc-provider</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
+<!-- <dependency>-->
+<!-- <groupId>com.gkhy.safePlatfrom</groupId>-->
+<!-- <artifactId>equipment</artifactId>-->
+<!-- <version>1.0-SNAPSHOT</version>-->
+<!-- </dependency>-->
<dependency>
<groupId>com.gkhy.safePlatfrom</groupId>
- <artifactId>equipment</artifactId>
+ <artifactId>equipment-service</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
diff --git a/safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/config/security/CorsConfig.java b/safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/config/security/CorsConfig.java
index af07df6..4f99106 100644
--- a/safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/config/security/CorsConfig.java
+++ b/safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/config/security/CorsConfig.java
@@ -1,5 +1,6 @@
package com.gkhy.safePlatform.config.security;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.web.cors.CorsConfiguration;
@@ -8,6 +9,10 @@
@Configuration
public class CorsConfig {
+
+ @Value("${spring.enableCors}")
+ private Boolean enableCors;
+
private CorsConfiguration buildConfig() {
CorsConfiguration corsConfiguration = new CorsConfiguration();
// 你需要跨域的地址 注意这里的 127.0.0.1 != localhost
@@ -26,7 +31,8 @@
public CorsFilter corsFilter() {
UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
//配置 可以访问的地址
- source.registerCorsConfiguration("/**", buildConfig());
+ if(enableCors == true)
+ source.registerCorsConfiguration("/**", buildConfig());
return new CorsFilter(source);
}
diff --git a/safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/minioDemo/utils/FileUtil.java b/safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/minioDemo/utils/FileUtil.java
index 2036414..c8d2be0 100644
--- a/safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/minioDemo/utils/FileUtil.java
+++ b/safePlatfrom-out-web/src/main/java/com/gkhy/safePlatform/minioDemo/utils/FileUtil.java
@@ -1,7 +1,6 @@
package com.gkhy.safePlatform.minioDemo.utils;
import com.gkhy.safePlatform.minioDemo.config.MinioConfig;
-import com.sun.org.apache.regexp.internal.RE;
import io.minio.*;
import io.minio.MinioClient;
import io.minio.errors.*;
diff --git a/safePlatfrom-out-web/src/main/resources/config/application-dev.yaml b/safePlatfrom-out-web/src/main/resources/config/application-dev.yaml
index 6300b48..92a2ec2 100644
--- a/safePlatfrom-out-web/src/main/resources/config/application-dev.yaml
+++ b/safePlatfrom-out-web/src/main/resources/config/application-dev.yaml
@@ -64,6 +64,9 @@
username: gkhy_safeplatform_out
password: 9485uyJHISes09t
+ #是否允许跨域 true：允许；false：不允许
+ enableCors: true
+
mybatis-plus:
configuration:
log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
diff --git a/safePlatfrom-out-web/src/main/resources/config/application-guotai-demo.yaml b/safePlatfrom-out-web/src/main/resources/config/application-guotai-demo.yaml
new file mode 100644
index 0000000..4c05944
--- /dev/null
+++ b/safePlatfrom-out-web/src/main/resources/config/application-guotai-demo.yaml
@@ -0,0 +1,129 @@
+server:
+ tomcat:
+ uri-encoding: UTF-8
+ basedir: /
+ port: 16009
+ servlet:
+ context-path: /
+
+# mysql
+spring:
+ jta:
+ transaction-manager-id: txManager
+ datasource:
+ type: com.alibaba.druid.pool.xa.DruidXADataSource
+ emergency:
+ driver-class-name: com.mysql.cj.jdbc.Driver
+ url: jdbc:mysql://192.168.0.52:3306/safeplatform.emergency.guotai?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
+ &allowPublicKeyRetrieval=true
+ username: gkhy_out_team
+ password: sas@sASDa28
+ type: com.alibaba.druid.pool.DruidDataSource
+ goalmanage:
+ driver-class-name: com.mysql.cj.jdbc.Driver
+ url: jdbc:mysql://192.168.0.52:3306/safeplatform.goalmanage.guotai?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
+ username: gkhy_out_team
+ password: sas@sASDa28
+ type: com.alibaba.druid.pool.DruidDataSource
+ incidentmanage:
+ driver-class-name: com.mysql.cj.jdbc.Driver
+ url: jdbc:mysql://192.168.0.52:3306/safeplatform.incidentmanage.guotai?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
+ username: gkhy_out_team
+ password: sas@sASDa28
+ type: com.alibaba.druid.pool.DruidDataSource
+ equipment:
+ driver-class-name: com.mysql.cj.jdbc.Driver
+ url: jdbc:mysql://192.168.0.52:3306/safeplatform.equipment.guotai?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
+ username: gkhy_out_team
+ password: sas@sASDa28
+ type: com.alibaba.druid.pool.DruidDataSource
+ redis:
+ host: 192.168.0.52
+ port: 6377
+ password: SEF98uvs98dUAUEF90Udssa
+ database: 0 # Redis 数据库号，默认为 0
+ timeout: 15000 # Redis 连接超时时间，单位：毫秒。
+ lettuce:
+ pool:
+ max-active: 4
+ max-idle: 4
+ # 对应 RedisProperties.Jedis 内部类
+ jedis:
+ pool:
+ max-active: 4 # 连接池最大连接数，默认为 8 。使用负数表示没有限制 同一时间最大只能执行8条sql语句，每执行一条语句就会建立一个连接
+ max-idle: 4 # 默认连接数最大空闲的连接数，默认为 8 。使用负数表示没有限制。
+ min-idle: 0 # 默认连接池最小空闲的连接数，默认为 0 。允许设置 0 和 正数。
+ max-wait: -1
+ cloud:
+ nacos:
+ discovery:
+ # server-addr: nacos://121.239.169.27:18848?username=nacos&password=guokehongyu
+ # server-addr: 192.168.0.52:8848?namespace=e07a2454-136b-4498-99eb-09dae3336ebe&username=gkhy_team_safeplatform_dev&password=nacosadmin
+ server-addr: http://192.168.0.52:8848
+ namespace: aa080ed0-5a7c-480c-8b7a-5a0a8d3c986f
+ username: gkhy_safeplatform_out
+ password: 9485uyJHISes09t
+ enabled: true
+ register-enabled: true
+ config:
+ server-addr: http://192.168.0.52:8848
+ namespace: aa080ed0-5a7c-480c-8b7a-5a0a8d3c986f
+ username: gkhy_safeplatform_out
+ password: 9485uyJHISes09t
+
+ #是否允许跨域 true：允许；false：不允许
+ enableCors: false
+
+mybatis-plus:
+ configuration:
+ log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+
+dubbo:
+ registry:
+ protocol: nacos
+ address: nacos://192.168.0.52:8848?namespace=aa080ed0-5a7c-480c-8b7a-5a0a8d3c986f&username=gkhy_safeplatform_out&password=9485uyJHISes09t
+ application:
+ name: gkhy-safeplatform-out-test
+ scan:
+ # 扫描rpc接口定义包
+ base-packages: com.gkhy.safePlatform
+ protocol:
+ name: dubbo
+ port: 18082
+ serialization: kryo
+ consumer:
+ # 服务连接超时时间
+ timeout: 3000
+ # 取消服务启动检查
+ check: false
+
+rocketmq:
+ name-server: 192.168.0.52:9876
+ producer:
+ group: gkhy-safeplatform-guotai
+ sendMessageTimeout: 300000
+ consumer:
+ group: gkhy-safeplatform-guotai
+ topic:
+ demoTopic: gkhy-safeplatform-topic-demo
+
+minio:
+ endPoint: 192.168.0.52
+ port: 9000
+ accessKey: oddER8eSv211WVG3
+ secretKey: TeaEh8eWNhBbjCYK3G6cIX2QGYECwo7M
+ secure: false
+ bucketName: safeplatform-dev
+ urlPrefix: http://192.168.0.52/file
+ #用户名 gkhy_team_out_dev
+ #密码 12345678
+
+
+token:
+ header: Authorization
+ secret: safe666
+ expiration: 7200
+ refreshExpiration: 14400
+ tokenHead: Bearer
+ loginUserHeader: uid
+
diff --git a/safePlatfrom-out-web/src/main/resources/config/application-out-dev.yaml b/safePlatfrom-out-web/src/main/resources/config/application-out-dev.yaml
index d296d49..fb29ea5 100644
--- a/safePlatfrom-out-web/src/main/resources/config/application-out-dev.yaml
+++ b/safePlatfrom-out-web/src/main/resources/config/application-out-dev.yaml
@@ -70,6 +70,9 @@
username: gkhy_safeplatform_out
password: 9485uyJHISes09t
+ #是否允许跨域 true：允许；false：不允许
+ enableCors: true
+
mybatis-plus:
configuration:
log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
diff --git a/safePlatfrom-out-web/src/main/resources/config/application-prod.yaml b/safePlatfrom-out-web/src/main/resources/config/application-prod.yaml
deleted file mode 100644
index d7474cc..0000000
--- a/safePlatfrom-out-web/src/main/resources/config/application-prod.yaml
+++ /dev/null
@@ -1,53 +0,0 @@
-server:
- tomcat:
- uri-encoding: UTF-8
- basedir: /
- port: 8009
- servlet:
- context-path: /
-
-# mysql
-spring:
- datasource:
- one:
- driver-class-name: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://twt.sinanoaq.com:13306/zhongtai.demo?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
- username: root
- password: Sinanoaq#415
- type: com.alibaba.druid.pool.DruidDataSource
-
-
-mybatis-plus:
- configuration:
- log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
-
-dubbo:
- registry:
- protocol: nacos
- address: nacos://192.168.0.52:8848?namespace=71701971-5257-48d9-b745-a4218022b397&username=gkhy_safeplatform_out&password=9485uyJHISes09t
- application:
- name: gkhy-safeplatform-account-provider
- scan:
- # 扫描rpc接口定义包
- base-packages: com.gkhy.safePlatform
- protocol:
- name: dubbo
- port: 18080
- serialization: kryo
- consumer:
- # 服务连接超时时间
- timeout: 3000
- # 取消服务启动检查
- check: false
-
-minio:
- endPoint: 192.168.0.52
- port: 9001
- accessKey: MhLac53T2KD88fwD
- secretKey: dGcLziFwyKaXuMcug385cfb6iGy61U8q
- secure: false
- bucketName: safeplatform-dev
- urlPrefix: http://192.168.0.52/file
-
-
-
diff --git a/safePlatfrom-out-web/src/main/resources/config/application-test.yaml b/safePlatfrom-out-web/src/main/resources/config/application-test.yaml
index 5109dfa..5e35629 100644
--- a/safePlatfrom-out-web/src/main/resources/config/application-test.yaml
+++ b/safePlatfrom-out-web/src/main/resources/config/application-test.yaml
@@ -8,14 +8,71 @@
# mysql
spring:
+ jta:
+ transaction-manager-id: txManager
datasource:
- one:
+ type: com.alibaba.druid.pool.xa.DruidXADataSource
+ emergency:
driver-class-name: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://192.168.0.52:3306/safeplatform.out.test?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
+ url: jdbc:mysql://192.168.0.52:3306/safeplatform.emergency.dev?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
username: gkhy_dev_out_team
password: Adsdf675T6AC7yga
type: com.alibaba.druid.pool.DruidDataSource
+ goalmanage:
+ driver-class-name: com.mysql.cj.jdbc.Driver
+ url: jdbc:mysql://192.168.0.52:3306/safeplatform.goalmanage.dev?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
+ username: gkhy_dev_out_team
+ password: Adsdf675T6AC7yga
+ type: com.alibaba.druid.pool.DruidDataSource
+ incidentmanage:
+ driver-class-name: com.mysql.cj.jdbc.Driver
+ url: jdbc:mysql://192.168.0.52:3306/safeplatform.incidentmanage.dev?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
+ username: gkhy_dev_out_team
+ password: Adsdf675T6AC7yga
+ type: com.alibaba.druid.pool.DruidDataSource
+ equipment:
+ driver-class-name: com.mysql.cj.jdbc.Driver
+ url: jdbc:mysql://192.168.0.52:3306/safeplatform.equipment.dev?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
+ username: gkhy_dev_out_team
+ password: Adsdf675T6AC7yga
+ type: com.alibaba.druid.pool.DruidDataSource
+ redis:
+ host: 192.168.0.52
+ port: 6377
+ password: SEF98uvs98dUAUEF90Udssa
+ database: 0 # Redis 数据库号，默认为 0
+ timeout: 15000 # Redis 连接超时时间，单位：毫秒。
+ lettuce:
+ pool:
+ max-active: 4
+ max-idle: 4
+ # 对应 RedisProperties.Jedis 内部类
+ jedis:
+ pool:
+ max-active: 4 # 连接池最大连接数，默认为 8 。使用负数表示没有限制 同一时间最大只能执行8条sql语句，每执行一条语句就会建立一个连接
+ max-idle: 4 # 默认连接数最大空闲的连接数，默认为 8 。使用负数表示没有限制。
+ min-idle: 0 # 默认连接池最小空闲的连接数，默认为 0 。允许设置 0 和 正数。
+ max-wait: -1
+ cloud:
+ nacos:
+ discovery:
+ # server-addr: nacos://121.239.169.27:18848?username=nacos&password=guokehongyu
+ # server-addr: 192.168.0.52:8848?namespace=e07a2454-136b-4498-99eb-09dae3336ebe&username=gkhy_team_safeplatform_dev&password=nacosadmin
+ server-addr: http://192.168.0.52:8848
+ namespace: aa080ed0-5a7c-480c-8b7a-5a0a8d3c986f
+ username: gkhy_safeplatform_out
+ password: 9485uyJHISes09t
+ enabled: true
+ register-enabled: true
+ config:
+ server-addr: http://192.168.0.52:8848
+ namespace: aa080ed0-5a7c-480c-8b7a-5a0a8d3c986f
+ username: gkhy_safeplatform_out
+ password: 9485uyJHISes09t
+
+ #是否允许跨域 true：允许；false：不允许
+ enableCors: false
mybatis-plus:
configuration:
@@ -24,15 +81,15 @@
dubbo:
registry:
protocol: nacos
- address: nacos://192.168.0.52:8848?namespace=e07a2454-136b-4498-99eb-09dae3336ebe&username=gkhy_safeplatform_out&password=9485uyJHISes09t
+ address: nacos://192.168.0.52:8848?namespace=aa080ed0-5a7c-480c-8b7a-5a0a8d3c986f&username=gkhy_safeplatform_out&password=9485uyJHISes09t
application:
- name: gkhy-safeplatform-account-provider
+ name: gkhy-safeplatform-out-test
scan:
# 扫描rpc接口定义包
base-packages: com.gkhy.safePlatform
protocol:
name: dubbo
- port: 18080
+ port: 18082
serialization: kryo
consumer:
# 服务连接超时时间
@@ -40,14 +97,33 @@
# 取消服务启动检查
check: false
+rocketmq:
+ name-server: 192.168.0.52:9876
+ producer:
+ group: gkhy-safeplatform-guotai
+ sendMessageTimeout: 300000
+ consumer:
+ group: gkhy-safeplatform-guotai
+ topic:
+ demoTopic: gkhy-safeplatform-topic-demo
+
minio:
endPoint: 192.168.0.52
- port: 9001
- accessKey: MhLac53T2KD88fwD
- secretKey: dGcLziFwyKaXuMcug385cfb6iGy61U8q
+ port: 9000
+ accessKey: oddER8eSv211WVG3
+ secretKey: TeaEh8eWNhBbjCYK3G6cIX2QGYECwo7M
secure: false
- bucketName: safeplatform-test
+ bucketName: safeplatform-dev
urlPrefix: http://192.168.0.52/file
+ #用户名 gkhy_team_out_dev
+ #密码 12345678
+token:
+ header: Authorization
+ secret: safe666
+ expiration: 7200
+ refreshExpiration: 14400
+ tokenHead: Bearer
+ loginUserHeader: uid
diff --git a/safePlatfrom-out-web/src/main/resources/config/application.yaml b/safePlatfrom-out-web/src/main/resources/config/application.yaml
index ed41ebd..d161931 100644
--- a/safePlatfrom-out-web/src/main/resources/config/application.yaml
+++ b/safePlatfrom-out-web/src/main/resources/config/application.yaml
@@ -1,9 +1,9 @@
spring:
application:
- name: gkhy-safeplatform-out
+ name: safeplatform-out
profiles:
-# active: prod
- active: out-dev
+# active: test
+ active: guotai-demo
#mybatis-plus:
# mapper-locations: classpath:config/mapper/**/*.xml
--
Gitblit v1.9.2