Merge remote-tracking branch 'origin/qiandao_v1.0' into qiandao_v1.0

ch-dao/pom.xml

@@ -273,7 +273,12 @@
         <dependency>
             <groupId>org.apache.curator</groupId>
             <artifactId>curator-recipes</artifactId>
-            <version>2.13.0</version>
+            <version>2.12.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.curator</groupId>
+            <artifactId>curator-framework</artifactId>
+            <version>2.12.0</version>
         </dependency>
     </dependencies>
 

ch-dao/src/main/java/com/wwdz/ch/db/dao/qiandao/SignInTaskDao.java

 package com.wwdz.ch.db.dao.qiandao;
 
+import com.wwdz.ch.db.dto.request.qiandao.SignInTaskRequestDto;
+
 public interface SignInTaskDao {
+
+    int insert(SignInTaskRequestDto signInTaskRequestDto);
+
+    int delete(SignInTaskRequestDto signInTaskRequestDto);
+
+
+
+
+
+
+
 }

ch-dao/src/main/java/com/wwdz/ch/db/impl/qiandao/SignInTaskDaoImpl.java

 package com.wwdz.ch.db.impl.qiandao;
 
 import com.wwdz.ch.db.dao.qiandao.SignInTaskDao;
+import com.wwdz.ch.db.dto.request.qiandao.SignInTaskRequestDto;
+import com.wwdz.ch.db.mapper.qiandao.SignInTaskMapper;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Repository;
 
 @Repository
 public class SignInTaskDaoImpl implements SignInTaskDao {
 
+    @Autowired
+    SignInTaskMapper signInTaskMapper;
+    @Override
+    public int insert(SignInTaskRequestDto signInTaskRequestDto) {
 
+        return signInTaskMapper.insert(signInTaskRequestDto) ;
+    }
 }

ch-dao/src/main/java/com/wwdz/ch/db/mapper/qiandao/SignInTaskMapper.java

@@ -4,6 +4,7 @@ import com.wwdz.ch.db.domain.qiandao.SignInTask;
 import com.wwdz.ch.db.domain.qiandao.SignInTaskExample;
 import java.util.List;
 
+import com.wwdz.ch.db.dto.request.qiandao.SignInTaskRequestDto;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -15,7 +16,7 @@ public interface SignInTaskMapper {
 
     int deleteByPrimaryKey(Long id);
 
-    int insert(SignInTask record);
+    int insert(SignInTaskRequestDto record);
 
     int insertSelective(SignInTask record);
 

ch-wx-api/pom.xml

@@ -13,6 +13,16 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
     <dependencies>
+        <dependency>
+        <groupId>org.apache.curator</groupId>
+        <artifactId>curator-recipes</artifactId>
+        <version>2.12.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.curator</groupId>
+            <artifactId>curator-framework</artifactId>
+            <version>2.12.0</version>
+        </dependency>
 
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -35,6 +45,12 @@
             <groupId>com.wwdz</groupId>
             <artifactId>ch-dao</artifactId>
             <version>${project.version}</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>curator-framework</artifactId>
+                    <groupId>org.apache.curator</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>

ch-wx-api/src/main/java/com/wwdz/ch/wx/config/WebMvcConfiguration.java

@@ -56,7 +56,7 @@ public class WebMvcConfiguration implements WebMvcConfigurer {
 						"/wx/appletPageConfig/**", "/wx/blindBox/**","/wx/sellActivity/**","/wx/itemTagQrCode/createQrCode",
 						"/wx/userSignIn/**",
 
-						"/wx/userSignIn/testSignIn","/wx/userSignIn/deleteTodayRecord"
+						"/wx/userSignIn/testSignIn","/wx/userSignIn/deleteTodayRecord","/wx/signInTask/**"
 						//下列路径上线注释
 						//"/wx/itemTagQrCode/**"
 						//		,"/wx/itemTagOperate/**", "/wx/openShop/**", "/wx/earnestRecord/**", "/wx/auctionEarnest/**", "/wx/userAccount/**"

ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/qiandao/SignInTaskServiceImpl.java

 package com.wwdz.ch.wx.impl.qiandao;
 
+import com.wwdz.ch.core.type.Result;
+import com.wwdz.ch.db.dao.qiandao.SignInTaskDao;
+import com.wwdz.ch.db.domain.qiandao.SignInTask;
+import com.wwdz.ch.db.dto.request.qiandao.SignInTaskRequestDto;
+import com.wwdz.ch.db.mapper.qiandao.SignInTaskMapper;
 import com.wwdz.ch.wx.service.qiandao.SignInTaskService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Date;
+import java.util.HashMap;
+
 @Service
 public class SignInTaskServiceImpl implements SignInTaskService {
 
+    @Autowired
+    SignInTaskDao signInTaskDao;
+
     private static final Logger logger = LoggerFactory.getLogger(SignInTaskServiceImpl.class);
+
+
+    @Override
+    public Result addSign(SignInTaskRequestDto dto) {
+
+        dto.setCreateTime(new Date());
+        dto.setUpdateTime(new Date());
+        signInTaskDao.insert(dto);
+        return Result.success();
+    }
+
+    @Override
+    public void findlist(int pageNum, int pageSize) throws Exception {
+
+
+
+    }
+
 }

ch-wx-api/src/main/java/com/wwdz/ch/wx/job/AutoCreateAuctionOrderJob.java

@@ -33,7 +33,7 @@ import java.util.List;
 /**
  * 拍卖结束自动创建订单
  */
-@Component
+//@Component
 public class AutoCreateAuctionOrderJob {
 
     private static final Logger logger = LoggerFactory.getLogger(AutoCreateAuctionOrderJob.class);
@@ -61,7 +61,7 @@ public class AutoCreateAuctionOrderJob {
     /**
      * 隔2分钟运行一次
      */
-    @Scheduled(fixedDelay = 1000 * 60 * 2)
+ //   @Scheduled(fixedDelay = 1000 * 60 * 2)
     public void execute() {
         RLock lock = redissonClient.getLock(AUTO_CREATE_AUCTION_ORDER_KEY);
         if (!lock.tryLock()) {

ch-wx-api/src/main/java/com/wwdz/ch/wx/service/qiandao/SignInTaskService.java

 package com.wwdz.ch.wx.service.qiandao;
 
+import com.wwdz.ch.core.type.Result;
+import com.wwdz.ch.db.dto.request.qiandao.SignInTaskRequestDto;
+
 public interface SignInTaskService {
+
+    Result addSign(SignInTaskRequestDto dto);
+
+    void findlist(int pageNum ,int pageSize) throws Exception;
+
+
+
+
 }

ch-wx-api/src/main/java/com/wwdz/ch/wx/web/AiAssistantController.java

@@ -36,8 +36,6 @@ public class AiAssistantController {
         return aiAssistantService.findList(dto);
     }
 
-
-
     @ApiOperation(value = "查询ai默认问题")
     @PostMapping("/findDefaultQuestions")
     public Result findDefaultQuestions(@RequestBody AiDefaultQuestionRequestDto dto) {

ch-wx-api/src/main/java/com/wwdz/ch/wx/web/WxStorageController.java

@@ -89,9 +89,7 @@ public class WxStorageController {
 	@ApiOperation("上传文件")
 	public Object upload(@RequestParam("file") MultipartFile file) throws IOException {
 		logger.info("【请求开始】上传文件,请求参数,file:{}", file.getOriginalFilename());
-
 		String originalFilename = file.getOriginalFilename();
-
 		InputStream targetInput = null;
 		try (InputStream inputStream = file.getInputStream()) {
 			BufferedImage image = ImageIO.read(inputStream);

ch-wx-api/src/main/java/com/wwdz/ch/wx/web/qiandao/SignInTaskServiceController.java

+package com.wwdz.ch.wx.web.qiandao;
+import com.alibaba.fastjson.JSON;
+import com.wwdz.ch.core.consts.CommConsts;
+import com.wwdz.ch.core.type.Result;
+import com.wwdz.ch.core.util.ResponseUtil;
+import com.wwdz.ch.db.dto.request.qiandao.SignInTaskRequestDto;
+import com.wwdz.ch.wx.service.qiandao.SignInTaskService;
+import com.wwdz.ch.wx.web.distribution.SupplierItemController;
+import com.xxdxxs.utils.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@RequestMapping("/wx/signInTask")
+public class SignInTaskServiceController {
+
+    private static final Logger logger = LoggerFactory.getLogger(SignInTaskServiceController.class);
+
+    @Autowired
+    SignInTaskService signInTaskService;
+    @PostMapping("/add")
+    @ResponseBody
+    public Result addSign(@RequestBody SignInTaskRequestDto dto) throws Exception {
+        logger.info("新建岛,请求参数:{}", JSON.toJSONString(dto));
+        if (StringUtils.isEmpty(dto.getName())) {
+            return Result.failed("商品名称必填");
+        }
+        if (StringUtils.isEmpty(dto.getDesc())) {
+            return Result.failed("商品摘要必填");
+        }
+        return signInTaskService.addSign(dto);
+    }
+
+
+
+}

ch-wx-api/src/main/resources/logback-spring.xml

@@ -7,7 +7,7 @@
     <property name="log.level.console" value="all"/>
     <property name="rolling.pattern" value="%d{yyyy-MM-dd}"/>
     <property name="layout.pattern" value="%-5p %d [%t] %c{50} > %m%n"/>
-    <property name="LOG_FILE_PATH" value="/data/logs/"/>
+<!--    <property name="LOG_FILE_PATH" value="/data/logs/"/>-->
     <property name="APP_NAME" value="quanku-applet"/>
 
     <appender name="console" class="ch.qos.logback.core.ConsoleAppender">