fix ua type问题

2025-02-23 04:11:36 +02:00 · 2023-05-21 13:24:26 +08:00
parent 74087493bb
commit 81d0471067
4 changed files with 50 additions and 44 deletions
--- a/app_chatgpt/models/mail_channel.py
+++ b/app_chatgpt/models/mail_channel.py
@@ -65,7 +65,9 @@ class Channel(models.Model):
        param = self.get_ai_config(ai)
        res, usage, is_ai = ai.get_ai(messages, author_id, answer_id, param)
        if res:
-            res = res.replace('\n', '<br/>')
+            if self.get_ua_type() != 'wxweb':
+                # 处理当微信语音返回时，是直接回文本信息，不需要转换回车
+                res = res.replace('\n', '<br/>')
            new_msg = channel.with_user(user_id).message_post(body=res, message_type='comment', subtype_xmlid='mail.mt_comment', parent_id=message.id)
            if usage:
                prompt_tokens = usage['prompt_tokens']
--- a/app_common/controllers/main.py
+++ b/app_common/controllers/main.py
@@ -6,7 +6,7 @@ import requests
 from math import radians, cos, sin, asin, sqrt

 from ..lib.user_agents import parse
-from ..models.ir_http import get_ua_type
+from ..models.base import get_ua_type


 from odoo import api, http, SUPERUSER_ID, _
@@ -28,7 +28,7 @@ class AppController(http.Controller):
        # 返回这个图片的base64编码
        return base64.b64encode(BytesIO(response.content).read())

-    @http.route(['/web/ua', '/web/ua/show'], auth='public', methods=['GET'])
+    @http.route(['/my/ua', '/web/ua', '/web/ua/show'], auth='public', methods=['GET'])
    def app_ua_show(self):
        # https://github.com/selwin/python-user-agents
        ua_string = request.httprequest.headers.get('User-Agent')
--- a/app_common/models/base.py
+++ b/app_common/models/base.py
@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 from odoo import models, fields, api, _
 from odoo.tools import DEFAULT_SERVER_DATE_FORMAT, DEFAULT_SERVER_DATETIME_FORMAT
+from odoo.http import request

 import requests
 import base64
@@ -108,3 +109,47 @@ class Base(models.AbstractModel):
            return None
        # 返回这个图片的base64编码
        return base64.b64encode(BytesIO(response.content).read())
+
+    def get_ua_type(self):
+        return get_ua_type()
+
+
+def get_ua_type():
+    ua = request.httprequest.headers.get('User-Agent')
+    # 临时用 agent 处理，后续要前端中正确处理或者都从后台来
+    # 微信浏览器
+    #  MicroMessenger: Mozilla/5.0 (Linux; Android 10; ELE-AL00 Build/HUAWEIELE-AL00; wv)
+    # AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/77.0.3865.120
+    # MQQBrowser/6.2 TBS/045525 Mobile Safari/537.36 MMWEBID/3135 MicroMessenger/8.0.2.1860(0x2800023B) Process/tools WeChat/arm64 Weixin NetType/WIFI Language/zh_CN ABI/arm64
+    # 微信浏览器，开发工具，网页 iphone
+    # ,Mozilla/5.0 (iPhone; CPU iPhone OS 11_0 like Mac OS X) AppleWebKit/604.1.38 (KHTML, like Gecko) Version/11.0 Mobile/15A372 Safari/604.1
+    # wechatdevtools/1.03.2011120 MicroMessenger/7.0.4 Language/zh_CN webview/16178807094901773
+    # webdebugger port/27772 token/b91f4a234b918f4e2a5d1a835a09c31e
+
+    # 微信小程序
+    # MicroMessenger: Mozilla/5.0 (Linux; Android 10; ELE-AL00 Build/HUAWEIELE-AL00; wv)
+    # AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/78.0.3904.62 XWEB/2767 MMWEBSDK/20210302 Mobile Safari/537.36 MMWEBID/6689 MicroMessenger/8.0.2.1860(0x2800023B) Process/appbrand2 WeChat/arm64 Weixin NetType/WIFI Language/zh_CN ABI/arm64
+    # MiniProgramEnv/android
+    # 微信浏览器，开发工具，小程序，iphone
+    # Mozilla/5.0 (iPhone; CPU iPhone OS 11_0 like Mac OS X) AppleWebKit/604.1.38 (KHTML, like Gecko) Version/11.0 Mobile/15A372 Safari/604.1
+    # wechatdevtools/1.03.2011120 MicroMessenger/7.0.4 Language/zh_CN webview/
+    # 微信内，iphone web
+    # Mozilla/5.0 (iPhone; CPU iPhone OS 14_4_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148
+    # MicroMessenger/8.0.3(0x1800032a) NetType/WIFI Language/zh_CN
+    # 安卓app,h5
+    # ELE-AL00(Android/10) (cn.erpapp.o20sticks.App/13.20.12.09) Weex/0.26.0 1080x2265
+
+    # web 表示普通浏览器，后续更深入处理
+    utype = 'web'
+    # todo: 引入现成 py lib，处理企业微信
+    if 'MicroMessenger' in ua and 'webdebugger' not in ua and ('MiniProgramEnv' in ua or 'wechatdevtools' in ua):
+        # 微信小程序及开发者工具
+        utype = 'wxapp'
+    elif 'MicroMessenger' in ua:
+        # 微信浏览器
+        utype = 'wxweb'
+    elif 'cn.erpapp.o20sticks.App' in ua:
+        # 安卓app
+        utype = 'native_android'
+    # _logger.warning('=========get ua %s,%s' % (utype, ua))
+    return utype
--- a/app_common/models/ir_http.py
+++ b/app_common/models/ir_http.py
@@ -14,45 +14,4 @@ class IrHttp(models.AbstractModel):
        result['ua_type'] = self.get_ua_type()
        return result

-    def get_ua_type(self):
-        return get_ua_type()

-def get_ua_type():
-    ua = request.httprequest.headers.get('User-Agent')
-    # 临时用 agent 处理，后续要前端中正确处理或者都从后台来
-    # 微信浏览器
-    #  MicroMessenger: Mozilla/5.0 (Linux; Android 10; ELE-AL00 Build/HUAWEIELE-AL00; wv)
-    # AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/77.0.3865.120
-    # MQQBrowser/6.2 TBS/045525 Mobile Safari/537.36 MMWEBID/3135 MicroMessenger/8.0.2.1860(0x2800023B) Process/tools WeChat/arm64 Weixin NetType/WIFI Language/zh_CN ABI/arm64
-    # 微信浏览器，开发工具，网页 iphone
-    # ,Mozilla/5.0 (iPhone; CPU iPhone OS 11_0 like Mac OS X) AppleWebKit/604.1.38 (KHTML, like Gecko) Version/11.0 Mobile/15A372 Safari/604.1
-    # wechatdevtools/1.03.2011120 MicroMessenger/7.0.4 Language/zh_CN webview/16178807094901773
-    # webdebugger port/27772 token/b91f4a234b918f4e2a5d1a835a09c31e
-
-    # 微信小程序
-    # MicroMessenger: Mozilla/5.0 (Linux; Android 10; ELE-AL00 Build/HUAWEIELE-AL00; wv)
-    # AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/78.0.3904.62 XWEB/2767 MMWEBSDK/20210302 Mobile Safari/537.36 MMWEBID/6689 MicroMessenger/8.0.2.1860(0x2800023B) Process/appbrand2 WeChat/arm64 Weixin NetType/WIFI Language/zh_CN ABI/arm64
-    # MiniProgramEnv/android
-    # 微信浏览器，开发工具，小程序，iphone
-    # Mozilla/5.0 (iPhone; CPU iPhone OS 11_0 like Mac OS X) AppleWebKit/604.1.38 (KHTML, like Gecko) Version/11.0 Mobile/15A372 Safari/604.1
-    # wechatdevtools/1.03.2011120 MicroMessenger/7.0.4 Language/zh_CN webview/
-    # 微信内，iphone web
-    # Mozilla/5.0 (iPhone; CPU iPhone OS 14_4_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148
-    # MicroMessenger/8.0.3(0x1800032a) NetType/WIFI Language/zh_CN
-    # 安卓app,h5
-    # ELE-AL00(Android/10) (cn.erpapp.o20sticks.App/13.20.12.09) Weex/0.26.0 1080x2265
-    
-    # web 表示普通浏览器，后续更深入处理
-    utype = 'web'
-    # todo: 引入现成 py lib，处理企业微信
-    if 'MicroMessenger' in ua and 'webdebugger' not in ua and ('MiniProgramEnv' in ua or 'wechatdevtools' in ua):
-        # 微信小程序及开发者工具
-        utype = 'wxapp'
-    elif 'MicroMessenger' in ua:
-        # 微信浏览器
-        utype = 'wxweb'
-    elif 'cn.erpapp.o20sticks.App' in ua:
-        # 安卓app
-        utype = 'native_android'
-    # _logger.warning('=========get ua %s,%s' % (utype, ua))
-    return utype