|
|
@@ -18,6 +18,7 @@ import org.springframework.security.core.Authentication;
|
|
|
import org.springframework.security.core.authority.SimpleGrantedAuthority;
|
|
|
import org.springframework.web.bind.annotation.PostMapping;
|
|
|
import org.springframework.web.bind.annotation.RequestMapping;
|
|
|
+import org.springframework.web.bind.annotation.RequestParam;
|
|
|
import org.springframework.web.bind.annotation.RestController;
|
|
|
|
|
|
import java.util.HashMap;
|
|
|
@@ -76,7 +77,8 @@ public class AuthenticationController {
|
|
|
|
|
|
@PostMapping("/maLogin")
|
|
|
@ApiOperation(value = "小程序登录")
|
|
|
- public Map<String, String> maLogin(String code, Long parent, Boolean expert) {
|
|
|
+ public Map<String, String> maLogin(@RequestParam String code, @RequestParam(required = false) Long parent,
|
|
|
+ @RequestParam(defaultValue = "false") Boolean expert) {
|
|
|
try {
|
|
|
Map<String, String> map = new HashMap<>();
|
|
|
User user = userService.loginMa(code, parent, expert);
|