diff --git a/Ylt/ms-task/pom.xml b/Ylt/ms-task/pom.xml index 2d2e6a4..d8e3a48 100644 --- a/Ylt/ms-task/pom.xml +++ b/Ylt/ms-task/pom.xml @@ -84,6 +84,18 @@ org.springframework.boot spring-boot-starter-data-mongodb + + + com.cybermkd + MongodbPlugin + 1.0.8.2 + + + + org.mongodb + mongo-java-driver + 3.12.14 + diff --git a/Ylt/ms-task/src/main/java/com/charge/task/JfinalPlugin.java b/Ylt/ms-task/src/main/java/com/charge/task/JfinalPlugin.java index 51f8ddb..ac77ad2 100644 --- a/Ylt/ms-task/src/main/java/com/charge/task/JfinalPlugin.java +++ b/Ylt/ms-task/src/main/java/com/charge/task/JfinalPlugin.java @@ -1,5 +1,6 @@ package com.charge.task; +import com.cybermkd.mongo.plugin.MongoJFinalPlugin; import com.jfinal.kit.PathKit; import com.jfinal.plugin.activerecord.ActiveRecordPlugin; import com.jfinal.plugin.activerecord.dialect.MysqlDialect; @@ -18,7 +19,7 @@ public class JfinalPlugin { /** * logger */ - private static final Logger LOGGER = LoggerFactory.getLogger(JfinalPlugin.class); + private static final Logger log = LoggerFactory.getLogger(JfinalPlugin.class); @Value("${spring.datasource.driver-class-name}") private String driverClassName; @@ -29,6 +30,17 @@ public class JfinalPlugin { @Value("${spring.datasource.url}") private String url; + @Value("${spring.data.mongodb.host}") + private String mongoHost; + @Value("${spring.data.mongodb.port}") + private int mongoPort; + @Value("${spring.data.mongodb.database}") + private String mongoDatabase; + @Value("${spring.data.mongodb.username}") + private String mongoUsername; + @Value("${spring.data.mongodb.password}") + private String mongoPassword; + @Bean public ActiveRecordPlugin initActiveRecordPlugin() { // 配置druid数据库连接池插件 @@ -51,7 +63,17 @@ public class JfinalPlugin { // 开启插件 druidPlugin.start(); arp.start(); - LOGGER.info("JfinalActiveRecordPlugin Start Successful"); + log.info("JfinalActiveRecordPlugin Start Successful"); + return arp; + } + + @Bean + public MongoJFinalPlugin initMongoJFinalPlugin() { + MongoJFinalPlugin arp = new MongoJFinalPlugin(); + arp.add(mongoHost, mongoPort); + arp.setDatabase(mongoDatabase); + arp.auth(mongoUsername, mongoPassword); + arp.start(); return arp; } } diff --git a/Ylt/ms-task/src/main/java/com/charge/task/controller/YltControllerForWx.java b/Ylt/ms-task/src/main/java/com/charge/task/controller/YltControllerForWx.java index 8583007..440ed6d 100644 --- a/Ylt/ms-task/src/main/java/com/charge/task/controller/YltControllerForWx.java +++ b/Ylt/ms-task/src/main/java/com/charge/task/controller/YltControllerForWx.java @@ -3,31 +3,22 @@ package com.charge.task.controller; import cn.hutool.http.HttpUtil; import com.alibaba.fastjson.JSONObject; import com.charge.task.dao.EquipmentChargeOrderDOMapper; -import com.charge.task.model.EquipmentChargeOrderDO; import com.charge.task.service.AsyncTaskService; -import com.charge.task.service.FinanceServiceApi; +import com.charge.task.service.FeignClient.FinanceServiceApi; import com.charge.task.service.HandleOrderTarckService; import com.charge.util.CommonUtil; import com.charge.util.ResultVO; import com.charge.util.SignUtils; -import com.jfinal.kit.Kv; -import com.jfinal.kit.StrKit; import com.jfinal.plugin.activerecord.Record; import org.apache.commons.lang.StringUtils; -import org.apache.commons.logging.Log; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletRequest; -import javax.xml.soap.MimeHeaders; -import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; import java.util.List; -import java.util.Map; import java.util.UUID; @RestController diff --git a/Ylt/ms-task/src/main/java/com/charge/task/service/FeignClient/FinanceServiceApi.java b/Ylt/ms-task/src/main/java/com/charge/task/service/FeignClient/FinanceServiceApi.java new file mode 100644 index 0000000..d8b6dcd --- /dev/null +++ b/Ylt/ms-task/src/main/java/com/charge/task/service/FeignClient/FinanceServiceApi.java @@ -0,0 +1,27 @@ +package com.charge.task.service.FeignClient; + + +import com.charge.util.ResultVO; +import org.springframework.cloud.netflix.feign.FeignClient; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; + +import java.util.Map; + +/** + * 1、SpringCloud中一个模块调用另一个模块中的接口，需要使用FeignClient注解 + * 2、FeignClient注解中name属性的值，需要指定微服务名称，即在Eureka中注册的名称 + * 3、FeignClient注解中url属性的值，指定微服务地址，即在Eureka中注册的名称 + * 4、用哪些接口需要声明出来，并且，方法的参数和返回值需要和微服务中的接口保持一致 + * 5、需要注意的是Request和Response不用传递，而且还不自动传递过去，需要额外写一个FeignClient的拦截器，自行脑补下Request的对象属性传递 + */ +@FeignClient(name = "financeapi", url = "${financeapi.ribbon.listOfServers}") +public interface FinanceServiceApi { + //需要调用financeapi中的/userRefund/recDataListNew接口,显示用户有哪些可以退款的订单 + @RequestMapping(value = "/userRefund/recDataListNew") + ResultVO recDataListNew(); + + //需要调用financeapi中的/userRefund/apply,用户申请某个订单进行退款 + @RequestMapping(value = "/userRefund/apply") + Map apply(@RequestBody net.sf.json.JSONObject param); +} diff --git a/Ylt/ms-task/src/main/java/com/charge/task/service/FinanceServiceApi.java b/Ylt/ms-task/src/main/java/com/charge/task/service/FinanceServiceApi.java deleted file mode 100644 index 368a336..0000000 --- a/Ylt/ms-task/src/main/java/com/charge/task/service/FinanceServiceApi.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.charge.task.service; - - -import com.charge.util.ResultVO; -import org.springframework.cloud.netflix.feign.FeignClient; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; - -import java.util.Map; - -@FeignClient(name = "financeapi", url = "${financeapi.ribbon.listOfServers}") -public interface FinanceServiceApi { - - @RequestMapping(value = "/userRefund/recDataListNew") - ResultVO recDataListNew(); - - @RequestMapping(value = "/userRefund/apply") - Map apply(@RequestBody net.sf.json.JSONObject param); -}