接口调整

pqs-gateway/pom.xml

@@ -96,7 +96,7 @@
             <plugin>
                 <groupId>com.spotify</groupId>
                 <artifactId>docker-maven-plugin</artifactId>
-                <version>1.0.0</version>
+                <version>1.2.2</version>
                 <executions>
                     <!--执行mvn package,即执行 mvn clean package docker:build-->
                     <execution>

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

pqs-user/user-api/src/main/java/com/njcn/user/pojo/po/app/AppInfoSet.java

@@ -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;
-
-/**
- * <p>
- * APP用户消息配置表
- * </p>
- *
- * @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;
-
-
-}

pqs-user/user-boot/pom.xml

@@ -23,6 +23,11 @@
             <artifactId>user-api</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>com.njcn</groupId>
+            <artifactId>cs-system-api</artifactId>
+            <version>1.0.0</version>
+        </dependency>
         <dependency>
             <groupId>com.njcn</groupId>
             <artifactId>system-api</artifactId>

pqs-user/user-boot/src/main/java/com/njcn/user/mapper/AppInfoSetMapper.java

@@ -1,16 +0,0 @@
-package com.njcn.user.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.njcn.user.pojo.po.app.AppInfoSet;
-
-/**
- * <p>
- * APP用户消息配置表 Mapper 接口
- * </p>
- *
- * @author xuyang
- * @since 2023-06-08
- */
-public interface AppInfoSetMapper extends BaseMapper<AppInfoSet> {
-
-}

pqs-user/user-boot/src/main/java/com/njcn/user/service/IAppInfoSetService.java

@@ -1,16 +0,0 @@
-package com.njcn.user.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.njcn.user.pojo.po.app.AppInfoSet;
-
-/**
- * <p>
- * APP用户消息配置表 服务类
- * </p>
- *
- * @author xuyang
- * @since 2023-06-08
- */
-public interface IAppInfoSetService extends IService<AppInfoSet> {
-
-}

pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/AppInfoSetServiceImpl.java

@@ -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;
-
-/**
- * <p>
- * APP用户消息配置表 服务实现类
- * </p>
- *
- * @author xuyang
- * @since 2023-06-08
- */
-@Service
-public class AppInfoSetServiceImpl extends ServiceImpl<AppInfoSetMapper, AppInfoSet> implements IAppInfoSetService {
-
-}

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<AppUserMapper, User> 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<AppUserMapper, User> 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);
+            appInfoSet.setDataInfo(1);
-            appInfoSetService.save(appInfoSet);
+            appInfoSetFeignClient.add(appInfoSet);
             //发送用户初始密码
             sendPasswordMessage(phone,newUser.getId());
             //删除验证码