From 3432548c1a7eeac6ecfc71916ba34ae76cf32412 Mon Sep 17 00:00:00 2001
From: 64850858 <648540858@qq.com>
Date: 星期一, 28 六月 2021 15:54:50 +0800
Subject: [PATCH] 修复用户更新sql错误，ffmpeg拉流代理超时时间错误
---
src/main/java/com/genersoft/iot/vmp/storager/dao/UserMapper.java | 12 ++++++------
web_src/src/components/dialog/StreamProxyEdit.vue | 2 +-
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/storager/dao/UserMapper.java b/src/main/java/com/genersoft/iot/vmp/storager/dao/UserMapper.java
index f8507cb..6ecc828 100644
--- a/src/main/java/com/genersoft/iot/vmp/storager/dao/UserMapper.java
+++ b/src/main/java/com/genersoft/iot/vmp/storager/dao/UserMapper.java
@@ -13,21 +13,21 @@
int add(User user);
@Update("UPDATE user " +
- "SET username=#{username}," +
- "password=#{password}," +
- "roleId=#{roleId}" +
+ "SET username=#{username}, " +
+ "password=#{password}, " +
+ "roleId=#{roleId} " +
"WHERE id=#{id}")
int update(User user);
@Delete("DELETE FROM user WHERE app=#{app} AND id=#{id}")
int delete(User user);
- @Select("select * FROM user WHERE username= #{username} AND password=#{password}")
+ @Select("select * FROM user WHERE username=#{username} AND password=#{password}")
User select(String username, String password);
- @Select("select * FROM user WHERE id= #{id}")
+ @Select("select * FROM user WHERE id=#{id}")
User selectById(int id);
- @Select("select * FROM user WHERE username= #{username}")
+ @Select("select * FROM user WHERE username=#{username}")
User getUserByUsername(String username);
}
diff --git a/web_src/src/components/dialog/StreamProxyEdit.vue b/web_src/src/components/dialog/StreamProxyEdit.vue
index f558ed6..e1d224a 100644
--- a/web_src/src/components/dialog/StreamProxyEdit.vue
+++ b/web_src/src/components/dialog/StreamProxyEdit.vue
@@ -36,7 +36,7 @@
<el-form-item label="鎷夋祦鍦板潃" prop="src_url" v-if="proxyParam.type=='ffmpeg'">
<el-input v-model="proxyParam.src_url" clearable></el-input>
</el-form-item>
- <el-form-item label="瓒呮椂鏃堕棿:绉�" prop="timeout_ms" v-if="proxyParam.type=='ffmpeg'">
+ <el-form-item label="瓒呮椂鏃堕棿:姣" prop="timeout_ms" v-if="proxyParam.type=='ffmpeg'">
<el-input v-model="proxyParam.timeout_ms" clearable></el-input>
</el-form-item>
<el-form-item label="FFmpeg鍛戒护妯℃澘" prop="ffmpeg_cmd_key" v-if="proxyParam.type=='ffmpeg'">
--
Gitblit v1.8.0