zianxin/pj_service_cloud
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix:修改硬件模块

Browse Source
This commit is contained in:
dzc committed 2024-12-27 16:35:35 +08:00
1 parent 55b890aa8f
commit ae7507abb2
21 files changed
+277 -118
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

pjcloud-hardware/.editorconfig
+18
View File
@@ -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
pjcloud-hardware/README.md
+22
View File
@@ -0,0 +1,22 @@
项目描述 ....
| 姓名 | 角色 | 时间 |
| ---- | ---- |---------|
| xxx | 开发 | 2023-01 |
| | | |
| | | |
```
项目根目录
├── xxx-api -- 业务接口(实体,DTO,utils,feign接口)
├── xxx-biz -- 业务实现[默认服务端口 : 6060]
```
pjcloud-hardware/pjcloud-hardware-api/pom.xml
+40 -39
View File
@@ -1,41 +1,42 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" 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">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.bsd</groupId>
<artifactId>pjcloud-hardware</artifactId>
<version>5.7.0</version>
</parent>
<?xml version="1.0"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
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">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.bsd</groupId>
<artifactId>pjcloud-hardware</artifactId>
<version>5.7.0</version>
</parent>
<artifactId>pjcloud-hardware-api</artifactId>
<artifactId>pjcloud-hardware-api</artifactId>
<dependencies>
<!--core 工具类-->
<dependency>
<groupId>com.bsd</groupId>
<artifactId>pjcloud-common-core</artifactId>
</dependency>
<!--mybatis plus extension,包含了mybatis plus core-->
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-spring</artifactId>
</dependency>
<!--feign 工具类-->
<dependency>
<groupId>com.bsd</groupId>
<artifactId>pjcloud-common-feign</artifactId>
</dependency>
<!-- excel 导入导出 -->
<dependency>
<groupId>com.bsd</groupId>
<artifactId>pjcloud-common-excel</artifactId>
</dependency>
<!-- 脱敏工具类-->
<dependency>
<groupId>com.bsd</groupId>
<artifactId>pjcloud-common-sensitive</artifactId>
</dependency>
</dependencies>
</project>
<dependencies>
<!-- 连表查询注解 -->
<dependency>
<groupId>com.github.yulichang</groupId>
<artifactId>mybatis-plus-join-annotation</artifactId>
</dependency>
<!--core 工具类-->
<dependency>
<groupId>com.bsd</groupId>
<artifactId>pjcloud-common-core</artifactId>
</dependency>
<!--mybatis plus spring,包含了mybatis plus core-->
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-spring</artifactId>
</dependency>
<!--feign 工具类-->
<dependency>
<groupId>com.bsd</groupId>
<artifactId>pjcloud-common-feign</artifactId>
</dependency>
<!-- excel 导入导出 -->
<dependency>
<groupId>com.bsd</groupId>
<artifactId>pjcloud-common-excel</artifactId>
</dependency>
</dependencies>
</project>
pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/example/Main.java
-7
View File
@@ -1,7 +0,0 @@
package com.example;
public class Main {
public static void main(String[] args) {
System.out.println("Hello world!");
}
}
pjcloud-hardware/pjcloud-hardware-api/src/main/java/hardware/api/feign/packge-info.java
+6
View File
@@ -0,0 +1,6 @@
/*
@author pigx archetype
* <p>
* feign client 存放目录，注意 @EnablePigxFeignClients 的扫描范围
*/
package hardware.api.feign;
pjcloud-hardware/pjcloud-hardware-api/src/main/java/hardware/constant/packge-info.java
+6
View File
@@ -0,0 +1,6 @@
/*
* @author pigx archetype
* <p>
* 常量和枚举定义
*/
package hardware.constant;
pjcloud-hardware/pjcloud-hardware-api/src/main/java/hardware/dto/packge-info.java
+6
View File
@@ -0,0 +1,6 @@
/*
* @author pigx archetype
* <p>
* DTO 存放目录
*/
package hardware.dto;
pjcloud-hardware/pjcloud-hardware-api/src/main/java/hardware/entity/packge-info.java
+6
View File
@@ -0,0 +1,6 @@
/*
* @author pigx archetype
* <p>
* 实体 存放目录
*/
package hardware.entity;
pjcloud-hardware/pjcloud-hardware-biz/pom.xml
+23 -29
View File
@@ -1,6 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" 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">
<?xml version="1.0"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
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">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.bsd</groupId>
@@ -11,16 +13,6 @@
<artifactId>pjcloud-hardware-biz</artifactId>
<dependencies>
<!--必备: undertow容器-->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-undertow</artifactId>
</dependency>
<!--必备: spring boot web-->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
<!--必备: 注册中心客户端-->
<dependency>
<groupId>com.alibaba.cloud</groupId>
@@ -36,7 +28,7 @@
<groupId>com.bsd</groupId>
<artifactId>pjcloud-common-data</artifactId>
</dependency>
<!--必备：pjcloud安全模块-->
<!--必备：pigx安全模块-->
<dependency>
<groupId>com.bsd</groupId>
<artifactId>pjcloud-common-security</artifactId>
@@ -59,13 +51,7 @@
<!--必备: 依赖api模块-->
<dependency>
<groupId>com.bsd</groupId>
<artifactId>pjcloud-app-server-api</artifactId>
<version>5.7.0</version>
</dependency>
<dependency>
<groupId>com.bsd</groupId>
<artifactId>pjcloud-thirdparty-api</artifactId>
<artifactId>pjcloud-hardware-api</artifactId>
<version>5.7.0</version>
</dependency>
<!--必备: log 依赖-->
@@ -93,13 +79,22 @@
<groupId>com.bsd</groupId>
<artifactId>pjcloud-common-swagger</artifactId>
</dependency>
<!-- 引入分布式事务-->
<!--必备: undertow容器-->
<dependency>
<groupId>com.bsd</groupId>
<artifactId>pjcloud-common-seata</artifactId>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-undertow</artifactId>
</dependency>
<!--必备: spring boot web-->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
<!--测试: spring boot test-->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
</dependency>
</dependencies>
<profiles>
<profile>
<id>cloud</id>
@@ -111,7 +106,7 @@
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<executions>
<executions>
<execution>
<goals>
<goal>repackage</goal>
@@ -121,7 +116,7 @@
</configuration>
</execution>
</executions>
</plugin>
</plugin>
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
@@ -136,5 +131,4 @@
<id>boot</id>
</profile>
</profiles>
</project>
</project>
pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/example/pjcloudhardwarebiz/PjcloudHardwareBizApplication.java
-13
View File
@@ -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);
}
}
pjcloud-hardware/pjcloud-hardware-biz/src/main/java/hardware/App.java
+24
View File
@@ -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
* <p>
* 项目启动类
*/
@EnableOpenApi("hardware")
@EnablePjcloudFeignClients
@EnableDiscoveryClient
@EnablePjcloudResourceServer
@SpringBootApplication
public class App {
public static void main(String[] args) {
SpringApplication.run(App.class, args);
}
}
pjcloud-hardware/pjcloud-hardware-biz/src/main/java/hardware/controller/packge-info.java
+4
View File
@@ -0,0 +1,4 @@
/*
* @author pigx archetype
*/
package hardware.controller;
pjcloud-hardware/pjcloud-hardware-biz/src/main/java/hardware/mapper/packge-info.java
+6
View File
@@ -0,0 +1,6 @@
/*
* @author pigx archetype
* <p>
* Mybatis Mapper 存放目录
*/
package hardware.mapper;
pjcloud-hardware/pjcloud-hardware-biz/src/main/java/hardware/service/packge-info.java
+4
View File
@@ -0,0 +1,4 @@
/*
* @author pigx archetype
*/
package hardware.service;
pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/application.properties
-1
View File
@@ -1 +0,0 @@
spring.application.name=pjcloud-hardware-biz
pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/application.yml
+25
View File
@@ -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
pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/logback-spring.xml
+70
View File
@@ -0,0 +1,70 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
小技巧: 在根pom里面设置统一存放路径，统一管理方便维护
<properties>
<log-path>/Users/lengleng</log-path>
</properties>
1. 其他模块加日志输出，直接copy本文件放在resources 目录即可
2. 注意修改 <property name="${log-path}/log.path" value=""/> 的value模块
-->
<configuration debug="false" scan="false">
<property name="log.path" value="logs/${project.artifactId}"/>
<!-- 彩色日志格式 -->
<property name="CONSOLE_LOG_PATTERN"
value="${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
<!-- 彩色日志依赖的渲染类 -->
<conversionRule conversionWord="clr" converterClass="org.springframework.boot.logging.logback.ColorConverter"/>
<conversionRule conversionWord="wex"
converterClass="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter"/>
<conversionRule conversionWord="wEx"
converterClass="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter"/>
<!-- Console log output -->
<appender name="console" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
<pattern>${CONSOLE_LOG_PATTERN}</pattern>
</encoder>
</appender>
<!-- Log file debug output -->
<appender name="debug" class="ch.qos.logback.core.rolling.RollingFileAppender">
<file>${log.path}/debug.log</file>
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<fileNamePattern>${log.path}/%d{yyyy-MM, aux}/debug.%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern>
<maxFileSize>50MB</maxFileSize>
<maxHistory>30</maxHistory>
</rollingPolicy>
<encoder>
<pattern>%date [%thread] %-5level [%logger{50}] %file:%line - %msg%n</pattern>
</encoder>
</appender>
<!-- Log file error output -->
<appender name="error" class="ch.qos.logback.core.rolling.RollingFileAppender">
<file>${log.path}/error.log</file>
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<fileNamePattern>${log.path}/%d{yyyy-MM}/error.%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern>
<maxFileSize>50MB</maxFileSize>
<maxHistory>30</maxHistory>
</rollingPolicy>
<encoder>
<pattern>%date [%thread] %-5level [%logger{50}] %file:%line - %msg%n</pattern>
</encoder>
<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
<level>ERROR</level>
</filter>
</appender>
<logger name="org.activiti.engine.impl.db" level="DEBUG">
<appender-ref ref="debug"/>
</logger>
<!--nacos 心跳 INFO 屏蔽-->
<logger name="com.alibaba.nacos" level="OFF">
<appender-ref ref="error"/>
</logger>
<!-- Level: FATAL 0 ERROR 3 WARN 4 INFO 6 DEBUG 7 -->
<root level="INFO">
<appender-ref ref="console"/>
<appender-ref ref="debug"/>
</root>
</configuration>
pjcloud-hardware/pjcloud-hardware-biz/src/test/java/com/example/pjcloudhardwarebiz/PjcloudHardwareBizApplicationTests.java
-13
View File
@@ -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() {
}
}
pjcloud-hardware/pom.xml
+12 -13
View File
@@ -4,19 +4,18 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.bsd</groupId>
<artifactId>pjcloud</artifactId>
<version>5.7.0</version>
</parent>
<parent>
<groupId>com.bsd</groupId>
<artifactId>pjcloud</artifactId>
<version>5.7.0</version>
</parent>
<artifactId>pjcloud-hardware</artifactId>
<packaging>pom</packaging>
<!--项目子模块-->
<modules>
<module>pjcloud-hardware-api</module>
<module>pjcloud-hardware-biz</module>
</modules>
<artifactId>pjcloud-hardware</artifactId>
<packaging>pom</packaging>
<!--项目子模块-->
<modules>
<module>pjcloud-hardware-api</module>
<module>pjcloud-hardware-biz</module>
</modules>
</project>
pjcloud-thirdparty/pjcloud-thirdparty-biz/src/main/resources/application.yml
Vendored
+4 -2
View File
@@ -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
pom.xml
+1 -1
View File
@@ -123,8 +123,8 @@
<module>pjcloud-canteen</module>
<module>pjcloud-supermarket-erp</module>
<module>pjcloud-wallet</module>
<module>pjcloud-hardware</module>
<module>pjcloud-supermarket</module>
<module>pjcloud-hardware</module>
</modules>
<dependencyManagement>