From 94496f091916f96a9a8fdf32a4ab62efe7b5eecd Mon Sep 17 00:00:00 2001 From: lmm <3386165318@qq.com> Date: 星期一, 15 七月 2024 17:21:18 +0800 Subject: [PATCH] 提交项目 --- online-course-biz/pom.xml | 6 +- online-course-api/src/main/java/com/by4cloud/platformx/onlineCourse/entity/Demo.java | 2 platformx-boot/src/main/resources/application-dev.yml | 4 online-course-api/src/main/java/com/by4cloud/platformx/onlineCourse/dto/packge-info.java | 6 ++ online-course-api/src/main/java/com/by4cloud/platformx/onlineCourse/constant/packge-info.java | 6 ++ online-course-biz/src/main/java/com/by4cloud/platformx/onlineCourse/mapper/packge-info.java | 6 ++ online-course-biz/src/main/java/com/by4cloud/platformx/onlineCourse/App.java | 2 pom.xml | 6 +- online-course-biz/src/main/java/com/by4cloud/platformx/onlineCourse/service/packge-info.java | 4 + platformx-boot/pom.xml | 6 +- /dev/null | 70 ----------------------- online-course-api/src/main/java/com/by4cloud/platformx/onlineCourse/entity/packge-info.java | 6 ++ online-course-api/src/main/java/com/by4cloud/platformx/onlineCourse/api/feign/packge-info.java | 2 online-course-api/pom.xml | 4 online-course-biz/src/main/java/com/by4cloud/platformx/onlineCourse/controller/packge-info.java | 4 + 15 files changed, 48 insertions(+), 86 deletions(-) diff --git a/platformx-demo-api/pom.xml b/online-course-api/pom.xml similarity index 93% rename from platformx-demo-api/pom.xml rename to online-course-api/pom.xml index e0aa33e..0734805 100644 --- a/platformx-demo-api/pom.xml +++ b/online-course-api/pom.xml @@ -6,11 +6,11 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>com.by4cloud</groupId> - <artifactId>platformx-demo</artifactId> + <artifactId>online-course</artifactId> <version>5.5.0</version> </parent> - <artifactId>platformx-demo-api</artifactId> + <artifactId>online-course-api</artifactId> <dependencies> <!-- 杩炶〃鏌ヨ娉ㄨВ --> diff --git a/platformx-demo-api/src/main/java/com/by4cloud/platformx/demo/api/feign/packge-info.java b/online-course-api/src/main/java/com/by4cloud/platformx/onlineCourse/api/feign/packge-info.java similarity index 69% rename from platformx-demo-api/src/main/java/com/by4cloud/platformx/demo/api/feign/packge-info.java rename to online-course-api/src/main/java/com/by4cloud/platformx/onlineCourse/api/feign/packge-info.java index a9565f0..f458208 100644 --- a/platformx-demo-api/src/main/java/com/by4cloud/platformx/demo/api/feign/packge-info.java +++ b/online-course-api/src/main/java/com/by4cloud/platformx/onlineCourse/api/feign/packge-info.java @@ -3,4 +3,4 @@ * <p> * feign client 瀛樻斁鐩綍锛屾敞鎰� @EnablePlatformxFeignClients 鐨勬壂鎻忚寖鍥� */ -package com.by4cloud.platformx.demo.api.feign; \ No newline at end of file +package com.by4cloud.platformx.onlineCourse.api.feign; \ No newline at end of file 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 new file mode 100644 index 0000000..25596f6 --- /dev/null +++ b/online-course-api/src/main/java/com/by4cloud/platformx/onlineCourse/constant/packge-info.java @@ -0,0 +1,6 @@ +/* + * @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 new file mode 100644 index 0000000..6302089 --- /dev/null +++ b/online-course-api/src/main/java/com/by4cloud/platformx/onlineCourse/dto/packge-info.java @@ -0,0 +1,6 @@ +/* + * @author platformx archetype + * <p> + * DTO 瀛樻斁鐩綍 + */ +package com.by4cloud.platformx.onlineCourse.dto; \ No newline at end of file diff --git a/platformx-demo-api/src/main/java/com/by4cloud/platformx/demo/entity/Demo.java b/online-course-api/src/main/java/com/by4cloud/platformx/onlineCourse/entity/Demo.java similarity index 95% rename from platformx-demo-api/src/main/java/com/by4cloud/platformx/demo/entity/Demo.java rename to online-course-api/src/main/java/com/by4cloud/platformx/onlineCourse/entity/Demo.java index b78e947..95fd66f 100644 --- a/platformx-demo-api/src/main/java/com/by4cloud/platformx/demo/entity/Demo.java +++ b/online-course-api/src/main/java/com/by4cloud/platformx/onlineCourse/entity/Demo.java @@ -1,4 +1,4 @@ -package com.by4cloud.platformx.demo.entity; +package com.by4cloud.platformx.onlineCourse.entity; import com.baomidou.mybatisplus.annotation.TableField; import com.by4cloud.platformx.common.data.mybatis.BaseModel; 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 new file mode 100644 index 0000000..5fa18af --- /dev/null +++ b/online-course-api/src/main/java/com/by4cloud/platformx/onlineCourse/entity/packge-info.java @@ -0,0 +1,6 @@ +/* + * @author platformx archetype + * <p> + * 瀹炰綋 瀛樻斁鐩綍 + */ +package com.by4cloud.platformx.onlineCourse.entity; \ No newline at end of file diff --git a/platformx-demo-biz/pom.xml b/online-course-biz/pom.xml similarity index 96% rename from platformx-demo-biz/pom.xml rename to online-course-biz/pom.xml index 5c8f89d..e8fee3c 100644 --- a/platformx-demo-biz/pom.xml +++ b/online-course-biz/pom.xml @@ -6,11 +6,11 @@ <modelVersion>4.0.0</modelVersion> <parent> <groupId>com.by4cloud</groupId> - <artifactId>platformx-demo</artifactId> + <artifactId>online-course</artifactId> <version>5.5.0</version> </parent> - <artifactId>platformx-demo-biz</artifactId> + <artifactId>online-course-biz</artifactId> <dependencies> <!--蹇呭: undertow瀹瑰櫒--> @@ -61,7 +61,7 @@ <!--蹇呭: 渚濊禆api妯″潡--> <dependency> <groupId>com.by4cloud</groupId> - <artifactId>platformx-demo-api</artifactId> + <artifactId>online-course-api</artifactId> <version>5.5.0</version> </dependency> <!--蹇呭: log 渚濊禆--> diff --git a/platformx-demo-biz/src/main/java/com/by4cloud/platformx/demo/App.java b/online-course-biz/src/main/java/com/by4cloud/platformx/onlineCourse/App.java similarity index 93% rename from platformx-demo-biz/src/main/java/com/by4cloud/platformx/demo/App.java rename to online-course-biz/src/main/java/com/by4cloud/platformx/onlineCourse/App.java index 26cdb3b..f9baa49 100644 --- a/platformx-demo-biz/src/main/java/com/by4cloud/platformx/demo/App.java +++ b/online-course-biz/src/main/java/com/by4cloud/platformx/onlineCourse/App.java @@ -1,4 +1,4 @@ -package com.by4cloud.platformx.demo; +package com.by4cloud.platformx.onlineCourse; import com.by4cloud.platformx.common.feign.annotation.EnablePlatformxFeignClients; import com.by4cloud.platformx.common.security.annotation.EnablePlatformxResourceServer; 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 new file mode 100644 index 0000000..73fd910 --- /dev/null +++ b/online-course-biz/src/main/java/com/by4cloud/platformx/onlineCourse/controller/packge-info.java @@ -0,0 +1,4 @@ +/* + * @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 new file mode 100644 index 0000000..bb96bd9 --- /dev/null +++ b/online-course-biz/src/main/java/com/by4cloud/platformx/onlineCourse/mapper/packge-info.java @@ -0,0 +1,6 @@ +/* + * @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 new file mode 100644 index 0000000..4bf6cfe --- /dev/null +++ b/online-course-biz/src/main/java/com/by4cloud/platformx/onlineCourse/service/packge-info.java @@ -0,0 +1,4 @@ +/* + * @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 d3dbfc9..6fa918b 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>platformx-demo</artifactId> + <artifactId>online-course</artifactId> <version>5.5.0</version> </parent> - <artifactId>demo-boot</artifactId> + <artifactId>platformx-boot</artifactId> <packaging>jar</packaging> <description>demo 鍗曚綋鐗堟湰鍚姩</description> @@ -39,7 +39,7 @@ <!--蹇呭锛氱敤鎴风鐞嗘ā鍧�--> <dependency> <groupId>com.by4cloud</groupId> - <artifactId>platformx-demo-biz</artifactId> + <artifactId>online-course-biz</artifactId> <version>${project.version}</version> </dependency> <!--瀹夊叏妯″潡--> diff --git a/platformx-boot/src/main/resources/application-dev.yml b/platformx-boot/src/main/resources/application-dev.yml index b995530..b6ee2e0 100644 --- a/platformx-boot/src/main/resources/application-dev.yml +++ b/platformx-boot/src/main/resources/application-dev.yml @@ -9,8 +9,8 @@ druid: driver-class-name: com.mysql.cj.jdbc.Driver username: root - password: rootroot - url: jdbc:mysql://platformx-mysql:3306/platformxx_demo?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true + password: root + url: jdbc:mysql://platformx-mysql:3306/online_course?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true jpa: # 鑷姩鐢熸垚琛ㄧ粨鏋� hibernate: 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 deleted file mode 100644 index ab748a1..0000000 --- a/platformx-demo-api/src/main/java/com/by4cloud/platformx/demo/constant/packge-info.java +++ /dev/null @@ -1,6 +0,0 @@ -/* - * @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 deleted file mode 100644 index a0695fe..0000000 --- a/platformx-demo-api/src/main/java/com/by4cloud/platformx/demo/dto/packge-info.java +++ /dev/null @@ -1,6 +0,0 @@ -/* - * @author platformx archetype - * <p> - * DTO 瀛樻斁鐩綍 - */ -package com.by4cloud.platformx.demo.dto; \ No newline at end of file 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 deleted file mode 100644 index e56cda8..0000000 --- a/platformx-demo-api/src/main/java/com/by4cloud/platformx/demo/entity/packge-info.java +++ /dev/null @@ -1,6 +0,0 @@ -/* - * @author platformx archetype - * <p> - * 瀹炰綋 瀛樻斁鐩綍 - */ -package com.by4cloud.platformx.demo.entity; \ No newline at end of file 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 deleted file mode 100644 index 5104794..0000000 --- a/platformx-demo-biz/src/main/java/com/by4cloud/platformx/demo/controller/packge-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/* - * @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 deleted file mode 100644 index 1a927b0..0000000 --- a/platformx-demo-biz/src/main/java/com/by4cloud/platformx/demo/mapper/packge-info.java +++ /dev/null @@ -1,6 +0,0 @@ -/* - * @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 deleted file mode 100644 index 6b75b5e..0000000 --- a/platformx-demo-biz/src/main/java/com/by4cloud/platformx/demo/service/packge-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/* - * @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 deleted file mode 100644 index cb286d7..0000000 --- a/platformx-demo-biz/src/main/resources/application.yml +++ /dev/null @@ -1,25 +0,0 @@ -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 deleted file mode 100644 index d8a813c..0000000 --- a/platformx-demo-biz/src/main/resources/logback-spring.xml +++ /dev/null @@ -1,70 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - 灏忔妧宸�: 鍦ㄦ牴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> - <!-- Level: FATAL 0 ERROR 3 WARN 4 INFO 6 DEBUG 7 --> - <root level="INFO"> - <appender-ref ref="console"/> - <appender-ref ref="debug"/> - </root> -</configuration> diff --git a/pom.xml b/pom.xml index c5ac1cc..e5e1a0d 100644 --- a/pom.xml +++ b/pom.xml @@ -10,13 +10,13 @@ <version>5.5.0</version> </parent> - <artifactId>platformx-demo</artifactId> + <artifactId>online-course</artifactId> <packaging>pom</packaging> <!--椤圭洰瀛愭ā鍧�--> <modules> - <module>platformx-demo-api</module> - <module>platformx-demo-biz</module> + <module>online-course-api</module> + <module>online-course-biz</module> <module>platformx-boot</module> </modules> </project> -- Gitblit v1.9.1