diff --git a/pjcloud-hardware/pjcloud-hardware-api/pom.xml b/pjcloud-hardware/pjcloud-hardware-api/pom.xml new file mode 100644 index 000000000..ebd69e967 --- /dev/null +++ b/pjcloud-hardware/pjcloud-hardware-api/pom.xml @@ -0,0 +1,41 @@ + + + 4.0.0 + + com.bsd + pjcloud-hardware + 5.7.0 + + + pjcloud-hardware-api + + + + + com.bsd + pjcloud-common-core + + + + com.baomidou + mybatis-plus-spring + + + + com.bsd + pjcloud-common-feign + + + + com.bsd + pjcloud-common-excel + + + + com.bsd + pjcloud-common-sensitive + + + + \ No newline at end of file diff --git a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/example/Main.java b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/example/Main.java new file mode 100644 index 000000000..b47156fd1 --- /dev/null +++ b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/example/Main.java @@ -0,0 +1,7 @@ +package com.example; + +public class Main { + public static void main(String[] args) { + System.out.println("Hello world!"); + } +} \ No newline at end of file diff --git a/pjcloud-hardware/pjcloud-hardware-biz/pom.xml b/pjcloud-hardware/pjcloud-hardware-biz/pom.xml new file mode 100644 index 000000000..5c35a4c48 --- /dev/null +++ b/pjcloud-hardware/pjcloud-hardware-biz/pom.xml @@ -0,0 +1,140 @@ + + + 4.0.0 + + com.bsd + pjcloud-hardware + 5.7.0 + + + pjcloud-hardware-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 + pjcloud-app-server-api + 5.7.0 + + + + com.bsd + pjcloud-thirdparty-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 + + + + com.bsd + pjcloud-common-seata + + + + + + cloud + + true + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + repackage + + + CLASSIC + + + + + + io.fabric8 + docker-maven-plugin + + false + + + + + + + boot + + + + \ No newline at end of file diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/example/pjcloudhardwarebiz/PjcloudHardwareBizApplication.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/example/pjcloudhardwarebiz/PjcloudHardwareBizApplication.java new file mode 100644 index 000000000..7fdc967dc --- /dev/null +++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/example/pjcloudhardwarebiz/PjcloudHardwareBizApplication.java @@ -0,0 +1,13 @@ +package com.example.pjcloudhardwarebiz; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class PjcloudHardwareBizApplication { + + public static void main(String[] args) { + SpringApplication.run(PjcloudHardwareBizApplication.class, args); + } + +} diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/application.properties b/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/application.properties new file mode 100644 index 000000000..1609c6439 --- /dev/null +++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/application.properties @@ -0,0 +1 @@ +spring.application.name=pjcloud-hardware-biz diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/test/java/com/example/pjcloudhardwarebiz/PjcloudHardwareBizApplicationTests.java b/pjcloud-hardware/pjcloud-hardware-biz/src/test/java/com/example/pjcloudhardwarebiz/PjcloudHardwareBizApplicationTests.java new file mode 100644 index 000000000..2d49473a1 --- /dev/null +++ b/pjcloud-hardware/pjcloud-hardware-biz/src/test/java/com/example/pjcloudhardwarebiz/PjcloudHardwareBizApplicationTests.java @@ -0,0 +1,13 @@ +package com.example.pjcloudhardwarebiz; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class PjcloudHardwareBizApplicationTests { + + @Test + void contextLoads() { + } + +} diff --git a/pjcloud-hardware/pom.xml b/pjcloud-hardware/pom.xml new file mode 100644 index 000000000..cd46669c6 --- /dev/null +++ b/pjcloud-hardware/pom.xml @@ -0,0 +1,22 @@ + + + + 4.0.0 + + + com.bsd + pjcloud + 5.7.0 + + + pjcloud-hardware + pom + + + + pjcloud-hardware-api + pjcloud-hardware-biz + + + diff --git a/pjcloud-wallet/.editorconfig b/pjcloud-wallet/.editorconfig deleted file mode 100644 index 2f2262bb1..000000000 --- a/pjcloud-wallet/.editorconfig +++ /dev/null @@ -1,18 +0,0 @@ -# 开发组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/pjcloud-wallet/README.md b/pjcloud-wallet/README.md deleted file mode 100644 index 77b54353a..000000000 --- a/pjcloud-wallet/README.md +++ /dev/null @@ -1,22 +0,0 @@ - -项目描述 .... - - - - -| 姓名 | 角色 | 时间 | -| ---- | ---- |---------| -| xxx | 开发 | 2023-01 | -| | | | -| | | | - - - - -``` -项目根目录 -├── xxx-api -- 业务接口(实体,DTO,utils,feign接口) -├── xxx-biz -- 业务实现[默认服务端口 : 6060] -``` - - diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/application.yml b/pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/application.yml index e268513ec..3cd098f7a 100644 --- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/application.yml +++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/application.yml @@ -1,5 +1,5 @@ server: - port: 6060 + port: 6070 spring: application: @@ -9,17 +9,10 @@ spring: username: @nacos.username@ password: @nacos.password@ discovery: - server-addr: pjcloud-register:8848 + server-addr: 123.156.230.15: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/pjcloudx_wallet?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true + - optional:nacos:${spring.application.name}-@profiles.active@.yml \ No newline at end of file diff --git a/pjcloud-wallet/pom.xml b/pjcloud-wallet/pom.xml index 9414a195c..1ce45a835 100644 --- a/pjcloud-wallet/pom.xml +++ b/pjcloud-wallet/pom.xml @@ -11,6 +11,7 @@ pjcloud-wallet + 钱包模块 pom diff --git a/pom.xml b/pom.xml index f51c17bde..d0fad82d9 100644 --- a/pom.xml +++ b/pom.xml @@ -16,7 +16,9 @@ ~ this software without specific prior written permission. ~ Author: pjcloud ~ - --> + --> + 4.0.0 com.bsd @@ -119,10 +121,11 @@ pjcloud-app-server pjcloud-thirdparty pjcloud-canteen - pjcloud-supermarket-erp - pjcloud-wallet - pjcloud-supermarket - + pjcloud-supermarket-erp + pjcloud-wallet + pjcloud-hardware + pjcloud-supermarket +