Selaa lähdekoodia

fix 修改git过滤配置文件

DYH2020 1 vuosi sitten
vanhempi
commit
19e3a979cd

+ 0 - 64
ywt-platform-outpatient-common/src/main/java/com/ywt/outpatient/config/ParameterConfigurer.java

@@ -1,64 +0,0 @@
-package com.ywt.outpatient.config;
-
-import com.ywt.biz.common.util.Checker;
-import com.ywt.outpatient.api.checkIn.CheckInConstants;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.stereotype.Component;
-
-
-/**
- * @author daiyihua
- * @create 2019-01-16 11:54 AM
- * @desc 配置文件传过来的参数配置
- **/
-@Configuration
-public class ParameterConfigurer {
-    private static Logger logger = LoggerFactory.getLogger(ParameterConfigurer.class);
-
-    @Value("${ywt.covid19.list.count}")
-    private Integer ywtCovid19ListCount;
-
-    @Value("${com.by.ftp.appid}")
-    private String byFtpAppid;
-
-    @Value("${com.by.ftp.appsecret}")
-    private String byFtpAppsecret;
-
-    @Value("${com.by.ftp.url}")
-    private String byFtpUrl;
-
-    @Value("${com.by.distance}")
-    private Integer nearBYDistance;
-
-    public Integer getYwtCovid19ListCount() {
-        if (Checker.isNone(ywtCovid19ListCount)){
-            return 100;
-        }
-        return ywtCovid19ListCount;
-    }
-
-    public String getByFtpAppid() {
-        return byFtpAppid;
-    }
-
-    public String getByFtpAppsecret() {
-        return byFtpAppsecret;
-    }
-
-    public String getByFtpUrl() {
-        return byFtpUrl;
-    }
-
-    public Integer getNearBYDistance() {
-        if (Checker.isNone(nearBYDistance)){
-//            logger.info("ParameterConfigurer#getNearBYDistance()1 :{}", nearBYDistance);
-            nearBYDistance = CheckInConstants.NEARBY_DISTANCE_NEW;
-        }
-        logger.info("ParameterConfigurer#getNearBYDistance()2 :{}",nearBYDistance);
-        return nearBYDistance;
-    }
-}

+ 16 - 0
ywt-platform-outpatient-common/src/main/java/com/ywt/outpatient/config/biz/BizParamWebConfig.java

@@ -0,0 +1,16 @@
+package com.ywt.outpatient.config.biz;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+@ConfigurationProperties(prefix = "biz-param.web")
+@Data
+public class BizParamWebConfig {
+    private String covid19;
+    private String comByDistance;
+    private String comByFtpAppid;
+    private String comByFtpAppsecret;
+    private String comByFtpUrl;
+}

+ 7 - 9
ywt-platform-outpatient-web/src/main/resources/application.yml

@@ -56,14 +56,12 @@ dubbo: #统一配置
     retries: 2
     check: false
 #自定义参数
-param:
-  covid19: @ywt.covid19.list.count@
-  com:
-    by:
-      distance: @com.by.distance@
-      ftp:
-        appid: @com.by.ftp.appid@
-        appsecret: @com.by.ftp.appsecret@
-        url: @com.by.ftp.url@
+biz-param:
+  web:
+    covid19: @ywt.covid19.list.count@
+    comByDistance: @com.by.distance@
+    comByFtpAppid: @com.by.ftp.appid@
+    comByFtpAppsecret: @com.by.ftp.appsecret@
+    comByFtpUrl: @com.by.ftp.url@