Browse Source

Merge remote-tracking branch 'origin/master'

yumeng 3 năm trước cách đây
mục cha
commit
84fca81369

+ 16 - 16
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/WebMvcConfiguration.java

@@ -54,22 +54,22 @@ public class WebMvcConfiguration implements WebMvcConfigurer {
         registry.addViewController("/").setViewName("doc.html");
     }
 
-//    @Bean
-//    @Conditional(CorsFilterCondition.class)
-//    public CorsFilter corsFilter() {
-//        final UrlBasedCorsConfigurationSource urlBasedCorsConfigurationSource = new UrlBasedCorsConfigurationSource();
-//        final CorsConfiguration corsConfiguration = new CorsConfiguration();
-//        //是否允许请求带有验证信息
-//        corsConfiguration.setAllowCredentials(true);
-//        // 允许访问的客户端域名
-//        corsConfiguration.addAllowedOrigin("*");
-//        // 允许服务端访问的客户端请求头
-//        corsConfiguration.addAllowedHeader("*");
-//        // 允许访问的方法名,GET POST等
-//        corsConfiguration.addAllowedMethod("*");
-//        urlBasedCorsConfigurationSource.registerCorsConfiguration("/**", corsConfiguration);
-//        return new CorsFilter(urlBasedCorsConfigurationSource);
-//    }
+    @Bean
+    @Conditional(CorsFilterCondition.class)
+    public CorsFilter corsFilter() {
+        final UrlBasedCorsConfigurationSource urlBasedCorsConfigurationSource = new UrlBasedCorsConfigurationSource();
+        final CorsConfiguration corsConfiguration = new CorsConfiguration();
+        //是否允许请求带有验证信息
+        corsConfiguration.setAllowCredentials(true);
+        // 允许访问的客户端域名
+        corsConfiguration.addAllowedOrigin("*");
+        // 允许服务端访问的客户端请求头
+        corsConfiguration.addAllowedHeader("*");
+        // 允许访问的方法名,GET POST等
+        corsConfiguration.addAllowedMethod("*");
+        urlBasedCorsConfigurationSource.registerCorsConfiguration("/**", corsConfiguration);
+        return new CorsFilter(urlBasedCorsConfigurationSource);
+    }
 
     /**
     * 添加Long转json精度丢失的配置

+ 3 - 3
jeecg-cloud-module/jeecg-cloud-nacos/src/main/resources/application-test.yml

@@ -4,11 +4,11 @@ spring:
 db:
   num: 1
   password:
-    '0': hcst@2021
+    '0': hcst@2020
   url:
-    '0': jdbc:mysql://139.186.27.96:4000/nacos?characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&useUnicode=true&useSSL=false&serverTimezone=UTC&allowPublicKeyRetrieval=true
+    '0': jdbc:mysql://139.186.165.84:3306/nacos?characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&useUnicode=true&useSSL=false&serverTimezone=UTC&allowPublicKeyRetrieval=true
   user:
-    '0': data
+    '0': hcst
 management:
   metrics:
     export:

+ 7 - 0
jeecg-cloud-module/jeecg-cloud-system-start/src/main/resources/application-dev.yml

@@ -1,3 +1,10 @@
+server:
+  port: 7001
+  servlet:
+    context-path: /jeecg-boot
+    compression:
+      enabled: true
+      mime-types: application/javascript,application/json,application/xml,text/html,text/xml,text/plain,text/css,image/*
 dubbo:
   application:
     id: sys-center-dubbo-prodiver

+ 7 - 0
jeecg-cloud-module/jeecg-cloud-system-start/src/main/resources/application-prod.yml

@@ -1,3 +1,10 @@
+server:
+  port: 7001
+  servlet:
+    context-path: /jeecg-boot
+    compression:
+      enabled: true
+      mime-types: application/javascript,application/json,application/xml,text/html,text/xml,text/plain,text/css,image/*
 dubbo:
   application:
     id: sys-center-dubbo-prodiver

+ 20 - 9
jeecg-cloud-module/jeecg-cloud-system-start/src/main/resources/application-test.yml

@@ -1,9 +1,16 @@
+server:
+  port: 8806
+  servlet:
+    context-path: /jeecg-boot
+    compression:
+      enabled: true
+      mime-types: application/javascript,application/json,application/xml,text/html,text/xml,text/plain,text/css,image/*
 dubbo:
   application:
     id: sys-center-dubbo-prodiver
     name: sys-center-dubbo-prodiver
   registry:
-    address: nacos://127.0.0.1:8848
+    address: nacos://172.30.0.3:8848
   protocol:
     name: dubbo
     port: 20880
@@ -20,6 +27,11 @@ management:
       exposure:
         include: metrics,httptrace
 spring:
+  cloud:
+    nacos:
+      discovery:
+        server-addr: 172.30.0.3:8848
+        service: jeecg-system
   servlet:
     multipart:
       max-file-size: -1
@@ -64,9 +76,9 @@ spring:
   autoconfigure:
     exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
   datasource:
-    url: jdbc:mysql://139.186.27.96:4000/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=GMT%2B8
-    username: data
-    password: hcst@2021
+    url: jdbc:mysql://139.186.165.84:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=GMT%2B8
+    username: hcst
+    password: hcst@2020
     driver-class-name: com.mysql.jdbc.Driver
     druid:
       stat-view-servlet:
@@ -104,16 +116,15 @@ spring:
         connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
       datasource:
         master:
-          url: jdbc:mysql://139.186.27.96:4000/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false
-          username: data
-          password: hcst@2021
+          url: jdbc:mysql://139.186.165.84:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false
+          username: hcst
+          password: hcst@2020
           driver-class-name: com.mysql.jdbc.Driver
   #redis 配置
   redis:
     database: 0
-    #    host: 172.30.0.17
     host: 127.0.0.1
-    password:
+    password: hcst@2020
     port: 6379
     lettuce:
       pool:

+ 0 - 12
jeecg-cloud-module/jeecg-cloud-system-start/src/main/resources/application.yml

@@ -1,19 +1,7 @@
-server:
-  port: 7001
-  servlet:
-    context-path: /jeecg-boot
-    compression:
-      enabled: true
-      mime-types: application/javascript,application/json,application/xml,text/html,text/xml,text/plain,text/css,image/*
 spring:
   application:
     name: jeecg-system
   profiles:
     active: @activatedProperties@
-  cloud:
-    nacos:
-      discovery:
-        server-addr: 127.0.0.1:8848
-        service: jeecg-system
   main:
     allow-bean-definition-overriding: true