Skip to content

Commit 9225b36

Browse files
authored
Merge branch 'master' into refactor/change-response-vo
2 parents d69fbc7 + 4c7ab46 commit 9225b36

90 files changed

Lines changed: 203 additions & 75 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<h1 align="center">
2-
<a href="http://doc.cms.7yue.pro/">
3-
<img src="http://doc.cms.7yue.pro/left-logo.png" width="250"/></a>
2+
<a href="http://doc.cms.talelin.com/">
3+
<img src="http://doc.cms.talelin.com/left-logo.png" width="250"/></a>
44
<br>
55
Lin-CMS-Spring-boot
66
</h1>
77

8-
<h4 align="center">一个简单易用的CMS后端项目 | <a href="http://doc.cms.7yue.pro/" target="_blank">Lin-CMS-Spring-boot</a></h4>
8+
<h4 align="center">一个简单易用的CMS后端项目 | <a href="http://doc.cms.talelin.com/" target="_blank">Lin-CMS-Spring-boot</a></h4>
99

1010
<p align="center">
1111

@@ -42,7 +42,7 @@
4242

4343
### 文档地址
4444

45-
[http://doc.cms.7yue.pro/](http://doc.cms.7yue.pro/)
45+
[http://doc.cms.talelin.com/](http://doc.cms.talelin.com/)
4646

4747
## 简介
4848

src/main/java/io/github/talelin/merak/MerakApplication.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@
66
import org.springframework.web.bind.annotation.RequestMapping;
77
import org.springframework.web.bind.annotation.RestController;
88

9+
/**
10+
* @author pedro@TaleLin
11+
*/
912
@SpringBootApplication(scanBasePackages = {"io.github.talelin.merak"})
1013
@MapperScan(basePackages = {"io.github.talelin.merak.mapper"})
1114
@RestController

src/main/java/io/github/talelin/merak/bo/FileBO.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22

33
import lombok.Data;
44

5+
/**
6+
* @author pedro@TaleLin
7+
*/
58
@Data
69
public class FileBO {
710

src/main/java/io/github/talelin/merak/bo/GroupPermissionBO.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@
77

88
import java.util.List;
99

10+
/**
11+
* @author pedro@TaleLin
12+
*/
1013
@Data
1114
@NoArgsConstructor
1215
@AllArgsConstructor

src/main/java/io/github/talelin/merak/common/LocalUser.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44

55
/**
66
* 线程安全的当前登录用户,如果用户为登录,则得到 null
7+
*
8+
* @author pedro@TaleLin
79
*/
810
public class LocalUser {
911

src/main/java/io/github/talelin/merak/common/aop/ResultAspect.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,12 @@
99
import org.aspectj.lang.annotation.Pointcut;
1010
import org.springframework.stereotype.Component;
1111

12-
1312
/**
1413
* 处理返回结果为 UnifyResponseVO 的视图函数
1514
* 默认的返回均是英文,在此处通过code替换成中文
15+
*
16+
* @author pedro@TaleLin
17+
* @author colorful@TaleLin
1618
*/
1719
@Aspect
1820
@Component

src/main/java/io/github/talelin/merak/common/configuration/CodeMessageConfiguration.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@
77
import java.util.HashMap;
88
import java.util.Map;
99

10+
/**
11+
* @author pedro@TaleLin
12+
*/
1013
@SuppressWarnings("ConfigurationProperties")
1114
@Component
1215
@ConfigurationProperties

src/main/java/io/github/talelin/merak/common/configuration/CommonConfiguration.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,9 @@
1212
import org.springframework.context.annotation.Bean;
1313
import org.springframework.context.annotation.Configuration;
1414

15-
15+
/**
16+
* @author pedro@TaleLin
17+
*/
1618
@Configuration(proxyBeanMethods = false)
1719
@EnableConfigurationProperties(FileProperties.class)
1820
public class CommonConfiguration {

src/main/java/io/github/talelin/merak/common/configuration/WebConfiguration.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,10 @@
1616
import java.nio.file.FileSystems;
1717
import java.nio.file.Path;
1818

19-
2019
/**
2120
* Spring MVC 配置
21+
*
22+
* @author pedro@TaleLin
2223
*/
2324
@Configuration(proxyBeanMethods = false)
2425
@Slf4j

src/main/java/io/github/talelin/merak/common/constant/IdentityConstant.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
/**
44
* 身份认证常量
5+
*
6+
* @author pedro@TaleLin
57
*/
68
public class IdentityConstant {
79

0 commit comments

Comments
 (0)