From 06406df998e0c97014f79c569c1c79a9ce50bf39 Mon Sep 17 00:00:00 2001
From: "feihu.wang" <wangfeihu@xforceplus.com>
Date: Sat, 30 Jan 2021 13:33:32 +0800
Subject: [PATCH] opts: update path. feihu wang

---
 pom.xml                                                     | 2 +-
 .../com/pgmmers/radar/controller/SysLoginApiController.java | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 635957c..da2c504 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@
     </parent>
     <groupId>com.pgmmers</groupId>
     <artifactId>radar</artifactId>
-    <version>1.0.6-SNAPSHOT</version>
+    <version>1.0.7-SNAPSHOT</version>
     <name>radar</name>
     <description>Demo project for Spring Boot</description>
     <packaging>pom</packaging>
diff --git a/radar-admin/src/main/java/com/pgmmers/radar/controller/SysLoginApiController.java b/radar-admin/src/main/java/com/pgmmers/radar/controller/SysLoginApiController.java
index 13d128c..dd6cd0e 100644
--- a/radar-admin/src/main/java/com/pgmmers/radar/controller/SysLoginApiController.java
+++ b/radar-admin/src/main/java/com/pgmmers/radar/controller/SysLoginApiController.java
@@ -55,7 +55,7 @@ public class SysLoginApiController {
     @Autowired
     private CacheService cacheService;
 
-    @PostMapping("/merchant/login")
+    @PostMapping("/user/login")
     public CommonResult login(String loginName, String passwd, String captcha) {
         CommonResult ret = new CommonResult();
         ret.setSuccess(false);
@@ -94,7 +94,7 @@ public class SysLoginApiController {
         return ret;
     }
 
-    @GetMapping("/merchant/logout")
+    @GetMapping("/user/logout")
 	public CommonResult logout(HttpServletRequest request) {
 		CommonResult ret = new CommonResult();
         String accessToken = contextHolder.getAttributeByType("x-auth-token", String.class);
@@ -109,7 +109,7 @@ public class SysLoginApiController {
      * @return
      * @author xushuai
      */
-    @PostMapping("/merchant/regist")
+    @PostMapping("/user/regist")
     public CommonResult regist(String loginName, String passwd, String verifyPasswd, String captcha, String giteeAccount) {
         CommonResult result = new CommonResult();