diff --git a/ds-gw/pom.xml b/ds-gw/pom.xml index f674c785..391c2acd 100644 --- a/ds-gw/pom.xml +++ b/ds-gw/pom.xml @@ -65,6 +65,11 @@ okhttp 4.12.0 - + + + org.yaml + snakeyaml + ${snakeyaml.version} + diff --git a/ds-gw/src/main/java/com/dsideal/gw/GwApplication.java b/ds-gw/src/main/java/com/dsideal/gw/GwApplication.java index 9eade7d0..a3ea5fea 100644 --- a/ds-gw/src/main/java/com/dsideal/gw/GwApplication.java +++ b/ds-gw/src/main/java/com/dsideal/gw/GwApplication.java @@ -2,10 +2,10 @@ package com.dsideal.gw; import cn.hutool.core.io.FileUtil; import com.dsideal.gw.Handler.RouterHandler; +import com.dsideal.gw.Plugin.YamlProp; import com.dsideal.gw.Util.LogBackLogFactory; import com.jfinal.config.*; import com.jfinal.kit.Prop; -import com.jfinal.kit.PropKit; import com.jfinal.server.undertow.UndertowServer; import com.jfinal.template.Engine; @@ -37,12 +37,11 @@ public class GwApplication extends JFinalConfig { //使用LogBack me.setLogFactory(new LogBackLogFactory()); //加载配置文件 - String configFile = "application_{?}.properties".replace("{?}", getEnvPrefix()); - Prop prop = PropKit.use(configFile); - + String configFile = "application_{?}.yaml".replace("{?}", getEnvPrefix()); + Prop prop = new YamlProp(configFile); // 获取所有配置项,得到路由表 for (Map.Entry entry : prop.getProperties().entrySet()) { - if (entry.getKey().toString().startsWith("route_")) { + if (entry.getKey().toString().startsWith("route")) { routeDict.put(entry.getKey().toString().substring(6), entry.getValue().toString()); } } diff --git a/ds-gw/src/main/java/com/dsideal/gw/Plugin/YamlProp.java b/ds-gw/src/main/java/com/dsideal/gw/Plugin/YamlProp.java new file mode 100644 index 00000000..39cf2ec0 --- /dev/null +++ b/ds-gw/src/main/java/com/dsideal/gw/Plugin/YamlProp.java @@ -0,0 +1,47 @@ +package com.dsideal.gw.Plugin; + +import com.jfinal.kit.Prop; +import org.yaml.snakeyaml.Yaml; + +import java.io.InputStream; +import java.util.LinkedHashMap; +import java.util.Map; +import java.util.Properties; + +public class YamlProp extends Prop { + public YamlProp(String yamlFile) { + setYaml(yamlFile); + } + + private void setYaml(String yamlFile) { + LinkedHashMap map = null; + Properties properties = new Properties(); + InputStream in; + try { + Yaml yaml = new Yaml(); + in = YamlProp.class.getClassLoader().getResourceAsStream(yamlFile); + map = yaml.loadAs(in, LinkedHashMap.class); + } catch (Exception e) { + e.printStackTrace(); + } + setProperties(properties, map, ""); + this.properties = properties; + } + + private static void setProperties(Properties properties, Map map, String prefix) { + for (Object key : map.keySet()) { + Object value = map.get(key); + if (key == null) { + continue; + } + if (value instanceof Map) { + setProperties(properties, (Map) value, prefix + key + "."); + } else { + if (value == null) { + continue; + } + properties.setProperty(prefix + key, value.toString()); + } + } + } +} \ No newline at end of file diff --git a/ds-gw/src/main/resources/application_dev.properties b/ds-gw/src/main/resources/application_dev.properties deleted file mode 100644 index 67d10b35..00000000 --- a/ds-gw/src/main/resources/application_dev.properties +++ /dev/null @@ -1,20 +0,0 @@ -# 数据库信息 -driverClassName=com.mysql.cj.jdbc.Driver -user=root -password=DsideaL147258369 -jdbcUrl=jdbc:mysql://10.10.14.210:22066/ds_db?rewriteBatchedStatements=true&useUnicode=true&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai -# redis -redis_ip=10.10.14.210 -redis_port=18890 -redis_password= -# ============================================================== -# 生成Token的密码 -CookieMd5SingPwd=DsideaL4r5t6y7u -# 导出excel 的模板配置路径 -excelExportTemplatePathSuffix=/ExcelExportTemplate/ -# 导入excel 的模板配置路径 -ExcelImportTemplatePathSuffix=/ExcelImportTemplate/ - -# 基础数据 -route_ds-base= http://ds-base:8001 - diff --git a/ds-gw/src/main/resources/application_dev.yaml b/ds-gw/src/main/resources/application_dev.yaml new file mode 100644 index 00000000..2cf328f9 --- /dev/null +++ b/ds-gw/src/main/resources/application_dev.yaml @@ -0,0 +1,12 @@ +# 路由 +route: + # 基础数据 + ds-base: + url: http://ds-base:8001 + # 资源库 + ds-resource: + url: http://ds-resouce:8002 + +# 白名单 +whitelist: + - /ds-base/doLogin diff --git a/ds-gw/src/main/resources/application_pro.properties b/ds-gw/src/main/resources/application_pro.properties deleted file mode 100644 index 39c7e9dd..00000000 --- a/ds-gw/src/main/resources/application_pro.properties +++ /dev/null @@ -1,19 +0,0 @@ -# 数据库信息 -driverClassName=com.mysql.cj.jdbc.Driver -user=ylt -password=Ycharge666 -jdbcUrl=jdbc:mysql://rm-bp1ux6tuk49er80t9.mysql.rds.aliyuncs.com:3306/ds_db?useUnicode=true&characterEncoding=UTF-8 -# redis -redis_ip=r-bp14c1p5j5lkpw1jc2.redis.rds.aliyuncs.com -redis_port=6379 -redis_password=Ycharge666 -# ============================================================== -# 生成Token的密码 -CookieMd5SingPwd=DsideaL4r5t6y7u -# 导出excel 的模板配置路径 -excelExportTemplatePathSuffix=/ExcelExportTemplate/ -# 导入excel 的模板配置路径 -ExcelImportTemplatePathSuffix=/ExcelImportTemplate/ - -# 基础数据 -route_ds-base= http://ds-base:8001 \ No newline at end of file diff --git a/ds-gw/src/main/resources/application_pro.yaml b/ds-gw/src/main/resources/application_pro.yaml new file mode 100644 index 00000000..2cf328f9 --- /dev/null +++ b/ds-gw/src/main/resources/application_pro.yaml @@ -0,0 +1,12 @@ +# 路由 +route: + # 基础数据 + ds-base: + url: http://ds-base:8001 + # 资源库 + ds-resource: + url: http://ds-resouce:8002 + +# 白名单 +whitelist: + - /ds-base/doLogin diff --git a/ds-gw/target/classes/application_dev.properties b/ds-gw/target/classes/application_dev.properties deleted file mode 100644 index 67d10b35..00000000 --- a/ds-gw/target/classes/application_dev.properties +++ /dev/null @@ -1,20 +0,0 @@ -# 数据库信息 -driverClassName=com.mysql.cj.jdbc.Driver -user=root -password=DsideaL147258369 -jdbcUrl=jdbc:mysql://10.10.14.210:22066/ds_db?rewriteBatchedStatements=true&useUnicode=true&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai -# redis -redis_ip=10.10.14.210 -redis_port=18890 -redis_password= -# ============================================================== -# 生成Token的密码 -CookieMd5SingPwd=DsideaL4r5t6y7u -# 导出excel 的模板配置路径 -excelExportTemplatePathSuffix=/ExcelExportTemplate/ -# 导入excel 的模板配置路径 -ExcelImportTemplatePathSuffix=/ExcelImportTemplate/ - -# 基础数据 -route_ds-base= http://ds-base:8001 - diff --git a/ds-gw/target/classes/application_dev.yaml b/ds-gw/target/classes/application_dev.yaml new file mode 100644 index 00000000..2cf328f9 --- /dev/null +++ b/ds-gw/target/classes/application_dev.yaml @@ -0,0 +1,12 @@ +# 路由 +route: + # 基础数据 + ds-base: + url: http://ds-base:8001 + # 资源库 + ds-resource: + url: http://ds-resouce:8002 + +# 白名单 +whitelist: + - /ds-base/doLogin diff --git a/ds-gw/target/classes/application_pro.properties b/ds-gw/target/classes/application_pro.properties deleted file mode 100644 index 39c7e9dd..00000000 --- a/ds-gw/target/classes/application_pro.properties +++ /dev/null @@ -1,19 +0,0 @@ -# 数据库信息 -driverClassName=com.mysql.cj.jdbc.Driver -user=ylt -password=Ycharge666 -jdbcUrl=jdbc:mysql://rm-bp1ux6tuk49er80t9.mysql.rds.aliyuncs.com:3306/ds_db?useUnicode=true&characterEncoding=UTF-8 -# redis -redis_ip=r-bp14c1p5j5lkpw1jc2.redis.rds.aliyuncs.com -redis_port=6379 -redis_password=Ycharge666 -# ============================================================== -# 生成Token的密码 -CookieMd5SingPwd=DsideaL4r5t6y7u -# 导出excel 的模板配置路径 -excelExportTemplatePathSuffix=/ExcelExportTemplate/ -# 导入excel 的模板配置路径 -ExcelImportTemplatePathSuffix=/ExcelImportTemplate/ - -# 基础数据 -route_ds-base= http://ds-base:8001 \ No newline at end of file diff --git a/ds-gw/target/classes/application_pro.yaml b/ds-gw/target/classes/application_pro.yaml new file mode 100644 index 00000000..2cf328f9 --- /dev/null +++ b/ds-gw/target/classes/application_pro.yaml @@ -0,0 +1,12 @@ +# 路由 +route: + # 基础数据 + ds-base: + url: http://ds-base:8001 + # 资源库 + ds-resource: + url: http://ds-resouce:8002 + +# 白名单 +whitelist: + - /ds-base/doLogin diff --git a/pom.xml b/pom.xml index a3777abf..67ffa8cb 100644 --- a/pom.xml +++ b/pom.xml @@ -44,5 +44,8 @@ 5.2.5 + + + 2.3 \ No newline at end of file