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
070e2e88
Commit
070e2e88
authored
Dec 20, 2021
by
唐功亮
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
【修改】 MD5加密修改为小写
parent
46441157
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
116 additions
and
14 deletions
+116
-14
TycpdmFirmController.java
...ffice/modules/manage/controller/TycpdmFirmController.java
+39
-5
TycpdmFirmService.java
...a/io/office/modules/manage/service/TycpdmFirmService.java
+5
-0
LogLoginServiceImpl.java
...fice/modules/manage/service/impl/LogLoginServiceImpl.java
+2
-2
MemberServiceImpl.java
...office/modules/manage/service/impl/MemberServiceImpl.java
+3
-3
TimescodeFindpsServiceImpl.java
...dules/manage/service/impl/TimescodeFindpsServiceImpl.java
+2
-2
TycpdmFirmServiceImpl.java
...ce/modules/manage/service/impl/TycpdmFirmServiceImpl.java
+63
-0
MD5Util.java
src/main/java/io/office/modules/manage/utils/MD5Util.java
+2
-2
No files found.
src/main/java/io/office/modules/manage/controller/TycpdmFirmController.java
View file @
070e2e88
package
io
.
office
.
modules
.
manage
.
controller
;
import
java.io.IOException
;
import
java.lang.reflect.InvocationTargetException
;
import
java.util.Arrays
;
import
java.util.HashMap
;
...
...
@@ -11,6 +12,7 @@ import io.office.modules.manage.dao.MemberDao;
import
io.office.modules.manage.dao.TycpdmFirmDao
;
import
io.office.modules.manage.entity.MemberEntity
;
import
io.office.modules.manage.service.TycpdmFirmChangeService
;
import
io.office.modules.manage.utils.MD5Util
;
import
io.office.modules.sys.controller.AbstractController
;
import
org.apache.commons.beanutils.BeanUtils
;
import
org.springframework.beans.factory.annotation.Autowired
;
...
...
@@ -115,11 +117,8 @@ public class TycpdmFirmController extends AbstractController {
public
static
void
main
(
String
[]
args
)
throws
InvocationTargetException
,
IllegalAccessException
{
MemberEntity
memberEntity
=
new
MemberEntity
();
Map
<
String
,
Object
>
body
=
new
HashMap
<>();
body
.
put
(
"username"
,
"xiaoz"
);
BeanUtils
.
populate
(
memberEntity
,
body
);
System
.
out
.
println
(
memberEntity
.
getUsername
());
String
s
=
MD5Util
.
md5Encrypt32Upper
(
"123123"
);
System
.
out
.
println
(
s
);
}
/**
* 根据用户名获取企业认证信息
...
...
@@ -252,4 +251,39 @@ public class TycpdmFirmController extends AbstractController {
tycpdmFirmService
.
updateSystem
(
params
);
return
R
.
ok
();
}
/**
* 跳转GDS页面
*/
@RequestMapping
(
"/authApi/redirectGDS"
)
public
R
redirectGDS
(
HttpServletResponse
response
){
MemberEntity
memberUser
=
getMemberUser
();
String
url
=
tycpdmFirmService
.
redirectGDSURL
(
memberUser
);
try
{
//response.sendRedirect(url);
return
R
.
ok
().
put
(
"data"
,
url
);
}
catch
(
Exception
e
)
{
e
.
printStackTrace
();
return
R
.
error
(
"跳转失败"
);
}
}
/**
* 跳转GLN页面
*/
@RequestMapping
(
"/authApi/redirectGLN"
)
public
R
redirectGLN
(
HttpServletResponse
response
){
MemberEntity
memberUser
=
getMemberUser
();
String
url
=
tycpdmFirmService
.
redirectGDSGLN
(
memberUser
);
try
{
//response.sendRedirect(url);
return
R
.
ok
().
put
(
"data"
,
url
);
}
catch
(
Exception
e
)
{
e
.
printStackTrace
();
return
R
.
error
(
"跳转失败"
);
}
}
}
src/main/java/io/office/modules/manage/service/TycpdmFirmService.java
View file @
070e2e88
...
...
@@ -47,5 +47,10 @@ public interface TycpdmFirmService extends IService<TycpdmFirmEntity> {
void
returnFile
(
Map
<
String
,
Object
>
params
,
HttpServletResponse
response
)
;
void
updateSystem
(
Map
<
String
,
Object
>
params
);
String
redirectGDSURL
(
MemberEntity
memberUser
);
String
redirectGDSGLN
(
MemberEntity
memberUser
);
}
src/main/java/io/office/modules/manage/service/impl/LogLoginServiceImpl.java
View file @
070e2e88
...
...
@@ -137,9 +137,9 @@ public class LogLoginServiceImpl extends ServiceImpl<LogLoginDao, LogLoginEntity
}
phone
=
user
.
getPhone
();
String
password
=
user
.
getPass
();
String
passwordMD5
=
MD5Util
.
md5Encrypt32
Upp
er
(
passWord
);
String
passwordMD5
=
MD5Util
.
md5Encrypt32
Low
er
(
passWord
);
//判断密码是否正确
if
(!
passwordMD5
.
equals
(
password
)){
if
(!
passwordMD5
.
equals
IgnoreCase
(
password
)){
throw
new
RRException
(
"密码不正确!"
);
}
...
...
src/main/java/io/office/modules/manage/service/impl/MemberServiceImpl.java
View file @
070e2e88
...
...
@@ -110,7 +110,7 @@ public class MemberServiceImpl extends ServiceImpl<MemberDao, MemberEntity> impl
MemberEntity
memberEntity
=
new
MemberEntity
();
memberEntity
.
setUsername
(
userName
);
//MD5加密密码
memberEntity
.
setPass
(
MD5Util
.
md5Encrypt32
Upp
er
(
passWord
));
memberEntity
.
setPass
(
MD5Util
.
md5Encrypt32
Low
er
(
passWord
));
memberEntity
.
setEmail
(
emiail
);
memberEntity
.
setPhone
(
phone
);
memberEntity
.
setOicq
(
""
);
...
...
@@ -143,12 +143,12 @@ public class MemberServiceImpl extends ServiceImpl<MemberDao, MemberEntity> impl
}
MemberEntity
memberEntity
=
memberDao
.
selectById
(
id
);
String
passData
=
memberEntity
.
getPass
();
String
passMD5
=
MD5Util
.
md5Encrypt32
Upp
er
(
oldPass
);
String
passMD5
=
MD5Util
.
md5Encrypt32
Low
er
(
oldPass
);
if
(!
passMD5
.
equals
(
passData
))
{
throw
new
RRException
(
"旧密码输入错误"
);
}
//修改密码
memberDao
.
updateByIdPassWord
(
Integer
.
valueOf
(
id
),
MD5Util
.
md5Encrypt32
Upp
er
(
newPass
));
memberDao
.
updateByIdPassWord
(
Integer
.
valueOf
(
id
),
MD5Util
.
md5Encrypt32
Low
er
(
newPass
));
}
@Override
...
...
src/main/java/io/office/modules/manage/service/impl/TimescodeFindpsServiceImpl.java
View file @
070e2e88
...
...
@@ -74,7 +74,7 @@ public class TimescodeFindpsServiceImpl extends ServiceImpl<TimescodeFindpsDao,
//获取6位随机字符串
String
uuid
=
UUID
.
randomUUID
().
toString
().
replaceAll
(
"-"
,
""
).
substring
(
0
,
6
);
//更换密码
memberDao
.
updateByIdPassWord
(
id
,
MD5Util
.
md5Encrypt32
Upp
er
(
uuid
));
memberDao
.
updateByIdPassWord
(
id
,
MD5Util
.
md5Encrypt32
Low
er
(
uuid
));
///////// 以下添加短信发送次数验证
int
flag
=
1
;
TimescodeFindpsEntity
timescodeFindpsEntity
=
tFindpsDao
.
selectById
(
phone
);
...
...
@@ -167,7 +167,7 @@ public class TimescodeFindpsServiceImpl extends ServiceImpl<TimescodeFindpsDao,
//获取6位随机字符串
String
uuid
=
UUID
.
randomUUID
().
toString
().
replaceAll
(
"-"
,
""
).
substring
(
0
,
6
);
//更换密码
memberDao
.
updateByIdPassWord
(
id
,
MD5Util
.
md5Encrypt32
Upp
er
(
uuid
));
memberDao
.
updateByIdPassWord
(
id
,
MD5Util
.
md5Encrypt32
Low
er
(
uuid
));
//发送邮箱
String
body
=
"您在中国物品编码中心网站注册的用户昵称为:"
+
userName
+
", 密码为:"
+
uuid
+
",请妥善保管!"
;
MailUtlis
.
sendMail
(
userName
,
"中国编码用户密码找回"
,
body
,
emiail
);
...
...
src/main/java/io/office/modules/manage/service/impl/TycpdmFirmServiceImpl.java
View file @
070e2e88
package
io
.
office
.
modules
.
manage
.
service
.
impl
;
import
cn.hutool.crypto.symmetric.DES
;
import
com.alibaba.fastjson.JSONObject
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
io.office.common.exception.RRException
;
...
...
@@ -8,6 +9,7 @@ import io.office.modules.manage.dao.TycpdmFirmChangeDao;
import
io.office.modules.manage.dao.TycpdmVipUserDao
;
import
io.office.modules.manage.entity.*
;
import
io.office.modules.manage.service.TycpdmFirmChangeService
;
import
io.office.modules.manage.utils.DESUtils
;
import
io.office.modules.manage.utils.DateUtils
;
import
org.apache.commons.beanutils.BeanMap
;
import
org.apache.commons.beanutils.BeanUtils
;
...
...
@@ -20,6 +22,7 @@ import java.io.FileInputStream;
import
java.io.IOException
;
import
java.lang.reflect.InvocationTargetException
;
import
java.util.*
;
import
java.util.regex.Pattern
;
import
com.baomidou.mybatisplus.core.conditions.query.QueryWrapper
;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
...
...
@@ -444,4 +447,63 @@ public class TycpdmFirmServiceImpl extends ServiceImpl<TycpdmFirmDao, TycpdmFirm
}
}
@Override
public
String
redirectGDSURL
(
MemberEntity
memberUser
)
{
Integer
levels
=
null
;
//用户权限 空.代表普通用户 0.代表中心管理员,1.代表校验管理员 其他4位.代表分中心管理员
int
dept
=
-
2
;
//0表示中心管理员;-2表示普通成员。-100表示没有任何值时
String
regist_or_login_from_ancc
=
""
;
String
username
=
memberUser
.
getUsername
();
String
pass
=
memberUser
.
getPass
();
if
(
matchPhoneNumber
(
username
)){
//TODO tgl 手机号用户 调用接口获取 条码数据
}
else
{
//其他用户
//密码进行 DES加密
//String pass_DES = DESUtils.byteToHexString(DESUtils.DES_CBC_Encrypt(pass.getBytes(),DESUtils.Key.getBytes()));
levels
=
memberDao
.
selectCode_agen
(
username
);
if
(
levels
==
null
){
dept
=-
2
;
}
else
if
(
levels
==
0
){
dept
=
0
;
}
regist_or_login_from_ancc
=
dept
+
"{regist_or_login_from_ancc}"
;
regist_or_login_from_ancc
=
DESUtils
.
byteToHexString
(
DESUtils
.
DES_CBC_Encrypt
(
regist_or_login_from_ancc
.
getBytes
(),
DESUtils
.
Key
.
getBytes
()));
String
url
=
"http://v3.gds.org.cn/registerOrLoginFromAncc.aspx?uname="
+
username
+
"&pwd="
+
pass
+
"®ist_or_login_from_ancc="
+
regist_or_login_from_ancc
+
"&dept="
+
dept
;
return
url
;
}
return
null
;
}
/**
* 只有官网注册用户登录,已通过厂商实名认证的,此处直接跳转,传参为用户名和密码
* username 参数 进行DES加密
* password 参数 MD5加密后的字段(也就是member表的pass字段) 再进行DES加密
* @param memberUser
* @return
*/
@Override
public
String
redirectGDSGLN
(
MemberEntity
memberUser
)
{
//
String
userName_M
=
DESUtils
.
byteToHexString
(
DESUtils
.
DES_CBC_Encrypt
(
memberUser
.
getUsername
().
getBytes
(),
"appsGdsn"
.
getBytes
()));
String
pass_M
=
DESUtils
.
byteToHexString
(
DESUtils
.
DES_CBC_Encrypt
(
memberUser
.
getPass
().
getBytes
(),
"appsGdsn"
.
getBytes
()));
String
url
=
"http://gln.gs1cn.org/userAction_U.aspx?act=1&&username="
+
userName_M
+
"&&password="
+
pass_M
;
return
url
;
}
/**
* 验证手机号 由于号码段不断的更新,只需要判断手机号有11位,并且全是数字以及1开头等
* @param phoneNumber 手机号码
* @return
*/
private
static
boolean
matchPhoneNumber
(
String
phoneNumber
)
{
String
regex
=
"1[358][0-9]{9}"
;
if
(
phoneNumber
==
null
||
phoneNumber
.
length
()<=
0
){
return
false
;
}
return
Pattern
.
matches
(
regex
,
phoneNumber
);
}
}
\ No newline at end of file
src/main/java/io/office/modules/manage/utils/MD5Util.java
View file @
070e2e88
...
...
@@ -48,7 +48,7 @@ public class MD5Util {
* @param string 需要进行MD5加密的字符串
* @return 加密后的字符串(小写)
*/
/*
public static String md5Encrypt32Lower(String string) {
public
static
String
md5Encrypt32Lower
(
String
string
)
{
byte
[]
hash
;
try
{
//创建一个MD5算法对象,并获得MD5字节数组,16*8=128位
...
...
@@ -66,7 +66,7 @@ public class MD5Util {
hex
.
append
(
Integer
.
toHexString
(
b
&
0xFF
));
}
return
hex
.
toString
().
toLowerCase
();
}
*/
}
/**
* 将二进制字节数组转换为十六进制字符串
...
...
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