diff --git a/pjcloud-wallet/.editorconfig b/pjcloud-wallet/.editorconfig new file mode 100644 index 000000000..2f2262bb1 --- /dev/null +++ b/pjcloud-wallet/.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-wallet/README.md b/pjcloud-wallet/README.md new file mode 100644 index 000000000..77b54353a --- /dev/null +++ b/pjcloud-wallet/README.md @@ -0,0 +1,22 @@ + +项目�述 .... + + + + +| 姓� | 角色 | 时间 | +| ---- | ---- |---------| +| xxx | 开� | 2023-01 | +| | | | +| | | | + + + + +``` +项目根目录 +├── xxx-api -- 业务接�(实体,DTO,utils,feign接�) +├── xxx-biz -- 业务实现[默认�务端� : 6060] +``` + + diff --git a/pjcloud-wallet/pjcloud-wallet-api/pom.xml b/pjcloud-wallet/pjcloud-wallet-api/pom.xml new file mode 100644 index 000000000..a4b358259 --- /dev/null +++ b/pjcloud-wallet/pjcloud-wallet-api/pom.xml @@ -0,0 +1,42 @@ + + + 4.0.0 + + com.bsd + pjcloud-wallet + 5.7.0 + + + pjcloud-wallet-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/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/pjcloud-wallet/api/feign/packge-info.java b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/pjcloud-wallet/api/feign/packge-info.java new file mode 100644 index 000000000..069a59df7 --- /dev/null +++ b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/pjcloud-wallet/api/feign/packge-info.java @@ -0,0 +1,6 @@ +/* + @author pigx archetype + *

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

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

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

+ * 实体 存放目录 + */ +package com.bsd.pjcloud.pjcloud-wallet.entity; \ No newline at end of file diff --git a/pjcloud-wallet/pjcloud-wallet-biz/pom.xml b/pjcloud-wallet/pjcloud-wallet-biz/pom.xml new file mode 100644 index 000000000..1aabf8d9d --- /dev/null +++ b/pjcloud-wallet/pjcloud-wallet-biz/pom.xml @@ -0,0 +1,134 @@ + + + 4.0.0 + + com.bsd + pjcloud-wallet + 5.7.0 + + + pjcloud-wallet-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-wallet-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/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/pjcloud-wallet/App.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/pjcloud-wallet/App.java new file mode 100644 index 000000000..b2f4a171f --- /dev/null +++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/pjcloud-wallet/App.java @@ -0,0 +1,24 @@ +package com.bsd.pjcloud.pjcloud-wallet; + +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("pjcloud-wallet") +@EnablePjcloudFeignClients +@EnableDiscoveryClient +@EnablePjcloudResourceServer +@SpringBootApplication +public class App { + public static void main(String[] args) { + SpringApplication.run(App.class, args); + } +} diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/pjcloud-wallet/controller/packge-info.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/pjcloud-wallet/controller/packge-info.java new file mode 100644 index 000000000..b8e6da41c --- /dev/null +++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/pjcloud-wallet/controller/packge-info.java @@ -0,0 +1,4 @@ +/* + * @author pigx archetype + */ +package com.bsd.pjcloud.pjcloud-wallet.controller; \ No newline at end of file diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/pjcloud-wallet/mapper/packge-info.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/pjcloud-wallet/mapper/packge-info.java new file mode 100644 index 000000000..4e153b670 --- /dev/null +++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/pjcloud-wallet/mapper/packge-info.java @@ -0,0 +1,6 @@ +/* + * @author pigx archetype + *

+ * Mybatis Mapper 存放目录 + */ +package com.bsd.pjcloud.pjcloud-wallet.mapper; \ No newline at end of file diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/pjcloud-wallet/service/packge-info.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/pjcloud-wallet/service/packge-info.java new file mode 100644 index 000000000..45bb4012a --- /dev/null +++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/pjcloud-wallet/service/packge-info.java @@ -0,0 +1,4 @@ +/* + * @author pigx archetype + */ +package com.bsd.pjcloud.pjcloud-wallet.service; \ No newline at end of file diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/application.yml b/pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/application.yml new file mode 100644 index 000000000..e268513ec --- /dev/null +++ b/pjcloud-wallet/pjcloud-wallet-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_wallet?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/logback-spring.xml b/pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/logback-spring.xml new file mode 100644 index 000000000..964ca8735 --- /dev/null +++ b/pjcloud-wallet/pjcloud-wallet-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-wallet/pom.xml b/pjcloud-wallet/pom.xml new file mode 100644 index 000000000..9414a195c --- /dev/null +++ b/pjcloud-wallet/pom.xml @@ -0,0 +1,21 @@ + + + + 4.0.0 + + + com.bsd + pjcloud + 5.7.0 + + + pjcloud-wallet + pom + + + + pjcloud-wallet-api + pjcloud-wallet-biz + + diff --git a/pom.xml b/pom.xml index 00368ac98..7364a6683 100644 --- a/pom.xml +++ b/pom.xml @@ -57,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 @@ -100,7 +100,7 @@ jaxb-impl ${jaxb.version} - + org.springframework.boot spring-boot-starter-test @@ -120,11 +120,12 @@ pjcloud-thirdparty pjcloud-canteen erp + pjcloud-wallet - + com.bsd pjcloud-common-bom @@ -132,7 +133,7 @@ pom import - + org.springframework.boot spring-boot-dependencies @@ -140,7 +141,7 @@ pom import - + org.springframework.cloud spring-cloud-dependencies @@ -156,13 +157,13 @@ pom import - + org.springframework.boot spring-boot-starter-web ${spring-boot.version} - + spring-boot-starter-tomcat org.springframework.boot @@ -182,7 +183,7 @@ - + org.springframework.boot spring-boot-maven-plugin @@ -195,7 +196,7 @@ - + io.fabric8 docker-maven-plugin @@ -222,13 +223,13 @@ - + io.spring.javaformat spring-javaformat-maven-plugin ${spring.checkstyle.version} - + org.apache.maven.plugins maven-compiler-plugin @@ -240,7 +241,7 @@ true - + io.github.git-commit-id git-commit-id-maven-plugin @@ -251,13 +252,13 @@ revision - validate + validate false true - + yyyy-MM-dd HH:mm:ss ^git.build.(time|version)$ @@ -272,13 +273,13 @@ cloud - + dev nacos nacos - + true