Merge remote-tracking branch 'origin/master'

src/com/hellogithub/dao/UserDao.java

@@ -118,13 +118,14 @@ public class UserDao {
     * */
     public int dedletePieceLabel(String name,String str){
         String label;
+        userEntity userEntity;
         int num;
         try {
             Connection conn = JdbcUtils.getConnection();
             QueryRunner runner = new QueryRunner();
             String sql = "select searchHistory from user where userName=?";
-            label  = runner.query(conn, sql, new BeanHandler<>(String.class),name);
-            label=label.replace(str,"");
+            userEntity  = runner.query(conn, sql, new BeanHandler<>(userEntity.class),name);
+            label = userEntity.getSearchHistory().replace(str+";","");
             sql="UPDATE user SET searchHistory = ? WHERE userName= ?";
             num = runner.update(conn,sql,label,name);
         } catch (SQLException e) {

src/com/hellogithub/servlet/deletelabelServlet.java

@@ -43,9 +43,9 @@ public class deletelabelServlet extends HttpServlet {
         int num = userService.dedletePieceLabel(name,str);
         //返回处理行数，如果为零则代表处理零条结果
         if(num == 0 ){
-            setResultError("删除失败",writer);
+            setResultError("删除失败1",writer);
         }else{
-            setResultOK("删除成功",writer);
+            setResultOK("删除成功1",writer);
         }
     }
     public void setResult(Integer code, String msg, PrintWriter writer) {