2020-01-15 年前修改

src/main/java/com/yc/education/controller/BaseController.java

@@ -133,9 +133,6 @@ public class BaseController {
                                             @RequestParam(required = false, defaultValue = "0") int type) {
         AjaxMessage<Object> ajax = new AjaxMessage<>();
         Map<String, String> phoneMap = (Map<String, String>) session.getAttribute(phone);
-        System.out.println("11111111111");
-        System.out.println(phone);
-        System.out.println(code);
         String sendsms = "", smsphone = "";
         if (phoneMap != null) {
             if (type == 0) {

src/main/java/com/yc/education/controller/IndexController.java

@@ -65,11 +65,12 @@ public class IndexController {
         try {
             if (!StringUtils.isEmpty(title)) {
                 forums = forumService.forumListByUsersIds(0, page, rows, title, types, type);
-                for (Forum forum : forums) {
-                    if (!forum.getIsdel().equals(0) || !forum.getStatus().equals(1)) {
-                        forums.remove(forum);
-                    }
-                }
+//                for (Forum forum : forums) {
+//                    if (!forum.getIsdel().equals(0) || !forum.getStatus().equals(1)) {
+//                        forums.remove(forum);
+//                    }
+//                }
+                forums.removeIf(forum -> !forum.getIsdel().equals(0) || !forum.getStatus().equals(1));
             } else {
                 forums = forumService.forumListByType(page, rows, type, types);
             }
@@ -204,11 +205,12 @@ public class IndexController {
 //        try {
         if (!StringUtils.isEmpty(title)) {
             forums = forumService.forumListByUsersId(0, page, rows, title, types, id);
-            for (Forum forum : forums) {
-                if (!forum.getIsdel().equals(0) || !forum.getStatus().equals(1)) {
-                    forums.remove(forum);
-                }
-            }
+//            for (Forum forum : forums) {
+//                if (!forum.getIsdel().equals(0) || !forum.getStatus().equals(1)) {
+//                    forums.remove(forum);
+//                }
+//            }
+            forums.removeIf(forum -> !forum.getIsdel().equals(0) || !forum.getStatus().equals(1));
         } else {
             forums = forumService.forumListByType(page, rows, 2, id);
         }

src/main/java/com/yc/education/controller/OrderController.java

@@ -108,6 +108,7 @@ public class OrderController {
         return ajaxMessage;
     }
 
+
     protected String getRandom(int num) {
         //存放产生的随机数
         String sms = "";

src/main/java/com/yc/education/controller/PersonController.java

@@ -8,7 +8,6 @@ import com.yc.education.util.AjaxMessage;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
@@ -275,6 +274,7 @@ public class PersonController {
         return ajaxMessage;
     }
 
+
     /**
      * @Description: 账号绑定
      * @Param: [httpSession]
@@ -284,8 +284,7 @@ public class PersonController {
      */
     @RequestMapping("binding.html")
     public ModelAndView binding(HttpSession httpSession) {
-        ModelAndView modelAndView = new ModelAndView();
-        return modelAndView;
+        return new ModelAndView();
     }
 
 

src/main/java/com/yc/education/controller/UsersController.java

@@ -47,7 +47,7 @@ public class UsersController {
     private WorkService workService;
 
     @Autowired
-    AboutService aboutService;
+    private AboutService aboutService;
 
     /**
      * @Description: 用户登录 -- 跳转
@@ -259,8 +259,7 @@ public class UsersController {
      */
     @RequestMapping("safe.html")
     public ModelAndView safe() {
-        ModelAndView mv = new ModelAndView();
-        return mv;
+        return new ModelAndView();
     }
 
     /**

src/main/java/com/yc/education/model/About.java

@@ -29,7 +29,6 @@ public class About {
         this.id = id;
     }
 
-
     public String getAbout() {
         return about;
     }

src/main/java/com/yc/education/util/AjaxMessage.java

@@ -1,52 +1,53 @@
 package com.yc.education.util;
 
 public class AjaxMessage<T> {
-	
-	 public AjaxMessage(){}
-	 
-	 public AjaxMessage(boolean is,String msg,T data){
-		 this.msg = msg;
-		 this.data = data;
-		 this.is = is;
-	 }
-	
-	/**
-	 * 提示信息
-	 */
-	private String msg;
-	
-	/**
-	 * 返回的数据
-	 */
-	private T data;
-	
-	/**
-	 * 是否成功
-	 */
-	private boolean is = false;
-
-	public String getMsg() {
-		return msg;
-	}
-
-	public void setMsg(String msg) {
-		this.msg = msg;
-	}
-
-	public T getData() {
-		return data;
-	}
-
-	public void setData(T data) {
-		this.data = data;
-	}
-
-	public boolean isIs() {
-		return is;
-	}
-
-	public void setIs(boolean is) {
-		this.is = is;
-	}
-	
+
+    public AjaxMessage() {
+    }
+
+    public AjaxMessage(boolean is, String msg, T data) {
+        this.msg = msg;
+        this.data = data;
+        this.is = is;
+    }
+
+    /**
+     * 提示信息
+     */
+    private String msg;
+
+    /**
+     * 返回的数据
+     */
+    private T data;
+
+    /**
+     * 是否成功
+     */
+    private boolean is = false;
+
+    public String getMsg() {
+        return msg;
+    }
+
+    public void setMsg(String msg) {
+        this.msg = msg;
+    }
+
+    public T getData() {
+        return data;
+    }
+
+    public void setData(T data) {
+        this.data = data;
+    }
+
+    public boolean isIs() {
+        return is;
+    }
+
+    public void setIs(boolean is) {
+        this.is = is;
+    }
+
 }

src/main/webapp/WEB-INF/jsp/person.jsp

@@ -1206,6 +1206,15 @@ To change this template use File | Settings | File Templates.
             }
         });
 
+        $(".setlist").click(function () {
+            if ($(this).children(".setlist-menu").hasClass("open")) {
+                $(this).children(".setlist-menu").removeClass("open")
+            } else {
+                $(this).children(".setlist-menu").addClass("open")
+            }
+        });
+
+
         $(".limits").click(function () {
             if ($(this).children(".pub-sel").hasClass("open")) {
                 $(this).children(".pub-sel").removeClass("open")

src/main/webapp/css/amazeui.min.css

@@ -2120,7 +2120,7 @@ ul.am-dropdown-content>.am-disabled>a:focus,ul.am-dropdown-content>.am-disabled>
 .am-pureview-bar .am-pureview-title{display:block;word-wrap:normal;text-overflow:ellipsis;white-space:nowrap;overflow:hidden;margin-left:6px;-webkit-box-flex:1;-webkit-flex:1;-ms-flex:1;flex:1}
 .am-pureview-bar .am-pureview-total{font-size:10px;line-height:48px}
 .am-pureview-actions{left:0;right:0;top:0}
-.am-pureview-actions a{position:absolute;left:10px;color:#ccc;display:block;width:45px;line-height:45px; height:45px;
+.am-pureview-actions a{position:absolute;right:10px;color:#ccc;display:block;width:45px;line-height:45px; height:45px;
 	text-align:left;font-size:16px}
 .am-pureview-actions a:hover{color:#fff}
 .am-pureview-actions [data-am-toggle=share]{left:auto;right:10px}

src/main/webapp/css/intro/introjs.css

@@ -571,7 +571,7 @@ tr.introjs-showElement > th {
     width: 200px;
     height: 45px;
     line-height: 45px;
-    background: rgba(255, 0, 104, 1);
+    background:#42A5DB;
     color: #fff;
     text-align: center;
     font-size: 16px;

src/main/webapp/css/main.63.css

@@ -322,6 +322,7 @@ a:focus, a:hover {
     z-index: 9;
 }
 
+
 .nav .open > a, .nav .open > a:focus {
     color: #333;
 }
@@ -1495,7 +1496,8 @@ ul.face li img:hover {
     display: inline-block;
     margin-left: 10px;
     transition: right 0.3s;
-    z-index: 1000;
+	position:fixed;
+    z-index: 1;
 }
 
 .idx_fold {
@@ -1637,18 +1639,43 @@ ul.face li img:hover {
 
 .content-publish, .mess-search {
     position: relative;
-    padding: 10px;
+    padding:30px 10px;
     background: #fff;
     border-radius: 2px;
     line-height: 1.3;
     margin-bottom: 12px;
     margin-top: 10px;
 }
-
+.closebtn{
+	display:block;
+	width:25px;
+	height:25px;
+	position:absolute;
+	right:5px;
+	top:5px;
+	text-indent:-9999px;
+	background:url(../images/close.png) center center/25px 25px;
+}
 #content-publish.content-publish {
     animation: heightAni 0.3s linear;
 }
-
+.fb_bg{
+	width:100%;
+	height:100%;
+	background:rgba(0,0,0,0.5);
+	position:fixed;
+	left:0;
+	top:0;
+	display:none;
+	z-index:1;
+}
+.fb_tc{
+	width:50%;
+	position: fixed;
+    top:40%;
+    left:25%;
+	z-index:2;
+}
 @keyframes heightAni {
     0% {
         transform: translateY(-5%);
@@ -2660,7 +2687,8 @@ div.mess-meta > a.mess-tag:first-child {
 }
 
 .index-bg {
-    background: url(../img/bg1.jpg) no-repeat fixed center;
+    /*background: url(../img/bg1.jpg) no-repeat fixed center;*/
+	background:#eee;
     background-size: cover;
 }
 
@@ -2679,7 +2707,8 @@ div.mess-meta > a.mess-tag:first-child {
 
 .login-bg {
     padding-top: 0;
-    background: url(../img/bg1.jpg) no-repeat center center;
+    /*background: url(../img/bg1.jpg) no-repeat center center;*/
+	background:#eee;
     background-size: cover;
     width: 100%;
     min-height: 100%;
@@ -5301,6 +5330,7 @@ li.my-fans-active > i, li.my-fans-active > a, li.my-fans-active > span {
     -ms-flex: 5;
     flex: 5;
     margin-bottom: 0;
+    min-height:630px;
 }
 
 .set-right li ul li > ul {
@@ -8028,4 +8058,29 @@ input.btn:hover {
     .mess-search > .search-box > .sch-input2 {
         width: 75%;
     }
+}
+
+
+.pic_list{
+	display:inline-block;
+	width:60px;
+	height:40px;
+	overflow:hidden;
+	position:relative;
+	border:1px solid #ddd;
+	margin:0 10px 10px 0;
+}
+.pic_list img{
+	width:100%;
+	height:auto;
+}
+.delsimg{
+	display:block;
+	width:15px;
+	height:15px;
+	position:absolute;
+	right:3px;
+	top:3px;
+	background:url(../images/del_btn.png) no-repeat center center/15px 15px;
+	text-indent:-9999px;
 }