Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
C
cms_sys
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
西魏
cms_sys
Commits
74cc8d5b
Commit
74cc8d5b
authored
Mar 26, 2019
by
他是超人他会飞
Committed by
铭飞
Mar 26, 2019
Browse files
Options
Browse Files
Download
Plain Diff
!162 修改用户信息请求方式、添加用户登录ip、去除多余的参数
Merge pull request !162 from 他是超人他会飞/4.7.0
parents
59bdeabb
60922163
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
5 additions
and
5 deletions
+5
-5
4.6.5-to-4.7.0-mysql.sql
doc/4.6.5-to-4.7.0-mysql.sql
+0
-0
db-mcms-mysql-4.7.0.sql
doc/db-mcms-mysql-4.7.0.sql
+0
-0
ColumnAction.java
src/main/java/net/mingsoft/cms/action/ColumnAction.java
+3
-3
head.htm
src/main/webapp/templets/1/default/head.htm
+2
-2
No files found.
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;
...
@@ -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
());
...
...
src/main/webapp/templets/1/default/head.htm
View file @
74cc8d5b
...
@@ -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
:
"
POS
T"
,
type
:
"
GE
T"
,
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
:
"
POS
T"
,
type
:
"
GE
T"
,
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
)
{
...
...
Write
Preview
Markdown
is supported
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