Merge remote-tracking branch 'origin/master'

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

@@ -9,8 +9,10 @@ import com.miaxis.user.vo.UserVipInfoVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import java.security.KeyFactory;
 import java.security.PrivateKey;
@@ -59,7 +61,7 @@ public class UserInfoController extends BaseController{
         userVipInfoVO.setUnionId(dbUserInfo.getUnionId());
         userVipInfoVO.setHeadImage(dbUserInfo.getHeadImage());
         userVipInfoVO.setNickName(dbUserInfo.getNickName());
-        userVipInfoVO.setSign(getSign(dbUserInfo.getIsVip(),dbUserInfo.getAppOpenid()));
+        userVipInfoVO.setSign(getSign(dbUserInfo.getIsVip(),dbUserInfo.getUnionId()));
         return Response.success(userVipInfoVO);
     }