华颐合并至8小时

src/main/java/cn/timer/api/controller/LoginController.java

@@ -222,7 +222,7 @@ public class LoginController {
 
 
 		// 6位随机数验证码
 		// 6位随机数验证码
 		try {
 		try {
-			Integer code = (int) ((Math.random() * 9 + 1) * 100000);
+			//Integer code = (int) ((Math.random() * 9 + 1) * 100000);
 
 
 			if (phone == null || "".equals(phone)) {
 			if (phone == null || "".equals(phone)) {
 				phone = entRegisterDto.getUsername();
 				phone = entRegisterDto.getUsername();

src/main/java/cn/timer/api/controller/qyxx/CmsController.java

@@ -4,9 +4,11 @@ import java.util.*;
 
 
 import cn.timer.api.bean.qyxx.*;
 import cn.timer.api.bean.qyxx.*;
 import cn.timer.api.dto.qyxx.CmsContentReadDto;
 import cn.timer.api.dto.qyxx.CmsContentReadDto;
+import com.alibaba.fastjson.JSONObject;
 import com.github.yulichang.query.MPJQueryWrapper;
 import com.github.yulichang.query.MPJQueryWrapper;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Maps;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
+import net.sf.json.JSONArray;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.annotation.Transactional;
@@ -698,7 +700,7 @@ public class CmsController {
 		QueryWrapper<CmsContent> queryWrapper = new QueryWrapper<>();
 		QueryWrapper<CmsContent> queryWrapper = new QueryWrapper<>();
 		queryWrapper.eq("id", cmsContentId);
 		queryWrapper.eq("id", cmsContentId);
 		CmsContent cmsContent = CmsContent.builder().build().selectOne(queryWrapper);
 		CmsContent cmsContent = CmsContent.builder().build().selectOne(queryWrapper);
-		JSONArray addjsonArray=JSONArray.fromObject(request.getString("filepathcms"));
+		JSONArray addjsonArray= JSONArray.fromObject(request.getString("filepathcms"));
 		JSONArray resjsonArray=JSONArray.fromObject(cmsContent.getFilepath());
 		JSONArray resjsonArray=JSONArray.fromObject(cmsContent.getFilepath());
 		resjsonArray.addAll(addjsonArray);
 		resjsonArray.addAll(addjsonArray);
 		cmsContent.setFilepath(resjsonArray.toString());
 		cmsContent.setFilepath(resjsonArray.toString());