Skip to content

Commit 65e3fb4

Browse files
Merge pull request #68 from geekidea/dev
🇨🇳 1.3.0.RELEASE shiro+jwt
2 parents 7ee05f3 + a8f4aa5 commit 65e3fb4

File tree

6 files changed

+15
-5
lines changed

6 files changed

+15
-5
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,5 +30,5 @@
3030
*.log
3131
logs
3232

33-
33+
*.rdb
3434

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# 更新日志 CHANGELOG
22

3-
## [V1.3.0-RELEASE] 2019.10.05
3+
## [V1.3.0-RELEASE] 2019.10.06
44

55
### ⭐️ New Features
66

pom.xml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
<junit.version>4.12</junit.version>
6969
<ini.version>0.5.4</ini.version>
7070
<mapstruct.version>1.3.0.Final</mapstruct.version>
71-
<shiro.version>1.4.0</shiro.version>
71+
<shiro.version>1.4.1</shiro.version>
7272
<jwt.version>3.8.3</jwt.version>
7373

7474
<maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
@@ -290,9 +290,10 @@
290290
<!-- Shiro+JWT start -->
291291
<dependency>
292292
<groupId>org.apache.shiro</groupId>
293-
<artifactId>shiro-spring-boot-web-starter</artifactId>
293+
<artifactId>shiro-spring-boot-starter</artifactId>
294294
<version>${shiro.version}</version>
295295
</dependency>
296+
296297
<dependency>
297298
<groupId>com.auth0</groupId>
298299
<artifactId>java-jwt</artifactId>

src/main/assembly/assembly.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,6 @@
7979
<includes>
8080
<include>NOTICE</include>
8181
<include>LICENSE</include>
82-
<include>*.md</include>
8382
</includes>
8483
</fileSet>
8584
</fileSets>

src/main/resources/config/application-dev.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,3 +27,8 @@ spring:
2727
# logback.xml中有详细的日志配置
2828
logging:
2929
file: logs/spring-boot-plus-log.log
30+
31+
# 打印SQL语句和结果集,本地开发环境可开启,线上注释掉
32+
mybatis-plus:
33+
configuration:
34+
log-impl: org.apache.ibatis.logging.stdout.StdOutImpl

src/main/resources/config/application-local.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,3 +43,8 @@ logging:
4343
config: classpath:config/logback.xml
4444
# 方便Spring Boot Admin页面上实时查看日志
4545
file: logs/spring-boot-plus.log
46+
47+
# 打印SQL语句和结果集,本地开发环境可开启,线上注释掉
48+
mybatis-plus:
49+
configuration:
50+
log-impl: org.apache.ibatis.logging.stdout.StdOutImpl

0 commit comments

Comments
 (0)