Skip to content

Commit 345c37a

Browse files
author
pedro
authored
Merge pull request #16 from TaleLin/feat/qiniu-upload
Feat/qiniu upload
2 parents 2c41177 + 6e0bf6e commit 345c37a

32 files changed

Lines changed: 184 additions & 338 deletions

‎pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
<groupId>io.github.talelin</groupId>
1313
<artifactId>merak</artifactId>
14-
<version>0.0.1-RC4</version>
14+
<version>0.0.1-RC6</version>
1515
<name>merak</name>
1616
<description>Demo project for lin cms</description>
1717

@@ -46,7 +46,7 @@
4646
<dependency>
4747
<groupId>io.github.talelin</groupId>
4848
<artifactId>lin-cms-spring-boot-starter</artifactId>
49-
<version>0.0.1-RC4</version>
49+
<version>0.0.1-RC6</version>
5050
</dependency>
5151

5252
<dependency>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package io.github.talelin.merak.common.aop;
22

33
import cn.hutool.core.util.StrUtil;
4-
import io.github.talelin.merak.common.configure.CodeConfig;
4+
import io.github.talelin.merak.common.configuration.CodeMessageConfiguration;
55
import io.github.talelin.merak.vo.UnifyResponseVO;
66
import lombok.extern.slf4j.Slf4j;
77
import org.aspectj.lang.annotation.AfterReturning;
@@ -29,7 +29,7 @@ public void doAfterReturning(Object ret) throws Throwable {
2929
if (ret instanceof UnifyResponseVO) {
3030
UnifyResponseVO result = (UnifyResponseVO) ret;
3131
int code = result.getCode();
32-
String message = CodeConfig.getMessage(code);
32+
String message = CodeMessageConfiguration.getMessage(code);
3333
if (StrUtil.isNotBlank(message)) {
3434
result.setMessage(message);
3535
}

src/main/java/io/github/talelin/merak/common/configure/CodeConfig.java renamed to src/main/java/io/github/talelin/merak/common/configuration/CodeMessageConfiguration.java

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package io.github.talelin.merak.common.configure;
1+
package io.github.talelin.merak.common.configuration;
22

33
import org.springframework.boot.context.properties.ConfigurationProperties;
44
import org.springframework.context.annotation.PropertySource;
@@ -7,10 +7,11 @@
77
import java.util.HashMap;
88
import java.util.Map;
99

10+
@SuppressWarnings("ConfigurationProperties")
1011
@Component
11-
@ConfigurationProperties(prefix = "lin.cms")
12-
@PropertySource(value = "classpath:code.properties", encoding = "UTF-8")
13-
public class CodeConfig {
12+
@ConfigurationProperties
13+
@PropertySource(value = "classpath:code-message.properties", encoding = "UTF-8")
14+
public class CodeMessageConfiguration {
1415

1516
private static Map<Integer, String> codeMessage = new HashMap<>();
1617

@@ -23,6 +24,6 @@ public Map<Integer, String> getCodeMessage() {
2324
}
2425

2526
public void setCodeMessage(Map<Integer, String> codeMessage) {
26-
CodeConfig.codeMessage = codeMessage;
27+
CodeMessageConfiguration.codeMessage = codeMessage;
2728
}
2829
}

src/main/java/io/github/talelin/merak/common/configure/CommonConfig.java renamed to src/main/java/io/github/talelin/merak/common/configuration/CommonConfiguration.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
package io.github.talelin.merak.common.configure;
1+
package io.github.talelin.merak.common.configuration;
22

33
import com.baomidou.mybatisplus.core.injector.DefaultSqlInjector;
44
import com.baomidou.mybatisplus.core.injector.ISqlInjector;
55
import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
66
import com.fasterxml.jackson.databind.PropertyNamingStrategy;
7-
import io.github.talelin.autoconfigure.beans.RouteMetaCollector;
7+
import io.github.talelin.autoconfigure.bean.RouteMetaCollector;
88
import io.github.talelin.merak.extensions.file.FileProperties;
99
import io.github.talelin.merak.common.interceptor.RequestLogInterceptor;
1010
import org.springframework.boot.autoconfigure.jackson.Jackson2ObjectMapperBuilderCustomizer;
@@ -15,7 +15,7 @@
1515

1616
@Configuration(proxyBeanMethods = false)
1717
@EnableConfigurationProperties(FileProperties.class)
18-
public class CommonConfig {
18+
public class CommonConfiguration {
1919

2020
@Bean
2121
public RequestLogInterceptor requestLogInterceptor() {

src/main/java/io/github/talelin/merak/common/configure/WebConfig.java renamed to src/main/java/io/github/talelin/merak/common/configuration/WebConfiguration.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package io.github.talelin.merak.common.configure;
1+
package io.github.talelin.merak.common.configuration;
22

33
import io.github.talelin.merak.common.interceptor.RequestLogInterceptor;
44
import io.github.talelin.autoconfigure.interceptor.AuthorizeInterceptor;
@@ -22,7 +22,7 @@
2222
*/
2323
@Configuration(proxyBeanMethods = false)
2424
@Slf4j
25-
public class WebConfig implements WebMvcConfigurer {
25+
public class WebConfiguration implements WebMvcConfigurer {
2626

2727
@Value("${auth.enabled:false}")
2828
private boolean authEnabled;

src/main/java/io/github/talelin/merak/common/consts/IdentityConsts.java renamed to src/main/java/io/github/talelin/merak/common/constant/IdentityConstant.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
package io.github.talelin.merak.common.consts;
1+
package io.github.talelin.merak.common.constant;
22

33
/**
44
* 身份认证常量
55
*/
6-
public class IdentityConsts {
6+
public class IdentityConstant {
77

88
/**
99
* 表示通过用户名和密码来进行身份认证

‎src/main/java/io/github/talelin/merak/common/exception/RestExceptionHandler.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package io.github.talelin.merak.common.exception;
22

33
import cn.hutool.core.util.StrUtil;
4-
import io.github.talelin.autoconfigure.beans.Code;
5-
import io.github.talelin.merak.common.configure.CodeConfig;
4+
import io.github.talelin.autoconfigure.bean.Code;
5+
import io.github.talelin.merak.common.configuration.CodeMessageConfiguration;
66
import io.github.talelin.merak.vo.UnifyResponseVO;
77
import io.github.talelin.autoconfigure.exception.HttpException;
88
import lombok.extern.slf4j.Slf4j;
@@ -30,7 +30,7 @@
3030
import java.util.List;
3131
import java.util.Map;
3232

33-
import static io.github.talelin.autoconfigure.utils.RequestUtil.getSimpleRequest;
33+
import static io.github.talelin.autoconfigure.util.RequestUtil.getSimpleRequest;
3434

3535

3636
@SuppressWarnings("Duplicates")
@@ -53,7 +53,7 @@ public UnifyResponseVO processException(HttpException exception, HttpServletRequ
5353
int code = exception.getCode();
5454
unifyResponse.setCode(code);
5555
response.setStatus(exception.getHttpCode());
56-
String errorMessage = CodeConfig.getMessage(code);
56+
String errorMessage = CodeMessageConfiguration.getMessage(code);
5757
if (StrUtil.isBlank(errorMessage)) {
5858
unifyResponse.setMessage(exception.getMessage());
5959
} else {
@@ -90,7 +90,7 @@ public UnifyResponseVO processException(NoHandlerFoundException exception, HttpS
9090
log.error("", exception);
9191
UnifyResponseVO unifyResponse = new UnifyResponseVO();
9292
unifyResponse.setRequest(getSimpleRequest(request));
93-
String message = CodeConfig.getMessage(10025);
93+
String message = CodeMessageConfiguration.getMessage(10025);
9494
if (StrUtil.isBlank(message)) {
9595
unifyResponse.setMessage(exception.getMessage());
9696
} else {
@@ -110,7 +110,7 @@ public UnifyResponseVO processException(MissingServletRequestParameterException
110110
UnifyResponseVO result = new UnifyResponseVO();
111111
result.setRequest(getSimpleRequest(request));
112112

113-
String errorMessage = CodeConfig.getMessage(10150);
113+
String errorMessage = CodeMessageConfiguration.getMessage(10150);
114114
if (StrUtil.isBlank(errorMessage)) {
115115
result.setMessage(exception.getMessage());
116116
} else {
@@ -129,7 +129,7 @@ public UnifyResponseVO processException(MethodArgumentTypeMismatchException exce
129129
log.error("", exception);
130130
UnifyResponseVO result = new UnifyResponseVO();
131131
result.setRequest(getSimpleRequest(request));
132-
String errorMessage = CodeConfig.getMessage(10160);
132+
String errorMessage = CodeMessageConfiguration.getMessage(10160);
133133
if (StrUtil.isBlank(errorMessage)) {
134134
result.setMessage(exception.getMessage());
135135
} else {
@@ -187,7 +187,7 @@ public UnifyResponseVO processException(HttpMessageNotReadableException exceptio
187187
log.error("", exception);
188188
UnifyResponseVO result = new UnifyResponseVO();
189189
result.setRequest(getSimpleRequest(request));
190-
String errorMessage = CodeConfig.getMessage(10170);
190+
String errorMessage = CodeMessageConfiguration.getMessage(10170);
191191
if (StrUtil.isBlank(errorMessage)) {
192192
result.setMessage(exception.getMessage());
193193
} else {
@@ -220,7 +220,7 @@ public UnifyResponseVO processException(MaxUploadSizeExceededException exception
220220
log.error("", exception);
221221
UnifyResponseVO result = new UnifyResponseVO();
222222
result.setRequest(getSimpleRequest(request));
223-
String errorMessage = CodeConfig.getMessage(10180);
223+
String errorMessage = CodeMessageConfiguration.getMessage(10180);
224224
if (StrUtil.isBlank(errorMessage)) {
225225
result.setMessage(exception.getMessage());
226226
} else {

‎src/main/java/io/github/talelin/merak/common/interceptor/AuthorizeVerifyResolverImpl.java‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
import com.auth0.jwt.exceptions.*;
44
import com.auth0.jwt.exceptions.TokenExpiredException;
55
import com.auth0.jwt.interfaces.Claim;
6+
import io.github.talelin.autoconfigure.bean.MetaInfo;
67
import io.github.talelin.autoconfigure.exception.AuthenticationException;
78
import io.github.talelin.autoconfigure.exception.AuthorizationException;
89
import io.github.talelin.autoconfigure.exception.NotFoundException;
910
import io.github.talelin.autoconfigure.exception.TokenInvalidException;
10-
import io.github.talelin.core.annotation.RouteMeta;
1111
import io.github.talelin.merak.common.LocalUser;
1212
import io.github.talelin.merak.model.PermissionDO;
1313
import io.github.talelin.merak.model.UserDO;
@@ -18,8 +18,6 @@
1818
import org.apache.logging.log4j.util.Strings;
1919
import org.springframework.beans.factory.annotation.Autowired;
2020
import org.springframework.stereotype.Component;
21-
import org.springframework.web.servlet.ModelAndView;
22-
2321

2422
import javax.servlet.http.HttpServletRequest;
2523
import javax.servlet.http.HttpServletResponse;
@@ -45,7 +43,7 @@ public class AuthorizeVerifyResolverImpl implements AuthorizeVerifyResolver {
4543
private GroupService groupService;
4644

4745

48-
public boolean handleLogin(HttpServletRequest request, HttpServletResponse response, RouteMeta meta) {
46+
public boolean handleLogin(HttpServletRequest request, HttpServletResponse response, MetaInfo meta) {
4947
String tokenStr = verifyHeader(request, response);
5048
Map<String, Claim> claims = null;
5149
try {
@@ -59,22 +57,22 @@ public boolean handleLogin(HttpServletRequest request, HttpServletResponse respo
5957
}
6058

6159
@Override
62-
public boolean handleGroup(HttpServletRequest request, HttpServletResponse response, RouteMeta meta) {
60+
public boolean handleGroup(HttpServletRequest request, HttpServletResponse response, MetaInfo meta) {
6361
handleLogin(request, response, meta);
6462
UserDO user = LocalUser.getLocalUser();
6563
if (verifyAdmin(user))
6664
return true;
6765
long userId = user.getId();
68-
String permission = meta.permission();
69-
String module = meta.module();
66+
String permission = meta.getPermission();
67+
String module = meta.getModule();
7068
List<PermissionDO> permissions = userService.getUserPermissions(userId);
7169
boolean matched = permissions.stream().anyMatch(it -> it.getModule().equals(module) && it.getName().equals(permission));
7270
if (!matched)
7371
throw new AuthenticationException("you don't have the permission to access", 10001);
7472
return true;
7573
}
7674

77-
public boolean handleAdmin(HttpServletRequest request, HttpServletResponse response, RouteMeta meta) {
75+
public boolean handleAdmin(HttpServletRequest request, HttpServletResponse response, MetaInfo meta) {
7876
handleLogin(request, response, meta);
7977
UserDO user = LocalUser.getLocalUser();
8078
if (!verifyAdmin(user))
@@ -83,7 +81,7 @@ public boolean handleAdmin(HttpServletRequest request, HttpServletResponse respo
8381
}
8482

8583

86-
public boolean handleRefresh(HttpServletRequest request, HttpServletResponse response, RouteMeta meta) {
84+
public boolean handleRefresh(HttpServletRequest request, HttpServletResponse response, MetaInfo meta) {
8785
String tokenStr = verifyHeader(request, response);
8886
Map<String, Claim> claims = null;
8987
try {

‎src/main/java/io/github/talelin/merak/common/interceptor/LoggerImpl.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import io.github.talelin.autoconfigure.interfaces.LoggerResolver;
66
import io.github.talelin.core.annotation.Logger;
77
import io.github.talelin.core.annotation.RouteMeta;
8-
import io.github.talelin.core.utils.BeanUtil;
8+
import io.github.talelin.core.util.BeanUtil;
99
import io.github.talelin.merak.service.LogService;
1010
import lombok.extern.slf4j.Slf4j;
1111
import org.springframework.beans.factory.annotation.Autowired;

‎src/main/java/io/github/talelin/merak/common/listener/PermissionHandleListener.java‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package io.github.talelin.merak.common.listener;
22

33
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
4-
import io.github.talelin.autoconfigure.beans.RouteMetaCollector;
5-
import io.github.talelin.core.annotation.RouteMeta;
4+
import io.github.talelin.autoconfigure.bean.MetaInfo;
5+
import io.github.talelin.autoconfigure.bean.RouteMetaCollector;
66
import io.github.talelin.merak.model.PermissionDO;
77
import io.github.talelin.merak.service.PermissionService;
88
import org.springframework.beans.factory.annotation.Autowired;
@@ -30,23 +30,21 @@ public void onApplicationEvent(ContextRefreshedEvent event) {
3030

3131
private void addNewPermissions() {
3232
metaCollector.getMetaMap().values().forEach(meta -> {
33-
if (meta.mount()) {
34-
String module = meta.module();
35-
String permission = meta.permission();
36-
createPermissionIfNotExist(permission, module);
37-
}
33+
String module = meta.getModule();
34+
String permission = meta.getPermission();
35+
createPermissionIfNotExist(permission, module);
3836
});
3937
}
4038

4139
private void removeUnusedPermissions() {
4240
List<PermissionDO> allPermissions = permissionService.list();
43-
Map<String, RouteMeta> metaMap = metaCollector.getMetaMap();
41+
Map<String, MetaInfo> metaMap = metaCollector.getMetaMap();
4442
for (PermissionDO permission : allPermissions) {
4543
boolean stayedInMeta = metaMap
4644
.values()
4745
.stream()
48-
.anyMatch(meta -> meta.mount() && meta.module().equals(permission.getModule())
49-
&& meta.permission().equals(permission.getName()));
46+
.anyMatch(meta -> meta.getModule().equals(permission.getModule())
47+
&& meta.getPermission().equals(permission.getName()));
5048
if (!stayedInMeta) {
5149
permissionService.removeById(permission.getId());
5250
}

0 commit comments

Comments
 (0)