--no commit message

com.zrqx.member/src/main/java/com/zrqx/member/commons/redis/Redis.java

@@ -44,7 +44,9 @@ public class Redis {
         jedisConnectionFactory.setDatabase(num);
         stringRedisTemplate.setConnectionFactory(jedisConnectionFactory);
 	}
-	
+	public void add(String token, Object obj, long timeout, TimeUnit unit) throws IOException {
+		stringRedisTemplate.opsForValue().set(token, JsonUtil.bean2Json(obj),timeout,unit);
+	}
 	/**
 	 * 获取后台登录用户信息
 	 * 

com.zrqx.member/src/main/java/com/zrqx/member/fg/member/service/FgMemberService.java

@@ -57,4 +57,11 @@ public interface FgMemberService  extends BaseService<Member, Integer> {
 	 */
 	boolean isExistByPhone(Integer id, String phone);
 	
+	/**
+	 * 创建会员用户
+	 * @param member
+	 * @return
+	 */
+	boolean saveMember(Member member);
+
 }

com.zrqx.member/src/main/java/com/zrqx/member/fg/member/service/FgMemberServiceImpl.java

 package com.zrqx.member.fg.member.service;
 
+import java.util.Date;
+
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -127,4 +129,10 @@ public class FgMemberServiceImpl extends BaseServiceImpl<Member, Integer> implem
 		}
 		return info;
 	}
+
+	@Override
+	public boolean saveMember(Member member) {
+		member.setCreateTime(new Date());
+		return mapper.insertSelective(member) > 0;
+	}
 }

com.zrqx.member/src/main/java/com/zrqx/member/fg/permissions/FgPermissionsController.java

@@ -218,26 +218,51 @@ public class FgPermissionsController {
 	
 	@ApiOperation(value = "微信用户登录", notes = "0：登录成功；5：该账户已禁用；6：第三方登录错误；7：未绑定平台账号")
 	@GetMapping(value =MemberRequestPath.WECHAT + MemberRequestPath.LOGIN)
-	public CallBack<Member> wechartLogin(@RequestParam("code")String code) throws BaseException, Exception {
-		CallBack<WeChartThirdReturn> cb = weChatLogin.query(code);
-	
-		Member m = mService.loginWechat(cb.getData().getOpenid());
-		if(m == null){
-			m = new Member();
-			//还未与平台用户绑定的微信用户
-			m.setWechatKey(cb.getData().getOpenid());
-			m.setOpenid(cb.getData().getOpenid());
-			throw new BaseException(7,cb.getMsg(),m);
-		}else if (m.getStatus() == 0) {
-			throw new BaseException(5,"该账户已禁用");
-		}
-		LoginMemberInfo	info = new LoginMemberInfo();
-		BeanUtils.copyProperties(m, info);
-		String token = MD5Util.getEncoderByMd5(m.getAccount());
-		info.setToken(token);
-		m.setToken(token);
-		redis.set(token,  JsonUtil.bean2Json(info),60*60*24*7,TimeUnit.SECONDS);
-		return CallBack.success(m);
+	public CallBack<String> wechartLogin(@RequestBody WeChartThirdReturn cb) throws BaseException, Exception {
+		Member member = mService.loginWechat(cb.getOpenid());
+		if(member == null){
+			member = new Member();
+			member.setWechatKey(cb.getOpenid());
+			member.setAccount(filterEmoji(cb.getNickname()));
+			member.setNickName(filterEmoji(cb.getNickname()));
+			member.setStatus(1);
+			member.setLevel(0);
+			mService.saveMember(member);
+		}
+		logger.info(member.toString());
+		member.setImg(cb.getHeadImgUrl());
+		if (member.getStatus() == 0) {
+			throw new BaseException("该账户已禁用");
+		}
+		member.setPassword(null);	
+		String token = cb.getOpenid();
+		try {
+			redis.add(token, member,60*60*24,TimeUnit.SECONDS);
+		} catch (IOException e) {
+			logger.info("redis 缓存用户异常");
+			e.printStackTrace();
+		}
+		logger.info("打印微信key"+token);
+		return CallBack.success(token);
+		/*
+		 * CallBack<WeChartThirdReturn> cb = weChatLogin.query(code); try {
+		 * logger.info(JsonUtil.bean2Json(cb)); } catch (IOException e) {
+		 * e.printStackTrace(); } logger.info(cb.getData().getNickname());
+		 * if(!cb.isStatus()){
+		 * 
+		 * throw new BaseException(cb.getMsg()); } Member member =
+		 * mService.loginWechat(cb.getData().getOpenid()); if(member == null){ member =
+		 * new Member(); member.setWechatKey(cb.getData().getOpenid());
+		 * member.setAccount(filterEmoji(cb.getData().getNickname()));
+		 * member.setNickName(filterEmoji(cb.getData().getNickname()));
+		 * member.setStatus(1); mService.saveMember(member); }
+		 * logger.info(member.toString()); member.setImg(cb.getData().getHeadImgUrl());
+		 * if (member.getStatus() == 0) { throw new BaseException("该账户已禁用"); }
+		 * member.setPassword(null); String token = cb.getData().getOpenid(); try {
+		 * redis.add(token, member,60*60*24,TimeUnit.SECONDS); } catch (IOException e) {
+		 * logger.info("redis 缓存用户异常"); e.printStackTrace(); }
+		 * logger.info("打印微信key"+token); return CallBack.success(token);
+		 */
 	}
 	@ApiOperation(value = "QQ用户登录", notes = "0：登录成功；5：该账户已禁用；6：第三方登录错误；7：未绑定平台账号；")
 	@GetMapping(value =MemberRequestPath.QQ + MemberRequestPath.LOGIN)

com.zrqx.resource/src/main/java/com/zrqx/resource/fg/controller/workmanagement/FgWorkmanagementController.java

@@ -50,6 +50,7 @@ import com.zrqx.resource.bg.service.workmanagement.WorkManagementService;
 import com.zrqx.resource.bg.service.workmanagement.WorkManagementWorkService;
 import com.zrqx.resource.commons.Redis;
 import com.zrqx.resource.fg.mapper.workmanagement.FgWorkManagementAgreeMapper;
+import com.zrqx.resource.fg.mapper.workmanagement.FgWorkManagementDiyTypeMapper;
 import com.zrqx.resource.fg.service.workmanagement.FgWorkManagementDiyTypeService;
 import com.zrqx.resource.fg.service.workmanagement.FgWorkManagementImgService;
 import com.zrqx.resource.fg.service.workmanagement.FgWorkManagementService;
@@ -78,7 +79,8 @@ public class FgWorkmanagementController {
 	// 作品图片
 	@Autowired
 	private FgWorkManagementImgService workManagementImgService;
-
+	@Autowired
+	private FgWorkManagementDiyTypeMapper fgWorkManagementDiyTypeMapper;
 	@Autowired
 	private FgWorkManagementAgreeMapper fgWorkManagementAgreeMappere;
 	@Autowired
@@ -155,6 +157,9 @@ public class FgWorkmanagementController {
 		} else {
 			vo.setWorkAbbImageList(workListvo);
 		}
+		//拼装分类，只拼一级
+		fgWorkManagementDiyTypeMapper.getdiytype(oid);
+		
 		// 组装自定义分类
 		example = workManagementDiyTypeService.createExample();
 		example.createCriteria().andEqualTo("workId", oid);

com.zrqx.resource/src/main/java/com/zrqx/resource/fg/mapper/workmanagement/FgWorkManagementDiyTypeMapper.java

 package com.zrqx.resource.fg.mapper.workmanagement;
 
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import com.zrqx.core.form.resource.fg.workmanagement.FgWorkmanagementForm;
 import com.zrqx.core.mapper.BaseMapper;
 import com.zrqx.core.model.resource.workmanagement.WorkManagementDiyType;
+import com.zrqx.core.vo.member.fg.workmanagement.FgWorkmanagementListVo;
 
 /**
  * 作品分类关系-mapper
  */
 public interface FgWorkManagementDiyTypeMapper extends BaseMapper<WorkManagementDiyType> {
 	
-	
+	/**
+	 * 查询分类
+	 * @Title page
+	 * @param form
+	 * @return List<BookVo>
+	 * @author Conan
+	 * @date 2020年7月15日 下午2:33:32
+	 */
+	@Select("<script>"
+		    + " select GROUP_CONCAT(typename) from res_diy_type a where a.code in (select db.code from  res_work_management_diy_type db where be.id = db.workId)) diyType"
+			+ "</script>")
+	String getdiytype(@Param("oid")String oid);
 }