diff --git a/pqs-gateway/pom.xml b/pqs-gateway/pom.xml index 641a4d9cc..042e44843 100644 --- a/pqs-gateway/pom.xml +++ b/pqs-gateway/pom.xml @@ -96,7 +96,7 @@ com.spotify docker-maven-plugin - 1.0.0 + 1.2.2 diff --git a/pqs-gateway/src/main/resources/bootstrap.yml b/pqs-gateway/src/main/resources/bootstrap.yml index 0fb98cb58..6f00e5549 100644 --- a/pqs-gateway/src/main/resources/bootstrap.yml +++ b/pqs-gateway/src/main/resources/bootstrap.yml @@ -186,6 +186,7 @@ whitelist: - /user-boot/user/updateFirstPassword - /user-boot/appUser/authCode - /user-boot/appUser/register + - /user-boot/appUser/resetPsd - /pqs-auth/oauth/logout - /pqs-auth/oauth/token - /pqs-auth/oauth/autoLogin diff --git a/pqs-user/user-api/src/main/java/com/njcn/user/pojo/po/app/AppInfoSet.java b/pqs-user/user-api/src/main/java/com/njcn/user/pojo/po/app/AppInfoSet.java deleted file mode 100644 index 0d4913db3..000000000 --- a/pqs-user/user-api/src/main/java/com/njcn/user/pojo/po/app/AppInfoSet.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.njcn.user.pojo.po.app; - -import com.baomidou.mybatisplus.annotation.TableName; -import com.njcn.db.bo.BaseEntity; -import java.io.Serializable; - -import lombok.Data; -import lombok.Getter; -import lombok.Setter; - -/** - *

- * APP用户消息配置表 - *

- * - * @author xuyang - * @since 2023-06-08 - */ -@Data -@TableName("app_info_set") -public class AppInfoSet { - - private static final long serialVersionUID = 1L; - - /** - * 用户id - */ - private String userIndex; - - /** - * 0:false ;1:true 暂态消息模块 - */ - private Integer eventInfo; - - /** - * 0:false ;1:true 稳态消息模块 - */ - private Integer harmonicInfo; - - /** - * 0:false ;1:true 终端消息模块 - */ - private Integer deviceInfo; - - /** - * 0:false ;1:true 系统消息模块 - */ - private Integer systemInfo; - - -} diff --git a/pqs-user/user-boot/pom.xml b/pqs-user/user-boot/pom.xml index ea47e0536..5507fc803 100644 --- a/pqs-user/user-boot/pom.xml +++ b/pqs-user/user-boot/pom.xml @@ -23,6 +23,11 @@ user-api ${project.version} + + com.njcn + cs-system-api + 1.0.0 + com.njcn system-api diff --git a/pqs-user/user-boot/src/main/java/com/njcn/user/mapper/AppInfoSetMapper.java b/pqs-user/user-boot/src/main/java/com/njcn/user/mapper/AppInfoSetMapper.java deleted file mode 100644 index eb6211b8a..000000000 --- a/pqs-user/user-boot/src/main/java/com/njcn/user/mapper/AppInfoSetMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.njcn.user.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.njcn.user.pojo.po.app.AppInfoSet; - -/** - *

- * APP用户消息配置表 Mapper 接口 - *

- * - * @author xuyang - * @since 2023-06-08 - */ -public interface AppInfoSetMapper extends BaseMapper { - -} diff --git a/pqs-user/user-boot/src/main/java/com/njcn/user/service/IAppInfoSetService.java b/pqs-user/user-boot/src/main/java/com/njcn/user/service/IAppInfoSetService.java deleted file mode 100644 index 916eec53e..000000000 --- a/pqs-user/user-boot/src/main/java/com/njcn/user/service/IAppInfoSetService.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.njcn.user.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.njcn.user.pojo.po.app.AppInfoSet; - -/** - *

- * APP用户消息配置表 服务类 - *

- * - * @author xuyang - * @since 2023-06-08 - */ -public interface IAppInfoSetService extends IService { - -} diff --git a/pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/AppInfoSetServiceImpl.java b/pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/AppInfoSetServiceImpl.java deleted file mode 100644 index adb8ba966..000000000 --- a/pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/AppInfoSetServiceImpl.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.njcn.user.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.njcn.user.mapper.AppInfoSetMapper; -import com.njcn.user.pojo.po.app.AppInfoSet; -import com.njcn.user.service.IAppInfoSetService; -import org.springframework.stereotype.Service; - -/** - *

- * APP用户消息配置表 服务实现类 - *

- * - * @author xuyang - * @since 2023-06-08 - */ -@Service -public class AppInfoSetServiceImpl extends ServiceImpl implements IAppInfoSetService { - -} diff --git a/pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/AppUserServiceImpl.java b/pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/AppUserServiceImpl.java index 6e678ed4d..650bedf46 100644 --- a/pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/AppUserServiceImpl.java +++ b/pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/AppUserServiceImpl.java @@ -15,6 +15,8 @@ import com.njcn.common.pojo.constant.PatternRegex; import com.njcn.common.pojo.exception.BusinessException; import com.njcn.common.utils.PubUtils; import com.njcn.common.utils.sm.Sm4Utils; +import com.njcn.cssystem.api.AppInfoSetFeignClient; +import com.njcn.cssystem.pojo.po.AppInfoSet; import com.njcn.redis.pojo.enums.RedisKeyEnum; import com.njcn.redis.utils.RedisUtil; import com.njcn.user.enums.AppRoleEnum; @@ -26,7 +28,6 @@ import com.njcn.user.pojo.constant.UserType; import com.njcn.user.pojo.po.Role; import com.njcn.user.pojo.po.User; import com.njcn.user.pojo.po.UserSet; -import com.njcn.user.pojo.po.app.AppInfoSet; import com.njcn.user.pojo.po.app.AppSendMsg; import com.njcn.user.service.*; import lombok.AllArgsConstructor; @@ -58,14 +59,14 @@ public class AppUserServiceImpl extends ServiceImpl impleme private final IAppSendMsgService appSendMsgService; - private final IAppInfoSetService appInfoSetService; - private final IUserSetService userSetService; private final IRoleService roleService; private final IUserRoleService userRoleService; + private final AppInfoSetFeignClient appInfoSetFeignClient; + @Override @Transactional(rollbackFor = Exception.class) public void setMessage(String phone, String devCode, String type) { @@ -200,12 +201,12 @@ public class AppUserServiceImpl extends ServiceImpl impleme userRoleService.addUserRole(newUser.getId(), Collections.singletonList(role.getId())); //消息默认配置 AppInfoSet appInfoSet = new AppInfoSet(); - appInfoSet.setUserIndex(newUser.getId()); + appInfoSet.setUserId(newUser.getId()); appInfoSet.setDeviceInfo(1); appInfoSet.setEventInfo(1); appInfoSet.setSystemInfo(1); - appInfoSet.setHarmonicInfo(1); - appInfoSetService.save(appInfoSet); + appInfoSet.setDataInfo(1); + appInfoSetFeignClient.add(appInfoSet); //发送用户初始密码 sendPasswordMessage(phone,newUser.getId()); //删除验证码