Selaa lähdekoodia

整合常量类,迁移注册、校验手机号、校验用户名接口到/open下

zengxj 6 vuotta sitten
vanhempi
commit
2450500110

+ 1 - 1
src/main/java/edu/math/diagnosis/config/WebSecurityConfig.java

@@ -127,7 +127,7 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
         web.ignoring().antMatchers("/resources/**", "/static/**", "/**.js");
         web.ignoring().antMatchers(uploadProperties.getUploadPattern());
         web.ignoring().antMatchers("/**/*.js", "/lang/*.json", "/**/*.css", "/**/*.map", "/**/*.png", "/**/*.jpg");
-        web.ignoring().antMatchers("/user/**");
+        web.ignoring().antMatchers("/open/**");
         web.ignoring().antMatchers("/v2/api-docs",//swagger api json
                 "/swagger-resources/configuration/ui",//用来获取支持的动作
                 "/swagger-resources",//用来获取api-docs的URI

+ 39 - 0
src/main/java/edu/math/diagnosis/controller/OpenController.java

@@ -0,0 +1,39 @@
+package edu.math.diagnosis.controller;
+
+import edu.math.diagnosis.entity.UserInfo;
+import edu.math.diagnosis.service.UserService;
+import edu.math.diagnosis.util.Constants;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+@Api(tags = "开放接口")
+@RestController
+@RequestMapping("/open")
+public class OpenController {
+
+    @Resource
+    private UserService userService;
+
+    @ApiOperation("注册")
+    @PostMapping(value = "/user/register")
+    public Long register(@RequestBody UserInfo user) {
+        user.setUserType(Constants.USER_TYPE_STUDENT);
+        return userService.addUser(user);
+    }
+
+    @ApiOperation(value = "校验手机号码是否可用(已被注册)", notes = "true : 可用 false : 不可用")
+    @GetMapping(value = "/user/checkPhone")
+    public boolean checkPhone(@RequestParam String phone) {
+        return userService.checkPhone(phone);
+    }
+
+    @ApiOperation(value = "校验用户名是否可用(已被注册)", notes = "true : 可用 false : 不可用")
+    @GetMapping(value = "/user/checkUsername")
+    public boolean checkUsername(@RequestParam String username) {
+        return userService.checkUsername(username);
+    }
+
+}

+ 3 - 13
src/main/java/edu/math/diagnosis/controller/UserManagerController.java

@@ -2,7 +2,7 @@ package edu.math.diagnosis.controller;
 
 import edu.math.diagnosis.entity.UserInfo;
 import edu.math.diagnosis.service.UserService;
-import io.swagger.annotations.ApiOperation;
+import edu.math.diagnosis.util.Constants;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -17,10 +17,11 @@ import java.util.Date;
 @RequestMapping("/user")
 public class UserManagerController {
     @Resource
-    UserService userService;
+    private UserService userService;
 
     @PostMapping(value = "/add")
     public Long addUser(@RequestBody UserInfo user) {
+        user.setUserType(Constants.USER_TYPE_ADMIN);
         return userService.addUser(user);
     }
 
@@ -29,15 +30,4 @@ public class UserManagerController {
         return new Date() + "";
     }
 
-    @ApiOperation(value = "校验手机号码是否可用(已被注册)", notes = "true : 可用 false : 不可用")
-    @GetMapping(value = "/checkPhone")
-    public boolean checkPhone(@RequestParam String phone) {
-        return userService.checkPhone(phone);
-    }
-
-    @ApiOperation(value = "校验用户名是否可用(已被注册)", notes = "true : 可用 false : 不可用")
-    @GetMapping(value = "/checkUsername")
-    public boolean checkUsername(@RequestParam String username) {
-        return userService.checkUsername(username);
-    }
 }

+ 1 - 1
src/main/java/edu/math/diagnosis/model/AuthUser.java

@@ -1,7 +1,7 @@
 package edu.math.diagnosis.model;
 
-import edu.math.diagnosis.config.Constants;
 import edu.math.diagnosis.entity.UserInfo;
+import edu.math.diagnosis.util.Constants;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.userdetails.UserDetails;

+ 12 - 1
src/main/java/edu/math/diagnosis/util/Constants.java

@@ -1,6 +1,8 @@
 package edu.math.diagnosis.util;
 
 
+import org.springframework.security.core.authority.SimpleGrantedAuthority;
+
 import java.util.HashMap;
 import java.util.Map;
 
@@ -63,5 +65,14 @@ public class Constants {
         }
     };
 
-//            SUBJECT_MAS,SUBJECT_PYS,SUBJECT_CHE,SUBJECT_BIO,SUBJECT_HST,SUBJECT_GEO,SUBJECT_ENG,SUBJECT_POL,SUBJECT_EMO}};
+    public static final String USER_TYPE_ADMIN = "admin";
+    public static final String USER_TYPE_STUDENT = "student";
+    public static final String USER_TYPE_TEACHER = "teacher";
+    public static final String USER_TYPE_GUEST = "guest";
+
+    public static final SimpleGrantedAuthority USER_ADMIN = new SimpleGrantedAuthority(USER_TYPE_ADMIN);
+    public static final SimpleGrantedAuthority USER_TEACHER = new SimpleGrantedAuthority(USER_TYPE_TEACHER);
+    public static final SimpleGrantedAuthority USER_STUDENT = new SimpleGrantedAuthority(USER_TYPE_STUDENT);
+    public static final SimpleGrantedAuthority USER_GUEST = new SimpleGrantedAuthority(USER_TYPE_GUEST);
+
 }