diff --git a/AxibugEmuOnline.Server/Manager/LoginManager.cs b/AxibugEmuOnline.Server/Manager/LoginManager.cs
index ac7cf0f7..f88db02a 100644
--- a/AxibugEmuOnline.Server/Manager/LoginManager.cs
+++ b/AxibugEmuOnline.Server/Manager/LoginManager.cs
@@ -265,12 +265,15 @@ namespace AxibugEmuOnline.Server.Manager
             ProtoBufHelper.DeSerizlize<Protobuf_Token_Struct>(protobufData);
             byte[] encryptData = AESHelper.Encrypt(protobufData);
             string tobase64 = Convert.ToBase64String(encryptData);
-            return tobase64;
+            AppSrv.g_Log.Debug("token_base64=>" + tobase64);
+            string result = Uri.EscapeDataString(tobase64);
+            AppSrv.g_Log.Debug("token_urlcode=>" + result);
+            return result;
         }
 
         static Protobuf_Token_Struct DecrypToken(string tokenStr)
         {
-           byte[] encryptData = Convert.FromBase64String(tokenStr);
+            byte[] encryptData = Convert.FromBase64String(tokenStr);
             byte[] decryptData = AESHelper.Decrypt(encryptData);
             return ProtoBufHelper.DeSerizlize<Protobuf_Token_Struct>(decryptData);
         }
diff --git a/AxibugEmuOnline.Web/Controllers/ApiController.cs b/AxibugEmuOnline.Web/Controllers/ApiController.cs
index 86525b62..fed3d27f 100644
--- a/AxibugEmuOnline.Web/Controllers/ApiController.cs
+++ b/AxibugEmuOnline.Web/Controllers/ApiController.cs
@@ -114,7 +114,7 @@ namespace AxibugEmuOnline.Web.Controllers
 
                 if (UID > 0)
                 {
-                    query = $"SELECT r.id,r.`Name`,r.GameType,r.Note,r.RomUrl,r.ImgUrl,r.`Hash`,r.`playcount`,r.`stars`,r.`PlatformType`,r.`parentids`,IF(s.uid IS NOT NULL, TRUE, FALSE) AS is_collected FROM romlist r left join rom_stars s on r.id = s.romid {GetWhereCmd(condition)} {HotOrderBy} LIMIT ?offset, ?pageSize;";
+                    query = $"SELECT r.id,r.`Name`,r.GameType,r.Note,r.RomUrl,r.ImgUrl,r.`Hash`,r.`playcount`,r.`stars`,r.`PlatformType`,r.`parentids`,IF(s.uid = {UID}, TRUE, FALSE) AS is_collected FROM romlist r left join rom_stars s on r.id = s.romid {GetWhereCmd(condition)} {HotOrderBy} LIMIT ?offset, ?pageSize;";
                 }
                 else
                 {