diff --git a/nflg_project_dev/bom/nflg-bom.iml b/nflg_project_dev/bom/nflg-bom.iml deleted file mode 100644 index 37f21add..00000000 --- a/nflg_project_dev/bom/nflg-bom.iml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/nflg_project_dev/bom/pom.xml b/nflg_project_dev/bom/pom.xml index d70cf133..a6085a79 100644 --- a/nflg_project_dev/bom/pom.xml +++ b/nflg_project_dev/bom/pom.xml @@ -101,6 +101,12 @@ jcifs jcifs ${jcifs.version} + + + servlet-api + javax.servlet + + diff --git a/nflg_project_dev/nflg-bom-new/target/classes/bootstrap-dev.properties b/nflg_project_dev/nflg-bom-new/target/classes/bootstrap-dev.properties deleted file mode 100644 index 74ba7641..00000000 --- a/nflg_project_dev/nflg-bom-new/target/classes/bootstrap-dev.properties +++ /dev/null @@ -1,4 +0,0 @@ -#nacos.server-addr=114.132.64.230:8123 -nacos.server-addr=192.168.0.194:8848 - - diff --git a/nflg_project_dev/nflg-bom-new/target/classes/bootstrap-prod.properties b/nflg_project_dev/nflg-bom-new/target/classes/bootstrap-prod.properties deleted file mode 100644 index f648f2ca..00000000 --- a/nflg_project_dev/nflg-bom-new/target/classes/bootstrap-prod.properties +++ /dev/null @@ -1 +0,0 @@ -nacos.server-addr=192.168.0.191:8848 \ No newline at end of file diff --git a/nflg_project_dev/nflg-bom-new/target/classes/bootstrap-sit.properties b/nflg_project_dev/nflg-bom-new/target/classes/bootstrap-sit.properties deleted file mode 100644 index 74ba7641..00000000 --- a/nflg_project_dev/nflg-bom-new/target/classes/bootstrap-sit.properties +++ /dev/null @@ -1,4 +0,0 @@ -#nacos.server-addr=114.132.64.230:8123 -nacos.server-addr=192.168.0.194:8848 - - diff --git a/nflg_project_dev/nflg-bom-new/target/classes/bootstrap.properties b/nflg_project_dev/nflg-bom-new/target/classes/bootstrap.properties deleted file mode 100644 index e36644ac..00000000 --- a/nflg_project_dev/nflg-bom-new/target/classes/bootstrap.properties +++ /dev/null @@ -1,30 +0,0 @@ -spring.application.name=bom-new -spring.profiles.active=dev - -spring.jackson.date-format=yyyy-MM-dd HH:mm:ss - -spring.cloud.nacos.config.namespace=nflg_dev -spring.cloud.nacos.discovery.namespace=nflg_dev -spring.cloud.nacos.config.file-extension=properties -nacos.plugin.namespace=nflg_dev - -#configuration -spring.cloud.nacos.config.server-addr=${nacos.server-addr} -spring.cloud.nacos.config.group=${spring.profiles.active} - -spring.cloud.nacos.config.extension-configs[0].data-id=application-${spring.profiles.active}.properties -spring.cloud.nacos.config.extension-configs[0].group=${spring.profiles.active} -spring.cloud.nacos.config.extension-configs[0].refresh=true -spring.cloud.nacos.config.extension-configs[1].data-id=mysql-${spring.profiles.active}.properties -spring.cloud.nacos.config.extension-configs[1].group=${spring.profiles.active} -spring.cloud.nacos.config.extension-configs[1].refresh=true - -#discovery -spring.cloud.nacos.discovery.server-addr=${nacos.server-addr} -spring.cloud.nacos.discovery.group=${spring.profiles.active} -spring.cloud.nacos.discovery.metadata.group=${spring.profiles.active} -spring.cloud.nacos.discovery.metadata.region=${env_region:blue} -spring.cloud.nacos.discovery.metadata.env=${spring.profiles.active} - -logging.level.com.nflg.product.material.mapper.master=INFO - diff --git a/nflg_project_dev/nflg-bom-new/target/classes/com/nflg/BomnewApplication.class b/nflg_project_dev/nflg-bom-new/target/classes/com/nflg/BomnewApplication.class deleted file mode 100644 index 6bba1ec4..00000000 Binary files a/nflg_project_dev/nflg-bom-new/target/classes/com/nflg/BomnewApplication.class and /dev/null differ diff --git a/nflg_project_dev/nflg-bom-new/target/classes/com/nflg/product/bomnew/config/DruidStatFilter.class b/nflg_project_dev/nflg-bom-new/target/classes/com/nflg/product/bomnew/config/DruidStatFilter.class deleted file mode 100644 index d0d10698..00000000 Binary files a/nflg_project_dev/nflg-bom-new/target/classes/com/nflg/product/bomnew/config/DruidStatFilter.class and /dev/null differ diff --git a/nflg_project_dev/nflg-bom-new/target/classes/com/nflg/product/bomnew/config/MasterDataSourceConfig.class b/nflg_project_dev/nflg-bom-new/target/classes/com/nflg/product/bomnew/config/MasterDataSourceConfig.class deleted file mode 100644 index e87e7fab..00000000 Binary files a/nflg_project_dev/nflg-bom-new/target/classes/com/nflg/product/bomnew/config/MasterDataSourceConfig.class and /dev/null differ diff --git a/nflg_project_dev/nflg-bom-new/target/classes/com/nflg/product/bomnew/config/NacosConfig.class b/nflg_project_dev/nflg-bom-new/target/classes/com/nflg/product/bomnew/config/NacosConfig.class deleted file mode 100644 index 67cf0c5d..00000000 Binary files a/nflg_project_dev/nflg-bom-new/target/classes/com/nflg/product/bomnew/config/NacosConfig.class and /dev/null differ diff --git a/nflg_project_dev/nflg-bom-new/target/classes/com/nflg/product/bomnew/fallback/ValideUserApi.class b/nflg_project_dev/nflg-bom-new/target/classes/com/nflg/product/bomnew/fallback/ValideUserApi.class deleted file mode 100644 index a3442ce4..00000000 Binary files a/nflg_project_dev/nflg-bom-new/target/classes/com/nflg/product/bomnew/fallback/ValideUserApi.class and /dev/null differ diff --git a/nflg_project_dev/pom.xml b/nflg_project_dev/pom.xml index a2586805..70f5eb88 100644 --- a/nflg_project_dev/pom.xml +++ b/nflg_project_dev/pom.xml @@ -20,6 +20,7 @@ nflg-boot-base nflg-boot-starter nflg-cloud-gateway + nflg-bom-new pom