From 33145e9276a73d59367f731d44cd21702a0c5cea Mon Sep 17 00:00:00 2001
From: Zhu Zhonghua <zhonghua@qq.com>
Date: 星期一, 07 四月 2025 22:05:23 +0800
Subject: [PATCH] 创建aps业务模块
---
aps-modules/aps-core/pom.xml | 82 ++++++++++++++++
aps-modules/aps-core/src/main/java/com/aps/core/APSCoreApplication.java | 6
aps-modules/aps-file/src/main/java/com/aps/core/utils/FileUploadUtils.java | 2
aps-modules/aps-core/src/main/resources/mapper/core/CoreMapper.xml | 10 ++
aps-modules/aps-file/src/main/java/com/aps/core/config/ResourcesConfig.java | 2
aps-modules/aps-core/src/main/java/com/aps/core/service/impl/CoreServiceImpl.java | 21 ++++
aps-modules/aps-file/src/main/java/com/aps/core/service/ISysFileService.java | 2
aps-modules/aps-file/src/main/java/com/aps/core/controller/SysFileController.java | 4
aps-modules/aps-core/src/main/resources/bootstrap.yml | 25 +++++
aps-modules/aps-core/src/main/resources/logback.xml | 74 ++++++++++++++
aps-modules/aps-file/src/main/java/com/aps/core/service/LocalSysFileServiceImpl.java | 4
aps-modules/aps-core/src/main/java/com/aps/core/mapper/CoreMapper.java | 7 +
aps-modules/pom.xml | 1
aps-modules/aps-core/src/main/java/com/aps/core/service/ICoreService.java | 4
aps-modules/aps-core/src/main/resources/banner.txt | 10 ++
aps-modules/aps-core/src/main/java/com/aps/core/controller/CoreController.java | 12 +-
aps-modules/aps-file/src/main/java/com/aps/core/APSFileApplication.java | 2
17 files changed, 249 insertions(+), 19 deletions(-)
diff --git a/aps-modules/aps-core/pom.xml b/aps-modules/aps-core/pom.xml
new file mode 100644
index 0000000..4139244
--- /dev/null
+++ b/aps-modules/aps-core/pom.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="http://maven.apache.org/POM/4.0.0"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <parent>
+ <groupId>com.aps</groupId>
+ <artifactId>aps-modules</artifactId>
+ <version>3.6.5</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+
+ <artifactId>aps-modules-core</artifactId>
+
+ <description>
+ aps涓氬姟妯″潡
+ </description>
+
+ <dependencies>
+
+ <!-- SpringCloud Alibaba Nacos -->
+ <dependency>
+ <groupId>com.alibaba.cloud</groupId>
+ <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
+ </dependency>
+
+ <!-- SpringCloud Alibaba Nacos Config -->
+ <dependency>
+ <groupId>com.alibaba.cloud</groupId>
+ <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
+ </dependency>
+
+ <!-- SpringCloud Alibaba Sentinel -->
+ <dependency>
+ <groupId>com.alibaba.cloud</groupId>
+ <artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
+ </dependency>
+
+ <!-- SpringBoot Actuator -->
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-actuator</artifactId>
+ </dependency>
+
+ <!-- SpringBoot Web -->
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-web</artifactId>
+ </dependency>
+
+ <!-- Minio -->
+ <dependency>
+ <groupId>io.minio</groupId>
+ <artifactId>minio</artifactId>
+ <version>${minio.version}</version>
+ </dependency>
+
+ <!-- RuoYi Api System -->
+ <dependency>
+ <groupId>com.aps</groupId>
+ <artifactId>aps-api-system</artifactId>
+ </dependency>
+
+ </dependencies>
+
+ <build>
+ <finalName>${project.artifactId}</finalName>
+ <plugins>
+ <plugin>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>repackage</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
\ No newline at end of file
diff --git a/aps-modules/aps-file/src/main/java/com/aps/file/APSFileApplication.java b/aps-modules/aps-core/src/main/java/com/aps/core/APSCoreApplication.java
similarity index 89%
copy from aps-modules/aps-file/src/main/java/com/aps/file/APSFileApplication.java
copy to aps-modules/aps-core/src/main/java/com/aps/core/APSCoreApplication.java
index a9fa08a..138d440 100644
--- a/aps-modules/aps-file/src/main/java/com/aps/file/APSFileApplication.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/APSCoreApplication.java
@@ -1,4 +1,4 @@
-package com.aps.file;
+package com.aps.core;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -10,11 +10,11 @@
* @author ruoyi
*/
@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class })
-public class APSFileApplication
+public class APSCoreApplication
{
public static void main(String[] args)
{
- SpringApplication.run(APSFileApplication.class, args);
+ SpringApplication.run(APSCoreApplication.class, args);
System.out.println("(鈾モ棤鈥库棤)锞夛緸 鏂囦欢鏈嶅姟妯″潡鍚姩鎴愬姛 醿�(麓凇`醿�)锞� \n" +
" .-------. ____ __ \n" +
" | _ _ \\ \\ \\ / / \n" +
diff --git a/aps-modules/aps-file/src/main/java/com/aps/file/controller/SysFileController.java b/aps-modules/aps-core/src/main/java/com/aps/core/controller/CoreController.java
similarity index 77%
copy from aps-modules/aps-file/src/main/java/com/aps/file/controller/SysFileController.java
copy to aps-modules/aps-core/src/main/java/com/aps/core/controller/CoreController.java
index 7a8115e..5c5a95a 100644
--- a/aps-modules/aps-file/src/main/java/com/aps/file/controller/SysFileController.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/controller/CoreController.java
@@ -1,5 +1,6 @@
-package com.aps.file.controller;
+package com.aps.core.controller;
+import com.aps.core.service.ICoreService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -8,7 +9,6 @@
import org.springframework.web.multipart.MultipartFile;
import com.aps.common.core.domain.R;
import com.aps.common.core.utils.file.FileUtils;
-import com.aps.file.service.ISysFileService;
import com.aps.system.api.domain.SysFile;
/**
@@ -17,12 +17,12 @@
* @author ruoyi
*/
@RestController
-public class SysFileController
+public class CoreController
{
- private static final Logger log = LoggerFactory.getLogger(SysFileController.class);
+ private static final Logger log = LoggerFactory.getLogger(CoreController.class);
@Autowired
- private ISysFileService sysFileService;
+ private ICoreService coreService;
/**
* 鏂囦欢涓婁紶璇锋眰
@@ -33,7 +33,7 @@
try
{
// 涓婁紶骞惰繑鍥炶闂湴鍧�
- String url = sysFileService.uploadFile(file);
+ String url = coreService.uploadFile(file);
SysFile sysFile = new SysFile();
sysFile.setName(FileUtils.getName(url));
sysFile.setUrl(url);
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/mapper/CoreMapper.java b/aps-modules/aps-core/src/main/java/com/aps/core/mapper/CoreMapper.java
new file mode 100644
index 0000000..edbc154
--- /dev/null
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/mapper/CoreMapper.java
@@ -0,0 +1,7 @@
+package com.aps.core.mapper;
+
+public interface CoreMapper
+{
+
+ public void cleanJobLog();
+}
diff --git a/aps-modules/aps-file/src/main/java/com/aps/file/service/ISysFileService.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/ICoreService.java
similarity index 83%
copy from aps-modules/aps-file/src/main/java/com/aps/file/service/ISysFileService.java
copy to aps-modules/aps-core/src/main/java/com/aps/core/service/ICoreService.java
index 5e905b8..a5098a6 100644
--- a/aps-modules/aps-file/src/main/java/com/aps/file/service/ISysFileService.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/service/ICoreService.java
@@ -1,4 +1,4 @@
-package com.aps.file.service;
+package com.aps.core.service;
import org.springframework.web.multipart.MultipartFile;
@@ -7,7 +7,7 @@
*
* @author ruoyi
*/
-public interface ISysFileService
+public interface ICoreService
{
/**
* 鏂囦欢涓婁紶鎺ュ彛
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/CoreServiceImpl.java b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/CoreServiceImpl.java
new file mode 100644
index 0000000..232b194
--- /dev/null
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/service/impl/CoreServiceImpl.java
@@ -0,0 +1,21 @@
+package com.aps.core.service.impl;
+
+import com.aps.core.service.ICoreService;
+import org.springframework.context.annotation.Primary;
+import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+
+/**
+ * 鏈湴鏂囦欢瀛樺偍
+ *
+ */
+@Primary
+@Service
+public class CoreServiceImpl implements ICoreService
+{
+ @Override
+ public String uploadFile(MultipartFile file) throws Exception
+ {
+ return null;
+ }
+}
diff --git a/aps-modules/aps-core/src/main/resources/banner.txt b/aps-modules/aps-core/src/main/resources/banner.txt
new file mode 100644
index 0000000..27cacb9
--- /dev/null
+++ b/aps-modules/aps-core/src/main/resources/banner.txt
@@ -0,0 +1,10 @@
+Spring Boot Version: ${spring-boot.version}
+Spring Application Name: ${spring.application.name}
+ _ __ _ _
+ (_) / _|(_)| |
+ _ __ _ _ ___ _ _ _ ______ | |_ _ | | ___
+| '__|| | | | / _ \ | | | || ||______|| _|| || | / _ \
+| | | |_| || (_) || |_| || | | | | || || __/
+|_| \__,_| \___/ \__, ||_| |_| |_||_| \___|
+ __/ |
+ |___/
\ No newline at end of file
diff --git a/aps-modules/aps-core/src/main/resources/bootstrap.yml b/aps-modules/aps-core/src/main/resources/bootstrap.yml
new file mode 100644
index 0000000..04568ef
--- /dev/null
+++ b/aps-modules/aps-core/src/main/resources/bootstrap.yml
@@ -0,0 +1,25 @@
+# Tomcat
+server:
+ port: 9205
+
+# Spring
+spring:
+ application:
+ # 搴旂敤鍚嶇О
+ name: aps-core
+ profiles:
+ # 鐜閰嶇疆
+ active: dev
+ cloud:
+ nacos:
+ discovery:
+ # 鏈嶅姟娉ㄥ唽鍦板潃
+ server-addr: 192.168.50.160:8848
+ config:
+ # 閰嶇疆涓績鍦板潃
+ server-addr: 192.168.50.160:8848
+ # 閰嶇疆鏂囦欢鏍煎紡
+ file-extension: yml
+ # 鍏变韩閰嶇疆
+ shared-configs:
+ - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
diff --git a/aps-modules/aps-core/src/main/resources/logback.xml b/aps-modules/aps-core/src/main/resources/logback.xml
new file mode 100644
index 0000000..fd27c64
--- /dev/null
+++ b/aps-modules/aps-core/src/main/resources/logback.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration scan="true" scanPeriod="60 seconds" debug="false">
+ <!-- 鏃ュ織瀛樻斁璺緞 -->
+ <property name="log.path" value="logs/aps-file" />
+ <!-- 鏃ュ織杈撳嚭鏍煎紡 -->
+ <property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
+
+ <!-- 鎺у埗鍙拌緭鍑� -->
+ <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
+ <encoder>
+ <pattern>${log.pattern}</pattern>
+ </encoder>
+ </appender>
+
+ <!-- 绯荤粺鏃ュ織杈撳嚭 -->
+ <appender name="file_info" class="ch.qos.logback.core.rolling.RollingFileAppender">
+ <file>${log.path}/info.log</file>
+ <!-- 寰幆鏀跨瓥锛氬熀浜庢椂闂村垱寤烘棩蹇楁枃浠� -->
+ <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+ <!-- 鏃ュ織鏂囦欢鍚嶆牸寮� -->
+ <fileNamePattern>${log.path}/info.%d{yyyy-MM-dd}.log</fileNamePattern>
+ <!-- 鏃ュ織鏈�澶х殑鍘嗗彶 60澶� -->
+ <maxHistory>60</maxHistory>
+ </rollingPolicy>
+ <encoder>
+ <pattern>${log.pattern}</pattern>
+ </encoder>
+ <filter class="ch.qos.logback.classic.filter.LevelFilter">
+ <!-- 杩囨护鐨勭骇鍒� -->
+ <level>INFO</level>
+ <!-- 鍖归厤鏃剁殑鎿嶄綔锛氭帴鏀讹紙璁板綍锛� -->
+ <onMatch>ACCEPT</onMatch>
+ <!-- 涓嶅尮閰嶆椂鐨勬搷浣滐細鎷掔粷锛堜笉璁板綍锛� -->
+ <onMismatch>DENY</onMismatch>
+ </filter>
+ </appender>
+
+ <appender name="file_error" class="ch.qos.logback.core.rolling.RollingFileAppender">
+ <file>${log.path}/error.log</file>
+ <!-- 寰幆鏀跨瓥锛氬熀浜庢椂闂村垱寤烘棩蹇楁枃浠� -->
+ <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+ <!-- 鏃ュ織鏂囦欢鍚嶆牸寮� -->
+ <fileNamePattern>${log.path}/error.%d{yyyy-MM-dd}.log</fileNamePattern>
+ <!-- 鏃ュ織鏈�澶х殑鍘嗗彶 60澶� -->
+ <maxHistory>60</maxHistory>
+ </rollingPolicy>
+ <encoder>
+ <pattern>${log.pattern}</pattern>
+ </encoder>
+ <filter class="ch.qos.logback.classic.filter.LevelFilter">
+ <!-- 杩囨护鐨勭骇鍒� -->
+ <level>ERROR</level>
+ <!-- 鍖归厤鏃剁殑鎿嶄綔锛氭帴鏀讹紙璁板綍锛� -->
+ <onMatch>ACCEPT</onMatch>
+ <!-- 涓嶅尮閰嶆椂鐨勬搷浣滐細鎷掔粷锛堜笉璁板綍锛� -->
+ <onMismatch>DENY</onMismatch>
+ </filter>
+ </appender>
+
+ <!-- 绯荤粺妯″潡鏃ュ織绾у埆鎺у埗 -->
+ <logger name="com.aps" level="info" />
+ <!-- Spring鏃ュ織绾у埆鎺у埗 -->
+ <logger name="org.springframework" level="warn" />
+
+ <root level="info">
+ <appender-ref ref="console" />
+ </root>
+
+ <!--绯荤粺鎿嶄綔鏃ュ織-->
+ <root level="info">
+ <appender-ref ref="file_info" />
+ <appender-ref ref="file_error" />
+ </root>
+</configuration>
\ No newline at end of file
diff --git a/aps-modules/aps-core/src/main/resources/mapper/core/CoreMapper.xml b/aps-modules/aps-core/src/main/resources/mapper/core/CoreMapper.xml
new file mode 100644
index 0000000..135b2ab
--- /dev/null
+++ b/aps-modules/aps-core/src/main/resources/mapper/core/CoreMapper.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.aps.core.mapper.CoreMapper">
+
+ <update id="cleanJobLog">
+ truncate table sys_job_log
+ </update>
+</mapper>
\ No newline at end of file
diff --git a/aps-modules/aps-file/src/main/java/com/aps/file/APSFileApplication.java b/aps-modules/aps-file/src/main/java/com/aps/core/APSFileApplication.java
similarity index 97%
rename from aps-modules/aps-file/src/main/java/com/aps/file/APSFileApplication.java
rename to aps-modules/aps-file/src/main/java/com/aps/core/APSFileApplication.java
index a9fa08a..18b63c1 100644
--- a/aps-modules/aps-file/src/main/java/com/aps/file/APSFileApplication.java
+++ b/aps-modules/aps-file/src/main/java/com/aps/core/APSFileApplication.java
@@ -1,4 +1,4 @@
-package com.aps.file;
+package com.aps.core;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
diff --git a/aps-modules/aps-file/src/main/java/com/aps/file/config/ResourcesConfig.java b/aps-modules/aps-file/src/main/java/com/aps/core/config/ResourcesConfig.java
similarity index 97%
rename from aps-modules/aps-file/src/main/java/com/aps/file/config/ResourcesConfig.java
rename to aps-modules/aps-file/src/main/java/com/aps/core/config/ResourcesConfig.java
index 0381cf7..c50553a 100644
--- a/aps-modules/aps-file/src/main/java/com/aps/file/config/ResourcesConfig.java
+++ b/aps-modules/aps-file/src/main/java/com/aps/core/config/ResourcesConfig.java
@@ -1,4 +1,4 @@
-package com.aps.file.config;
+package com.aps.core.config;
import java.io.File;
import org.springframework.beans.factory.annotation.Value;
diff --git a/aps-modules/aps-file/src/main/java/com/aps/file/controller/SysFileController.java b/aps-modules/aps-file/src/main/java/com/aps/core/controller/SysFileController.java
similarity index 93%
rename from aps-modules/aps-file/src/main/java/com/aps/file/controller/SysFileController.java
rename to aps-modules/aps-file/src/main/java/com/aps/core/controller/SysFileController.java
index 7a8115e..141e658 100644
--- a/aps-modules/aps-file/src/main/java/com/aps/file/controller/SysFileController.java
+++ b/aps-modules/aps-file/src/main/java/com/aps/core/controller/SysFileController.java
@@ -1,4 +1,4 @@
-package com.aps.file.controller;
+package com.aps.core.controller;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -8,7 +8,7 @@
import org.springframework.web.multipart.MultipartFile;
import com.aps.common.core.domain.R;
import com.aps.common.core.utils.file.FileUtils;
-import com.aps.file.service.ISysFileService;
+import com.aps.core.service.ISysFileService;
import com.aps.system.api.domain.SysFile;
/**
diff --git a/aps-modules/aps-file/src/main/java/com/aps/file/service/ISysFileService.java b/aps-modules/aps-file/src/main/java/com/aps/core/service/ISysFileService.java
similarity index 91%
rename from aps-modules/aps-file/src/main/java/com/aps/file/service/ISysFileService.java
rename to aps-modules/aps-file/src/main/java/com/aps/core/service/ISysFileService.java
index 5e905b8..479cac9 100644
--- a/aps-modules/aps-file/src/main/java/com/aps/file/service/ISysFileService.java
+++ b/aps-modules/aps-file/src/main/java/com/aps/core/service/ISysFileService.java
@@ -1,4 +1,4 @@
-package com.aps.file.service;
+package com.aps.core.service;
import org.springframework.web.multipart.MultipartFile;
diff --git a/aps-modules/aps-file/src/main/java/com/aps/file/service/LocalSysFileServiceImpl.java b/aps-modules/aps-file/src/main/java/com/aps/core/service/LocalSysFileServiceImpl.java
similarity index 93%
rename from aps-modules/aps-file/src/main/java/com/aps/file/service/LocalSysFileServiceImpl.java
rename to aps-modules/aps-file/src/main/java/com/aps/core/service/LocalSysFileServiceImpl.java
index 73f7c52..8abfc68 100644
--- a/aps-modules/aps-file/src/main/java/com/aps/file/service/LocalSysFileServiceImpl.java
+++ b/aps-modules/aps-file/src/main/java/com/aps/core/service/LocalSysFileServiceImpl.java
@@ -1,10 +1,10 @@
-package com.aps.file.service;
+package com.aps.core.service;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Primary;
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;
-import com.aps.file.utils.FileUploadUtils;
+import com.aps.core.utils.FileUploadUtils;
/**
* 鏈湴鏂囦欢瀛樺偍
diff --git a/aps-modules/aps-file/src/main/java/com/aps/file/utils/FileUploadUtils.java b/aps-modules/aps-file/src/main/java/com/aps/core/utils/FileUploadUtils.java
similarity index 99%
rename from aps-modules/aps-file/src/main/java/com/aps/file/utils/FileUploadUtils.java
rename to aps-modules/aps-file/src/main/java/com/aps/core/utils/FileUploadUtils.java
index 5fa10d1..a170e48 100644
--- a/aps-modules/aps-file/src/main/java/com/aps/file/utils/FileUploadUtils.java
+++ b/aps-modules/aps-file/src/main/java/com/aps/core/utils/FileUploadUtils.java
@@ -1,4 +1,4 @@
-package com.aps.file.utils;
+package com.aps.core.utils;
import java.io.File;
import java.io.IOException;
diff --git a/aps-modules/pom.xml b/aps-modules/pom.xml
index 54d43e3..26dd932 100644
--- a/aps-modules/pom.xml
+++ b/aps-modules/pom.xml
@@ -13,6 +13,7 @@
<module>aps-gen</module>
<module>aps-job</module>
<module>aps-file</module>
+ <module>aps-core</module>
</modules>
<artifactId>aps-modules</artifactId>
--
Gitblit v1.9.3