mirage
/
edu
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://gitee.com/likeshop_gitee/likeadmin-java into develop

This commit is contained in:
Jason 2022-09-19 12:12:03 +08:00
parent 65da3d4a3a a7e50bf511
commit fa4de3214d
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
server/like-admin/src/main/java/com/mdd/admin/controller/common/UploadController.java
View File

@ -106,6 +106,7 @@ public class UploadController {
album.put("ext", map.get("ext").toString()); album.put("ext", map.get("ext").toString());
album.put("size", map.get("size").toString()); album.put("size", map.get("size").toString());
album.put("url", map.get("url").toString()); album.put("url", map.get("url").toString());
album.put("name", map.get("name").toString());
Integer id = iAlbumService.albumAdd(album); Integer id = iAlbumService.albumAdd(album);
map.put("id", id); map.put("id", id);

4
server/like-front/src/main/java/com/mdd/front/service/impl/UserServiceImpl.java
View File

@ -6,14 +6,11 @@ import cn.binarywang.wx.miniapp.bean.WxMaPhoneNumberInfo;
import cn.binarywang.wx.miniapp.config.impl.WxMaDefaultConfigImpl; import cn.binarywang.wx.miniapp.config.impl.WxMaDefaultConfigImpl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.mdd.common.config.GlobalConfig; import com.mdd.common.config.GlobalConfig;
import com.mdd.common.entity.server.Sys;
import com.mdd.common.entity.system.SystemConfig;
import com.mdd.common.entity.user.User; import com.mdd.common.entity.user.User;
import com.mdd.common.entity.user.UserAuth; import com.mdd.common.entity.user.UserAuth;
import com.mdd.common.enums.ClientEnum; import com.mdd.common.enums.ClientEnum;
import com.mdd.common.enums.NoticeEnum; import com.mdd.common.enums.NoticeEnum;
import com.mdd.common.exception.OperateException; import com.mdd.common.exception.OperateException;
import com.mdd.common.mapper.system.SystemConfigMapper;
import com.mdd.common.mapper.user.UserAuthMapper; import com.mdd.common.mapper.user.UserAuthMapper;
import com.mdd.common.mapper.user.UserMapper; import com.mdd.common.mapper.user.UserMapper;
import com.mdd.common.utils.*; import com.mdd.common.utils.*;
@ -27,7 +24,6 @@ import org.springframework.stereotype.Service;
import org.springframework.util.Assert; import org.springframework.util.Assert;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.util.LinkedHashMap;
import java.util.Map; import java.util.Map;
/** /**