精简拆分httpurl工具类

 import data_preferences from '@ohos.data.preferences';
 import data_preferences from '@ohos.data.preferences';
 
 
-/*
+/**
+ * sp存储
+ *
+ * 单例模式
+ * TODO 新增内存存储，避免频繁sp获取
+ */
 // SPHelper.default.get("key1", "defValue1").then((value1) => {
 // SPHelper.default.get("key1", "defValue1").then((value1) => {
 //   this.message = value1.toString();
 //   this.message = value1.toString();
 // })
 // })
 
 
 // let value2: string = await SPHelper.default.get("key2", "defValue2");
 // let value2: string = await SPHelper.default.get("key2", "defValue2");
 // this.message = result;
 // this.message = result;
-*
-* 单例模式
- */
 export class SPHelper {
 export class SPHelper {
   private static context: Context;
   private static context: Context;
   private static spFilename: string = '__SPHelper';
   private static spFilename: string = '__SPHelper';
@@ -21,7 +23,7 @@ export class SPHelper {
   static setSpFilename(spFilename: string) {
   static setSpFilename(spFilename: string) {
     SPHelper.spFilename = spFilename;
     SPHelper.spFilename = spFilename;
   }
   }
-  
+
   // 静态属性
   // 静态属性
   static default: SPHelper = new SPHelper();
   static default: SPHelper = new SPHelper();
 
 
@@ -102,8 +104,8 @@ export class SPHelper {
   //   preferences.flush()
   //   preferences.flush()
   // }
   // }
 
 
-  public  getPreferences(){
-    let preferences =  data_preferences.getPreferences(SPHelper.context, SPHelper.spFilename);
+  public getPreferences() {
+    let preferences = data_preferences.getPreferences(SPHelper.context, SPHelper.spFilename);
     return preferences;
     return preferences;
   }
   }
 }
 }

@@ -8,5 +8,7 @@ export { HttpUrlUtils } from "./src/main/ets/http/HttpUrlUtils"
 
 
 export { HttpBizUtil } from "./src/main/ets/http/HttpBizUtil"
 export { HttpBizUtil } from "./src/main/ets/http/HttpBizUtil"
 
 
+export { HttpUtils } from "./src/main/ets/utils/HttpUtils"
+
 export { HostEnum, HostManager } from "./src/main/ets/http/HttpHostManager"
 export { HostEnum, HostManager } from "./src/main/ets/http/HttpHostManager"
 
 

@@ -5,6 +5,7 @@ import { ResponseDTO } from '../bean/ResponseDTO';
 import { HttpUrlUtils, WDHttp } from '../../../../Index';
 import { HttpUrlUtils, WDHttp } from '../../../../Index';
 import { RefreshTokenRes } from '../bean/RefreshTokenRes';
 import { RefreshTokenRes } from '../bean/RefreshTokenRes';
 import { ResposeError } from '../bean/ResposeError';
 import { ResposeError } from '../bean/ResposeError';
+import { HttpUtils } from '../utils/HttpUtils';
 
 
 const TAG: string = 'HttpBizUtil'
 const TAG: string = 'HttpBizUtil'
 
 
@@ -93,8 +94,8 @@ export class HttpBizUtil {
   static refreshToken(): Promise<string> {
   static refreshToken(): Promise<string> {
     let url = HttpUrlUtils.getRefreshTokenUrl();
     let url = HttpUrlUtils.getRefreshTokenUrl();
     let params: HashMap<string, string> = new HashMap<string, string>()
     let params: HashMap<string, string> = new HashMap<string, string>()
-    params.set('refreshToken', HttpUrlUtils.getRefreshToken())
-    params.set('deviceId', HttpUrlUtils.getDeviceId())
+    params.set('refreshToken', HttpUtils.getRefreshToken())
+    params.set('deviceId', HttpUtils.getDeviceId())
     // Logger.debug(TAG, 'refreshToken getRefreshToken: ' + HttpUrlUtils.getRefreshToken())
     // Logger.debug(TAG, 'refreshToken getRefreshToken: ' + HttpUrlUtils.getRefreshToken())
     // 请求刷新token接口
     // 请求刷新token接口
     return new Promise<string>((success, error) => {
     return new Promise<string>((success, error) => {

 import { SpConstants } from 'wdConstant';
 import { SpConstants } from 'wdConstant';
 import { DateTimeUtils, DeviceUtil, SPHelper, StringUtils } from 'wdKit';
 import { DateTimeUtils, DeviceUtil, SPHelper, StringUtils } from 'wdKit';
+import { HttpUtils } from '../utils/HttpUtils';
 import { HostEnum, HostManager } from './HttpHostManager';
 import { HostEnum, HostManager } from './HttpHostManager';
 
 
 /**
 /**
- * 网络请求参数工具类
+ * 网络请求参数工具类，TODO 不对外暴露，收缩权限
  */
  */
 export class HttpParams {
 export class HttpParams {
-  private static userId = ''
-  private static userType = ''
-  private static token = ''
-
   static buildHeaders(): Record<string, string> {
   static buildHeaders(): Record<string, string> {
     let headers: Record<string, string> = {};
     let headers: Record<string, string> = {};
     // 通用请求头
     // 通用请求头
@@ -19,7 +16,7 @@ export class HttpParams {
     headers['Content-Type'] = 'application/json; charset=utf-8'
     headers['Content-Type'] = 'application/json; charset=utf-8'
     headers['device_id'] = DeviceUtil.clientId()
     headers['device_id'] = DeviceUtil.clientId()
     headers['build_version'] = HttpParams.getVersion()
     headers['build_version'] = HttpParams.getVersion()
-    headers['adcode'] = HttpParams.getAdCode()
+    headers['adcode'] = HttpUtils.getProvinceCode()
     headers['os_version'] = DeviceUtil.getOsVersion()
     headers['os_version'] = DeviceUtil.getOsVersion()
     headers['system'] = 'Android' // TODO 后续是否新增鸿蒙标识
     headers['system'] = 'Android' // TODO 后续是否新增鸿蒙标识
     headers['versionCode'] = HttpParams.getVersionCode()
     headers['versionCode'] = HttpParams.getVersionCode()
@@ -30,12 +27,12 @@ export class HttpParams {
     headers['timestamp'] = DateTimeUtils.getTimeStamp() + ''
     headers['timestamp'] = DateTimeUtils.getTimeStamp() + ''
     HttpParams.setLocationHeader(headers)
     HttpParams.setLocationHeader(headers)
     // // TODO 判断是否登录
     // // TODO 判断是否登录
-    headers['RMRB-X-TOKEN'] = HttpParams.getXToken()
-    if (HttpParams.getXToken() != '') {
-      headers['cookie'] = 'RMRB-X-TOKEN=' + HttpParams.getXToken()
+    headers['RMRB-X-TOKEN'] = HttpUtils.getXToken()
+    if (HttpUtils.getXToken() != '') {
+      headers['cookie'] = 'RMRB-X-TOKEN=' + HttpUtils.getXToken()
     }
     }
-    headers['userId'] = HttpParams.getUserId()
-    headers['userType'] = HttpParams.getUserType()
+    headers['userId'] = HttpUtils.getUserId()
+    headers['userType'] = HttpUtils.getUserType()
     headers['mpassid'] = 'ZbHTMeTsfaYDAHqt8ZHIzcPs'
     headers['mpassid'] = 'ZbHTMeTsfaYDAHqt8ZHIzcPs'
     HttpParams.addSpecialHeaders(headers);
     HttpParams.addSpecialHeaders(headers);
     return headers;
     return headers;
@@ -68,6 +65,11 @@ export class HttpParams {
     }
     }
   }
   }
 
 
+  /**
+   * 设置定位信息header
+   *
+   * @param headers
+   */
   static setLocationHeader(headers: Record<string, string>) {
   static setLocationHeader(headers: Record<string, string>) {
     let cityName = SPHelper.default.getSync(SpConstants.LOCATION_CITY_NAME, '') as string
     let cityName = SPHelper.default.getSync(SpConstants.LOCATION_CITY_NAME, '') as string
     if (StringUtils.isNotEmpty(cityName)) {
     if (StringUtils.isNotEmpty(cityName)) {
@@ -79,26 +81,6 @@ export class HttpParams {
     }
     }
   }
   }
 
 
-  private static getXToken() {
-    if (StringUtils.isNotEmpty(HttpParams.token)) {
-      return HttpParams.token
-    }
-    HttpParams.token = SPHelper.default.getSync(SpConstants.USER_JWT_TOKEN, "") as string
-    if (StringUtils.isNotEmpty(HttpParams.token)) {
-      return HttpParams.token
-    }
-    // return 'eyJhbGciOiJIUzI1NiIsImtpZCI6ImQ4WkI2QkhxSEZrdjJ2U25BNlRwZEdKRjBHcjItVzBvS2FaYzdLOUUycmcifQ.eyJpc3MiOiJwZW9wbGVzLWRhaWx5LWZvdXJhIiwic3ViIjoicGVvcGxlcy1kYWlseS1mb3VyYSIsImV4cCI6MTcwMzY0OTYwNiwidXNlcklkIjo0NTk3NzYyOTc0NzQ5NDksInVzZXJWZXJzaW9uIjoiNDU5Nzc2Mjk3NDc0OTQ5XzIiLCJ1c2VyTmFtZSI6IkJ1bGlraWtpMTgxIiwidXNlclR5cGUiOjIsImNyZWF0b3JJZCI6NDI2NTM5MH0.jhQ9kylcm3FxWf0-lBMZuLkdtIQ6XpFnAi0AFZJNwfc';
-    return ''
-  }
-
-  static getRefreshToken(): string {
-    let refreshToken = SPHelper.default.getSync(SpConstants.USER_REFRESH_TOKEN, "")
-    if (StringUtils.isNotEmpty(refreshToken)) {
-      return refreshToken as string;
-    }
-    return '';
-  }
-
   private static getVersion() {
   private static getVersion() {
     // TODO
     // TODO
     return '202401242103';
     return '202401242103';
@@ -110,60 +92,7 @@ export class HttpParams {
   }
   }
 
 
   private static getVersionName() {
   private static getVersionName() {
-    // TODO
+    // TODO 读取配置
     return '1.0.0';
     return '1.0.0';
   }
   }
-
-  private static getAdCode() {
-    // 省份编码
-    return '340000';
-  }
-
-  public static getCityCode() {
-    // TODO
-    // 城市编码
-    return '340100';
-  }
-
-  public static getProvinceCode() {
-    // TODO
-    return '340000';
-  }
-
-  /**
-   * 地区code
-   */
-  public static getDistrictCode() {
-    // TODO
-    return '340103';
-  }
-
-  public static getUserId(): string {
-    // TODO 对接登录
-    if (StringUtils.isNotEmpty(HttpParams.userId)) {
-      return HttpParams.userId
-    }
-    HttpParams.userId = SPHelper.default.getSync(SpConstants.USER_ID, "") as string
-    return HttpParams.userId;
-  }
-
-  public static getUserType() {
-    if (StringUtils.isNotEmpty(HttpParams.userType)) {
-      return HttpParams.userType
-    }
-    HttpParams.userType = SPHelper.default.getSync(SpConstants.USER_Type, "") as string
-    return HttpParams.userType;
-  }
-
-  public static setUserId(userId: string) {
-    HttpParams.userId = userId;
-  }
-
-  public static setUserType(userType: string) {
-    HttpParams.userType = userType;
-  }
-
-  public static setUserToken(token: string) {
-    HttpParams.token = token;
-  }
 }
 }

-import HashMap from '@ohos.util.HashMap';
-import { SpConstants } from 'wdConstant';
-import { SPHelper, StringUtils } from 'wdKit';
-import { HostEnum, HostManager } from './HttpHostManager';
+import { HostManager } from './HttpHostManager';
 
 
 /**
 /**
- * 网络请求业务侧工具类
+ * 网络请求业务侧接口url工具类
  */
  */
 export class HttpUrlUtils {
 export class HttpUrlUtils {
   /**
   /**
@@ -286,211 +283,11 @@ export class HttpUrlUtils {
    * 搜索推荐
    * 搜索推荐
    */
    */
   static readonly SEARCH_SUGGEST_DATA_PATH: string = "/api/rmrb-bff-display-zh/recommend/zh/c/list";
   static readonly SEARCH_SUGGEST_DATA_PATH: string = "/api/rmrb-bff-display-zh/recommend/zh/c/list";
-  private static userId = ''
-  private static userType = ''
-  private static token = ''
-
-  /**
-   * @deprecated
-   * @returns
-   */
-  private static getCommonHeaders(): HashMap<string, string> {
-    let headers: HashMap<string, string> = new HashMap<string, string>()
-    headers.set('User-Agent', 'Dalvik/2.1.0 (Linux; U; Android 13; 22101317C Build/TKQ1.221013.002)')
-    headers.set('channel', HttpUrlUtils.getChannel())
-    //headers.set('appCode', ConfigConstants.appCode)
-    headers.set('plat', HttpUrlUtils.getPlat())
-    //headers.set('Authorization', 'APPCODE 83092caa603a421aa0222308b3f6b27a')
-    headers.set('Content-Type', 'application/json; charset=utf-8')
-    headers.set('timestamp', HttpUrlUtils.getTimestamp())
-    headers.set('RMRB-X-TOKEN', HttpUrlUtils.getXToken())
-    headers.set('device_id', HttpUrlUtils.getDeviceId())
-    if (HttpUrlUtils.getXToken() != '') {
-      headers.set('cookie', 'RMRB-X-TOKEN=' + HttpUrlUtils.getXToken())
-    }
-    headers.set('build_version', HttpUrlUtils.getVersion())
-    headers.set('adcode', HttpUrlUtils.getAdCode())
-    headers.set('os_version', HttpUrlUtils.getOsVersion())
-    //headers.set('X-Ca-Stage', 'PRE')
-    headers.set('versionCode', HttpUrlUtils.getVersionCode())
-    headers.set('system', HttpUrlUtils.getTerminalId())
-    headers.set('version_name', HttpUrlUtils.getVersionName())
-    headers.set('EagleEye-TraceID', 'D539562E48554A60977AF4BECB6D6C7A')
-    headers.set('imei', HttpUrlUtils.getImei())
-    headers.set('Accept-Language', 'zh')
-    // headers.set('city', HttpUrlUtils.getCity())
-    // headers.set('city_dode', HttpUrlUtils.getCityCode())
-    HttpUrlUtils.setLocationHeader(headers)
-    // TODO 判断是否登录
-    headers.set('userId', HttpUrlUtils.getUserId())
-    headers.set('userType', HttpUrlUtils.getUserType())
-
-    headers.set('mpassid', 'ZbHTMeTsfaYDAHqt8ZHIzcPs')
-    HttpUrlUtils.addSpecialHeaders(headers);
-    // Logger.debug("TAG", '******************* commonHeaders headers start ******************************** ');
-    // headers.forEach((v,k)=>{
-    //   Logger.debug("TAG", 'getCommonHeaders header: ' + k + ': ' + v);
-    // })
-    // Logger.debug("TAG", '******************* commonHeaders headers end ******************************** ');
-    return headers;
-  }
-
-  private static addSpecialHeaders(headers: HashMap<string, string>) {
-    switch (HostManager.getHost()) {
-      case HostEnum.HOST_UAT:
-      // TODO 待优化到常量类里
-        headers.set('X-Ca-Stage', 'PRE');
-        headers.set('Authorization', 'APPCODE 83092caa603a421aa0222308b3f6b27a');
-        headers.set('appCode', '83092caa603a421aa0222308b3f6b27a');
-        break
-      case HostEnum.HOST_SIT:
-        headers.set('X-Ca-Stage', 'TEST');
-        headers.set('Authorization', 'APPCODE 0af1f9085e484c97b2a44704bae72c07');
-        headers.set('appCode', '0af1f9085e484c97b2a44704bae72c07');
-        break
-      case HostEnum.HOST_PRODUCT:
-        headers.set('X-Ca-Stage', 'RELEASE');
-        headers.set('Authorization', 'APPCODE 3d4181bceeb94d9780e10dbb6c67bbf6');
-        headers.set('appCode', '3d4181bceeb94d9780e10dbb6c67bbf6');
-        break
-      case HostEnum.HOST_DEV:
-        headers.set('X-Ca-Stage', 'TEST');
-        headers.set('Authorization', 'APPCODE ff33172859e14f9a8299e3bd769e79f9');
-        headers.set('appCode', 'ff33172859e14f9a8299e3bd769e79f9');
-        break
-      default:
-        break
-    }
-  }
-
-  private static setLocationHeader(headers: HashMap<string, string>) {
-    let cityName = SPHelper.default.getSync(SpConstants.LOCATION_CITY_NAME, '') as string
-    if (StringUtils.isNotEmpty(cityName)) {
-      headers.set('city', encodeURI(cityName))
-    }
-    let cityCode = SPHelper.default.getSync(SpConstants.LOCATION_CITY_CODE, '') as string
-    if (StringUtils.isNotEmpty(cityCode)) {
-      headers.set('city_dode', encodeURI(cityCode))
-    }
-  }
 
 
   static getHost(): string {
   static getHost(): string {
     return HostManager.getHost();
     return HostManager.getHost();
   }
   }
 
 
-  private static getCity() {
-    // TODO 对接定位
-    return '%E5%90%88%E8%82%A5%E5%B8%82';
-  }
-
-  private static getChannel() {
-    // TODO 对接配置
-    return 'rmrb_china_0000';
-  }
-
-  private static getPlat() {
-    return 'Phone';
-  }
-
-  private static getTimestamp() {
-    // return DateTimeUtils.getCurrentTime() + '';
-    // TODO 暂时写死，有些page 真实时间戳 返回数据为空
-    return '155203523';
-  }
-
-  private static getXToken() {
-    if (StringUtils.isNotEmpty(HttpUrlUtils.token)) {
-      return HttpUrlUtils.token
-    }
-    HttpUrlUtils.token = SPHelper.default.getSync(SpConstants.USER_JWT_TOKEN, "") as string
-    if (StringUtils.isNotEmpty(HttpUrlUtils.token)) {
-      return HttpUrlUtils.token
-    }
-    // return 'eyJhbGciOiJIUzI1NiIsImtpZCI6ImQ4WkI2QkhxSEZrdjJ2U25BNlRwZEdKRjBHcjItVzBvS2FaYzdLOUUycmcifQ.eyJpc3MiOiJwZW9wbGVzLWRhaWx5LWZvdXJhIiwic3ViIjoicGVvcGxlcy1kYWlseS1mb3VyYSIsImV4cCI6MTcwMzY0OTYwNiwidXNlcklkIjo0NTk3NzYyOTc0NzQ5NDksInVzZXJWZXJzaW9uIjoiNDU5Nzc2Mjk3NDc0OTQ5XzIiLCJ1c2VyTmFtZSI6IkJ1bGlraWtpMTgxIiwidXNlclR5cGUiOjIsImNyZWF0b3JJZCI6NDI2NTM5MH0.jhQ9kylcm3FxWf0-lBMZuLkdtIQ6XpFnAi0AFZJNwfc';
-    return ''
-  }
-
-  static getRefreshToken() {
-    let refreshToken = SPHelper.default.getSync(SpConstants.USER_REFRESH_TOKEN, "")
-    if (StringUtils.isNotEmpty(refreshToken)) {
-      return refreshToken as string;
-    }
-    return '';
-  }
-
-  public static getDeviceId() {
-    // TODO
-    return '8a81226a-cabd-3e1b-b630-b51db4a720ed';
-  }
-
-  private static getVersion() {
-    // TODO
-    return '202401242103';
-  }
-
-  private static getVersionCode() {
-    // TODO
-    return '7301';
-  }
-
-  private static getVersionName() {
-    // TODO
-    return '7.3.0.1';
-  }
-
-  private static getAdCode() {
-    return '340000';
-  }
-
-  private static getOsVersion() {
-    // TODO
-    return '12';
-  }
-
-  public static getCityCode() {
-    // TODO
-    return '340100';
-  }
-
-  public static getProvinceCode() {
-    // TODO
-    return '340000';
-  }
-
-  /**
-   * 地区code
-   */
-  public static getDistrictCode() {
-    // TODO
-    return '340103';
-  }
-
-  private static getTerminalId() {
-    return 'Android';
-  }
-
-  public static getImei() {
-    // TODO
-    return '8a81226a-cabd-3e1b-b630-b51db4a720ed';
-  }
-
-  public static getUserId() {
-    // TODO 对接登录
-    if (StringUtils.isNotEmpty(HttpUrlUtils.userId)) {
-      return HttpUrlUtils.userId
-    }
-    HttpUrlUtils.userId = SPHelper.default.getSync(SpConstants.USER_ID, "") as string
-    return HttpUrlUtils.userId;
-  }
-
-  public static getUserType() {
-    if (StringUtils.isNotEmpty(HttpUrlUtils.userType)) {
-      return HttpUrlUtils.userType
-    }
-    HttpUrlUtils.userType = SPHelper.default.getSync(SpConstants.USER_Type, "") as string
-    return HttpUrlUtils.userType;
-  }
-
   static getVerifyCodeUrl() {
   static getVerifyCodeUrl() {
     let url = HttpUrlUtils.getHost() + "/api/rmrb-user-center/auth/zh/c/sendVerifyCode";
     let url = HttpUrlUtils.getHost() + "/api/rmrb-user-center/auth/zh/c/sendVerifyCode";
     return url;
     return url;
@@ -842,7 +639,6 @@ export class HttpUrlUtils {
     return url;
     return url;
   }
   }
 
 
-
   //搜索推荐
   //搜索推荐
   static getSearchSuggestDataUrl() {
   static getSearchSuggestDataUrl() {
     let url = HttpUrlUtils.getHost() + HttpUrlUtils.SEARCH_SUGGEST_DATA_PATH
     let url = HttpUrlUtils.getHost() + HttpUrlUtils.SEARCH_SUGGEST_DATA_PATH
@@ -854,16 +650,4 @@ export class HttpUrlUtils {
     let url = HttpUrlUtils.getHost() + "/api/rmrb-bff-display-zh/display/zh/c/themeList";
     let url = HttpUrlUtils.getHost() + "/api/rmrb-bff-display-zh/display/zh/c/themeList";
     return url;
     return url;
   }
   }
-
-  public static setUserId(userId: string) {
-    HttpUrlUtils.userId = userId;
-  }
-
-  public static setUserType(userType: string) {
-    HttpUrlUtils.userType = userType;
-  }
-
-  public static setUserToken(token: string) {
-    HttpUrlUtils.token = token;
-  }
 }
 }

+import { SpConstants } from 'wdConstant/Index';
+import { DeviceUtil, SPHelper, StringUtils } from 'wdKit/Index';
+import { HttpParams } from '../http/HttpCommonParams';
 import { HttpRequest } from '../http/HttpRequest';
 import { HttpRequest } from '../http/HttpRequest';
 
 
 const TAG: string = '[HttpUtils]'
 const TAG: string = '[HttpUtils]'
 
 
+/**
+ * http相关工具类，对外暴露
+ */
 export class HttpUtils {
 export class HttpUtils {
+  private static userId = ''
+  private static userType = ''
+  private static token = ''
+
   /**
   /**
    * 添加公共参数，如登录后，添加登录信息
    * 添加公共参数，如登录后，添加登录信息
    */
    */
@@ -19,4 +29,89 @@ export class HttpUtils {
   static removeCommonHeader() {
   static removeCommonHeader() {
 
 
   }
   }
+
+  static getRefreshToken() {
+    let refreshToken = SPHelper.default.getSync(SpConstants.USER_REFRESH_TOKEN, "")
+    if (StringUtils.isNotEmpty(refreshToken)) {
+      return refreshToken as string;
+    }
+    return '';
+  }
+
+  /**
+   * 设备id，uuid
+   */
+  public static getDeviceId(): string {
+    return DeviceUtil.clientId();
+  }
+
+  /**
+   * 定位，城市code
+   */
+  public static getCityCode(): string {
+    // TODO
+    // 城市编码
+    return '340100';
+  }
+
+  /**
+   * 定位，省份code
+   */
+  public static getProvinceCode(): string {
+    // TODO
+    return '340000';
+  }
+
+  /**
+   * 定位，地区code
+   */
+  public static getDistrictCode(): string {
+    // TODO
+    return '340103';
+  }
+
+  public static getImei(): string {
+    return DeviceUtil.clientId();
+  }
+
+  public static getUserId(): string {
+    // TODO 对接登录
+    if (StringUtils.isNotEmpty(HttpUtils.userId)) {
+      return HttpUtils.userId
+    }
+    HttpUtils.userId = SPHelper.default.getSync(SpConstants.USER_ID, "") as string
+    return HttpUtils.userId;
+  }
+
+  public static getUserType(): string {
+    if (StringUtils.isNotEmpty(HttpUtils.userType)) {
+      return HttpUtils.userType
+    }
+    HttpUtils.userType = SPHelper.default.getSync(SpConstants.USER_Type, "") as string
+    return HttpUtils.userType;
+  }
+
+  static getXToken(): string {
+    if (StringUtils.isNotEmpty(HttpUtils.token)) {
+      return HttpUtils.token
+    }
+    HttpUtils.token = SPHelper.default.getSync(SpConstants.USER_JWT_TOKEN, "") as string
+    if (StringUtils.isNotEmpty(HttpUtils.token)) {
+      return HttpUtils.token
+    }
+    return ''
+  }
+
+  public static setUserId(userId: string) {
+    // TODO 优化赋值
+    HttpUtils.userId = userId;
+  }
+
+  public static setUserType(userType: string) {
+    HttpUtils.userType = userType;
+  }
+
+  public static setUserToken(token: string) {
+    HttpUtils.token = token;
+  }
 }
 }

@@ -15,7 +15,6 @@ import { ImageAndTextWebComponent } from './ImageAndTextWebComponent';
 import { OperRowListView } from './view/OperRowListView';
 import { OperRowListView } from './view/OperRowListView';
 import { RecommendList } from '../components/view/RecommendList'
 import { RecommendList } from '../components/view/RecommendList'
 import { CommonConstants } from 'wdConstant';
 import { CommonConstants } from 'wdConstant';
-import { HttpUrlUtils } from 'wdNetwork/Index';
 import { WDRouterPage, WDRouterRule } from 'wdRouter/Index';
 import { WDRouterPage, WDRouterRule } from 'wdRouter/Index';
 import { MultiPictureDetailViewModel } from '../viewmodel/MultiPictureDetailViewModel';
 import { MultiPictureDetailViewModel } from '../viewmodel/MultiPictureDetailViewModel';
 import { PageRepository } from '../repository/PageRepository';
 import { PageRepository } from '../repository/PageRepository';
@@ -23,6 +22,7 @@ import { detailedSkeleton } from './skeleton/detailSkeleton';
 import { publishCommentModel } from '../components/comment/model/PublishCommentModel';
 import { publishCommentModel } from '../components/comment/model/PublishCommentModel';
 
 
 import { CommentComponent } from '../components/comment/view/CommentComponent'
 import { CommentComponent } from '../components/comment/view/CommentComponent'
+import { HttpUtils } from 'wdNetwork/Index';
 
 
 const PATTERN_DATE_CN_RN: string = 'yyyy年MM月dd日 HH:mm';
 const PATTERN_DATE_CN_RN: string = 'yyyy年MM月dd日 HH:mm';
 
 
@@ -197,8 +197,9 @@ export struct ImageAndTextPageComponent {
 
 
   private async getRecommend() {
   private async getRecommend() {
     let params: postRecommendListParams = {
     let params: postRecommendListParams = {
+      // TODO ?  imei: HttpUtils.getImei()
       imei: "8272c108-4fa2-34ce-80b9-bc425a7c2a7e",
       imei: "8272c108-4fa2-34ce-80b9-bc425a7c2a7e",
-      userId: HttpUrlUtils.getUserId(),
+      userId: HttpUtils.getUserId(),
       contentId: String(this.contentDetailData[0]?.newsId),
       contentId: String(this.contentDetailData[0]?.newsId),
       recType: 1,
       recType: 1,
       contentType: this.contentDetailData[0]?.newsType,
       contentType: this.contentDetailData[0]?.newsType,
@@ -235,7 +236,7 @@ export struct ImageAndTextPageComponent {
    */
    */
   toggleLikeStatus() {
   toggleLikeStatus() {
     // 未登录，跳转登录
     // 未登录，跳转登录
-    if (!HttpUrlUtils.getUserId()) {
+    if (!HttpUtils.getUserId()) {
       WDRouterRule.jumpWithPage(WDRouterPage.loginPage)
       WDRouterRule.jumpWithPage(WDRouterPage.loginPage)
       return
       return
     }
     }

 import { DateTimeUtils, Logger, ToastUtils, UserDataLocal } from 'wdKit/Index';
 import { DateTimeUtils, Logger, ToastUtils, UserDataLocal } from 'wdKit/Index';
-import { HttpBizUtil, HttpUrlUtils, ResponseDTO } from 'wdNetwork/Index';
+import { HttpBizUtil, HttpUrlUtils, HttpUtils, ResponseDTO } from 'wdNetwork/Index';
 import { HttpRequest } from 'wdNetwork/src/main/ets/http/HttpRequest';
 import { HttpRequest } from 'wdNetwork/src/main/ets/http/HttpRequest';
 import {
 import {
   commentItemModel,
   commentItemModel,
@@ -29,7 +29,7 @@ class CommentViewModel {
   /*获取所有评论*/
   /*获取所有评论*/
   fetchContentCommentList(pageNum: string, contentId: string, contentType: string): Promise<commentListModel> {
   fetchContentCommentList(pageNum: string, contentId: string, contentType: string): Promise<commentListModel> {
 
 
-    let url = HttpUrlUtils.getContentCommentListDataUrl() + `?&pageSize=${10}&pageNum=${pageNum}&contentId=${contentId}&contentType=${contentType}&deviceId=${HttpUrlUtils.getDeviceId()}&userId=${HttpUrlUtils.getUserId()}&userType=${HttpUrlUtils.getUserType()}&time=${DateTimeUtils.getCurTime(DateTimeUtils.PATTERN_DATE_TIME_HYPHEN)}`
+    let url = HttpUrlUtils.getContentCommentListDataUrl() + `?&pageSize=${10}&pageNum=${pageNum}&contentId=${contentId}&contentType=${contentType}&deviceId=${HttpUtils.getDeviceId()}&userId=${HttpUtils.getUserId()}&userType=${HttpUtils.getUserType()}&time=${DateTimeUtils.getCurTime(DateTimeUtils.PATTERN_DATE_TIME_HYPHEN)}`
     url = url.replace(' ', '%20')
     url = url.replace(' ', '%20')
 
 
     return new Promise<commentListModel>((success, fail) => {
     return new Promise<commentListModel>((success, fail) => {
@@ -59,7 +59,7 @@ class CommentViewModel {
 
 
   fetchChildContentCommentList(pageNum: string, contentId: string, contentType: string, commentId: String): Promise<commentListModel> {
   fetchChildContentCommentList(pageNum: string, contentId: string, contentType: string, commentId: String): Promise<commentListModel> {
     // https://pd-apis-uat.pdnews.cn/api/rmrb-comment/comment/zh/c/childCommentList?commentId=44846810&contentId=30004266013&contentType=8&deviceId=35C78D13-A84A-47CE-A5D0-E114E4E49939&pageNum=1&pageSize=10&time=2024-04-23%2014%3A44%3A57&userId=&userType=0
     // https://pd-apis-uat.pdnews.cn/api/rmrb-comment/comment/zh/c/childCommentList?commentId=44846810&contentId=30004266013&contentType=8&deviceId=35C78D13-A84A-47CE-A5D0-E114E4E49939&pageNum=1&pageSize=10&time=2024-04-23%2014%3A44%3A57&userId=&userType=0
-    let url = HttpUrlUtils.getChildContentCommentListDataUrl() + `?&pageSize=${10}&pageNum=${pageNum}&commentId=${commentId}&contentId=${contentId}&contentType=${contentType}&deviceId=${HttpUrlUtils.getDeviceId()}&userId=${HttpUrlUtils.getUserId()}&userType=${HttpUrlUtils.getUserType()}&time=${DateTimeUtils.getCurTime(DateTimeUtils.PATTERN_DATE_TIME_HYPHEN)}`
+    let url = HttpUrlUtils.getChildContentCommentListDataUrl() + `?&pageSize=${10}&pageNum=${pageNum}&commentId=${commentId}&contentId=${contentId}&contentType=${contentType}&deviceId=${HttpUtils.getDeviceId()}&userId=${HttpUtils.getUserId()}&userType=${HttpUtils.getUserType()}&time=${DateTimeUtils.getCurTime(DateTimeUtils.PATTERN_DATE_TIME_HYPHEN)}`
     url = url.replace(' ', '%20')
     url = url.replace(' ', '%20')
 
 
     return new Promise<commentListModel>((success, fail) => {
     return new Promise<commentListModel>((success, fail) => {
@@ -234,7 +234,7 @@ class CommentViewModel {
     let promiseArray: Promise<commentStatusListModel | void>[] = [];
     let promiseArray: Promise<commentStatusListModel | void>[] = [];
 
 
     //未登录不用批查
     //未登录不用批查
-    if (HttpUrlUtils.getUserId()) {
+    if (HttpUtils.getUserId()) {
       if (commentIDs.length > 0) {
       if (commentIDs.length > 0) {
         let promise1 = new Promise<void>((success) => {
         let promise1 = new Promise<void>((success) => {
           // HttpRequest HttpBizUtil
           // HttpRequest HttpBizUtil

 import { CompDTO, ContentDTO, Params } from 'wdBean';
 import { CompDTO, ContentDTO, Params } from 'wdBean';
 import { WDRouterPage, WDRouterRule } from 'wdRouter/Index';
 import { WDRouterPage, WDRouterRule } from 'wdRouter/Index';
-import { HttpUrlUtils } from 'wdNetwork/Index';
 import { postInteractAccentionOperateParams } from 'wdBean';
 import { postInteractAccentionOperateParams } from 'wdBean';
 import { PageRepository } from '../../repository/PageRepository';
 import { PageRepository } from '../../repository/PageRepository';
 import { CommonConstants } from 'wdConstant/Index';
 import { CommonConstants } from 'wdConstant/Index';
 import { ProcessUtils } from 'wdRouter';
 import { ProcessUtils } from 'wdRouter';
+import { HttpUtils } from 'wdNetwork/Index';
 
 
 /**
 /**
  * 小视频横划卡
  * 小视频横划卡
@@ -145,7 +145,7 @@ struct CreatorItem {
     this.rmhIsAttention = this.rmhIsAttention ? 0 : 1
     this.rmhIsAttention = this.rmhIsAttention ? 0 : 1
     return
     return
     // 未登录，跳转登录
     // 未登录，跳转登录
-    if (!HttpUrlUtils.getUserId()) {
+    if (!HttpUtils.getUserId()) {
       WDRouterRule.jumpWithPage(WDRouterPage.loginPage)
       WDRouterRule.jumpWithPage(WDRouterPage.loginPage)
       return
       return
     }
     }

 import { CompDTO, ContentDTO, Params } from 'wdBean';
 import { CompDTO, ContentDTO, Params } from 'wdBean';
 import { WDRouterPage, WDRouterRule } from 'wdRouter/Index';
 import { WDRouterPage, WDRouterRule } from 'wdRouter/Index';
-import { HttpUrlUtils } from 'wdNetwork/Index';
 import { postInteractAccentionOperateParams } from 'wdBean';
 import { postInteractAccentionOperateParams } from 'wdBean';
 import { PageRepository } from '../../repository/PageRepository';
 import { PageRepository } from '../../repository/PageRepository';
-import { CommonConstants } from 'wdConstant/Index';
 import { ProcessUtils } from 'wdRouter';
 import { ProcessUtils } from 'wdRouter';
+import { HttpUtils } from 'wdNetwork/Index';
 
 
 /**
 /**
  * 小视频横划卡
  * 小视频横划卡
@@ -198,7 +197,7 @@ struct CreatorItem {
     this.rmhIsAttention = this.rmhIsAttention ? 0 : 1
     this.rmhIsAttention = this.rmhIsAttention ? 0 : 1
     return
     return
     // 未登录，跳转登录
     // 未登录，跳转登录
-    if (!HttpUrlUtils.getUserId()) {
+    if (!HttpUtils.getUserId()) {
       WDRouterRule.jumpWithPage(WDRouterPage.loginPage)
       WDRouterRule.jumpWithPage(WDRouterPage.loginPage)
       return
       return
     }
     }

 import { CompDTO, ContentDTO, Params } from 'wdBean';
 import { CompDTO, ContentDTO, Params } from 'wdBean';
 import { WDRouterPage, WDRouterRule } from 'wdRouter/Index';
 import { WDRouterPage, WDRouterRule } from 'wdRouter/Index';
-import { HttpUrlUtils } from 'wdNetwork/Index';
 import { postInteractAccentionOperateParams } from 'wdBean';
 import { postInteractAccentionOperateParams } from 'wdBean';
 import { PageRepository } from '../../repository/PageRepository';
 import { PageRepository } from '../../repository/PageRepository';
 import { CommonConstants } from 'wdConstant/Index';
 import { CommonConstants } from 'wdConstant/Index';
+import { HttpUtils } from 'wdNetwork/Index';
 
 
 /**
 /**
  * 人民号横划卡
  * 人民号横划卡
@@ -172,7 +172,7 @@ struct CreatorItem {
     this.rmhIsAttention = this.rmhIsAttention ? 0 : 1
     this.rmhIsAttention = this.rmhIsAttention ? 0 : 1
     return
     return
     // 未登录，跳转登录
     // 未登录，跳转登录
-    if (!HttpUrlUtils.getUserId()) {
+    if (!HttpUtils.getUserId()) {
       WDRouterRule.jumpWithPage(WDRouterPage.loginPage)
       WDRouterRule.jumpWithPage(WDRouterPage.loginPage)
       return
       return
     }
     }

 import { commentInfo, CompDTO, ContentDTO, Params } from 'wdBean';
 import { commentInfo, CompDTO, ContentDTO, Params } from 'wdBean';
 import { WDRouterPage, WDRouterRule } from 'wdRouter/Index';
 import { WDRouterPage, WDRouterRule } from 'wdRouter/Index';
-import { HttpUrlUtils } from 'wdNetwork/Index';
+import { HttpUtils } from 'wdNetwork/Index';
 import { postInteractAccentionOperateParams } from 'wdBean';
 import { postInteractAccentionOperateParams } from 'wdBean';
 import { PageRepository } from '../../repository/PageRepository';
 import { PageRepository } from '../../repository/PageRepository';
 import { DateTimeUtils } from 'wdKit/Index';
 import { DateTimeUtils } from 'wdKit/Index';
-import { CommonConstants } from 'wdConstant/Index';
 import { ProcessUtils } from 'wdRouter';
 import { ProcessUtils } from 'wdRouter';
 
 
 /**
 /**
@@ -228,7 +227,7 @@ struct CreatorItem {
     this.rmhIsAttention = this.rmhIsAttention ? 0 : 1
     this.rmhIsAttention = this.rmhIsAttention ? 0 : 1
     return
     return
     // 未登录，跳转登录
     // 未登录，跳转登录
-    if (!HttpUrlUtils.getUserId()) {
+    if (!HttpUtils.getUserId()) {
       WDRouterRule.jumpWithPage(WDRouterPage.loginPage)
       WDRouterRule.jumpWithPage(WDRouterPage.loginPage)
       return
       return
     }
     }

 import { SpConstants } from 'wdConstant/Index'
 import { SpConstants } from 'wdConstant/Index'
 import { DateTimeUtils, SPHelper, StringUtils, ToastUtils, UserDataLocal } from 'wdKit/Index'
 import { DateTimeUtils, SPHelper, StringUtils, ToastUtils, UserDataLocal } from 'wdKit/Index'
-import { HttpUrlUtils } from 'wdNetwork/Index'
+import { HttpUtils } from 'wdNetwork/Index'
 import { WDRouterRule, WDRouterPage } from 'wdRouter/Index'
 import { WDRouterRule, WDRouterPage } from 'wdRouter/Index'
 import MinePageDatasModel from '../../../model/MinePageDatasModel'
 import MinePageDatasModel from '../../../model/MinePageDatasModel'
 import { FollowListDetailItem } from '../../../viewmodel/FollowListDetailItem'
 import { FollowListDetailItem } from '../../../viewmodel/FollowListDetailItem'
@@ -250,7 +250,7 @@ export struct FollowChildComponent{
       isLogin = false
       isLogin = false
     }
     }
     if(isLogin){
     if(isLogin){
-      let item = new FollowOperationRequestItem(this.data.cnUserType,this.data.cnUserId,this.data.creatorId,HttpUrlUtils.getUserType(),HttpUrlUtils.getUserId(),this.data.status==="0" ? 1:0)
+      let item = new FollowOperationRequestItem(this.data.cnUserType,this.data.cnUserId,this.data.creatorId,HttpUtils.getUserType(),HttpUtils.getUserId(),this.data.status==="0" ? 1:0)
       MinePageDatasModel.getFollowOperation(item,getContext(this)).then((value)=>{
       MinePageDatasModel.getFollowOperation(item,getContext(this)).then((value)=>{
         if(value!=null){
         if(value!=null){
           if (value.code === 0 || value.code.toString() === "0") {
           if (value.code === 0 || value.code.toString() === "0") {

@@ -5,7 +5,7 @@ import { Logger } from 'wdKit'
 import { PeopleShipHomePageDataModel } from '../../viewmodel/PeopleShipHomePageDataModel'
 import { PeopleShipHomePageDataModel } from '../../viewmodel/PeopleShipHomePageDataModel'
 import { PeopleShipHomeListComponent } from '../peopleShipHomePage/PeopleShipHomeListComponent'
 import { PeopleShipHomeListComponent } from '../peopleShipHomePage/PeopleShipHomeListComponent'
 import { QueryListIsFollowedItem } from '../../viewmodel/QueryListIsFollowedItem'
 import { QueryListIsFollowedItem } from '../../viewmodel/QueryListIsFollowedItem'
-import { HttpUrlUtils } from 'wdNetwork/Index'
+import { HttpUtils } from 'wdNetwork/Index'
 import { WDRouterPage, WDRouterRule } from 'wdRouter/Index'
 import { WDRouterPage, WDRouterRule } from 'wdRouter/Index'
 import { PageRepository } from '../../repository/PageRepository'
 import { PageRepository } from '../../repository/PageRepository'
 import {
 import {
@@ -108,7 +108,7 @@ struct PeopleShipHomePage {
 
 
       // 获取关注
       // 获取关注
       // 登录后获取，是否关注
       // 登录后获取，是否关注
-      if (HttpUrlUtils.getUserId()) {
+      if (HttpUtils.getUserId()) {
         let followList: QueryListIsFollowedItem[] = await PeopleShipHomePageDataModel.getHomePageFollowListStatusData(this.creatorId)
         let followList: QueryListIsFollowedItem[] = await PeopleShipHomePageDataModel.getHomePageFollowListStatusData(this.creatorId)
         Logger.debug('PeopleShipHomePage', '获取关注信息', `${JSON.stringify(followList)}`)
         Logger.debug('PeopleShipHomePage', '获取关注信息', `${JSON.stringify(followList)}`)
         this.findFollowStata(followList)
         this.findFollowStata(followList)
@@ -135,7 +135,7 @@ struct PeopleShipHomePage {
       return
       return
     }
     }
     // 未登录，跳转登录
     // 未登录，跳转登录
-    if (!HttpUrlUtils.getUserId()) {
+    if (!HttpUtils.getUserId()) {
       this.isLoadingAttention = false
       this.isLoadingAttention = false
       WDRouterRule.jumpWithPage(WDRouterPage.loginPage)
       WDRouterRule.jumpWithPage(WDRouterPage.loginPage)
       return
       return

-import dataPreferences from '@ohos.data.preferences';
 import { PermissionUtil } from 'wdKit'
 import { PermissionUtil } from 'wdKit'
-import { SPHelper } from 'wdKit'
-import hilog from '@ohos.hilog';
 import { PrivacySettingModel } from '../../model/PrivacySettingModel'
 import { PrivacySettingModel } from '../../model/PrivacySettingModel'
 import { Params } from 'wdBean';
 import { Params } from 'wdBean';
 import { WDRouterPage, WDRouterRule } from 'wdRouter';
 import { WDRouterPage, WDRouterRule } from 'wdRouter';
-import { HttpUrlUtils } from 'wdNetwork/Index';
+import { HttpUtils } from 'wdNetwork/Index';
 
 
 const TAG = 'PrivacySettingPage';
 const TAG = 'PrivacySettingPage';
 const DiyString = '开启个性化推荐'
 const DiyString = '开启个性化推荐'
@@ -24,7 +21,7 @@ export struct PrivacySettingPage {
   }
   }
 
 
   aboutToAppear() {
   aboutToAppear() {
-    if (!HttpUrlUtils.getUserId()) {
+    if (!HttpUtils.getUserId()) {
       this.listData.splice(0, 1);
       this.listData.splice(0, 1);
     }
     }
     // 获取权限=
     // 获取权限=

 import { ContentDTO } from 'wdBean/Index'
 import { ContentDTO } from 'wdBean/Index'
 import { LazyDataSource, UserDataLocal } from 'wdKit/Index'
 import { LazyDataSource, UserDataLocal } from 'wdKit/Index'
-import { HttpUrlUtils } from 'wdNetwork/Index'
+import { HttpUtils } from 'wdNetwork/Index'
 import SearcherAboutDataModel from '../../model/SearcherAboutDataModel'
 import SearcherAboutDataModel from '../../model/SearcherAboutDataModel'
 import { SearchSuggestRequestItem } from '../../viewmodel/SearchSuggestRequestItem'
 import { SearchSuggestRequestItem } from '../../viewmodel/SearchSuggestRequestItem'
 import { CardParser } from '../CardParser'
 import { CardParser } from '../CardParser'
@@ -36,7 +36,7 @@ export struct SearchResultComponent {
   getSuggestData() {
   getSuggestData() {
     this.isLoading = true
     this.isLoading = true
 
 
-    let request: SearchSuggestRequestItem = new SearchSuggestRequestItem(2, "", "", HttpUrlUtils.getImei(), UserDataLocal.getUserId(), 8, "")
+    let request: SearchSuggestRequestItem = new SearchSuggestRequestItem(2, "", "", HttpUtils.getImei(), UserDataLocal.getUserId(), 8, "")
 
 
     SearcherAboutDataModel.getSearchSuggestData(request, getContext(this)).then((value) => {
     SearcherAboutDataModel.getSearchSuggestData(request, getContext(this)).then((value) => {
       value.forEach((item) => {
       value.forEach((item) => {

-import { HttpBizUtil, HttpUrlUtils, ResponseDTO } from 'wdNetwork';
+import { HttpBizUtil, HttpUrlUtils, HttpUtils, ResponseDTO } from 'wdNetwork';
 
 
 export class LogoutModel{
 export class LogoutModel{
 
 
   requestLogout(){
   requestLogout(){
     let bean: Record<string, string> = {};
     let bean: Record<string, string> = {};
-    bean['refreshToken'] = HttpUrlUtils.getRefreshToken()
+    bean['refreshToken'] = HttpUtils.getRefreshToken()
     return new Promise<string>((success, fail) => {
     return new Promise<string>((success, fail) => {
       HttpBizUtil.post<ResponseDTO<string>>(HttpUrlUtils.accountLogoutUrl(), bean).then((data: ResponseDTO<string>) => {
       HttpBizUtil.post<ResponseDTO<string>>(HttpUrlUtils.accountLogoutUrl(), bean).then((data: ResponseDTO<string>) => {
         if (!data) {
         if (!data) {

@@ -2,7 +2,7 @@
 import MinePagePersonalFunctionsItem from '../viewmodel/MinePagePersonalFunctionsItem'
 import MinePagePersonalFunctionsItem from '../viewmodel/MinePagePersonalFunctionsItem'
 import MinePageCreatorFunctionsItem from '../viewmodel/MinePageCreatorFunctionsItem'
 import MinePageCreatorFunctionsItem from '../viewmodel/MinePageCreatorFunctionsItem'
 import MinePageMoreFunctionModel from '../viewmodel/MinePageMoreFunctionModel';
 import MinePageMoreFunctionModel from '../viewmodel/MinePageMoreFunctionModel';
-import { HttpBizUtil, HttpUrlUtils, ResponseDTO, WDHttp } from 'wdNetwork';
+import { HttpBizUtil, HttpUrlUtils, HttpUtils, ResponseDTO, WDHttp } from 'wdNetwork';
 import { MineAppointmentListItem } from '../viewmodel/MineAppointmentListItem';
 import { MineAppointmentListItem } from '../viewmodel/MineAppointmentListItem';
 import { Logger, StringUtils } from 'wdKit';
 import { Logger, StringUtils } from 'wdKit';
 import { MineFollowListDetailItem } from '../viewmodel/MineFollowListDetailItem';
 import { MineFollowListDetailItem } from '../viewmodel/MineFollowListDetailItem';
@@ -470,7 +470,7 @@ class MinePageDatasModel{
   }
   }
 
 
   fetchOtherUserFollowListData(object:UserFollowListRequestItem) {
   fetchOtherUserFollowListData(object:UserFollowListRequestItem) {
-    let url = HttpUrlUtils.getOtherUserFollowListDataUrl()+`?pageSize=${object.pageSize}&pageNum=${object.pageNum}&queryUserId=${object.queryUserId}&userType=${object.userType}&userId=${HttpUrlUtils.getUserId()}`
+    let url = HttpUrlUtils.getOtherUserFollowListDataUrl()+`?pageSize=${object.pageSize}&pageNum=${object.pageNum}&queryUserId=${object.queryUserId}&userType=${object.userType}&userId=${HttpUtils.getUserId()}`
     return WDHttp.get<ResponseDTO<MineFollowListItem>>(url)
     return WDHttp.get<ResponseDTO<MineFollowListItem>>(url)
   };
   };
 
 

-import { HttpUrlUtils, ResponseDTO, WDHttp } from 'wdNetwork';
+import { HttpUrlUtils, HttpUtils, ResponseDTO, WDHttp } from 'wdNetwork';
 import { DateTimeUtils, Logger, StringUtils } from 'wdKit';
 import { DateTimeUtils, Logger, StringUtils } from 'wdKit';
 import {
 import {
   batchLikeAndCollectResult,
   batchLikeAndCollectResult,
@@ -52,9 +52,9 @@ export class PageRepository {
     }
     }
     url = url + "?channelStrategy=" + pageBean.groupStrategy
     url = url + "?channelStrategy=" + pageBean.groupStrategy
       + "&loadStrategy=" + loadStrategy
       + "&loadStrategy=" + loadStrategy
-      + "&districtCode=" + HttpUrlUtils.getDistrictCode()
-      + "&provinceCode=" + HttpUrlUtils.getProvinceCode()
-      + "&cityCode=" + HttpUrlUtils.getCityCode()
+      + "&districtCode=" + HttpUtils.getDistrictCode()
+      + "&provinceCode=" + HttpUtils.getProvinceCode()
+      + "&cityCode=" + HttpUtils.getCityCode()
       + "&refreshTime=" + DateTimeUtils.getTimeStamp()
       + "&refreshTime=" + DateTimeUtils.getTimeStamp()
       + "&pageId=" + pageBean.pageId
       + "&pageId=" + pageBean.pageId
       + "&groupId=" + pageBean.groupId
       + "&groupId=" + pageBean.groupId
@@ -83,9 +83,9 @@ export class PageRepository {
     }
     }
     url = url + "?channelStrategy=" + pageBean.groupStrategy
     url = url + "?channelStrategy=" + pageBean.groupStrategy
       + "&loadStrategy=" + loadStrategy
       + "&loadStrategy=" + loadStrategy
-      + "&districtCode=" + HttpUrlUtils.getDistrictCode()
-      + "&provinceCode=" + HttpUrlUtils.getProvinceCode()
-      + "&cityCode=" + HttpUrlUtils.getCityCode()
+      + "&districtCode=" + HttpUtils.getDistrictCode()
+      + "&provinceCode=" + HttpUtils.getProvinceCode()
+      + "&cityCode=" + HttpUtils.getCityCode()
       + "&refreshTime=" + DateTimeUtils.getTimeStamp()
       + "&refreshTime=" + DateTimeUtils.getTimeStamp()
       + "&pageId=" + pageBean.pageId
       + "&pageId=" + pageBean.pageId
       + "&groupId=" + pageBean.groupId
       + "&groupId=" + pageBean.groupId

 import { SpConstants } from 'wdConstant/Index'
 import { SpConstants } from 'wdConstant/Index'
 import { SPHelper, UserDataLocal } from 'wdKit/Index'
 import { SPHelper, UserDataLocal } from 'wdKit/Index'
-import { HttpUrlUtils } from 'wdNetwork/Index'
+import { HttpUtils } from 'wdNetwork/Index'
 import { LogoutModel } from '../model/LogoutModel'
 import { LogoutModel } from '../model/LogoutModel'
 
 
 export class LogoutViewModel{
 export class LogoutViewModel{
@@ -29,9 +29,9 @@ export class LogoutViewModel{
     SPHelper.default.saveSync(SpConstants.USER_Type, '')
     SPHelper.default.saveSync(SpConstants.USER_Type, '')
     SPHelper.default.saveSync(SpConstants.USER_NAME, '')
     SPHelper.default.saveSync(SpConstants.USER_NAME, '')
     SPHelper.default.saveSync(SpConstants.USER_PHONE, '')
     SPHelper.default.saveSync(SpConstants.USER_PHONE, '')
-    HttpUrlUtils.setUserId("")
-    HttpUrlUtils.setUserType("")
-    HttpUrlUtils.setUserToken('')
+    HttpUtils.setUserId("")
+    HttpUtils.setUserType("")
+    HttpUtils.setUserToken('')
     UserDataLocal.clearUserData()
     UserDataLocal.clearUserData()
   }
   }
 }
 }

@@ -2,7 +2,7 @@ import font from '@ohos.font'
 import { LiveDetailsBean } from 'wdBean/Index'
 import { LiveDetailsBean } from 'wdBean/Index'
 import { DateTimeUtils, StringUtils } from 'wdKit/Index'
 import { DateTimeUtils, StringUtils } from 'wdKit/Index'
 import { LiveViewModel } from '../../viewModel/LiveViewModel'
 import { LiveViewModel } from '../../viewModel/LiveViewModel'
-import { HttpUrlUtils } from 'wdNetwork/Index'
+import { HttpUtils } from 'wdNetwork/Index'
 import { WDRouterPage, WDRouterRule } from 'wdRouter/Index'
 import { WDRouterPage, WDRouterRule } from 'wdRouter/Index'
 
 
 @Component
 @Component
@@ -116,7 +116,7 @@ export struct LiveCountdownComponent {
       .border({ radius: 4 })
       .border({ radius: 4 })
       .backgroundColor(this.isAppointmentLive ? '#CCCCCC' : '#ED2800')
       .backgroundColor(this.isAppointmentLive ? '#CCCCCC' : '#ED2800')
       .onClick(() => {
       .onClick(() => {
-        if (!HttpUrlUtils.getUserId()) {
+        if (!HttpUtils.getUserId()) {
           WDRouterRule.jumpWithPage(WDRouterPage.loginPage)
           WDRouterRule.jumpWithPage(WDRouterPage.loginPage)
           return
           return
         }
         }

@@ -7,7 +7,7 @@ import {
   postBatchAttentionStatusParams,
   postBatchAttentionStatusParams,
   postInteractBrowsOperateParams
   postInteractBrowsOperateParams
 } from 'wdDetailPlayApi/src/main/ets/request/ContentDetailRequest';
 } from 'wdDetailPlayApi/src/main/ets/request/ContentDetailRequest';
-import { HttpUrlUtils } from 'wdNetwork/Index';
+import { HttpUtils } from 'wdNetwork/Index';
 import { DateTimeUtils } from 'wdKit/Index';
 import { DateTimeUtils } from 'wdKit/Index';
 import { PlayerBottomView } from '../view/PlayerBottomView';
 import { PlayerBottomView } from '../view/PlayerBottomView';
 import { PlayerRightView } from '../view/PlayerRightView';
 import { PlayerRightView } from '../view/PlayerRightView';
@@ -85,7 +85,7 @@ export struct DetailPlayShortVideoPage {
    * 查询用户点赞、收藏、关注状态、记录浏览历史
    * 查询用户点赞、收藏、关注状态、记录浏览历史
    */
    */
   queryNewsInfoOfUser() {
   queryNewsInfoOfUser() {
-    if (HttpUrlUtils.getUserId()) {
+    if (HttpUtils.getUserId()) {
       const params: batchLikeAndCollectParams = {
       const params: batchLikeAndCollectParams = {
         contentList: [
         contentList: [
           {
           {

 import HashMap from '@ohos.util.HashMap';
 import HashMap from '@ohos.util.HashMap';
-import { HttpBizUtil, HttpUrlUtils, ResponseDTO } from 'wdNetwork';
+import { HttpBizUtil, HttpUrlUtils, HttpUtils, ResponseDTO } from 'wdNetwork';
 import { Logger } from 'wdKit';
 import { Logger } from 'wdKit';
 import { HttpRequest } from 'wdNetwork/src/main/ets/http/HttpRequest';
 import { HttpRequest } from 'wdNetwork/src/main/ets/http/HttpRequest';
 import { LoginBean } from './LoginBean';
 import { LoginBean } from './LoginBean';
 import { CheckVerifyBean } from './CheckVerifyBean';
 import { CheckVerifyBean } from './CheckVerifyBean';
-import {
-  SpConstants
-} from '../../../../../../../commons/wdNetwork/oh_modules/wdConstant/src/main/ets/constants/SpConstants'
 import { UserDetail } from 'wdBean/Index';
 import { UserDetail } from 'wdBean/Index';
 
 
-
 const TAG = 'LoginModel'
 const TAG = 'LoginModel'
 
 
 export class LoginModel {
 export class LoginModel {
@@ -213,7 +209,7 @@ export class LoginModel {
   //退出登录
   //退出登录
   logOut() {
   logOut() {
     let bean: Record<string, string> = {};
     let bean: Record<string, string> = {};
-    bean['refreshToken'] = HttpUrlUtils.getRefreshToken();
+    bean['refreshToken'] = HttpUtils.getRefreshToken();
 
 
     return new Promise<string>((success, fail) => {
     return new Promise<string>((success, fail) => {
       HttpBizUtil.post<ResponseDTO<string>>(HttpUrlUtils.getLogoutUrl(), bean).then((data: ResponseDTO<string>)=>{
       HttpBizUtil.post<ResponseDTO<string>>(HttpUrlUtils.getLogoutUrl(), bean).then((data: ResponseDTO<string>)=>{

@@ -7,9 +7,9 @@ import cryptoFramework from '@ohos.security.cryptoFramework'
 import buffer from '@ohos.buffer'
 import buffer from '@ohos.buffer'
 import { encryptMessage } from '../../utils/cryptoUtil'
 import { encryptMessage } from '../../utils/cryptoUtil'
 
 
-import { HttpUrlUtils } from 'wdNetwork/src/main/ets/http/HttpUrlUtils'
 import { SpConstants } from 'wdConstant/Index'
 import { SpConstants } from 'wdConstant/Index'
 import { UserDetail } from 'wdBean/Index';
 import { UserDetail } from 'wdBean/Index';
+import { HttpUtils } from 'wdNetwork/Index'
 
 
 const TAG = "LoginViewModel"
 const TAG = "LoginViewModel"
 
 
@@ -55,9 +55,9 @@ export class LoginViewModel {
         SPHelper.default.saveSync(SpConstants.USER_STATUS, data.status)
         SPHelper.default.saveSync(SpConstants.USER_STATUS, data.status)
         SPHelper.default.saveSync(SpConstants.USER_Type, data.userType)
         SPHelper.default.saveSync(SpConstants.USER_Type, data.userType)
         SPHelper.default.saveSync(SpConstants.USER_NAME, data.userName)
         SPHelper.default.saveSync(SpConstants.USER_NAME, data.userName)
-        HttpUrlUtils.setUserId(data.id+"")
-        HttpUrlUtils.setUserType(data.userType+"")
-        HttpUrlUtils.setUserToken(data.jwtToken)
+        HttpUtils.setUserId(data.id+"")
+        HttpUtils.setUserType(data.userType+"")
+        HttpUtils.setUserToken(data.jwtToken)
         success(data)
         success(data)
       }).catch((error:string) => {
       }).catch((error:string) => {
         fail(error)
         fail(error)
@@ -79,9 +79,9 @@ export class LoginViewModel {
         SPHelper.default.saveSync(SpConstants.USER_STATUS, data.status)
         SPHelper.default.saveSync(SpConstants.USER_STATUS, data.status)
         SPHelper.default.saveSync(SpConstants.USER_Type, data.userType)
         SPHelper.default.saveSync(SpConstants.USER_Type, data.userType)
         SPHelper.default.saveSync(SpConstants.USER_NAME, data.userName)
         SPHelper.default.saveSync(SpConstants.USER_NAME, data.userName)
-        HttpUrlUtils.setUserId(data.id+"")
-        HttpUrlUtils.setUserType(data.userType+"")
-        HttpUrlUtils.setUserToken(data.jwtToken)
+        HttpUtils.setUserId(data.id+"")
+        HttpUtils.setUserType(data.userType+"")
+        HttpUtils.setUserToken(data.jwtToken)
         success(data)
         success(data)
       }).catch((value: string) => {
       }).catch((value: string) => {
         fail(value)
         fail(value)
@@ -157,9 +157,9 @@ export class LoginViewModel {
         SPHelper.default.saveSync(SpConstants.USER_STATUS, '')
         SPHelper.default.saveSync(SpConstants.USER_STATUS, '')
         SPHelper.default.saveSync(SpConstants.USER_Type, '')
         SPHelper.default.saveSync(SpConstants.USER_Type, '')
         SPHelper.default.saveSync(SpConstants.USER_NAME, '')
         SPHelper.default.saveSync(SpConstants.USER_NAME, '')
-        HttpUrlUtils.setUserId("")
-        HttpUrlUtils.setUserType("")
-        HttpUrlUtils.setUserToken('')
+        HttpUtils.setUserId("")
+        HttpUtils.setUserType("")
+        HttpUtils.setUserToken('')
         success(data)
         success(data)
       }).catch((message: string) => {
       }).catch((message: string) => {
         fail(message)
         fail(message)