Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
jinli gu
MCMS
Commits
74cc8d5b
Commit
74cc8d5b
authored
Mar 27, 2019
by
他是超人他会飞
Committed by
铭飞
Mar 27, 2019
Browse files
!162 修改用户信息请求方式、添加用户登录ip、去除多余的参数
Merge pull request !162 from 他是超人他会飞/4.7.0
parents
59bdeabb
60922163
Changes
4
Expand all
Show whitespace changes
Inline
Side-by-side
doc/4.6.5-to-4.7.0-mysql.sql
View file @
74cc8d5b
This diff is collapsed.
Click to expand it.
doc/db-mcms-mysql-4.7.0.sql
View file @
74cc8d5b
This diff is collapsed.
Click to expand it.
src/main/java/net/mingsoft/cms/action/ColumnAction.java
View file @
74cc8d5b
...
...
@@ -20,7 +20,9 @@ import org.springframework.web.bind.annotation.RequestMapping;
import
org.springframework.web.bind.annotation.ResponseBody
;
import
com.alibaba.fastjson.JSONArray
;
import
net.mingsoft.basic.action.BaseAction
;
import
net.mingsoft.basic.bean.EUListBean
;
import
net.mingsoft.basic.biz.ICategoryBiz
;
import
net.mingsoft.basic.biz.IColumnBiz
;
import
net.mingsoft.basic.biz.IModelBiz
;
...
...
@@ -29,8 +31,6 @@ import net.mingsoft.basic.constant.ModelCode;
import
net.mingsoft.basic.constant.e.SessionConstEnum
;
import
net.mingsoft.basic.entity.ColumnEntity
;
import
net.mingsoft.basic.entity.ManagerEntity
;
import
net.mingsoft.basic.bean.EUListBean
;
import
net.mingsoft.basic.util.BasicUtil
;
import
net.mingsoft.basic.util.FileUtil
;
import
net.mingsoft.basic.util.StringUtil
;
...
...
@@ -125,7 +125,7 @@ public class ColumnAction extends BaseAction{
*/
private
void
columnPath
(
HttpServletRequest
request
,
ColumnEntity
column
){
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
=
""
;
//修改栏目路径时,删除已存在的文件夹
column
=
(
ColumnEntity
)
columnBiz
.
getEntity
(
column
.
getCategoryId
());
...
...
src/main/webapp/templets/1/default/head.htm
View file @
74cc8d5b
...
...
@@ -94,7 +94,7 @@
target
.
isLogin
=
msg
.
result
;
if
(
msg
.
result
)
{
$
.
ajax
({
type
:
"
POS
T
"
,
type
:
"
GE
T
"
,
url
:
"
{ms:global.host/}/people/user/info.do
"
,
success
:
function
(
msg
)
{
target
.
peopleInfo
=
msg
;
...
...
@@ -109,7 +109,7 @@
quitLogin
:
function
()
{
var
target
=
this
;
$
.
ajax
({
type
:
"
POS
T
"
,
type
:
"
GE
T
"
,
url
:
"
{ms:global.host/}/people/quit.do
"
,
success
:
function
(
msg
)
{
if
(
msg
.
result
)
{
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment