1、修改了TiangXingConsts常量名为CopyWritingConsts
2、实现Uomg平台土味情话api(远程调用有问题,暂时弃用)
This commit is contained in:
parent
e4836b53e8
commit
8f08381625
|
|
@ -74,6 +74,8 @@ public class ApiConst {
|
|||
|
||||
public static final String LQ_A_WORD = "零七-一言";
|
||||
|
||||
public static final String UOMG_EARTH_LOVE = "Uomg-土味情话";
|
||||
|
||||
|
||||
//-------------------url------------------------------
|
||||
|
||||
|
|
@ -178,6 +180,11 @@ public class ApiConst {
|
|||
*/
|
||||
public static final String LQ_A_WORD_URL = "https://api.oick.cn/yiyan/api.php";
|
||||
|
||||
/**
|
||||
* 接口文档:https://api.uomg.com/doc-rand.qinghua.html
|
||||
*/
|
||||
public static final String UOMG_EARTH_LOVE_URL = "https://api.uomg.com/api/rand.qinghua";
|
||||
|
||||
|
||||
//-----------------------api请求参数常量-----------------------------
|
||||
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ package com.xjs.consts;
|
|||
* @desc 各个数据平台常量类
|
||||
* @create 2021-12-28
|
||||
*/
|
||||
public class TianXingConst {
|
||||
public class CopyWritingConst {
|
||||
|
||||
//---------------天行平台参数---------------------------
|
||||
|
||||
|
|
@ -25,7 +25,7 @@ public class TianXingConst {
|
|||
public static final Integer MRYJ= 5;
|
||||
|
||||
|
||||
//--------------------零七平台-----------------------
|
||||
//--------------------零七平台参数-----------------------
|
||||
|
||||
//舔狗日记
|
||||
public static final Integer TGRJ= 6;
|
||||
|
|
@ -33,4 +33,9 @@ public class TianXingConst {
|
|||
public static final Integer DJT= 7;
|
||||
//一言
|
||||
public static final Integer YY= 8;
|
||||
|
||||
//-------------------Uomg平台参数------------------------
|
||||
|
||||
//土味情话
|
||||
public static final Integer TWQH= 9;
|
||||
}
|
||||
|
|
@ -7,9 +7,9 @@ import com.ruoyi.common.core.web.page.PageDomain;
|
|||
import com.ruoyi.common.core.web.page.TableSupport;
|
||||
|
||||
/**
|
||||
* 自定义通用controller
|
||||
* @author xiejs
|
||||
* @desc 自定义通用controller
|
||||
* @create 2021-12-31
|
||||
* @since 2021-12-31
|
||||
*/
|
||||
public class MyBaseController extends BaseController {
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,29 @@
|
|||
package com.xjs.common.client.api.uomg;
|
||||
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.xjs.annotation.ApiLog;
|
||||
import com.xjs.common.client.factory.UomgEarthLoveFeignFactory;
|
||||
import com.xjs.copywriting.domain.RequestBody;
|
||||
import org.springframework.cloud.openfeign.FeignClient;
|
||||
import org.springframework.cloud.openfeign.SpringQueryMap;
|
||||
import org.springframework.web.bind.annotation.PostMapping;
|
||||
|
||||
import static com.xjs.consts.ApiConst.UOMG_EARTH_LOVE;
|
||||
import static com.xjs.consts.ApiConst.UOMG_EARTH_LOVE_URL;
|
||||
|
||||
/**
|
||||
* Uomg平台 土味情话 feign
|
||||
*
|
||||
* @author xiejs
|
||||
* @since 2022-02-14
|
||||
*/
|
||||
@FeignClient(name = "uomgEarthLove", url = UOMG_EARTH_LOVE_URL, fallbackFactory = UomgEarthLoveFeignFactory.class)
|
||||
@Deprecated
|
||||
public interface UomgEarthLoveFeignClient {
|
||||
@PostMapping(headers = {"Content-Type=text/html;charset=UTF-8"})
|
||||
@ApiLog(name = UOMG_EARTH_LOVE,
|
||||
url = UOMG_EARTH_LOVE_URL,
|
||||
method = "Get")
|
||||
@Deprecated
|
||||
JSONObject earthLoveApi(@SpringQueryMap RequestBody requestBody);
|
||||
}
|
||||
|
|
@ -0,0 +1,28 @@
|
|||
package com.xjs.common.client.factory;
|
||||
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.ruoyi.common.core.domain.R;
|
||||
import com.xjs.common.client.api.uomg.UomgEarthLoveFeignClient;
|
||||
import lombok.extern.log4j.Log4j2;
|
||||
import org.springframework.cloud.openfeign.FallbackFactory;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
import static com.xjs.consts.ApiConst.DEMOTE_ERROR;
|
||||
|
||||
/**
|
||||
* @author xiejs
|
||||
* @since 2022-02-14
|
||||
*/
|
||||
@Component
|
||||
@Log4j2
|
||||
public class UomgEarthLoveFeignFactory implements FallbackFactory<UomgEarthLoveFeignClient> {
|
||||
@Override
|
||||
public UomgEarthLoveFeignClient create(Throwable cause) {
|
||||
log.error("api模块Uomg-土味情话服务调用失败:{},执行降级处理", cause.getMessage());
|
||||
return (req) -> {
|
||||
JSONObject jsonObject = new JSONObject();
|
||||
jsonObject.put(DEMOTE_ERROR, R.FAIL);
|
||||
return jsonObject;
|
||||
};
|
||||
}
|
||||
}
|
||||
|
|
@ -55,6 +55,8 @@ public class CopyWritingController extends BaseController {
|
|||
private CopyWritingFactory lqPoisonChickenWritingFactory;
|
||||
@Autowired
|
||||
private CopyWritingFactory lqAWordCopyWritingFactory;
|
||||
@Autowired
|
||||
private CopyWritingFactory uomgEarthLoveCopyWritingFactory;
|
||||
|
||||
|
||||
@GetMapping
|
||||
|
|
@ -108,6 +110,7 @@ public class CopyWritingController extends BaseController {
|
|||
factories.add(lqDogDiaryCopyWritingFactory);
|
||||
factories.add(lqPoisonChickenWritingFactory);
|
||||
factories.add(lqAWordCopyWritingFactory);
|
||||
//factories.add(uomgEarthLoveCopyWritingFactory);
|
||||
//--------add----------------------------;-
|
||||
//随机调用集合中的接口
|
||||
return RandomUtil.randomEle(factories);
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
package com.xjs.copywriting.factory.impl;
|
||||
|
||||
import com.xjs.common.client.api.lq.LqAWordFeignClient;
|
||||
import com.xjs.consts.TianXingConst;
|
||||
import com.xjs.consts.CopyWritingConst;
|
||||
import com.xjs.copywriting.domain.CopyWriting;
|
||||
import com.xjs.copywriting.domain.RequestBody;
|
||||
import com.xjs.copywriting.factory.CopyWritingFactory;
|
||||
|
|
@ -13,6 +13,7 @@ import org.springframework.beans.factory.annotation.Autowired;
|
|||
import org.springframework.stereotype.Component;
|
||||
|
||||
/**
|
||||
* 零七平台 一言api工厂实现
|
||||
* @author xiejs
|
||||
* @since 2022-02-14
|
||||
*/
|
||||
|
|
@ -33,7 +34,7 @@ public class LqAWordCopyWritingFactory implements CopyWritingFactory {
|
|||
CopyWriting copyWriting = new CopyWriting();
|
||||
copyWriting.setContent(data);
|
||||
copyWriting.setSource("一言");
|
||||
copyWriting.setType(TianXingConst.YY);
|
||||
copyWriting.setType(CopyWritingConst.YY);
|
||||
copyWritingService.save(copyWriting);
|
||||
return copyWriting;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
package com.xjs.copywriting.factory.impl;
|
||||
|
||||
import com.xjs.common.client.api.lq.LqDogDiaryFeignClient;
|
||||
import com.xjs.consts.TianXingConst;
|
||||
import com.xjs.consts.CopyWritingConst;
|
||||
import com.xjs.copywriting.domain.CopyWriting;
|
||||
import com.xjs.copywriting.domain.RequestBody;
|
||||
import com.xjs.copywriting.factory.CopyWritingFactory;
|
||||
|
|
@ -35,7 +35,7 @@ public class LqDogDiaryCopyWritingFactory implements CopyWritingFactory {
|
|||
CopyWriting copyWriting = new CopyWriting();
|
||||
copyWriting.setContent(data);
|
||||
copyWriting.setSource("舔狗日记");
|
||||
copyWriting.setType(TianXingConst.TGRJ);
|
||||
copyWriting.setType(CopyWritingConst.TGRJ);
|
||||
|
||||
copyWritingService.save(copyWriting);
|
||||
return copyWriting;
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
package com.xjs.copywriting.factory.impl;
|
||||
|
||||
import com.xjs.common.client.api.lq.LqPoisonChickenFeignClient;
|
||||
import com.xjs.consts.TianXingConst;
|
||||
import com.xjs.consts.CopyWritingConst;
|
||||
import com.xjs.copywriting.domain.CopyWriting;
|
||||
import com.xjs.copywriting.domain.RequestBody;
|
||||
import com.xjs.copywriting.factory.CopyWritingFactory;
|
||||
|
|
@ -35,7 +35,7 @@ public class LqPoisonChickenWritingFactory implements CopyWritingFactory {
|
|||
CopyWriting copyWriting = new CopyWriting();
|
||||
copyWriting.setContent(data);
|
||||
copyWriting.setSource("毒鸡汤");
|
||||
copyWriting.setType(TianXingConst.DJT);
|
||||
copyWriting.setType(CopyWritingConst.DJT);
|
||||
copyWritingService.save(copyWriting);
|
||||
return copyWriting;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ import com.alibaba.fastjson.JSONArray;
|
|||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.xjs.common.client.api.roll.RollMMYJFeignClient;
|
||||
import com.xjs.properties.RollProperties;
|
||||
import com.xjs.consts.TianXingConst;
|
||||
import com.xjs.consts.CopyWritingConst;
|
||||
import com.xjs.copywriting.domain.CopyWriting;
|
||||
import com.xjs.copywriting.domain.RequestBody;
|
||||
import com.xjs.copywriting.factory.CopyWritingFactory;
|
||||
|
|
@ -52,7 +52,7 @@ public class RollMMYJCopyWritingFactory implements CopyWritingFactory {
|
|||
JSONObject toJSON = (JSONObject) JSONObject.toJSON(json);
|
||||
copyWriting.setContent(toJSON.getString("content"));
|
||||
copyWriting.setSource(toJSON.getString("author"));
|
||||
copyWriting.setType(TianXingConst.MRYJ);
|
||||
copyWriting.setType(CopyWritingConst.MRYJ);
|
||||
if (StringUtils.isBlank(copyWriting.getSource())) {
|
||||
copyWriting.setSource("匿名");
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@ import cn.hutool.http.HttpStatus;
|
|||
import com.alibaba.fastjson.JSONArray;
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.xjs.common.client.api.tianxing.TianXingJDTCFeignClient;
|
||||
import com.xjs.consts.CopyWritingConst;
|
||||
import com.xjs.properties.TianXingProperties;
|
||||
import com.xjs.consts.TianXingConst;
|
||||
import com.xjs.exception.ApiException;
|
||||
import com.xjs.copywriting.domain.CopyWriting;
|
||||
import com.xjs.copywriting.domain.RequestBody;
|
||||
|
|
@ -48,7 +48,7 @@ public class TianXingJDTCCopyWritingFactory implements CopyWritingFactory {
|
|||
CopyWriting copyWriting = new CopyWriting();
|
||||
copyWriting.setContent(dialogue);
|
||||
copyWriting.setSource(source);
|
||||
copyWriting.setType(TianXingConst.JDTC);
|
||||
copyWriting.setType(CopyWritingConst.JDTC);
|
||||
copyWritingMapper.insert(copyWriting);
|
||||
return copyWriting;
|
||||
}else {
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ import com.alibaba.fastjson.JSONArray;
|
|||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.xjs.common.client.api.tianxing.TianXingMMMYFeignClient;
|
||||
import com.xjs.properties.TianXingProperties;
|
||||
import com.xjs.consts.TianXingConst;
|
||||
import com.xjs.consts.CopyWritingConst;
|
||||
import com.xjs.exception.ApiException;
|
||||
import com.xjs.copywriting.domain.CopyWriting;
|
||||
import com.xjs.copywriting.domain.RequestBody;
|
||||
|
|
@ -48,7 +48,7 @@ public class TianXingMMMYCopyWritingFactory implements CopyWritingFactory {
|
|||
CopyWriting copyWriting = new CopyWriting();
|
||||
copyWriting.setContent(content);
|
||||
copyWriting.setSource(author);
|
||||
copyWriting.setType(TianXingConst.MMMY);
|
||||
copyWriting.setType(CopyWritingConst.MMMY);
|
||||
copyWritingMapper.insert(copyWriting);
|
||||
return copyWriting;
|
||||
}else {
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@ import cn.hutool.http.HttpStatus;
|
|||
import com.alibaba.fastjson.JSONArray;
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.xjs.common.client.api.tianxing.TianXingPYQFeignClient;
|
||||
import com.xjs.consts.CopyWritingConst;
|
||||
import com.xjs.properties.TianXingProperties;
|
||||
import com.xjs.consts.TianXingConst;
|
||||
import com.xjs.exception.ApiException;
|
||||
import com.xjs.copywriting.domain.CopyWriting;
|
||||
import com.xjs.copywriting.domain.RequestBody;
|
||||
|
|
@ -50,7 +50,7 @@ public class TianXingPYQCopyWritingFactory implements CopyWritingFactory {
|
|||
CopyWriting copyWriting = new CopyWriting();
|
||||
copyWriting.setContent(content);
|
||||
copyWriting.setSource(source);
|
||||
copyWriting.setType(TianXingConst.PYQ);
|
||||
copyWriting.setType(CopyWritingConst.PYQ);
|
||||
copyWritingMapper.insert(copyWriting);
|
||||
return copyWriting;
|
||||
}else {
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ import com.alibaba.fastjson.JSONArray;
|
|||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.xjs.common.client.api.tianxing.TianXingWYYFeignClient;
|
||||
import com.xjs.properties.TianXingProperties;
|
||||
import com.xjs.consts.TianXingConst;
|
||||
import com.xjs.consts.CopyWritingConst;
|
||||
import com.xjs.exception.ApiException;
|
||||
import com.xjs.copywriting.domain.CopyWriting;
|
||||
import com.xjs.copywriting.domain.RequestBody;
|
||||
|
|
@ -50,7 +50,7 @@ public class TianXingWYYCopyWritingFactory implements CopyWritingFactory {
|
|||
CopyWriting copyWriting = new CopyWriting();
|
||||
copyWriting.setContent(content);
|
||||
copyWriting.setSource(source);
|
||||
copyWriting.setType(TianXingConst.WYY);
|
||||
copyWriting.setType(CopyWritingConst.WYY);
|
||||
copyWritingMapper.insert(copyWriting);
|
||||
return copyWriting;
|
||||
}else {
|
||||
|
|
|
|||
|
|
@ -0,0 +1,46 @@
|
|||
package com.xjs.copywriting.factory.impl;
|
||||
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.xjs.common.client.api.uomg.UomgEarthLoveFeignClient;
|
||||
import com.xjs.consts.CopyWritingConst;
|
||||
import com.xjs.copywriting.domain.CopyWriting;
|
||||
import com.xjs.copywriting.domain.RequestBody;
|
||||
import com.xjs.copywriting.factory.CopyWritingFactory;
|
||||
import com.xjs.copywriting.service.CopyWritingService;
|
||||
import com.xjs.exception.ApiException;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import static com.xjs.consts.ApiConst.DEMOTE_ERROR;
|
||||
|
||||
/**
|
||||
* Uomg平台 土味情话 api工厂实现
|
||||
* @author xiejs
|
||||
* @since 2022-02-14
|
||||
*/
|
||||
@Service
|
||||
@Deprecated
|
||||
public class UomgEarthLoveCopyWritingFactory implements CopyWritingFactory {
|
||||
@Autowired
|
||||
private CopyWritingService copyWritingService;
|
||||
@Autowired
|
||||
private UomgEarthLoveFeignClient uomgEarthLoveFeignClient;
|
||||
|
||||
|
||||
@Override
|
||||
@Deprecated
|
||||
public CopyWriting productCopyWriting(RequestBody requestBody) {
|
||||
requestBody.setFormat("json");
|
||||
JSONObject jsonObject = uomgEarthLoveFeignClient.earthLoveApi(requestBody);
|
||||
if (jsonObject.containsKey(DEMOTE_ERROR)) {
|
||||
throw new ApiException("Uomg平台 土味情话接口调用异常");
|
||||
}
|
||||
String content = jsonObject.getString("content");
|
||||
CopyWriting copyWriting = new CopyWriting();
|
||||
copyWriting.setContent(content);
|
||||
copyWriting.setSource("土味情话");
|
||||
copyWriting.setType(CopyWritingConst.TWQH);
|
||||
copyWritingService.save(copyWriting);
|
||||
return copyWriting;
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue