Commit 3432548c1a7eeac6ecfc71916ba34ae76cf32412
1 parent
18f8f2e6
修复用户更新sql错误,ffmpeg拉流代理超时时间错误
Showing
2 changed files
with
7 additions
and
7 deletions
src/main/java/com/genersoft/iot/vmp/storager/dao/UserMapper.java
| ... | ... | @@ -13,21 +13,21 @@ public interface UserMapper { |
| 13 | 13 | int add(User user); |
| 14 | 14 | |
| 15 | 15 | @Update("UPDATE user " + |
| 16 | - "SET username=#{username}," + | |
| 17 | - "password=#{password}," + | |
| 18 | - "roleId=#{roleId}" + | |
| 16 | + "SET username=#{username}, " + | |
| 17 | + "password=#{password}, " + | |
| 18 | + "roleId=#{roleId} " + | |
| 19 | 19 | "WHERE id=#{id}") |
| 20 | 20 | int update(User user); |
| 21 | 21 | |
| 22 | 22 | @Delete("DELETE FROM user WHERE app=#{app} AND id=#{id}") |
| 23 | 23 | int delete(User user); |
| 24 | 24 | |
| 25 | - @Select("select * FROM user WHERE username= #{username} AND password=#{password}") | |
| 25 | + @Select("select * FROM user WHERE username=#{username} AND password=#{password}") | |
| 26 | 26 | User select(String username, String password); |
| 27 | 27 | |
| 28 | - @Select("select * FROM user WHERE id= #{id}") | |
| 28 | + @Select("select * FROM user WHERE id=#{id}") | |
| 29 | 29 | User selectById(int id); |
| 30 | 30 | |
| 31 | - @Select("select * FROM user WHERE username= #{username}") | |
| 31 | + @Select("select * FROM user WHERE username=#{username}") | |
| 32 | 32 | User getUserByUsername(String username); |
| 33 | 33 | } | ... | ... |
web_src/src/components/dialog/StreamProxyEdit.vue
| ... | ... | @@ -36,7 +36,7 @@ |
| 36 | 36 | <el-form-item label="拉流地址" prop="src_url" v-if="proxyParam.type=='ffmpeg'"> |
| 37 | 37 | <el-input v-model="proxyParam.src_url" clearable></el-input> |
| 38 | 38 | </el-form-item> |
| 39 | - <el-form-item label="超时时间:秒" prop="timeout_ms" v-if="proxyParam.type=='ffmpeg'"> | |
| 39 | + <el-form-item label="超时时间:毫秒" prop="timeout_ms" v-if="proxyParam.type=='ffmpeg'"> | |
| 40 | 40 | <el-input v-model="proxyParam.timeout_ms" clearable></el-input> |
| 41 | 41 | </el-form-item> |
| 42 | 42 | <el-form-item label="FFmpeg命令模板" prop="ffmpeg_cmd_key" v-if="proxyParam.type=='ffmpeg'"> | ... | ... |