Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
amos-boot-biz
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
项目统一框架
amos-boot-biz
Commits
75773970
Commit
75773970
authored
Sep 19, 2023
by
wujiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改代码报错
parent
2dc48632
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
11 additions
and
13 deletions
+11
-13
IDesignInformationService.java
...ot/module/hygf/api/service/IDesignInformationService.java
+1
-1
CommonResponseUtil.java
...in/amos/boot/module/hygf/api/util/CommonResponseUtil.java
+1
-1
pom.xml
amos-boot-system-jxiop/amos-boot-module-hygf-biz/pom.xml
+1
-3
DesignInformationServiceImpl.java
...e/hygf/biz/service/impl/DesignInformationServiceImpl.java
+1
-1
PeasantHouseholdServiceImpl.java
...le/hygf/biz/service/impl/PeasantHouseholdServiceImpl.java
+4
-4
PersonnelBusinessServiceImpl.java
...e/hygf/biz/service/impl/PersonnelBusinessServiceImpl.java
+1
-1
WxServiceImpl.java
...amos/boot/module/hygf/biz/service/impl/WxServiceImpl.java
+1
-1
DesUtil.java
.../com/yeejoin/amos/boot/module/jxiop/api/util/DesUtil.java
+1
-1
No files found.
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/service/IDesignInformationService.java
View file @
75773970
package
com
.
yeejoin
.
amos
.
boot
.
module
.
jxiop
.
api
.
service
;
package
com
.
yeejoin
.
amos
.
boot
.
module
.
hygf
.
api
.
service
;
/**
...
...
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/util/CommonResponseUtil.java
View file @
75773970
package
com
.
yeejoin
.
amos
.
boot
.
module
.
hygf
.
api
.
util
;
import
com.yeejoin.amos.boot.module.
jxiop
.api.util.Constants
;
import
com.yeejoin.amos.boot.module.
hygf
.api.util.Constants
;
import
org.springframework.http.HttpStatus
;
public
class
CommonResponseUtil
...
...
amos-boot-system-jxiop/amos-boot-module-hygf-biz/pom.xml
View file @
75773970
...
...
@@ -41,8 +41,6 @@
<artifactId>
spring-boot-starter-activemq
</artifactId>
<version>
2.5.4
</version>
</dependency>
<dependency>
<groupId>
mcb.module.standard
</groupId>
<artifactId>
api
</artifactId>
...
...
@@ -51,7 +49,7 @@
<dependency>
<groupId>
com.qiyuesuo.sdk
</groupId>
<artifactId>
sdk-java
</artifactId>
<version>
3.
0.0
</version>
<version>
3.
6.3
</version>
</dependency>
</dependencies>
...
...
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/DesignInformationServiceImpl.java
View file @
75773970
...
...
@@ -2,7 +2,7 @@ package com.yeejoin.amos.boot.module.hygf.biz.service.impl;
import
com.yeejoin.amos.boot.module.hygf.api.entity.DesignInformation
;
import
com.yeejoin.amos.boot.module.hygf.api.mapper.DesignInformationMapper
;
import
com.yeejoin.amos.boot.module.
jxiop
.api.service.IDesignInformationService
;
import
com.yeejoin.amos.boot.module.
hygf
.api.service.IDesignInformationService
;
import
com.yeejoin.amos.boot.module.hygf.api.dto.DesignInformationDto
;
import
org.typroject.tyboot.core.rdbms.service.BaseService
;
import
org.springframework.stereotype.Service
;
...
...
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/PeasantHouseholdServiceImpl.java
View file @
75773970
...
...
@@ -14,7 +14,7 @@ import com.yeejoin.amos.boot.module.hygf.api.mapper.PersonnelBusinessMapper;
import
com.yeejoin.amos.boot.module.hygf.api.service.IPeasantHouseholdService
;
import
com.yeejoin.amos.boot.module.hygf.api.service.IUnitInfoService
;
import
com.yeejoin.amos.boot.module.hygf.api.service.IWxService
;
import
com.yeejoin.amos.boot.module.
jxiop
.api.util.HttpUtil
;
import
com.yeejoin.amos.boot.module.
hygf
.api.util.HttpUtil
;
import
com.yeejoin.amos.component.feign.model.FeignClientResult
;
import
com.yeejoin.amos.component.robot.AmosRequestContext
;
import
com.yeejoin.amos.feign.privilege.Privilege
;
...
...
@@ -398,7 +398,7 @@ public class PeasantHouseholdServiceImpl extends BaseService<PeasantHouseholdDto
roleSeqMap
.
put
(
companyInfo
.
getSequenceNbr
(),
roleIds
);
orgRoles
.
put
(
companyInfo
.
getSequenceNbr
(),
userRoleList
);
// 初始默认密码 a1234560
String
custPassword
=
com
.
yeejoin
.
precontrol
.
common
.
utils
.
DesUtil
.
encode
(
registerPassword
,
SECRETKEY
);
String
custPassword
=
DesUtil
.
encode
(
registerPassword
,
SECRETKEY
);
AgencyUserModel
agencyUserModel
=
new
AgencyUserModel
();
agencyUserModel
.
setUserName
(
mobileLoginParamDto
.
getPhoneNo
());
agencyUserModel
.
setRealName
(
mobileLoginParamDto
.
getPhoneNo
());
...
...
@@ -406,7 +406,7 @@ public class PeasantHouseholdServiceImpl extends BaseService<PeasantHouseholdDto
agencyUserModel
.
setRePassword
(
custPassword
);
// model中有个openId, 传手机号,verifyCode值为手机号加密
agencyUserModel
.
setOpenId
(
mobileLoginParamDto
.
getPhoneNo
());
agencyUserModel
.
setVerifyCode
(
com
.
yeejoin
.
precontrol
.
common
.
utils
.
DesUtil
.
encode
(
mobileLoginParamDto
.
getPhoneNo
(),
SECRETKEY
));
agencyUserModel
.
setVerifyCode
(
DesUtil
.
encode
(
mobileLoginParamDto
.
getPhoneNo
(),
SECRETKEY
));
agencyUserModel
.
setLockStatus
(
"UNLOCK"
);
agencyUserModel
.
setAgencyCode
(
"JXIOP"
);
agencyUserModel
.
setMobile
(
mobileLoginParamDto
.
getPhoneNo
());
...
...
@@ -442,7 +442,7 @@ public class PeasantHouseholdServiceImpl extends BaseService<PeasantHouseholdDto
// 授权登录
VerifyCodeAuthModel
verifyCodeAuthModel
=
new
VerifyCodeAuthModel
();
verifyCodeAuthModel
.
setLoginId
(
phoneNo
);
verifyCodeAuthModel
.
setVerifyCode
(
com
.
yeejoin
.
precontrol
.
common
.
utils
.
DesUtil
.
encode
(
phoneNo
,
SECRETKEY
));
// 手机号码 + 密码盐
verifyCodeAuthModel
.
setVerifyCode
(
DesUtil
.
encode
(
phoneNo
,
SECRETKEY
));
// 手机号码 + 密码盐
log
.
info
(
"微信登录入参 => {}"
,
verifyCodeAuthModel
);
loginResult
=
Privilege
.
authClient
.
Wechat
(
verifyCodeAuthModel
);
}
else
{
...
...
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/PersonnelBusinessServiceImpl.java
View file @
75773970
...
...
@@ -22,7 +22,7 @@ import com.yeejoin.amos.feign.privilege.Privilege;
import
com.yeejoin.amos.feign.privilege.model.AgencyUserModel
;
import
com.yeejoin.amos.feign.privilege.model.CompanyModel
;
import
com.yeejoin.amos.feign.privilege.model.RoleModel
;
import
com.yeejoin.
precontrol.common.utils
.DesUtil
;
import
com.yeejoin.
amos.boot.module.hygf.api.util
.DesUtil
;
import
org.apache.commons.lang3.StringUtils
;
import
org.springframework.beans.BeanUtils
;
import
org.springframework.beans.factory.annotation.Autowired
;
...
...
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/WxServiceImpl.java
View file @
75773970
...
...
@@ -8,7 +8,7 @@ import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
import
com.yeejoin.amos.boot.module.hygf.api.dto.AccessTokenDto
;
import
com.yeejoin.amos.boot.module.hygf.api.dto.WechatQrCodeDTO
;
import
com.yeejoin.amos.boot.module.hygf.api.service.IWxService
;
import
com.yeejoin.amos.boot.module.
jxiop
.api.util.HttpUtil
;
import
com.yeejoin.amos.boot.module.
hygf
.api.util.HttpUtil
;
import
lombok.Data
;
import
lombok.extern.slf4j.Slf4j
;
import
org.apache.commons.lang3.StringUtils
;
...
...
amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/util/DesUtil.java
View file @
75773970
package
com
.
yeejoin
.
precontrol
.
common
.
utils
;
package
com
.
yeejoin
.
amos
.
boot
.
module
.
jxiop
.
api
.
util
;
import
java.util.ArrayList
;
...
...
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