Commit 74cc8d5b authored by 他是超人他会飞's avatar 他是超人他会飞 Committed by 铭飞

!162 修改用户信息请求方式、添加用户登录ip、去除多余的参数

Merge pull request !162 from 他是超人他会飞/4.7.0
parents 59bdeabb 60922163
This diff is collapsed.
This diff is collapsed.
...@@ -20,7 +20,9 @@ import org.springframework.web.bind.annotation.RequestMapping; ...@@ -20,7 +20,9 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.ResponseBody;
import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONArray;
import net.mingsoft.basic.action.BaseAction; import net.mingsoft.basic.action.BaseAction;
import net.mingsoft.basic.bean.EUListBean;
import net.mingsoft.basic.biz.ICategoryBiz; import net.mingsoft.basic.biz.ICategoryBiz;
import net.mingsoft.basic.biz.IColumnBiz; import net.mingsoft.basic.biz.IColumnBiz;
import net.mingsoft.basic.biz.IModelBiz; import net.mingsoft.basic.biz.IModelBiz;
...@@ -29,8 +31,6 @@ import net.mingsoft.basic.constant.ModelCode; ...@@ -29,8 +31,6 @@ import net.mingsoft.basic.constant.ModelCode;
import net.mingsoft.basic.constant.e.SessionConstEnum; import net.mingsoft.basic.constant.e.SessionConstEnum;
import net.mingsoft.basic.entity.ColumnEntity; import net.mingsoft.basic.entity.ColumnEntity;
import net.mingsoft.basic.entity.ManagerEntity; import net.mingsoft.basic.entity.ManagerEntity;
import net.mingsoft.basic.bean.EUListBean;
import net.mingsoft.basic.util.BasicUtil; import net.mingsoft.basic.util.BasicUtil;
import net.mingsoft.basic.util.FileUtil; import net.mingsoft.basic.util.FileUtil;
import net.mingsoft.basic.util.StringUtil; import net.mingsoft.basic.util.StringUtil;
...@@ -125,7 +125,7 @@ public class ColumnAction extends BaseAction{ ...@@ -125,7 +125,7 @@ public class ColumnAction extends BaseAction{
*/ */
private void columnPath(HttpServletRequest request,ColumnEntity column){ private void columnPath(HttpServletRequest request,ColumnEntity column){
StringBuffer columnPath = new StringBuffer(); StringBuffer columnPath = new StringBuffer();
String file = BasicUtil.getRealPath("","")+ParserUtil.HTML+File.separator+ column.getAppId(); String file = BasicUtil.getRealPath("")+ParserUtil.HTML+File.separator+ column.getAppId();
String delFile = ""; String delFile = "";
//修改栏目路径时,删除已存在的文件夹 //修改栏目路径时,删除已存在的文件夹
column = (ColumnEntity) columnBiz.getEntity(column.getCategoryId()); column = (ColumnEntity) columnBiz.getEntity(column.getCategoryId());
......
...@@ -94,7 +94,7 @@ ...@@ -94,7 +94,7 @@
target.isLogin = msg.result; target.isLogin = msg.result;
if(msg.result) { if(msg.result) {
$.ajax({ $.ajax({
type: "POST", type: "GET",
url: "{ms:global.host/}/people/user/info.do", url: "{ms:global.host/}/people/user/info.do",
success: function(msg) { success: function(msg) {
target.peopleInfo = msg; target.peopleInfo = msg;
...@@ -109,7 +109,7 @@ ...@@ -109,7 +109,7 @@
quitLogin: function() { quitLogin: function() {
var target = this; var target = this;
$.ajax({ $.ajax({
type: "POST", type: "GET",
url: "{ms:global.host/}/people/quit.do", url: "{ms:global.host/}/people/quit.do",
success: function(msg) { success: function(msg) {
if(msg.result) { if(msg.result) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment