diff --git a/env.js b/env.js index 7dd7b85..8b6d73a 100644 --- a/env.js +++ b/env.js @@ -1,7 +1,7 @@ // uni版本号 -export const uniVersion = '1.0.1' +export const uniVersion = '1.0.2' // uni构建号 -export const uniBuildNumber = 2 +export const uniBuildNumber = 3 // web版本号 export const webVersion = '1.0.1' diff --git a/package.json b/package.json index f67ab33..51ac76e 100644 --- a/package.json +++ b/package.json @@ -1,8 +1,8 @@ { - "name": "star-cloud-web", - "version": "1.0.1", + "name": "star-cloud-uni", + "version": "1.0.2", "type": "module", - "main": "./web/index.js", + "main": "./uni/index.js", "author": "zzc059", "scripts": { "web-build": "node obfuscate-web.js", diff --git a/star-cloud/password.js b/star-cloud/password.js index 49e43d9..da44bea 100644 --- a/star-cloud/password.js +++ b/star-cloud/password.js @@ -77,7 +77,10 @@ export async function customPassword(params) { if (password.keyboardPwdId) { checkPasswordParams.keyboardPwdId = password.keyboardPwdId } - const checkPasswordResult = await this.checkPassword(checkPasswordParams) + const checkPasswordResult = await this.checkPassword({ + uid:params.uid, + info:checkPasswordParams + }) if (checkPasswordResult.code === -3) { return Result.ReadyHasPassword } @@ -291,5 +294,11 @@ export async function updateAdminPassword(params) { // 检查密码名称与密码是否已存在 export async function checkPassword(params) { - return await checkPasswordRequest(params) + const { info } = params + // 设置执行账号 + const result = await this.login(params.uid) + if (result.code !== Result.Success.code) { + return result + } + return await checkPasswordRequest(info) } diff --git a/uni.md b/uni.md index e89fa61..64d0b75 100644 --- a/uni.md +++ b/uni.md @@ -448,6 +448,36 @@ keyboardPwdType 密码类型 | keyboardPwdId | Number | 密码ID | | keyboardPwdStatus | Number | 密码状态 1:正常 2:已过期 3:待生效 | +## 检查密码是否重复 + +**调用方法** + +```javascript +import { checkPassword } from 'star-cloud-uni' + +checkPassword(params) +``` + +**入参** + +| 参数名称 | 数据类型 | 必须 | 描述 | +|------|-----------|----|-------| +| uid | Number | N | 用户uid | +| info | CheckInfo | Y | 信息 | + +CheckInfo 检查密码信息 + +| 属性 | 数据类型 | 必须 | 描述 | +|-----------------|--------|----|-------| +| lockId | Number | Y | 锁 Id | +| keyboardPwdName | String | N | 密码名称 | +| keyboardPwdId | String | N | 密码 Id | +| keyboardPwd | String | N | 密码 | + +**返回** + +无 + ## 修改超级管理员密码 **调用方法** diff --git a/uni/index.js b/uni/index.js index 59b6b2d..5ba159d 100644 --- a/uni/index.js +++ b/uni/index.js @@ -91,6 +91,26 @@ export const getOfflinePassword = async params => { return await starCloudInstance.getOfflinePassword(params) } +/** + * 账户信息 + * @typedef {Object} CheckInfo + * @property {Number} lockId 锁ID + * @property {Number} [keyboardPwdId] 密码ID + * @property {String} [keyboardPwdName] 密码名称 + * @property {String} [keyboardPwd] 密码 + */ + +/** + * 检查密码 + * @param params + * @param {Number} [params.uid] 用户ID + * @param {CheckInfo} params.info 信息 + * @returns Result + */ +export const checkPassword = async params => { + return await starCloudInstance.checkPassword(params) +} + /** * 自定义密码 * @typedef {Object} CustomPassword @@ -151,7 +171,7 @@ export const bindDevice = async params => { * 移除坏锁 * @param params * @param {Number} [params.uid] 用户ID - * @param {List[Number]} params.lockIds 锁Id列表 + * @param {Array[Number]} params.lockIds 锁Id列表 * @returns Result */ export const removeBadLock = async params => {