8f4e6484f0b27f471e81c3667142cb1324f4be4e..69ef46cbec0487cf6eba8a6989dbe33238bb923d
2020-03-17 kimi42345
no message
69ef46 对比 | 目录
2020-03-17 kimi42345
Merge branch 'master' of http://highdatas.com:9000/r/~kimi/srs_spring
0bf1c5 对比 | 目录
2020-03-17 kimi42345
no message
9a449d 对比 | 目录
7个文件已修改
92 ■■■■ 已修改文件
.gitignore 63 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pom.xml 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/highdatas/srs/entity/Topic.java 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/highdatas/srs/web/SchemeController.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/highdatas/srs/web/TopicController.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/application-prod.yml 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/application.yml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
.gitignore
@@ -1,31 +1,32 @@
HELP.md
target/
!.mvn/wrapper/maven-wrapper.jar
!**/src/main/**
!**/src/test/**
### STS ###
.apt_generated
.classpath
.factorypath
.project
.settings
.springBeans
.sts4-cache
### IntelliJ IDEA ###
.idea
*.iws
*.iml
*.ipr
### NetBeans ###
/nbproject/private/
/nbbuild/
/dist/
/nbdist/
/.nb-gradle/
build/
### VS Code ###
.vscode/
HELP.md
target/
!.mvn/wrapper/maven-wrapper.jar
!**/src/main/**
!**/src/test/**
### STS ###
.apt_generated
.classpath
.factorypath
.project
.settings
.springBeans
.sts4-cache
### IntelliJ IDEA ###
.idea
*.iws
*.iml
*.ipr
### NetBeans ###
/nbproject/private/
/nbbuild/
/dist/
/nbdist/
/.nb-gradle/
build/
### VS Code ###
.vscode/
srs.zip
pom.xml
@@ -38,6 +38,7 @@
            <groupId>org.freemarker</groupId>
            <artifactId>freemarker</artifactId>
        </dependency>
        <dependency>
            <groupId>com.baomidou</groupId>
            <artifactId>mybatis-plus-boot-starter</artifactId>
src/main/java/com/highdatas/srs/entity/Topic.java
@@ -29,12 +29,24 @@
    @TableField("user_id")
    private String userId;
    @TableField("link_id")
    private String linkId;
    private String attachment;
    private Boolean examine;
    @TableField("create_time")
    private Date createTime;
    public String getLinkId() {
        return linkId;
    }
    public Topic setLinkId(String linkId) {
        this.linkId = linkId;
        return this;
    }
    public Date getCreateTime() {
        return createTime;
    }
src/main/java/com/highdatas/srs/web/SchemeController.java
@@ -49,6 +49,7 @@
    ISchemeDetailService iSchemeDetailService;
    @Autowired
    IProjectDealService projectDealService;
    @Value("${base.file.path}")
    String basePath;
@@ -139,8 +140,6 @@
        int delay = schemeService.selectCount(delayWrapper);
        int total = schemeService.selectCount(null);
        ArrayList<Integer> result = new ArrayList<>();
src/main/java/com/highdatas/srs/web/TopicController.java
@@ -13,10 +13,7 @@
import com.highdatas.srs.util.DbUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
import java.util.Date;
@@ -75,10 +72,10 @@
    }
    @RequestMapping(value = "/exam/{id}", method = RequestMethod.GET)
    public Result exam(@PathVariable String id)  {
    public Result exam(@PathVariable String id, @RequestParam String projectId)  {
        Topic topic = topicService.selectById(id);
        topic.setExamine(true);
        topic.setLinkId(projectId);
        boolean insert = topic.updateById();
        if (insert) {
src/main/resources/application-prod.yml
@@ -7,8 +7,6 @@
  topic:
    path: d:/srs/topic
multipart:
  maxFileSize: 50Mb
  maxRequestSize: 50Mb
src/main/resources/application.yml
@@ -1,6 +1,6 @@
spring:
  profiles:
    active:
      prod
      dev