Merge branch 'feature/dangjian'

esua-epdc/epdc-auth/pom.xml

@@ -115,7 +115,7 @@
                 <spring.redis.password>CJ!redis@elink</spring.redis.password>
 
                 <!-- nacos -->
-                <nacos.register-enabled>false</nacos.register-enabled>
+                <nacos.register-enabled>true</nacos.register-enabled>
                 <nacos.server-addr>47.104.92.53:8848</nacos.server-addr>
                 <nacos.ip></nacos.ip>
                 <nacos.namespace>dda4cc4b-ac6c-4a58-acc5-d64e667f039f</nacos.namespace>

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/v2/ApiAppUserV2Controller.java

@@ -42,6 +42,17 @@ public class ApiAppUserV2Controller {
         return appUserService.getMaV2Token(formDto);
     }
 
+    /**
+     * 党建引领新功能小程序居民注册
+     * @param formDto
+     * @return
+     */
+    @GetMapping("user/nma" + Constant.VERSION_CONTROL + "/getToken")
+    public Result<EpdcAppAuthorizationDTO> getNMaV2Token(EpdcAppUserRegisterFormDTO formDto) {
+        ValidatorUtils.validateEntity(formDto);
+        return appUserService.getNMaV2Token(formDto);
+    }
+
     /**
      * @param formDto
      * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.result.EpdcAppAuthorizationDTO>

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AppUserService.java

@@ -189,6 +189,13 @@ public interface AppUserService {
      */
     Result<EpdcAppAuthorizationDTO> getMaV2Token(EpdcAppUserRegisterFormDTO formDto);
 
+    /**
+     * 党建引领新功能小程序居民注册接口
+     * @param formDto
+     * @return
+     */
+    Result<EpdcAppAuthorizationDTO> getNMaV2Token(EpdcAppUserRegisterFormDTO formDto);
+
     /**
      * 用户注册、获取Token
      *

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java

@@ -59,6 +59,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.io.File;
 import java.util.ArrayList;
@@ -88,31 +89,31 @@ public class AppUserServiceImpl implements AppUserService {
     @Autowired
     private WxMaServiceUtils wxMaServiceUtils;
 
-    @Autowired
+    @Resource
     private AdminFeignClient adminFeignClient;
 
-    @Autowired
+    @Resource
     private UserFeignClient userFeignClient;
 
-    @Autowired
+    @Resource
     private JwtTokenProperties jwtTokenProperties;
 
-    @Autowired
+    @Resource
     private OssFeignClient ossFeignClient;
 
-    @Autowired
+    @Resource
     private JwtTokenUtils jwtTokenUtils;
 
     @Autowired
     private RedisUtils redisUtils;
 
-    @Autowired
+    @Resource
     private GroupFeignClient groupFeignClient;
 
-    @Autowired
+    @Resource
     private PointsFeignClient pointFeignClient;
 
-    @Autowired
+    @Resource
     private CustomFeignClient customFeignClient;
 
     //private static String USER_FACE = "https://epdc.elinkchina.com.cn/esua-epdc/static/default/default_user_face.png";
@@ -736,13 +737,30 @@ public class AppUserServiceImpl implements AppUserService {
         if (!userResult.success()) {
             return new Result<EpdcAppAuthorizationDTO>().error(userResult.getMsg());
         }
-
         // IP地址
         HttpServletRequest request = HttpContextUtils.getHttpServletRequest();
+        Result<EpdcAppAuthorizationDTO> result = this.dealWithUserRegisterState(userResult.getData(), openId, unionId, IpUtils.getIpAddr(request), formDto.getInviteUserId(), formDto.getGridId());
+        return result;
+    }
 
+    @Override
+    public Result<EpdcAppAuthorizationDTO> getNMaV2Token(EpdcAppUserRegisterFormDTO formDto) {
+        WxMaJscode2SessionResult wxMaResult = this.getNMPWxUser(formDto.getWxCode());
+        String openId = wxMaResult.getOpenid();
+        String unionId = wxMaResult.getUnionid();
 
+        // 查询当前微信注册状态
+        EpdcCheckUserRegisterFromDTO checkFromDto = new EpdcCheckUserRegisterFromDTO();
+        checkFromDto.setOpenId(openId);
+        checkFromDto.setWxUnionId(unionId);
+        checkFromDto.setGridId(formDto.getGridId());
+        Result<EpdcUserRegisterInfoResultDTO> userResult = userFeignClient.getUserRegisterState(checkFromDto);
+        if (!userResult.success()) {
+            return new Result<EpdcAppAuthorizationDTO>().error(userResult.getMsg());
+        }
+        // IP地址
+        HttpServletRequest request = HttpContextUtils.getHttpServletRequest();
         Result<EpdcAppAuthorizationDTO> result = this.dealWithUserRegisterState(userResult.getData(), openId, unionId, IpUtils.getIpAddr(request), formDto.getInviteUserId(), formDto.getGridId());
-
         return result;
     }