Pre Merge pull request !1 from Quieter/master

.gitignore

@@ -41,3 +41,5 @@ nbdist/
 !*/build/*.java
 !*/build/*.html
 !*/build/*.xml
+/**/src/main/resources/.triggerFile
+/**/**/src/main/resources/.triggerFile

pom.xml

@@ -203,6 +203,20 @@
                 <version>${ruoyi.version}</version>
             </dependency>
 
+            <dependency>
+                <groupId>com.alibaba</groupId>
+                <artifactId>druid-spring-boot-starter</artifactId>
+                <version>1.1.14</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.projectlombok</groupId>
+                <artifactId>lombok</artifactId>
+                <version>1.18.10</version>
+            </dependency>
+
+
+			
         </dependencies>
     </dependencyManagement>
 

ruoyi-api/ruoyi-api-system/pom.xml

@@ -23,6 +23,11 @@
             <artifactId>ruoyi-common-core</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>druid-spring-boot-starter</artifactId>
+        </dependency>
+        
     </dependencies>
 
 </project>

ruoyi-auth/pom.xml

@@ -58,6 +58,17 @@
             <artifactId>ruoyi-common-redis</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>druid-spring-boot-starter</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-devtools</artifactId>
+            <scope>runtime</scope>
+            <optional>true</optional>
+        </dependency>
     </dependencies>
    
 </project>

ruoyi-auth/src/main/java/com/ruoyi/auth/config/WebSecurityConfig.java

@@ -50,6 +50,8 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter
     @Override
     protected void configure(HttpSecurity http) throws Exception
     {
+        http.httpBasic().disable();
+
         http
         .authorizeRequests()
         .antMatchers(
@@ -57,6 +59,7 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter
             "/token/**").permitAll()
         .anyRequest().authenticated()
         .and().csrf().disable();
+
     }
 
     /*** 设置不拦截规则 */

ruoyi-auth/src/main/java/com/ruoyi/auth/handler/AuthenticationFailureEvenHandler.java

@@ -17,7 +17,7 @@ import com.ruoyi.common.security.handler.AbstractAuthenticationFailureEvenHandle
 @Component
 public class AuthenticationFailureEvenHandler extends AbstractAuthenticationFailureEvenHandler
 {
-    private final Logger logger = LoggerFactory.getLogger(AuthenticationSuccessEventHandler.class);
+    private final Logger logger = LoggerFactory.getLogger(AuthenticationFailureEvenHandler.class);
 
     @Override
     public void handle(AuthenticationException authenticationException, Authentication authentication)

ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/component/RyResourceServerConfigurerAdapter.java

@@ -17,8 +17,7 @@ public class RyResourceServerConfigurerAdapter extends ResourceServerConfigurerA
     @Autowired
     protected ResourceAuthExceptionEntryPoint resourceAuthExceptionEntryPoint;
 
-    @Autowired
+    protected RemoteTokenServices remoteTokenServices = new RemoteTokenServices();
-    protected RemoteTokenServices remoteTokenServices;
 
     @Autowired
     private AccessDeniedHandler accessDeniedHandler;

ruoyi-gateway/pom.xml

@@ -40,6 +40,11 @@
             <artifactId>spring-boot-starter-actuator</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-webflux</artifactId>
+        </dependency>
+        
         <!--验证码 -->
         <dependency>
             <groupId>com.github.penggle</groupId>
@@ -64,6 +69,18 @@
             <version>${swagger.fox.version}</version>
         </dependency>
 
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-devtools</artifactId>
+            <scope>runtime</scope>
+            <optional>true</optional>
+        </dependency>
+        
     </dependencies>
    
 </project>

ruoyi-gateway/src/main/resources/bootstrap.yml

@@ -22,3 +22,12 @@ spring:
         file-extension: yml
         # 共享配置
         shared-dataids: application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+    gateway:
+      routes:
+        - id: authRoute
+          uri: lb://ruoyi-auth
+          order: 10000
+          predicates:
+            - Path=/auth/**
+          filters:
+            - StripPrefix=1

ruoyi-modules/ruoyi-job/pom.xml

@@ -84,5 +84,16 @@
             <artifactId>ruoyi-common-swagger</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.mybatis.spring.boot</groupId>
+            <artifactId>mybatis-spring-boot-starter</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-devtools</artifactId>
+            <scope>runtime</scope>
+            <optional>true</optional>
+        </dependency>
     </dependencies>
 </project>

ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/RuoYiJobApplication.java

@@ -1,11 +1,13 @@
 package com.ruoyi.job;
 
+import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.cloud.client.SpringCloudApplication;
 import com.ruoyi.common.security.annotation.EnableCustomConfig;
 import com.ruoyi.common.security.annotation.EnableRyFeignClients;
 import com.ruoyi.common.security.annotation.EnableRyResourceServer;
 import com.ruoyi.common.swagger.annotation.EnableCustomSwagger2;
+import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 
 /**
  * 定时任务
@@ -17,6 +19,7 @@ import com.ruoyi.common.swagger.annotation.EnableCustomSwagger2;
 @EnableRyFeignClients
 @EnableRyResourceServer
 @SpringCloudApplication
+@EnableDiscoveryClient
 public class RuoYiJobApplication
 {
     public static void main(String[] args)

ruoyi-modules/ruoyi-job/src/main/resources/bootstrap.yml

@@ -22,3 +22,7 @@ spring:
         file-extension: yml
         # 共享配置
         shared-dataids: application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+
+mybatis:
+  mapper-locations: classpath*:/**/*Mapper.xml
+  type-aliases-package: com.ruoyi.job.domain

ruoyi-modules/ruoyi-system/pom.xml

@@ -78,5 +78,11 @@
             <artifactId>ruoyi-common-swagger</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-devtools</artifactId>
+            <scope>runtime</scope>
+            <optional>true</optional>
+        </dependency>
     </dependencies>
 </project>

ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml

@@ -1,6 +1,6 @@
 # Tomcat
 server:
-  port: 9201
+  port: 80
 
 # Spring
 spring: 

ruoyi-ui/vue.config.js

@@ -36,7 +36,7 @@ module.exports = {
         target: `http://localhost:8080`,
         changeOrigin: true,
         pathRewrite: {
-          ['^' + process.env.VUE_APP_BASE_API]: ''
+          ['^' + process.env.VUE_APP_BASE_API]: '/'
         }
       }
     },