B站视频对应录制版本

jessedog · May 28, 2020 · 83df523 · 83df523
1 parent d596260
commit 83df523
Show file tree

Hide file tree

Showing 38 changed files with 404 additions and 670 deletions.
diff --git a/vueblog-java/pom.xml b/vueblog-java/pom.xml
@@ -9,9 +9,9 @@
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
     <groupId>com.markerhub</groupId>
-    <artifactId>vblog-java</artifactId>
+    <artifactId>vueblog</artifactId>
     <version>0.0.1-SNAPSHOT</version>
-    <name>vblog-java</name>
+    <name>vueblog</name>
     <description>Demo project for Spring Boot</description>
 
     <properties>
@@ -30,18 +30,38 @@
             <scope>runtime</scope>
             <optional>true</optional>
         </dependency>
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+            <scope>runtime</scope>
+        </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
             <optional>true</optional>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.junit.vintage</groupId>
+                    <artifactId>junit-vintage-engine</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
 
         <!--mp-->
         <dependency>
             <groupId>com.baomidou</groupId>
             <artifactId>mybatis-plus-boot-starter</artifactId>
             <version>3.2.0</version>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-freemarker</artifactId>
+        </dependency>
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
@@ -55,13 +75,6 @@
             <version>3.2.0</version>
         </dependency>
 
-        <!-- 为了代码生成 -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-freemarker</artifactId>
-        </dependency>
-
-        <!-- shiro-redis -->
         <dependency>
             <groupId>org.crazycake</groupId>
             <artifactId>shiro-redis-spring-boot-starter</artifactId>
@@ -82,26 +95,15 @@
             <version>0.9.1</version>
         </dependency>
 
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
-            <scope>test</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.junit.vintage</groupId>
-                    <artifactId>junit-vintage-engine</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
     </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
+<!--    <build>-->
+<!--        <plugins>-->
+<!--            <plugin>-->
+<!--                <groupId>org.springframework.boot</groupId>-->
+<!--                <artifactId>spring-boot-maven-plugin</artifactId>-->
+<!--            </plugin>-->
+<!--        </plugins>-->
+<!--    </build>-->
 
 </project>
diff --git a/vueblog-java/src/main/java/com/markerhub/CodeGenerator.java b/vueblog-java/src/main/java/com/markerhub/CodeGenerator.java
@@ -53,7 +53,7 @@ public static void main(String[] args) {
 
         // 数据源配置
         DataSourceConfig dsc = new DataSourceConfig();
-        dsc.setUrl("jdbc:mysql://localhost:3306/markerhub?useUnicode=true&useSSL=false&characterEncoding=utf8&serverTimezone=UTC");
+        dsc.setUrl("jdbc:mysql://localhost:3306/vueblog?useUnicode=true&useSSL=false&characterEncoding=utf8&serverTimezone=UTC");
         // dsc.setSchemaName("public");
         dsc.setDriverName("com.mysql.cj.jdbc.Driver");
         dsc.setUsername("root");

diff --git a/.../main/java/com/markerhub/Application.java → ...ava/com/markerhub/VueblogApplication.java b/.../main/java/com/markerhub/Application.java → ...ava/com/markerhub/VueblogApplication.java
@@ -4,11 +4,10 @@
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
 @SpringBootApplication
-public class Application {
+public class VueblogApplication {
 
     public static void main(String[] args) {
-        SpringApplication.run(Application.class, args);
-        System.out.println("http://localhost:8081");
+        SpringApplication.run(VueblogApplication.class, args);
     }
 
 }
diff --git a/vueblog-java/src/main/java/com/markerhub/common/dto/LoginDto.java b/vueblog-java/src/main/java/com/markerhub/common/dto/LoginDto.java
@@ -1,6 +1,5 @@
 package com.markerhub.common.dto;
 
-import com.markerhub.entity.User;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;

diff --git a/...mon/exception/GlobalExcepitonHandler.java → ...mon/exception/GlobalExceptionHandler.java b/...mon/exception/GlobalExcepitonHandler.java → ...mon/exception/GlobalExceptionHandler.java
@@ -11,50 +11,38 @@
 import org.springframework.web.bind.annotation.ResponseStatus;
 import org.springframework.web.bind.annotation.RestControllerAdvice;
 
-import java.io.IOException;
-
-/**
- * 全局异常处理
- */
 @Slf4j
 @RestControllerAdvice
-public class GlobalExcepitonHandler {
+public class GlobalExceptionHandler {
 
-    // 捕捉shiro的异常
     @ResponseStatus(HttpStatus.UNAUTHORIZED)
-    @ExceptionHandler(ShiroException.class)
-    public Result handle401(ShiroException e) {
+    @ExceptionHandler(value = ShiroException.class)
+    public Result handler(ShiroException e) {
+        log.error("运行时异常：----------------{}", e);
         return Result.fail(401, e.getMessage(), null);
     }
 
-    /**
-     * 处理Assert的异常
-     */
-    @ResponseStatus(HttpStatus.BAD_REQUEST)
-    @ExceptionHandler(value = IllegalArgumentException.class)
-    public Result handler(IllegalArgumentException e) throws IOException {
-        log.error("Assert异常:-------------->{}",e.getMessage());
-        return Result.fail(e.getMessage());
-    }
-
-    /**
-     * @Validated 校验错误异常处理
-     */
     @ResponseStatus(HttpStatus.BAD_REQUEST)
     @ExceptionHandler(value = MethodArgumentNotValidException.class)
-    public Result handler(MethodArgumentNotValidException e) throws IOException {
-        log.error("运行时异常:-------------->",e);
-
+    public Result handler(MethodArgumentNotValidException e) {
+        log.error("实体校验异常：----------------{}", e);
         BindingResult bindingResult = e.getBindingResult();
         ObjectError objectError = bindingResult.getAllErrors().stream().findFirst().get();
+
         return Result.fail(objectError.getDefaultMessage());
     }
 
+    @ResponseStatus(HttpStatus.BAD_REQUEST)
+    @ExceptionHandler(value = IllegalArgumentException.class)
+    public Result handler(IllegalArgumentException e) {
+        log.error("Assert异常：----------------{}", e);
+        return Result.fail(e.getMessage());
+    }
 
     @ResponseStatus(HttpStatus.BAD_REQUEST)
     @ExceptionHandler(value = RuntimeException.class)
-    public Result handler(RuntimeException e) throws IOException {
-        log.error("运行时异常:-------------->",e);
+    public Result handler(RuntimeException e) {
+        log.error("运行时异常：----------------{}", e);
         return Result.fail(e.getMessage());
     }
 

diff --git a/vueblog-java/src/main/java/com/markerhub/common/lang/Result.java b/vueblog-java/src/main/java/com/markerhub/common/lang/Result.java
@@ -7,36 +7,36 @@
 @Data
 public class Result implements Serializable {
 
-    private int code;
+    private int code; // 200是正常，非200表示异常
     private String msg;
     private Object data;
 
     public static Result succ(Object data) {
-        return succ("操作成功", data);
+        return succ(200, "操作成功", data);
     }
 
-    public static Result succ(String mess, Object data) {
-        Result m = new Result();
-        m.setCode(200);
-        m.setData(data);
-        m.setMsg(mess);
-        return m;
+    public static Result succ(int code, String msg, Object data) {
+        Result r = new Result();
+        r.setCode(code);
+        r.setMsg(msg);
+        r.setData(data);
+        return r;
     }
 
-    public static Result fail(String mess) {
-        return fail(mess, null);
+    public static Result fail(String msg) {
+        return fail(400, msg, null);
     }
 
-    public static Result fail(String mess, Object data) {
-        return fail(400, mess, data);
+    public static Result fail(String msg, Object data) {
+        return fail(400, msg, data);
     }
 
-    public static Result fail(int code, String mess, Object data) {
-        Result m = new Result();
-        m.setCode(code);
-        m.setData(data);
-        m.setMsg(mess);
-        return m;
+    public static Result fail(int code, String msg, Object data) {
+        Result r = new Result();
+        r.setCode(code);
+        r.setMsg(msg);
+        r.setData(data);
+        return r;
     }
 
-}
+}
diff --git a/vueblog-java/src/main/java/com/markerhub/config/MybatisPlusConfig.java b/vueblog-java/src/main/java/com/markerhub/config/MybatisPlusConfig.java
@@ -16,4 +16,4 @@ public PaginationInterceptor paginationInterceptor() {
         PaginationInterceptor paginationInterceptor = new PaginationInterceptor();
         return paginationInterceptor;
     }
-}
+}
diff --git a/vueblog-java/src/main/java/com/markerhub/config/ShiroConfig.java b/vueblog-java/src/main/java/com/markerhub/config/ShiroConfig.java
@@ -2,34 +2,24 @@
 
 import com.markerhub.shiro.AccountRealm;
 import com.markerhub.shiro.JwtFilter;
-import io.jsonwebtoken.Jwt;
-import org.apache.shiro.mgt.DefaultSessionStorageEvaluator;
-import org.apache.shiro.mgt.DefaultSubjectDAO;
 import org.apache.shiro.mgt.SecurityManager;
 import org.apache.shiro.session.mgt.SessionManager;
-import org.apache.shiro.spring.LifecycleBeanPostProcessor;
-import org.apache.shiro.spring.security.interceptor.AuthorizationAttributeSourceAdvisor;
 import org.apache.shiro.spring.web.ShiroFilterFactoryBean;
 import org.apache.shiro.spring.web.config.DefaultShiroFilterChainDefinition;
 import org.apache.shiro.spring.web.config.ShiroFilterChainDefinition;
 import org.apache.shiro.web.mgt.DefaultWebSecurityManager;
 import org.apache.shiro.web.session.mgt.DefaultWebSessionManager;
 import org.crazycake.shiro.RedisCacheManager;
 import org.crazycake.shiro.RedisSessionDAO;
-import org.springframework.aop.framework.autoproxy.DefaultAdvisorAutoProxyCreator;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.DependsOn;
 
 import javax.servlet.Filter;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-/**
- * shiro启用注解拦截控制器
- */
 @Configuration
 public class ShiroConfig {
 
@@ -39,29 +29,24 @@ public class ShiroConfig {
     @Bean
     public SessionManager sessionManager(RedisSessionDAO redisSessionDAO) {
         DefaultWebSessionManager sessionManager = new DefaultWebSessionManager();
+
+        // inject redisSessionDAO
         sessionManager.setSessionDAO(redisSessionDAO);
         return sessionManager;
     }
 
     @Bean
     public DefaultWebSecurityManager securityManager(AccountRealm accountRealm,
-                                                     SessionManager sessionManager,
-                                                     RedisCacheManager redisCacheManager) {
+                                                   SessionManager sessionManager,
+                                                   RedisCacheManager redisCacheManager) {
+
         DefaultWebSecurityManager securityManager = new DefaultWebSecurityManager(accountRealm);
 
+        //inject sessionManager
         securityManager.setSessionManager(sessionManager);
-        securityManager.setCacheManager(redisCacheManager);
-
-        /*
-         * 关闭shiro自带的session，详情见文档
-         * http://shiro.apache.org/session-management.html#SessionManagement-StatelessApplications%28Sessionless%29
-         */
-        DefaultSubjectDAO subjectDAO = new DefaultSubjectDAO();
-        DefaultSessionStorageEvaluator defaultSessionStorageEvaluator = new DefaultSessionStorageEvaluator();
-        defaultSessionStorageEvaluator.setSessionStorageEnabled(false);
-        subjectDAO.setSessionStorageEvaluator(defaultSessionStorageEvaluator);
-        securityManager.setSubjectDAO(subjectDAO);
 
+        // inject redisCacheManager
+        securityManager.setCacheManager(redisCacheManager);
         return securityManager;
     }
 
@@ -70,12 +55,8 @@ public ShiroFilterChainDefinition shiroFilterChainDefinition() {
         DefaultShiroFilterChainDefinition chainDefinition = new DefaultShiroFilterChainDefinition();
 
         Map<String, String> filterMap = new LinkedHashMap<>();
-//        filterMap.put("/webjars/**", "anon");
-//        filterMap.put("/login", "anon");
-//        filterMap.put("/swagger/**", "anon");
-//        filterMap.put("/captcha.jpg", "anon");
 
-        filterMap.put("/**", "jwt"); // 主要通过注解方式校验权限
+        filterMap.put("/**", "jwt");
         chainDefinition.addPathDefinitions(filterMap);
         return chainDefinition;
     }
@@ -96,18 +77,4 @@ public ShiroFilterFactoryBean shiroFilterFactoryBean(SecurityManager securityMan
         return shiroFilter;
     }
 
-
-    // 开启注解代理
-    @Bean
-    public AuthorizationAttributeSourceAdvisor authorizationAttributeSourceAdvisor(SecurityManager securityManager){
-        AuthorizationAttributeSourceAdvisor authorizationAttributeSourceAdvisor = new AuthorizationAttributeSourceAdvisor();
-        authorizationAttributeSourceAdvisor.setSecurityManager(securityManager);
-        return authorizationAttributeSourceAdvisor;
-    }
-
-    @Bean
-    public static DefaultAdvisorAutoProxyCreator getDefaultAdvisorAutoProxyCreator() {
-        DefaultAdvisorAutoProxyCreator creator = new DefaultAdvisorAutoProxyCreator();
-        return creator;
-    }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -16,4 +16,4 @@ public PaginationInterceptor paginationInterceptor() { @@
             PaginationInterceptor paginationInterceptor = new PaginationInterceptor();
             return paginationInterceptor;
         }
-    }
+    }