同步更新 github 和 gitee

v1.4.1
Parker 5 years ago
parent 3de49b1a76
commit d40eb1a105

1
.gitignore vendored

@ -31,3 +31,4 @@ build/
.vscode/ .vscode/
/git-pull.sh /git-pull.sh
/git-push.sh /git-push.sh
/app-log/

@ -0,0 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>opsli-boot-parent</artifactId>
<groupId>org.opsliframework.boot</groupId>
<version>1.0.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>opsli-core</artifactId>
<version>${project.parent.version}</version>
<dependencies>
<!-- 引入公用模块 -->
<dependency>
<groupId>org.opsliframework.boot</groupId>
<artifactId>opsli-common</artifactId>
<version>${version}</version>
</dependency>
</dependencies>
</project>

@ -1,4 +1,4 @@
package org.opsli.common.conf; package org.opsli.core.conf;
import com.github.xiaoymin.swaggerbootstrapui.annotations.EnableSwaggerBootstrapUI; import com.github.xiaoymin.swaggerbootstrapui.annotations.EnableSwaggerBootstrapUI;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
@ -20,6 +20,8 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2;
* @Author parker * @Author parker
* *
* swagger * swagger
*
* spring enablefasle
*/ */
@Slf4j @Slf4j
@Configuration @Configuration

@ -0,0 +1,48 @@
package org.opsli.core.handler;
import lombok.extern.slf4j.Slf4j;
import org.opsli.common.api.ResultVo;
import org.opsli.common.exception.EmptyException;
import org.opsli.common.exception.ServiceException;
import org.springframework.core.annotation.Order;
import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.ControllerAdvice;
import org.springframework.web.bind.annotation.ExceptionHandler;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.ResponseStatus;
/**
* @author parker
* @date 2020-09-13
*/
@Slf4j
@ControllerAdvice
@Order(-1)
public class GlobalExceptionHandler {
/**
*
*/
@ExceptionHandler(ServiceException.class)
@ResponseStatus(HttpStatus.INTERNAL_SERVER_ERROR)
@ResponseBody
public ResultVo bussinessException(ServiceException e) {
log.warn("业务异常 - 异常编号:{} - 异常信息:{}",e.getCode(),e.getMessage());
ResultVo errorR = ResultVo.error(e.getMessage());
errorR.setCode(e.getCode());
return errorR;
}
/**
*
*/
@ExceptionHandler(EmptyException.class)
@ResponseStatus(HttpStatus.BAD_REQUEST)
@ResponseBody
public ResultVo bussinessException(EmptyException e) {
ResultVo errorR = ResultVo.error(e.getMessage());
errorR.setCode(e.getCode());
return errorR;
}
}

@ -0,0 +1,29 @@
package org.opsli.core.msg;
import io.swagger.models.auth.In;
import org.opsli.common.base.msg.BaseMsg;
/**
* @BelongsProject: opsli-boot
* @BelongsPackage: org.opsli.core.msg
* @Author: Parker
* @CreateTime: 2020-09-13 19:36
* @Description: -
*/
public enum CoreMsg implements BaseMsg {
;
private Integer code;
private String message;
@Override
public Integer getCode() {
return this.code;
}
@Override
public String getMessage() {
return this.message;
}
}

@ -1,3 +1,6 @@
**建议在 当前 plugins 父类pom中定义子maven所引用的版本号**
## opsli 业务模块 ## opsli 业务模块
> 可扩展业务模块 > 可扩展业务模块

@ -0,0 +1,50 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>org.opsliframework.boot</groupId>
<artifactId>opsli-boot-parent</artifactId>
<version>1.0.0</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>opsli-modulars</artifactId>
<version>1.0.0</version>
<packaging>pom</packaging>
<!-- 模块 -->
<modules>
<module>opsli-modulars-test</module>
</modules>
<!-- 规定子类所引用的版本 -->
<dependencyManagement>
<dependencies>
<!-- 引入邮件插件 -->
<dependency>
<groupId>org.opsliframework.boot</groupId>
<artifactId>opsli-plugins-mail</artifactId>
<version>${plugins.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
<dependencies>
<!-- 引入公共模块 -->
<dependency>
<groupId>org.opsliframework.boot</groupId>
<artifactId>opsli-common</artifactId>
<version>${project.parent.version}</version>
</dependency>
<!-- 引入核心模块 -->
<dependency>
<groupId>org.opsliframework.boot</groupId>
<artifactId>opsli-core</artifactId>
<version>${project.parent.version}</version>
</dependency>
</dependencies>
</project>

@ -19,22 +19,22 @@
<dependency> <dependency>
<groupId>org.opsliframework.boot</groupId> <groupId>org.opsliframework.boot</groupId>
<artifactId>opsli-common</artifactId> <artifactId>opsli-common</artifactId>
<version>${project.parent.version}</version> <version>${version}</version>
</dependency> </dependency>
<!-- 引入插件模块 --> <!-- 引入核心模块 -->
<dependency> <dependency>
<groupId>org.opsliframework.boot</groupId> <groupId>org.opsliframework.boot</groupId>
<artifactId>opsli-plugins-mail</artifactId> <artifactId>opsli-core</artifactId>
<version>${project.parent.version}</version> <version>${version}</version>
</dependency> </dependency>
<!-- 引入子模块 -->
<!-- 注:业务自模块需要 在 web 里引入,否则打包不会加入 --> <!-- 引入测试业务模块 -->
<dependency> <dependency>
<groupId>org.opsliframework.boot</groupId> <groupId>org.opsliframework.boot</groupId>
<artifactId>opsli-modulars-test</artifactId> <artifactId>opsli-modulars-test</artifactId>
<version>${project.parent.version}</version> <version>${modulars.version}</version>
</dependency> </dependency>
</dependencies> </dependencies>

@ -1,4 +1,7 @@
## ---- 开发环境 ---- ## ## ---- 开发环境 ---- ##
opsli:
prefix: api
version: v1
# 端口设置 # 端口设置

@ -34,6 +34,9 @@ mybatis-plus:
call-setters-on-nulls: true call-setters-on-nulls: true
spring: spring:
profiles:
#此处由maven的环境选择决定
active: "@spring.active@"
servlet: servlet:
multipart: multipart:
max-file-size: 10MB max-file-size: 10MB
@ -49,6 +52,16 @@ spring:
autoconfigure: autoconfigure:
exclude: exclude:
- com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure - com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure
profiles: # 邮件设置
#此处由maven的环境选择决定 mail:
active: "@spring.active@" host: smtp.qq.com
properties:
mail:
smpt:
# 认证
auth: true
starttls:
enable: true
required: true
# 默认编码
default-encoding: UTF-8

@ -0,0 +1,2 @@
## 统一异常类
02001=请求数据不完整或格式错误!

@ -0,0 +1,118 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
<!--日志格式应用spring boot默认的格式也可以自己更改-->
<include resource="org/springframework/boot/logging/logback/defaults.xml"/>
<!--定义日志存放的位置,默认存放在项目启动的相对路径的目录-->
<springProperty scope="context" name="LOG_PATH" source="log.path" defaultValue="app-log"/>
<!-- ****************************************************************************************** -->
<!-- ****************************** 本地开发只在控制台打印日志 ************************************ -->
<!-- ****************************************************************************************** -->
<springProfile name="local">
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
<pattern>${CONSOLE_LOG_PATTERN}</pattern>
<charset>utf-8</charset>
</encoder>
</appender>
<!--默认所有的包以info-->
<root level="info">
<appender-ref ref="STDOUT"/>
</root>
<!--各个服务的包在本地执行的时候打开debug模式-->
<logger name="org.opsli" level="debug" additivity="false">
<appender-ref ref="STDOUT"/>
</logger>
</springProfile>
<!-- ********************************************************************************************** -->
<!-- **** 放到服务器上不管在什么环境都只在文件记录日志控制台catalina.out打印logback捕获不到的日志 **** -->
<!-- ********************************************************************************************** -->
<springProfile name="!local">
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
<pattern>${CONSOLE_LOG_PATTERN}</pattern>
<charset>utf-8</charset>
</encoder>
</appender>
<!-- 日志记录器,日期滚动记录 -->
<appender name="FILE_ERROR" class="ch.qos.logback.core.rolling.RollingFileAppender">
<!-- 正在记录的日志文件的路径及文件名 -->
<file>${LOG_PATH}/opsli_log_error.log</file>
<!-- 日志记录器的滚动策略,按日期,按大小记录 -->
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<!-- 归档的日志文件的路径,%d{yyyy-MM-dd}指定日期格式,%i指定索引 -->
<fileNamePattern>${LOG_PATH}/error/opsli-log-error-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
<!-- 除按日志记录之外还配置了日志文件不能超过2M若超过2M日志文件会以索引0开始
命名日志文件例如log-error-2013-12-21.0.log -->
<timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
<maxFileSize>10MB</maxFileSize>
</timeBasedFileNamingAndTriggeringPolicy>
</rollingPolicy>
<!-- 追加方式记录日志 -->
<append>true</append>
<!-- 日志文件的格式 -->
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
<pattern>${FILE_LOG_PATTERN}</pattern>
<charset>utf-8</charset>
</encoder>
<!-- 此日志文件只记录error级别的 -->
<filter class="ch.qos.logback.classic.filter.LevelFilter">
<level>error</level>
<onMatch>ACCEPT</onMatch>
<onMismatch>DENY</onMismatch>
</filter>
</appender>
<!-- 日志记录器,日期滚动记录 -->
<appender name="FILE_ALL" class="ch.qos.logback.core.rolling.RollingFileAppender">
<!-- 正在记录的日志文件的路径及文件名 -->
<file>${LOG_PATH}/opsli_log_total.log</file>
<!-- 日志记录器的滚动策略,按日期,按大小记录 -->
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<!-- 归档的日志文件的路径,%d{yyyy-MM-dd}指定日期格式,%i指定索引 -->
<fileNamePattern>${LOG_PATH}/total/opsli-log-total-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
<!-- 除按日志记录之外还配置了日志文件不能超过2M若超过2M日志文件会以索引0开始
命名日志文件例如log-error-2013-12-21.0.log -->
<timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
<maxFileSize>10MB</maxFileSize>
</timeBasedFileNamingAndTriggeringPolicy>
</rollingPolicy>
<!-- 追加方式记录日志 -->
<append>true</append>
<!-- 日志文件的格式 -->
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
<pattern>${FILE_LOG_PATTERN}</pattern>
<charset>utf-8</charset>
</encoder>
</appender>
<!--记录到文件时记录两类一类是error日志一个是所有日志-->
<root level="info">
<appender-ref ref="STDOUT"/>
<appender-ref ref="FILE_ERROR"/>
<appender-ref ref="FILE_ALL"/>
</root>
</springProfile>
</configuration>

@ -0,0 +1 @@
## 邮件异常 90001 - 90020

@ -48,13 +48,16 @@
<!-- 引入 modules --> <!-- 引入 modules -->
<modules> <modules>
<module>opsli-web</module> <module>opsli-web</module>
<module>opsli-core</module>
<module>opsli-common</module> <module>opsli-common</module>
<module>opsli-modulars/opsli-modulars-test</module> <module>opsli-plugins</module>
<module>opsli-plugins/opsli-plugins-mail</module> <module>opsli-modulars</module>
</modules> </modules>
<!-- 全局版本 --> <!-- 全局版本 -->
<properties> <properties>
<plugins.version>1.0.0</plugins.version>
<modulars.version>1.0.0</modulars.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>1.8</java.version> <java.version>1.8</java.version>
@ -81,11 +84,7 @@
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId> <artifactId>spring-boot-starter-web</artifactId>
</dependency> </dependency>
<!-- 邮件服务 -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-mail</artifactId>
</dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId> <artifactId>spring-boot-starter-test</artifactId>
@ -112,13 +111,13 @@
<!-- 集成Shiro鉴权安全认证 BEGIN --> <!-- 集成Shiro鉴权安全认证 BEGIN -->
<!--shiro--> <!--shiro-->
<dependency> <!--<dependency>
<groupId>org.apache.shiro</groupId> <groupId>org.apache.shiro</groupId>
<artifactId>shiro-spring-boot-starter</artifactId> <artifactId>shiro-spring-boot-starter</artifactId>
<version>1.6.0</version> <version>1.6.0</version>
</dependency> </dependency>
<!-- shiro-redis --> &lt;!&ndash; shiro-redis &ndash;&gt;
<dependency> <dependency>
<groupId>org.crazycake</groupId> <groupId>org.crazycake</groupId>
<artifactId>shiro-redis</artifactId> <artifactId>shiro-redis</artifactId>
@ -129,7 +128,7 @@
<artifactId>shiro-core</artifactId> <artifactId>shiro-core</artifactId>
</exclusion> </exclusion>
</exclusions> </exclusions>
</dependency> </dependency>-->
<!-- 集成Shiro鉴权安全认证 END --> <!-- 集成Shiro鉴权安全认证 END -->
<!-- 集成数据库相关配置 BEGIN--> <!-- 集成数据库相关配置 BEGIN-->
@ -274,6 +273,8 @@
</dependency> </dependency>
<!-- 集成工具 END--> <!-- 集成工具 END-->
</dependencies> </dependencies>
<!-- 包版本管理 --> <!-- 包版本管理 -->

Loading…
Cancel
Save