Merge branch 'master' of 192.168.1.249:ty_wyl/adaptation-master1 into zs

src/main/java/com/zjty/adaptationmaster/adaptor/controller/AdaptationController.java

 package com.zjty.adaptationmaster.adaptor.controller;
 
+import com.alibaba.fastjson.JSON;
+import com.zjty.adaptationmaster.adaptor.entity.AdaptRequest;
 import com.zjty.adaptationmaster.adaptor.entity.Project;
 import com.zjty.adaptationmaster.adaptor.entity.Rule;
 import com.zjty.adaptationmaster.adaptor.service.AdaptationService;
 import com.zjty.adaptationmaster.base.response.ServerResponse;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.*;
 
 import java.io.IOException;
 import java.util.List;
 import java.util.UUID;
 
-@Controller
+@RestController
 @RequestMapping("/adapt")
 public class AdaptationController {
     @GetMapping("/getUUID")
@@ -24,27 +24,27 @@ public class AdaptationController {
     @Autowired
     private AdaptationService adaptationService;
     @PostMapping("/adapt")
-    public ServerResponse adapt(Project project, List<Rule> ruleList,String uuid) throws IOException {
-        return adaptationService.adapt(project,ruleList,uuid);
+    public ServerResponse adapt(@RequestBody AdaptRequest adaptRequest) throws IOException {
+        return adaptationService.adapt(adaptRequest.getProject(),adaptRequest.getRuleList(),adaptRequest.getUuid());
     }
     @PostMapping("/compile")
-    public ServerResponse compile(Project project,String uuid){
-        return adaptationService.compile(project,uuid);
+    public ServerResponse compile(@RequestBody AdaptRequest adaptRequest){
+        return adaptationService.compile(adaptRequest.getProject(),adaptRequest.getUuid());
     }
     @PostMapping("/deploy")
-    public ServerResponse deploy(Project project,String uuid){
-        return adaptationService.deploy(project,uuid);
+    public ServerResponse deploy(@RequestBody AdaptRequest adaptRequest){
+        return adaptationService.deploy(adaptRequest.getProject(),adaptRequest.getUuid());
     }
     @PostMapping("/startInApusic")
-    public ServerResponse startInApusic(Project project,String uuid){
-        return adaptationService.start(project,uuid);
+    public ServerResponse startInApusic(@RequestBody AdaptRequest adaptRequest){
+        return adaptationService.start(adaptRequest.getProject(),adaptRequest.getUuid());
     }
     @PostMapping("/stopInApusic")
-    public ServerResponse stopInApusic(Project project,String uuid){
-        return adaptationService.stop(project,uuid);
+    public ServerResponse stopInApusic(@RequestBody AdaptRequest adaptRequest){
+        return adaptationService.stop(adaptRequest.getProject(),adaptRequest.getUuid());
     }
     @PostMapping("/unzipProject")
-    public ServerResponse unZipProject(String path,Project project){
-        return adaptationService.unZipProject(path,project);
+    public ServerResponse unZipProject(@RequestBody AdaptRequest adaptRequest){
+        return adaptationService.unZipProject(adaptRequest.getPath(),adaptRequest.getProject());
     }
 }

src/main/java/com/zjty/adaptationmaster/adaptor/entity/AdaptRequest.java

+package com.zjty.adaptationmaster.adaptor.entity;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.List;
+
+/**
+ * <h4>Description : adaptation-master</h4>
+ *
+ * @author : M@tr!x [xhyrzldf@foxmail.com]
+ * @Date : 2019-12-19 11:37
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class AdaptRequest {
+    private Project project;
+    private List<Rule> ruleList;
+    private String uuid;
+    private String path;
+}

src/main/java/com/zjty/adaptationmaster/adaptor/entity/Project.java

@@ -22,24 +22,33 @@ public class Project {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Integer id;
+
     @Column(unique = true)
     private String projectName;//项目名称
+
     private String codeUrl;//当前源码源码路径
+
     private Integer status = 1;//状态（0：删除 1：未删除）
+
     @Temporal(TemporalType.TIMESTAMP)
     private Date startTime = new Date();//开始时间
+
     @Temporal(TemporalType.TIMESTAMP)
     private Date updateTime;//更新时间
+
     @OneToMany(mappedBy = "project", cascade = CascadeType.ALL, fetch = FetchType.EAGER)
     private List<Rule> rules;//自定义的规则
+
     @ManyToMany
     @JoinTable(name = "project_ruleSet",
             joinColumns = @JoinColumn(name = "p_id",referencedColumnName = "id"),
             inverseJoinColumns = @JoinColumn(name = "r_id", referencedColumnName = "id"))
     private List<RuleSet> ruleSets;//规则集
+
     private boolean compileSuccess = false;
     @OneToOne
     private Report report;
+
     private boolean deploySuccess = false;
 
 }

src/main/java/com/zjty/adaptationmaster/adaptor/entity/Rule.java

@@ -42,11 +42,11 @@ public class Rule {
     private String replacing;//更改方式              全文替换/正则替换
 
     public enum MatchType{
-        PATH,NAME,SUFFIX
+        PATH,NAME,SUFFIX,GLOB
     }
 
     public enum TextMatch{
-        AREA
+        AREA,CONTENT
     }
 
     public enum DealWay{

src/main/java/com/zjty/adaptationmaster/adaptor/entity/RuleSetAndRule.java

+package com.zjty.adaptationmaster.adaptor.entity;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import net.bytebuddy.asm.Advice;
+
+import java.util.List;
+
+/**
+ * <h4>Description : adaptation-master</h4>
+ *
+ * @author : M@tr!x [xhyrzldf@foxmail.com]
+ * @Date : 2019-12-18 13:48
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class RuleSetAndRule {
+    private List<RuleSet> ruleSets;
+    private List<Rule> rules;
+}

src/main/java/com/zjty/adaptationmaster/adaptor/repository/RuleDao.java

 package com.zjty.adaptationmaster.adaptor.repository;
 
 import com.zjty.adaptationmaster.adaptor.entity.Rule;
+import org.springframework.data.domain.Example;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Query;
+
+import java.util.List;
 
 /**
  * <h4>Description : adaptation-master</h4>
@@ -11,4 +15,7 @@ import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
  * @Date : 2019-12-09 9:30
  */
 public interface RuleDao extends JpaRepository<Rule, Integer>,JpaSpecificationExecutor {
+
+    @Query("select r from Rule r where r.ruleSet = null and r.status = 1")
+    List<Rule> findRulesInProject();
 }

src/main/java/com/zjty/adaptationmaster/adaptor/service/Impl/AssemblyServiceImpl.java

@@ -60,6 +60,7 @@ public class AssemblyServiceImpl implements AssemblyService{
                 .build();
 //        Pageable pageable = /*new */PageRequest.of(page-1, 10, Sort.Direction.DESC, "id");
         List<Assembly> assemblyList = assemblyDao.findAll(spec);
-        return ServerResponse.success(new ListResponse<>(assemblyDao.count(spec),assemblyList));
+//        return ServerResponse.success(new ListResponse<>(assemblyDao.count(spec),assemblyList));
+        return ServerResponse.success(assemblyList);
     }
 }

src/main/java/com/zjty/adaptationmaster/adaptor/service/Impl/DependencyServiceImpl.java

@@ -41,12 +41,13 @@ public class DependencyServiceImpl implements DependencyService {
         //上传的依赖文件和依赖包
         if (!dependencyFile.isEmpty()) {
             //依赖名称
-            String photo = dependencyFile.getName();
-            dependency.setDependencyUrl(Const.UPLOAD_LOCATION+photo);
+            String originalFilename = dependencyFile.getOriginalFilename();
+            assert originalFilename != null;
+            dependency.setDependencyUrl("/uploads/"+originalFilename);
             dependency.setStartTime(new Date());
             try {
                 InputStream inputStream = dependencyFile.getInputStream();
-                Files.copy(inputStream, Paths.get(Const.UPLOAD_LOCATION, photo));
+                Files.copy(inputStream, Paths.get(Const.UPLOAD_LOCATION, originalFilename));
                 inputStream.close();
             } catch (IOException e) {
                 e.printStackTrace();

src/main/java/com/zjty/adaptationmaster/adaptor/service/Impl/RuleServiceImpl.java

@@ -4,6 +4,7 @@ import com.github.wenhao.jpa.Specifications;
 import com.zjty.adaptationmaster.adaptor.entity.Project;
 import com.zjty.adaptationmaster.adaptor.entity.Rule;
 import com.zjty.adaptationmaster.adaptor.entity.RuleSet;
+import com.zjty.adaptationmaster.adaptor.entity.RuleSetAndRule;
 import com.zjty.adaptationmaster.adaptor.repository.ProjectDao;
 import com.zjty.adaptationmaster.adaptor.repository.RuleDao;
 import com.zjty.adaptationmaster.adaptor.repository.RuleSetDao;
@@ -43,6 +44,7 @@ public class RuleServiceImpl implements RuleService{
     @Override
     public ServerResponse addRuleSet(RuleSet ruleSet) {
         List<Rule> ruleList = ruleSet.getRuleList();
+        if (ruleList != null)
         ruleList.forEach(rule -> rule.setRuleSet(ruleSet));
         RuleSet save = ruleSetDao.save(ruleSet);
         return ServerResponse.success(filter(save));
@@ -68,7 +70,8 @@ public class RuleServiceImpl implements RuleService{
                     .collect(toList());
             rules.setRuleList(ruleList);
         }
-        return ServerResponse.success(ruleSetList);
+        List<Rule> rules = ruleDao.findRulesInProject();
+        return ServerResponse.success(new RuleSetAndRule(ruleSetList,rules));
     }
 
 //    @Override
@@ -97,8 +100,10 @@ public class RuleServiceImpl implements RuleService{
 
     private RuleSet filter(RuleSet ruleSet){
         List<Rule> rules = ruleSet.getRuleList();
+        if(rules != null){
             List<Rule> collect = rules.stream().filter(rule -> rule.getStatus() != 0).collect(toList());
             ruleSet.setRuleList(collect);
+        }
         return ruleSet;
     }
 }

src/main/java/com/zjty/adaptationmaster/config/MyWebConfig.java

+package com.zjty.adaptationmaster.config;
+
+import com.zjty.adaptationmaster.base.enums.Const;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.CorsRegistry;
+import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
+
+import java.io.File;
+
+/**
+ * <h4>Description : businessservice</h4>
+ *
+ * @author : M@tr!x [xhyrzldf@foxmail.com]
+ * @Date : 2018/4/19 13:29
+ */
+@Configuration
+public class MyWebConfig extends WebMvcConfigurerAdapter {
+    @Override
+    public void addResourceHandlers(ResourceHandlerRegistry registry) {
+        File file1 =new File(Const.UPLOAD_LOCATION);
+        //如果文件夹不存在则创建
+        if  (!file1 .exists())
+        {
+            file1 .mkdirs();
+        } else
+        {
+            System.out.println("//目录存在");
+        }
+//        registry.addResourceHandler("/src/main/resources/**").addResourceLocations("classpath:/resources/uploads/");
+        registry.addResourceHandler("/uploads/**").addResourceLocations("file:"+ Const.UPLOAD_LOCATION);
+        super.addResourceHandlers(registry);
+    }
+}