Merge remote-tracking branch 'origin/alpha_cafas_v3.6.0.7_pl6_20221128_temp'…

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/pom.xml

@@ -53,18 +53,8 @@
         </dependency>
         <dependency>
             <groupId>com.yeejoin</groupId>
-            <artifactId>amos-component-authtoken</artifactId>
+            <artifactId>amos-component-security</artifactId>
             <version>1.7.13-SNAPSHOT</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.typroject</groupId>
-                    <artifactId>*</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>io.springfox</groupId>
-                    <artifactId>*</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
     </dependencies>
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/remote/RemoteSecurityService.java

@@ -9,7 +9,7 @@ import java.util.concurrent.TimeUnit;
 
 import javax.servlet.http.HttpServletRequest;
 
-import com.yeejoin.amos.component.authtoken.robot.AmosRequestContext;
+import com.yeejoin.amos.component.robot.AmosRequestContext;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.redis.core.RedisTemplate;

amos-boot-system-equip/src/main/java/com/yeejoin/amos/WebSecurityConfig.java

-package com.yeejoin.amos;
-
-import org.springframework.context.annotation.Configuration;
-import org.springframework.security.config.annotation.web.builders.HttpSecurity;
-import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
-
-@Configuration
-@EnableWebSecurity
-
-public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
-    // 授权
-    @Override
-    protected void configure(HttpSecurity http) throws Exception {
-        http.csrf().disable()
-                .headers()
-                .frameOptions()
-                .disable()
-                .and()
-                .authorizeRequests()
-                .regexMatchers("^(?!/actuator).*$").permitAll()
-                .regexMatchers("/actuator/health").permitAll()
-                .regexMatchers("/actuator/info").permitAll()
-                .anyRequest().authenticated().and()
-                .formLogin();
-    }
-}

amos-boot-system-jcs/src/main/java/com/yeejoin/amos/WebSecurityConfig.java

-package com.yeejoin.amos;
-
-import org.springframework.context.annotation.Configuration;
-import org.springframework.security.config.annotation.web.builders.HttpSecurity;
-import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
-
-@Configuration
-@EnableWebSecurity
-
-public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
-    // 授权
-    @Override
-    protected void configure(HttpSecurity http) throws Exception {
-        http.csrf().disable()
-                .headers()
-                .frameOptions()
-                .disable()
-                .and()
-                .authorizeRequests()
-                .regexMatchers("^(?!/actuator).*$").permitAll()
-                .regexMatchers("/actuator/health").permitAll()
-                .regexMatchers("/actuator/info").permitAll()
-                .anyRequest().authenticated().and()
-                .formLogin();
-    }
-}