From ae7507abb2623f3861349b352c369b90de110c2f Mon Sep 17 00:00:00 2001 From: dzc <2388224167@qq.com> Date: Fri, 27 Dec 2024 16:35:35 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E7=A1=AC=E4=BB=B6?= =?UTF-8?q?=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pjcloud-hardware/.editorconfig | 18 +++++ pjcloud-hardware/README.md | 22 ++++++ pjcloud-hardware/pjcloud-hardware-api/pom.xml | 79 ++++++++++--------- .../src/main/java/com/example/Main.java | 7 -- .../java/hardware/api/feign/packge-info.java | 6 ++ .../java/hardware/constant/packge-info.java | 6 ++ .../main/java/hardware/dto/packge-info.java | 6 ++ .../java/hardware/entity/packge-info.java | 6 ++ pjcloud-hardware/pjcloud-hardware-biz/pom.xml | 52 ++++++------ .../PjcloudHardwareBizApplication.java | 13 --- .../src/main/java/hardware/App.java | 24 ++++++ .../java/hardware/controller/packge-info.java | 4 + .../java/hardware/mapper/packge-info.java | 6 ++ .../java/hardware/service/packge-info.java | 4 + .../src/main/resources/application.properties | 1 - .../src/main/resources/application.yml | 25 ++++++ .../src/main/resources/logback-spring.xml | 70 ++++++++++++++++ .../PjcloudHardwareBizApplicationTests.java | 13 --- pjcloud-hardware/pom.xml | 25 +++--- .../src/main/resources/application.yml | 6 +- pom.xml | 2 +- 21 files changed, 277 insertions(+), 118 deletions(-) create mode 100644 pjcloud-hardware/.editorconfig create mode 100644 pjcloud-hardware/README.md delete mode 100644 pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/example/Main.java create mode 100644 pjcloud-hardware/pjcloud-hardware-api/src/main/java/hardware/api/feign/packge-info.java create mode 100644 pjcloud-hardware/pjcloud-hardware-api/src/main/java/hardware/constant/packge-info.java create mode 100644 pjcloud-hardware/pjcloud-hardware-api/src/main/java/hardware/dto/packge-info.java create mode 100644 pjcloud-hardware/pjcloud-hardware-api/src/main/java/hardware/entity/packge-info.java delete mode 100644 pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/example/pjcloudhardwarebiz/PjcloudHardwareBizApplication.java create mode 100644 pjcloud-hardware/pjcloud-hardware-biz/src/main/java/hardware/App.java create mode 100644 pjcloud-hardware/pjcloud-hardware-biz/src/main/java/hardware/controller/packge-info.java create mode 100644 pjcloud-hardware/pjcloud-hardware-biz/src/main/java/hardware/mapper/packge-info.java create mode 100644 pjcloud-hardware/pjcloud-hardware-biz/src/main/java/hardware/service/packge-info.java delete mode 100644 pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/application.properties create mode 100644 pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/application.yml create mode 100644 pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/logback-spring.xml delete mode 100644 pjcloud-hardware/pjcloud-hardware-biz/src/test/java/com/example/pjcloudhardwarebiz/PjcloudHardwareBizApplicationTests.java diff --git a/pjcloud-hardware/.editorconfig b/pjcloud-hardware/.editorconfig new file mode 100644 index 000000000..2f2262bb1 --- /dev/null +++ b/pjcloud-hardware/.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/pjcloud-hardware/README.md b/pjcloud-hardware/README.md new file mode 100644 index 000000000..77b54353a --- /dev/null +++ b/pjcloud-hardware/README.md @@ -0,0 +1,22 @@ + +项目描述 .... + + + + +| 姓名 | 角色 | 时间 | +| ---- | ---- |---------| +| xxx | 开发 | 2023-01 | +| | | | +| | | | + + + + +``` +项目根目录 +├── xxx-api -- 业务接口(实体,DTO,utils,feign接口) +├── xxx-biz -- 业务实现[默认服务端口 : 6060] +``` + + diff --git a/pjcloud-hardware/pjcloud-hardware-api/pom.xml b/pjcloud-hardware/pjcloud-hardware-api/pom.xml index ebd69e967..1d1f9a201 100644 --- a/pjcloud-hardware/pjcloud-hardware-api/pom.xml +++ b/pjcloud-hardware/pjcloud-hardware-api/pom.xml @@ -1,41 +1,42 @@ - - - 4.0.0 - - com.bsd - pjcloud-hardware - 5.7.0 - + + + 4.0.0 + + com.bsd + pjcloud-hardware + 5.7.0 + - pjcloud-hardware-api + 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 + + + + com.github.yulichang + mybatis-plus-join-annotation + + + + com.bsd + pjcloud-common-core + + + + com.baomidou + mybatis-plus-spring + + + + com.bsd + pjcloud-common-feign + + + + com.bsd + pjcloud-common-excel + + + 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 deleted file mode 100644 index b47156fd1..000000000 --- a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/example/Main.java +++ /dev/null @@ -1,7 +0,0 @@ -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-api/src/main/java/hardware/api/feign/packge-info.java b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/hardware/api/feign/packge-info.java new file mode 100644 index 000000000..f5e00c199 --- /dev/null +++ b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/hardware/api/feign/packge-info.java @@ -0,0 +1,6 @@ +/* + @author pigx archetype + *

+ * feign client 存放目录，注意 @EnablePigxFeignClients 的扫描范围 + */ +package hardware.api.feign; \ No newline at end of file diff --git a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/hardware/constant/packge-info.java b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/hardware/constant/packge-info.java new file mode 100644 index 000000000..5b812b069 --- /dev/null +++ b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/hardware/constant/packge-info.java @@ -0,0 +1,6 @@ +/* + * @author pigx archetype + *

+ * 常量和枚举定义 + */ +package hardware.constant; \ No newline at end of file diff --git a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/hardware/dto/packge-info.java b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/hardware/dto/packge-info.java new file mode 100644 index 000000000..3e0cec092 --- /dev/null +++ b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/hardware/dto/packge-info.java @@ -0,0 +1,6 @@ +/* + * @author pigx archetype + *

+ * DTO 存放目录 + */ +package hardware.dto; \ No newline at end of file diff --git a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/hardware/entity/packge-info.java b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/hardware/entity/packge-info.java new file mode 100644 index 000000000..10b3392df --- /dev/null +++ b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/hardware/entity/packge-info.java @@ -0,0 +1,6 @@ +/* + * @author pigx archetype + *

+ * 实体 存放目录 + */ +package hardware.entity; \ No newline at end of file diff --git a/pjcloud-hardware/pjcloud-hardware-biz/pom.xml b/pjcloud-hardware/pjcloud-hardware-biz/pom.xml index 5c35a4c48..a2114dbf5 100644 --- a/pjcloud-hardware/pjcloud-hardware-biz/pom.xml +++ b/pjcloud-hardware/pjcloud-hardware-biz/pom.xml @@ -1,6 +1,8 @@ - - + + 4.0.0 com.bsd @@ -11,16 +13,6 @@ pjcloud-hardware-biz - - - org.springframework.boot - spring-boot-starter-undertow - - - - org.springframework.boot - spring-boot-starter-web - com.alibaba.cloud @@ -36,7 +28,7 @@ com.bsd pjcloud-common-data - + com.bsd pjcloud-common-security @@ -59,13 +51,7 @@ com.bsd - pjcloud-app-server-api - 5.7.0 - - - - com.bsd - pjcloud-thirdparty-api + pjcloud-hardware-api 5.7.0 @@ -93,13 +79,22 @@ com.bsd pjcloud-common-swagger - + - com.bsd - pjcloud-common-seata + org.springframework.boot + spring-boot-starter-undertow + + + + org.springframework.boot + spring-boot-starter-web + + + + org.springframework.boot + spring-boot-starter-test - cloud @@ -111,7 +106,7 @@ org.springframework.boot spring-boot-maven-plugin - + repackage @@ -121,7 +116,7 @@ - + io.fabric8 docker-maven-plugin @@ -136,5 +131,4 @@ 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 deleted file mode 100644 index 7fdc967dc..000000000 --- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/example/pjcloudhardwarebiz/PjcloudHardwareBizApplication.java +++ /dev/null @@ -1,13 +0,0 @@ -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/java/hardware/App.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/hardware/App.java new file mode 100644 index 000000000..32ff557b9 --- /dev/null +++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/hardware/App.java @@ -0,0 +1,24 @@ +package hardware; + +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("hardware") +@EnablePjcloudFeignClients +@EnableDiscoveryClient +@EnablePjcloudResourceServer +@SpringBootApplication +public class App { + public static void main(String[] args) { + SpringApplication.run(App.class, args); + } +} diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/hardware/controller/packge-info.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/hardware/controller/packge-info.java new file mode 100644 index 000000000..275d8280f --- /dev/null +++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/hardware/controller/packge-info.java @@ -0,0 +1,4 @@ +/* + * @author pigx archetype + */ +package hardware.controller; \ No newline at end of file diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/hardware/mapper/packge-info.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/hardware/mapper/packge-info.java new file mode 100644 index 000000000..d4260d829 --- /dev/null +++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/hardware/mapper/packge-info.java @@ -0,0 +1,6 @@ +/* + * @author pigx archetype + *

+ * Mybatis Mapper 存放目录 + */ +package hardware.mapper; \ No newline at end of file diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/hardware/service/packge-info.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/hardware/service/packge-info.java new file mode 100644 index 000000000..c154a0bc8 --- /dev/null +++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/hardware/service/packge-info.java @@ -0,0 +1,4 @@ +/* + * @author pigx archetype + */ +package hardware.service; \ No newline at end of file diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/application.properties b/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/application.properties deleted file mode 100644 index 1609c6439..000000000 --- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/application.properties +++ /dev/null @@ -1 +0,0 @@ -spring.application.name=pjcloud-hardware-biz diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/application.yml b/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/application.yml new file mode 100644 index 000000000..b97d1f43f --- /dev/null +++ b/pjcloud-hardware/pjcloud-hardware-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/pjcloudx_demo?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/logback-spring.xml b/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/logback-spring.xml new file mode 100644 index 000000000..964ca8735 --- /dev/null +++ b/pjcloud-hardware/pjcloud-hardware-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/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 deleted file mode 100644 index 2d49473a1..000000000 --- a/pjcloud-hardware/pjcloud-hardware-biz/src/test/java/com/example/pjcloudhardwarebiz/PjcloudHardwareBizApplicationTests.java +++ /dev/null @@ -1,13 +0,0 @@ -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 index cd46669c6..d5664fda8 100644 --- a/pjcloud-hardware/pom.xml +++ b/pjcloud-hardware/pom.xml @@ -4,19 +4,18 @@ 4.0.0 - - com.bsd - pjcloud - 5.7.0 - + + com.bsd + pjcloud + 5.7.0 + - pjcloud-hardware - pom - - - - pjcloud-hardware-api - pjcloud-hardware-biz - + pjcloud-hardware + pom + + + pjcloud-hardware-api + pjcloud-hardware-biz + diff --git a/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/main/resources/application.yml b/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/main/resources/application.yml index dccc955a0..393bb0f28 100644 --- a/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/main/resources/application.yml +++ b/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/main/resources/application.yml @@ -9,7 +9,8 @@ spring: username: @nacos.username@ password: @nacos.password@ discovery: - server-addr: pjcloud-register:8848 + # server-addr: pjcloud-register:8848 + server-addr: ${NACOS_HOST:pjcloud-register}:${NACOS_PORT:8848} config: server-addr: ${spring.cloud.nacos.discovery.server-addr} config: @@ -22,4 +23,5 @@ spring: driver-class-name: com.mysql.cj.jdbc.Driver username: root password: root - url: jdbc:mysql://pjcloud-mysql:3306/pjcloudx_thirdparty?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true + # url: jdbc:mysql://pjcloud-mysql:3306/pjcloudx_thirdparty?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true + url: jdbc:mysql://${MYSQL_HOST:pjcloud-mysql}:${MYSQL_PORT:3306}/${MYSQL_DB:pjcloudx_thirdparty}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true \ No newline at end of file diff --git a/pom.xml b/pom.xml index d0fad82d9..bcb840dd3 100644 --- a/pom.xml +++ b/pom.xml @@ -123,8 +123,8 @@ pjcloud-canteen pjcloud-supermarket-erp pjcloud-wallet - pjcloud-hardware pjcloud-supermarket + pjcloud-hardware