Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
X
xzxt-app-report
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
Administrator
xzxt-app-report
Commits
778a7cc6
Commit
778a7cc6
authored
Aug 31, 2022
by
wang_jiaxing
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
关闭swagger,完善修改密码接口
parent
d2ed94b6
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
75 additions
and
28 deletions
+75
-28
src/main/java/org/springblade/founder/redis/controller/DictitemController.java
+2
-0
src/main/java/org/springblade/founder/redis/mapper/DictitemMapper.xml
+1
-1
src/main/java/org/springblade/modules/system/mapper/SysUserMapper.java
+1
-0
src/main/java/org/springblade/modules/system/mapper/SysUserMapper.xml
+44
-0
src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
+6
-9
src/main/resources/application-dev.yml
+20
-18
src/main/resources/application.yml
+1
-0
No files found.
src/main/java/org/springblade/founder/redis/controller/DictitemController.java
View file @
778a7cc6
...
...
@@ -4,6 +4,7 @@ package org.springblade.founder.redis.controller;
import
com.alibaba.fastjson.JSONArray
;
import
com.alibaba.fastjson.JSONObject
;
import
com.alibaba.fastjson.serializer.SerializerFeature
;
import
com.baomidou.dynamic.datasource.annotation.DS
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.ApiOperation
;
import
org.springblade.founder.redis.service.IDicItemService
;
...
...
@@ -24,6 +25,7 @@ import java.util.*;
@Controller
@Api
(
tags
=
"字典码相关接口"
)
@DS
(
"db1"
)
public
class
DictitemController
{
@Autowired
...
...
src/main/java/org/springblade/founder/redis/mapper/DictitemMapper.xml
View file @
778a7cc6
...
...
@@ -34,7 +34,7 @@
startcode,
endcode
from sys_dictitem
where scbz =
'0'
where scbz =
0
<if
test=
"value != null"
>
and groupid=#{value, jdbcType=VARCHAR}
</if>
...
...
src/main/java/org/springblade/modules/system/mapper/SysUserMapper.java
View file @
778a7cc6
...
...
@@ -33,6 +33,7 @@ public interface SysUserMapper {
// 根据id查询用户 信息
SysNewUser
getUserByBh
(
String
id
)
throws
Exception
;
SysNewUser
getUserByZjhm
(
String
zjhm
)
throws
Exception
;
//删除用户信息
void
deleteUserNew
(
SysNewUser
sysNewUser
)
throws
Exception
;
...
...
src/main/java/org/springblade/modules/system/mapper/SysUserMapper.xml
View file @
778a7cc6
...
...
@@ -470,5 +470,49 @@
#{id,jdbcType=VARCHAR}
</foreach>
</select>
<select
id=
"getUserByZjhm"
resultType=
"org.springblade.modules.system.entity.SysNewUser"
>
SELECT
id as id,
unitcode as unitcode,
username as username,
password as password,
true_name as trueName,
open_flag as openFlag,
default_model as defaultModel,
remark as remark,
lrr as lrr,
lrsj as lrsj,
gxr as gxr,
gxsj as gxsj,
lrdwdm as lrdwdm,
lrdwmc as lrdwmc,
identitycard as identitycard,
sex as sex,
birthday as birthday,
telephone as telephone,
unitname as unitname,
scbz as scbz,
ip as ip,
grade as grade,
policemanid as policemanid,
default_desktop as defaultDesktop,
theme as theme,
lastlogintime as lastlogintime,
lastchecktime as lastchecktime,
xxzyurl as xxzyurl,
gzzm_zhy as gzzmZhy,
gzzm_ypy as gzzmYpy,
gzzm_zcy as gzzmZcy,
gzzm_play as gzzmPlay,
glybz as glybz,
tqyhbz as tqyhbz,
jgz_photo_zm as jgzPhotoZm,
jgz_photo_fm as jgzPhotoFm,
zbzx_dwdm as zbzxDwdm,
grdf as grdf
FROM sys_user
where scbz='0' and IDENTITYCARD=#{ zjhm , jdbcType=VARCHAR }
</select>
</mapper>
src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
View file @
778a7cc6
...
...
@@ -26,11 +26,9 @@ import org.apache.commons.lang.StringUtils;
import
org.springblade.common.constant.CommonConstant
;
import
org.springblade.core.log.exception.ServiceException
;
import
org.springblade.core.mp.base.BaseServiceImpl
;
import
org.springblade.core.secure.utils.SecureUtil
;
import
org.springblade.core.tool.utils.*
;
import
org.springblade.modules.system.entity.SysNewUser
;
import
org.springblade.modules.system.entity.User
;
import
org.springblade.modules.system.entity.UserInfo
;
import
org.springblade.modules.system.entity.UserInfoResult
;
import
org.springblade.modules.system.entity.*
;
import
org.springblade.modules.system.excel.UserExcel
;
import
org.springblade.modules.system.mapper.SysUserMapper
;
import
org.springblade.modules.system.mapper.UserMapper
;
...
...
@@ -284,9 +282,8 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, User> implement
@Override
@DS
(
"db1"
)
public
String
updatePassword
(
String
userId
,
String
oldPassword
,
String
newPassword
,
String
newPassword1
)
{
if
(
StringUtils
.
isEmpty
(
userId
)){
return
"202#用户id不能为空"
;
}
XzxtUser
userXzxt
=
SecureUtil
.
getUserXzxt
();
userId
=
userXzxt
.
getIdentitycard
();
if
(
StringUtils
.
isEmpty
(
newPassword
)
||
!
newPassword
.
equals
(
newPassword1
)){
if
(
StringUtils
.
isEmpty
(
newPassword
)){
return
"201#新密码不能为空"
;
...
...
@@ -297,9 +294,9 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, User> implement
return
"201#原密码不能为空"
;
}
try
{
SysNewUser
user
=
sysUserMapper
.
getUserBy
Bh
(
userId
);
SysNewUser
user
=
sysUserMapper
.
getUserBy
Zjhm
(
userId
);
if
(
user
==
null
){
return
"202#用户
id有误
"
;
return
"202#用户
不存在
"
;
}
if
(!
DigestUtil
.
encrypt
(
oldPassword
).
equals
(
user
.
getPassword
())){
return
"201#原密码错误"
;
...
...
src/main/resources/application-dev.yml
View file @
778a7cc6
#数据源配置
jasypt
:
encryptor
:
algorithm
:
PBEWithMD5AndDES
#加密算法设置
algorithm
:
PBEWithMD5AndDES
iv-generator-classname
:
org.jasypt.iv.NoIvGenerator
password
:
${XZXT_REPORT}
spring
:
redis
:
##redis 单机环境配置
host
:
127.0.0.1
port
:
6379
password
:
database
:
0
ssl
:
false
host
:
127.0.0.1
port
:
6379
password
:
database
:
0
ssl
:
false
# host: 74.6.54.152
# port: 6378
# database: 0
...
...
@@ -34,29 +34,29 @@ spring:
datasource
:
xzxt_hn
:
#海南
# url: jdbc:oracle:thin:@10.184.17.3:1521:HNXZXT1
# username: ENC(
ZA4vXCX7GUMt7x/QBlw0z
A==)
# password: ENC(
n4QiQMv5+CsHg6VfmTbQbwR2kIuYmSdh
)
# username: ENC(
flDmWJqmJgLHFuetYy4x/
A==)
# password: ENC(
RZWfCneQ+BFU3cZjsMTIFwU4SEajqARk
)
url
:
jdbc:oracle:thin:@47.92.129.99:1560:orcl
username
:
ENC(
+ZmqDtfuX3L1I+zDRNce9Q
==)
password
:
ENC(
ZLVz8DkDpIwf1dgWDhqlVmBFIIeppbFf
)
username
:
ENC(
2gWv/+Q7eVC8/xCQchQFrA
==)
password
:
ENC(
pg5ZP+70jL/w3c/dIfeSZ2tTB036zzax
)
driver-class-name
:
oracle.jdbc.driver.OracleDriver
type
:
com.alibaba.druid.pool.DruidDataSource
xzxt_qg
:
#全国
# url: jdbc:oracle:thin:@10.2.164.176:1521:xzdb176
# username: ENC(
rhch4Tdkraizcu3DPslYDQ
==)
# password: ENC(
h7T0jwvNnrg7TfAcZGNG0w
==)
# username: ENC(
hH+fdRs4XMMLNGuZQIqA/w
==)
# password: ENC(
AbQityqdwHeQfel3fZ1giQ
==)
url
:
jdbc:oracle:thin:@47.92.129.99:1560:orcl
username
:
ENC(
XWCKFrkmFuVEknh9I5KUS
Q==)
password
:
ENC(
g9N5euxMDNx4YXfDNgxV4QrBW+LbkGQ8
)
username
:
ENC(
UiOtXwkiqow2VejTbYSEJ
Q==)
password
:
ENC(
an9nyUTLI4x6R2zRsBltE5h/PpCeg0vm
)
driver-class-name
:
oracle.jdbc.driver.OracleDriver
type
:
com.alibaba.druid.pool.DruidDataSource
db1
:
#mysql库
# url: jdbc:mysql://74.10.26.176:4606/xzxt?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8
# username: ENC(
dOoA6OdNK03dX2IdPCf0mw
==)
# password: ENC(
WoPhZ9arQ5SqplS1gTJ1e1LOTaV/sft3
)
# username: ENC(
tVZxpXBDil7lvQE9sSEgtA
==)
# password: ENC(
RlI0E2e8nLeVM+816Fvatil3DSc4n9kJ
)
url
:
jdbc:mysql://47.92.223.200:3365/xzxt?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8
username
:
ENC(
AoAI1r/5PcFBDEs0ZFIBV
A==)
password
:
ENC(
UVE9IyOE8vTAG2UdiKMtBA
==)
username
:
ENC(
bCkMoJvvHsZlKG4TX+gkJ
A==)
password
:
ENC(
S7+oYHAxpYOgrvbb+cfb5w
==)
driver-class-name
:
com.mysql.cj.jdbc.Driver
type
:
com.alibaba.druid.pool.DruidDataSource
...
...
@@ -119,6 +119,8 @@ socketIoUrl: http://74.6.54.153:9022/sendMassage
bbgxfjPath
:
/Users/lystar/Software/fileupload/fileupload
rxhczpPath
:
/Users/lystar/Software/fileupload/rxhczp
#bbgxfjPath: /data/software/file/bbgx
#rxhczpPath: /data/software/file/rxhczp
qgEs
:
url
:
http://74.6.54.172:9061/xxcx/
...
...
src/main/resources/application.yml
View file @
778a7cc6
...
...
@@ -80,6 +80,7 @@ knife4j:
enableFilterMultipartApis
:
false
enableFilterMultipartApiMethodType
:
POST
language
:
zh-CN
production
:
true
#swagger配置信息
swagger
:
title
:
ma系统 接口文档系统
...
...
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