From acd7daa7f53b9cd2bd232b29f1c6006ddac78b16 Mon Sep 17 00:00:00 2001
From: wsx9172 <wsx9172@gmail.com>
Date: Mon, 11 Sep 2023 10:41:30 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E6=9B=BF=E6=8D=A2System.getProperty("file.?=
 =?UTF-8?q?separator")=E4=B8=BAFile.separator?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../springclimb/music/config/FileConfig.java  | 22 ++++++++++---------
 .../music/controller/ConsumerController.java  |  6 ++---
 .../music/controller/SingerController.java    |  6 ++---
 .../music/controller/SongController.java      | 10 ++++-----
 .../music/controller/SongListController.java  |  6 ++---
 5 files changed, 26 insertions(+), 24 deletions(-)

diff --git a/music-server/src/main/java/com/study/springclimb/music/config/FileConfig.java b/music-server/src/main/java/com/study/springclimb/music/config/FileConfig.java
index a365ca1..7af7574 100644
--- a/music-server/src/main/java/com/study/springclimb/music/config/FileConfig.java
+++ b/music-server/src/main/java/com/study/springclimb/music/config/FileConfig.java
@@ -4,6 +4,8 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
+import java.io.File;
+
 
 @Configuration
 public class FileConfig  implements WebMvcConfigurer {
@@ -14,31 +16,31 @@ public class FileConfig  implements WebMvcConfigurer {
         //所有img/singerPic/**开头的请求 都会去后面配置的路径下查找资源
         //定位歌手头像地址
         registry.addResourceHandler("/img/singerPic/**").addResourceLocations(
-                "file:"+System.getProperty("user.dir")+System.getProperty("file.separator")+"img"
-                        +System.getProperty("file.separator")+"singerPic"+System.getProperty("file.separator")
+                "file:"+System.getProperty("user.dir")+ File.separator+"img"
+                        +File.separator+"singerPic"+File.separator
         );
         //歌单图片地址
         registry.addResourceHandler("/img/songListPic/**").addResourceLocations(
-                "file:"+System.getProperty("user.dir")+System.getProperty("file.separator")+"img"
-                        +System.getProperty("file.separator")+"songListPic"+System.getProperty("file.separator")
+                "file:"+System.getProperty("user.dir")+File.separator+"img"
+                        +File.separator+"songListPic"+File.separator
         );
         //歌曲图片地址
         registry.addResourceHandler("/img/songPic/**").addResourceLocations(
-                "file:"+System.getProperty("user.dir")+System.getProperty("file.separator")+"img"
-                        +System.getProperty("file.separator")+"songPic"+System.getProperty("file.separator")
+                "file:"+System.getProperty("user.dir")+File.separator+"img"
+                        +File.separator+"songPic"+File.separator
         );
         //歌曲地址
         registry.addResourceHandler("/song/**").addResourceLocations(
-                "file:"+System.getProperty("user.dir")+System.getProperty("file.separator")+"song"+System.getProperty("file.separator")
+                "file:"+System.getProperty("user.dir")+File.separator+"song"+File.separator
         );
         //前端用户头像地址
         registry.addResourceHandler("/img/userPic/**").addResourceLocations(
-                "file:"+System.getProperty("user.dir")+System.getProperty("file.separator")+"img"
-                        +System.getProperty("file.separator")+"userPic"+System.getProperty("file.separator")
+                "file:"+System.getProperty("user.dir")+File.separator+"img"
+                        +File.separator+"userPic"+File.separator
         );
         //用户头像默认地址
         registry.addResourceHandler("/img/**").addResourceLocations(
-                "file:"+System.getProperty("user.dir")+System.getProperty("file.separator")+"img"+System.getProperty("file.separator")
+                "file:"+System.getProperty("user.dir")+File.separator+"img"+File.separator
         );
     }
 
diff --git a/music-server/src/main/java/com/study/springclimb/music/controller/ConsumerController.java b/music-server/src/main/java/com/study/springclimb/music/controller/ConsumerController.java
index 0f9e5ff..58aee2d 100644
--- a/music-server/src/main/java/com/study/springclimb/music/controller/ConsumerController.java
+++ b/music-server/src/main/java/com/study/springclimb/music/controller/ConsumerController.java
@@ -140,15 +140,15 @@ public class ConsumerController {
         //文件名=当前时间到毫秒+原来的文件名
         String fileName = System.currentTimeMillis()+avatorFile.getOriginalFilename();
         //文件路径
-        String filePath = System.getProperty("user.dir")+System.getProperty("file.separator")
-                +"img"+System.getProperty("file.separator")+"userPic";
+        String filePath = System.getProperty("user.dir")+File.separator
+                +"img"+File.separator+"userPic";
         //如果文件路径不存在，新增该路径
         File file1 = new File(filePath);
         if(!file1.exists()){
             file1.mkdir();
         }
         //实际的文件地址
-        File dest = new File(filePath+System.getProperty("file.separator")+fileName);
+        File dest = new File(filePath+File.separator+fileName);
         //存储到数据库里的相对文件地址
         String storeAvatorPath = "/img/userPic/"+fileName;
         try {
diff --git a/music-server/src/main/java/com/study/springclimb/music/controller/SingerController.java b/music-server/src/main/java/com/study/springclimb/music/controller/SingerController.java
index 08aa7bc..92b8d44 100644
--- a/music-server/src/main/java/com/study/springclimb/music/controller/SingerController.java
+++ b/music-server/src/main/java/com/study/springclimb/music/controller/SingerController.java
@@ -122,15 +122,15 @@ public class SingerController {
         //文件名=当前时间到毫秒+原来的文件名
         String fileName = System.currentTimeMillis() + avatorFile.getOriginalFilename();
         //文件路径
-        String filePath = System.getProperty("user.dir") + System.getProperty("file.separator") + "img"
-                + System.getProperty("file.separator") + "singerPic";
+        String filePath = System.getProperty("user.dir") + File.separator + "img"
+                + File.separator + "singerPic";
         //如果文件路径不存在，新增该路径
         File file1 = new File(filePath);
         if (!file1.exists()) {
             file1.mkdir();
         }
         //实际的文件地址
-        File dest = new File(filePath + System.getProperty("file.separator") + fileName);
+        File dest = new File(filePath + File.separator + fileName);
         //存储到数据库里的相对文件地址
         String storeAvatorPath = "/img/singerPic/" + fileName;
         try {
diff --git a/music-server/src/main/java/com/study/springclimb/music/controller/SongController.java b/music-server/src/main/java/com/study/springclimb/music/controller/SongController.java
index c9a6449..ccf5924 100644
--- a/music-server/src/main/java/com/study/springclimb/music/controller/SongController.java
+++ b/music-server/src/main/java/com/study/springclimb/music/controller/SongController.java
@@ -46,14 +46,14 @@ public class SongController {
         //文件名=当前时间到毫秒+原来的文件名
         String fileName = System.currentTimeMillis() + mpFile.getOriginalFilename();
         //文件路径，歌曲存储路径
-        String filePath = System.getProperty("user.dir") + System.getProperty("file.separator") + "song";
+        String filePath = System.getProperty("user.dir") + File.separator + "song";
         //如果文件路径不存在，新增该路径
         File file1 = new File(filePath);
         if (!file1.exists()) {
             file1.mkdir();
         }
         //实际的文件地址
-        File dest = new File(filePath + System.getProperty("file.separator") + fileName);
+        File dest = new File(filePath + File.separator + fileName);
         //存储到数据库里的相对文件地址
         String storeUrlPath = "/song/" + fileName;
 
@@ -131,15 +131,15 @@ public class SongController {
         //文件名=当前时间到毫秒+原来的文件名
         String fileName = System.currentTimeMillis() + avatorFile.getOriginalFilename();
         //文件路径
-        String filePath = System.getProperty("user.dir") + System.getProperty("file.separator") + "img"
-                + System.getProperty("file.separator") + "songPic";
+        String filePath = System.getProperty("user.dir") + File.separator + "img"
+                + File.separator + "songPic";
         //如果文件路径不存在，新增该路径
         File file1 = new File(filePath);
         if (!file1.exists()) {
             file1.mkdir();
         }
         //实际的文件地址
-        File dest = new File(filePath + System.getProperty("file.separator") + fileName);
+        File dest = new File(filePath + File.separator + fileName);
         //存储到数据库里的相对文件地址
         String storeAvatorPath = "/img/songPic/" + fileName;
         try {
diff --git a/music-server/src/main/java/com/study/springclimb/music/controller/SongListController.java b/music-server/src/main/java/com/study/springclimb/music/controller/SongListController.java
index 7d4a685..f75b18a 100644
--- a/music-server/src/main/java/com/study/springclimb/music/controller/SongListController.java
+++ b/music-server/src/main/java/com/study/springclimb/music/controller/SongListController.java
@@ -136,15 +136,15 @@ public class SongListController {
         //文件名=当前时间到毫秒+原来的文件名
         String fileName = System.currentTimeMillis()+avatorFile.getOriginalFilename();
         //文件路径
-        String filePath = System.getProperty("user.dir")+System.getProperty("file.separator")+"img"
-                +System.getProperty("file.separator")+"songListPic";
+        String filePath = System.getProperty("user.dir")+File.separator+"img"
+                +File.separator+"songListPic";
         //如果文件路径不存在，新增该路径
         File file1 = new File(filePath);
         if(!file1.exists()){
             file1.mkdir();
         }
         //实际的文件地址
-        File dest = new File(filePath+System.getProperty("file.separator")+fileName);
+        File dest = new File(filePath+File.separator+fileName);
         //存储到数据库里的相对文件地址
         String storeAvatorPath = "/img/songListPic/"+fileName;
         try {
-- 
Gitee


From 4c7fa0fde134c27f08e94c7010c32474e0689e76 Mon Sep 17 00:00:00 2001
From: wsx9172 <wsx9172@gmail.com>
Date: Mon, 11 Sep 2023 10:43:37 +0800
Subject: [PATCH 2/5] =?UTF-8?q?logback=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=A4=9A=E4=BD=99=E5=BA=8F=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/logback-spring.xml     | 160 ++++++++----------
 1 file changed, 73 insertions(+), 87 deletions(-)

diff --git a/music-server/src/main/resources/logback-spring.xml b/music-server/src/main/resources/logback-spring.xml
index 7fb0545..d893643 100644
--- a/music-server/src/main/resources/logback-spring.xml
+++ b/music-server/src/main/resources/logback-spring.xml
@@ -1,89 +1,75 @@
 <?xml version="1.0" encoding="UTF-8"?>
          <configuration scan="true" scanPeriod="60 seconds">
-    3     <property name="LOG_HOME" value="/datalog/shopping/shopping-goods/"/>
-    4     <property name="FORMAT" value="%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{25} - %msg%n"/>
-    5     <property name="RollingMaxHistory" value="10"/>
-    6     <property name="RollingFileNamePattern" value="${LOG_HOME}/%d{yyyy-MM-dd}.%i"/>
-    7
-    8
-    9     <!-- 彩色日志依赖的渲染类 -->
-    10     <conversionRule conversionWord="clr" converterClass="org.springframework.boot.logging.logback.ColorConverter"/>
-    11     <conversionRule conversionWord="wex" converterClass="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter"/>
-    13     <conversionRule conversionWord="wEx" converterClass="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter"/>
-    15     <!-- 彩色日志格式 -->
-    16     <property name="CONSOLE_LOG_PATTERN" value="${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
-    18
-    19
-    20     <!-- 控制台输出 -->
-    21     <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-    22         <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-    23             <pattern>${CONSOLE_LOG_PATTERN}</pattern>
-    24             <charset>utf8</charset>
-    25         </encoder>
-    26     </appender>
-    27
-    28
-    29     <!-- 生成INFO日志文件 -->
-    30     <appender name="INFO-FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-    31         <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-    32             <!--日志文件输出的文件名-->
-    33             <FileNamePattern>${RollingFileNamePattern}/info/%d{yyyy-MM-dd}.%i-info.log</FileNamePattern>
-    34             <!--日志文件最大的大小-->
-    35             <maxFileSize>500MB</maxFileSize>
-    36             <!--日志文件保留天数-->
-    37             <MaxHistory>${RollingMaxHistory}</MaxHistory>
-    38         </rollingPolicy>
-    39         <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-    40             <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
-    41             <pattern>${FORMAT}</pattern>
-    42         </encoder>
-    43         <!-- 打印日志级别 -->
-    44         <filter class="ch.qos.logback.classic.filter.LevelFilter">
-    45             <level>debug</level>
-    46             <onMatch>ACCEPT</onMatch>
-    47             <onMismatch>DENY</onMismatch>
-    48         </filter>
-    49     </appender>
-    50
-    51     <!-- 生成ERROR日志文件 -->
-    52     <appender name="ERROR-FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-    53         <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-    54             <!--日志文件输出的文件名-->
-    55             <FileNamePattern>${RollingFileNamePattern}/error/%d{yyyy-MM-dd}.%i-error.log</FileNamePattern>
-    56             <!--日志文件最大的大小-->
-    57             <maxFileSize>500MB</maxFileSize>
-    58             <!--日志文件保留天数-->
-    59             <MaxHistory>${RollingMaxHistory}</MaxHistory>
-    60         </rollingPolicy>
-    61         <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-    62             <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
-    63             <pattern>${FORMAT}</pattern>
-    64         </encoder>
-    65         <!-- 打印日志级别 -->
-    66         <filter class="ch.qos.logback.classic.filter.LevelFilter">
-    67             <level>ERROR</level>
-    68             <onMatch>ACCEPT</onMatch>
-    69             <onMismatch>DENY</onMismatch>
-    70         </filter>
-    71     </appender>
-    72
-    73     <!-- 日志输出级别 -->
-    74     <root level="debug">
-    75         <appender-ref ref="STDOUT"/>
-    76         <appender-ref ref="INFO-FILE"/>
-    77         <appender-ref ref="ERROR-FILE"/>
-    78     </root>
-    79
-    80
-    81     <logger name="druid.sql" level="INFO"/>
-    82     <logger name="com.shopping.goods.mapper" level="DEBUG">
-    83         <appender-ref ref="STDOUT" />
-    84         <appender-ref ref="INFO-FILE" />
-    85
-    86     </logger>
-    87
-    88
-    89     <!-- 减少nacos日志 -->
-    90     <logger name="com.alibaba.nacos" level="ERROR"/>
-    91
-    92 </configuration>
\ No newline at end of file
+       <property name="LOG_HOME" value="/datalog/shopping/shopping-goods/"/>
+       <property name="FORMAT" value="%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{25} - %msg%n"/>
+       <property name="RollingMaxHistory" value="10"/>
+       <property name="RollingFileNamePattern" value="${LOG_HOME}/%d{yyyy-MM-dd}.%i"/>
+             <!-- 彩色日志依赖的渲染类 -->
+       <conversionRule conversionWord="clr" converterClass="org.springframework.boot.logging.logback.ColorConverter"/>
+       <conversionRule conversionWord="wex" converterClass="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter"/>
+       <conversionRule conversionWord="wEx" converterClass="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter"/>
+       <!-- 彩色日志格式 -->
+       <property name="CONSOLE_LOG_PATTERN" value="${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
+             <!-- 控制台输出 -->
+       <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+           <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+               <pattern>${CONSOLE_LOG_PATTERN}</pattern>
+               <charset>utf8</charset>
+           </encoder>
+       </appender>
+             <!-- 生成INFO日志文件 -->
+       <appender name="INFO-FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+           <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+               <!--日志文件输出的文件名-->
+               <FileNamePattern>${RollingFileNamePattern}/info/%d{yyyy-MM-dd}.%i-info.log</FileNamePattern>
+               <!--日志文件最大的大小-->
+               <maxFileSize>500MB</maxFileSize>
+               <!--日志文件保留天数-->
+               <MaxHistory>${RollingMaxHistory}</MaxHistory>
+           </rollingPolicy>
+           <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+               <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
+               <pattern>${FORMAT}</pattern>
+           </encoder>
+           <!-- 打印日志级别 -->
+           <filter class="ch.qos.logback.classic.filter.LevelFilter">
+               <level>debug</level>
+               <onMatch>ACCEPT</onMatch>
+               <onMismatch>DENY</onMismatch>
+           </filter>
+       </appender>
+          <!-- 生成ERROR日志文件 -->
+       <appender name="ERROR-FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+           <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+               <!--日志文件输出的文件名-->
+               <FileNamePattern>${RollingFileNamePattern}/error/%d{yyyy-MM-dd}.%i-error.log</FileNamePattern>
+               <!--日志文件最大的大小-->
+               <maxFileSize>500MB</maxFileSize>
+               <!--日志文件保留天数-->
+               <MaxHistory>${RollingMaxHistory}</MaxHistory>
+           </rollingPolicy>
+           <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+               <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
+               <pattern>${FORMAT}</pattern>
+           </encoder>
+           <!-- 打印日志级别 -->
+           <filter class="ch.qos.logback.classic.filter.LevelFilter">
+               <level>ERROR</level>
+               <onMatch>ACCEPT</onMatch>
+               <onMismatch>DENY</onMismatch>
+           </filter>
+       </appender>
+          <!-- 日志输出级别 -->
+       <root level="debug">
+           <appender-ref ref="STDOUT"/>
+           <appender-ref ref="INFO-FILE"/>
+           <appender-ref ref="ERROR-FILE"/>
+       </root>
+             <logger name="druid.sql" level="INFO"/>
+       <logger name="com.shopping.goods.mapper" level="DEBUG">
+           <appender-ref ref="STDOUT" />
+           <appender-ref ref="INFO-FILE" />
+          </logger>
+             <!-- 减少nacos日志 -->
+       <logger name="com.alibaba.nacos" level="ERROR"/>
+      </configuration>
\ No newline at end of file
-- 
Gitee


From 41e27c8f3266124e676ada9dfaaa98794bb2d999 Mon Sep 17 00:00:00 2001
From: wsx9172 <wsx9172@gmail.com>
Date: Mon, 11 Sep 2023 10:46:15 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=A0=BC=E5=BC=8F?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 music-server/pom.xml                          |   2 +-
 .../springclimb/music/config/FileConfig.java  |  22 +--
 .../springclimb/music/config/LoginConfig.java |   2 +-
 .../music/config/MybatisPlusConfig.java       |   8 +-
 .../music/config/SggCodeGenerator.java        |   2 +-
 .../music/config/WebMvcConfig.java            |   3 +-
 .../music/controller/AdminController.java     |  33 ++--
 .../music/controller/CollectController.java   |  48 ++---
 .../music/controller/CommentController.java   |  66 +++----
 .../music/controller/ConsumerController.java  | 146 +++++++--------
 .../music/controller/ListSongController.java  |  30 +--
 .../music/controller/RankController.java      |  18 +-
 .../music/controller/SingerController.java    |  69 +++----
 .../music/controller/SongController.java      |   8 +-
 .../music/controller/SongListController.java  |  96 +++++-----
 .../study/springclimb/music/dao/AdminDao.java |   8 +-
 .../springclimb/music/dao/CollectDao.java     |   2 +-
 .../springclimb/music/dao/CommentDao.java     |   2 +-
 .../springclimb/music/dao/ConsumerDao.java    |   2 +-
 .../springclimb/music/dao/ListSongDao.java    |   2 +-
 .../study/springclimb/music/dao/RankDao.java  |   2 +-
 .../springclimb/music/dao/SingerDao.java      |   7 +-
 .../springclimb/music/dao/SongListDao.java    |   2 +-
 .../study/springclimb/music/entity/Admin.java |   5 +-
 .../springclimb/music/entity/Collect.java     |   7 +-
 .../springclimb/music/entity/Comment.java     |   2 +-
 .../springclimb/music/entity/ListSong.java    |   5 +-
 .../study/springclimb/music/entity/Rank.java  |   2 +-
 .../springclimb/music/entity/Singer.java      |  29 ++-
 .../study/springclimb/music/entity/Song.java  |   6 +-
 .../springclimb/music/entity/SongList.java    |   5 +-
 .../music/handler/MyMetaObjectHandler.java    |   1 +
 .../interceptor/MyHandlerInterceptor.java     |   2 +-
 .../music/service/AdminService.java           |   6 +-
 .../music/service/CollectService.java         |   2 +-
 .../music/service/CommentService.java         |   2 +-
 .../music/service/ConsumerService.java        |   2 +-
 .../music/service/ListSongService.java        |   2 +-
 .../music/service/RankService.java            |   7 +-
 .../music/service/SingerService.java          |   5 -
 .../music/service/SongListService.java        |   4 +-
 .../music/service/impl/AdminServiceImpl.java  |  11 +-
 .../service/impl/CollectServiceImpl.java      |   4 +-
 .../service/impl/CommentServiceImpl.java      |   4 +-
 .../service/impl/ConsumerServiceImpl.java     |   4 +-
 .../service/impl/ListSongServiceImpl.java     |   4 +-
 .../music/service/impl/RankServiceImpl.java   |  12 +-
 .../music/service/impl/SingerServiceImpl.java |  14 +-
 .../service/impl/SongListServiceImpl.java     |   3 +-
 .../music/service/impl/SongServiceImpl.java   |   6 +-
 .../study/springclimb/music/utils/Consts.java |  12 +-
 .../springclimb/music/utils/PageRequest.java  |   4 +-
 .../springclimb/music/utils/PageUtils.java    | 177 +++++++++---------
 .../com/study/springclimb/music/utils/R.java  |  38 ++--
 .../src/main/resources/application.properties |   3 -
 .../src/main/resources/logback-spring.xml     | 151 +++++++--------
 .../src/main/resources/mapper/AdminDao.xml    |  12 +-
 .../src/main/resources/mapper/RankMapper.xml  |  14 +-
 .../src/main/resources/mapper/SingerDao.xml   |  10 +-
 .../src/main/resources/mapper/SongDao.xml     |   8 +-
 .../study/springclimb/music/TestSongDao.java  |   4 +-
 61 files changed, 593 insertions(+), 576 deletions(-)

diff --git a/music-server/pom.xml b/music-server/pom.xml
index 5e901f2..ac99fca 100644
--- a/music-server/pom.xml
+++ b/music-server/pom.xml
@@ -1,5 +1,5 @@
 <?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"
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
diff --git a/music-server/src/main/java/com/study/springclimb/music/config/FileConfig.java b/music-server/src/main/java/com/study/springclimb/music/config/FileConfig.java
index 7af7574..c6fde78 100644
--- a/music-server/src/main/java/com/study/springclimb/music/config/FileConfig.java
+++ b/music-server/src/main/java/com/study/springclimb/music/config/FileConfig.java
@@ -8,7 +8,7 @@ import java.io.File;
 
 
 @Configuration
-public class FileConfig  implements WebMvcConfigurer {
+public class FileConfig implements WebMvcConfigurer {
 
     @Override
     public void addResourceHandlers(ResourceHandlerRegistry registry) {
@@ -16,31 +16,31 @@ public class FileConfig  implements WebMvcConfigurer {
         //所有img/singerPic/**开头的请求 都会去后面配置的路径下查找资源
         //定位歌手头像地址
         registry.addResourceHandler("/img/singerPic/**").addResourceLocations(
-                "file:"+System.getProperty("user.dir")+ File.separator+"img"
-                        +File.separator+"singerPic"+File.separator
+                "file:" + System.getProperty("user.dir") + File.separator + "img"
+                        + File.separator + "singerPic" + File.separator
         );
         //歌单图片地址
         registry.addResourceHandler("/img/songListPic/**").addResourceLocations(
-                "file:"+System.getProperty("user.dir")+File.separator+"img"
-                        +File.separator+"songListPic"+File.separator
+                "file:" + System.getProperty("user.dir") + File.separator + "img"
+                        + File.separator + "songListPic" + File.separator
         );
         //歌曲图片地址
         registry.addResourceHandler("/img/songPic/**").addResourceLocations(
-                "file:"+System.getProperty("user.dir")+File.separator+"img"
-                        +File.separator+"songPic"+File.separator
+                "file:" + System.getProperty("user.dir") + File.separator + "img"
+                        + File.separator + "songPic" + File.separator
         );
         //歌曲地址
         registry.addResourceHandler("/song/**").addResourceLocations(
-                "file:"+System.getProperty("user.dir")+File.separator+"song"+File.separator
+                "file:" + System.getProperty("user.dir") + File.separator + "song" + File.separator
         );
         //前端用户头像地址
         registry.addResourceHandler("/img/userPic/**").addResourceLocations(
-                "file:"+System.getProperty("user.dir")+File.separator+"img"
-                        +File.separator+"userPic"+File.separator
+                "file:" + System.getProperty("user.dir") + File.separator + "img"
+                        + File.separator + "userPic" + File.separator
         );
         //用户头像默认地址
         registry.addResourceHandler("/img/**").addResourceLocations(
-                "file:"+System.getProperty("user.dir")+File.separator+"img"+File.separator
+                "file:" + System.getProperty("user.dir") + File.separator + "img" + File.separator
         );
     }
 
diff --git a/music-server/src/main/java/com/study/springclimb/music/config/LoginConfig.java b/music-server/src/main/java/com/study/springclimb/music/config/LoginConfig.java
index 532eaf1..9576834 100644
--- a/music-server/src/main/java/com/study/springclimb/music/config/LoginConfig.java
+++ b/music-server/src/main/java/com/study/springclimb/music/config/LoginConfig.java
@@ -6,7 +6,7 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
 @Configuration
 public class LoginConfig implements WebMvcConfigurer {
-    
+
     @Override
     public void addInterceptors(InterceptorRegistry registry) {
         //注册TestInterceptor拦截器
diff --git a/music-server/src/main/java/com/study/springclimb/music/config/MybatisPlusConfig.java b/music-server/src/main/java/com/study/springclimb/music/config/MybatisPlusConfig.java
index 15b2e02..8be389d 100644
--- a/music-server/src/main/java/com/study/springclimb/music/config/MybatisPlusConfig.java
+++ b/music-server/src/main/java/com/study/springclimb/music/config/MybatisPlusConfig.java
@@ -7,8 +7,8 @@ import org.springframework.context.annotation.Configuration;
 @Configuration
 public class MybatisPlusConfig {
 
-   @Bean
-    public PaginationInterceptor paginationInterceptor(){
-       return  new PaginationInterceptor();
-   }
+    @Bean
+    public PaginationInterceptor paginationInterceptor() {
+        return new PaginationInterceptor();
+    }
 }
diff --git a/music-server/src/main/java/com/study/springclimb/music/config/SggCodeGenerator.java b/music-server/src/main/java/com/study/springclimb/music/config/SggCodeGenerator.java
index 17258cc..f71f5c2 100644
--- a/music-server/src/main/java/com/study/springclimb/music/config/SggCodeGenerator.java
+++ b/music-server/src/main/java/com/study/springclimb/music/config/SggCodeGenerator.java
@@ -25,7 +25,7 @@ public class SggCodeGenerator {
         gc.setAuthor("tqz");
         gc.setOpen(false); //生成后是否打开资源管理器
         gc.setFileOverride(false); //重新生成时文件是否覆盖
-        gc.setServiceName("%sService");	//去掉Service接口的首字母I
+        gc.setServiceName("%sService");    //去掉Service接口的首字母I
         gc.setIdType(IdType.ID_WORKER_STR); //主键策略
         gc.setDateType(DateType.ONLY_DATE);//定义生成的实体类中日期类型
         gc.setSwagger2(false);//开启Swagger2模式
diff --git a/music-server/src/main/java/com/study/springclimb/music/config/WebMvcConfig.java b/music-server/src/main/java/com/study/springclimb/music/config/WebMvcConfig.java
index 003e6d4..b2afc6f 100644
--- a/music-server/src/main/java/com/study/springclimb/music/config/WebMvcConfig.java
+++ b/music-server/src/main/java/com/study/springclimb/music/config/WebMvcConfig.java
@@ -3,8 +3,9 @@ package com.study.springclimb.music.config;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.cors.CorsConfiguration;
-import org.springframework.web.filter.CorsFilter;
 import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
+import org.springframework.web.filter.CorsFilter;
+
 @Configuration
 public class WebMvcConfig {
 
diff --git a/music-server/src/main/java/com/study/springclimb/music/controller/AdminController.java b/music-server/src/main/java/com/study/springclimb/music/controller/AdminController.java
index 9a4b1bb..654c0ff 100644
--- a/music-server/src/main/java/com/study/springclimb/music/controller/AdminController.java
+++ b/music-server/src/main/java/com/study/springclimb/music/controller/AdminController.java
@@ -1,10 +1,15 @@
 package com.study.springclimb.music.controller;
+
 import com.alibaba.fastjson.JSONObject;
 import com.study.springclimb.music.entity.Admin;
 import com.study.springclimb.music.service.AdminService;
 import com.study.springclimb.music.utils.Consts;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
@@ -27,24 +32,24 @@ public class AdminController {
     private AdminService adminService;
 
     @PostMapping("/login/status")
-    public Object loginStatus(HttpServletRequest request, HttpSession session){
+    public Object loginStatus(HttpServletRequest request, HttpSession session) {
 
-        JSONObject jsonObject =new JSONObject();
+        JSONObject jsonObject = new JSONObject();
 
-        String name =request.getParameter("name");
-        String password=request.getParameter("password");
+        String name = request.getParameter("name");
+        String password = request.getParameter("password");
 
-        boolean flag = adminService.verifyPassword(name,password);
-        if(flag){
+        boolean flag = adminService.verifyPassword(name, password);
+        if (flag) {
             //  System.out.println("here");
-            jsonObject.put(Consts.CODE,1);
-            jsonObject.put(Consts.MSG,"登录成功");
-            session.setAttribute(Consts.NAME,name);
-            return  jsonObject;
+            jsonObject.put(Consts.CODE, 1);
+            jsonObject.put(Consts.MSG, "登录成功");
+            session.setAttribute(Consts.NAME, name);
+            return jsonObject;
         }
-        jsonObject.put(Consts.CODE,0);
-        jsonObject.put(Consts.MSG,"用户名或密码错误");
-        return  jsonObject;
+        jsonObject.put(Consts.CODE, 0);
+        jsonObject.put(Consts.MSG, "用户名或密码错误");
+        return jsonObject;
     }
 
     /**
diff --git a/music-server/src/main/java/com/study/springclimb/music/controller/CollectController.java b/music-server/src/main/java/com/study/springclimb/music/controller/CollectController.java
index bc63478..ce3ce69 100644
--- a/music-server/src/main/java/com/study/springclimb/music/controller/CollectController.java
+++ b/music-server/src/main/java/com/study/springclimb/music/controller/CollectController.java
@@ -31,44 +31,44 @@ public class CollectController {
     /**
      * 添加收藏
      */
-    @RequestMapping(value = "/add",method = RequestMethod.POST)
-    public Object addCollect(Collect collect){
+    @RequestMapping(value = "/add", method = RequestMethod.POST)
+    public Object addCollect(Collect collect) {
         JSONObject jsonObject = new JSONObject();
-        if(collect.getSongId()==null||collect.getSongId().equals("")){
-            jsonObject.put(Consts.CODE,0);
-            jsonObject.put(Consts.MSG,"收藏歌曲为空");
+        if (collect.getSongId() == null || collect.getSongId().equals("")) {
+            jsonObject.put(Consts.CODE, 0);
+            jsonObject.put(Consts.MSG, "收藏歌曲为空");
             return jsonObject;
         }
         QueryWrapper<Collect> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("song_id",collect.getSongId());
-        queryWrapper.eq("user_id",collect.getUserId());
-        if(collectService.getOne(queryWrapper)!=null){//用户已收藏该歌曲
-            jsonObject.put(Consts.CODE,2);
-            jsonObject.put(Consts.MSG,"已收藏");
+        queryWrapper.eq("song_id", collect.getSongId());
+        queryWrapper.eq("user_id", collect.getUserId());
+        if (collectService.getOne(queryWrapper) != null) {//用户已收藏该歌曲
+            jsonObject.put(Consts.CODE, 2);
+            jsonObject.put(Consts.MSG, "已收藏");
             return jsonObject;
         }
 
         boolean flag = collectService.save(collect);
-        if(flag){   //保存成功
-            jsonObject.put(Consts.CODE,1);
-            jsonObject.put(Consts.MSG,"收藏成功");
+        if (flag) {   //保存成功
+            jsonObject.put(Consts.CODE, 1);
+            jsonObject.put(Consts.MSG, "收藏成功");
             return jsonObject;
         }
-        jsonObject.put(Consts.CODE,0);
-        jsonObject.put(Consts.MSG,"收藏失败");
+        jsonObject.put(Consts.CODE, 0);
+        jsonObject.put(Consts.MSG, "收藏失败");
         return jsonObject;
     }
 
     /**
      * 删除收藏
      */
-    @RequestMapping(value = "/delete",method = RequestMethod.GET)
-    public Object deleteCollect(HttpServletRequest request){
+    @RequestMapping(value = "/delete", method = RequestMethod.GET)
+    public Object deleteCollect(HttpServletRequest request) {
         String userId = request.getParameter("userId");           //用户id
         String songId = request.getParameter("songId");           //歌曲id
         QueryWrapper<Collect> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("user_id",userId);
-        queryWrapper.eq("song_id",songId);
+        queryWrapper.eq("user_id", userId);
+        queryWrapper.eq("song_id", songId);
         boolean flag = collectService.remove(queryWrapper);
         return flag;
     }
@@ -76,18 +76,18 @@ public class CollectController {
     /**
      * 查询所有收藏
      */
-    @RequestMapping(value = "/allCollect",method = RequestMethod.GET)
-    public Object allCollect(){
+    @RequestMapping(value = "/allCollect", method = RequestMethod.GET)
+    public Object allCollect() {
         return collectService.list();
     }
 
     /**
      * 查询某个用户的收藏列表
      */
-    @RequestMapping(value = "/collectOfUserId",method = RequestMethod.GET)
-    public Object collectOfUserId(Integer userId){
+    @RequestMapping(value = "/collectOfUserId", method = RequestMethod.GET)
+    public Object collectOfUserId(Integer userId) {
         QueryWrapper<Collect> queryWrapper = new QueryWrapper<>();
-         queryWrapper.eq("user_id",userId);
+        queryWrapper.eq("user_id", userId);
         return collectService.list(queryWrapper);
     }
 
diff --git a/music-server/src/main/java/com/study/springclimb/music/controller/CommentController.java b/music-server/src/main/java/com/study/springclimb/music/controller/CommentController.java
index 3f480c6..438cdd5 100644
--- a/music-server/src/main/java/com/study/springclimb/music/controller/CommentController.java
+++ b/music-server/src/main/java/com/study/springclimb/music/controller/CommentController.java
@@ -29,43 +29,43 @@ public class CommentController {
     /**
      * 添加评论
      */
-    @RequestMapping(value = "/add",method = RequestMethod.POST)
-    public Object addComment(Comment comment){
+    @RequestMapping(value = "/add", method = RequestMethod.POST)
+    public Object addComment(Comment comment) {
         JSONObject jsonObject = new JSONObject();
         System.out.println(comment);
         boolean flag = commentService.save(comment);
-        if(flag){   //保存成功
-            jsonObject.put(Consts.CODE,1);
-            jsonObject.put(Consts.MSG,"评论成功");
+        if (flag) {   //保存成功
+            jsonObject.put(Consts.CODE, 1);
+            jsonObject.put(Consts.MSG, "评论成功");
             return jsonObject;
         }
-        jsonObject.put(Consts.CODE,0);
-        jsonObject.put(Consts.MSG,"评论失败");
+        jsonObject.put(Consts.CODE, 0);
+        jsonObject.put(Consts.MSG, "评论失败");
         return jsonObject;
     }
 
     /**
      * 修改评论
      */
-    @RequestMapping(value = "/update",method = RequestMethod.POST)
-    public Object updateComment(Comment comment){
+    @RequestMapping(value = "/update", method = RequestMethod.POST)
+    public Object updateComment(Comment comment) {
         JSONObject jsonObject = new JSONObject();
         boolean flag = commentService.updateById(comment);
-        if(flag){   //保存成功
-            jsonObject.put(Consts.CODE,1);
-            jsonObject.put(Consts.MSG,"修改成功");
+        if (flag) {   //保存成功
+            jsonObject.put(Consts.CODE, 1);
+            jsonObject.put(Consts.MSG, "修改成功");
             return jsonObject;
         }
-        jsonObject.put(Consts.CODE,0);
-        jsonObject.put(Consts.MSG,"修改失败");
+        jsonObject.put(Consts.CODE, 0);
+        jsonObject.put(Consts.MSG, "修改失败");
         return jsonObject;
     }
 
     /**
      * 删除评论
      */
-    @RequestMapping(value = "/delete",method = RequestMethod.GET)
-    public Object deleteComment(Integer id){
+    @RequestMapping(value = "/delete", method = RequestMethod.GET)
+    public Object deleteComment(Integer id) {
         boolean flag = commentService.removeById(id);
         return flag;
     }
@@ -73,53 +73,53 @@ public class CommentController {
     /**
      * 根据主键查询整个对象
      */
-    @RequestMapping(value = "/selectByPrimaryKey",method = RequestMethod.GET)
-    public Object selectByPrimaryKey(Integer id){
+    @RequestMapping(value = "/selectByPrimaryKey", method = RequestMethod.GET)
+    public Object selectByPrimaryKey(Integer id) {
         return commentService.getById(id);
     }
 
     /**
      * 查询所有评论
      */
-    @RequestMapping(value = "/allComment",method = RequestMethod.GET)
-    public Object allComment(){
+    @RequestMapping(value = "/allComment", method = RequestMethod.GET)
+    public Object allComment() {
         return commentService.list();
     }
 
     /**
      * 查询某个歌曲下的所有评论
      */
-    @RequestMapping(value = "/commentOfSongId",method = RequestMethod.GET)
-    public Object commentOfSongId(Integer songId){
+    @RequestMapping(value = "/commentOfSongId", method = RequestMethod.GET)
+    public Object commentOfSongId(Integer songId) {
         QueryWrapper<Comment> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("song_id",songId);
+        queryWrapper.eq("song_id", songId);
         return commentService.list(queryWrapper);
     }
 
     /**
      * 查询某个歌单下的所有评论
      */
-    @RequestMapping(value = "/commentOfSongListId",method = RequestMethod.GET)
-    public Object commentOfSongListId(Integer songListId){//歌曲id
+    @RequestMapping(value = "/commentOfSongListId", method = RequestMethod.GET)
+    public Object commentOfSongListId(Integer songListId) {//歌曲id
         QueryWrapper<Comment> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("song_list_id",songListId);
+        queryWrapper.eq("song_list_id", songListId);
         return commentService.list(queryWrapper);
     }
 
     /**
      * 给某个评论点赞
      */
-    @RequestMapping(value = "/like",method = RequestMethod.POST)
-    public Object like(Comment comment){
+    @RequestMapping(value = "/like", method = RequestMethod.POST)
+    public Object like(Comment comment) {
         JSONObject jsonObject = new JSONObject();
         boolean flag = commentService.updateById(comment);
-        if(flag){   //保存成功
-            jsonObject.put(Consts.CODE,1);
-            jsonObject.put(Consts.MSG,"点赞成功");
+        if (flag) {   //保存成功
+            jsonObject.put(Consts.CODE, 1);
+            jsonObject.put(Consts.MSG, "点赞成功");
             return jsonObject;
         }
-        jsonObject.put(Consts.CODE,0);
-        jsonObject.put(Consts.MSG,"点赞失败");
+        jsonObject.put(Consts.CODE, 0);
+        jsonObject.put(Consts.MSG, "点赞失败");
         return jsonObject;
     }
 }
diff --git a/music-server/src/main/java/com/study/springclimb/music/controller/ConsumerController.java b/music-server/src/main/java/com/study/springclimb/music/controller/ConsumerController.java
index 58aee2d..8b6fac0 100644
--- a/music-server/src/main/java/com/study/springclimb/music/controller/ConsumerController.java
+++ b/music-server/src/main/java/com/study/springclimb/music/controller/ConsumerController.java
@@ -35,68 +35,68 @@ public class ConsumerController {
     /**
      * 添加前端用户
      */
-    @RequestMapping(value = "/add",method = RequestMethod.POST)
-    public Object addConsumer(Consumer consumer){
+    @RequestMapping(value = "/add", method = RequestMethod.POST)
+    public Object addConsumer(Consumer consumer) {
         JSONObject jsonObject = new JSONObject();
 
 
-        if(consumer.getUsername()==null||consumer.getUsername().equals("")){
-            jsonObject.put(Consts.CODE,0);
-            jsonObject.put(Consts.MSG,"用户名不能为空");
+        if (consumer.getUsername() == null || consumer.getUsername().equals("")) {
+            jsonObject.put(Consts.CODE, 0);
+            jsonObject.put(Consts.MSG, "用户名不能为空");
             return jsonObject;
         }
 
         //根据username查询用户是否已存在
         QueryWrapper<Consumer> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("username",consumer.getUsername());
+        queryWrapper.eq("username", consumer.getUsername());
         Consumer consumer1 = consumerService.getOne(queryWrapper);
-        if(consumer1!=null){
-            jsonObject.put(Consts.CODE,0);
-            jsonObject.put(Consts.MSG,"用户名已存在");
+        if (consumer1 != null) {
+            jsonObject.put(Consts.CODE, 0);
+            jsonObject.put(Consts.MSG, "用户名已存在");
             return jsonObject;
         }
 
-        if(consumer.getPassword()==null||consumer.getPassword().equals("")){
-            jsonObject.put(Consts.CODE,0);
-            jsonObject.put(Consts.MSG,"密码不能为空");
+        if (consumer.getPassword() == null || consumer.getPassword().equals("")) {
+            jsonObject.put(Consts.CODE, 0);
+            jsonObject.put(Consts.MSG, "密码不能为空");
             return jsonObject;
         }
 
         boolean flag = consumerService.save(consumer);
-        if(flag){ //保存成功
-            jsonObject.put(Consts.CODE,1);
-            jsonObject.put(Consts.MSG,"添加成功");
+        if (flag) { //保存成功
+            jsonObject.put(Consts.CODE, 1);
+            jsonObject.put(Consts.MSG, "添加成功");
             return jsonObject;
         }
-        jsonObject.put(Consts.CODE,0);
-        jsonObject.put(Consts.MSG,"添加失败");
+        jsonObject.put(Consts.CODE, 0);
+        jsonObject.put(Consts.MSG, "添加失败");
         return jsonObject;
     }
 
     /**
      * 修改前端用户
      */
-    @RequestMapping(value = "/update",method = RequestMethod.POST)
-    public Object updateConsumer(Consumer consumer){
+    @RequestMapping(value = "/update", method = RequestMethod.POST)
+    public Object updateConsumer(Consumer consumer) {
         JSONObject jsonObject = new JSONObject();
-        if(consumer.getUsername()==null||consumer.getUsername().equals("")){
-            jsonObject.put(Consts.CODE,0);
-            jsonObject.put(Consts.MSG,"用户名不能为空");
+        if (consumer.getUsername() == null || consumer.getUsername().equals("")) {
+            jsonObject.put(Consts.CODE, 0);
+            jsonObject.put(Consts.MSG, "用户名不能为空");
             return jsonObject;
         }
-        if(consumer.getPassword()==null||consumer.getPassword().equals("")){
-            jsonObject.put(Consts.CODE,0);
-            jsonObject.put(Consts.MSG,"密码不能为空");
+        if (consumer.getPassword() == null || consumer.getPassword().equals("")) {
+            jsonObject.put(Consts.CODE, 0);
+            jsonObject.put(Consts.MSG, "密码不能为空");
             return jsonObject;
         }
         boolean flag = consumerService.updateById(consumer);
-        if(flag){   //保存成功
-            jsonObject.put(Consts.CODE,1);
-            jsonObject.put(Consts.MSG,"修改成功");
+        if (flag) {   //保存成功
+            jsonObject.put(Consts.CODE, 1);
+            jsonObject.put(Consts.MSG, "修改成功");
             return jsonObject;
         }
-        jsonObject.put(Consts.CODE,0);
-        jsonObject.put(Consts.MSG,"修改失败");
+        jsonObject.put(Consts.CODE, 0);
+        jsonObject.put(Consts.MSG, "修改失败");
         return jsonObject;
     }
 
@@ -104,8 +104,8 @@ public class ConsumerController {
     /**
      * 删除前端用户
      */
-    @RequestMapping(value = "/delete",method = RequestMethod.GET)
-    public Object deleteConsumer(Integer id){
+    @RequestMapping(value = "/delete", method = RequestMethod.GET)
+    public Object deleteConsumer(Integer id) {
         boolean flag = consumerService.removeById(id);
         return flag;
     }
@@ -113,63 +113,63 @@ public class ConsumerController {
     /**
      * 根据主键查询整个对象
      */
-    @RequestMapping(value = "/selectByPrimaryKey",method = RequestMethod.GET)
-    public Consumer selectByPrimaryKey(Integer id){
+    @RequestMapping(value = "/selectByPrimaryKey", method = RequestMethod.GET)
+    public Consumer selectByPrimaryKey(Integer id) {
         return consumerService.getById(id);
     }
 
     /**
      * 查询所有前端用户
      */
-    @RequestMapping(value = "/allConsumer",method = RequestMethod.GET)
-    public Object allConsumer(){
+    @RequestMapping(value = "/allConsumer", method = RequestMethod.GET)
+    public Object allConsumer() {
         return consumerService.list();
     }
 
     /**
      * 更新前端用户图片
      */
-    @RequestMapping(value = "/updateConsumerPic",method = RequestMethod.POST)
-    public Object updateConsumerPic(@RequestParam("file") MultipartFile avatorFile, @RequestParam("id")int id){
+    @RequestMapping(value = "/updateConsumerPic", method = RequestMethod.POST)
+    public Object updateConsumerPic(@RequestParam("file") MultipartFile avatorFile, @RequestParam("id") int id) {
         JSONObject jsonObject = new JSONObject();
-        if(avatorFile.isEmpty()){
-            jsonObject.put(Consts.CODE,0);
-            jsonObject.put(Consts.MSG,"文件上传失败");
+        if (avatorFile.isEmpty()) {
+            jsonObject.put(Consts.CODE, 0);
+            jsonObject.put(Consts.MSG, "文件上传失败");
             return jsonObject;
         }
         //文件名=当前时间到毫秒+原来的文件名
-        String fileName = System.currentTimeMillis()+avatorFile.getOriginalFilename();
+        String fileName = System.currentTimeMillis() + avatorFile.getOriginalFilename();
         //文件路径
-        String filePath = System.getProperty("user.dir")+File.separator
-                +"img"+File.separator+"userPic";
+        String filePath = System.getProperty("user.dir") + File.separator
+                + "img" + File.separator + "userPic";
         //如果文件路径不存在，新增该路径
         File file1 = new File(filePath);
-        if(!file1.exists()){
+        if (!file1.exists()) {
             file1.mkdir();
         }
         //实际的文件地址
-        File dest = new File(filePath+File.separator+fileName);
+        File dest = new File(filePath + File.separator + fileName);
         //存储到数据库里的相对文件地址
-        String storeAvatorPath = "/img/userPic/"+fileName;
+        String storeAvatorPath = "/img/userPic/" + fileName;
         try {
             avatorFile.transferTo(dest);
             Consumer consumer = new Consumer();
             consumer.setId(id);
             consumer.setAvator(storeAvatorPath);
             boolean flag = consumerService.updateById(consumer);
-            if(flag){
-                jsonObject.put(Consts.CODE,1);
-                jsonObject.put(Consts.MSG,"上传成功");
-                jsonObject.put("avator",storeAvatorPath);
+            if (flag) {
+                jsonObject.put(Consts.CODE, 1);
+                jsonObject.put(Consts.MSG, "上传成功");
+                jsonObject.put("avator", storeAvatorPath);
                 return jsonObject;
             }
-            jsonObject.put(Consts.CODE,0);
-            jsonObject.put(Consts.MSG,"上传失败");
+            jsonObject.put(Consts.CODE, 0);
+            jsonObject.put(Consts.MSG, "上传失败");
             return jsonObject;
         } catch (IOException e) {
-            jsonObject.put(Consts.CODE,0);
-            jsonObject.put(Consts.MSG,"上传失败"+e.getMessage());
-        }finally {
+            jsonObject.put(Consts.CODE, 0);
+            jsonObject.put(Consts.MSG, "上传失败" + e.getMessage());
+        } finally {
             return jsonObject;
         }
     }
@@ -177,19 +177,19 @@ public class ConsumerController {
     /**
      * 前端用户登录
      */
-    @RequestMapping(value = "/login",method = RequestMethod.POST)
-    public Object login(HttpServletRequest request){
+    @RequestMapping(value = "/login", method = RequestMethod.POST)
+    public Object login(HttpServletRequest request) {
         JSONObject jsonObject = new JSONObject();
         String username = request.getParameter("username").trim();     //账号
         String password = request.getParameter("password").trim();     //密码
-        if(username==null||username.equals("")){
-            jsonObject.put(Consts.CODE,0);
-            jsonObject.put(Consts.MSG,"用户名不能为空");
+        if (username == null || username.equals("")) {
+            jsonObject.put(Consts.CODE, 0);
+            jsonObject.put(Consts.MSG, "用户名不能为空");
             return jsonObject;
         }
-        if(password==null||password.equals("")){
-            jsonObject.put(Consts.CODE,0);
-            jsonObject.put(Consts.MSG,"密码不能为空");
+        if (password == null || password.equals("")) {
+            jsonObject.put(Consts.CODE, 0);
+            jsonObject.put(Consts.MSG, "密码不能为空");
             return jsonObject;
         }
         //保存到前端用户的对象中
@@ -197,19 +197,19 @@ public class ConsumerController {
         consumerTemp.setUsername(username);
         consumerTemp.setPassword(password);
         QueryWrapper<Consumer> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("username",consumerTemp.getUsername());
-        queryWrapper.eq("password",consumerTemp.getPassword());
+        queryWrapper.eq("username", consumerTemp.getUsername());
+        queryWrapper.eq("password", consumerTemp.getPassword());
         Consumer consumer = consumerService.getOne(queryWrapper);
-        if(consumerTemp!=null){   //验证成功
-            jsonObject.put(Consts.CODE,1);
-            jsonObject.put(Consts.MSG,"登录成功");
+        if (consumerTemp != null) {   //验证成功
+            jsonObject.put(Consts.CODE, 1);
+            jsonObject.put(Consts.MSG, "登录成功");
             QueryWrapper<Consumer> queryWrapperTwo = new QueryWrapper<>();
-            queryWrapperTwo.eq("username",consumer.getUsername());
-            jsonObject.put("userMsg",consumerService.getOne(queryWrapperTwo));//登陆成功返回用户的信息
+            queryWrapperTwo.eq("username", consumer.getUsername());
+            jsonObject.put("userMsg", consumerService.getOne(queryWrapperTwo));//登陆成功返回用户的信息
             return jsonObject;
         }
-        jsonObject.put(Consts.CODE,0);
-        jsonObject.put(Consts.MSG,"用户名或密码错误");
+        jsonObject.put(Consts.CODE, 0);
+        jsonObject.put(Consts.MSG, "用户名或密码错误");
         return jsonObject;
     }
 }
diff --git a/music-server/src/main/java/com/study/springclimb/music/controller/ListSongController.java b/music-server/src/main/java/com/study/springclimb/music/controller/ListSongController.java
index d4b2531..7298a7e 100644
--- a/music-server/src/main/java/com/study/springclimb/music/controller/ListSongController.java
+++ b/music-server/src/main/java/com/study/springclimb/music/controller/ListSongController.java
@@ -15,7 +15,7 @@ import java.util.List;
 
 /**
  * <p>
- *   歌单包含歌曲列表 前端控制器
+ * 歌单包含歌曲列表 前端控制器
  * </p>
  *
  * @author tqz
@@ -31,17 +31,17 @@ public class ListSongController {
     /**
      * 给歌单添加歌曲
      */
-    @RequestMapping(value = "/add",method = RequestMethod.POST)
-    public Object addListSong(ListSong listSong){
+    @RequestMapping(value = "/add", method = RequestMethod.POST)
+    public Object addListSong(ListSong listSong) {
         JSONObject jsonObject = new JSONObject();
         boolean flag = listSongService.save(listSong);
-        if(flag){
-            jsonObject.put(Consts.CODE,1);
-            jsonObject.put(Consts.MSG,"保存成功");
+        if (flag) {
+            jsonObject.put(Consts.CODE, 1);
+            jsonObject.put(Consts.MSG, "保存成功");
             return jsonObject;
         }
-        jsonObject.put(Consts.CODE,0);
-        jsonObject.put(Consts.MSG,"保存失败");
+        jsonObject.put(Consts.CODE, 0);
+        jsonObject.put(Consts.MSG, "保存失败");
         return jsonObject;
 
     }
@@ -49,22 +49,22 @@ public class ListSongController {
     /**
      * 根据歌单id查询歌曲
      */
-    @RequestMapping(value = "/detail",method = RequestMethod.GET)
-    public List<ListSong> detail(Integer songListId){
+    @RequestMapping(value = "/detail", method = RequestMethod.GET)
+    public List<ListSong> detail(Integer songListId) {
         QueryWrapper<ListSong> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("song_list_id",songListId);
+        queryWrapper.eq("song_list_id", songListId);
         return listSongService.list(queryWrapper);
     }
 
     /**
      * 删除歌单里的歌曲
      */
-    @RequestMapping(value = "/delete",method = RequestMethod.GET)
-    public Object delete(Integer songId,Integer songListId){
+    @RequestMapping(value = "/delete", method = RequestMethod.GET)
+    public Object delete(Integer songId, Integer songListId) {
         QueryWrapper<ListSong> queryWrapper = new QueryWrapper<>();
         //删除XXX歌单的XXX歌曲
-        queryWrapper.eq("song_list_id",songListId);
-        queryWrapper.eq("song_id",songId);
+        queryWrapper.eq("song_list_id", songListId);
+        queryWrapper.eq("song_id", songId);
         boolean flag = listSongService.remove(queryWrapper);
         return flag;
     }
diff --git a/music-server/src/main/java/com/study/springclimb/music/controller/RankController.java b/music-server/src/main/java/com/study/springclimb/music/controller/RankController.java
index 60805fa..afa7084 100644
--- a/music-server/src/main/java/com/study/springclimb/music/controller/RankController.java
+++ b/music-server/src/main/java/com/study/springclimb/music/controller/RankController.java
@@ -29,25 +29,25 @@ public class RankController {
     /**
      * 新增评价
      */
-    @RequestMapping(value = "/rank/add",method = RequestMethod.POST)
-    public Object add(Rank rank){
+    @RequestMapping(value = "/rank/add", method = RequestMethod.POST)
+    public Object add(Rank rank) {
         JSONObject jsonObject = new JSONObject();
         boolean flag = service.insertRank(rank);
-        if(flag){
-            jsonObject.put(Consts.CODE,1);
-            jsonObject.put(Consts.MSG,"评价成功");
+        if (flag) {
+            jsonObject.put(Consts.CODE, 1);
+            jsonObject.put(Consts.MSG, "评价成功");
             return jsonObject;
         }
-        jsonObject.put(Consts.CODE,0);
-        jsonObject.put(Consts.MSG,"评价失败");
+        jsonObject.put(Consts.CODE, 0);
+        jsonObject.put(Consts.MSG, "评价失败");
         return jsonObject;
     }
 
     /**
      * 计算平均分,根据SongListId查询rank
      */
-    @RequestMapping(value = "/rank",method = RequestMethod.GET)
-    public Object rankOfSongListId(Integer songListId){
+    @RequestMapping(value = "/rank", method = RequestMethod.GET)
+    public Object rankOfSongListId(Integer songListId) {
         return service.rankOfSongListId(songListId);
     }
 }
diff --git a/music-server/src/main/java/com/study/springclimb/music/controller/SingerController.java b/music-server/src/main/java/com/study/springclimb/music/controller/SingerController.java
index 92b8d44..6a13b91 100644
--- a/music-server/src/main/java/com/study/springclimb/music/controller/SingerController.java
+++ b/music-server/src/main/java/com/study/springclimb/music/controller/SingerController.java
@@ -30,45 +30,47 @@ public class SingerController {
 
     //添加歌手
     @PostMapping("/add")
-    public Object addSinger(Singer singer){
-        JSONObject jsonObject=new JSONObject();
+    public Object addSinger(Singer singer) {
+        JSONObject jsonObject = new JSONObject();
         boolean flag = singerService.insert(singer);
-        if(flag){//保存成功
-            jsonObject.put(Consts.CODE,1);
-            jsonObject.put(Consts.MSG,"添加成功");
+        if (flag) {//保存成功
+            jsonObject.put(Consts.CODE, 1);
+            jsonObject.put(Consts.MSG, "添加成功");
             return jsonObject;
         }
-        jsonObject.put(Consts.CODE,0);
-        jsonObject.put(Consts.MSG,"添加失败");
+        jsonObject.put(Consts.CODE, 0);
+        jsonObject.put(Consts.MSG, "添加失败");
         return jsonObject;
     }
+
     //修改歌手
     @PostMapping("/update")
-    public Object editSinger(Singer singer){
-        JSONObject jsonObject=new JSONObject();
+    public Object editSinger(Singer singer) {
+        JSONObject jsonObject = new JSONObject();
         boolean flag = singerService.update(singer);
-        if(flag){ //保存成功
-          //  System.out.println("修改成功");
-            jsonObject.put(Consts.CODE,1);
-            jsonObject.put(Consts.MSG,"修改成功");
+        if (flag) { //保存成功
+            //  System.out.println("修改成功");
+            jsonObject.put(Consts.CODE, 1);
+            jsonObject.put(Consts.MSG, "修改成功");
             return jsonObject;
         }
-        jsonObject.put(Consts.CODE,0);
-        jsonObject.put(Consts.MSG,"修改失败");
+        jsonObject.put(Consts.CODE, 0);
+        jsonObject.put(Consts.MSG, "修改失败");
         return jsonObject;
     }
+
     //删除歌手
     @RequestMapping("/delete")
-    public Object deleteSinger(Integer id){
-        JSONObject jsonObject=new JSONObject();
+    public Object deleteSinger(Integer id) {
+        JSONObject jsonObject = new JSONObject();
         boolean flag = singerService.deleteById(id);
-        if(flag){ //保存成功
-            jsonObject.put(Consts.CODE,1);
-            jsonObject.put(Consts.MSG,"删除成功");
+        if (flag) { //保存成功
+            jsonObject.put(Consts.CODE, 1);
+            jsonObject.put(Consts.MSG, "删除成功");
             return jsonObject;
         }
-        jsonObject.put(Consts.CODE,0);
-        jsonObject.put(Consts.MSG,"删除失败");
+        jsonObject.put(Consts.CODE, 0);
+        jsonObject.put(Consts.MSG, "删除失败");
         return jsonObject;
     }
 
@@ -85,34 +87,35 @@ public class SingerController {
 
     //查询所有歌手
     @RequestMapping("allSinger")
-    public Object findAllSinger(){
+    public Object findAllSinger() {
         //System.out.println("查询所有歌手成功");
         return singerService.queryAll();//直接返回列表
     }
-    @PostMapping ("list")
-    public R singerList(@RequestBody PageRequest pageRequest){
-        return R.ok().data("data",singerService.selectSingerByPage(pageRequest));
+
+    @PostMapping("list")
+    public R singerList(@RequestBody PageRequest pageRequest) {
+        return R.ok().data("data", singerService.selectSingerByPage(pageRequest));
     }
 
 
     //根据歌手name模糊查询
     @RequestMapping("singersOfName")
-    public Object singleOfName(String name){
-       return  singerService.singerOfName("%"+name.trim()+"%");
+    public Object singleOfName(String name) {
+        return singerService.singerOfName("%" + name.trim() + "%");
     }
 
     //根据歌手sex模糊查询
     @RequestMapping("singersOfSex")
-    public Object singleOfSex(String sex){//0 女   1 男    2组合   3不明
-        Integer sex1=Integer.parseInt(sex.trim());
-        return  singerService.singerOfSex(sex1);
+    public Object singleOfSex(String sex) {//0 女   1 男    2组合   3不明
+        Integer sex1 = Integer.parseInt(sex.trim());
+        return singerService.singerOfSex(sex1);
     }
 
     /**
      * 更新歌手图片
      */
-    @RequestMapping(value = "/updateSingerPic",method = RequestMethod.POST)
-    public Object updateSingerPic(@RequestParam("file") MultipartFile avatorFile, @RequestParam("id")int id) {
+    @RequestMapping(value = "/updateSingerPic", method = RequestMethod.POST)
+    public Object updateSingerPic(@RequestParam("file") MultipartFile avatorFile, @RequestParam("id") int id) {
         JSONObject jsonObject = new JSONObject();
         if (avatorFile.isEmpty()) {
             jsonObject.put(Consts.CODE, 0);
diff --git a/music-server/src/main/java/com/study/springclimb/music/controller/SongController.java b/music-server/src/main/java/com/study/springclimb/music/controller/SongController.java
index ccf5924..1925b62 100644
--- a/music-server/src/main/java/com/study/springclimb/music/controller/SongController.java
+++ b/music-server/src/main/java/com/study/springclimb/music/controller/SongController.java
@@ -71,13 +71,13 @@ public class SongController {
                 return jsonObject;
             }
         } catch (IOException e) {
-                jsonObject.put(Consts.CODE, 0);
-                jsonObject.put(Consts.MSG, "保存失败");
-                return jsonObject;
-        }
             jsonObject.put(Consts.CODE, 0);
             jsonObject.put(Consts.MSG, "保存失败");
             return jsonObject;
+        }
+        jsonObject.put(Consts.CODE, 0);
+        jsonObject.put(Consts.MSG, "保存失败");
+        return jsonObject;
     }
 
 
diff --git a/music-server/src/main/java/com/study/springclimb/music/controller/SongListController.java b/music-server/src/main/java/com/study/springclimb/music/controller/SongListController.java
index f75b18a..879f434 100644
--- a/music-server/src/main/java/com/study/springclimb/music/controller/SongListController.java
+++ b/music-server/src/main/java/com/study/springclimb/music/controller/SongListController.java
@@ -35,34 +35,34 @@ public class SongListController {
     /**
      * 添加歌单
      */
-    @RequestMapping(value = "/add",method = RequestMethod.POST)
-    public Object addSongList(SongList songList){
+    @RequestMapping(value = "/add", method = RequestMethod.POST)
+    public Object addSongList(SongList songList) {
         JSONObject jsonObject = new JSONObject();
         boolean flag = songListService.insertSongList(songList);
-        if(flag){   //保存成功
-            jsonObject.put(Consts.CODE,1);
-            jsonObject.put(Consts.MSG,"添加成功");
+        if (flag) {   //保存成功
+            jsonObject.put(Consts.CODE, 1);
+            jsonObject.put(Consts.MSG, "添加成功");
             return jsonObject;
         }
-        jsonObject.put(Consts.CODE,0);
-        jsonObject.put(Consts.MSG,"添加失败");
+        jsonObject.put(Consts.CODE, 0);
+        jsonObject.put(Consts.MSG, "添加失败");
         return jsonObject;
     }
 
     /**
      * 修改歌单
      */
-    @RequestMapping(value = "/update",method = RequestMethod.POST)
+    @RequestMapping(value = "/update", method = RequestMethod.POST)
     public Object updateSongList(SongList songList) {
         JSONObject jsonObject = new JSONObject();
         boolean flag = songListService.updateById(songList);
-        if(flag){   //保存成功
-            jsonObject.put(Consts.CODE,1);
-            jsonObject.put(Consts.MSG,"修改成功");
+        if (flag) {   //保存成功
+            jsonObject.put(Consts.CODE, 1);
+            jsonObject.put(Consts.MSG, "修改成功");
             return jsonObject;
         }
-        jsonObject.put(Consts.CODE,0);
-        jsonObject.put(Consts.MSG,"修改失败");
+        jsonObject.put(Consts.CODE, 0);
+        jsonObject.put(Consts.MSG, "修改失败");
         return jsonObject;
     }
 
@@ -70,8 +70,8 @@ public class SongListController {
     /**
      * 删除歌单
      */
-    @RequestMapping(value = "/delete",method = RequestMethod.GET)
-    public Object deleteSongList(Integer id){
+    @RequestMapping(value = "/delete", method = RequestMethod.GET)
+    public Object deleteSongList(Integer id) {
         boolean flag = songListService.removeById(id);
         return flag;
     }
@@ -79,93 +79,93 @@ public class SongListController {
     /**
      * 根据主键查询整个对象
      */
-    @RequestMapping(value = "/selectByPrimaryKey",method = RequestMethod.GET)
-    public Object selectByPrimaryKey(Integer id){
+    @RequestMapping(value = "/selectByPrimaryKey", method = RequestMethod.GET)
+    public Object selectByPrimaryKey(Integer id) {
         return songListService.getById(id);
     }
 
     /**
      * 查询所有歌单
      */
-    @RequestMapping(value = "/allSongList",method = RequestMethod.GET)
-    public Object allSongList(){
+    @RequestMapping(value = "/allSongList", method = RequestMethod.GET)
+    public Object allSongList() {
         return songListService.list();//查询所有
     }
 
     /**
      * 根据标题精确查询歌单列表
      */
-    @RequestMapping(value = "/songListOfTitle",method = RequestMethod.GET)
-    public List<SongList> songListOfName(String title){//歌单标题
+    @RequestMapping(value = "/songListOfTitle", method = RequestMethod.GET)
+    public List<SongList> songListOfName(String title) {//歌单标题
         QueryWrapper<SongList> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("title",title);
+        queryWrapper.eq("title", title);
         return songListService.list(queryWrapper);
     }
 
     /**
      * 根据标题模糊查询歌单列表
      */
-    @RequestMapping(value = "/likeTitle",method = RequestMethod.GET)
-    public Object likeTitle(String title){
+    @RequestMapping(value = "/likeTitle", method = RequestMethod.GET)
+    public Object likeTitle(String title) {
         QueryWrapper<SongList> queryWrapper = new QueryWrapper<>();
-        queryWrapper.like("title",title);
+        queryWrapper.like("title", title);
         return songListService.list(queryWrapper);
     }
 
     /**
      * 根据风格模糊查询歌单列表
      */
-    @RequestMapping(value = "/likeStyle",method = RequestMethod.GET)
-    public Object likeStyle(String style){
+    @RequestMapping(value = "/likeStyle", method = RequestMethod.GET)
+    public Object likeStyle(String style) {
         QueryWrapper<SongList> queryWrapper = new QueryWrapper<>();
-        queryWrapper.like("style",style);
+        queryWrapper.like("style", style);
         return songListService.list(queryWrapper);
     }
 
     /**
      * 更新歌单图片
      */
-    @RequestMapping(value = "/updateSongListPic",method = RequestMethod.POST)
-    public Object updateSongListPic(@RequestParam("file") MultipartFile avatorFile, @RequestParam("id")int id){
+    @RequestMapping(value = "/updateSongListPic", method = RequestMethod.POST)
+    public Object updateSongListPic(@RequestParam("file") MultipartFile avatorFile, @RequestParam("id") int id) {
         JSONObject jsonObject = new JSONObject();
-        if(avatorFile.isEmpty()){
-            jsonObject.put(Consts.CODE,0);
-            jsonObject.put(Consts.MSG,"文件上传失败");
+        if (avatorFile.isEmpty()) {
+            jsonObject.put(Consts.CODE, 0);
+            jsonObject.put(Consts.MSG, "文件上传失败");
             return jsonObject;
         }
         //文件名=当前时间到毫秒+原来的文件名
-        String fileName = System.currentTimeMillis()+avatorFile.getOriginalFilename();
+        String fileName = System.currentTimeMillis() + avatorFile.getOriginalFilename();
         //文件路径
-        String filePath = System.getProperty("user.dir")+File.separator+"img"
-                +File.separator+"songListPic";
+        String filePath = System.getProperty("user.dir") + File.separator + "img"
+                + File.separator + "songListPic";
         //如果文件路径不存在，新增该路径
         File file1 = new File(filePath);
-        if(!file1.exists()){
+        if (!file1.exists()) {
             file1.mkdir();
         }
         //实际的文件地址
-        File dest = new File(filePath+File.separator+fileName);
+        File dest = new File(filePath + File.separator + fileName);
         //存储到数据库里的相对文件地址
-        String storeAvatorPath = "/img/songListPic/"+fileName;
+        String storeAvatorPath = "/img/songListPic/" + fileName;
         try {
             avatorFile.transferTo(dest);
             SongList songList = new SongList();
             songList.setId(id);
             songList.setPic(storeAvatorPath);
             boolean flag = songListService.updateById(songList);
-            if(flag){
-                jsonObject.put(Consts.CODE,1);
-                jsonObject.put(Consts.MSG,"上传成功");
-                jsonObject.put("pic",storeAvatorPath);
+            if (flag) {
+                jsonObject.put(Consts.CODE, 1);
+                jsonObject.put(Consts.MSG, "上传成功");
+                jsonObject.put("pic", storeAvatorPath);
                 return jsonObject;
             }
-            jsonObject.put(Consts.CODE,0);
-            jsonObject.put(Consts.MSG,"上传失败");
+            jsonObject.put(Consts.CODE, 0);
+            jsonObject.put(Consts.MSG, "上传失败");
             return jsonObject;
         } catch (IOException e) {
-            jsonObject.put(Consts.CODE,0);
-            jsonObject.put(Consts.MSG,"上传失败"+e.getMessage());
-        }finally {
+            jsonObject.put(Consts.CODE, 0);
+            jsonObject.put(Consts.MSG, "上传失败" + e.getMessage());
+        } finally {
             return jsonObject;
         }
     }
diff --git a/music-server/src/main/java/com/study/springclimb/music/dao/AdminDao.java b/music-server/src/main/java/com/study/springclimb/music/dao/AdminDao.java
index 4112a01..d2eecf8 100644
--- a/music-server/src/main/java/com/study/springclimb/music/dao/AdminDao.java
+++ b/music-server/src/main/java/com/study/springclimb/music/dao/AdminDao.java
@@ -1,4 +1,5 @@
 package com.study.springclimb.music.dao;
+
 import com.study.springclimb.music.entity.Admin;
 import org.apache.ibatis.annotations.Param;
 
@@ -15,11 +16,12 @@ public interface AdminDao {
 
     /**
      * 验证密码是否正确
+     *
      * @param username 用户名
-     * @param password  密码
-     * @return  用户
+     * @param password 密码
+     * @return 用户
      */
-    Admin verifyPassword(String username,String password);
+    Admin verifyPassword(String username, String password);
 
     /**
      * 通过ID查询单条数据
diff --git a/music-server/src/main/java/com/study/springclimb/music/dao/CollectDao.java b/music-server/src/main/java/com/study/springclimb/music/dao/CollectDao.java
index 507fa84..790b742 100644
--- a/music-server/src/main/java/com/study/springclimb/music/dao/CollectDao.java
+++ b/music-server/src/main/java/com/study/springclimb/music/dao/CollectDao.java
@@ -1,7 +1,7 @@
 package com.study.springclimb.music.dao;
 
-import com.study.springclimb.music.entity.Collect;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.study.springclimb.music.entity.Collect;
 
 /**
  * <p>
diff --git a/music-server/src/main/java/com/study/springclimb/music/dao/CommentDao.java b/music-server/src/main/java/com/study/springclimb/music/dao/CommentDao.java
index 26eddee..4a25dce 100644
--- a/music-server/src/main/java/com/study/springclimb/music/dao/CommentDao.java
+++ b/music-server/src/main/java/com/study/springclimb/music/dao/CommentDao.java
@@ -1,7 +1,7 @@
 package com.study.springclimb.music.dao;
 
-import com.study.springclimb.music.entity.Comment;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.study.springclimb.music.entity.Comment;
 
 /**
  * <p>
diff --git a/music-server/src/main/java/com/study/springclimb/music/dao/ConsumerDao.java b/music-server/src/main/java/com/study/springclimb/music/dao/ConsumerDao.java
index d72af98..1ca6731 100644
--- a/music-server/src/main/java/com/study/springclimb/music/dao/ConsumerDao.java
+++ b/music-server/src/main/java/com/study/springclimb/music/dao/ConsumerDao.java
@@ -1,7 +1,7 @@
 package com.study.springclimb.music.dao;
 
-import com.study.springclimb.music.entity.Consumer;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.study.springclimb.music.entity.Consumer;
 
 /**
  * <p>
diff --git a/music-server/src/main/java/com/study/springclimb/music/dao/ListSongDao.java b/music-server/src/main/java/com/study/springclimb/music/dao/ListSongDao.java
index 577f7fa..fbc57e2 100644
--- a/music-server/src/main/java/com/study/springclimb/music/dao/ListSongDao.java
+++ b/music-server/src/main/java/com/study/springclimb/music/dao/ListSongDao.java
@@ -1,7 +1,7 @@
 package com.study.springclimb.music.dao;
 
-import com.study.springclimb.music.entity.ListSong;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.study.springclimb.music.entity.ListSong;
 
 /**
  * <p>
diff --git a/music-server/src/main/java/com/study/springclimb/music/dao/RankDao.java b/music-server/src/main/java/com/study/springclimb/music/dao/RankDao.java
index 3c4cfa8..b0f6512 100644
--- a/music-server/src/main/java/com/study/springclimb/music/dao/RankDao.java
+++ b/music-server/src/main/java/com/study/springclimb/music/dao/RankDao.java
@@ -1,7 +1,7 @@
 package com.study.springclimb.music.dao;
 
-import com.study.springclimb.music.entity.Rank;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.study.springclimb.music.entity.Rank;
 
 /**
  * <p>
diff --git a/music-server/src/main/java/com/study/springclimb/music/dao/SingerDao.java b/music-server/src/main/java/com/study/springclimb/music/dao/SingerDao.java
index 637e90a..5b52bb3 100644
--- a/music-server/src/main/java/com/study/springclimb/music/dao/SingerDao.java
+++ b/music-server/src/main/java/com/study/springclimb/music/dao/SingerDao.java
@@ -41,10 +41,6 @@ public interface SingerDao extends BaseMapper<Singer> {
     List<Singer> queryAll(Singer singer);
 
 
-
-
-
-
     /**
      * 新增数据
      *
@@ -87,12 +83,14 @@ public interface SingerDao extends BaseMapper<Singer> {
 
     /**
      * 查询所有用户
+     *
      * @return 对象列表
      */
     List<Singer> findAll();
 
     /**
      * 通过name模糊查询
+     *
      * @param name
      * @return
      */
@@ -101,6 +99,7 @@ public interface SingerDao extends BaseMapper<Singer> {
 
     /**
      * 通过sex模糊查询
+     *
      * @param sex
      * @return
      */
diff --git a/music-server/src/main/java/com/study/springclimb/music/dao/SongListDao.java b/music-server/src/main/java/com/study/springclimb/music/dao/SongListDao.java
index a6f0510..7b60d34 100644
--- a/music-server/src/main/java/com/study/springclimb/music/dao/SongListDao.java
+++ b/music-server/src/main/java/com/study/springclimb/music/dao/SongListDao.java
@@ -1,7 +1,7 @@
 package com.study.springclimb.music.dao;
 
-import com.study.springclimb.music.entity.SongList;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.study.springclimb.music.entity.SongList;
 
 /**
  * <p>
diff --git a/music-server/src/main/java/com/study/springclimb/music/entity/Admin.java b/music-server/src/main/java/com/study/springclimb/music/entity/Admin.java
index 27b6a7f..46b1d81 100644
--- a/music-server/src/main/java/com/study/springclimb/music/entity/Admin.java
+++ b/music-server/src/main/java/com/study/springclimb/music/entity/Admin.java
@@ -10,7 +10,6 @@ public class Admin implements Serializable {
     private String password;
 
 
-
     public Admin() {
     }
 
@@ -43,6 +42,7 @@ public class Admin implements Serializable {
     public void setPassword(String password) {
         this.password = password;
     }
+
     @Override
     public String toString() {
         return "Admin{" +
@@ -50,4 +50,5 @@ public class Admin implements Serializable {
                 ", name='" + name + '\'' +
                 ", password='" + password + '\'' +
                 '}';
-    }}
+    }
+}
diff --git a/music-server/src/main/java/com/study/springclimb/music/entity/Collect.java b/music-server/src/main/java/com/study/springclimb/music/entity/Collect.java
index dc37572..346569e 100644
--- a/music-server/src/main/java/com/study/springclimb/music/entity/Collect.java
+++ b/music-server/src/main/java/com/study/springclimb/music/entity/Collect.java
@@ -1,13 +1,14 @@
 package com.study.springclimb.music.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
-import java.util.Date;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.io.Serializable;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.io.Serializable;
+import java.util.Date;
+
 /**
  * <p>
  * 收藏
@@ -21,7 +22,7 @@ import lombok.experimental.Accessors;
 @Accessors(chain = true)
 public class Collect implements Serializable {
 
-    private static final long serialVersionUID=1L;
+    private static final long serialVersionUID = 1L;
 
     /**
      * 主键
diff --git a/music-server/src/main/java/com/study/springclimb/music/entity/Comment.java b/music-server/src/main/java/com/study/springclimb/music/entity/Comment.java
index 95045e3..f98542c 100644
--- a/music-server/src/main/java/com/study/springclimb/music/entity/Comment.java
+++ b/music-server/src/main/java/com/study/springclimb/music/entity/Comment.java
@@ -28,7 +28,7 @@ import java.util.Date;
 @Accessors(chain = true)
 public class Comment implements Serializable {
 
-    private static final long serialVersionUID=1L;
+    private static final long serialVersionUID = 1L;
 
     /**
      * 主键
diff --git a/music-server/src/main/java/com/study/springclimb/music/entity/ListSong.java b/music-server/src/main/java/com/study/springclimb/music/entity/ListSong.java
index 863eda0..ec8dbb6 100644
--- a/music-server/src/main/java/com/study/springclimb/music/entity/ListSong.java
+++ b/music-server/src/main/java/com/study/springclimb/music/entity/ListSong.java
@@ -2,11 +2,12 @@ package com.study.springclimb.music.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.io.Serializable;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.io.Serializable;
+
 /**
  * <p>
  * 歌单包含歌曲列表
@@ -20,7 +21,7 @@ import lombok.experimental.Accessors;
 @Accessors(chain = true)
 public class ListSong implements Serializable {
 
-    private static final long serialVersionUID=1L;
+    private static final long serialVersionUID = 1L;
 
     /**
      * 主键
diff --git a/music-server/src/main/java/com/study/springclimb/music/entity/Rank.java b/music-server/src/main/java/com/study/springclimb/music/entity/Rank.java
index 86145df..ebd67b9 100644
--- a/music-server/src/main/java/com/study/springclimb/music/entity/Rank.java
+++ b/music-server/src/main/java/com/study/springclimb/music/entity/Rank.java
@@ -25,7 +25,7 @@ import java.io.Serializable;
 @Accessors(chain = true)
 public class Rank implements Serializable {
 
-    private static final long serialVersionUID=1L;
+    private static final long serialVersionUID = 1L;
 
     /**
      * 主键
diff --git a/music-server/src/main/java/com/study/springclimb/music/entity/Singer.java b/music-server/src/main/java/com/study/springclimb/music/entity/Singer.java
index 57d4275..3a17a40 100644
--- a/music-server/src/main/java/com/study/springclimb/music/entity/Singer.java
+++ b/music-server/src/main/java/com/study/springclimb/music/entity/Singer.java
@@ -1,6 +1,5 @@
 package com.study.springclimb.music.entity;
 
-import java.util.Date;
 import java.io.Serializable;
 
 /**
@@ -12,32 +11,32 @@ import java.io.Serializable;
 public class Singer implements Serializable {
     private static final long serialVersionUID = 372984511951162091L;
     /**
-    * 主键
-    */
+     * 主键
+     */
     private Integer id;
     /**
-    * 姓名
-    */
+     * 姓名
+     */
     private String name;
     /**
-    * 性别（0女1男2组合3不明）
-    */
+     * 性别（0女1男2组合3不明）
+     */
     private Byte sex;
     /**
-    * 头像
-    */
+     * 头像
+     */
     private String pic;
     /**
-    * 生日
-    */
+     * 生日
+     */
     private String birth;
     /**
-    * 地区
-    */
+     * 地区
+     */
     private String location;
     /**
-    * 简介
-    */
+     * 简介
+     */
     private String introduction;
 
 
diff --git a/music-server/src/main/java/com/study/springclimb/music/entity/Song.java b/music-server/src/main/java/com/study/springclimb/music/entity/Song.java
index d3dc322..91c93bd 100644
--- a/music-server/src/main/java/com/study/springclimb/music/entity/Song.java
+++ b/music-server/src/main/java/com/study/springclimb/music/entity/Song.java
@@ -26,7 +26,7 @@ import java.util.Date;
 @Accessors(chain = true)//链式set方法
 public class Song extends Model<Song> {
     //主键
-    @TableId(value = "id",type = IdType.AUTO)
+    @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
     //歌手id
     private Integer singerId;
@@ -35,10 +35,10 @@ public class Song extends Model<Song> {
     //简介
     private String introduction;
     //创建时间
-    @TableField(value = "create_time",fill = FieldFill.INSERT)
+    @TableField(value = "create_time", fill = FieldFill.INSERT)
     private Date createTime;
     //更新时间
-    @TableField(value = "update_time",fill = FieldFill.INSERT_UPDATE)
+    @TableField(value = "update_time", fill = FieldFill.INSERT_UPDATE)
     private Date updateTime;
     //歌曲图片
     private String pic;
diff --git a/music-server/src/main/java/com/study/springclimb/music/entity/SongList.java b/music-server/src/main/java/com/study/springclimb/music/entity/SongList.java
index 71761b1..64d2f5a 100644
--- a/music-server/src/main/java/com/study/springclimb/music/entity/SongList.java
+++ b/music-server/src/main/java/com/study/springclimb/music/entity/SongList.java
@@ -2,11 +2,12 @@ package com.study.springclimb.music.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.io.Serializable;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.io.Serializable;
+
 /**
  * <p>
  * 歌单
@@ -20,7 +21,7 @@ import lombok.experimental.Accessors;
 @Accessors(chain = true)
 public class SongList implements Serializable {
 
-    private static final long serialVersionUID=1L;
+    private static final long serialVersionUID = 1L;
 
     /**
      * 主键
diff --git a/music-server/src/main/java/com/study/springclimb/music/handler/MyMetaObjectHandler.java b/music-server/src/main/java/com/study/springclimb/music/handler/MyMetaObjectHandler.java
index d69a1ee..827fd39 100644
--- a/music-server/src/main/java/com/study/springclimb/music/handler/MyMetaObjectHandler.java
+++ b/music-server/src/main/java/com/study/springclimb/music/handler/MyMetaObjectHandler.java
@@ -22,6 +22,7 @@ public class MyMetaObjectHandler implements MetaObjectHandler {
 
     /**
      * 更新时的填充策略
+     *
      * @param metaObject
      */
     @Override
diff --git a/music-server/src/main/java/com/study/springclimb/music/interceptor/MyHandlerInterceptor.java b/music-server/src/main/java/com/study/springclimb/music/interceptor/MyHandlerInterceptor.java
index e428a4a..aacec74 100644
--- a/music-server/src/main/java/com/study/springclimb/music/interceptor/MyHandlerInterceptor.java
+++ b/music-server/src/main/java/com/study/springclimb/music/interceptor/MyHandlerInterceptor.java
@@ -6,7 +6,7 @@ import org.springframework.web.servlet.ModelAndView;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-public class MyHandlerInterceptor  implements HandlerInterceptor {
+public class MyHandlerInterceptor implements HandlerInterceptor {
     @Override
     public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
         return true;
diff --git a/music-server/src/main/java/com/study/springclimb/music/service/AdminService.java b/music-server/src/main/java/com/study/springclimb/music/service/AdminService.java
index 3b46098..a9d1368 100644
--- a/music-server/src/main/java/com/study/springclimb/music/service/AdminService.java
+++ b/music-server/src/main/java/com/study/springclimb/music/service/AdminService.java
@@ -1,7 +1,6 @@
 package com.study.springclimb.music.service;
 
 
-
 import com.study.springclimb.music.entity.Admin;
 
 import java.util.List;
@@ -15,12 +14,13 @@ import java.util.List;
 public interface AdminService {
 
     /**
-     *   验证密码是否正确
+     * 验证密码是否正确
+     *
      * @param username
      * @param password
      * @return
      */
-    Boolean verifyPassword(String username,String password);
+    Boolean verifyPassword(String username, String password);
 
     /**
      * 通过ID查询单条数据
diff --git a/music-server/src/main/java/com/study/springclimb/music/service/CollectService.java b/music-server/src/main/java/com/study/springclimb/music/service/CollectService.java
index 606a1c8..dd24a8b 100644
--- a/music-server/src/main/java/com/study/springclimb/music/service/CollectService.java
+++ b/music-server/src/main/java/com/study/springclimb/music/service/CollectService.java
@@ -1,7 +1,7 @@
 package com.study.springclimb.music.service;
 
-import com.study.springclimb.music.entity.Collect;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.study.springclimb.music.entity.Collect;
 
 /**
  * <p>
diff --git a/music-server/src/main/java/com/study/springclimb/music/service/CommentService.java b/music-server/src/main/java/com/study/springclimb/music/service/CommentService.java
index 1936816..4fbcbfa 100644
--- a/music-server/src/main/java/com/study/springclimb/music/service/CommentService.java
+++ b/music-server/src/main/java/com/study/springclimb/music/service/CommentService.java
@@ -1,7 +1,7 @@
 package com.study.springclimb.music.service;
 
-import com.study.springclimb.music.entity.Comment;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.study.springclimb.music.entity.Comment;
 
 /**
  * <p>
diff --git a/music-server/src/main/java/com/study/springclimb/music/service/ConsumerService.java b/music-server/src/main/java/com/study/springclimb/music/service/ConsumerService.java
index 0f80603..ed5f9f5 100644
--- a/music-server/src/main/java/com/study/springclimb/music/service/ConsumerService.java
+++ b/music-server/src/main/java/com/study/springclimb/music/service/ConsumerService.java
@@ -1,7 +1,7 @@
 package com.study.springclimb.music.service;
 
-import com.study.springclimb.music.entity.Consumer;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.study.springclimb.music.entity.Consumer;
 
 /**
  * <p>
diff --git a/music-server/src/main/java/com/study/springclimb/music/service/ListSongService.java b/music-server/src/main/java/com/study/springclimb/music/service/ListSongService.java
index 72c2278..4e0714b 100644
--- a/music-server/src/main/java/com/study/springclimb/music/service/ListSongService.java
+++ b/music-server/src/main/java/com/study/springclimb/music/service/ListSongService.java
@@ -1,7 +1,7 @@
 package com.study.springclimb.music.service;
 
-import com.study.springclimb.music.entity.ListSong;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.study.springclimb.music.entity.ListSong;
 
 /**
  * <p>
diff --git a/music-server/src/main/java/com/study/springclimb/music/service/RankService.java b/music-server/src/main/java/com/study/springclimb/music/service/RankService.java
index b8c344e..3a99069 100644
--- a/music-server/src/main/java/com/study/springclimb/music/service/RankService.java
+++ b/music-server/src/main/java/com/study/springclimb/music/service/RankService.java
@@ -14,18 +14,19 @@ import com.study.springclimb.music.entity.Rank;
 public interface RankService extends IService<Rank> {
 
     boolean insertRank(Rank rank);
+
     /**
      * 查总分
      */
-     int selectScoreSum(Integer songListId);
+    int selectScoreSum(Integer songListId);
 
     /**
      * 查总评分人数
      */
-     int selectRankNum(Integer songListId);
+    int selectRankNum(Integer songListId);
 
     /**
      * 计算平均分
      */
-     int rankOfSongListId(Integer songListId);
+    int rankOfSongListId(Integer songListId);
 }
diff --git a/music-server/src/main/java/com/study/springclimb/music/service/SingerService.java b/music-server/src/main/java/com/study/springclimb/music/service/SingerService.java
index 3f3c309..d9e6089 100644
--- a/music-server/src/main/java/com/study/springclimb/music/service/SingerService.java
+++ b/music-server/src/main/java/com/study/springclimb/music/service/SingerService.java
@@ -1,13 +1,9 @@
 package com.study.springclimb.music.service;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.study.springclimb.music.entity.Collect;
 import com.study.springclimb.music.entity.Singer;
 import com.study.springclimb.music.utils.PageRequest;
 import com.study.springclimb.music.utils.PageUtils;
-import com.study.springclimb.music.utils.R;
 
 import java.util.List;
 
@@ -28,7 +24,6 @@ public interface SingerService extends IService<Singer> {
     Singer queryById(Integer id);
 
 
-
     /**
      * 查询多条数据
      *
diff --git a/music-server/src/main/java/com/study/springclimb/music/service/SongListService.java b/music-server/src/main/java/com/study/springclimb/music/service/SongListService.java
index ecfb2a3..9996889 100644
--- a/music-server/src/main/java/com/study/springclimb/music/service/SongListService.java
+++ b/music-server/src/main/java/com/study/springclimb/music/service/SongListService.java
@@ -1,7 +1,7 @@
 package com.study.springclimb.music.service;
 
-import com.study.springclimb.music.entity.SongList;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.study.springclimb.music.entity.SongList;
 
 /**
  * <p>
@@ -12,5 +12,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @since 2021-06-20
  */
 public interface SongListService extends IService<SongList> {
-   Boolean insertSongList(SongList songList);
+    Boolean insertSongList(SongList songList);
 }
diff --git a/music-server/src/main/java/com/study/springclimb/music/service/impl/AdminServiceImpl.java b/music-server/src/main/java/com/study/springclimb/music/service/impl/AdminServiceImpl.java
index 4f3feaf..02f86f5 100644
--- a/music-server/src/main/java/com/study/springclimb/music/service/impl/AdminServiceImpl.java
+++ b/music-server/src/main/java/com/study/springclimb/music/service/impl/AdminServiceImpl.java
@@ -1,7 +1,7 @@
 package com.study.springclimb.music.service.impl;
 
-import com.study.springclimb.music.entity.Admin;
 import com.study.springclimb.music.dao.AdminDao;
+import com.study.springclimb.music.entity.Admin;
 import com.study.springclimb.music.service.AdminService;
 import org.springframework.stereotype.Service;
 
@@ -21,6 +21,7 @@ public class AdminServiceImpl implements AdminService {
 
     /**
      * 验证密码是否正确
+     *
      * @param username
      * @param password
      * @return
@@ -29,10 +30,10 @@ public class AdminServiceImpl implements AdminService {
     public Boolean verifyPassword(String username, String password) {
         Admin admin = adminDao.verifyPassword(username, password);
         //System.out.println(admin);
-        if(admin == null){
+        if (admin == null) {
             return false;
         }
-        return  true;
+        return true;
     }
 
 
@@ -68,7 +69,7 @@ public class AdminServiceImpl implements AdminService {
     @Override
     public boolean insert(Admin admin) {
         int insert = this.adminDao.insert(admin);
-        if(insert == 1){
+        if (insert == 1) {
             return true;
         }
         return false;
@@ -83,7 +84,7 @@ public class AdminServiceImpl implements AdminService {
     @Override
     public boolean update(Admin admin) {
         int update = this.adminDao.update(admin);
-        if(update == 1){
+        if (update == 1) {
             return true;
         }
         return false;
diff --git a/music-server/src/main/java/com/study/springclimb/music/service/impl/CollectServiceImpl.java b/music-server/src/main/java/com/study/springclimb/music/service/impl/CollectServiceImpl.java
index f28edd0..98130cb 100644
--- a/music-server/src/main/java/com/study/springclimb/music/service/impl/CollectServiceImpl.java
+++ b/music-server/src/main/java/com/study/springclimb/music/service/impl/CollectServiceImpl.java
@@ -1,9 +1,9 @@
 package com.study.springclimb.music.service.impl;
 
-import com.study.springclimb.music.entity.Collect;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.study.springclimb.music.dao.CollectDao;
+import com.study.springclimb.music.entity.Collect;
 import com.study.springclimb.music.service.CollectService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 /**
diff --git a/music-server/src/main/java/com/study/springclimb/music/service/impl/CommentServiceImpl.java b/music-server/src/main/java/com/study/springclimb/music/service/impl/CommentServiceImpl.java
index 000f6f0..3cd7541 100644
--- a/music-server/src/main/java/com/study/springclimb/music/service/impl/CommentServiceImpl.java
+++ b/music-server/src/main/java/com/study/springclimb/music/service/impl/CommentServiceImpl.java
@@ -1,9 +1,9 @@
 package com.study.springclimb.music.service.impl;
 
-import com.study.springclimb.music.entity.Comment;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.study.springclimb.music.dao.CommentDao;
+import com.study.springclimb.music.entity.Comment;
 import com.study.springclimb.music.service.CommentService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 /**
diff --git a/music-server/src/main/java/com/study/springclimb/music/service/impl/ConsumerServiceImpl.java b/music-server/src/main/java/com/study/springclimb/music/service/impl/ConsumerServiceImpl.java
index e1439c0..295c6fb 100644
--- a/music-server/src/main/java/com/study/springclimb/music/service/impl/ConsumerServiceImpl.java
+++ b/music-server/src/main/java/com/study/springclimb/music/service/impl/ConsumerServiceImpl.java
@@ -1,9 +1,9 @@
 package com.study.springclimb.music.service.impl;
 
-import com.study.springclimb.music.entity.Consumer;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.study.springclimb.music.dao.ConsumerDao;
+import com.study.springclimb.music.entity.Consumer;
 import com.study.springclimb.music.service.ConsumerService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 /**
diff --git a/music-server/src/main/java/com/study/springclimb/music/service/impl/ListSongServiceImpl.java b/music-server/src/main/java/com/study/springclimb/music/service/impl/ListSongServiceImpl.java
index 9d7b747..5a3792d 100644
--- a/music-server/src/main/java/com/study/springclimb/music/service/impl/ListSongServiceImpl.java
+++ b/music-server/src/main/java/com/study/springclimb/music/service/impl/ListSongServiceImpl.java
@@ -1,9 +1,9 @@
 package com.study.springclimb.music.service.impl;
 
-import com.study.springclimb.music.entity.ListSong;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.study.springclimb.music.dao.ListSongDao;
+import com.study.springclimb.music.entity.ListSong;
 import com.study.springclimb.music.service.ListSongService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 /**
diff --git a/music-server/src/main/java/com/study/springclimb/music/service/impl/RankServiceImpl.java b/music-server/src/main/java/com/study/springclimb/music/service/impl/RankServiceImpl.java
index b23dced..031b672 100644
--- a/music-server/src/main/java/com/study/springclimb/music/service/impl/RankServiceImpl.java
+++ b/music-server/src/main/java/com/study/springclimb/music/service/impl/RankServiceImpl.java
@@ -1,9 +1,9 @@
 package com.study.springclimb.music.service.impl;
 
-import com.study.springclimb.music.entity.Rank;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.study.springclimb.music.dao.RankDao;
+import com.study.springclimb.music.entity.Rank;
 import com.study.springclimb.music.service.RankService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -24,7 +24,7 @@ public class RankServiceImpl extends ServiceImpl<RankDao, Rank> implements RankS
 
     @Override
     public boolean insertRank(Rank rank) {
-        return dao.insert(rank)>0;
+        return dao.insert(rank) > 0;
     }
 
     @Override
@@ -48,12 +48,12 @@ public class RankServiceImpl extends ServiceImpl<RankDao, Rank> implements RankS
         int rankNum = dao.selectRankNum(songListId);
         //总人数
         int countNum = dao.selectScoreSum(songListId);
-        if(countNum==0){
+        if (countNum == 0) {
             return rankNum;
         }
         //平均分=总分数/总人数
-        int result=countNum/rankNum;
-        if(result==0){
+        int result = countNum / rankNum;
+        if (result == 0) {
             return 5;
         }
         return result;
diff --git a/music-server/src/main/java/com/study/springclimb/music/service/impl/SingerServiceImpl.java b/music-server/src/main/java/com/study/springclimb/music/service/impl/SingerServiceImpl.java
index 8af2b2a..7e9926d 100644
--- a/music-server/src/main/java/com/study/springclimb/music/service/impl/SingerServiceImpl.java
+++ b/music-server/src/main/java/com/study/springclimb/music/service/impl/SingerServiceImpl.java
@@ -3,8 +3,8 @@ package com.study.springclimb.music.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.study.springclimb.music.entity.Singer;
 import com.study.springclimb.music.dao.SingerDao;
+import com.study.springclimb.music.entity.Singer;
 import com.study.springclimb.music.service.SingerService;
 import com.study.springclimb.music.utils.PageRequest;
 import com.study.springclimb.music.utils.PageUtils;
@@ -21,7 +21,7 @@ import java.util.List;
  * @since 2021-06-10 18:25:23
  */
 @Service
-public class SingerServiceImpl extends ServiceImpl<SingerDao,Singer> implements SingerService {
+public class SingerServiceImpl extends ServiceImpl<SingerDao, Singer> implements SingerService {
     @Resource
     private SingerDao singerDao;
 
@@ -61,7 +61,7 @@ public class SingerServiceImpl extends ServiceImpl<SingerDao,Singer> implements
      */
     @Override
     public boolean insert(Singer singer) {
-        return this.singerDao.insert(singer)>0;
+        return this.singerDao.insert(singer) > 0;
     }
 
     /**
@@ -72,7 +72,7 @@ public class SingerServiceImpl extends ServiceImpl<SingerDao,Singer> implements
      */
     @Override
     public boolean update(Singer singer) {
-        return  this.singerDao.update(singer)>0;
+        return this.singerDao.update(singer) > 0;
     }
 
     /**
@@ -97,10 +97,10 @@ public class SingerServiceImpl extends ServiceImpl<SingerDao,Singer> implements
     }
 
     @Override
-    public PageUtils selectSingerByPage(PageRequest pageRequest){
+    public PageUtils selectSingerByPage(PageRequest pageRequest) {
         Page page = this.page(pageRequest.toMybatisPage(),
-                      new LambdaQueryWrapper<Singer>()
-                        .like(StringUtils.isNotBlank(pageRequest.getSearchKey()),Singer::getName, pageRequest.getSearchKey())
+                new LambdaQueryWrapper<Singer>()
+                        .like(StringUtils.isNotBlank(pageRequest.getSearchKey()), Singer::getName, pageRequest.getSearchKey())
 //                        .or()
 //                        .like(StringUtils.isNotBlank(pageRequest.getSearchKey()),Singer::getSex, pageRequest.getSearchKey())
 //                        .or()
diff --git a/music-server/src/main/java/com/study/springclimb/music/service/impl/SongListServiceImpl.java b/music-server/src/main/java/com/study/springclimb/music/service/impl/SongListServiceImpl.java
index 0dae93f..982ef44 100644
--- a/music-server/src/main/java/com/study/springclimb/music/service/impl/SongListServiceImpl.java
+++ b/music-server/src/main/java/com/study/springclimb/music/service/impl/SongListServiceImpl.java
@@ -21,8 +21,9 @@ public class SongListServiceImpl extends ServiceImpl<SongListDao, SongList> impl
 
     @Resource
     private SongListDao dao;
+
     @Override
     public Boolean insertSongList(SongList songList) {
-        return dao.insert(songList)>0;
+        return dao.insert(songList) > 0;
     }
 }
diff --git a/music-server/src/main/java/com/study/springclimb/music/service/impl/SongServiceImpl.java b/music-server/src/main/java/com/study/springclimb/music/service/impl/SongServiceImpl.java
index 30e5f2b..38d0945 100644
--- a/music-server/src/main/java/com/study/springclimb/music/service/impl/SongServiceImpl.java
+++ b/music-server/src/main/java/com/study/springclimb/music/service/impl/SongServiceImpl.java
@@ -21,18 +21,18 @@ public class SongServiceImpl extends ServiceImpl<SongDao, Song> implements SongS
 
 
     @Resource
-    private  SongDao dao;
+    private SongDao dao;
 
     @Override
     public Boolean insertSong(Song song) {
         int insert = dao.insert(song);
-        return  insert>0;
+        return insert > 0;
     }
 
     @Override
     public List<Song> songOfSingerId(Integer id) {
         QueryWrapper<Song> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("singer_id",id);//查询歌手id为xxx的歌曲列表
+        queryWrapper.eq("singer_id", id);//查询歌手id为xxx的歌曲列表
         List<Song> songs = dao.selectList(queryWrapper);
         return songs;
     }
diff --git a/music-server/src/main/java/com/study/springclimb/music/utils/Consts.java b/music-server/src/main/java/com/study/springclimb/music/utils/Consts.java
index 3d777b7..32faaa6 100644
--- a/music-server/src/main/java/com/study/springclimb/music/utils/Consts.java
+++ b/music-server/src/main/java/com/study/springclimb/music/utils/Consts.java
@@ -4,10 +4,10 @@ package com.study.springclimb.music.utils;
  *
  */
 public class Consts {
-     //登录名
-     public static final String NAME="name";
-     //返回码
-     public  static final String CODE="code";
-     //返回信息
-     public  static final String MSG="msg";
+    //登录名
+    public static final String NAME = "name";
+    //返回码
+    public static final String CODE = "code";
+    //返回信息
+    public static final String MSG = "msg";
 }
diff --git a/music-server/src/main/java/com/study/springclimb/music/utils/PageRequest.java b/music-server/src/main/java/com/study/springclimb/music/utils/PageRequest.java
index a91e5c7..ad67e5d 100644
--- a/music-server/src/main/java/com/study/springclimb/music/utils/PageRequest.java
+++ b/music-server/src/main/java/com/study/springclimb/music/utils/PageRequest.java
@@ -13,7 +13,7 @@ public class PageRequest {
 
     private String searchKey;
 
-    private Integer  current;
+    private Integer current;
 
 
     private Integer size;
@@ -21,7 +21,7 @@ public class PageRequest {
      * 排序列
      */
 
-    private String orderByColumn ;
+    private String orderByColumn;
     /**
      * 排序的方向 "desc" 或者 "asc".
      */
diff --git a/music-server/src/main/java/com/study/springclimb/music/utils/PageUtils.java b/music-server/src/main/java/com/study/springclimb/music/utils/PageUtils.java
index f901d8c..da450c2 100644
--- a/music-server/src/main/java/com/study/springclimb/music/utils/PageUtils.java
+++ b/music-server/src/main/java/com/study/springclimb/music/utils/PageUtils.java
@@ -11,92 +11,93 @@ import java.util.List;
  * @author Mark sunlightcs@gmail.com
  */
 public class PageUtils implements Serializable {
-	private static final long serialVersionUID = 1L;
-	/**
-	 * 总记录数
-	 */
-	private int totalCount;
-	/**
-	 * 每页记录数
-	 */
-	private int pageSize;
-	/**
-	 * 总页数
-	 */
-	private int totalPage;
-	/**
-	 * 当前页数
-	 */
-	private int currPage;
-	/**
-	 * 列表数据
-	 */
-	private List<?> list;
-	
-	/**
-	 * 分页
-	 * @param list        列表数据
-	 * @param totalCount  总记录数
-	 * @param pageSize    每页记录数
-	 * @param currPage    当前页数
-	 */
-	public PageUtils(List<?> list, int totalCount, int pageSize, int currPage) {
-		this.list = list;
-		this.totalCount = totalCount;
-		this.pageSize = pageSize;
-		this.currPage = currPage;
-		this.totalPage = (int)Math.ceil((double)totalCount/pageSize);
-	}
-
-	/**
-	 * 分页
-	 */
-	public PageUtils(IPage<?> page) {
-		this.list = page.getRecords();
-		this.totalCount = (int)page.getTotal();
-		this.pageSize = (int)page.getSize();
-		this.currPage = (int)page.getCurrent();
-		this.totalPage = (int)page.getPages();
-	}
-
-	public int getTotalCount() {
-		return totalCount;
-	}
-
-	public void setTotalCount(int totalCount) {
-		this.totalCount = totalCount;
-	}
-
-	public int getPageSize() {
-		return pageSize;
-	}
-
-	public void setPageSize(int pageSize) {
-		this.pageSize = pageSize;
-	}
-
-	public int getTotalPage() {
-		return totalPage;
-	}
-
-	public void setTotalPage(int totalPage) {
-		this.totalPage = totalPage;
-	}
-
-	public int getCurrPage() {
-		return currPage;
-	}
-
-	public void setCurrPage(int currPage) {
-		this.currPage = currPage;
-	}
-
-	public List<?> getList() {
-		return list;
-	}
-
-	public void setList(List<?> list) {
-		this.list = list;
-	}
-	
+    private static final long serialVersionUID = 1L;
+    /**
+     * 总记录数
+     */
+    private int totalCount;
+    /**
+     * 每页记录数
+     */
+    private int pageSize;
+    /**
+     * 总页数
+     */
+    private int totalPage;
+    /**
+     * 当前页数
+     */
+    private int currPage;
+    /**
+     * 列表数据
+     */
+    private List<?> list;
+
+    /**
+     * 分页
+     *
+     * @param list       列表数据
+     * @param totalCount 总记录数
+     * @param pageSize   每页记录数
+     * @param currPage   当前页数
+     */
+    public PageUtils(List<?> list, int totalCount, int pageSize, int currPage) {
+        this.list = list;
+        this.totalCount = totalCount;
+        this.pageSize = pageSize;
+        this.currPage = currPage;
+        this.totalPage = (int) Math.ceil((double) totalCount / pageSize);
+    }
+
+    /**
+     * 分页
+     */
+    public PageUtils(IPage<?> page) {
+        this.list = page.getRecords();
+        this.totalCount = (int) page.getTotal();
+        this.pageSize = (int) page.getSize();
+        this.currPage = (int) page.getCurrent();
+        this.totalPage = (int) page.getPages();
+    }
+
+    public int getTotalCount() {
+        return totalCount;
+    }
+
+    public void setTotalCount(int totalCount) {
+        this.totalCount = totalCount;
+    }
+
+    public int getPageSize() {
+        return pageSize;
+    }
+
+    public void setPageSize(int pageSize) {
+        this.pageSize = pageSize;
+    }
+
+    public int getTotalPage() {
+        return totalPage;
+    }
+
+    public void setTotalPage(int totalPage) {
+        this.totalPage = totalPage;
+    }
+
+    public int getCurrPage() {
+        return currPage;
+    }
+
+    public void setCurrPage(int currPage) {
+        this.currPage = currPage;
+    }
+
+    public List<?> getList() {
+        return list;
+    }
+
+    public void setList(List<?> list) {
+        this.list = list;
+    }
+
 }
diff --git a/music-server/src/main/java/com/study/springclimb/music/utils/R.java b/music-server/src/main/java/com/study/springclimb/music/utils/R.java
index 948e180..23b1c1e 100644
--- a/music-server/src/main/java/com/study/springclimb/music/utils/R.java
+++ b/music-server/src/main/java/com/study/springclimb/music/utils/R.java
@@ -6,38 +6,40 @@ import java.util.HashMap;
 import java.util.Map;
 
 /**
- *  统一返回结果
+ * 统一返回结果
  */
 @Data
 public class R {
 
     private Integer code;
     private String message;
-    private Map<String,Object> data = new HashMap<>();
+    private Map<String, Object> data = new HashMap<>();
 
     /**
      * 构造函数私有化
      */
-    private R(){
+    private R() {
 
     }
 
     /**
      * 返回成功结果
+     *
      * @return
      */
-    public static R ok(){
-       R r = new R();
-       r.setCode(ResponseEnum.SUCCESS.getCode());
-       r.setMessage(ResponseEnum.SUCCESS.getMessage());
-       return r;
+    public static R ok() {
+        R r = new R();
+        r.setCode(ResponseEnum.SUCCESS.getCode());
+        r.setMessage(ResponseEnum.SUCCESS.getMessage());
+        return r;
     }
 
     /**
      * 返回其他枚举结果
+     *
      * @return
      */
-    public static R result(ResponseEnum responseEnum){
+    public static R result(ResponseEnum responseEnum) {
         R r = new R();
         r.setCode(responseEnum.getCode());
         r.setMessage(responseEnum.getMessage());
@@ -45,12 +47,12 @@ public class R {
     }
 
 
-
     /**
      * 返回失败结果
+     *
      * @return
      */
-    public static R error(){
+    public static R error() {
         R r = new R();
         r.setCode(ResponseEnum.ERROR.getCode());
         r.setMessage(ResponseEnum.ERROR.getMessage());
@@ -59,35 +61,37 @@ public class R {
 
     /**
      * 给data赋值
+     *
      * @param key
      * @param value
      * @return
      */
-    public R data(String key,Object value){
-      this.data.put(key,value);
-      return this;
+    public R data(String key, Object value) {
+        this.data.put(key, value);
+        return this;
     }
 
     /**
      * 设置自定义返回信息
+     *
      * @param message
      * @return
      */
-    public R message(String message){
+    public R message(String message) {
         this.setMessage(message);
         return this;
     }
 
     /**
      * 设置自定义返回码
+     *
      * @param code
      * @return
      */
-    public R code(Integer code){
+    public R code(Integer code) {
         this.setCode(code);
         return this;
     }
 
 
-
 }
\ No newline at end of file
diff --git a/music-server/src/main/resources/application.properties b/music-server/src/main/resources/application.properties
index 3958064..fdd8e94 100644
--- a/music-server/src/main/resources/application.properties
+++ b/music-server/src/main/resources/application.properties
@@ -1,17 +1,14 @@
 server.port=8888
-
 spring.datasource.url=jdbc:mysql://localhost:3306/music?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf-8&useSSL=false&allowPublicKeyRetrieval=true
 spring.datasource.username=root
 spring.datasource.password=521127
 spring.datasource.type=com.alibaba.druid.pool.DruidDataSource 
 spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
 spring.jackson.time-zone=GMT+8
-
 #指定实体类
 mybatis.type-aliases-package=com.study.springclimb.music.entity
 #指定mapper文件位置
 mybatis.mapper-locations=classpath:mapper/*.xml
-
 #文件上传最大20MB
 spring.servlet.multipart.max-file-size=20MB
 spring.servlet.multipart.max-request-size=100MB
\ No newline at end of file
diff --git a/music-server/src/main/resources/logback-spring.xml b/music-server/src/main/resources/logback-spring.xml
index d893643..65a4fbd 100644
--- a/music-server/src/main/resources/logback-spring.xml
+++ b/music-server/src/main/resources/logback-spring.xml
@@ -1,75 +1,78 @@
 <?xml version="1.0" encoding="UTF-8"?>
-         <configuration scan="true" scanPeriod="60 seconds">
-       <property name="LOG_HOME" value="/datalog/shopping/shopping-goods/"/>
-       <property name="FORMAT" value="%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{25} - %msg%n"/>
-       <property name="RollingMaxHistory" value="10"/>
-       <property name="RollingFileNamePattern" value="${LOG_HOME}/%d{yyyy-MM-dd}.%i"/>
-             <!-- 彩色日志依赖的渲染类 -->
-       <conversionRule conversionWord="clr" converterClass="org.springframework.boot.logging.logback.ColorConverter"/>
-       <conversionRule conversionWord="wex" converterClass="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter"/>
-       <conversionRule conversionWord="wEx" converterClass="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter"/>
-       <!-- 彩色日志格式 -->
-       <property name="CONSOLE_LOG_PATTERN" value="${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
-             <!-- 控制台输出 -->
-       <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-           <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-               <pattern>${CONSOLE_LOG_PATTERN}</pattern>
-               <charset>utf8</charset>
-           </encoder>
-       </appender>
-             <!-- 生成INFO日志文件 -->
-       <appender name="INFO-FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-           <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-               <!--日志文件输出的文件名-->
-               <FileNamePattern>${RollingFileNamePattern}/info/%d{yyyy-MM-dd}.%i-info.log</FileNamePattern>
-               <!--日志文件最大的大小-->
-               <maxFileSize>500MB</maxFileSize>
-               <!--日志文件保留天数-->
-               <MaxHistory>${RollingMaxHistory}</MaxHistory>
-           </rollingPolicy>
-           <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-               <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
-               <pattern>${FORMAT}</pattern>
-           </encoder>
-           <!-- 打印日志级别 -->
-           <filter class="ch.qos.logback.classic.filter.LevelFilter">
-               <level>debug</level>
-               <onMatch>ACCEPT</onMatch>
-               <onMismatch>DENY</onMismatch>
-           </filter>
-       </appender>
-          <!-- 生成ERROR日志文件 -->
-       <appender name="ERROR-FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-           <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-               <!--日志文件输出的文件名-->
-               <FileNamePattern>${RollingFileNamePattern}/error/%d{yyyy-MM-dd}.%i-error.log</FileNamePattern>
-               <!--日志文件最大的大小-->
-               <maxFileSize>500MB</maxFileSize>
-               <!--日志文件保留天数-->
-               <MaxHistory>${RollingMaxHistory}</MaxHistory>
-           </rollingPolicy>
-           <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-               <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
-               <pattern>${FORMAT}</pattern>
-           </encoder>
-           <!-- 打印日志级别 -->
-           <filter class="ch.qos.logback.classic.filter.LevelFilter">
-               <level>ERROR</level>
-               <onMatch>ACCEPT</onMatch>
-               <onMismatch>DENY</onMismatch>
-           </filter>
-       </appender>
-          <!-- 日志输出级别 -->
-       <root level="debug">
-           <appender-ref ref="STDOUT"/>
-           <appender-ref ref="INFO-FILE"/>
-           <appender-ref ref="ERROR-FILE"/>
-       </root>
-             <logger name="druid.sql" level="INFO"/>
-       <logger name="com.shopping.goods.mapper" level="DEBUG">
-           <appender-ref ref="STDOUT" />
-           <appender-ref ref="INFO-FILE" />
-          </logger>
-             <!-- 减少nacos日志 -->
-       <logger name="com.alibaba.nacos" level="ERROR"/>
-      </configuration>
\ No newline at end of file
+<configuration scan="true" scanPeriod="60 seconds">
+    <property name="LOG_HOME" value="/datalog/shopping/shopping-goods/"/>
+    <property name="FORMAT" value="%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{25} - %msg%n"/>
+    <property name="RollingMaxHistory" value="10"/>
+    <property name="RollingFileNamePattern" value="${LOG_HOME}/%d{yyyy-MM-dd}.%i"/>
+    <!-- 彩色日志依赖的渲染类 -->
+    <conversionRule conversionWord="clr" converterClass="org.springframework.boot.logging.logback.ColorConverter"/>
+    <conversionRule conversionWord="wex"
+                    converterClass="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter"/>
+    <conversionRule conversionWord="wEx"
+                    converterClass="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter"/>
+    <!-- 彩色日志格式 -->
+    <property name="CONSOLE_LOG_PATTERN"
+              value="${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
+    <!-- 控制台输出 -->
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+            <pattern>${CONSOLE_LOG_PATTERN}</pattern>
+            <charset>utf8</charset>
+        </encoder>
+    </appender>
+    <!-- 生成INFO日志文件 -->
+    <appender name="INFO-FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+            <!--日志文件输出的文件名-->
+            <FileNamePattern>${RollingFileNamePattern}/info/%d{yyyy-MM-dd}.%i-info.log</FileNamePattern>
+            <!--日志文件最大的大小-->
+            <maxFileSize>500MB</maxFileSize>
+            <!--日志文件保留天数-->
+            <MaxHistory>${RollingMaxHistory}</MaxHistory>
+        </rollingPolicy>
+        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+            <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
+            <pattern>${FORMAT}</pattern>
+        </encoder>
+        <!-- 打印日志级别 -->
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>debug</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+    <!-- 生成ERROR日志文件 -->
+    <appender name="ERROR-FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+            <!--日志文件输出的文件名-->
+            <FileNamePattern>${RollingFileNamePattern}/error/%d{yyyy-MM-dd}.%i-error.log</FileNamePattern>
+            <!--日志文件最大的大小-->
+            <maxFileSize>500MB</maxFileSize>
+            <!--日志文件保留天数-->
+            <MaxHistory>${RollingMaxHistory}</MaxHistory>
+        </rollingPolicy>
+        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+            <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
+            <pattern>${FORMAT}</pattern>
+        </encoder>
+        <!-- 打印日志级别 -->
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>ERROR</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+    <!-- 日志输出级别 -->
+    <root level="debug">
+        <appender-ref ref="STDOUT"/>
+        <appender-ref ref="INFO-FILE"/>
+        <appender-ref ref="ERROR-FILE"/>
+    </root>
+    <logger name="druid.sql" level="INFO"/>
+    <logger name="com.shopping.goods.mapper" level="DEBUG">
+        <appender-ref ref="STDOUT"/>
+        <appender-ref ref="INFO-FILE"/>
+    </logger>
+    <!-- 减少nacos日志 -->
+    <logger name="com.alibaba.nacos" level="ERROR"/>
+</configuration>
\ No newline at end of file
diff --git a/music-server/src/main/resources/mapper/AdminDao.xml b/music-server/src/main/resources/mapper/AdminDao.xml
index 7152368..fbe63ad 100644
--- a/music-server/src/main/resources/mapper/AdminDao.xml
+++ b/music-server/src/main/resources/mapper/AdminDao.xml
@@ -9,16 +9,16 @@
     </resultMap>
     <!--根据username password 查询用户是否存在-->
     <select id="verifyPassword" resultMap="AdminMap">
-          select
-              id,name,password
-          from music.admin
-          where name = #{username} and password = #{password}
+        select
+        id,name,password
+        from music.admin
+        where name = #{username} and password = #{password}
     </select>
 
     <!--查询单个-->
     <select id="queryById" resultMap="AdminMap">
         select
-          id, name, password
+        id, name, password
         from music.admin
         where id = #{id}
     </select>
@@ -26,7 +26,7 @@
     <!--查询指定行数据-->
     <select id="queryAllByLimit" resultMap="AdminMap">
         select
-          id, name, password
+        id, name, password
         from music.admin
         limit #{offset}, #{limit}
     </select>
diff --git a/music-server/src/main/resources/mapper/RankMapper.xml b/music-server/src/main/resources/mapper/RankMapper.xml
index a0d8ffb..4bc7627 100644
--- a/music-server/src/main/resources/mapper/RankMapper.xml
+++ b/music-server/src/main/resources/mapper/RankMapper.xml
@@ -2,18 +2,18 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.study.springclimb.music.dao.RankDao">
 
-<!--    /**-->
-<!--    * 查总分-->
-<!--    */-->
+    <!--    /**-->
+    <!--    * 查总分-->
+    <!--    */-->
     <select id="selectScoreSum" resultType="java.lang.Integer" parameterType="java.lang.Integer">
         select COALESCE(sum(score),0) as score
         from music.rank
         where song_list_id = #{songListId}
     </select>
 
-<!--    /**-->
-<!--    * 查总评分人数-->
-<!--    */-->
+    <!--    /**-->
+    <!--    * 查总评分人数-->
+    <!--    */-->
     <select id="selectRankNum" resultType="java.lang.Integer" parameterType="java.lang.Integer">
         select COALESCE(count(id),0) as num
         from music.rank
@@ -21,6 +21,6 @@
     </select>
 
     <insert id="insert" parameterType="com.study.springclimb.music.entity.Rank">
-          insert into music.rank (song_list_id,consumer_id,score) values (#{songListId},#{consumerId},#{score});
+        insert into music.rank (song_list_id,consumer_id,score) values (#{songListId},#{consumerId},#{score});
     </insert>
 </mapper>
diff --git a/music-server/src/main/resources/mapper/SingerDao.xml b/music-server/src/main/resources/mapper/SingerDao.xml
index 8806f37..8cec585 100644
--- a/music-server/src/main/resources/mapper/SingerDao.xml
+++ b/music-server/src/main/resources/mapper/SingerDao.xml
@@ -15,7 +15,7 @@
     <!--查询单个-->
     <select id="queryById" resultMap="SingerMap">
         select
-          id, name, sex, pic, birth, location, introduction
+        id, name, sex, pic, birth, location, introduction
         from music.singer
         where id = #{id}
     </select>
@@ -23,14 +23,14 @@
     <!--查询所有-->
     <select id="findAll" resultMap="SingerMap">
         select
-          id, name, sex, pic, birth, location, introduction
+        id, name, sex, pic, birth, location, introduction
         from music.singer
     </select>
 
     <!--查询指定行数据-->
     <select id="queryAllByLimit" resultMap="SingerMap">
         select
-          id, name, sex, pic, birth, location, introduction
+        id, name, sex, pic, birth, location, introduction
         from music.singer
         limit #{offset}, #{limit}
     </select>
@@ -123,14 +123,14 @@
 
     <select id="singerOfName" resultMap="SingerMap" parameterType="java.lang.String">
         select
-          id, name, sex, pic, birth, location, introduction
+        id, name, sex, pic, birth, location, introduction
         from music.singer
         where name = #{name}
     </select>
 
     <select id="singerOfSex" resultMap="SingerMap" parameterType="java.lang.Integer">
         select
-          id, name, sex, pic, birth, location, introduction
+        id, name, sex, pic, birth, location, introduction
         from music.singer
         where sex = #{sex}
     </select>
diff --git a/music-server/src/main/resources/mapper/SongDao.xml b/music-server/src/main/resources/mapper/SongDao.xml
index 56b1b57..61c323b 100644
--- a/music-server/src/main/resources/mapper/SongDao.xml
+++ b/music-server/src/main/resources/mapper/SongDao.xml
@@ -3,8 +3,8 @@
 <mapper namespace="com.study.springclimb.music.dao.SingerDao">
 
 
-<!--    <insert id="insertSong"  parameterType="com.study.springclimb.music.entity.Song">-->
-<!--     insert into song(singer_id,name,introduction,lyric,url)-->
-<!--     values (#{singerId},#{name},#{introduction},#{lyric},#{url})-->
-<!--    </insert>-->
+    <!--    <insert id="insertSong"  parameterType="com.study.springclimb.music.entity.Song">-->
+    <!--     insert into song(singer_id,name,introduction,lyric,url)-->
+    <!--     values (#{singerId},#{name},#{introduction},#{lyric},#{url})-->
+    <!--    </insert>-->
 </mapper>
diff --git a/music-server/src/test/java/com/study/springclimb/music/TestSongDao.java b/music-server/src/test/java/com/study/springclimb/music/TestSongDao.java
index 51e0a45..6ca31ec 100644
--- a/music-server/src/test/java/com/study/springclimb/music/TestSongDao.java
+++ b/music-server/src/test/java/com/study/springclimb/music/TestSongDao.java
@@ -16,9 +16,9 @@ public class TestSongDao {
     private SongDao songDao;
 
     @Test
-    public void testQuerySongById(){
+    public void testQuerySongById() {
         QueryWrapper<Song> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("singer_id",1);//查询
+        queryWrapper.eq("singer_id", 1);//查询
         List<Song> songs = songDao.selectList(queryWrapper);
         songs.forEach(song -> System.out.println(song));
     }
-- 
Gitee


From 809e69d6b18c70f25574263914549fdfdfcb4c47 Mon Sep 17 00:00:00 2001
From: wsx9172 <wsx9172@gmail.com>
Date: Mon, 11 Sep 2023 10:49:38 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E4=B8=ADmybatis=E4=B8=BAmybatis-plus?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 music-server/src/main/resources/application.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/music-server/src/main/resources/application.properties b/music-server/src/main/resources/application.properties
index fdd8e94..a5e76a7 100644
--- a/music-server/src/main/resources/application.properties
+++ b/music-server/src/main/resources/application.properties
@@ -6,9 +6,9 @@ spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
 spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
 spring.jackson.time-zone=GMT+8
 #指定实体类
-mybatis.type-aliases-package=com.study.springclimb.music.entity
+mybatis-plus.type-aliases-package=com.study.springclimb.music.entity
 #指定mapper文件位置
-mybatis.mapper-locations=classpath:mapper/*.xml
+mybatis-plus.mapper-locations=classpath:mapper/*.xml
 #文件上传最大20MB
 spring.servlet.multipart.max-file-size=20MB
 spring.servlet.multipart.max-request-size=100MB
\ No newline at end of file
-- 
Gitee


From 4d42585e901e48baeab14ec70ed4b4abba3af9e6 Mon Sep 17 00:00:00 2001
From: wsx9172 <wsx9172@gmail.com>
Date: Mon, 11 Sep 2023 10:49:45 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E4=B8=ADmybatis=E4=B8=BAmybatis-plus?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 music-server/src/main/resources/application.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/music-server/src/main/resources/application.properties b/music-server/src/main/resources/application.properties
index a5e76a7..53b03de 100644
--- a/music-server/src/main/resources/application.properties
+++ b/music-server/src/main/resources/application.properties
@@ -2,7 +2,7 @@ server.port=8888
 spring.datasource.url=jdbc:mysql://localhost:3306/music?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf-8&useSSL=false&allowPublicKeyRetrieval=true
 spring.datasource.username=root
 spring.datasource.password=521127
-spring.datasource.type=com.alibaba.druid.pool.DruidDataSource 
+spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
 spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
 spring.jackson.time-zone=GMT+8
 #指定实体类
-- 
Gitee