Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
V
volunteer_service
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
volunteer_service
Commits
7ae9aec0
Commit
7ae9aec0
authored
May 08, 2021
by
cy
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
用户须知接口
parent
b18bf5ae
Show whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
134 additions
and
11 deletions
+134
-11
UserKnownMapper.java
...er/src/main/java/cn/wisenergy/mapper/UserKnownMapper.java
+7
-0
VolunteerMapper.xml
...ergy-mapper/src/main/resources/mapper/VolunteerMapper.xml
+0
-2
UserKnown.java
...model/src/main/java/cn/wisenergy/model/app/UserKnown.java
+49
-0
UserKnownDto.java
...el/src/main/java/cn/wisenergy/model/dto/UserKnownDto.java
+34
-0
UserService.java
...e/src/main/java/cn/wisenergy/service/app/UserService.java
+6
-0
UserServiceImpl.java
...n/java/cn/wisenergy/service/app/impl/UserServiceImpl.java
+18
-0
WxPayServiceImpl.java
.../java/cn/wisenergy/service/app/impl/WxPayServiceImpl.java
+1
-0
Common.java
...ice/src/main/java/cn/wisenergy/service/common/Common.java
+6
-6
ShiroConfig.java
...in/java/cn/wisenergy/service/shir/config/ShiroConfig.java
+1
-0
KickoutSessionControlFilter.java
...ergy/service/shir/filter/KickoutSessionControlFilter.java
+1
-0
WxCommon.java
...ce/src/main/java/cn/wisenergy/service/wxpay/WxCommon.java
+4
-3
UserController.java
...cn/wisenergy/web/admin/controller/app/UserController.java
+7
-0
No files found.
wisenergy-mapper/src/main/java/cn/wisenergy/mapper/UserKnownMapper.java
0 → 100644
View file @
7ae9aec0
package
cn
.
wisenergy
.
mapper
;
import
cn.wisenergy.model.app.UserKnown
;
import
com.baomidou.mybatisplus.core.mapper.BaseMapper
;
public
interface
UserKnownMapper
extends
BaseMapper
<
UserKnown
>
{
}
wisenergy-mapper/src/main/resources/mapper/VolunteerMapper.xml
View file @
7ae9aec0
...
...
@@ -128,8 +128,6 @@
#{id}
</foreach>
</if>
order by major_name,lowest_mark desc
</where>
</select>
...
...
wisenergy-model/src/main/java/cn/wisenergy/model/app/UserKnown.java
0 → 100644
View file @
7ae9aec0
package
cn
.
wisenergy
.
model
.
app
;
import
com.alibaba.excel.annotation.ExcelProperty
;
import
com.baomidou.mybatisplus.annotation.TableName
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
java.io.Serializable
;
import
java.util.Date
;
@Data
@ApiModel
(
value
=
"UserKnown"
)
@TableName
(
"user_known"
)
public
class
UserKnown
implements
Serializable
{
private
static
final
long
serialVersionUID
=
1L
;
/***
* 用户须知id
*/
@ApiModelProperty
(
value
=
"用户须知id"
,
name
=
"id"
)
private
Integer
id
;
/***
* 用户须知内容
*/
@ApiModelProperty
(
value
=
"用户须知内容"
,
name
=
"content"
)
private
String
content
;
/***
* 是否删除
*/
@ApiModelProperty
(
value
=
"是否删除"
,
name
=
"isDelete"
)
private
Integer
isDelete
;
/***
* 是否展示
*/
@ApiModelProperty
(
value
=
"是否展示"
,
name
=
"isShow"
)
private
Integer
isShow
;
/**
* 创建时间
*/
@ApiModelProperty
(
value
=
"创建时间"
,
name
=
"createTime"
)
@ExcelProperty
(
value
=
"创建时间"
)
private
Date
createTime
;
}
wisenergy-model/src/main/java/cn/wisenergy/model/dto/UserKnownDto.java
0 → 100644
View file @
7ae9aec0
package
cn
.
wisenergy
.
model
.
dto
;
import
com.alibaba.excel.annotation.ExcelProperty
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
java.io.Serializable
;
import
java.util.Date
;
@Data
@ApiModel
(
value
=
"UserKnownDto"
)
public
class
UserKnownDto
implements
Serializable
{
private
static
final
long
serialVersionUID
=
1L
;
/***
* 用户须知id
*/
@ApiModelProperty
(
value
=
"用户须知id"
,
name
=
"id"
)
private
Integer
id
;
/***
* 用户须知内容
*/
@ApiModelProperty
(
value
=
"用户须知内容"
,
name
=
"content"
)
private
String
content
;
/**
* 创建时间
*/
@ApiModelProperty
(
value
=
"创建时间"
,
name
=
"createTime"
)
@ExcelProperty
(
value
=
"创建时间"
)
private
Date
createTime
;
}
wisenergy-service/src/main/java/cn/wisenergy/service/app/UserService.java
View file @
7ae9aec0
...
...
@@ -4,6 +4,7 @@ import cn.wisenergy.common.utils.R;
import
cn.wisenergy.model.app.User
;
import
cn.wisenergy.model.dto.UserCommitDto
;
import
cn.wisenergy.model.dto.UserInfoDto
;
import
cn.wisenergy.model.dto.UserKnownDto
;
import
cn.wisenergy.model.vo.UserInfoVo
;
import
cn.wisenergy.model.vo.UserQueryVo
;
import
cn.wisenergy.model.vo.UserShowVo
;
...
...
@@ -105,4 +106,9 @@ public interface UserService {
*/
R
<
String
>
quitApplet
(
Integer
userId
);
/**
* 获取用户须知
* @return
*/
R
<
UserKnownDto
>
getUserKnown
();
}
wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/UserServiceImpl.java
View file @
7ae9aec0
...
...
@@ -7,6 +7,7 @@ import cn.wisenergy.model.app.*;
import
cn.wisenergy.model.dto.UserCommitDto
;
import
cn.wisenergy.model.dto.UserDto
;
import
cn.wisenergy.model.dto.UserInfoDto
;
import
cn.wisenergy.model.dto.UserKnownDto
;
import
cn.wisenergy.model.enums.GradeType
;
import
cn.wisenergy.model.enums.SchemeTypeEnums
;
import
cn.wisenergy.model.enums.StudentType
;
...
...
@@ -62,6 +63,8 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, User> implements U
protected
VolunteerManager
volunteerManager
;
@Autowired
private
AdmissionRuleMapper
admissionRuleMapper
;
@Autowired
private
UserKnownMapper
knownMapper
;
@Value
(
"${wxPay.Applets_ID}"
)
private
String
appid
;
...
...
@@ -519,5 +522,20 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, User> implements U
}
return
R
.
error
(
"退出失败"
);
}
@Override
public
R
<
UserKnownDto
>
getUserKnown
()
{
QueryWrapper
<
UserKnown
>
userKnownQueryWrapper
=
new
QueryWrapper
<>();
userKnownQueryWrapper
.
eq
(
"is_delete"
,
0
);
userKnownQueryWrapper
.
eq
(
"is_show"
,
1
);
userKnownQueryWrapper
.
orderByDesc
(
"create_time"
);
userKnownQueryWrapper
.
last
(
"limit 0,1 "
);
UserKnown
userKnown
=
knownMapper
.
selectOne
(
userKnownQueryWrapper
);
UserKnownDto
userKnownDto
=
new
UserKnownDto
();
userKnownDto
.
setContent
(
userKnown
.
getContent
());
userKnownDto
.
setId
(
userKnown
.
getId
());
userKnownDto
.
setCreateTime
(
userKnown
.
getCreateTime
());
return
R
.
ok
(
userKnownDto
);
}
}
wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/WxPayServiceImpl.java
View file @
7ae9aec0
...
...
@@ -23,6 +23,7 @@ import java.net.HttpURLConnection;
import
java.net.URL
;
import
java.net.URLEncoder
;
import
java.nio.charset.StandardCharsets
;
import
java.text.DecimalFormat
;
import
java.util.*
;
import
static
com
.
baomidou
.
mybatisplus
.
core
.
toolkit
.
Constants
.
MD5
;
...
...
wisenergy-service/src/main/java/cn/wisenergy/service/common/Common.java
View file @
7ae9aec0
...
...
@@ -39,24 +39,24 @@ public class Common {
* 支付宝--回调地址
*/
//测试
//
public static final String NOTIFY_URL = "http://111.203.232.171:8997/pay/aliPayCallBack.do";
public
static
final
String
NOTIFY_URL
=
"http://111.203.232.171:8997/pay/aliPayCallBack.do"
;
//线上
public
static
final
String
NOTIFY_URL
=
"https://jygkzy.com/api/pay/aliPayCallBack.do"
;
//
public static final String NOTIFY_URL = "https://jygkzy.com/api/pay/aliPayCallBack.do";
/***
* 支付宝--pc端支付成功跳转地址
*/
//测试
//
public static final String RETURN_URL_PC = "http://111.203.232.171:8999/#/wallet";
public
static
final
String
RETURN_URL_PC
=
"http://111.203.232.171:8999/#/wallet"
;
//线上
public
static
final
String
RETURN_URL_PC
=
"https://jygkzy.com/#/wallet"
;
//
public static final String RETURN_URL_PC = "https://jygkzy.com/#/wallet";
/***
* 支付宝--手机网页支付成功跳转地址
*/
//测试
//
public static final String RETURN_URL_WAP = "http://111.203.232.171:8999/#/history";
public
static
final
String
RETURN_URL_WAP
=
"http://111.203.232.171:8999/#/history"
;
//线上
public
static
final
String
RETURN_URL_WAP
=
"https://jygkzy.com/#/history"
;
//
public static final String RETURN_URL_WAP = "https://jygkzy.com/#/history";
/**
...
...
wisenergy-service/src/main/java/cn/wisenergy/service/shir/config/ShiroConfig.java
View file @
7ae9aec0
...
...
@@ -86,6 +86,7 @@ public class ShiroConfig {
filterChainDefinitionMap
.
put
(
"/user/login/*"
,
"anon"
);
// 登录页面-身份认证
filterChainDefinitionMap
.
put
(
"/user/sendSms"
,
"anon"
);
// 发送验证码
filterChainDefinitionMap
.
put
(
"/user/valid"
,
"anon"
);
// 缓存验证码
filterChainDefinitionMap
.
put
(
"/user/getUserKnown"
,
"anon"
);
// 用户须知接口放行
filterChainDefinitionMap
.
put
(
"/account/login"
,
"anon"
);
// 登录页面-身份认证
filterChainDefinitionMap
.
put
(
"/staffUser/login"
,
"anon"
);
// 登录页面-身份认证
filterChainDefinitionMap
.
put
(
"/swagger-ui.html"
,
"anon"
);
// swagger接口-匿名访问
...
...
wisenergy-service/src/main/java/cn/wisenergy/service/shir/filter/KickoutSessionControlFilter.java
View file @
7ae9aec0
...
...
@@ -50,6 +50,7 @@ public class KickoutSessionControlFilter extends AccessControlFilter{
static
{
filterChainDefinitionList
.
add
(
"/login"
);
filterChainDefinitionList
.
add
(
"/user/valid"
);
filterChainDefinitionList
.
add
(
"/user/getUserKnown"
);
filterChainDefinitionList
.
add
(
"/user/sendSms"
);
filterChainDefinitionList
.
add
(
"pay/aliPayCallBack.do"
);
filterChainDefinitionList
.
add
(
"pay/wxPayCallBack.do"
);
...
...
wisenergy-service/src/main/java/cn/wisenergy/service/wxpay/WxCommon.java
View file @
7ae9aec0
...
...
@@ -8,9 +8,10 @@ package cn.wisenergy.service.wxpay;
*/
public
class
WxCommon
{
//public static final String NOTIFY_URL = "http://111.203.232.171:8997/pay/wxPayCallBack.do";
public
static
final
String
NOTIFY_URL
=
"https://jygkzy.com/api/pay/wxPayCallBack.do"
;
//测试
public
static
final
String
NOTIFY_URL
=
"http://111.203.232.171:8997/pay/wxPayCallBack.do"
;
//线上
//public static final String NOTIFY_URL = "https://jygkzy.com/api/pay/wxPayCallBack.do";
...
...
wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/UserController.java
View file @
7ae9aec0
...
...
@@ -6,6 +6,7 @@ import cn.wisenergy.common.utils.R;
import
cn.wisenergy.model.app.User
;
import
cn.wisenergy.model.dto.UserCommitDto
;
import
cn.wisenergy.model.dto.UserInfoDto
;
import
cn.wisenergy.model.dto.UserKnownDto
;
import
cn.wisenergy.model.vo.UserInfoVo
;
import
cn.wisenergy.model.vo.UserQueryVo
;
import
cn.wisenergy.model.vo.UserShowVo
;
...
...
@@ -200,4 +201,10 @@ public class UserController {
return
userService
.
quitApplet
(
userId
);
}
@ApiOperation
(
value
=
"获取用户须知"
,
notes
=
"退出小程序"
,
httpMethod
=
"POST"
)
@PostMapping
(
"/getUserKnown"
)
public
R
<
UserKnownDto
>
getUserKnown
(){
return
userService
.
getUserKnown
();
}
}
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