fix:入驻审核结果通知账号乱码,账号改为手机号

nightFragrance-admin/src/main/java/com/ylx/web/controller/massage/TJsController.java

@@ -282,6 +282,7 @@ public class TJsController extends BaseController {
             js.setnTong(JsStatusEnum.JS_RETURN.getCode());
             boolean update = jsService.update(js, mhCompanyLambdaQueryWrapper);
             js.setcOpenId(js1.getcOpenId());
+            js.setcPhone(js1.getcPhone());
             jsService.jsNotification(js);
 
             return R.ok(update);

nightFragrance-admin/src/main/resources/i18n/messages.properties

@@ -16,7 +16,7 @@ length.not.valid=长度必须在{min}到{max}个字符之间
 
 user.username.not.valid=* 2到20个汉字、字母、数字或下划线组成，且必须以非数字开头
 user.password.not.valid=* 5-50个字符
- 
+
 user.email.not.valid=邮箱格式错误
 user.mobile.phone.number.not.valid=手机号格式错误
 user.login.success=登录成功

nightFragrance-framework/src/main/java/com/ylx/framework/security/handle/LogoutSuccessHandlerImpl.java

@@ -4,6 +4,9 @@ import java.io.IOException;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
+import com.ylx.common.core.domain.model.WxLoginUser;
+import com.ylx.framework.web.service.WxTokenService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.security.core.Authentication;
@@ -25,11 +28,14 @@ import com.ylx.framework.web.service.TokenService;
  * @author ylx
  */
 @Configuration
-public class LogoutSuccessHandlerImpl implements LogoutSuccessHandler
-{
+public class LogoutSuccessHandlerImpl implements LogoutSuccessHandler {
     @Autowired
     private TokenService tokenService;
 
+
+    @Autowired
+    private WxTokenService wxTokenService;
+
     /**
      * 退出处理
      *
@@ -37,16 +43,26 @@ public class LogoutSuccessHandlerImpl implements LogoutSuccessHandler
      */
     @Override
     public void onLogoutSuccess(HttpServletRequest request, HttpServletResponse response, Authentication authentication)
-            throws IOException, ServletException
-    {
+            throws IOException, ServletException {
+
+
+
         LoginUser loginUser = tokenService.getLoginUser(request);
-        if (StringUtils.isNotNull(loginUser))
-        {
+        if (StringUtils.isNotNull(loginUser)) {
             String userName = loginUser.getUsername();
             // 删除用户缓存记录
             tokenService.delLoginUser(loginUser.getToken());
             // 记录用户退出日志
             AsyncManager.me().execute(AsyncFactory.recordLogininfor(userName, Constants.LOGOUT, MessageUtils.message("user.logout.success")));
+        }else{
+            WxLoginUser wxUser = wxTokenService.getWxUser(request);
+            if (StringUtils.isNotNull(wxUser)) {
+                String userName = wxUser.getUsername();
+                // 删除用户缓存记录
+                tokenService.delLoginUser(wxUser.getToken());
+                // 记录用户退出日志
+                AsyncManager.me().execute(AsyncFactory.recordLogininfor(userName, Constants.LOGOUT, MessageUtils.message("user.logout.success")));
+            }
         }
         ServletUtils.renderString(response, JSON.toJSONString(AjaxResult.success(MessageUtils.message("user.logout.success"))));
     }

nightFragrance-massage/src/main/java/com/ylx/massage/service/impl/TJsServiceImpl.java

@@ -127,6 +127,7 @@ public class TJsServiceImpl extends ServiceImpl<TJsMapper, TJs> implements TJsSe
         jsLambdaQueryWrapper.eq(TJs::getId, js.getId()).eq(TJs::getnTong, JsStatusEnum.JS_NOT_PASS.getCode());
         js.setnTong(JsStatusEnum.JS_PASS.getCode());
         js.setnB2(1);
+        js.setcPhone(js1.getcPhone());
         js.setcTime(new Date());
         LambdaQueryWrapper<TWxUser> wxLambdaQueryWrapper = new LambdaQueryWrapper<>();
         wxLambdaQueryWrapper.eq(TWxUser::getcOpenid, js1.getcOpenId());