diff --git a/erp/.editorconfig b/erp/.editorconfig
new file mode 100644
index 000000000..2f2262bb1
--- /dev/null
+++ b/erp/.editorconfig
@@ -0,0 +1,18 @@
+# 开发组IDE 编辑器标准 V2.1.0
+root = true
+
+[*.{adoc, bat, groovy, html, java, js, jsp, kt, kts, md, properties, py, rb, sh, sql, svg, txt, xml, xsd}]
+charset = utf-8
+
+[*.{groovy, java, kt, kts, xml, xsd}]
+indent_style = tab
+indent_size = 4
+continuation_indent_size = 8
+end_of_line = lf
+
+[*.{js, html}]
+indent_style = space
+indent_size = 2
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
diff --git a/erp/README.md b/erp/README.md
new file mode 100644
index 000000000..77b54353a
--- /dev/null
+++ b/erp/README.md
@@ -0,0 +1,22 @@
+
+项目描述 ....
+
+
+
+
+| 姓名 | 角色 | 时间 |
+| ---- | ---- |---------|
+| xxx | 开发 | 2023-01 |
+| | | |
+| | | |
+
+
+
+
+```
+项目根目录
+├── xxx-api -- 业务接口(实体,DTO,utils,feign接口)
+├── xxx-biz -- 业务实现[默认服务端口 : 6060]
+```
+
+
diff --git a/erp/erp-api/pom.xml b/erp/erp-api/pom.xml
new file mode 100644
index 000000000..d4823cdee
--- /dev/null
+++ b/erp/erp-api/pom.xml
@@ -0,0 +1,42 @@
+
+
+ 4.0.0
+
+ com.bsd
+ erp
+ 5.7.0
+
+
+ erp-api
+
+
+
+
+ com.github.yulichang
+ mybatis-plus-join-annotation
+
+
+
+ com.bsd
+ pjcloud-common-core
+
+
+
+ com.baomidou
+ mybatis-plus-extension
+
+
+
+ com.bsd
+ pjcloud-common-feign
+
+
+
+ com.bsd
+ pjcloud-common-excel
+
+
+
diff --git a/erp/erp-api/src/main/java/com/bsd/pjcloud/erp/api/feign/packge-info.java b/erp/erp-api/src/main/java/com/bsd/pjcloud/erp/api/feign/packge-info.java
new file mode 100644
index 000000000..19bcac496
--- /dev/null
+++ b/erp/erp-api/src/main/java/com/bsd/pjcloud/erp/api/feign/packge-info.java
@@ -0,0 +1,6 @@
+/*
+ @author pigx archetype
+ *
+ * feign client 存放目录，注意 @EnablePigxFeignClients 的扫描范围
+ */
+package com.bsd.pjcloud.erp.api.feign;
\ No newline at end of file
diff --git a/erp/erp-api/src/main/java/com/bsd/pjcloud/erp/constant/packge-info.java b/erp/erp-api/src/main/java/com/bsd/pjcloud/erp/constant/packge-info.java
new file mode 100644
index 000000000..3d3a3c964
--- /dev/null
+++ b/erp/erp-api/src/main/java/com/bsd/pjcloud/erp/constant/packge-info.java
@@ -0,0 +1,6 @@
+/*
+ * @author pigx archetype
+ *
+ * 常量和枚举定义
+ */
+package com.bsd.pjcloud.erp.constant;
\ No newline at end of file
diff --git a/erp/erp-api/src/main/java/com/bsd/pjcloud/erp/dto/packge-info.java b/erp/erp-api/src/main/java/com/bsd/pjcloud/erp/dto/packge-info.java
new file mode 100644
index 000000000..006add580
--- /dev/null
+++ b/erp/erp-api/src/main/java/com/bsd/pjcloud/erp/dto/packge-info.java
@@ -0,0 +1,6 @@
+/*
+ * @author pigx archetype
+ *
+ * DTO 存放目录
+ */
+package com.bsd.pjcloud.erp.dto;
\ No newline at end of file
diff --git a/erp/erp-api/src/main/java/com/bsd/pjcloud/erp/entity/packge-info.java b/erp/erp-api/src/main/java/com/bsd/pjcloud/erp/entity/packge-info.java
new file mode 100644
index 000000000..dce807af6
--- /dev/null
+++ b/erp/erp-api/src/main/java/com/bsd/pjcloud/erp/entity/packge-info.java
@@ -0,0 +1,6 @@
+/*
+ * @author pigx archetype
+ *
+ * 实体 存放目录
+ */
+package com.bsd.pjcloud.erp.entity;
\ No newline at end of file
diff --git a/erp/erp-biz/pom.xml b/erp/erp-biz/pom.xml
new file mode 100644
index 000000000..d12e1b385
--- /dev/null
+++ b/erp/erp-biz/pom.xml
@@ -0,0 +1,134 @@
+
+
+ 4.0.0
+
+ com.bsd
+ erp
+ 5.7.0
+
+
+ erp-biz
+
+
+
+
+ org.springframework.boot
+ spring-boot-starter-undertow
+
+
+
+ org.springframework.boot
+ spring-boot-starter-web
+
+
+
+ com.alibaba.cloud
+ spring-cloud-starter-alibaba-nacos-discovery
+
+
+
+ com.alibaba.cloud
+ spring-cloud-starter-alibaba-nacos-config
+
+
+
+ com.bsd
+ pjcloud-common-data
+
+
+
+ com.bsd
+ pjcloud-common-security
+
+
+
+ com.bsd
+ pjcloud-common-xss
+
+
+
+ com.bsd
+ pjcloud-common-sentinel
+
+
+
+ com.bsd
+ pjcloud-common-feign
+
+
+
+ com.bsd
+ erp-api
+ 5.7.0
+
+
+
+ com.bsd
+ pjcloud-common-log
+
+
+
+ com.baomidou
+ mybatis-plus-spring-boot3-starter
+
+
+
+ com.alibaba
+ druid-spring-boot-3-starter
+
+
+
+ com.mysql
+ mysql-connector-j
+
+
+
+ com.bsd
+ pjcloud-common-swagger
+
+
+
+ org.springframework.boot
+ spring-boot-starter-test
+
+
+
+
+ cloud
+
+ true
+
+
+
+
+ org.springframework.boot
+ spring-boot-maven-plugin
+
+
+
+ repackage
+
+
+ CLASSIC
+
+
+
+
+
+ io.fabric8
+ docker-maven-plugin
+
+ false
+
+
+
+
+
+
+ boot
+
+
+
diff --git a/erp/erp-biz/src/main/java/com/bsd/pjcloud/erp/ErpApp.java b/erp/erp-biz/src/main/java/com/bsd/pjcloud/erp/ErpApp.java
new file mode 100644
index 000000000..6137128a7
--- /dev/null
+++ b/erp/erp-biz/src/main/java/com/bsd/pjcloud/erp/ErpApp.java
@@ -0,0 +1,24 @@
+package com.bsd.pjcloud.erp;
+
+import com.bsd.pjcloud.common.feign.annotation.EnablePjcloudFeignClients;
+import com.bsd.pjcloud.common.security.annotation.EnablePjcloudResourceServer;
+import com.bsd.pjcloud.common.swagger.annotation.EnableOpenApi;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
+
+/**
+ * @author archetype auto
+ *
+ * 项目启动类
+ */
+@EnableOpenApi("erp")
+@EnablePjcloudFeignClients
+@EnableDiscoveryClient
+@EnablePjcloudResourceServer
+@SpringBootApplication
+public class ErpApp {
+ public static void main(String[] args) {
+ SpringApplication.run(ErpApp.class, args);
+ }
+}
diff --git a/erp/erp-biz/src/main/java/com/bsd/pjcloud/erp/controller/packge-info.java b/erp/erp-biz/src/main/java/com/bsd/pjcloud/erp/controller/packge-info.java
new file mode 100644
index 000000000..ab94c9873
--- /dev/null
+++ b/erp/erp-biz/src/main/java/com/bsd/pjcloud/erp/controller/packge-info.java
@@ -0,0 +1,4 @@
+/*
+ * @author pigx archetype
+ */
+package com.bsd.pjcloud.erp.controller;
\ No newline at end of file
diff --git a/erp/erp-biz/src/main/java/com/bsd/pjcloud/erp/mapper/packge-info.java b/erp/erp-biz/src/main/java/com/bsd/pjcloud/erp/mapper/packge-info.java
new file mode 100644
index 000000000..04dba2764
--- /dev/null
+++ b/erp/erp-biz/src/main/java/com/bsd/pjcloud/erp/mapper/packge-info.java
@@ -0,0 +1,6 @@
+/*
+ * @author pigx archetype
+ *
+ * Mybatis Mapper 存放目录
+ */
+package com.bsd.pjcloud.erp.mapper;
\ No newline at end of file
diff --git a/erp/erp-biz/src/main/java/com/bsd/pjcloud/erp/service/packge-info.java b/erp/erp-biz/src/main/java/com/bsd/pjcloud/erp/service/packge-info.java
new file mode 100644
index 000000000..717829b4e
--- /dev/null
+++ b/erp/erp-biz/src/main/java/com/bsd/pjcloud/erp/service/packge-info.java
@@ -0,0 +1,4 @@
+/*
+ * @author pigx archetype
+ */
+package com.bsd.pjcloud.erp.service;
\ No newline at end of file
diff --git a/erp/erp-biz/src/main/resources/application.yml b/erp/erp-biz/src/main/resources/application.yml
new file mode 100644
index 000000000..08e83c1a9
--- /dev/null
+++ b/erp/erp-biz/src/main/resources/application.yml
@@ -0,0 +1,25 @@
+server:
+ port: 6060
+
+spring:
+ application:
+ name: @artifactId@
+ cloud:
+ nacos:
+ username: @nacos.username@
+ password: @nacos.password@
+ discovery:
+ server-addr: pjcloud-register:8848
+ config:
+ server-addr: ${spring.cloud.nacos.discovery.server-addr}
+ config:
+ import:
+ - optional:nacos:application-@profiles.active@.yml
+ - optional:nacos:${spring.application.name}-@profiles.active@.yml
+ datasource:
+ type: com.alibaba.druid.pool.DruidDataSource
+ druid:
+ driver-class-name: com.mysql.cj.jdbc.Driver
+ username: root
+ password: root
+ url: jdbc:mysql://pjcloud-mysql:3306/pjcloud_demo?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true
diff --git a/erp/erp-biz/src/main/resources/logback-spring.xml b/erp/erp-biz/src/main/resources/logback-spring.xml
new file mode 100644
index 000000000..964ca8735
--- /dev/null
+++ b/erp/erp-biz/src/main/resources/logback-spring.xml
@@ -0,0 +1,70 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ${CONSOLE_LOG_PATTERN}
+
+
+
+
+
+ ${log.path}/debug.log
+
+ ${log.path}/%d{yyyy-MM, aux}/debug.%d{yyyy-MM-dd}.%i.log.gz
+ 50MB
+ 30
+
+
+ %date [%thread] %-5level [%logger{50}] %file:%line - %msg%n
+
+
+
+
+
+ ${log.path}/error.log
+
+ ${log.path}/%d{yyyy-MM}/error.%d{yyyy-MM-dd}.%i.log.gz
+ 50MB
+ 30
+
+
+ %date [%thread] %-5level [%logger{50}] %file:%line - %msg%n
+
+
+ ERROR
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/erp/pom.xml b/erp/pom.xml
new file mode 100644
index 000000000..e7582a332
--- /dev/null
+++ b/erp/pom.xml
@@ -0,0 +1,21 @@
+
+
+
+ 4.0.0
+
+
+ com.bsd
+ pjcloud
+ 5.7.0
+
+
+ erp
+ pom
+
+
+
+ erp-api
+ erp-biz
+
+
diff --git a/pom.xml b/pom.xml
index ab5812ae6..00368ac98 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,5 +1,4 @@
-
-
+ -->
4.0.0
com.bsd
@@ -60,32 +57,32 @@
registry.cn-hangzhou.aliyuncs.com
http://127.0.0.1:2375
pigcloudx
- 佩小格科技
+ СƼ
qq123456
0.33.0
-
+
false
-
+
org.springframework.boot
spring-boot-configuration-processor
true
-
+
com.github.ulisesbocchio
jasypt-spring-boot-starter
${jasypt.version}
-
+
org.springframework.boot
spring-boot-starter-actuator
-
+
de.codecentric
spring-boot-admin-starter-client
@@ -103,7 +100,7 @@
jaxb-impl
${jaxb.version}
-
+
org.springframework.boot
spring-boot-starter-test
@@ -122,11 +119,12 @@
pjcloud-app-server
pjcloud-thirdparty
pjcloud-canteen
-
+ erp
+
-
+
com.bsd
pjcloud-common-bom
@@ -134,7 +132,7 @@
pom
import
-
+
org.springframework.boot
spring-boot-dependencies
@@ -142,7 +140,7 @@
pom
import
-
+
org.springframework.cloud
spring-cloud-dependencies
@@ -158,13 +156,13 @@
pom
import
-
+
org.springframework.boot
spring-boot-starter-web
${spring-boot.version}
-
+
spring-boot-starter-tomcat
org.springframework.boot
@@ -184,7 +182,7 @@
-
+
org.springframework.boot
spring-boot-maven-plugin
@@ -197,7 +195,7 @@
-
+
io.fabric8
docker-maven-plugin
@@ -224,13 +222,13 @@
-
+
io.spring.javaformat
spring-javaformat-maven-plugin
${spring.checkstyle.version}
-
+
org.apache.maven.plugins
maven-compiler-plugin
@@ -242,7 +240,7 @@
true
-
+
io.github.git-commit-id
git-commit-id-maven-plugin
@@ -253,13 +251,13 @@
revision
- validate
+ validate
false
true
-
+
yyyy-MM-dd HH:mm:ss
^git.build.(time|version)$
@@ -274,13 +272,13 @@
cloud
-
+
dev
nacos
nacos
-
+
true
@@ -291,4 +289,4 @@
-
+
\ No newline at end of file