diff --git a/jnpf-tendering-api/pom.xml b/jnpf-library-api/pom.xml
similarity index 83%
rename from jnpf-tendering-api/pom.xml
rename to jnpf-library-api/pom.xml
index 3c37fbe..01e6f80 100644
--- a/jnpf-tendering-api/pom.xml
+++ b/jnpf-library-api/pom.xml
@@ -3,17 +3,17 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- jnpf-tendering
+ jnpf-library
com.jnpf
3.7.0-RELEASE
4.0.0
- jnpf-tendering-api
+ jnpf-library-api
com.jnpf
- jnpf-tendering-entity
+ jnpf-library-entity
${project.version}
compile
diff --git a/jnpf-tendering-biz/pom.xml b/jnpf-library-biz/pom.xml
similarity index 84%
rename from jnpf-tendering-biz/pom.xml
rename to jnpf-library-biz/pom.xml
index b17e207..5b67f88 100644
--- a/jnpf-tendering-biz/pom.xml
+++ b/jnpf-library-biz/pom.xml
@@ -3,23 +3,23 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- jnpf-tendering
+ jnpf-library
com.jnpf
3.7.0-RELEASE
4.0.0
- jnpf-tendering-biz
+ jnpf-library-biz
com.jnpf
- jnpf-tendering-entity
+ jnpf-library-entity
${project.version}
compile
com.jnpf
- jnpf-tendering-api
+ jnpf-library-api
${project.version}
compile
diff --git a/jnpf-tendering-controller/pom.xml b/jnpf-library-controller/pom.xml
similarity index 83%
rename from jnpf-tendering-controller/pom.xml
rename to jnpf-library-controller/pom.xml
index 1eea8ef..5fa8e0d 100644
--- a/jnpf-tendering-controller/pom.xml
+++ b/jnpf-library-controller/pom.xml
@@ -3,13 +3,13 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- jnpf-tendering
+ jnpf-library
com.jnpf
3.7.0-RELEASE
4.0.0
- jnpf-tendering-controller
+ jnpf-library-controller
com.jnpf
@@ -18,7 +18,7 @@
com.jnpf
- jnpf-tendering-biz
+ jnpf-library-biz
${project.version}
compile
diff --git a/jnpf-tendering-entity/pom.xml b/jnpf-library-entity/pom.xml
similarity index 85%
rename from jnpf-tendering-entity/pom.xml
rename to jnpf-library-entity/pom.xml
index dd041cd..96476e4 100644
--- a/jnpf-tendering-entity/pom.xml
+++ b/jnpf-library-entity/pom.xml
@@ -3,13 +3,13 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- jnpf-tendering
+ jnpf-library
com.jnpf
3.7.0-RELEASE
4.0.0
- jnpf-tendering-entity
+ jnpf-library-entity
diff --git a/jnpf-tendering-entity/src/main/java/jnpf/model/JsonArrayTypeHandler.java b/jnpf-library-entity/src/main/java/jnpf/model/JsonArrayTypeHandler.java
similarity index 100%
rename from jnpf-tendering-entity/src/main/java/jnpf/model/JsonArrayTypeHandler.java
rename to jnpf-library-entity/src/main/java/jnpf/model/JsonArrayTypeHandler.java
diff --git a/jnpf-tendering-entity/src/main/java/jnpf/model/JsonTypeHandler.java b/jnpf-library-entity/src/main/java/jnpf/model/JsonTypeHandler.java
similarity index 100%
rename from jnpf-tendering-entity/src/main/java/jnpf/model/JsonTypeHandler.java
rename to jnpf-library-entity/src/main/java/jnpf/model/JsonTypeHandler.java
diff --git a/jnpf-tendering-server/pom.xml b/jnpf-library-server/pom.xml
similarity index 81%
rename from jnpf-tendering-server/pom.xml
rename to jnpf-library-server/pom.xml
index 6d1dfb4..b89783d 100644
--- a/jnpf-tendering-server/pom.xml
+++ b/jnpf-library-server/pom.xml
@@ -3,32 +3,32 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- jnpf-tendering
+ jnpf-library
com.jnpf
3.7.0-RELEASE
4.0.0
- jnpf-tendering-server
+ jnpf-library-server
com.jnpf
- jnpf-tendering-controller
+ jnpf-library-controller
${project.version}
- jnpf-tendering-${project.version}
+ jnpf-library-${project.version}
org.springframework.boot
spring-boot-maven-plugin
- jnpf.JnpfTenderingApplication
+ jnpf.JnpfLibraryApplication
ZIP
diff --git a/jnpf-tendering-server/src/main/java/jnpf/JnpfTenderingApplication.java b/jnpf-library-server/src/main/java/jnpf/JnpfLibraryApplication.java
similarity index 76%
rename from jnpf-tendering-server/src/main/java/jnpf/JnpfTenderingApplication.java
rename to jnpf-library-server/src/main/java/jnpf/JnpfLibraryApplication.java
index 45c2382..296468b 100644
--- a/jnpf-tendering-server/src/main/java/jnpf/JnpfTenderingApplication.java
+++ b/jnpf-library-server/src/main/java/jnpf/JnpfLibraryApplication.java
@@ -6,10 +6,10 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
@SpringBootApplication
@EnableFeignClients
-public class JnpfTenderingApplication {
+public class JnpfLibraryApplication {
public static void main(String[] args) {
- SpringApplication.run(JnpfTenderingApplication.class, args);
+ SpringApplication.run(JnpfLibraryApplication.class, args);
System.out.println("tendering启动成功");
}
diff --git a/jnpf-tendering-server/src/main/resources/application.yml b/jnpf-library-server/src/main/resources/application.yml
similarity index 96%
rename from jnpf-tendering-server/src/main/resources/application.yml
rename to jnpf-library-server/src/main/resources/application.yml
index bfce1a5..6ef1595 100644
--- a/jnpf-tendering-server/src/main/resources/application.yml
+++ b/jnpf-library-server/src/main/resources/application.yml
@@ -2,7 +2,7 @@
server:
tomcat:
uri-encoding: UTF-8
- port: 30300
+ port: 30400
management:
endpoints:
diff --git a/jnpf-tendering-server/src/main/resources/bootstrap.yml b/jnpf-library-server/src/main/resources/bootstrap.yml
similarity index 90%
rename from jnpf-tendering-server/src/main/resources/bootstrap.yml
rename to jnpf-library-server/src/main/resources/bootstrap.yml
index 7b074c4..e77f9f4 100644
--- a/jnpf-tendering-server/src/main/resources/bootstrap.yml
+++ b/jnpf-library-server/src/main/resources/bootstrap.yml
@@ -1,7 +1,7 @@
spring:
application:
# 应用名称
- name: jnpf-tendering
+ name: jnpf-library
main:
allow-bean-definition-overriding: true
allow-circular-references: true
@@ -11,7 +11,7 @@ spring:
password: nacos
discovery:
# 服务注册地址
- server-addr: ${nacos.hostname:172.30.42.97}:${nacos.port:30099}
+ server-addr: ${nacos.hostname:47.96.162.218}:${nacos.port:8848}
namespace: 69c4eecb-05bd-4041-81fe-1473f95f578c
config:
server-addr: ${spring.cloud.nacos.discovery.server-addr}
diff --git a/jnpf-tendering-server/src/main/resources/jnpf/templete/招投标公司打印.docx b/jnpf-library-server/src/main/resources/jnpf/templete/招投标公司打印.docx
similarity index 100%
rename from jnpf-tendering-server/src/main/resources/jnpf/templete/招投标公司打印.docx
rename to jnpf-library-server/src/main/resources/jnpf/templete/招投标公司打印.docx
diff --git a/jnpf-tendering-server/src/main/resources/jnpf/templete/招标采购方案审批表.docx b/jnpf-library-server/src/main/resources/jnpf/templete/招标采购方案审批表.docx
similarity index 100%
rename from jnpf-tendering-server/src/main/resources/jnpf/templete/招标采购方案审批表.docx
rename to jnpf-library-server/src/main/resources/jnpf/templete/招标采购方案审批表.docx
diff --git a/jnpf-tendering-server/src/main/resources/jnpf/templete/浙江出版传媒股份有限公司ERP系统建设项目.docx b/jnpf-library-server/src/main/resources/jnpf/templete/浙江出版传媒股份有限公司ERP系统建设项目.docx
similarity index 100%
rename from jnpf-tendering-server/src/main/resources/jnpf/templete/浙江出版传媒股份有限公司ERP系统建设项目.docx
rename to jnpf-library-server/src/main/resources/jnpf/templete/浙江出版传媒股份有限公司ERP系统建设项目.docx
diff --git a/jnpf-tendering-server/src/main/resources/jnpf/templete/结果核准表.docx b/jnpf-library-server/src/main/resources/jnpf/templete/结果核准表.docx
similarity index 100%
rename from jnpf-tendering-server/src/main/resources/jnpf/templete/结果核准表.docx
rename to jnpf-library-server/src/main/resources/jnpf/templete/结果核准表.docx
diff --git a/jnpf-tendering-server/src/main/resources/jnpf/templete/联合集团项目备案表.docx b/jnpf-library-server/src/main/resources/jnpf/templete/联合集团项目备案表.docx
similarity index 100%
rename from jnpf-tendering-server/src/main/resources/jnpf/templete/联合集团项目备案表.docx
rename to jnpf-library-server/src/main/resources/jnpf/templete/联合集团项目备案表.docx
diff --git a/jnpf-tendering-server/src/main/resources/logback-spring.xml b/jnpf-library-server/src/main/resources/logback-spring.xml
similarity index 100%
rename from jnpf-tendering-server/src/main/resources/logback-spring.xml
rename to jnpf-library-server/src/main/resources/logback-spring.xml
diff --git a/jnpf-tendering-biz/src/main/java/jnpf/mapper/Base_datainterfaceMapper.java b/jnpf-tendering-biz/src/main/java/jnpf/mapper/Base_datainterfaceMapper.java
deleted file mode 100644
index 6a41466..0000000
--- a/jnpf-tendering-biz/src/main/java/jnpf/mapper/Base_datainterfaceMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package jnpf.mapper;
-
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import jnpf.entity.Base_datainterfaceEntity;
-
-/**
- * base_datainterface
- * 版本: V3.5
- * 版权: 引迈信息技术有限公司(https://www.jnpfsoft.com)
- * 作者: JNPF开发平台组
- * 日期: 2024-06-19
- */
-public interface Base_datainterfaceMapper extends BaseMapper {
-
-}
diff --git a/jnpf-tendering-biz/src/main/java/jnpf/mapper/BiddingProjectSubscribeChildMapper.java b/jnpf-tendering-biz/src/main/java/jnpf/mapper/BiddingProjectSubscribeChildMapper.java
deleted file mode 100644
index 2368967..0000000
--- a/jnpf-tendering-biz/src/main/java/jnpf/mapper/BiddingProjectSubscribeChildMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package jnpf.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import jnpf.entity.BiddingProjectSubscribeChild;
-
-/**
- *
- * Mapper 接口
- *
- *
- * @author admin
- * @since 2024-06-11
- */
-public interface BiddingProjectSubscribeChildMapper extends BaseMapper {
-
-}
diff --git a/jnpf-tendering-biz/src/main/java/jnpf/mapper/BiddingProjectSubscribeMapper.java b/jnpf-tendering-biz/src/main/java/jnpf/mapper/BiddingProjectSubscribeMapper.java
deleted file mode 100644
index 4c6d4a2..0000000
--- a/jnpf-tendering-biz/src/main/java/jnpf/mapper/BiddingProjectSubscribeMapper.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package jnpf.mapper;
-
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import jnpf.entity.BiddingProjectSubscribeEntity;
-import jnpf.model.bidding_project_subscribe.BiddingProjectSubscribePagination;
-import jnpf.model.dto.IndicatorStatisticsDto;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * bidding_project_subscribe
- * 版本: V3.5
- * 版权: 引迈信息技术有限公司(https://www.jnpfsoft.com)
- * 作者: JNPF开发平台组
- * 日期: 2024-06-11
- */
-public interface BiddingProjectSubscribeMapper extends BaseMapper {
-
- IPage queryList(@Param("page") Page