CC/Jarvis_java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: CC:888702297f6ecd45e18e055551c7cbc84e437c16
Branches Tags
CC:master
...
compare: CC:d058b58cd01dfeb65458a8d4ab7ae02a0a93871f
Branches Tags
CC:master

2 Commits
888702297f ... d058b58cd0

Author SHA1 Message Date
Leo
d058b58cd0 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	src/main/java/cn/van/business/mq/MessageConsumerService.java
 2025-01-24 13:03:43 +08:00
Leo
8df1fa9fc8 1 2025-01-24 13:00:57 +08:00
2 changed files with 1 additions and 2 deletions
Expand all files Collapse all files

2
src/main/java/cn/van/business/controller/jd/OrderController.java
View File

@@ -16,7 +16,7 @@ import javax.annotation.Resource;
* @description： * @description：
*/ */
@RestController @RestController
@RequestMapping("order") @RequestMapping("/order")
public class OrderController { public class OrderController {
public static String TOKEN = "cc0313"; public static String TOKEN = "cc0313";

1
src/main/java/cn/van/business/mq/MessageProducerService.java
View File

@@ -6,7 +6,6 @@ import org.apache.rocketmq.common.message.Message;
import org.apache.rocketmq.spring.core.RocketMQTemplate; import org.apache.rocketmq.spring.core.RocketMQTemplate;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
/** /**