资讯模块数据——数据展示功能修复

wisenergy-mapper/src/main/resources/mapper/UsersMapper.xml

@@ -182,8 +182,8 @@
 
     <!--用户注册-->
     <insert id="save">
-        insert into user(user_id,invite_code,be_invited_code,user_level) value
-        (#{userId},#{inviteCode},#{beInvitedCode},#{userLevel})
+        insert into user(user_id,invite_code,be_invited_code,user_level,create_time,update_time) value
+        (#{userId},#{inviteCode},#{beInvitedCode},#{userLevel}#{now()},#{now()})
     </insert>
     <insert id="insertbyint">
         insert into user_info(user_id,be_invited_code) value (#{userId},#{beInvitedCode})

wisenergy-model/src/main/java/cn/wisenergy/model/app/UsersDto.java

@@ -13,7 +13,7 @@ public class UsersDto extends User implements Serializable {
     /**
      * 主键id
      */
-    private Integer id;
+    private Integer id;     //  beInvitedCode":"1","id":65,"inviteCode":"GBY34L","userId":"19919990669","userLevel":0
     /**
      * 手机号作为用户账号
      */
@@ -21,7 +21,7 @@ public class UsersDto extends User implements Serializable {
     /**
      * 用户头像
      */
-    private String headImage;
+//    private String headImage;
     /**
      * 用户会员等级
      */
@@ -31,7 +31,7 @@ public class UsersDto extends User implements Serializable {
      * 跨境额度
      */
 
-    private BigDecimal crossBorderLine;
+//    private BigDecimal crossBorderLine;
 
 
     /**
@@ -42,17 +42,17 @@ public class UsersDto extends User implements Serializable {
     /**
      * 推荐人邀请码
      */
-    private String beInvitedCode;
+//    private String beInvitedCode;
 
     /**
      * 用户名称
      */
-    private Integer userName;
+//    private Integer userName;
 
     /**
      * 创建时间
      */
-    private Date createTime;
+//    private Date createTime;
 
     //用户token
     private String token;
@@ -77,15 +77,7 @@ public class UsersDto extends User implements Serializable {
         this.userId = userId;
     }
 
-    @Override
-    public String getHeadImage() {
-        return headImage;
-    }
 
-    @Override
-    public void setHeadImage(String headImage) {
-        this.headImage = headImage;
-    }
 
     @Override
     public int getUserLevel() {
@@ -97,15 +89,7 @@ public class UsersDto extends User implements Serializable {
         this.userLevel = userLevel;
     }
 
-    @Override
-    public BigDecimal getCrossBorderLine() {
-        return crossBorderLine;
-    }
 
-    @Override
-    public void setCrossBorderLine(BigDecimal crossBorderLine) {
-        this.crossBorderLine = crossBorderLine;
-    }
 
     @Override
     public String getInviteCode() {
@@ -117,25 +101,6 @@ public class UsersDto extends User implements Serializable {
         this.inviteCode = inviteCode;
     }
 
-    @Override
-    public String getBeInvitedCode() {
-        return beInvitedCode;
-    }
-
-    @Override
-    public void setBeInvitedCode(String beInvitedCode) {
-        this.beInvitedCode = beInvitedCode;
-    }
-
-    @Override
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    @Override
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
 
     public String getToken() {
         return token;

wisenergy-parent.iml

 <?xml version="1.0" encoding="UTF-8"?>
-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4" />
\ No newline at end of file
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
\ No newline at end of file

wisenergy-service/src/main/java/cn/wisenergy/service/app/UserService.java

@@ -2,6 +2,7 @@ package cn.wisenergy.service.app;
 
 import cn.wisenergy.common.utils.R;
 import cn.wisenergy.model.app.User;
+import cn.wisenergy.model.app.UsersDto;
 import cn.wisenergy.model.vo.AerialDeliveryVo;
 
 import java.util.Map;
@@ -23,6 +24,12 @@ public interface UserService {
      * @return 用户信息
      */
     User getById(String userId);
+    /**
+     * 获取登录用户
+     * @param token
+     * @return
+     */
+    UsersDto getLoginUser(String token);
 
     R<Integer> getById1(String userId);
 

wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/UserServiceImpl.java

 package cn.wisenergy.service.app.impl;
 
-import cn.wisenergy.common.utils.R;
-import cn.wisenergy.common.utils.RedisKeyUtils;
-import cn.wisenergy.common.utils.RedisUtils;
-import cn.wisenergy.common.utils.ShareCodeUtil;
+import cn.wisenergy.common.utils.*;
 import cn.wisenergy.mapper.RecommendUserMapper;
 import cn.wisenergy.mapper.TeamUserInfoMapper;
 import cn.wisenergy.mapper.UsersMapper;
 import cn.wisenergy.model.app.RecommendUser;
 import cn.wisenergy.model.app.TeamUserInfo;
 import cn.wisenergy.model.app.User;
+import cn.wisenergy.model.app.UsersDto;
 import cn.wisenergy.model.vo.AerialDeliveryVo;
 import cn.wisenergy.model.vo.UserPoolVo;
 import cn.wisenergy.service.app.UserService;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -49,6 +48,22 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, User> implements U
         return usersMapper.getByUserId(userId);
     }
 
+    /**
+     * 获取登录用户
+     * @param token
+     */
+    @Override
+    public UsersDto getLoginUser(String token) {
+        UsersDto usersDto = null;
+        String key = RedisKeyUtils.formatKeyWithPrefix(Constants.Redis.PREFIX_TOKEN,token);
+        String value = redisUtils.getValue(key);
+        if(!StringUtils.isBlank(value)){
+            usersDto = JSONObject.parseObject(value, UsersDto.class);
+            log.info("获取到用户登录信息users:{}", value);
+        }
+        return usersDto;
+    }
+
     @Override
     public R<Integer> getById1(String userId) {
 

wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/LoginController.java

@@ -113,7 +113,7 @@ public class LoginController {
     }
 
     @ApiOperation(value = "获取用户登录token信息", notes = "获取用户登录token信息", httpMethod = "POST", produces = "application/json; charset=UTF-8")
-    @RequestMapping("/info")
+    @PostMapping("/info")
     public Map info(HttpServletRequest request) throws Exception {
         String token = request.getHeader("token");
         String tokenKey = StringUtil.formatKeyWithPrefix(Constants.RedisKey.PROJECT_PRIFIX, Constants.RedisKey.TOKEN_PRIFIX, token);
@@ -125,7 +125,7 @@ public class LoginController {
             return map;
         }
         UsersDto usersDto = JSONObject.parseObject(userDtoJson, UsersDto.class);
-        usersDto.setPassword(null);
+
         return (Map) ResultUtils.returnDataSuccess(userDtoJson);
     }
 

wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/SmsController.java

@@ -41,6 +41,7 @@ public class SmsController {
     @RequestMapping("/verifyCode")
     @ResponseBody
     public Result verifyCode(@RequestParam String phone, @RequestParam Integer codeType)  {
+
         Map map=new HashMap();
         //判断phone和codeType是否符合输入类型
         if(!phone.matches(Constants.RegConstant.PHONE_REGSTR)){
@@ -59,7 +60,7 @@ public class SmsController {
         //生成随机数
         String code= MathUtils.random();
         //保存至Redis   MINUTE_INT
-        redisUtils.set(key,code,Constants.Duration.HALF_HOUR_INT);
+        redisUtils.set(key,code,Constants.Duration.TEN_HOURS_HOUR_INT);
 
         boolean flag=smsUtils.sendMessage(phone,Constants.Sms.TemplateCode.LOGIN_SF_REGISTER,code);
         return  (flag? ResultUtils.returnSuccess():ResultUtils.returnFail());

wisenergy-web-admin/src/main/java/cn/wisenergy/web/config/ShiroConfig.java

@@ -63,20 +63,22 @@ public class ShiroConfig {
         filterChainDefinitionMap.put("/sys/registered", "anon"); // 注册页面
         filterChainDefinitionMap.put("/swagger-ui.html", "anon"); // swagger接口-匿名访问
         filterChainDefinitionMap.put("/swagger/**", "anon");
+        filterChainDefinitionMap.put("/swagger-resources/**", "anon");
+        filterChainDefinitionMap.put("/webjars/springfox-swagger-ui/**", "anon");
+        filterChainDefinitionMap.put("/v2/api-docs", "anon");
         filterChainDefinitionMap.put("/user/**", "anon");
         filterChainDefinitionMap.put("/ZX/**", "anon");  //资讯的访问地址
         filterChainDefinitionMap.put("/api/user/**", "anon");  //登录注册路径
-        filterChainDefinitionMap.put("/webjars/springfox-swagger-ui/**", "anon");
-        filterChainDefinitionMap.put("/swagger-resources/**", "anon");
-        filterChainDefinitionMap.put("/v2/api-docs", "anon");
         filterChainDefinitionMap.put("/api/sms/verifyCode", "anon");
         filterChainDefinitionMap.put("/api/sms/**", "anon");
         filterChainDefinitionMap.put("/upload_flowChart/**", "anon");//图片地址
         filterChainDefinitionMap.put("/webSocket/**", "anon");//socket
         filterChainDefinitionMap.put("/message/**", "anon");//消息推送接口
-        filterChainDefinitionMap.put("/**", "oauth2");  // 其他路径均需要身份认证，一般位于最下面，优先级最低
         filterChainDefinitionMap.put("/userlevel/test","anon");
 
+
+        filterChainDefinitionMap.put("/**", "oauth2");  // 其他路径均需要身份认证，一般位于最下面，优先级最低
+
         // 设置拦截器
         shiroFilterFactoryBean.setFilterChainDefinitionMap(filterChainDefinitionMap);
         return shiroFilterFactoryBean;