From 3f0534251119097aa1db7c95bb8bb36d3ae3b428 Mon Sep 17 00:00:00 2001
From: yangpeng <3074487626@qq.com>
Date: Mon, 5 Aug 2024 20:54:06 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E4=BB=98=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Dockerfile | 19 ++++
cloud-pay-client/pom.xml | 2 +-
cloud-pay-common/pom.xml | 2 +-
cloud-pay-remote/pom.xml | 2 +-
cloud-pay-server/pom.xml | 95 ++++++++++++++++---
.../src/main/java/com/muyu/Main.java | 13 ---
.../muyu/cloud/pay/MuYuPayApplication.java | 22 +++++
.../cloud/pay/controller/TestController.java | 29 ++++++
.../src/main/resources/banner.txt | 2 +
.../src/main/resources/bootstrap.yml | 52 ++++++++++
.../src/main/resources/logback/dev.xml | 74 +++++++++++++++
.../src/main/resources/logback/prod.xml | 81 ++++++++++++++++
.../src/main/resources/logback/test.xml | 81 ++++++++++++++++
pom.xml | 6 --
14 files changed, 445 insertions(+), 35 deletions(-)
create mode 100644 Dockerfile
delete mode 100644 cloud-pay-server/src/main/java/com/muyu/Main.java
create mode 100644 cloud-pay-server/src/main/java/com/muyu/cloud/pay/MuYuPayApplication.java
create mode 100644 cloud-pay-server/src/main/java/com/muyu/cloud/pay/controller/TestController.java
create mode 100644 cloud-pay-server/src/main/resources/banner.txt
create mode 100644 cloud-pay-server/src/main/resources/bootstrap.yml
create mode 100644 cloud-pay-server/src/main/resources/logback/dev.xml
create mode 100644 cloud-pay-server/src/main/resources/logback/prod.xml
create mode 100644 cloud-pay-server/src/main/resources/logback/test.xml
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..73940f8
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,19 @@
+# 指定构建镜像的起始镜像
+FROM anolis-registry.cn-zhangjiakou.cr.aliyuncs.com/openanolis/dragonwell:17.0.4.0.4.8-standard-ga-8.6
+
+# 执行一些必备的条件
+
+# 定义时区参数
+ENV TZ=Asia/
+#设置时区
+RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo '$TZ' > /etc/timezone
+
+#挂载工作目录
+VOLUME ["/home/logs/cloud-system"]
+
+#拷贝执行jar包文件COPY
+COPY ./cloud-pay-server/target/cloud-pay.jar /home/app.jar
+
+#构建项目启动命令
+ENTRYPOINT ["java","-jar"]
+CMD ["/home/app.jar"]
\ No newline at end of file
diff --git a/cloud-pay-client/pom.xml b/cloud-pay-client/pom.xml
index c524404..eae2e06 100644
--- a/cloud-pay-client/pom.xml
+++ b/cloud-pay-client/pom.xml
@@ -4,7 +4,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4.0.0
- com.bwwei
+ com.muyu
cloud-pay
1.0.0
diff --git a/cloud-pay-common/pom.xml b/cloud-pay-common/pom.xml
index 6891487..dd34984 100644
--- a/cloud-pay-common/pom.xml
+++ b/cloud-pay-common/pom.xml
@@ -4,7 +4,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4.0.0
- com.bwwei
+ com.muyu
cloud-pay
1.0.0
diff --git a/cloud-pay-remote/pom.xml b/cloud-pay-remote/pom.xml
index c90f463..5f78a70 100644
--- a/cloud-pay-remote/pom.xml
+++ b/cloud-pay-remote/pom.xml
@@ -4,7 +4,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4.0.0
- com.bwwei
+ com.muyu
cloud-pay
1.0.0
diff --git a/cloud-pay-server/pom.xml b/cloud-pay-server/pom.xml
index fe1926c..2106860 100644
--- a/cloud-pay-server/pom.xml
+++ b/cloud-pay-server/pom.xml
@@ -4,7 +4,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4.0.0
- com.bwwei
+ com.muyu
cloud-pay
1.0.0
@@ -18,16 +18,85 @@
UTF-8
-
-
-
-
- org.apache.maven.plugins
- maven-deploy-plugin
-
- true
-
-
-
-
+
+
+
+
+
+ com.alibaba.cloud
+ spring-cloud-starter-alibaba-nacos-discovery
+
+
+
+
+ com.alibaba.cloud
+ spring-cloud-starter-alibaba-nacos-config
+
+
+
+
+ com.alibaba.cloud
+ spring-cloud-starter-alibaba-sentinel
+
+
+
+
+ org.springframework.boot
+ spring-boot-starter-actuator
+
+
+
+
+ com.mysql
+ mysql-connector-j
+
+
+
+
+ com.muyu
+ cloud-common-datasource
+
+
+
+
+ com.muyu
+ cloud-common-datascope
+
+
+
+
+ com.muyu
+ cloud-common-log
+
+
+
+
+ com.muyu
+ cloud-common-api-doc
+
+
+
+
+ com.muyu
+ cloud-common-xxl
+
+
+
+
+ cloud-pay
+
+
+
+ org.springframework.boot
+ spring-boot-maven-plugin
+
+
+
+ repackage
+
+
+
+
+
+
\ No newline at end of file
diff --git a/cloud-pay-server/src/main/java/com/muyu/Main.java b/cloud-pay-server/src/main/java/com/muyu/Main.java
deleted file mode 100644
index 44da29b..0000000
--- a/cloud-pay-server/src/main/java/com/muyu/Main.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.muyu;
-
-/**
- * @Classname ${NAME}
- * @Description TODO
- * @Date 2024/8/4 上午11:22
- * @Created by 杨旭飞
- */
-public class Main {
- public static void main(String[] args) {
- System.out.println("Hello world!");
- }
-}
\ No newline at end of file
diff --git a/cloud-pay-server/src/main/java/com/muyu/cloud/pay/MuYuPayApplication.java b/cloud-pay-server/src/main/java/com/muyu/cloud/pay/MuYuPayApplication.java
new file mode 100644
index 0000000..a99fa2a
--- /dev/null
+++ b/cloud-pay-server/src/main/java/com/muyu/cloud/pay/MuYuPayApplication.java
@@ -0,0 +1,22 @@
+package com.muyu.cloud.pay;
+
+import com.muyu.common.security.annotation.EnableCustomConfig;
+import com.muyu.common.security.annotation.EnableMyFeignClients;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+/**
+ * @Classname MuYuPayApplication
+ * @Description TODO
+ * @Date 2024/8/5 下午8:33
+ * @Created by 杨旭飞
+ */
+@EnableCustomConfig
+//@EnableCustomSwagger2
+@EnableMyFeignClients
+@SpringBootApplication
+public class MuYuPayApplication {
+ public static void main (String[] args) {
+ SpringApplication.run(MuYuPayApplication.class, args);
+ }
+}
diff --git a/cloud-pay-server/src/main/java/com/muyu/cloud/pay/controller/TestController.java b/cloud-pay-server/src/main/java/com/muyu/cloud/pay/controller/TestController.java
new file mode 100644
index 0000000..a02cf46
--- /dev/null
+++ b/cloud-pay-server/src/main/java/com/muyu/cloud/pay/controller/TestController.java
@@ -0,0 +1,29 @@
+package com.muyu.cloud.pay.controller;
+
+import com.muyu.common.core.domain.Result;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+
+
+/**
+ * @Classname TestController
+ * @Description TODO
+ * @Date 2024/8/5 下午8:37
+ * @Created by 杨旭飞
+ */
+@RequestMapping("/test")
+@RestController
+public class TestController {
+ @PostMapping
+ public Result post(){
+ return Result.success("测试Post成功");
+ }
+
+ @GetMapping
+ public Result get(){
+ return Result.success("测试Get成功");
+ }
+}
diff --git a/cloud-pay-server/src/main/resources/banner.txt b/cloud-pay-server/src/main/resources/banner.txt
new file mode 100644
index 0000000..0dd5eee
--- /dev/null
+++ b/cloud-pay-server/src/main/resources/banner.txt
@@ -0,0 +1,2 @@
+Spring Boot Version: ${spring-boot.version}
+Spring Application Name: ${spring.application.name}
diff --git a/cloud-pay-server/src/main/resources/bootstrap.yml b/cloud-pay-server/src/main/resources/bootstrap.yml
new file mode 100644
index 0000000..3606371
--- /dev/null
+++ b/cloud-pay-server/src/main/resources/bootstrap.yml
@@ -0,0 +1,52 @@
+# Tomcat
+server:
+ port: 9701
+
+# nacos线上地址
+nacos:
+ addr: 10.28.29.211:8848
+ user-name: nacos
+ password: nacos
+ namespace: cloud
+
+# Spring
+spring:
+ main:
+ allow-bean-definition-overriding: true
+ application:
+ # 应用名称
+ name: cloud-pay
+ profiles:
+ # 环境配置
+ active: dev
+ cloud:
+ nacos:
+ discovery:
+ # 服务注册地址
+ server-addr: ${nacos.addr}
+ # nacos用户名
+ username: ${nacos.user-name}
+ # nacos密码
+ password: ${nacos.password}
+ # 命名空间
+ namespace: ${nacos.namespace}
+ config:
+ # 服务注册地址
+ server-addr: ${nacos.addr}
+ # nacos用户名
+ username: ${nacos.user-name}
+ # nacos密码
+ password: ${nacos.password}
+ # 命名空间
+ namespace: ${nacos.namespace}
+ # 配置文件格式
+ file-extension: yml
+ # 共享配置
+ shared-configs:
+ # 系统共享配置
+ - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+ # 系统环境Config共享配置
+ - application-config-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+ # xxl-job 配置文件
+ - application-xxl-config-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+
diff --git a/cloud-pay-server/src/main/resources/logback/dev.xml b/cloud-pay-server/src/main/resources/logback/dev.xml
new file mode 100644
index 0000000..a0e16b0
--- /dev/null
+++ b/cloud-pay-server/src/main/resources/logback/dev.xml
@@ -0,0 +1,74 @@
+
+
+
+
+
+
+
+
+
+
+ ${log.pattern}
+
+
+
+
+
+ ${log.path}/info.log
+
+
+
+ ${log.path}/info.%d{yyyy-MM-dd}.log
+
+ 60
+
+
+ ${log.pattern}
+
+
+
+ INFO
+
+ ACCEPT
+
+ DENY
+
+
+
+
+ ${log.path}/error.log
+
+
+
+ ${log.path}/error.%d{yyyy-MM-dd}.log
+
+ 60
+
+
+ ${log.pattern}
+
+
+
+ ERROR
+
+ ACCEPT
+
+ DENY
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/cloud-pay-server/src/main/resources/logback/prod.xml b/cloud-pay-server/src/main/resources/logback/prod.xml
new file mode 100644
index 0000000..afd0098
--- /dev/null
+++ b/cloud-pay-server/src/main/resources/logback/prod.xml
@@ -0,0 +1,81 @@
+
+
+
+
+
+
+
+
+
+
+
+ ${log.sky.pattern}
+
+
+
+
+
+ ${log.path}/info.log
+
+
+
+ ${log.path}/info.%d{yyyy-MM-dd}.log
+
+ 60
+
+
+
+
+ INFO
+
+ ACCEPT
+
+ DENY
+
+
+
+
+ ${log.path}/error.log
+
+
+
+ ${log.path}/error.%d{yyyy-MM-dd}.log
+
+ 60
+
+
+
+
+ ERROR
+
+ ACCEPT
+
+ DENY
+
+
+
+
+
+
+
+ ${log.sky.pattern}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/cloud-pay-server/src/main/resources/logback/test.xml b/cloud-pay-server/src/main/resources/logback/test.xml
new file mode 100644
index 0000000..6594919
--- /dev/null
+++ b/cloud-pay-server/src/main/resources/logback/test.xml
@@ -0,0 +1,81 @@
+
+
+
+
+
+
+
+
+
+
+
+ ${log.sky.pattern}
+
+
+
+
+
+ ${log.path}/info.log
+
+
+
+ ${log.path}/info.%d{yyyy-MM-dd}.log
+
+ 60
+
+
+
+
+ INFO
+
+ ACCEPT
+
+ DENY
+
+
+
+
+ ${log.path}/error.log
+
+
+
+ ${log.path}/error.%d{yyyy-MM-dd}.log
+
+ 60
+
+
+
+
+ ERROR
+
+ ACCEPT
+
+ DENY
+
+
+
+
+
+
+
+ ${log.sky.pattern}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pom.xml b/pom.xml
index 795c59f..1539694 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,16 +10,10 @@
3.6.3
- com.bwwei
cloud-pay
1.0.0
pom
-
- cloud-pay-server
- cloud-pay-client
- cloud-pay-remote
- cloud-pay-common
cloud-pay-client
cloud-pay-common
cloud-pay-remote