浏览代码

添加全局前缀

lrf 9 月之前
父节点
当前提交
0f98476a23

+ 1 - 1
src/main/java/com/free/InterceptorConfig.java

@@ -14,7 +14,7 @@ public class InterceptorConfig implements WebMvcConfigurer {
   public void addInterceptors(InterceptorRegistry registry) {
     registry.addInterceptor(authenticationInterceptor())
         .addPathPatterns("/**")
-        .excludePathPatterns("/kf/login/**", "/kf/logout", "/swagger**/**", "/webjars/**", "/v3/**", "/doc.html");
+        .excludePathPatterns("/swagger**/**", "/webjars/**", "/v3/**", "/doc.html");
   }
 
   @Override

+ 23 - 2
src/main/java/com/free/Main.java

@@ -1,17 +1,38 @@
 package com.free;
 
+import java.io.IOException;
+import java.util.Properties;
+
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration;
 import org.springframework.context.annotation.ComponentScan;
+import org.springframework.core.io.ClassPathResource;
 
 @MapperScan({ "com.free.mapper", "com.gitee.sunchenbin.mybatis.actable.dao.*" })
 @ComponentScan(basePackages = { "com.free", "com.gitee.sunchenbin.mybatis.actable.manager.*" })
-@SpringBootApplication
+@SpringBootApplication(exclude = { SecurityAutoConfiguration.class })
 public class Main {
+
   public static void main(String[] args) {
     SpringApplication.run(Main.class, args);
     System.out.println("swagger:");
-    System.out.println("http://localhost:4001/swagger-ui/index.html");
+    Properties properties = readProperties("application.yml");
+    String contextPath = properties.getProperty("context-path", "");
+    System.out.println("http://localhost:4001" + contextPath + "/swagger-ui/index.html");
+  }
+
+  private static Properties readProperties(String... confFile) {
+    final Properties properties = new Properties();
+    try {
+      for (String path : confFile) {
+        final ClassPathResource resource = new ClassPathResource(path);
+        properties.load(resource.getInputStream());
+      }
+    } catch (IOException e) {
+      e.printStackTrace();
+    }
+    return properties;
   }
 }

+ 1 - 0
src/main/java/com/free/SecurityConfig.java

@@ -37,6 +37,7 @@ public class SecurityConfig {
         // .cors().and()
         // 禁用CSRF,因为不使用 session,前后端分离项目不需要
         .csrf().disable()
+        .logout().disable()
         // 禁用session,前后端分离项目基于token不需要
         .sessionManagement(AbstractHttpConfigurer::disable)
         .authorizeRequests(

+ 4 - 2
src/main/java/com/free/controller/LoginController.java

@@ -18,6 +18,7 @@ import org.springframework.web.bind.annotation.RestController;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.ArrayNode;
+import com.free.annotation.PassToken;
 import com.free.dto.LoginDTO;
 import com.free.dto.PasswordUpdateDTO;
 import com.free.entity.system.Admin;
@@ -59,8 +60,9 @@ public class LoginController {
   @Autowired
   private RoleService roleService;
 
+  @PassToken
   @ApiOperation("客服服务登录")
-  @PostMapping("/kf/login/{type}")
+  @PostMapping("/login/{type}")
   public Object login(@PathVariable String type, @RequestBody @Valid LoginDTO data) {
     Map<String, Object> userInfo = null;
     if (this.adminLoginType.equals(type)) {
@@ -100,7 +102,7 @@ public class LoginController {
   }
 
   @ApiOperation("客服服务登出")
-  @PostMapping("/kf/logout")
+  @PostMapping("/logout")
   public Object logout() {
     // 获取token,然后注销
     String token = JwtUtil.getToken();

+ 3 - 1
src/main/resources/application.yml

@@ -1,5 +1,7 @@
 server:
   port: 4001
+  servlet:
+    context-path: /customer/api
 
 spring:
   datasource:
@@ -33,7 +35,7 @@ spring:
       allow_unquoted_control_chars: true
       #允许出现单引号
       allow_single_quotes: true
-      
+
 mybatis:
   table:
     auto: update