天干地支

xpgx-admin/src/main/java/com/miaxis/app/controller/user/UserInfoController.java

@@ -75,11 +75,11 @@ public class UserInfoController extends BaseController {
         UserInfo dbUserInfo = userInfoService.getById(student.getId());
         UserVipInfoVO userVipInfoVO = new UserVipInfoVO();
         userVipInfoVO.setId(dbUserInfo.getId());
-        userVipInfoVO.setIsVip(dbUserInfo.getIsVip());
         userVipInfoVO.setUnionId(dbUserInfo.getUnionId());
         userVipInfoVO.setHeadImage(dbUserInfo.getHeadImage());
         userVipInfoVO.setNickName(dbUserInfo.getNickName());
-        userVipInfoVO.setSign(getSign(dbUserInfo.getIsVip(), dbUserInfo.getUnionId()));
+        String sign = String.valueOf(dbUserInfo.getExpireTime().getTime());
+        userVipInfoVO.setSign(getSign(sign, dbUserInfo.getUnionId()));
         return Response.success(userVipInfoVO);
     }
 
@@ -157,7 +157,7 @@ public class UserInfoController extends BaseController {
     }
 
 
-    private String getSign(Integer isVip, String unionId) throws Exception {
+    private String getSign(String isVip, String unionId) throws Exception {
         String str = unionId + isVip;
         // 进行签名服务
         Signature signature = Signature.getInstance("SHA256withRSA");

xpgx-admin/src/main/resources/application-local.yml

@@ -101,7 +101,6 @@ gzh:
     appSecret: 0212a4fc020cdc0c968eb17126d5fee1
 
 
-
 # 小程序
 xcx:
     appId: wxd14b31479ff7bfbc
@@ -122,9 +121,6 @@ wxpay:
     #notifyUrlRefund: https://1a0j71808.imdo.co/open-api/wx/notify/refund
 
 
-#GeoLite 地址库
-geo:
-    path: D:\ideaMiaxis\db\GeoLite2-City.mmdb
 
 
 #File文件保存地址

xpgx-common/src/main/java/com/miaxis/common/core/domain/entity/UserInfo.java

@@ -76,11 +76,11 @@ public class UserInfo extends BaseBusinessEntity{
     @ApiModelProperty(value = "0 启用 1禁用")
     private Integer status;
 
-    /** 0 否 1是 */
-    @Excel(name = "是否是vip 0-否 1-超级vip 2-普通vip")
-    @TableField("is_vip")
-    @ApiModelProperty(value = "是否是vip 0-否 1-超级vip 2-普通vip")
-    private Integer isVip;
+
+    @Excel(name = "到期时间")
+    @TableField("expire_time")
+    @ApiModelProperty(value = "到期时间")
+    private Date expireTime;
 
 
     /** 微信开放平台 */

xpgx-common/src/main/java/com/miaxis/common/core/domain/model/LoginUser.java

@@ -10,10 +10,7 @@ import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.authority.SimpleGrantedAuthority;
 import org.springframework.security.core.userdetails.UserDetails;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 
 /**
  * 登录用户身份权限
@@ -295,7 +292,8 @@ public class LoginUser implements UserDetails
             List<SimpleGrantedAuthority> roleList = new ArrayList<SimpleGrantedAuthority>();
             roleList.add(new SimpleGrantedAuthority("ROLE_STUDENT"));
             //如果已激活，是vip的话
-            if (this.getStudent().getIsVip() == 1){
+            Date now = new Date();
+            if (this.getStudent().getExpireTime() != null && now.compareTo(this.getStudent().getExpireTime())<0){
                 roleList.add(new SimpleGrantedAuthority("ROLE_VIP"));
             }
             return roleList;

xpgx-framework/src/main/java/com/miaxis/framework/web/service/UserDetailsServiceImpl.java

@@ -75,7 +75,6 @@ public class UserDetailsServiceImpl implements UserDetailsService
                     userInfo.setNickName((String) ServletUtils.getRequest().getAttribute("nickName"));
                     userInfo.setAppOpenid(openid);
                     userInfo.setUnionId(identification);
-                    userInfo.setIsVip(0);
                     userService.saveUserInfo(userInfo);
                     return createLoginUser(userService.getStudentByUnionId(identification),"app");
                 }else {
@@ -99,7 +98,6 @@ public class UserDetailsServiceImpl implements UserDetailsService
                     userInfo.setNickName((String) ServletUtils.getRequest().getAttribute("nickName"));
                     userInfo.setGzhOpenid(openid);
                     userInfo.setUnionId(identification);
-                    userInfo.setIsVip(0);
                     userService.saveUserInfo(userInfo);
                     return createLoginUser(userService.getStudentByUnionId(identification),"GH5");
                 }else {
@@ -125,7 +123,6 @@ public class UserDetailsServiceImpl implements UserDetailsService
                     userInfo.setNickName(RandomNameUtils.generateName());
                     userInfo.setXcxOpenid(openid);
                     userInfo.setUnionId(identification);
-                    userInfo.setIsVip(0);
                     userInfo.setPUnionId(pUnionId);
                     userService.saveUserInfo(userInfo);
                     return createLoginUser(userService.getStudentByUnionId(identification),"XCX");

xpgx-service/src/main/java/com/miaxis/user/vo/UserVipInfoVO.java

@@ -16,11 +16,6 @@ public class UserVipInfoVO {
     private String unionId;
 
 
-    /** 0 否 1是 */
-
-    @ApiModelProperty(value = "是否是vip 0 否 1是")
-    private Integer isVip;
-
 
 
     @ApiModelProperty(value = "签名")