Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
D
data-server
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
licc
data-server
Commits
0ad106d2
Commit
0ad106d2
authored
Mar 15, 2021
by
m1991
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
资讯模块数据——图片展示功能修复
parent
ca73f5e6
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
10 additions
and
3 deletions
+10
-3
Constants.java
...on/src/main/java/cn/wisenergy/common/utils/Constants.java
+2
-0
ShopZxMapper.xml
wisenergy-mapper/src/main/resources/mapper/ShopZxMapper.xml
+1
-2
UploadServiceImpl.java
...java/cn/wisenergy/service/app/impl/UploadServiceImpl.java
+6
-0
LoginController.java
...n/wisenergy/web/admin/controller/app/LoginController.java
+1
-1
No files found.
wisenergy-common/src/main/java/cn/wisenergy/common/utils/Constants.java
View file @
0ad106d2
...
@@ -49,6 +49,8 @@ public class Constants {
...
@@ -49,6 +49,8 @@ public class Constants {
public
final
static
Integer
HALF_HOUR_INT
=
MINUTE_INT
*
30
;
public
final
static
Integer
HALF_HOUR_INT
=
MINUTE_INT
*
30
;
//十小时
//十小时
public
final
static
Integer
TEN_HOURS_HOUR_INT
=
HALF_HOUR_INT
*
20
;
public
final
static
Integer
TEN_HOURS_HOUR_INT
=
HALF_HOUR_INT
*
20
;
//一个月
public
final
static
Integer
ONE_MONTH_HOUR_INT
=
TEN_HOURS_HOUR_INT
*
72
;
}
}
//正则的一些常量
//正则的一些常量
public
static
class
RegConstant
{
public
static
class
RegConstant
{
...
...
wisenergy-mapper/src/main/resources/mapper/ShopZxMapper.xml
View file @
0ad106d2
...
@@ -20,7 +20,7 @@
...
@@ -20,7 +20,7 @@
</sql>
</sql>
<sql
id=
"cols_exclude_id"
>
<sql
id=
"cols_exclude_id"
>
zx_url,zx_field,
zx_address,
invite_code,zx_date
zx_url,zx_field,invite_code,zx_date
</sql>
</sql>
<sql
id=
"vals"
>
<sql
id=
"vals"
>
...
@@ -62,7 +62,6 @@
...
@@ -62,7 +62,6 @@
b.zx_likes as zxLikes,
b.zx_likes as zxLikes,
b.zx_field as zxField,
b.zx_field as zxField,
b.zx_date as zxDate,
b.zx_date as zxDate,
b.zx_address as zxAddress,
b.invite_code as inviteCode,
b.invite_code as inviteCode,
a.user_id as userId,
a.user_id as userId,
a.head_image as headImage
a.head_image as headImage
...
...
wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/UploadServiceImpl.java
View file @
0ad106d2
...
@@ -292,7 +292,13 @@ public class UploadServiceImpl implements UploadService {
...
@@ -292,7 +292,13 @@ public class UploadServiceImpl implements UploadService {
}
}
int
likedId
=
shopZx
.
getZxid
();
int
likedId
=
shopZx
.
getZxid
();
if
(
shopZx
.
getUserId
()==
null
&&
""
!=
shopZx
.
getUserId
()){
map
.
put
(
"code"
,
1
);
map
.
put
(
"msg"
,
"用户不存在!请重新开始!"
);
return
map
;
}
shopZx
.
setUserId
(
shopZx
.
getUserId
().
replaceAll
(
"(\\d{3})\\d{4}(\\d{4})"
,
"$1****$2"
));
shopZx
.
setUserId
(
shopZx
.
getUserId
().
replaceAll
(
"(\\d{3})\\d{4}(\\d{4})"
,
"$1****$2"
));
if
(
null
!=
inviteCode
&&
""
!=
inviteCode
)
{
if
(
null
!=
inviteCode
&&
""
!=
inviteCode
)
{
//用户个人邀请码查询用户数据
//用户个人邀请码查询用户数据
User
user
=
usersMapper
.
InvitedCode2
(
inviteCode
);
User
user
=
usersMapper
.
InvitedCode2
(
inviteCode
);
...
...
wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/LoginController.java
View file @
0ad106d2
...
@@ -109,7 +109,7 @@ public class LoginController {
...
@@ -109,7 +109,7 @@ public class LoginController {
String
tokenKey
=
StringUtil
.
formatKeyWithPrefix
(
Constants
.
RedisKey
.
PROJECT_PRIFIX
,
Constants
.
RedisKey
.
TOKEN_PRIFIX
,
token
);
String
tokenKey
=
StringUtil
.
formatKeyWithPrefix
(
Constants
.
RedisKey
.
PROJECT_PRIFIX
,
Constants
.
RedisKey
.
TOKEN_PRIFIX
,
token
);
UsersDto
usersDto
=
new
UsersDto
();
UsersDto
usersDto
=
new
UsersDto
();
BeanUtils
.
copyProperties
(
users
,
usersDto
);
BeanUtils
.
copyProperties
(
users
,
usersDto
);
redisUtils
.
set
(
tokenKey
,
JSONObject
.
toJSONString
(
usersDto
),
Constants
.
Duration
.
HALF
_HOUR_INT
);
redisUtils
.
set
(
tokenKey
,
JSONObject
.
toJSONString
(
usersDto
),
Constants
.
Duration
.
ONE_MONTH
_HOUR_INT
);
return
token
;
return
token
;
}
}
...
...
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