diff --git a/READ.md b/README.md similarity index 100% rename from READ.md rename to README.md diff --git a/pom.xml b/pom.xml index b3f9d62c1d0de9d0b60ee2376a8ab293343d5a57..d050202362e2fb910083589d8e689a8656907145 100644 --- a/pom.xml +++ b/pom.xml @@ -124,11 +124,6 @@ mybatis-plus-extension 3.5.1 - - io.seata - seata-spring-boot-starter - 1.4.0 - com.baomidou dynamic-datasource-spring-boot-starter diff --git a/src/main/java/com/kwan/springbootkwan/controller/SeataControlller.java b/src/main/java/com/kwan/springbootkwan/controller/SeataControlller.java deleted file mode 100644 index 2c3256e71e3e0b145ab11a1d7e62c9f023f20b2f..0000000000000000000000000000000000000000 --- a/src/main/java/com/kwan/springbootkwan/controller/SeataControlller.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.kwan.springbootkwan.controller; - -import com.kwan.springbootkwan.entity.User; -import com.kwan.springbootkwan.service.IUserService; -import io.swagger.annotations.ApiOperation; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RestController; - -@Slf4j -@RestController -@RequestMapping("/seata") -public class SeataControlller { - - @Autowired - private IUserService userService; - - @ApiOperation(value = "保存用户", notes = "保存用户") - @RequestMapping(value = "/save", method = RequestMethod.GET) - public User save() { - //保存用户 - User user = new User(); - user.setName("秦梓淞"); - user.setSex("男"); - return userService.saveUser(user); - } -} diff --git a/src/main/java/com/kwan/springbootkwan/schedule/CsdnSchedule.java b/src/main/java/com/kwan/springbootkwan/schedule/CsdnSchedule.java index 61d8a43a9014f4dfffcbe28ad17e22c540eb9930..763bf36de2a66bcb38bea6af394b39ccf93362df 100644 --- a/src/main/java/com/kwan/springbootkwan/schedule/CsdnSchedule.java +++ b/src/main/java/com/kwan/springbootkwan/schedule/CsdnSchedule.java @@ -5,6 +5,7 @@ import cn.hutool.core.collection.CollectionUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.kwan.springbootkwan.entity.CsdnUserInfo; import com.kwan.springbootkwan.enums.CollectStatus; +import com.kwan.springbootkwan.enums.CommentStatus; import com.kwan.springbootkwan.enums.LikeStatus; import com.kwan.springbootkwan.service.CsdnService; import com.kwan.springbootkwan.service.CsdnUserInfoService; @@ -43,7 +44,7 @@ public class CsdnSchedule { for (CsdnUserInfo csdnUserInfo : list) { csdnUserInfo.setLikeStatus(LikeStatus.UN_PROCESSED.getCode()); csdnUserInfo.setCollectStatus(CollectStatus.UN_PROCESSED.getCode()); -// csdnUserInfo.setCommentStatus(CommentStatus.UN_PROCESSED.getCode()); + csdnUserInfo.setCommentStatus(CommentStatus.RESTRICTED_COMMENTS.getCode()); csdnUserInfoService.updateById(csdnUserInfo); } } diff --git a/src/main/resources/application-local.yml b/src/main/resources/application-local.yml index aa5292acc6390ccc9fc3434148077f372656f4bc..c7b4d87a6e82bb46f54e89b72d665dd295369477 100644 --- a/src/main/resources/application-local.yml +++ b/src/main/resources/application-local.yml @@ -27,7 +27,6 @@ spring: # mysql datasource: dynamic: - seata: true primary: kwan-ds datasource: kwan-ds: diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml index 4426832ed909a5be2a6ccef4e4b32644e042c1e0..43aed692d1933bfaebb8c1045071a43a491f9f0b 100644 --- a/src/main/resources/application.yaml +++ b/src/main/resources/application.yaml @@ -23,20 +23,6 @@ spring: mvc: pathmatch: matching-strategy: ant_path_matcher -#seata: -# tx-service-group: default_tx_group - -#seata: -# application-id: spring-boot-name -# tx-service-group: my-tx-group -# service: -# vgroup-mapping: -# my-tx-group: seata-server -# grouplist: -# seata-server: 127.0.0.1:8091 -# enabled: true - - #mybatis-plus配置 mybatis-plus: diff --git a/src/main/resources/file1111.conf b/src/main/resources/file1111.conf deleted file mode 100644 index c6778f29b5f22c0df4f02c6b7a918f1b14823315..0000000000000000000000000000000000000000 --- a/src/main/resources/file1111.conf +++ /dev/null @@ -1,5 +0,0 @@ -service { -#事务组名称 - vgroup_mapping.my-tx-group ="seata-server" - default.grouplist ="127.0.0.1:8091' -} \ No newline at end of file