From 45ad836a234fc0086dcf2608aeae546ad6ffdbd6 Mon Sep 17 00:00:00 2001
From: lmm <3386165318@qq.com>
Date: 星期二, 16 七月 2024 08:41:23 +0800
Subject: [PATCH] 回退
---
platformx-demo-api/src/main/java/com/by4cloud/platformx/demo/dto/packge-info.java | 6 +
platformx-demo-api/src/main/java/com/by4cloud/platformx/demo/entity/packge-info.java | 6 +
platformx-demo-biz/pom.xml | 6
platformx-demo-biz/src/main/java/com/by4cloud/platformx/demo/mapper/packge-info.java | 6 +
platformx-demo-biz/src/main/java/com/by4cloud/platformx/demo/controller/packge-info.java | 4 +
platformx-demo-biz/src/main/resources/logback-spring.xml | 94 +++++++++++++++++++++++
platformx-demo-biz/src/main/java/com/by4cloud/platformx/demo/service/packge-info.java | 4 +
platformx-demo-api/pom.xml | 4
platformx-demo-biz/src/main/java/com/by4cloud/platformx/demo/App.java | 2
pom.xml | 6
platformx-boot/pom.xml | 6
platformx-demo-api/src/main/java/com/by4cloud/platformx/demo/entity/Demo.java | 2
platformx-demo-api/src/main/java/com/by4cloud/platformx/demo/constant/packge-info.java | 6 +
/dev/null | 4 -
platformx-demo-api/src/main/java/com/by4cloud/platformx/demo/api/feign/packge-info.java | 2
platformx-demo-biz/src/main/resources/application.yml | 25 ++++++
16 files changed, 165 insertions(+), 18 deletions(-)
diff --git a/online-course-api/src/main/java/com/by4cloud/platformx/onlineCourse/constant/packge-info.java b/online-course-api/src/main/java/com/by4cloud/platformx/onlineCourse/constant/packge-info.java
deleted file mode 100644
index 25596f6..0000000
--- a/online-course-api/src/main/java/com/by4cloud/platformx/onlineCourse/constant/packge-info.java
+++ /dev/null
@@ -1,6 +0,0 @@
-/*
- * @author platformx archetype
- * <p>
- * 甯搁噺鍜屾灇涓惧畾涔�
- */
-package com.by4cloud.platformx.onlineCourse.constant;
\ No newline at end of file
diff --git a/online-course-api/src/main/java/com/by4cloud/platformx/onlineCourse/dto/packge-info.java b/online-course-api/src/main/java/com/by4cloud/platformx/onlineCourse/dto/packge-info.java
deleted file mode 100644
index 6302089..0000000
--- a/online-course-api/src/main/java/com/by4cloud/platformx/onlineCourse/dto/packge-info.java
+++ /dev/null
@@ -1,6 +0,0 @@
-/*
- * @author platformx archetype
- * <p>
- * DTO 瀛樻斁鐩綍
- */
-package com.by4cloud.platformx.onlineCourse.dto;
\ No newline at end of file
diff --git a/online-course-api/src/main/java/com/by4cloud/platformx/onlineCourse/entity/packge-info.java b/online-course-api/src/main/java/com/by4cloud/platformx/onlineCourse/entity/packge-info.java
deleted file mode 100644
index 5fa18af..0000000
--- a/online-course-api/src/main/java/com/by4cloud/platformx/onlineCourse/entity/packge-info.java
+++ /dev/null
@@ -1,6 +0,0 @@
-/*
- * @author platformx archetype
- * <p>
- * 瀹炰綋 瀛樻斁鐩綍
- */
-package com.by4cloud.platformx.onlineCourse.entity;
\ No newline at end of file
diff --git a/online-course-biz/src/main/java/com/by4cloud/platformx/onlineCourse/controller/packge-info.java b/online-course-biz/src/main/java/com/by4cloud/platformx/onlineCourse/controller/packge-info.java
deleted file mode 100644
index 73fd910..0000000
--- a/online-course-biz/src/main/java/com/by4cloud/platformx/onlineCourse/controller/packge-info.java
+++ /dev/null
@@ -1,4 +0,0 @@
-/*
- * @author platformx archetype
- */
-package com.by4cloud.platformx.onlineCourse.controller;
\ No newline at end of file
diff --git a/online-course-biz/src/main/java/com/by4cloud/platformx/onlineCourse/mapper/packge-info.java b/online-course-biz/src/main/java/com/by4cloud/platformx/onlineCourse/mapper/packge-info.java
deleted file mode 100644
index bb96bd9..0000000
--- a/online-course-biz/src/main/java/com/by4cloud/platformx/onlineCourse/mapper/packge-info.java
+++ /dev/null
@@ -1,6 +0,0 @@
-/*
- * @author platformx archetype
- * <p>
- * Mybatis Mapper 瀛樻斁鐩綍
- */
-package com.by4cloud.platformx.onlineCourse.mapper;
\ No newline at end of file
diff --git a/online-course-biz/src/main/java/com/by4cloud/platformx/onlineCourse/service/packge-info.java b/online-course-biz/src/main/java/com/by4cloud/platformx/onlineCourse/service/packge-info.java
deleted file mode 100644
index 4bf6cfe..0000000
--- a/online-course-biz/src/main/java/com/by4cloud/platformx/onlineCourse/service/packge-info.java
+++ /dev/null
@@ -1,4 +0,0 @@
-/*
- * @author platformx archetype
- */
-package com.by4cloud.platformx.onlineCourse.service;
\ No newline at end of file
diff --git a/platformx-boot/pom.xml b/platformx-boot/pom.xml
index 6fa918b..d3dbfc9 100644
--- a/platformx-boot/pom.xml
+++ b/platformx-boot/pom.xml
@@ -20,11 +20,11 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.by4cloud</groupId>
- <artifactId>online-course</artifactId>
+ <artifactId>platformx-demo</artifactId>
<version>5.5.0</version>
</parent>
- <artifactId>platformx-boot</artifactId>
+ <artifactId>demo-boot</artifactId>
<packaging>jar</packaging>
<description>demo 鍗曚綋鐗堟湰鍚姩</description>
@@ -39,7 +39,7 @@
<!--蹇呭锛氱敤鎴风鐞嗘ā鍧�-->
<dependency>
<groupId>com.by4cloud</groupId>
- <artifactId>online-course-biz</artifactId>
+ <artifactId>platformx-demo-biz</artifactId>
<version>${project.version}</version>
</dependency>
<!--瀹夊叏妯″潡-->
diff --git a/online-course-api/pom.xml b/platformx-demo-api/pom.xml
similarity index 93%
rename from online-course-api/pom.xml
rename to platformx-demo-api/pom.xml
index 0734805..e0aa33e 100644
--- a/online-course-api/pom.xml
+++ b/platformx-demo-api/pom.xml
@@ -6,11 +6,11 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.by4cloud</groupId>
- <artifactId>online-course</artifactId>
+ <artifactId>platformx-demo</artifactId>
<version>5.5.0</version>
</parent>
- <artifactId>online-course-api</artifactId>
+ <artifactId>platformx-demo-api</artifactId>
<dependencies>
<!-- 杩炶〃鏌ヨ娉ㄨВ -->
diff --git a/online-course-api/src/main/java/com/by4cloud/platformx/onlineCourse/api/feign/packge-info.java b/platformx-demo-api/src/main/java/com/by4cloud/platformx/demo/api/feign/packge-info.java
similarity index 69%
rename from online-course-api/src/main/java/com/by4cloud/platformx/onlineCourse/api/feign/packge-info.java
rename to platformx-demo-api/src/main/java/com/by4cloud/platformx/demo/api/feign/packge-info.java
index f458208..a9565f0 100644
--- a/online-course-api/src/main/java/com/by4cloud/platformx/onlineCourse/api/feign/packge-info.java
+++ b/platformx-demo-api/src/main/java/com/by4cloud/platformx/demo/api/feign/packge-info.java
@@ -3,4 +3,4 @@
* <p>
* feign client 瀛樻斁鐩綍锛屾敞鎰� @EnablePlatformxFeignClients 鐨勬壂鎻忚寖鍥�
*/
-package com.by4cloud.platformx.onlineCourse.api.feign;
\ No newline at end of file
+package com.by4cloud.platformx.demo.api.feign;
\ No newline at end of file
diff --git a/platformx-demo-api/src/main/java/com/by4cloud/platformx/demo/constant/packge-info.java b/platformx-demo-api/src/main/java/com/by4cloud/platformx/demo/constant/packge-info.java
new file mode 100644
index 0000000..ab748a1
--- /dev/null
+++ b/platformx-demo-api/src/main/java/com/by4cloud/platformx/demo/constant/packge-info.java
@@ -0,0 +1,6 @@
+/*
+ * @author platformx archetype
+ * <p>
+ * 甯搁噺鍜屾灇涓惧畾涔�
+ */
+package com.by4cloud.platformx.demo.constant;
\ No newline at end of file
diff --git a/platformx-demo-api/src/main/java/com/by4cloud/platformx/demo/dto/packge-info.java b/platformx-demo-api/src/main/java/com/by4cloud/platformx/demo/dto/packge-info.java
new file mode 100644
index 0000000..a0695fe
--- /dev/null
+++ b/platformx-demo-api/src/main/java/com/by4cloud/platformx/demo/dto/packge-info.java
@@ -0,0 +1,6 @@
+/*
+ * @author platformx archetype
+ * <p>
+ * DTO 瀛樻斁鐩綍
+ */
+package com.by4cloud.platformx.demo.dto;
\ No newline at end of file
diff --git a/online-course-api/src/main/java/com/by4cloud/platformx/onlineCourse/entity/Demo.java b/platformx-demo-api/src/main/java/com/by4cloud/platformx/demo/entity/Demo.java
similarity index 95%
rename from online-course-api/src/main/java/com/by4cloud/platformx/onlineCourse/entity/Demo.java
rename to platformx-demo-api/src/main/java/com/by4cloud/platformx/demo/entity/Demo.java
index 95fd66f..b78e947 100644
--- a/online-course-api/src/main/java/com/by4cloud/platformx/onlineCourse/entity/Demo.java
+++ b/platformx-demo-api/src/main/java/com/by4cloud/platformx/demo/entity/Demo.java
@@ -1,4 +1,4 @@
-package com.by4cloud.platformx.onlineCourse.entity;
+package com.by4cloud.platformx.demo.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.by4cloud.platformx.common.data.mybatis.BaseModel;
diff --git a/platformx-demo-api/src/main/java/com/by4cloud/platformx/demo/entity/packge-info.java b/platformx-demo-api/src/main/java/com/by4cloud/platformx/demo/entity/packge-info.java
new file mode 100644
index 0000000..e56cda8
--- /dev/null
+++ b/platformx-demo-api/src/main/java/com/by4cloud/platformx/demo/entity/packge-info.java
@@ -0,0 +1,6 @@
+/*
+ * @author platformx archetype
+ * <p>
+ * 瀹炰綋 瀛樻斁鐩綍
+ */
+package com.by4cloud.platformx.demo.entity;
\ No newline at end of file
diff --git a/online-course-biz/pom.xml b/platformx-demo-biz/pom.xml
similarity index 96%
rename from online-course-biz/pom.xml
rename to platformx-demo-biz/pom.xml
index e8fee3c..5c8f89d 100644
--- a/online-course-biz/pom.xml
+++ b/platformx-demo-biz/pom.xml
@@ -6,11 +6,11 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.by4cloud</groupId>
- <artifactId>online-course</artifactId>
+ <artifactId>platformx-demo</artifactId>
<version>5.5.0</version>
</parent>
- <artifactId>online-course-biz</artifactId>
+ <artifactId>platformx-demo-biz</artifactId>
<dependencies>
<!--蹇呭: undertow瀹瑰櫒-->
@@ -61,7 +61,7 @@
<!--蹇呭: 渚濊禆api妯″潡-->
<dependency>
<groupId>com.by4cloud</groupId>
- <artifactId>online-course-api</artifactId>
+ <artifactId>platformx-demo-api</artifactId>
<version>5.5.0</version>
</dependency>
<!--蹇呭: log 渚濊禆-->
diff --git a/online-course-biz/src/main/java/com/by4cloud/platformx/onlineCourse/App.java b/platformx-demo-biz/src/main/java/com/by4cloud/platformx/demo/App.java
similarity index 93%
rename from online-course-biz/src/main/java/com/by4cloud/platformx/onlineCourse/App.java
rename to platformx-demo-biz/src/main/java/com/by4cloud/platformx/demo/App.java
index f9baa49..26cdb3b 100644
--- a/online-course-biz/src/main/java/com/by4cloud/platformx/onlineCourse/App.java
+++ b/platformx-demo-biz/src/main/java/com/by4cloud/platformx/demo/App.java
@@ -1,4 +1,4 @@
-package com.by4cloud.platformx.onlineCourse;
+package com.by4cloud.platformx.demo;
import com.by4cloud.platformx.common.feign.annotation.EnablePlatformxFeignClients;
import com.by4cloud.platformx.common.security.annotation.EnablePlatformxResourceServer;
diff --git a/platformx-demo-biz/src/main/java/com/by4cloud/platformx/demo/controller/packge-info.java b/platformx-demo-biz/src/main/java/com/by4cloud/platformx/demo/controller/packge-info.java
new file mode 100644
index 0000000..5104794
--- /dev/null
+++ b/platformx-demo-biz/src/main/java/com/by4cloud/platformx/demo/controller/packge-info.java
@@ -0,0 +1,4 @@
+/*
+ * @author platformx archetype
+ */
+package com.by4cloud.platformx.demo.controller;
\ No newline at end of file
diff --git a/platformx-demo-biz/src/main/java/com/by4cloud/platformx/demo/mapper/packge-info.java b/platformx-demo-biz/src/main/java/com/by4cloud/platformx/demo/mapper/packge-info.java
new file mode 100644
index 0000000..1a927b0
--- /dev/null
+++ b/platformx-demo-biz/src/main/java/com/by4cloud/platformx/demo/mapper/packge-info.java
@@ -0,0 +1,6 @@
+/*
+ * @author platformx archetype
+ * <p>
+ * Mybatis Mapper 瀛樻斁鐩綍
+ */
+package com.by4cloud.platformx.demo.mapper;
\ No newline at end of file
diff --git a/platformx-demo-biz/src/main/java/com/by4cloud/platformx/demo/service/packge-info.java b/platformx-demo-biz/src/main/java/com/by4cloud/platformx/demo/service/packge-info.java
new file mode 100644
index 0000000..6b75b5e
--- /dev/null
+++ b/platformx-demo-biz/src/main/java/com/by4cloud/platformx/demo/service/packge-info.java
@@ -0,0 +1,4 @@
+/*
+ * @author platformx archetype
+ */
+package com.by4cloud.platformx.demo.service;
\ No newline at end of file
diff --git a/platformx-demo-biz/src/main/resources/application.yml b/platformx-demo-biz/src/main/resources/application.yml
new file mode 100644
index 0000000..cb286d7
--- /dev/null
+++ b/platformx-demo-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: ${NACOS_HOST:platformx-register}:${NACOS_PORT: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: ${MYSQL_USER:root}
+ password: ${MYSQL_PWD:root}
+ url: jdbc:mysql://${MYSQL_HOST:platformx-mysql}:${MYSQL_PORT:3306}/${MYSQL_DB:platformxx_demo}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true
diff --git a/platformx-demo-biz/src/main/resources/logback-spring.xml b/platformx-demo-biz/src/main/resources/logback-spring.xml
new file mode 100644
index 0000000..aa7b427
--- /dev/null
+++ b/platformx-demo-biz/src/main/resources/logback-spring.xml
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ Copyright (c) 2018-2025, platformx All rights reserved.
+ ~
+ ~ Redistribution and use in source and binary forms, with or without
+ ~ modification, are permitted provided that the following conditions are met:
+ ~
+ ~ Redistributions of source code must retain the above copyright notice,
+ ~ this list of conditions and the following disclaimer.
+ ~ Redistributions in binary form must reproduce the above copyright
+ ~ notice, this list of conditions and the following disclaimer in the
+ ~ documentation and/or other materials provided with the distribution.
+ ~ Neither the name of the pig4cloud.com developer nor the names of its
+ ~ contributors may be used to endorse or promote products derived from
+ ~ this software without specific prior written permission.
+ ~ Author: platformx
+ -->
+
+<!--
+ 灏忔妧宸�: 鍦ㄦ牴pom閲岄潰璁剧疆缁熶竴瀛樻斁璺緞锛岀粺涓�绠＄悊鏂逛究缁存姢
+ <properties>
+ <log-path>/Users/platformx</log-path>
+ </properties>
+ 1. 鍏朵粬妯″潡鍔犳棩蹇楄緭鍑猴紝鐩存帴copy鏈枃浠舵斁鍦╮esources 鐩綍鍗冲彲
+ 2. 娉ㄦ剰淇敼 <property name="${log-path}/log.path" value=""/> 鐨剉alue妯″潡
+-->
+<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>
+
+ <!--AJ 楠岃瘉鐮両NFO 灞忚斀-->
+ <logger name="com.anji.captcha" 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"/>
+ <appender-ref ref="error"/>
+ </root>
+</configuration>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index e5e1a0d..c5ac1cc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,13 +10,13 @@
<version>5.5.0</version>
</parent>
- <artifactId>online-course</artifactId>
+ <artifactId>platformx-demo</artifactId>
<packaging>pom</packaging>
<!--椤圭洰瀛愭ā鍧�-->
<modules>
- <module>online-course-api</module>
- <module>online-course-biz</module>
+ <module>platformx-demo-api</module>
+ <module>platformx-demo-biz</module>
<module>platformx-boot</module>
</modules>
</project>
--
Gitblit v1.9.1