Merge remote-tracking branch 'origin/master'

wisenergy-common/src/main/java/cn/wisenergy/common/utils/Constants.java

@@ -21,7 +21,7 @@ public class Constants {
         public final static Integer DECIMAL_DIGITS = 2;
 
         //头像地址
-        public final static String HEAD_POTRAIT= "http://8.131.244.76:81/upload/14c54de0d-ee41-4e90-8c3e-ae6b93a2ad91.png";
+        public final static String HEAD_POTRAIT= "/upload/14c54de0d-ee41-4e90-8c3e-ae6b93a2ad91.png";
     }
     //访问来源
     public static class SourceType{
@@ -49,6 +49,8 @@ public class Constants {
         public final static Integer HALF_HOUR_INT = MINUTE_INT * 30;
         //十小时
         public final static Integer TEN_HOURS_HOUR_INT = HALF_HOUR_INT * 20;
+        //一个月
+        public final static Integer ONE_MONTH_HOUR_INT =TEN_HOURS_HOUR_INT*72;
     }
     //正则的一些常量
     public static class RegConstant{

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

@@ -20,7 +20,7 @@
     </sql>
 
     <sql id="cols_exclude_id">
-        zx_url,zx_field,zx_address,invite_code,zx_date
+        zx_url,zx_field,invite_code,zx_date
     </sql>
 
     <sql id="vals">
@@ -62,7 +62,6 @@
       b.zx_likes as zxLikes,
       b.zx_field as zxField,
       b.zx_date as zxDate,
-      b.zx_address as zxAddress,
       b.invite_code as inviteCode,
       a.user_id as userId,
       a.head_image as headImage

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

@@ -57,12 +57,7 @@ public class zxUserDto {
     @TableField(exist = false)
     @ApiModelProperty(name = "zx_field", value = "资讯文字输入字段")
     private String zxField;
-    /**
-     * 用户发布地址
-     */
-    @TableField(exist = false)
-    @ApiModelProperty(name = "zx_address", value = "用户发布地址")
-    private String zxAddress;
+
     /**
      * 资讯数据创建时间
      */

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

@@ -5,7 +5,6 @@ import org.springframework.core.io.Resource;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
-import java.util.List;
 import java.util.Map;
 
 /**
@@ -34,7 +33,7 @@ public interface UploadService {
      * @param file
      * @return
      */
-     List imageUpload( MultipartFile[] file, String zxField,String inviteCode);
+     Map imageUpload(MultipartFile[] file, String zxField, String inviteCode);
 
 
 

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

@@ -9,7 +9,6 @@ import cn.wisenergy.model.app.User;
 import cn.wisenergy.model.app.shopZx;
 import cn.wisenergy.model.app.userLikes;
 import cn.wisenergy.model.app.zxUserDto;
-import com.alibaba.fastjson.JSON;
 import org.springframework.core.io.Resource;
 import org.springframework.core.io.UrlResource;
 import org.springframework.stereotype.Service;
@@ -158,7 +157,7 @@ public class UploadServiceImpl implements UploadService {
      * @return
      */
     @Override
-    public List imageUpload(MultipartFile[] files, String zxField, String inviteCode) {
+    public Map imageUpload(MultipartFile[] files, String zxField, String inviteCode) {
         //获取上传图片数量，打印在控制台
         System.out.println("上传图片数量" + files.length);
         String zxUrl = new String();
@@ -170,7 +169,7 @@ public class UploadServiceImpl implements UploadService {
         Long time = new Date().getTime();
         String localPath = "/upload/";
         Map<String, Object> result = new HashMap<String, Object>();//一个文件上传的结果
-        String result_msg = "";//上传结果信息
+        String msg = "";//上传结果信息
         //遍历图片数据
         for (MultipartFile file : files) {
             if (file.isEmpty()) {
@@ -193,26 +192,27 @@ public class UploadServiceImpl implements UploadService {
                     //文件存放的相对路径(一般存放在数据库用于img标签的src)
                     String relativePath ="用于判断是否图片上传成功，返回值有："+fileName;
                     result.put("relativePath", relativePath);//前端根据是否存在该字段来判断上传是否成功
-                    result_msg = "图片上传成功";
+                    msg = "图片上传成功";
                     result.put("zxUrl", zxUrl);
                 } else {
-                    result_msg = "图片上传失败";
+                    msg = "图片上传失败";
                 }
             } else {
-                result_msg = "图片格式不正确";
+                msg = "图片格式不正确";
             }
         }
-        result.put("result_msg", result_msg);
-        root.add(result);
-        String root_json = JSON.toJSONString(root);
-        System.out.println(root_json);
-        result.put("returnCode", 0);
+//        result.put("msg", result_msg);
+        //root.add(result);
+       // String root_json = JSON.toJSONString(root);
+       // System.out.println(root_json);
+        result.put("code", 0);
+        result.put("msg",msg);
         /**
          * 生成当前时间戳
          */
         Long zxDate= Long.valueOf(System.currentTimeMillis());
         shopZxMapper.zxadd(zxUrl,zxField,inviteCode, zxDate);
-        return root;
+        return result;
     }
 
     /**
@@ -292,7 +292,13 @@ public class UploadServiceImpl implements UploadService {
             }
 
             int likedId =shopZx.getZxid();
+            if(shopZx.getUserId()==null&&""!=shopZx.getUserId()){
+                map.put("code",1);
+                map.put("msg","用户不存在！请重新开始！");
+                return map;
+            }
             shopZx.setUserId(shopZx.getUserId().replaceAll("(\\d{3})\\d{4}(\\d{4})", "$1****$2"));
+
             if(null!=inviteCode&&""!=inviteCode) {
                 //用户个人邀请码查询用户数据
                 User user=usersMapper.InvitedCode2(inviteCode);

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

@@ -109,7 +109,7 @@ public class LoginController {
         String tokenKey = StringUtil.formatKeyWithPrefix(Constants.RedisKey.PROJECT_PRIFIX, Constants.RedisKey.TOKEN_PRIFIX, token);
         UsersDto usersDto = new UsersDto();
         BeanUtils.copyProperties(users, usersDto);
-        redisUtils.set(tokenKey, JSONObject.toJSONString(usersDto), Constants.Duration.HALF_HOUR_INT);
+        redisUtils.set(tokenKey, JSONObject.toJSONString(usersDto), Constants.Duration.ONE_MONTH_HOUR_INT);
         return token;
     }
 

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

@@ -13,7 +13,6 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
-import java.util.List;
 import java.util.Map;
 
 
@@ -90,7 +89,7 @@ public class UploadController {
             @ApiImplicitParam(name = "inviteCode", value = "用户本人邀请码（发布人）", required = true, dataType = "String")})
 
     @RequestMapping(method = RequestMethod.POST, value = "/multipleImageUpload", headers = "content-type=multipart/form-data")
-    public List multipleImageUpload(@RequestParam(required=false,value = "files") MultipartFile[] files, String zxField,String inviteCode) {
+    public Map multipleImageUpload(@RequestParam(required=false,value = "files") MultipartFile[] files, String zxField, String inviteCode) {
         return uploadService.imageUpload(files, zxField,inviteCode);
 
     }