云应用相关的业务代码

src/main/java/com/hwstudio/antaile/controller/AtlTimeController.java

@@ -606,4 +606,5 @@ public class AtlTimeController extends BaseController {
     public JsonResult selectAtlTimeCreateDateById(@ApiParam(value = "时光纪id", required = true) @RequestParam(value = "timeId", required = true) Long timeId) {
         return this.atlTimeService.selectAtlTimeCreateDateById(timeId);
     }
+
 }

src/main/java/com/hwstudio/antaile/controller/RegisterController.java

@@ -19,7 +19,7 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 @RequestMapping("/register")
 @Api(tags = "注册接口")
-@CrossOrigin
+@CrossOrigin(origins = "*",maxAge = 3600)
 public class RegisterController {
 
     @Autowired

src/main/java/com/hwstudio/antaile/controller/SmsController.java

@@ -18,7 +18,7 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 @RequestMapping(value="/sms")
 @Api(tags = "短信相关接口")
-@CrossOrigin
+@CrossOrigin(origins = "*",maxAge = 3600)
 public class SmsController {
 
     @Autowired

src/main/java/com/hwstudio/antaile/dto/LoginUserDto.java

@@ -38,12 +38,12 @@ public class LoginUserDto {
     private String isBingMobile;
 
     private String openId;
-
-    private String officeOpendId;
-
+    @ApiModelProperty(value = "小程序openId")
     private String appletOpenId;
     @ApiModelProperty(value = "网站应用openId")
     private String webappOpenId;
+    @ApiModelProperty(value = "公众号openId")
+    private String officeOpenId;
     @ApiModelProperty(value = "微信unionid")
     private String unionid;
 }

src/main/java/com/hwstudio/antaile/service/AtlUserService.java

@@ -91,15 +91,16 @@ public class AtlUserService {
                     throw new BusinessException("密码错误");
                 }
                 String officeOpenId = atlUser.getOfficeOpenId();
-                loginUserDto.setOfficeOpendId(officeOpenId);
+                loginUserDto.setOfficeOpenId(officeOpenId);
                 String token = UUID.randomUUID().toString();
                 redisUtil.set(token, atlUser, Long.valueOf(604800));
                 loginUserDto.setToken(token);
                 loginUserDto.setAvatarUrl(atlUser.getAvaterImageUrl());
                 loginUserDto.setNickName(atlUser.getNickName());
                 loginUserDto.setPhone(atlUser.getMobilePhone());
-                loginUserDto.setOfficeOpendId(officeOpenId);
+                loginUserDto.setOfficeOpenId(officeOpenId);
                 atlUserMapper.updateUserLoginDate(atlUser.getId());
+                loginUserDto.setUserId(atlUser.getId());
                 if (StringUtils.isNotBlank(officeOpenId)) {
                     loginUserDto.setIsBingOffice("1");
                 } else {
@@ -118,7 +119,8 @@ public class AtlUserService {
                     loginUserDto.setAvatarUrl(atlUser.getAvaterImageUrl());
                     loginUserDto.setNickName(atlUser.getNickName());
                     loginUserDto.setPhone(atlUser.getMobilePhone());
-                    loginUserDto.setOfficeOpendId(officeOpenId);
+                    loginUserDto.setOfficeOpenId(officeOpenId);
+                    loginUserDto.setUserId(atlUser.getId());
                 } else {
                     loginUserDto.setIsBingOffice("0");
                 }
@@ -146,6 +148,7 @@ public class AtlUserService {
                         loginUserDto.setNickName(atlUser.getNickName());
                         loginUserDto.setPhone(atlUser.getMobilePhone());
                         loginUserDto.setOpenId(openId);
+                        loginUserDto.setUserId(atlUser.getId());
                         atlUserMapper.updateUserLoginDate(atlUser.getId());
                         loginUserDto.setIsBingApp("1");
                     } else {
@@ -179,6 +182,7 @@ public class AtlUserService {
                 loginUserDto.setNickName(atlUser.getNickName());
                 loginUserDto.setPhone(atlUser.getMobilePhone());
                 loginUserDto.setOpenId(openId);
+                loginUserDto.setUserId(atlUser.getId());
                 atlUserMapper.updateUserLoginDate(atlUser.getId());
                 if (StringUtils.isNotBlank(openId)) {
                     loginUserDto.setIsBingApp("1");
@@ -662,7 +666,7 @@ public class AtlUserService {
         loginUserDto.setNickName(atlUser.getNickName());
         loginUserDto.setPhone(atlUser.getMobilePhone());
         loginUserDto.setOpenId(atlUser.getOpenId());
-        loginUserDto.setOfficeOpendId(atlUser.getOfficeOpenId());
+        loginUserDto.setOfficeOpenId(atlUser.getOfficeOpenId());
         return loginUserDto;
     }
 

src/main/java/com/hwstudio/antaile/service/AtlWxService.java

@@ -28,6 +28,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.UUID;
@@ -121,7 +122,7 @@ public class AtlWxService {
         AtlUser atlUser = null;
         if (type.equals(1)) {
             atlUser = atlUserMapper.getByWebappOpenId(openid);
-        } else {
+        } else if (type.equals(2)){
             atlUser= atlUserMapper.getByOfficeOpenId(openid);
         }
 
@@ -130,7 +131,7 @@ public class AtlWxService {
             String msg = "";
             if (type.equals(1)) {
                 msg = "未查询到网站应用openId相关数据，需要绑定手机号";
-            } else {
+            } else if (type.equals(2)){
                 msg = "未查询到公众号openId相关数据，需要绑定手机号";
             }
             return JsonResult.failed(msg, dataMap);
@@ -143,8 +144,13 @@ public class AtlWxService {
             loginUserDto.setAvatarUrl(atlUser.getAvaterImageUrl());
             loginUserDto.setNickName(atlUser.getNickName());
             loginUserDto.setPhone(atlUser.getMobilePhone());
-            loginUserDto.setOpenId(openid);
             loginUserDto.setUserId(atlUser.getId());
+            //根据不同openId来 返回不同的值
+            if (type.equals(1)) {
+                loginUserDto.setWebappOpenId(openid);
+            } else if (type.equals(2)){
+                loginUserDto.setOfficeOpenId(openid);
+            }
             return JsonResult.success("登录成功", loginUserDto);
         }
         //{"success":true,"status":"200","message":"获取微信登录链接成功","data":"{\"openid\":\"onUQk6gm0ALTXFtddQrikfhmivR0\",\"nickname\":\"夏侯\",\"sex\":1,\"language\":\"zh_CN\",\"city\":\"Xiamen\",\"province\":\"Fujian\",\"country\":\"CN\",
@@ -197,9 +203,9 @@ public class AtlWxService {
             insertAtlUser.setNickName(userMap.get("nickname") + "");
             //判断插入来源 1表示网页应用  2表示公众号
             if (wxInsertUserParam.getType().equals(1)) {
-                atlUser.setWebappOpenId(userMap.get("openid") + "");
+                insertAtlUser.setWebappOpenId(userMap.get("openid") + "");
             } else if (wxInsertUserParam.getType().equals(2)) {
-                atlUser.setOfficeOpenId(userMap.get("openid") + "");
+                insertAtlUser.setOfficeOpenId(userMap.get("openid") + "");
             }
             insertAtlUser.setAvaterImageUrl(userMap.get("headimgurl") + "");
             insertAtlUser.setState(1);
@@ -207,6 +213,7 @@ public class AtlWxService {
             insertAtlUser.setMobilePhone(wxInsertUserParam.getMobilePhone());
             insertAtlUser.setLoginPassword(DigestUtils.md5Hex(wxInsertUserParam.getLoginPassword()));
             insertAtlUser.setUnionid(userMap.get("unionid") + "");
+            insertAtlUser.setLoginDate(new Date());
             this.atlUserMapper.insert(insertAtlUser);
         }
 
@@ -220,6 +227,12 @@ public class AtlWxService {
         loginUserDto.setPhone(insertAtlUser.getMobilePhone());
         loginUserDto.setWebappOpenId(insertAtlUser.getOpenId());
         loginUserDto.setUserId(insertAtlUser.getId());
+        //判断插入来源 1表示网页应用  2表示公众号
+        if (wxInsertUserParam.getType().equals(1)) {
+            loginUserDto.setWebappOpenId(userMap.get("openid") + "");
+        } else if (wxInsertUserParam.getType().equals(2)) {
+            loginUserDto.setOfficeOpenId(userMap.get("openid") + "");
+        }
         return JsonResult.success("绑定手机号登录成功", loginUserDto);
     }
 

src/main/java/com/hwstudio/antaile/vo/LoginUserVo.java

@@ -43,7 +43,7 @@ public class LoginUserVo {
     @ApiModelProperty(value="微信openId")
     private String officeOpenId;
 
-    @ApiModelProperty(value="是否公众号登陆")
+    @ApiModelProperty(value="是否公众号登陆 1是")
     private String isOffice;
 
     @ApiModelProperty(value="微信小程序openId")