Merge remote-tracking branch 'origin/master'

# Conflicts:
#	ruoyi-admin/src/main/resources/templates/scada/NorthFoamerMesPlan.html
#	ruoyi-admin/src/main/resources/templates/scada/NorthFoamerMesPlan2.html

ruoyi-admin/src/main/resources/application-druid.yml

@@ -23,7 +23,7 @@ spring:
 #                username: system
 #                password: aucma
                 url: jdbc:oracle:thin:@10.100.71.119:1521:ORCL
-                username: system
+                username: scada
                 password: aucma
             # 从库数据源
             slave:

ruoyi-admin/src/main/resources/application.yml

@@ -16,7 +16,7 @@ ruoyi:
 # 开发环境配置
 server:
   # 服务器的HTTP端口，正式端口8012
-  port: 8013
+  port: 8012
   servlet:
     # 应用的访问路径
     context-path: /
@@ -138,4 +138,4 @@ swagger:
   # 是否开启swagger
   enabled: true
 
-in_id: 2
+in_id: 1

ruoyi-framework/src/main/java/com/ruoyi/framework/config/InterceptorConfig.java

@@ -9,6 +9,6 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 public class InterceptorConfig implements WebMvcConfigurer {
     @Override
     public void addInterceptors(InterceptorRegistry registry) {
-        registry.addInterceptor(new AInterceptor()).addPathPatterns("/**");
+        //registry.addInterceptor(new AInterceptor()).addPathPatterns("/**");
     }
 }