Commit 852ed9ce authored by xiami's avatar xiami

提交第一个接口

parent 5f68865b
# Default ignored files
/shelf/
/workspace.xml
# Editor-based HTTP Client requests
/httpRequests/
# Datasource local storage ignored files
/dataSources/
/dataSources.local.xml
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="CompilerConfiguration">
<annotationProcessing>
<profile default="true" name="Default" enabled="true" />
<profile name="Maven default annotation processors profile" enabled="true">
<sourceOutputDir name="target/generated-sources/annotations" />
<sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
<outputRelativeToContentRoot value="true" />
<module name="quanku-applet" />
<module name="quanku-system" />
<module name="ch-dao" />
<module name="ch-core" />
</profile>
</annotationProcessing>
</component>
<component name="JavacSettings">
<option name="ADDITIONAL_OPTIONS_OVERRIDE">
<module name="ch-core" options="-parameters" />
<module name="ch-dao" options="-parameters" />
<module name="quanku-applet" options="-parameters" />
<module name="quanku-system" options="-parameters" />
</option>
</component>
</project>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="Encoding">
<file url="file://$PROJECT_DIR$/ch-admin-api/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/ch-core/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/ch-dao/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/ch-wx-api/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/src/main/resources" charset="UTF-8" />
</component>
</project>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="RemoteRepositoriesConfiguration">
<remote-repository>
<option name="id" value="wwdz-snapshots" />
<option name="name" value="wwdz-snapshots" />
<option name="url" value="http://nexus.wanwudezhi.work/repository/wwdz-snapshots-group/" />
</remote-repository>
<remote-repository>
<option name="id" value="central" />
<option name="name" value="central" />
<option name="url" value="http://nexus.wanwudezhi.work/repository/wwdz-public/" />
</remote-repository>
<remote-repository>
<option name="id" value="central" />
<option name="name" value="Central Repository" />
<option name="url" value="http://nexus.wanwudezhi.work/repository/wwdz-public/" />
</remote-repository>
<remote-repository>
<option name="id" value="central" />
<option name="name" value="Maven Central repository" />
<option name="url" value="https://repo1.maven.org/maven2" />
</remote-repository>
<remote-repository>
<option name="id" value="jboss.community" />
<option name="name" value="JBoss Community repository" />
<option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
</remote-repository>
<remote-repository>
<option name="id" value="wwdz-releases" />
<option name="name" value="wwdz-releases" />
<option name="url" value="http://nexus.wanwudezhi.work/repository/wwdz-releases-group/" />
</remote-repository>
</component>
</project>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ExternalStorageConfigurationManager" enabled="true" />
<component name="MavenProjectsManager">
<option name="originalFiles">
<list>
<option value="$PROJECT_DIR$/pom.xml" />
</list>
</option>
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK" />
</project>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="" vcs="Git" />
</component>
</project>
\ No newline at end of file
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -273,7 +273,12 @@ ...@@ -273,7 +273,12 @@
<dependency> <dependency>
<groupId>org.apache.curator</groupId> <groupId>org.apache.curator</groupId>
<artifactId>curator-recipes</artifactId> <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> </dependency>
</dependencies> </dependencies>
......
package com.wwdz.ch.db.dao.qiandao; package com.wwdz.ch.db.dao.qiandao;
import com.wwdz.ch.db.dto.request.qiandao.SignInTaskRequestDto;
public interface SignInTaskDao { public interface SignInTaskDao {
int insert(SignInTaskRequestDto signInTaskRequestDto);
} }
package com.wwdz.ch.db.impl.qiandao; package com.wwdz.ch.db.impl.qiandao;
import com.wwdz.ch.db.dao.qiandao.SignInTaskDao; 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; import org.springframework.stereotype.Repository;
@Repository @Repository
public class SignInTaskDaoImpl implements SignInTaskDao { public class SignInTaskDaoImpl implements SignInTaskDao {
@Autowired
SignInTaskMapper signInTaskMapper;
@Override
public int insert(SignInTaskRequestDto signInTaskRequestDto) {
return signInTaskMapper.insert(signInTaskRequestDto) ;
}
} }
...@@ -4,6 +4,7 @@ import com.wwdz.ch.db.domain.qiandao.SignInTask; ...@@ -4,6 +4,7 @@ import com.wwdz.ch.db.domain.qiandao.SignInTask;
import com.wwdz.ch.db.domain.qiandao.SignInTaskExample; import com.wwdz.ch.db.domain.qiandao.SignInTaskExample;
import java.util.List; import java.util.List;
import com.wwdz.ch.db.dto.request.qiandao.SignInTaskRequestDto;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
...@@ -15,7 +16,7 @@ public interface SignInTaskMapper { ...@@ -15,7 +16,7 @@ public interface SignInTaskMapper {
int deleteByPrimaryKey(Long id); int deleteByPrimaryKey(Long id);
int insert(SignInTask record); int insert(SignInTaskRequestDto record);
int insertSelective(SignInTask record); int insertSelective(SignInTask record);
......
...@@ -13,6 +13,16 @@ ...@@ -13,6 +13,16 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties> </properties>
<dependencies> <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> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
...@@ -35,6 +45,12 @@ ...@@ -35,6 +45,12 @@
<groupId>com.wwdz</groupId> <groupId>com.wwdz</groupId>
<artifactId>ch-dao</artifactId> <artifactId>ch-dao</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
<exclusions>
<exclusion>
<artifactId>curator-framework</artifactId>
<groupId>org.apache.curator</groupId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
......
...@@ -56,7 +56,7 @@ public class WebMvcConfiguration implements WebMvcConfigurer { ...@@ -56,7 +56,7 @@ public class WebMvcConfiguration implements WebMvcConfigurer {
"/wx/appletPageConfig/**", "/wx/blindBox/**","/wx/sellActivity/**","/wx/itemTagQrCode/createQrCode", "/wx/appletPageConfig/**", "/wx/blindBox/**","/wx/sellActivity/**","/wx/itemTagQrCode/createQrCode",
"/wx/userSignIn/**", "/wx/userSignIn/**",
"/wx/userSignIn/testSignIn","/wx/userSignIn/deleteTodayRecord" "/wx/userSignIn/testSignIn","/wx/userSignIn/deleteTodayRecord","/wx/signInTask/**"
//下列路径上线注释 //下列路径上线注释
//"/wx/itemTagQrCode/**" //"/wx/itemTagQrCode/**"
// ,"/wx/itemTagOperate/**", "/wx/openShop/**", "/wx/earnestRecord/**", "/wx/auctionEarnest/**", "/wx/userAccount/**" // ,"/wx/itemTagOperate/**", "/wx/openShop/**", "/wx/earnestRecord/**", "/wx/auctionEarnest/**", "/wx/userAccount/**"
......
package com.wwdz.ch.wx.impl.qiandao; 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 com.wwdz.ch.wx.service.qiandao.SignInTaskService;
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;
import java.util.Date;
import java.util.HashMap;
@Service @Service
public class SignInTaskServiceImpl implements SignInTaskService { public class SignInTaskServiceImpl implements SignInTaskService {
@Autowired
SignInTaskDao signInTaskDao;
private static final Logger logger = LoggerFactory.getLogger(SignInTaskServiceImpl.class); 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 listSign(int pageNum, int pageSize) throws Exception {
}
} }
...@@ -33,7 +33,7 @@ import java.util.List; ...@@ -33,7 +33,7 @@ import java.util.List;
/** /**
* 拍卖结束自动创建订单 * 拍卖结束自动创建订单
*/ */
@Component //@Component
public class AutoCreateAuctionOrderJob { public class AutoCreateAuctionOrderJob {
private static final Logger logger = LoggerFactory.getLogger(AutoCreateAuctionOrderJob.class); private static final Logger logger = LoggerFactory.getLogger(AutoCreateAuctionOrderJob.class);
...@@ -61,7 +61,7 @@ public class AutoCreateAuctionOrderJob { ...@@ -61,7 +61,7 @@ public class AutoCreateAuctionOrderJob {
/** /**
* 隔2分钟运行一次 * 隔2分钟运行一次
*/ */
@Scheduled(fixedDelay = 1000 * 60 * 2) // @Scheduled(fixedDelay = 1000 * 60 * 2)
public void execute() { public void execute() {
RLock lock = redissonClient.getLock(AUTO_CREATE_AUCTION_ORDER_KEY); RLock lock = redissonClient.getLock(AUTO_CREATE_AUCTION_ORDER_KEY);
if (!lock.tryLock()) { if (!lock.tryLock()) {
......
package com.wwdz.ch.wx.service.qiandao; 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 { public interface SignInTaskService {
Result addSign(SignInTaskRequestDto dto);
void listSign(int pageNum ,int pageSize) throws Exception;
} }
...@@ -36,8 +36,6 @@ public class AiAssistantController { ...@@ -36,8 +36,6 @@ public class AiAssistantController {
return aiAssistantService.findList(dto); return aiAssistantService.findList(dto);
} }
@ApiOperation(value = "查询ai默认问题") @ApiOperation(value = "查询ai默认问题")
@PostMapping("/findDefaultQuestions") @PostMapping("/findDefaultQuestions")
public Result findDefaultQuestions(@RequestBody AiDefaultQuestionRequestDto dto) { public Result findDefaultQuestions(@RequestBody AiDefaultQuestionRequestDto dto) {
......
...@@ -89,9 +89,7 @@ public class WxStorageController { ...@@ -89,9 +89,7 @@ public class WxStorageController {
@ApiOperation("上传文件") @ApiOperation("上传文件")
public Object upload(@RequestParam("file") MultipartFile file) throws IOException { public Object upload(@RequestParam("file") MultipartFile file) throws IOException {
logger.info("【请求开始】上传文件,请求参数,file:{}", file.getOriginalFilename()); logger.info("【请求开始】上传文件,请求参数,file:{}", file.getOriginalFilename());
String originalFilename = file.getOriginalFilename(); String originalFilename = file.getOriginalFilename();
InputStream targetInput = null; InputStream targetInput = null;
try (InputStream inputStream = file.getInputStream()) { try (InputStream inputStream = file.getInputStream()) {
BufferedImage image = ImageIO.read(inputStream); BufferedImage image = ImageIO.read(inputStream);
......
package com.wwdz.ch.wx.web.qiandao;
import com.alibaba.fastjson.JSON;
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 Object 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);
}
}
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<property name="log.level.console" value="all"/> <property name="log.level.console" value="all"/>
<property name="rolling.pattern" value="%d{yyyy-MM-dd}"/> <property name="rolling.pattern" value="%d{yyyy-MM-dd}"/>
<property name="layout.pattern" value="%-5p %d [%t] %c{50} > %m%n"/> <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"/> <property name="APP_NAME" value="quanku-applet"/>
<appender name="console" class="ch.qos.logback.core.ConsoleAppender"> <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
......
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment