Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
0a3ce9df58
|
|
@ -11,7 +11,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
|
||||||
import org.springframework.web.bind.annotation.RestController;
|
import org.springframework.web.bind.annotation.RestController;
|
||||||
|
|
||||||
@RestController
|
@RestController
|
||||||
@RequestMapping("/auth")
|
@RequestMapping("/common/auth")
|
||||||
public class AuthController extends BaseController {
|
public class AuthController extends BaseController {
|
||||||
@Autowired
|
@Autowired
|
||||||
private Config config;
|
private Config config;
|
||||||
|
|
@ -25,8 +25,16 @@ public class AuthController extends BaseController {
|
||||||
}
|
}
|
||||||
@RequestMapping("get")
|
@RequestMapping("get")
|
||||||
@NoAuthCheck
|
@NoAuthCheck
|
||||||
public Result<JSONObject> get() {
|
public Result<String> get() {
|
||||||
String cert=config.get("common","cert");
|
String cert=config.get("common","cert");
|
||||||
return success(JSONObject.parseObject(cert));
|
return success(cert);
|
||||||
|
}
|
||||||
|
|
||||||
|
@RequestMapping("check")
|
||||||
|
@NoAuthCheck
|
||||||
|
public Result<JSONObject> check(){
|
||||||
|
String cert=config.get("common","cert");
|
||||||
|
String data= RsaUtil.decryp(cert);
|
||||||
|
return success(JSONObject.parseObject(data));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue