Skip to content

Commit c6720e2

Browse files
colorful3colorful3
authored
Merge pull request #30 from TaleLin/refactor/file-extension
refactor: 将 file 扩展除了实现类和配置文件的其他业务移动到 file 模块下
2 parents c6d7604 + b7fc03f commit c6720e2

121 files changed

Lines changed: 358 additions & 355 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.

‎pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
</parent>
1111

1212
<groupId>io.github.talelin</groupId>
13-
<artifactId>merak</artifactId>
13+
<artifactId>latticy</artifactId>
1414
<version>0.1.0-RELEASE</version>
15-
<name>merak</name>
15+
<name>latticy</name>
1616
<description>Demo project for lin cms</description>
1717

1818
<properties>
@@ -46,7 +46,7 @@
4646
<dependency>
4747
<groupId>io.github.talelin</groupId>
4848
<artifactId>lin-cms-spring-boot-starter</artifactId>
49-
<version>0.1.0-RELEASE</version>
49+
<version>0.1.1-RC1</version>
5050
</dependency>
5151

5252
<dependency>

src/main/java/io/github/talelin/merak/MerakApplication.java renamed to src/main/java/io/github/talelin/latticy/LatticyApplication.java

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

33
import org.mybatis.spring.annotation.MapperScan;
44
import org.springframework.boot.SpringApplication;
@@ -9,13 +9,13 @@
99
/**
1010
* @author pedro@TaleLin
1111
*/
12-
@SpringBootApplication(scanBasePackages = {"io.github.talelin.merak"})
13-
@MapperScan(basePackages = {"io.github.talelin.merak.mapper"})
12+
@SpringBootApplication(scanBasePackages = {"io.github.talelin.latticy"})
13+
@MapperScan(basePackages = {"io.github.talelin.latticy.mapper"})
1414
@RestController
15-
public class MerakApplication {
15+
public class LatticyApplication {
1616

1717
public static void main(String[] args) {
18-
SpringApplication.run(MerakApplication.class, args);
18+
SpringApplication.run(LatticyApplication.class, args);
1919
}
2020

2121
@RequestMapping("/")

src/main/java/io/github/talelin/merak/bo/FileBO.java renamed to src/main/java/io/github/talelin/latticy/bo/FileBO.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package io.github.talelin.merak.bo;
1+
package io.github.talelin.latticy.bo;
22

33
import lombok.Data;
44

src/main/java/io/github/talelin/merak/bo/GroupPermissionBO.java renamed to src/main/java/io/github/talelin/latticy/bo/GroupPermissionBO.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
package io.github.talelin.merak.bo;
1+
package io.github.talelin.latticy.bo;
22

33
import cn.hutool.core.bean.BeanUtil;
4-
import io.github.talelin.merak.model.GroupDO;
5-
import io.github.talelin.merak.model.PermissionDO;
4+
import io.github.talelin.latticy.model.GroupDO;
5+
import io.github.talelin.latticy.model.PermissionDO;
66
import lombok.*;
77

88
import java.util.List;

src/main/java/io/github/talelin/merak/common/LocalUser.java renamed to src/main/java/io/github/talelin/latticy/common/LocalUser.java

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

3-
import io.github.talelin.merak.model.UserDO;
3+
import io.github.talelin.latticy.model.UserDO;
44

55
/**
66
* 线程安全的当前登录用户，如果用户为登录，则得到 null

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

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

33
import cn.hutool.core.util.StrUtil;
4-
import io.github.talelin.merak.common.configuration.CodeMessageConfiguration;
5-
import io.github.talelin.merak.vo.UnifyResponseVO;
4+
import io.github.talelin.latticy.common.configuration.CodeMessageConfiguration;
5+
import io.github.talelin.latticy.vo.UnifyResponseVO;
66
import lombok.extern.slf4j.Slf4j;
77
import org.aspectj.lang.annotation.AfterReturning;
88
import org.aspectj.lang.annotation.Aspect;
@@ -22,7 +22,7 @@
2222
public class ResultAspect {
2323

2424

25-
@Pointcut("execution(public * io.github.talelin.merak.controller..*.*(..))")
25+
@Pointcut("execution(public * io.github.talelin.latticy.controller..*.*(..))")
2626
public void handlePlaceholder() {
2727
}
2828

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package io.github.talelin.merak.common.configuration;
1+
package io.github.talelin.latticy.common.configuration;
22

33
import org.springframework.boot.context.properties.ConfigurationProperties;
44
import org.springframework.context.annotation.PropertySource;

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
package io.github.talelin.merak.common.configuration;
1+
package io.github.talelin.latticy.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;
77
import io.github.talelin.autoconfigure.bean.RouteMetaCollector;
8-
import io.github.talelin.merak.extension.file.FileProperties;
9-
import io.github.talelin.merak.common.interceptor.RequestLogInterceptor;
8+
import io.github.talelin.latticy.module.file.FileProperties;
9+
import io.github.talelin.latticy.common.interceptor.RequestLogInterceptor;
1010
import org.springframework.boot.autoconfigure.jackson.Jackson2ObjectMapperBuilderCustomizer;
1111
import org.springframework.boot.context.properties.EnableConfigurationProperties;
1212
import org.springframework.context.annotation.Bean;

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

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

3-
import io.github.talelin.merak.common.interceptor.RequestLogInterceptor;
3+
import io.github.talelin.latticy.common.interceptor.RequestLogInterceptor;
44
import io.github.talelin.autoconfigure.interceptor.AuthorizeInterceptor;
55
import io.github.talelin.autoconfigure.interceptor.LogInterceptor;
66
import lombok.extern.slf4j.Slf4j;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package io.github.talelin.merak.common.constant;
1+
package io.github.talelin.latticy.common.constant;
22

33
/**
44
* 身份认证常量

0 commit comments

Comments
 (0)