🎨 R.OK() and R.NG()

trydofor · Aug 24, 2023 · eb321a1 · eb321a1
1 parent ae7edc5
commit eb321a1
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 10 deletions.
diff --git a/...le/winx-admin/src/main/java/com/moilioncircle/wings/admin/controller/AdminController.java b/...le/winx-admin/src/main/java/com/moilioncircle/wings/admin/controller/AdminController.java
@@ -22,9 +22,9 @@ public class AdminController {
     private WarlockUserAuthnService authnService;
 
     @PostMapping("/admin/disable-root.json")
-    public R<Boolean> rootNeverLogin() {
+    public R<Void> rootNeverLogin() {
         authnService.disable(DefaultUserId.Root, WarlockAuthType.USERNAME);
         log.info("disable root");
-        return R.ok();
+        return R.OK;
     }
 }
diff --git a/observe/docs b/observe/docs
diff --git a/observe/mirana b/observe/mirana
diff --git a/...shadow/src/main/java/pro/fessional/wings/warlock/controller/auth/LoginPageController.java b/...shadow/src/main/java/pro/fessional/wings/warlock/controller/auth/LoginPageController.java
@@ -143,7 +143,7 @@ public ResponseEntity<R<?>> nonceCheck(@RequestHeader("token") String token, Htt
         if (sid == null) {
             return ResponseEntity
                     .status(HttpStatus.UNAUTHORIZED)
-                    .body(R.ng());
+                    .body(R.NG);
         }
         else {
             final R<?> r;

diff --git a/...hadow/src/main/java/pro/fessional/wings/warlock/controller/user/AuthedUserController.java b/...hadow/src/main/java/pro/fessional/wings/warlock/controller/user/AuthedUserController.java
@@ -81,7 +81,7 @@ public static class Dto {
     @PostMapping(value = "${" + WarlockUrlmapProp.Key$userAuthedUser + "}")
     public R<Dto> authedUser(HttpServletRequest request) {
         final WingsUserDetails wd = SecurityContextUtil.getUserDetails(false);
-        if (wd == null) return R.ng();
+        if (wd == null) return R.NG();
 
         Dto dto = new Dto();
         fillDetail(wd, dto);
@@ -136,7 +136,7 @@ public static class Ins {
     @PostMapping(value = "${" + WarlockUrlmapProp.Key$userAuthedPerm + "}")
     public R<Set<String>> authedPerm(HttpServletRequest request, @RequestBody Ins ins) {
         final WingsUserDetails wd = SecurityContextUtil.getUserDetails(false);
-        if (wd == null) return R.ng();
+        if (wd == null) return R.NG();
 
         final Set<String> ck = ins.getCheck();
         final Set<String> pm = wd.getAuthorities().stream()
@@ -163,7 +163,7 @@ public R<Set<String>> authedPerm(HttpServletRequest request, @RequestBody Ins in
         if (alias == null) alias = Collections.emptyMap();
 
         if (perms.isEmpty() && alias.isEmpty()) {
-            return R.ok();
+            return R.OK();
         }
 
         // alias over perms
@@ -205,7 +205,7 @@ public static class Ses extends Dto {
     @PostMapping(value = "${" + WarlockUrlmapProp.Key$userListSession + "}")
     public R<List<Ses>> listSession() {
         final WingsUserDetails details = SecurityContextUtil.getUserDetails(false);
-        if (details == null) return R.ng();
+        if (details == null) return R.NG();
 
         final List<MapSession> sessions = wingsSessionHelper.findByUserId(details.getUserId());
         final List<Ses> sess = sessions.stream().map(it -> {

diff --git a/...hadow/src/test/java/pro/fessional/wings/warlock/controller/other/TestOtherController.java b/...hadow/src/test/java/pro/fessional/wings/warlock/controller/other/TestOtherController.java
@@ -93,6 +93,6 @@ public R<?> watching() throws InterruptedException {
         watchingService.asyncAwait();
         watchingService.normalFetch();
         watchingService.errorFetch();
-        return R.ok();
+        return R.OK;
     }
 }
+21 −0		src/0-wings/0j-code-pattern.md
+1 −1		src/3-slardar/3d-i18n-zone.md
+26 −0		src/4-warlock/4f-api-oauth.md
+21 −0		src/zh/0-wings/0j-code-pattern.md
+1 −1		src/zh/3-slardar/3d-i18n-zone.md
+26 −0		src/zh/4-warlock/4f-api-oauth.md