Merge remote-tracking branch 'origin/refactor-get-version' into refac…

…tor-get-version
Zzm0809 · Nov 4, 2024 · cbd6616 · cbd6616
2 parents 4d45f97 + 1c03f6f
commit cbd6616
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 9 deletions.
diff --git a/dinky-admin/src/main/java/org/dinky/controller/AdminController.java b/dinky-admin/src/main/java/org/dinky/controller/AdminController.java
@@ -134,7 +134,8 @@ public Result<SaTokenInfo> getTokenInfo() {
     @ApiOperation(value = "Query Service Version", notes = "Query Dinky Service Version Number")
     @ApiImplicitParam(name = "isExternalCall", value = "isExternalCall", dataTypeClass = Boolean.class)
     @SaCheckLogin
-    public Result<Object> getVersionInfo(@RequestParam(required = false,defaultValue = "true") boolean isExternalCall) {
+    public Result<Object> getVersionInfo(
+            @RequestParam(required = false, defaultValue = "true") boolean isExternalCall) {
         if (isExternalCall) {
             return Result.succeed((Object) DinkyVersion.getShortVersion());
         }

diff --git a/dinky-web/src/pages/Other/Login/function.tsx b/dinky-web/src/pages/Other/Login/function.tsx
@@ -47,15 +47,17 @@ export const redirectToLogin = (tipMsg: string) => {
 export const initSomeThing = () => {
   //  initialize setting theme
   setLocalThemeToStorage();
-  queryDataByParams<string>(API_CONSTANTS.GET_SERVICE_VERSION, {isExternalCall: false}).then((result) => {
-    if (result && result != getValueFromLocalStorage(SERVER_VERSION)) {
-      console.log('current version:', getValueFromLocalStorage(SERVER_VERSION));
-      console.log('update server version:', result);
-      setKeyToLocalStorage(SERVER_VERSION, result);
-      console.log('clean dva cache');
-      window.localStorage.removeItem('persist:root');
+  queryDataByParams<string>(API_CONSTANTS.GET_SERVICE_VERSION, { isExternalCall: false }).then(
+    (result) => {
+      if (result && result != getValueFromLocalStorage(SERVER_VERSION)) {
+        console.log('current version:', getValueFromLocalStorage(SERVER_VERSION));
+        console.log('update server version:', result);
+        setKeyToLocalStorage(SERVER_VERSION, result);
+        console.log('clean dva cache');
+        window.localStorage.removeItem('persist:root');
+      }
     }
-  });
+  );
 
   // Retrieve the key for enabling message prompts from the local storage, and if not, set it accordingly
   if (hasKeyofLocalStorage(ENABLE_MODEL_TIP)) {