feat:

1. 新增业务请求逻辑 API
2. 修改用户请求接口

commons/basic/src/main/ets/apis/YTRequest.ets

@@ -13,7 +13,7 @@ import { yTRouter } from '../utils/YTRouter';
 
 // export const baseURL: string = 'https://hm-test.ytpm.net/prod-api'
 
-export const baseURL: string = 'http://192.168.1.160:9900'
+export const baseURL: string = 'http://192.168.1.160:48099/'
 
 export const instance = axios.create({
   baseURL,

commons/basic/src/main/ets/apis/YTUserRequest.ets

@@ -1,11 +1,11 @@
 import { IBestToast } from '@ibestservices/ibest-ui'
-import { AppStorageKeyCollect } from '../constants'
+import { AppStorageKeyCollect, YTUserUrl } from '../constants'
 import { ReqString, ResultCallBack } from '../models'
 import { LoginCollect } from '../models/LoginCollect'
 import { UserInfo, userInfo } from '../models/UserInfo'
 import { yTRouter } from '../utils/YTRouter'
 import { YTRequest } from './YTRequest'
-import { YTLog } from '../../../../Index'
+import { YTLog, yTToast } from '../../../../Index'
 import { AxiosProgressEvent, FormData } from '@ohos/axios'
 import { YTDate } from '../utils/FormatDate'
 import { HuaweiAuthPlugin } from '../utils/HuaWeiAuthPlugin'
@@ -15,7 +15,7 @@ export class YTUserRequest extends YTRequest {
   //获取验证码
   static getLoginCaptcha(phonenumber: string, result: ResultCallBack<LoginCollect>) {
     YTUserRequest.post<LoginCollect, LoginCollect>(
-      `/warehouseApUser/sendSmsCode`,
+      YTUserUrl.SEND_SMS_CODE,
       new LoginCollect('login')
         .setPhonenumber(phonenumber)
     )
@@ -30,7 +30,7 @@ export class YTUserRequest extends YTRequest {
   //验证码登录
   static phonenumberLogin(param: LoginCollect, result?: ResultCallBack<UserInfo>) {
     if (param.getUuid() !== undefined) {
-      YTUserRequest.post<ReqString, LoginCollect>(`/warehouseApUser/phoneLogin`, param)
+      YTUserRequest.post<ReqString, LoginCollect>(YTUserUrl.PHONE_LOGIN, param)
         .then(res => {
           userInfo.setToken(res[AppStorageKeyCollect.TOKEN])
           YTUserRequest.refreshUserInfo((res) => {
@@ -47,7 +47,7 @@ export class YTUserRequest extends YTRequest {
   //注册
   static register(param: LoginCollect) {
     if (param.getUuid() !== undefined) {
-      YTUserRequest.post<ReqString, LoginCollect>(`/warehouseApUser/phoneSave`, param)
+      YTUserRequest.post<ReqString, LoginCollect>(YTUserUrl.PHONE_SAVE, param)
         .then(res => {
           userInfo.setToken(res[AppStorageKeyCollect.TOKEN])
           YTUserRequest.refreshUserInfo(() => {
@@ -62,7 +62,7 @@ export class YTUserRequest extends YTRequest {
 
   //密码登录
   static passwordLogin(param: LoginCollect, result?: ResultCallBack<UserInfo>) {
-    YTUserRequest.post<ReqString, LoginCollect>(`/warehouseApUser/passwordLogin`, param)
+    YTUserRequest.post<ReqString, LoginCollect>(YTUserUrl.PASSWORD_LOGIN, param)
       .then(res => {
         userInfo.setToken(res[AppStorageKeyCollect.TOKEN])
         YTUserRequest.refreshUserInfo((res) => {
@@ -75,7 +75,7 @@ export class YTUserRequest extends YTRequest {
 
   //重置密码
   static resetPassword(param: LoginCollect, result?: ResultCallBack<undefined>) {
-    YTUserRequest.post<ReqString, LoginCollect>(`/warehouseApUser/resetPwd`, param)
+    YTUserRequest.post<ReqString, LoginCollect>(YTUserUrl.RESET_PWD, param)
       .then(() => {
         result?.()
       })
@@ -88,7 +88,7 @@ export class YTUserRequest extends YTRequest {
       HuaweiAuthPlugin.requestAuth()
         .then(code => {
           instance.setCode(code!)
-          YTUserRequest.post<ReqString, LoginCollect>(`/warehouseApUser/hmLogin`,
+          YTUserRequest.post<ReqString, LoginCollect>(YTUserUrl.HM_LOGIN,
             instance)
             .then(data => {
               const token = data['token']
@@ -119,7 +119,7 @@ export class YTUserRequest extends YTRequest {
 
   //刷新用户信息
   static refreshUserInfo(result?: ResultCallBack<UserInfo>) {
-    YTUserRequest.post<UserInfo, null>(`/warehouseApUser/info`)
+    YTUserRequest.post<UserInfo, null>(YTUserUrl.USER_INFO)
       .then(res => {
         userInfo.setUserInfoAndLogin(res)
         YTLog.info(userInfo)
@@ -163,7 +163,7 @@ export class YTUserRequest extends YTRequest {
     })
       .then(res => {
         const url = res['url']
-        YTUserRequest.post<null, ReqString>(`/warehouseApUser/modifyMemberIcon`,
+        YTUserRequest.post<null, ReqString>(YTUserUrl.MODIFY_MEMBER_ICON,
           { 'memberIcon': url })
           .then(() => {
             success()
@@ -180,7 +180,7 @@ export class YTUserRequest extends YTRequest {
 
   // 修改用户昵称
   static changeNickname(name: string, success: () => void) {
-    YTUserRequest.post<null, ReqString>(`/warehouseApUser/modifyMemberName`,
+    YTUserRequest.post<null, ReqString>(YTUserUrl.MODIFY_MEMBER_NAME,
       { 'memberName': name })
       .then(() => {
         YTUserRequest.refreshUserInfo(() => {
@@ -191,7 +191,7 @@ export class YTUserRequest extends YTRequest {
 
   //问题反馈
   static questionBack(des: string, createBy: string) {
-    YTUserRequest.post<null, ReqString>(`/warehouseBack/saveQuestion`, {
+    YTUserRequest.post<null, ReqString>(YTUserUrl.SAVE_QUESTION, {
       'backQuestion': des,
       'createBy': createBy,
       'createTime': new YTDate().formatDate(),
@@ -204,4 +204,18 @@ export class YTUserRequest extends YTRequest {
         YTLog.error(e)
       })
   }
+
+  // 用户注销账号
+  static logout() {
+    YTUserRequest.post<null, null>(YTUserUrl.LOGIN_OUT)
+      .then(() => {
+        IBestToast.show("注销成功")
+        userInfo.logout()
+        yTToast.hide()
+        yTRouter.routerBack()
+      })
+      .catch((e: Error) => {
+        YTLog.error(e)
+      })
+  }
 }

commons/basic/src/main/ets/constants/index.ets

@@ -38,4 +38,51 @@ export enum AppStorageKeyCollect {
    * @description 验证码登录手机号与验证码
    */
   CAPTCHA_LOGIN = 'captchaLogin'
+}
+
+export enum YTUserUrl {
+  /**
+   * @description 获取验证码
+   */
+  SEND_SMS_CODE = `/diaryApUser/sendSmsCode`,
+  /**
+   * @description 验证码登录
+   */
+  PHONE_LOGIN = `/diaryApUser/phoneLogin`,
+  /**
+   * @description 注册
+   */
+  PHONE_SAVE = `/diaryApUser/phoneSave`,
+  /**
+   * @description 密码登录
+   */
+  PASSWORD_LOGIN = `/diaryApUser/passwordLogin`,
+  /**
+   * @description 重置密码
+   */
+  RESET_PWD = `/diaryApUser/resetPwd`,
+  /**
+   * @description 华为登录
+   */
+  HM_LOGIN = `/diaryApUser/hmLogin`,
+  /**
+   * @description 获取用户信息
+   */
+  USER_INFO = `/diaryApUser/info`,
+  /**
+   * @description 修改用户头像
+   */
+  MODIFY_MEMBER_ICON = `/diaryApUser/modifyMemberIcon`,
+  /**
+   * @description 修改用户昵称
+   */
+  MODIFY_MEMBER_NAME = `/diaryApUser/modifyMemberName`,
+  /**
+   * @description 保存问题反馈
+   */
+  SAVE_QUESTION = `/diaryApUser/saveQuestion`,
+  /**
+   * @description 注销账号
+   */
+  LOGIN_OUT = '/api/diaryApUser/member/logout'
 }

features/feature/src/main/ets/apis/ApiUrl.ets

@@ -0,0 +1,50 @@
+export class ApiUrl{
+  /**
+   * 删除日记
+   */
+  public static DELETE_DIARY_LOG = '/diaryLog/deleteDiaryLog'
+  /**
+   * 新增日记
+   */
+  public static LOG_SAVE = '/diaryLog/logSave'
+  /**
+   * 查询日记详情
+   */
+  public static QUERY_DIARY_LOG_BY_ID = '/diaryLog/queryDiaryLogById'
+  /**
+   * 查询日记列表
+   */
+  public static QUERY_DIARY_LOG_LIST = '/diaryLog/queryDiaryLogList'
+  /**
+   * 日记搜索
+   */
+  public static DIARY_LOG_SEARCH = '/diaryLog/search'
+  /**
+   * 修改日记
+   */
+  public static UPDATE_DIARY_LOG = '/diaryLog/updateDiaryLog'
+  /**
+   * 删除生活小记录
+   */
+  public static DELETE_NOTE = '/diaryNote/deleteNote'
+  /**
+   * 添加生活小记录
+   */
+  public static NOTE_SAVE = '/diaryNote/noteSave'
+  /**
+   * 查询生活小记录
+   */
+  public static QUERY_BY_NOTE_LIST = '/diaryNote/queryByNoteList'
+  /**
+   * 查询生活小记录对象
+   */
+  public static QUERY_NOTE_BY_ID = '/diaryNote/queryNoteById'
+  /**
+   * 编辑生活小记录
+   */
+  public static UPDATE_NOTE = '/diaryNote/updateNote'
+  /**
+   * 修改生活小记录时间
+   */
+  public static UPDATE_NOTE_TIME = '/diaryNote/updateNoteTime'
+}

features/feature/src/main/ets/apis/DiaryApi.ets

@@ -1,3 +1,113 @@
-export class ApiUrl {
+import { YTRequest } from "basic";
+import { DiaryData } from "../models";
+import { ApiUrl } from "./ApiUrl";
 
+export class DiaryApi {
+  /**
+   * 删除日记
+   * @param id 日记id
+   * @returns
+   */
+  static deleteDiaryLog(id: number): Promise<boolean> {
+    return YTRequest.delete<boolean>(ApiUrl.DELETE_DIARY_LOG + '?id=' + id)
+  }
+
+  /**
+   * 新增日记
+   * @param params 日记数据结构
+   * @returns
+   */
+  static saveDiaryLog(params: DiaryData): Promise<boolean> {
+    return YTRequest.post<boolean, DiaryData>(ApiUrl.LOG_SAVE, params)
+  }
+
+  /**
+   * 返回对应 id 的日记详情
+   * @param id 日记id
+   * @returns
+   */
+  static queryDiaryLogById(id: string): Promise<DiaryData> {
+    return YTRequest.get<DiaryData>(ApiUrl.QUERY_DIARY_LOG_BY_ID + '?id=' + id)
+  }
+
+  /**
+   * 查询日记列表
+   * @param nowTime 当前时间
+   * @returns 日记列表
+   */
+  static queryDiaryLogList(nowTime: string): Promise<DiaryData[]> {
+    return YTRequest.post<DiaryData[], number>(ApiUrl.QUERY_DIARY_LOG_LIST + '?nowTime=' + nowTime)
+  }
+
+  /**
+   * 日记搜索
+   * @param keyword 标题关键字
+   * @returns 日记列表
+   */
+  static diaryLogSearch(keyword: string): Promise<DiaryData[]> {
+    return YTRequest.post<DiaryData[], string>(ApiUrl.DIARY_LOG_SEARCH + '?keyword=' + keyword)
+  }
+
+  /**
+   * 修改日记
+   * @param params 日记数据结构
+   * @returns
+   */
+  static updateDiaryLog(params: DiaryData): Promise<boolean> {
+    return YTRequest.post<boolean, DiaryData>(ApiUrl.UPDATE_DIARY_LOG, params)
+  }
+
+  /**
+   * 删除生活小记录
+   * @param id 生活小记录id
+   * @returns
+   */
+  static deleteNote(id: string): Promise<boolean> {
+    return YTRequest.delete<boolean>(ApiUrl.DELETE_NOTE + '?id=' + id)
+  }
+
+  /**
+   * 添加生活小记录
+   * @param params 生活小记录数据结构
+   * @returns
+   */
+  static saveNote(params: DiaryData): Promise<boolean> {
+    return YTRequest.post<boolean, DiaryData>(ApiUrl.NOTE_SAVE, params)
+  }
+
+  /**
+   * 查询生活小记录
+   * @param nowTime 当前选中的时间
+   * @returns 生活小记录列表
+   */
+  static queryNoteList(nowTime: string): Promise<DiaryData[]> {
+    return YTRequest.post<DiaryData[], string>(ApiUrl.QUERY_BY_NOTE_LIST + '?nowTime=' + nowTime)
+  }
+
+  /**
+   * 查询生活小记录对象
+   * @param id 生活小记录id
+   * @returns
+   */
+  static queryNoteById(id: string): Promise<DiaryData> {
+    return YTRequest.get<DiaryData>(ApiUrl.QUERY_NOTE_BY_ID + '?id=' + id)
+  }
+
+  /**
+   * 编辑生活小记录
+   * @param params 生活小记录数据结构
+   * @returns
+   */
+  static updateNote(params: DiaryData): Promise<boolean> {
+    return YTRequest.post<boolean, DiaryData>(ApiUrl.UPDATE_NOTE, params)
+  }
+
+  /**
+   * 修改生活小记录时间
+   * @param params 生活小记录数据结构
+   * @returns
+   */
+  static updateNoteTime(params: DiaryData): Promise<boolean> {
+    return YTRequest.post<boolean, DiaryData>(ApiUrl.UPDATE_NOTE_TIME, params)
+  }
 }

features/feature/src/main/ets/models/index.ets

@@ -0,0 +1,17 @@
+/**
+ * 日记详细数据模型
+ */
+export interface DiaryData{
+  // 富文本正文
+  content?: string,
+  // 日记日期
+  diaryDate?: string,
+  // 日记id
+  id?: number,
+  // 图片地址集合
+  imageUrls?: string[],
+  // 日记标题
+  title?: string,
+  // 用户id
+  userId?: number
+}