bump version

.github/workflows/CI.yml

@@ -23,7 +23,7 @@ jobs:
         shell: cmd
         run: |
           cd .\src\client
-          sed -e "s/\"\[v.*semver$/\"[test-${{ github.sha }}]\"/" -i.bak yobot.py
+          sed -e "s/\"\[v.*semver$/\"[test-$(git rev-list --count HEAD)-${{ github.sha }}]\"/" -i.bak yobot.py
           pip install -r requirements.txt
           pip install pyinstaller
           PYTHONOPTIMIZE=0

src/client/public/template/admin/setting.html

@@ -24,7 +24,9 @@ <h1>yobot设置</h1>
       </el-form-item>
       <el-form-item>
         <el-button type="info" @click="setting.public_address = window.location.origin+'/'">填入当前地址</el-button>
+        <!--
         <el-button type="info" @click="domainApply = true">获取 yobot 域名</el-button>
+        -->
       </el-form-item>
       <el-dialog title="申请yobot域名" :visible.sync="domainApply">
         <el-form>

src/client/ybplugins/web_util.py

@@ -37,12 +37,12 @@ async def wrapper(*args, nocache=False):  # args must be hashable
 
 
 @async_cached_func(128)
-async def _ip_location(ip):
+async def _ip_location(ip) -> str:
     async with aiohttp.request("GET", url=f'http://freeapi.ipip.net/{ip}') as response:
         if response.status != 200:
             raise ServerError(f'http code {response.status} from ipip.net')
         res = await response.json()
-    return res
+    return ''.join(res)
 
 
 class WebUtil:
@@ -82,8 +82,8 @@ async def yobot_api_iplocation():
             try:
                 location = await _ip_location(ip)
             except:
-                location = ['unknown']
-            return jsonify(location)
+                location = 'unknown'
+            return jsonify([location])
 
         @app.route(
             urljoin(self.setting['public_basepath'], 'api/get-domain/'),

src/client/yobot.py

@@ -33,8 +33,8 @@
 
 
 class Yobot:
-    Version = "[v3.6.8]"  # semver
-    Version_id = 225
+    Version = "[v3.6.9]"  # semver
+    Version_id = 239
     #  "git rev-list --count HEAD"
 
     def __init__(self, *,