rakor
/
mobilebroken
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: 一些调整

This commit is contained in:
曹鹏飞 2025-02-19 19:13:45 +08:00
parent 5ff942e29a
commit dd3030050a
5 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nflg-mobilebroken-admin/src/main/resources/bootstrap-dev.properties
View File

@ -1,5 +1,5 @@
# Nacos 地址 # Nacos 地址
nacos.server-addr=112.74.186.154:8848 nacos.server-addr=${NACOS_SERVER_ADDR:112.74.186.154:8848}
#nacos.server-addr=192.168.0.194:8848 #nacos.server-addr=192.168.0.194:8848
#spring.cloud.nacos.discovery.username=nacos #spring.cloud.nacos.discovery.username=nacos
#spring.cloud.nacos.discovery.password=ZLQ8vgmjoJ4?EPJ4]fs_ #spring.cloud.nacos.discovery.password=ZLQ8vgmjoJ4?EPJ4]fs_

2
nflg-mobilebroken-auth/src/main/resources/bootstrap-dev.properties
View File

@ -1,5 +1,5 @@
# Nacos 地址 # Nacos 地址
nacos.server-addr=112.74.186.154:8848 nacos.server-addr=${NACOS_SERVER_ADDR:112.74.186.154:8848}
#nacos.server-addr=192.168.0.194:8848 #nacos.server-addr=192.168.0.194:8848
#spring.cloud.nacos.discovery.username=nacos #spring.cloud.nacos.discovery.username=nacos
#spring.cloud.nacos.discovery.password=ZLQ8vgmjoJ4?EPJ4]fs_ #spring.cloud.nacos.discovery.password=ZLQ8vgmjoJ4?EPJ4]fs_

2
nflg-mobilebroken-cfs-app/src/main/resources/bootstrap-dev.properties
View File

@ -1,5 +1,5 @@
# Nacos 地址 # Nacos 地址
nacos.server-addr=112.74.186.154:8848 nacos.server-addr=${NACOS_SERVER_ADDR:112.74.186.154:8848}
#nacos.server-addr=192.168.0.194:8848 #nacos.server-addr=192.168.0.194:8848
#spring.cloud.nacos.discovery.username=nacos #spring.cloud.nacos.discovery.username=nacos
#spring.cloud.nacos.discovery.password=ZLQ8vgmjoJ4?EPJ4]fs_ #spring.cloud.nacos.discovery.password=ZLQ8vgmjoJ4?EPJ4]fs_

2
nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AppUserApplyforServiceImpl.java
View File

@ -189,7 +189,7 @@ public class AppUserApplyforServiceImpl extends ServiceImpl<AppUserApplyforMappe
} else if (applyfor.getType() == AppUserApplyforType.EXTENSION.getState().byteValue()) { } else if (applyfor.getType() == AppUserApplyforType.EXTENSION.getState().byteValue()) {
//账号延期 //账号延期
AppUser appUser = appUserService.getById(applyfor.getUserId()); AppUser appUser = appUserService.getById(applyfor.getUserId());
appUser.setExpireTime(appUser.getExpireTime()) appUser.setExpireTime(appUser.getExpireTime().plusYears(1))
.setUpdateBy(applyfor.getCreateBy()) .setUpdateBy(applyfor.getCreateBy())
.setUpdateTime(LocalDateTime.now()); .setUpdateTime(LocalDateTime.now());
appUserService.updateById(appUser); appUserService.updateById(appUser);

18
nflg-mobilebroken-repository/src/main/resources/mapper/AppUserMapper.xml
View File

@ -38,15 +38,17 @@
</foreach> </foreach>
</select> </select>
<select id="getInfo" resultType="com.nflg.mobilebroken.common.pojo.vo.AppUserVO"> <select id="getInfo" resultType="com.nflg.mobilebroken.common.pojo.vo.AppUserVO">
SELECT u.id,u.area_id AS 'areaId',c.agency_company_name AS 'companyName',u.`name`,u.email,u.avatar,a.`name` AS 'areaName' SELECT u.id,u.area_id AS 'areaId',c.agency_company_name AS 'companyName',u.`name`,u.email,u.avatar
,u.state AS 'userState',uc.`name` AS 'createBy',u.create_time AS 'createTime',uu.`name` AS 'updateBy' ,IF(u.is_primary,a1.area_name,a2.`name`) AS 'areaName',u.state AS 'userState',uc.`name` AS 'createBy'
,u.update_time AS 'updateTime',u.last_login_time AS 'lastLoginTime',u.expire_time AS 'expireTime' ,u.create_time AS 'createTime',uu.`name` AS 'updateBy',u.update_time AS 'updateTime'
,u.is_primary AS 'isPrimary',u.login_name AS 'loginName',u.phone ,u.last_login_time AS 'lastLoginTime',u.expire_time AS 'expireTime',u.is_primary AS 'isPrimary'
,u.login_name AS 'loginName',u.phone
FROM app_user u FROM app_user u
INNER JOIN t_base_customer c ON u.company_id=c.id INNER JOIN t_base_customer c ON u.company_id = c.id
INNER JOIN app_area a ON u.area_id=a.id LEFT JOIN t_base_area a1 ON u.area_id = a1.id
LEFT JOIN app_user uc ON u.create_by=uc.id LEFT JOIN app_area a2 ON u.area_id = a2.id
LEFT JOIN app_user uu ON u.update_by=uu.id LEFT JOIN app_user uc ON u.create_by = uc.id
LEFT JOIN app_user uu ON u.update_by = uu.id
WHERE u.id = #{userId} WHERE u.id = #{userId}
</select> </select>