docker 打包

Dockerfile

@@ -1,5 +1,5 @@
 # jdk的版本
-FROM openjdk:8u181-jdk-alpine
+FROM anapsix/alpine-java:8_server-jre_unlimited
 # 作者
 MAINTAINER zhangheng
 ARG workdir=/app

pom.xml

@@ -88,7 +88,9 @@
                     <maxmem>1024m</maxmem>
                     <fork>true</fork>
                     <compilerArguments>
-                        <bootclasspath>${java.home}/lib/rt.jar${path.separator}${java.home}/lib/jce.jar${path.separator}${java.home}/../lib/tools.jar</bootclasspath>
+                        <bootclasspath>
+                            ${java.home}/lib/rt.jar${path.separator}${java.home}/lib/jce.jar${path.separator}${java.home}/../lib/tools.jar
+                        </bootclasspath>
                     </compilerArguments>
                     <compilerArgs>
                         <arg>-Xlint:all,-serial,-path</arg>
@@ -207,6 +209,37 @@
                     </licenseMapping>
                 </configuration>
             </plugin>
+
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+
+            <!--使用jib插件-->
+            <plugin>
+                <groupId>com.google.cloud.tools</groupId>
+                <artifactId>jib-maven-plugin</artifactId>
+                <version>1.7.0</version>
+                <configuration>
+                    <!--from节点用来设置镜像的基础镜像，相当于Docerkfile中的FROM关键字-->
+                    <from>
+                        <image>anapsix/alpine-java:8_server-jre_unlimited</image>
+                    </from>
+                    <to>
+                        <!--镜像名称和tag，使用了mvn内置变量${project.version}，表示当前工程的version-->
+                        <image>docker.xt.wenhq.top:8083/taihu_jh/taihu_analysis:${project.version}</image>
+                        <auth>
+                            <username>admin</username>
+                            <password>xtwenhongquan</password>
+                        </auth>
+                    </to>
+                    <!--容器相关的属性-->
+                    <container>
+                        <useCurrentTimestamp>true</useCurrentTimestamp>
+                    </container>
+                    <allowInsecureRegistries>true</allowInsecureRegistries>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 

server/Dockerfile

@@ -0,0 +1,10 @@
+# jdk的版本
+FROM anapsix/alpine-java:8_server-jre_unlimited
+# 作者
+MAINTAINER zhangheng
+ARG workdir=/app
+VOLUME ${workdir}
+WORKDIR ${workdir}
+ADD target/davinci-server-0.3.1-SNAPSHOT.jar app.jar
+EXPOSE 9000
+ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-jar","app.jar"]

server/src/main/java/edp/davinci/controller/DataScreeningController.java

@@ -75,7 +75,8 @@ public class DataScreeningController extends BaseController
         // 近一个月目录增长数量
         int countCatalogue = 0;
         List<Catalogue> catalogueList = catalogueService.getCatalogueMonth();
-        result.put("countCatalogue", catalogueList.size());
+        countCatalogue = catalogueList.size();
+        result.put("countCatalogue", countCatalogue);
 
         // 行业分类饼图
         Map<String, List<ViewExt>> mapIndustry = viewList.stream().collect(Collectors.groupingBy(ViewExt::getIndustry));

server/src/main/java/edp/davinci/controller/ViewController.java

@@ -53,7 +53,8 @@ import java.util.Map;
 @Slf4j
 @RestController
 @RequestMapping(value = Constants.BASE_API_PATH + "/views", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
-public class ViewController extends BaseController {
+public class ViewController extends BaseController
+{
 
     @Autowired
     private ViewService viewService;
@@ -73,9 +74,11 @@ public class ViewController extends BaseController {
     @GetMapping
     public ResponseEntity getViews(@RequestParam Long projectId,
                                    @ApiIgnore @CurrentUser User user,
-                                   HttpServletRequest request) {
+                                   HttpServletRequest request)
+    {
 
-        if (invalidId(projectId)) {
+        if (invalidId(projectId))
+        {
             ResultMap resultMap = new ResultMap(tokenUtils).failAndRefreshToken(request).message("Invalid project id");
             return ResponseEntity.status(resultMap.getCode()).body(resultMap);
         }
@@ -84,6 +87,33 @@ public class ViewController extends BaseController {
         return ResponseEntity.ok(new ResultMap(tokenUtils).successAndRefreshToken(request).payloads(views));
     }
 
+    /**
+     * 获取view
+     *
+     * @param projectId
+     * @param parentId
+     * @param user
+     * @param request
+     * @return
+     */
+    @ApiOperation(value = "get ViewsByParentId")
+    @GetMapping(value = "/getViewsByParentId")
+    public ResponseEntity getViewsByParentId(@RequestParam Long projectId,
+                                             @RequestParam Long parentId,
+                                             @ApiIgnore @CurrentUser User user,
+                                             HttpServletRequest request)
+    {
+
+        if (invalidId(projectId))
+        {
+            ResultMap resultMap = new ResultMap(tokenUtils).failAndRefreshToken(request).message("Invalid project id");
+            return ResponseEntity.status(resultMap.getCode()).body(resultMap);
+        }
+
+        List<ViewBaseInfo> views = viewService.getViewBaseInfoByParentId(projectId, parentId, user);
+        return ResponseEntity.ok(new ResultMap(tokenUtils).successAndRefreshToken(request).payloads(views));
+    }
+
 
     /**
      * get view info
@@ -97,9 +127,11 @@ public class ViewController extends BaseController {
     @GetMapping("/{id}")
     public ResponseEntity getView(@PathVariable Long id,
                                   @ApiIgnore @CurrentUser User user,
-                                  HttpServletRequest request) {
+                                  HttpServletRequest request)
+    {
 
-        if (invalidId(id)) {
+        if (invalidId(id))
+        {
             ResultMap resultMap = new ResultMap(tokenUtils).failAndRefreshToken(request).message("Invalid view id");
             return ResponseEntity.status(resultMap.getCode()).body(resultMap);
         }
@@ -123,9 +155,11 @@ public class ViewController extends BaseController {
     public ResponseEntity createView(@Valid @RequestBody ViewCreate view,
                                      @ApiIgnore BindingResult bindingResult,
                                      @ApiIgnore @CurrentUser User user,
-                                     HttpServletRequest request) {
+                                     HttpServletRequest request)
+    {
 
-        if (bindingResult.hasErrors()) {
+        if (bindingResult.hasErrors())
+        {
             ResultMap resultMap = new ResultMap(tokenUtils).failAndRefreshToken(request).message(bindingResult.getFieldErrors().get(0).getDefaultMessage());
             return ResponseEntity.status(resultMap.getCode()).body(resultMap);
         }
@@ -152,15 +186,18 @@ public class ViewController extends BaseController {
                                      @Valid @RequestBody ViewUpdate viewUpdate,
                                      @ApiIgnore BindingResult bindingResult,
                                      @ApiIgnore @CurrentUser User user,
-                                     HttpServletRequest request) {
+                                     HttpServletRequest request)
+    {
 
 
-        if (invalidId(id) || !id.equals(viewUpdate.getId())) {
+        if (invalidId(id) || !id.equals(viewUpdate.getId()))
+        {
             ResultMap resultMap = new ResultMap(tokenUtils).failAndRefreshToken(request).message("Invalid view id");
             return ResponseEntity.status(resultMap.getCode()).body(resultMap);
         }
 
-        if (bindingResult.hasErrors()) {
+        if (bindingResult.hasErrors())
+        {
             ResultMap resultMap = new ResultMap(tokenUtils).failAndRefreshToken(request).message(bindingResult.getFieldErrors().get(0).getDefaultMessage());
             return ResponseEntity.status(resultMap.getCode()).body(resultMap);
         }
@@ -182,8 +219,10 @@ public class ViewController extends BaseController {
     @DeleteMapping("/{id}")
     public ResponseEntity deleteView(@PathVariable Long id,
                                      @ApiIgnore @CurrentUser User user,
-                                     HttpServletRequest request) {
-        if (invalidId(id)) {
+                                     HttpServletRequest request)
+    {
+        if (invalidId(id))
+        {
             ResultMap resultMap = new ResultMap(tokenUtils).failAndRefreshToken(request).message("Invalid view id");
             return ResponseEntity.status(resultMap.getCode()).body(resultMap);
         }
@@ -208,9 +247,11 @@ public class ViewController extends BaseController {
     public ResponseEntity executeSql(@Valid @RequestBody ViewExecuteSql executeSql,
                                      @ApiIgnore BindingResult bindingResult,
                                      @ApiIgnore @CurrentUser User user,
-                                     HttpServletRequest request) {
+                                     HttpServletRequest request)
+    {
 
-        if (bindingResult.hasErrors()) {
+        if (bindingResult.hasErrors())
+        {
             ResultMap resultMap = new ResultMap(tokenUtils).failAndRefreshToken(request).message(bindingResult.getFieldErrors().get(0).getDefaultMessage());
             return ResponseEntity.status(resultMap.getCode()).body(resultMap);
         }
@@ -234,8 +275,10 @@ public class ViewController extends BaseController {
     public ResponseEntity getData(@PathVariable Long id,
                                   @RequestBody(required = false) ViewExecuteParam executeParam,
                                   @ApiIgnore @CurrentUser User user,
-                                  HttpServletRequest request) throws SQLException {
-        if (invalidId(id)) {
+                                  HttpServletRequest request) throws SQLException
+    {
+        if (invalidId(id))
+        {
             ResultMap resultMap = new ResultMap(tokenUtils).failAndRefreshToken(request).message("Invalid view id");
             return ResponseEntity.status(resultMap.getCode()).body(resultMap);
         }
@@ -251,13 +294,16 @@ public class ViewController extends BaseController {
                                            @Valid @RequestBody DistinctParam param,
                                            @ApiIgnore BindingResult bindingResult,
                                            @ApiIgnore @CurrentUser User user,
-                                           HttpServletRequest request) {
-        if (invalidId(id)) {
+                                           HttpServletRequest request)
+    {
+        if (invalidId(id))
+        {
             ResultMap resultMap = new ResultMap(tokenUtils).failAndRefreshToken(request).message("Invalid view id");
             return ResponseEntity.status(resultMap.getCode()).body(resultMap);
         }
 
-        if (bindingResult.hasErrors()) {
+        if (bindingResult.hasErrors())
+        {
             ResultMap resultMap = new ResultMap(tokenUtils).failAndRefreshToken(request).message(bindingResult.getFieldErrors().get(0).getDefaultMessage());
             return ResponseEntity.status(resultMap.getCode()).body(resultMap);
         }
@@ -269,14 +315,16 @@ public class ViewController extends BaseController {
 
     @ApiOperation(value = "get dac channels")
     @GetMapping("/dac/channels")
-    public ResponseEntity getDacChannels(@ApiIgnore @CurrentUser User user, HttpServletRequest request) {
+    public ResponseEntity getDacChannels(@ApiIgnore @CurrentUser User user, HttpServletRequest request)
+    {
         Map<String, DacChannel> dacMap = DacChannelUtil.dacMap;
         return ResponseEntity.ok(new ResultMap(tokenUtils).successAndRefreshToken(request).payloads(dacMap.keySet()));
     }
 
     @ApiOperation(value = "get dac tenants")
     @GetMapping("/dac/{dacName}/tenants")
-    public ResponseEntity getDacTenants(@PathVariable String dacName, @ApiIgnore @CurrentUser User user, HttpServletRequest request) {
+    public ResponseEntity getDacTenants(@PathVariable String dacName, @ApiIgnore @CurrentUser User user, HttpServletRequest request)
+    {
 
         return ResponseEntity.ok(new ResultMap(tokenUtils).successAndRefreshToken(request).payloads(dacChannelUtil.getTenants(dacName)));
     }
@@ -287,7 +335,8 @@ public class ViewController extends BaseController {
     public ResponseEntity getDacBizs(@PathVariable String dacName,
                                      @PathVariable String tenantId,
                                      @ApiIgnore @CurrentUser User user,
-                                     HttpServletRequest request) {
+                                     HttpServletRequest request)
+    {
         return ResponseEntity.ok(new ResultMap(tokenUtils).successAndRefreshToken(request).payloads(dacChannelUtil.getBizs(dacName, tenantId)));
     }
 }

server/src/main/java/edp/davinci/dao/ViewMapper.java

@@ -93,9 +93,9 @@ public interface ViewMapper {
             "select v.id, v.`name`, v.`description`, s.name as 'sourceName'",
             "from `view` v ",
             "left join source s on s.id = v.source_id ",
-            "where v.parent_id = #{parentId}"
+            "where v.parent_id = #{parentId} and v.project_id = #{projectId}"
     })
-    List<ViewBaseInfo> getViewBaseInfoByParentId(@Param("parentId") Long parentId);
+    List<ViewBaseInfo> getViewBaseInfoByParentId(@Param("parentId") Long parentId,@Param("projectId") Long projectId);
 
     int insertBatch(@Param("list") List<View> sourceList);
 

server/src/main/java/edp/davinci/dto/viewDto/ViewCreate.java

@@ -38,6 +38,9 @@ public class ViewCreate {
     @Min(value = 1, message = "Invalid project id")
     private Long projectId;
 
+    // 目录id
+    private Long parentId;
+
     @Min(value = 1, message = "Invalid source id")
     private Long sourceId;
 

server/src/main/java/edp/davinci/service/ViewService.java

@@ -61,7 +61,7 @@ public interface ViewService extends CheckEntityService {
 
     ViewWithSourceBaseInfo getView(Long id, User user) throws NotFoundException, UnAuthorizedException, ServerException;
 
-    List<ViewBaseInfo> getViewBaseInfoByParentId(Long projectId) throws NotFoundException, UnAuthorizedException, ServerException;
+    List<ViewBaseInfo> getViewBaseInfoByParentId(Long projectId, Long parentId, User user) throws NotFoundException, UnAuthorizedException, ServerException;
 
     SQLContext getSQLContext(boolean isMaintainer, ViewWithSource viewWithSource, ViewExecuteParam executeParam, User user);