ok

.env

@@ -20,8 +20,7 @@ STAGE_TYRZ_CLIENT_SECRET = '86c9F42E039E4a8exlqb'
 
 #中屏后台管理地址
 DEV_YJHTGL_WEB_ROOT_PATH = "http://127.0.0.1:8086/yjzp/#"
-#小屏地址
-DEV_YJXP_WEB_ROOT_PATH = "http://127.0.0.1:8086/yjxp/#"
+
 #粤政易APP回调地址
 DEV_YJXP_CALLBACK_WEB_PATH = "http://19.155.220.206:8086/api/yzy/callback.html"
 
@@ -45,9 +44,6 @@ STAGE_TYRZ_CLIENT_SECRET = '86c9F42E039E4a8exlqb'
 STAGE_YJHTGL_WEB_ROOT_PATH = "http://19.155.220.206:8086/yjzp/#"
 # STAGE_YJHTGL_WEB_ROOT_PATH = "http://10.181.7.235:8086/yjzp/#"
 
-# 小屏地址
-STAGE_YJXP_WEB_ROOT_PATH = "http://120.241.74.139:8086/yjxp/#"
-
 # 粤政易APP回调地址（域名和端口不能随便改，申请时定下来）
 STAGE_YJXP_CALLBACK_WEB_PATH = "http://19.155.220.206:8086/api/yzy/callback.html"
 # STAGE_YJXP_CALLBACK_WEB_PATH = "http://120.241.74.139:8086/api/yzy/callback.html"
@@ -78,9 +74,6 @@ PROD_YJHTGL_WEB_ROOT_PATH = "http://19.155.220.228:8086/yjzp/#"
 PROD_YJHTGL_WEB_ROOT_PATH = "http://19.155.220.228:8086/yjzp/#"
 # STAGE_YJHTGL_WEB_ROOT_PATH = "http://10.181.7.235:8086/yjzp/#"
 
-# 小屏地址
-PROD_YJXP_WEB_ROOT_PATH = "https://yjxp.mmsyjj.cn:8086/yjxp/#"
-
 # 粤政易APP回调地址（域名和端口不能随便改，申请时定下来）
 PROD_YJXP_CALLBACK_WEB_PATH = "https://yjxp.mmsyjj.cn:8086/yzy/callback"
 

common/YzyApi.py

@@ -187,27 +187,8 @@ def calcRequestSign(timestamp, token, nonce, uid, uinfo, ext):
         ).hexdigest().upper()
 
 
-def format_redirect_url(redirect_url: str) -> str:
-    yzy_callback_url = quote(settings.YJXP_CALLBACK_WEB_PATH)
-    logger.info("yzy_callback_url: {}", yzy_callback_url)
-    
-    state_json = {
-        "redirect_url": redirect_url,
-        "rnd": new_guid()
-    }
-    state_str = json.dumps(state_json)
-    state = base64.b64encode(state_str.encode('utf-8')).decode('utf-8')
-    print('state_base64:', state)
-        
-    detail_url = "https://open.weixin.qq.com/connect/Oauth2/authorize?appid={}&redirect_uri={}&response_type=code&scope=snsapi_base&agentid={}&state={}#wechat_redirect".format(
-        settings.YZY_CORPID,
-        yzy_callback_url, 
-        settings.YZY_AGENTID,
-        state)
-    
-    logger.info("detail_url: {}", detail_url)
-    return detail_url
-    
+def format_redirect_url(url: str) -> str:
+    return f"{settings.YZY_WEB_ROOT}/yjxp/#/?redirect_url={url}"
 
 def add_to_msg_queue(db: Session, data: dict) -> None:
     new_msg = YzyMsgQueue(**data, sent_status = 0, create_time = datetime.now())

config.py

@@ -72,7 +72,6 @@ class DevConfig(Settings):
     MYSQL_PORT: Optional[int] = Field(..., env="DEV_MYSQL_PORT")
 
     YJHTGL_WEB_ROOT_PATH: Optional[str] = Field(..., env="DEV_YJHTGL_WEB_ROOT_PATH")
-    YJXP_WEB_ROOT_PATH: Optional[str] = Field(..., env="DEV_YJXP_WEB_ROOT_PATH")
     YJXP_CALLBACK_WEB_PATH: Optional[str] = Field(..., env="DEV_YJXP_CALLBACK_WEB_PATH")
     YZY_WEB_ROOT: Optional[str] = Field(..., env="DEV_YZY_WEB_ROOT")
 
@@ -102,7 +101,6 @@ class ProdConfig(Settings):
     MYSQL_PORT: Optional[int] = Field(..., env="PROD_MYSQL_PORT")
 
     YJHTGL_WEB_ROOT_PATH: Optional[str] = Field(..., env="PROD_YJHTGL_WEB_ROOT_PATH")
-    YJXP_WEB_ROOT_PATH: Optional[str] = Field(..., env="PROD_YJXP_WEB_ROOT_PATH")
     YJXP_CALLBACK_WEB_PATH: Optional[str] = Field(..., env="PROD_YJXP_CALLBACK_WEB_PATH")
     YZY_WEB_ROOT: Optional[str] = Field(..., env="PROD_YZY_WEB_ROOT")
 
@@ -149,7 +147,6 @@ class StageConfig(Settings):
     MYSQL_PORT: Optional[int] = Field(..., env="STAGE_MYSQL_PORT")
 
     YJHTGL_WEB_ROOT_PATH: Optional[str] = Field(..., env="STAGE_YJHTGL_WEB_ROOT_PATH")
-    YJXP_WEB_ROOT_PATH: Optional[str] = Field(..., env="STAGE_YJXP_WEB_ROOT_PATH")
     YJXP_CALLBACK_WEB_PATH: Optional[str] = Field(..., env="STAGE_YJXP_CALLBACK_WEB_PATH")
     YZY_WEB_ROOT: Optional[str] = Field(..., env="STAGE_YZY_WEB_ROOT")
 

jobs/yzy_job.py

@@ -23,7 +23,7 @@ def proc():
     if redis_lock(lock_key):
         logger.info(datetime.now())
 
-        detail_url = "{}/leader/index".format(settings.YJXP_WEB_ROOT_PATH)
+        detail_url = YzyApi.format_redirect_url("/leader/index")
         
         yzy_user_id = "etk4130970pjg84tgrhapo"
         description = "预案名称: 茂名市自然灾害救助应急预案\n响应级别: Ⅰ级响应\n消息内容: 单位您好！《茂名市自然灾害救助应急预案》现已全面启动，特此通知您单位迅速响应，全力做好预案工作要点：负责救灾工作宣传报道协调工作。"

routers/api/onlineRollCall/call.py

@@ -579,7 +579,6 @@ def send_yzy_msg(db: Session, detail_entity: OnlineRollCallDetail, user_id: int)
         if yzy_account not in user_list:
             yzy_userid = db_yzy.get_userid_by_account(db, yzy_account)
             create_time = get_datetime_str(detail_entity.create_time)
-            # detail_url = YzyApi.format_redirect_url("{}/".format(settings.YJXP_WEB_ROOT_PATH)) # 主页
             detail_url = "{}{}".format(settings.YZY_WEB_ROOT, "/yjxp/")
 
             description = f"你有一条在线点名通知，请尽快确认\n点名时间:{create_time}"