!222 删除配置文件中过期属性、springdoc版本回退

Merge pull request !222 from Fxz/dev

pig-auth/src/main/resources/application.yml

@@ -12,8 +12,6 @@ spring:
         server-addr: ${spring.cloud.nacos.discovery.server-addr}
   config:
     import:
-      - nacos:application-${spring.profiles.active}.yml
-      - nacos:${spring.application.name}-${spring.profiles.active}.yml
-  profiles:
-    active: @profiles.active@
+      - nacos:application-@profiles.active@.yml
+      - nacos:${spring.application.name}-@profiles.active@.yml
 

pig-common/pig-common-bom/pom.xml

@@ -24,7 +24,7 @@
         <git.commit.plugin>4.9.9</git.commit.plugin>
         <spring.checkstyle.plugin>0.0.29</spring.checkstyle.plugin>
         <fastjson.version>1.2.78</fastjson.version>
-        <springdoc.version>1.6.7</springdoc.version>
+        <springdoc.version>1.6.6</springdoc.version>
         <swagger.core.version>2.2.0</swagger.core.version>
         <mybatis-plus.version>3.5.1</mybatis-plus.version>
         <seata.version>1.4.2</seata.version>

pig-gateway/src/main/resources/application.yml

@@ -12,10 +12,9 @@ spring:
         server-addr: ${spring.cloud.nacos.discovery.server-addr}
   config:
     import:
-      - optional:nacos:application-${spring.profiles.active}.yml
-      - optional:nacos:${spring.application.name}-${spring.profiles.active}.yml
-  profiles:
-    active: @profiles.active@
+      - optional:nacos:application-@profiles.active@.yml
+      - optional:nacos:${spring.application.name}-@profiles.active@.yml
+
 
 
 

pig-upms/pig-upms-biz/src/main/resources/application.yml

@@ -12,8 +12,7 @@ spring:
         server-addr: ${spring.cloud.nacos.discovery.server-addr}
   config:
     import:
-      - nacos:application-${spring.profiles.active}.yml
-      - nacos:${spring.application.name}-${spring.profiles.active}.yml
-  profiles:
-    active: @profiles.active@
+      - nacos:application-@profiles.active@.yml
+      - nacos:${spring.application.name}-@profiles.active@.yml
+
 

pig-visual/pig-codegen/src/main/resources/application.yml

@@ -12,8 +12,7 @@ spring:
         server-addr: ${spring.cloud.nacos.discovery.server-addr}
   config:
     import:
-      - nacos:application-${spring.profiles.active}.yml
-      - nacos:${spring.application.name}-${spring.profiles.active}.yml
-  profiles:
-    active: @profiles.active@
+      - nacos:application-@profiles.active@.yml
+      - nacos:${spring.application.name}-@profiles.active@.yml
+
 

pig-visual/pig-monitor/src/main/resources/application.yml

@@ -12,8 +12,6 @@ spring:
         server-addr: ${spring.cloud.nacos.discovery.server-addr}
   config:
     import:
-      - nacos:application-${spring.profiles.active}.yml
-      - nacos:${spring.application.name}-${spring.profiles.active}.yml
-  profiles:
-    active: @profiles.active@
+      - nacos:application-@profiles.active@.yml
+      - nacos:${spring.application.name}-@profiles.active@.yml
 

pig-visual/pig-sentinel-dashboard/src/main/resources/application.yml

@@ -11,8 +11,6 @@ spring:
     nacos:
       discovery:
         server-addr: ${NACOS_HOST:pig-register}:${NACOS_PORT:8848}
-  profiles:
-    active: @profiles.active@
 
 management:
   endpoints:

pig-visual/pig-xxl-job-admin/src/main/resources/application.yml

@@ -28,8 +28,6 @@ spring:
         server-addr: ${NACOS_HOST:pig-register}:${NACOS_PORT:8848}
         metadata:
           management.context-path: ${server.servlet.context-path}/actuator
-  profiles:
-    active: @profiles.active@
   datasource:
     url: jdbc:mysql://${MYSQL_HOST:pig-mysql}:${MYSQL_PORT:3306}/${MYSQL_DB:pig_job}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
     driver-class-name: com.mysql.cj.jdbc.Driver