Преглед на файлове

修复用户更新sql错误,ffmpeg拉流代理超时时间错误

64850858 преди 4 години
родител
ревизия
3432548c1a
променени са 2 файла, в които са добавени 7 реда и са изтрити 7 реда
  1. 6 6
      src/main/java/com/genersoft/iot/vmp/storager/dao/UserMapper.java
  2. 1 1
      web_src/src/components/dialog/StreamProxyEdit.vue

+ 6 - 6
src/main/java/com/genersoft/iot/vmp/storager/dao/UserMapper.java

@@ -13,21 +13,21 @@ public interface UserMapper {
     int add(User user);
     int add(User user);
 
 
     @Update("UPDATE user " +
     @Update("UPDATE user " +
-            "SET username=#{username}," +
-            "password=#{password}," +
-            "roleId=#{roleId}" +
+            "SET username=#{username}, " +
+            "password=#{password}, " +
+            "roleId=#{roleId} " +
             "WHERE id=#{id}")
             "WHERE id=#{id}")
     int update(User user);
     int update(User user);
 
 
     @Delete("DELETE FROM user WHERE app=#{app} AND id=#{id}")
     @Delete("DELETE FROM user WHERE app=#{app} AND id=#{id}")
     int delete(User user);
     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);
     User select(String username, String password);
 
 
-    @Select("select * FROM user WHERE id= #{id}")
+    @Select("select * FROM user WHERE id=#{id}")
     User selectById(int id);
     User selectById(int id);
 
 
-    @Select("select * FROM user WHERE username= #{username}")
+    @Select("select * FROM user WHERE username=#{username}")
     User getUserByUsername(String username);
     User getUserByUsername(String username);
 }
 }

+ 1 - 1
web_src/src/components/dialog/StreamProxyEdit.vue

@@ -36,7 +36,7 @@
               <el-form-item label="拉流地址" prop="src_url" v-if="proxyParam.type=='ffmpeg'">
               <el-form-item label="拉流地址" prop="src_url" v-if="proxyParam.type=='ffmpeg'">
                 <el-input v-model="proxyParam.src_url" clearable></el-input>
                 <el-input v-model="proxyParam.src_url" clearable></el-input>
               </el-form-item>
               </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-input v-model="proxyParam.timeout_ms" clearable></el-input>
               </el-form-item>
               </el-form-item>
               <el-form-item label="FFmpeg命令模板" prop="ffmpeg_cmd_key" v-if="proxyParam.type=='ffmpeg'">
               <el-form-item label="FFmpeg命令模板" prop="ffmpeg_cmd_key" v-if="proxyParam.type=='ffmpeg'">