Merge branch 'master' of https://git.oschina.net/cyf783/guns

sql/guns.sql

@@ -349,4 +349,4 @@ CREATE TABLE `user` (
 -- Records of user
 -- ----------------------------
 INSERT INTO `user` VALUES ('1', 'girl.gif', 'admin', 'ecfadcde9305f8891bcfe5a1e28c253e', '8pgby', '张三', '2017-05-05 00:00:00', '2', 'sn93@qq.com', '18200000000', '1', '27', '1', '2016-01-29 08:49:53', '25');
-INSERT INTO `user` VALUES ('44', null, ' test', '45abb7879f6a8268f1ef600e6038ac73', 'ssts3', 'test', '2017-05-01 00:00:00', '1', 'abc@123.com', '', '5', '26', '1', '2017-05-16 20:33:37', null);
+INSERT INTO `user` VALUES ('44', null, 'test', '45abb7879f6a8268f1ef600e6038ac73', 'ssts3', 'test', '2017-05-01 00:00:00', '1', 'abc@123.com', '', '5', '26', '1', '2017-05-16 20:33:37', null);

src/main/java/com/stylefeng/guns/core/log/factory/LogTaskFactory.java

@@ -21,9 +21,9 @@ import java.util.TimerTask;
  */
 public class LogTaskFactory {
 
-    private static Logger logger = Logger.getLogger(LogManager.class);
-    private static LoginLogMapper loginLogMapper = Db.getMapper(LoginLogMapper.class);
-    private static OperationLogMapper operationLogMapper = Db.getMapper(OperationLogMapper.class);
+    private static final Logger logger = Logger.getLogger(LogManager.class);
+    private static final LoginLogMapper loginLogMapper = Db.getMapper(LoginLogMapper.class);
+    private static final OperationLogMapper operationLogMapper = Db.getMapper(OperationLogMapper.class);
 
     public static TimerTask loginLog(Integer userId, String ip) {
         return new TimerTask() {

src/main/webapp/static/js/plugins/layer/laydate/need/laydate.css

@@ -7,7 +7,7 @@
 **/
 
 html{_background-image:url(about:blank); _background-attachment:fixed;}
-.layer-date{display: inline-block!important;vertical-align:text-top;max-width:240px;}
+.layer-date{display: inline-block!important;vertical-align:text-top;}
 .laydate_body .laydate_box, .laydate_body .laydate_box *{margin:0; padding:0;}
 .laydate-icon,
 .laydate-icon-default,