Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gs1-office-web-sit
Overview
Overview
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
吴迪
gs1-office-web-sit
Commits
c8da72b2
Commit
c8da72b2
authored
Dec 04, 2022
by
吴迪
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/master'
parents
2a702615
439087c8
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
37 additions
and
18 deletions
+37
-18
sqlserver.sql
db/sqlserver.sql
+13
-0
MemberController.java
...io/office/modules/manage/controller/MemberController.java
+6
-0
TycpdmFirmController.java
...ffice/modules/manage/controller/TycpdmFirmController.java
+0
-0
MemberServiceImpl.java
...office/modules/manage/service/impl/MemberServiceImpl.java
+16
-9
TimescodeRegiServiceImpl.java
...modules/manage/service/impl/TimescodeRegiServiceImpl.java
+2
-9
No files found.
db/sqlserver.sql
View file @
c8da72b2
...
@@ -788,3 +788,15 @@ alter table index_carousel_manage add is_show varchar(2) not null default (1);
...
@@ -788,3 +788,15 @@ alter table index_carousel_manage add is_show varchar(2) not null default (1);
##
文件夹内容上传
2021
-
12
-
18
Movie
.
/
redis
-
server
.
exe
redis
.
windows
.
conf
.
/
redis
-
server
.
exe
redis
.
windows
-
service
.
conf
##
文件夹内容上传
2021
-
12
-
18
Movie
.
/
redis
-
server
.
exe
redis
.
windows
.
conf
.
/
redis
-
server
.
exe
redis
.
windows
-
service
.
conf
knowledgeInfo
表
id
304
跳转路径修改为
http
:
//
192
.
168
.
0
.
77
/
search
/
check
1
、上线后需要数据清洗,测试环境没有进行数据清洗
http
:
//
192
.
168
.
0
.
77
:
9091
/
office
/
uploadFileResource
/
UserFiles
/
Image
/
2019
image
/
jd01
.
png
2
、数据清洗,第三方网站换了域名
http
:
//
www
.
gds
.
org
.
cn
/
login
.
aspx
更换成了:
https
:
//
www
.
gds
.
org
.
cn
/
http
:
//
www
.
gds
.
org
.
cn
/
login
.
aspx
更换成了:
https
:
//
www
.
gds
.
org
.
cn
/
\ No newline at end of file
src/main/java/io/office/modules/manage/controller/MemberController.java
View file @
c8da72b2
...
@@ -2,6 +2,9 @@ package io.office.modules.manage.controller;
...
@@ -2,6 +2,9 @@ package io.office.modules.manage.controller;
import
java.util.Arrays
;
import
java.util.Arrays
;
import
java.util.Map
;
import
java.util.Map
;
import
com.baomidou.mybatisplus.core.conditions.Wrapper
;
import
com.baomidou.mybatisplus.core.conditions.query.QueryWrapper
;
import
io.office.modules.app.annotation.Login
;
import
io.office.modules.app.annotation.Login
;
import
io.office.modules.sys.controller.AbstractController
;
import
io.office.modules.sys.controller.AbstractController
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
...
@@ -91,6 +94,9 @@ public class MemberController extends AbstractController {
...
@@ -91,6 +94,9 @@ public class MemberController extends AbstractController {
// @RequiresPermissions("manage:member:info")
// @RequiresPermissions("manage:member:info")
public
R
info
(){
public
R
info
(){
Long
memberUserId
=
getMemberUserId
();
Long
memberUserId
=
getMemberUserId
();
/*
QueryWrapper<MemberEntity> queryWrapper = new QueryWrapper<MemberEntity>();
queryWrapper.eq("phone",memberUserId);*/
MemberEntity
member
=
memberService
.
getById
(
memberUserId
);
MemberEntity
member
=
memberService
.
getById
(
memberUserId
);
return
R
.
ok
().
put
(
"data"
,
member
);
return
R
.
ok
().
put
(
"data"
,
member
);
...
...
src/main/java/io/office/modules/manage/controller/TycpdmFirmController.java
View file @
c8da72b2
This diff is collapsed.
Click to expand it.
src/main/java/io/office/modules/manage/service/impl/MemberServiceImpl.java
View file @
c8da72b2
package
io
.
office
.
modules
.
manage
.
service
.
impl
;
package
io
.
office
.
modules
.
manage
.
service
.
impl
;
import
com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper
;
import
io.office.common.exception.RRException
;
import
io.office.common.exception.RRException
;
import
io.office.common.utils.IPUtils
;
import
io.office.common.utils.IPUtils
;
import
io.office.modules.manage.dao.*
;
import
io.office.modules.manage.dao.*
;
...
@@ -25,10 +26,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
...
@@ -25,10 +26,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import
io.office.common.utils.PageUtils
;
import
io.office.common.utils.PageUtils
;
import
io.office.common.utils.Query
;
import
io.office.common.utils.Query
;
import
io.office.modules.manage.service.MemberService
;
import
io.office.modules.manage.service.MemberService
;
import
org.springframework.transaction.annotation.Transactional
;
import
javax.servlet.http.HttpServletRequest
;
import
javax.servlet.http.HttpServletRequest
;
import
javax.servlet.http.HttpServletResponse
;
import
javax.servlet.http.HttpServletResponse
;
import
javax.servlet.http.HttpSession
;
@Service
(
"memberService"
)
@Service
(
"memberService"
)
...
@@ -163,13 +162,16 @@ public class MemberServiceImpl extends ServiceImpl<MemberDao, MemberEntity> impl
...
@@ -163,13 +162,16 @@ public class MemberServiceImpl extends ServiceImpl<MemberDao, MemberEntity> impl
throw
new
RRException
(
"两次密码信息不一致,请重新输入"
);
throw
new
RRException
(
"两次密码信息不一致,请重新输入"
);
}
}
MemberEntity
memberEntity
=
memberDao
.
selectById
(
id
);
MemberEntity
memberEntity
=
memberDao
.
selectById
(
id
);
String
passData
=
memberEntity
.
getPass
();
if
(
memberEntity
!=
null
)
{
String
passMD5
=
MD5Util
.
md5Encrypt32Lower
(
oldPass
);
String
passData
=
memberEntity
.
getPass
();
if
(!
passMD5
.
equals
(
passData
))
{
String
passMD5
=
MD5Util
.
md5Encrypt32Lower
(
oldPass
);
throw
new
RRException
(
"旧密码输入错误"
);
if
(!
passMD5
.
equals
(
passData
))
{
throw
new
RRException
(
"旧密码输入错误"
);
}
//修改密码
memberDao
.
updateByIdPassWord
(
Long
.
valueOf
(
id
),
MD5Util
.
md5Encrypt32Lower
(
newPass
));
}
}
//修改密码
memberDao
.
updateByIdPassWord
(
Long
.
valueOf
(
id
),
MD5Util
.
md5Encrypt32Lower
(
newPass
));
}
}
@Override
@Override
...
@@ -346,13 +348,18 @@ public class MemberServiceImpl extends ServiceImpl<MemberDao, MemberEntity> impl
...
@@ -346,13 +348,18 @@ public class MemberServiceImpl extends ServiceImpl<MemberDao, MemberEntity> impl
* @return
* @return
*/
*/
private
static
boolean
matchPhoneNumber
(
String
phoneNumber
)
{
private
static
boolean
matchPhoneNumber
(
String
phoneNumber
)
{
String
regex
=
"1[3
58
][0-9]{9}"
;
String
regex
=
"1[3
456789
][0-9]{9}"
;
if
(
phoneNumber
==
null
||
phoneNumber
.
length
()
<=
0
)
{
if
(
phoneNumber
==
null
||
phoneNumber
.
length
()
<=
0
)
{
return
false
;
return
false
;
}
}
return
Pattern
.
matches
(
regex
,
phoneNumber
);
return
Pattern
.
matches
(
regex
,
phoneNumber
);
}
}
public
static
void
main
(
String
[]
args
)
{
System
.
out
.
println
(
matchPhoneNumber
(
"17368588652"
));
}
@Override
@Override
public
String
getVerificationCode
(
Map
<
String
,
Object
>
params
,
HttpServletRequest
request
,
HttpServletResponse
response
)
{
public
String
getVerificationCode
(
Map
<
String
,
Object
>
params
,
HttpServletRequest
request
,
HttpServletResponse
response
)
{
//验证码随机6位数字(验证码)
//验证码随机6位数字(验证码)
...
...
src/main/java/io/office/modules/manage/service/impl/TimescodeRegiServiceImpl.java
View file @
c8da72b2
...
@@ -76,7 +76,7 @@ public class TimescodeRegiServiceImpl extends ServiceImpl<TimescodeRegiDao, Time
...
@@ -76,7 +76,7 @@ public class TimescodeRegiServiceImpl extends ServiceImpl<TimescodeRegiDao, Time
* @return
* @return
*/
*/
private
static
boolean
matchPhoneNumber
(
String
phoneNumber
)
{
private
static
boolean
matchPhoneNumber
(
String
phoneNumber
)
{
String
regex
=
"1[3
58
][0-9]{9}"
;
String
regex
=
"1[3
456789
][0-9]{9}"
;
if
(
phoneNumber
==
null
||
phoneNumber
.
length
()<=
0
){
if
(
phoneNumber
==
null
||
phoneNumber
.
length
()<=
0
){
return
false
;
return
false
;
}
}
...
@@ -84,14 +84,7 @@ public class TimescodeRegiServiceImpl extends ServiceImpl<TimescodeRegiDao, Time
...
@@ -84,14 +84,7 @@ public class TimescodeRegiServiceImpl extends ServiceImpl<TimescodeRegiDao, Time
}
}
public
static
void
main
(
String
[]
args
)
{
public
static
void
main
(
String
[]
args
)
{
long
l
=
System
.
currentTimeMillis
();
System
.
out
.
println
(
matchPhoneNumber
(
"17368588652"
));
try
{
Thread
.
sleep
(
3000
);
}
catch
(
InterruptedException
e
)
{
e
.
printStackTrace
();
}
long
l2
=
System
.
currentTimeMillis
();
System
.
out
.
println
((
l2
-
l
)/
1000
+
"秒"
);
}
}
@Override
@Override
...
...
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