commit

src/main/java/com/yeejoin/amos/api/tool/controller/RelationResource.java

@@ -52,39 +52,9 @@ public class RelationResource {
      *
      * @return String
      */
-//    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
-//    @GetMapping(value = "/export/{agencyCode}/{sequenceNbrs}")
-//    @ApiOperation(httpMethod = "GET", value = "导出", notes = "导出")
-////    public ResponseModel<String> generateSQL(
-////    @RequestParam(value = "databaseName",required = false) String databaseName,
-//    public void generateSQL(
-//            @PathVariable String agencyCode,
-//            @PathVariable String sequenceNbrs,
-//            HttpServletResponse response,
-//            HttpServletRequest request) throws Exception {
-//        Map<String, Object> variables = new HashMap<>();
-//        variables.put("agencyCode", agencyCode);
-//        String referer = request.getHeader("Referer");
-//        int start = referer.indexOf("ipSeq=")+6;
-//        int end = referer.indexOf("&agencyCode=");
-//        String ipSeq = referer.substring(start,end);
-//        Long longIpSql = Long.parseLong(ipSeq);
-//        studioResourceService.generateSQL("Agency","agencyCode", longIpSql, variables, response);
-//        studioResourceService.generateSQLByDatabaseName("Agency","agencyCode",databaseName, longIpSql, variables, response);
-////        return ResponseHelper.buildResponse("yes");
-//    }
-
-
-    /**
-     * 导出SQL脚本
-     *
-     * @return String
-     */
     @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
     @GetMapping(value = "/export/{agencyCode}/{ipSeq}/{dbSeqs}")
     @ApiOperation(httpMethod = "GET", value = "导出", notes = "导出")
-//    public ResponseModel<String> generateSQL(
-//    @RequestParam(value = "databaseName",required = false) String databaseName,
     public void generateSQL(
             @PathVariable String agencyCode,
             @PathVariable Long ipSeq,
@@ -93,28 +63,8 @@ public class RelationResource {
             HttpServletRequest request) throws Exception {
         Map<String, Object> variables = new HashMap<>();
         variables.put("agencyCode", agencyCode);
-//        String referer = request.getHeader("Referer");
-//        int start = referer.indexOf("ipSeq=")+6;
-//        int end = referer.indexOf("&agencyCode=");
-//        String ipSeq = referer.substring(start,end);
-//        studioResourceService.generateSQL("Agency","agencyCode", ipSeq, variables, response);
         studioResourceService.generateSQLByDatabaseName("Agency","agencyCode",dbSeqs, ipSeq, variables, response);
-//        return ResponseHelper.buildResponse("yes");
     }
 
 
-//    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
-//    @GetMapping(value = "/export/{agencyCode}/{ipSeq}/{dbName}")
-//    @ApiOperation(httpMethod = "GET", value = "导出", notes = "导出")
-//    public ResponseModel<String> generateSQL(
-//            @PathVariable String agencyCode,
-//            @PathVariable Long ipSeq,
-//            @PathVariable String dbName,
-//            HttpServletResponse response) throws Exception {
-//        relationService.outputAgency(agencyCode, ipSeq,dbName,response);
-//        return ResponseHelper.buildResponse("yes");
-//    }
-
-
-
 }
\ No newline at end of file

src/main/java/com/yeejoin/amos/api/tool/face/service/StudioResourceService.java

@@ -205,7 +205,7 @@ public class StudioResourceService extends BaseService<StudioResourceModel, Stud
                     sqlDirectory.mkdir();
                 }
                 // 备份文件路径名称
-//            String fileName = (SourceEnum.IDX.getSource().equals(resourceCode.toLowerCase()) ? (resourceCode.toLowerCase() + "_") : "studio_") + DateFormatUtils.format(new Date(), "yyyyMMdd") + "." + SUFFIX;
+                // String fileName = (SourceEnum.IDX.getSource().equals(resourceCode.toLowerCase()) ? (resourceCode.toLowerCase() + "_") : "studio_") + DateFormatUtils.format(new Date(), "yyyyMMdd") + "." + SUFFIX;
                 String fileName = databaseName + DateFormatUtils.format(new Date(), "yyyyMMdd") + "." + SUFFIX;
                 String sqlFilePath = backPath + SLASH + fileName;
                 File file = new File(sqlFilePath);

src/main/java/com/yeejoin/amos/api/tool/face/service/ToolLibraryService.java

@@ -24,6 +24,7 @@ import java.util.*;
 
 @Service
 public class ToolLibraryService extends BaseService<ToolLibraryModel, ToolLibrary,ToolLibraryMapper> {
+
     private final String className = "com.mysql.cj.jdbc.Driver";
 
     private final String url = "jdbc:mysql://172.16.3.18:3306/amos_studio";
@@ -32,18 +33,6 @@ public class ToolLibraryService extends BaseService<ToolLibraryModel, ToolLibrar
 
     private final String passWord = "Yeejoin@2020";
 
-//    @Value("${toolLibrary.className}")
-//    private String className;
-//
-//    @Value("${toolLibrary.url}")
-//    private String url;
-//
-//    @Value("${toolLibrary.userName}")
-//    private String userName;
-//
-//    @Value("${toolLibrary.passWord}")
-//    private String passWord;
-
     /**
      * 由一级到二级
      */

src/main/resources/application-dev.properties

@@ -55,8 +55,3 @@ spring.boot.admin.client.password=a1234560
 management.security.enabled=false
 management.endpoint.health.show-details=always
 management.endpoints.web.exposure.include=*
-
-#toolLibrary.className=com.mysql.cj.jdbc.Driver
-#toolLibrary.url=jdbc:mysql://172.16.3.18:3306/amos_studio
-#toolLibrary.userName=root
-#toolLibrary.passWord=Yeejoin@2020
\ No newline at end of file