update code restful

pom.xml

@@ -31,6 +31,7 @@
             <version>1.4.5.RELEASE</version>
         </dependency>
 
+
         <dependency>
             <groupId>org.typroject</groupId>
             <artifactId>tyboot-core-foundation</artifactId>
@@ -180,6 +181,14 @@
                     <skip>true</skip>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>8</source>
+                    <target>8</target>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 

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

 package com.yeejoin.amos.api.tool.controller;
 
-import com.yeejoin.amos.api.tool.face.model.AmosDemoModel;
+import  com.yeejoin.amos.api.tool.face.model.AmosDemoModel;
 import com.yeejoin.amos.api.tool.face.service.AmosDemoService;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -76,7 +76,7 @@ public class AmosDemoResource {
     }
 
 
-    @TycloudOperation(ApiLevel = UserType.SUPER_ADMIN)
+    @TycloudOperation(ApiLevel = UserType.SUPER_ADMIN, needAuth = false)
     @ApiOperation(value = "列表查询")
     @RequestMapping(value = "/list", method = RequestMethod.GET)
     public ResponseModel selectForList(@RequestParam(value = "agencyCode") String agencyCode) {

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

+package com.yeejoin.amos.api.tool.controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+import com.yeejoin.amos.api.tool.face.service.ApiInfoService;
+import com.yeejoin.amos.api.tool.face.service.ApiSourceService;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+import org.springframework.beans.factory.annotation.Autowired;
+import javax.servlet.http.HttpServletRequest;
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.api.tool.face.model.ApiInfoModel;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+@CrossOrigin
+@RestController
+@Api(tags = "接口管理Api")
+@RequestMapping(value = "/demo/api-info")
+public class ApiInfoResource {
+
+    @Autowired
+    ApiInfoService apiInfoService;
+    @Autowired
+    ApiSourceService apiSourceService;
+
+    /**
+     * 新增
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
+    @PostMapping(value = "/save")
+    @ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
+    public ResponseModel<ApiInfoModel> save(@RequestBody ApiInfoModel apiInfoModel) throws Exception {
+        apiInfoModel = apiInfoService.createWithModel(apiInfoModel);
+        return ResponseHelper.buildResponse(apiInfoModel);
+    }
+
+    /**
+     * 根据sequenceNbr更新
+     * @param sequenceNbr 主键
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
+    @PutMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新", notes = "根据sequenceNbr更新")
+    public ResponseModel<ApiInfoModel> updateBySequenceNbrApiInfo(@RequestBody ApiInfoModel model, @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+        model.setSequenceNbr(sequenceNbr);
+        return ResponseHelper.buildResponse(apiInfoService.updateWithModel(model));
+    }
+
+    /**
+     * 根据sequenceNbr删除
+     * @param sequenceNbr 主键
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
+    @DeleteMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除", notes = "根据sequenceNbr删除")
+    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr){
+        return ResponseHelper.buildResponse(apiInfoService.removeById(sequenceNbr));
+    }
+    /**
+     * 根据sequenceNbr查询
+     * @param sequenceNbr  主键
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
+    @GetMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个",  notes = "根据sequenceNbr查询单个")
+    public ResponseModel<ApiInfoModel> selectOne(@PathVariable Long sequenceNbr) throws Exception {
+        return ResponseHelper.buildResponse(apiInfoService.queryBySeq(sequenceNbr));
+    }
+    /**
+     * 列表分页查询
+     *@param current 当前页
+     *@param current 每页大小
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
+    @GetMapping(value = "/page")
+    @ApiOperation(httpMethod = "GET",value = "分页查询",  notes = "分页查询")
+    public ResponseModel<Page<ApiInfoModel>> queryForPage(@RequestParam(value = "current") int current, @RequestParam(value = "size") int size, @RequestParam(value = "sequenceNbr") Long sequenceNbr)
+    {
+
+        Page<ApiInfoModel> page=new Page<ApiInfoModel>();
+        page.setCurrent(current);
+        page.setSize(size);
+        return ResponseHelper.buildResponse(apiInfoService.queryForApiInfoPage(page, apiSourceService.queryCodeById(sequenceNbr)));
+    }
+    /**
+     *列表全部数据查询
+     *@return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
+    @ApiOperation(httpMethod = "GET",value = "列表全部数据查询",   notes = "列表全部数据查询")
+    @GetMapping(value = "/list")
+    public ResponseModel<List<ApiInfoModel>>  selectForList()
+    {
+        return ResponseHelper.buildResponse(apiInfoService.queryForApiInfoList());
+    }
+}

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

+package com.yeejoin.amos.api.tool.controller;
+
+import com.yeejoin.amos.api.tool.face.model.ApiSourceModel;
+import com.yeejoin.amos.api.tool.face.service.ApiSourceService;
+import org.springframework.web.bind.annotation.RequestMapping;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+import org.springframework.beans.factory.annotation.Autowired;
+import javax.servlet.http.HttpServletRequest;
+import org.springframework.web.bind.annotation.*;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+
+@CrossOrigin
+@RestController
+@Api(tags = "接口来源管理Api")
+@RequestMapping(value = "/demo/api_source")
+public class ApiSourceResource {
+
+    @Autowired
+    ApiSourceService apiSourceService;
+
+    /**
+     * 新增
+     *
+     * @return ApiSourceDto
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+    @PostMapping(value = "/save")
+    @ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
+    public ResponseModel<ApiSourceModel> save(@RequestBody ApiSourceModel model) {
+        model = apiSourceService.createWithModel(model);
+        return ResponseHelper.buildResponse(model);
+    }
+
+    /**
+     * 根据sequenceNbr更新
+     *
+     * @param sequenceNbr 编码
+     * @return ApiSourceDto
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+    @PutMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新", notes = "根据sequenceNbr更新")
+    public ResponseModel<ApiSourceModel> updateBySeqApiSource(@RequestBody ApiSourceModel model, @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+        model.setSequenceNbr(sequenceNbr);
+        return ResponseHelper.buildResponse(apiSourceService.updateWithModel(model));
+    }
+
+    /**
+     * 根据sequenceNbr删除
+     *
+     * @param sequenceNbr 编码
+     * @return Boolean
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+    @DeleteMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除", notes = "根据sequenceNbr删除")
+    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+        return ResponseHelper.buildResponse(apiSourceService.removeById(sequenceNbr));
+    }
+
+    /**
+     * 根据sequenceNbr查询
+     *
+     * @param sequenceNbr 物理主键
+     * @return ApiSourceDto
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+    @GetMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个", notes = "根据sequenceNbr查询单个")
+    public ResponseModel<ApiSourceModel> selectOne(@PathVariable Long sequenceNbr) {
+        return ResponseHelper.buildResponse(apiSourceService.queryBySeq(sequenceNbr));
+    }
+
+
+    /**
+     * 列表全部数据查询
+     *
+     * @return List<ApiSourceDto>
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+    @ApiOperation(httpMethod = "GET", value = "列表全部数据查询", notes = "列表全部数据查询")
+    @GetMapping(value = "/list")
+    public ResponseModel<List<ApiSourceModel>> selectForList() {
+        return ResponseHelper.buildResponse(apiSourceService.queryForApiSourceList());
+    }
+
+}

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

+package com.yeejoin.amos.api.tool.controller;
+
+import com.yeejoin.amos.api.tool.face.model.TplCateModel;
+import com.yeejoin.amos.api.tool.face.model.TplCateTreeModel;
+import com.yeejoin.amos.api.tool.face.service.TplCateService;
+import com.yeejoin.amos.api.tool.face.service.VisualDesignerService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
+import java.util.List;
+
+@CrossOrigin
+@RestController
+@Api(tags = "模板分类管理Api")
+@RequestMapping(value = "/demo/tpl_cate")
+public class TplCateResource {
+
+    @Autowired
+    TplCateService tplCateService;
+
+    @Autowired
+    VisualDesignerService visualDesignerService;
+
+    /**
+     * 新增
+     *
+     * @return ApiSourceDto
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+    @PostMapping(value = "/save")
+    @ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
+    public ResponseModel<TplCateModel> save(@RequestBody TplCateModel tplCate){
+        tplCate.setIcon("");
+        tplCate.setIsDel(false);
+        tplCate = tplCateService.createWithModel(tplCate);
+        return ResponseHelper.buildResponse(tplCate);
+    }
+
+    /**
+     * 根据sequenceNbr更新
+     *
+     * @param sequenceNbr 编码
+     * @return ApiSourceDto
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+    @PutMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新", notes = "根据sequenceNbr更新")
+    public ResponseModel<TplCateModel> updateBySeqTplCate(@RequestBody TplCateModel tplCateModel,@PathVariable(value = "sequenceNbr") Long sequenceNbr){
+        tplCateModel.setSequenceNbr(sequenceNbr);
+        return ResponseHelper.buildResponse(tplCateService.updateWithModel(tplCateModel));
+    }
+
+    /**
+     * 根据sequenceNbr删除
+     *
+     * @param sequenceNbr 编码
+     * @return Boolean
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+    @DeleteMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除", notes = "根据sequenceNbr删除")
+    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+        return ResponseHelper.buildResponse(tplCateService.removeById(sequenceNbr));
+    }
+
+    /**
+     * 根据sequenceNbr查询
+     *
+     * @param sequenceNbr 物理主键
+     * @return ApiSourceDto
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+    @GetMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个", notes = "根据sequenceNbr查询单个")
+    public  ResponseModel<TplCateModel> selectOne(@PathVariable Long sequenceNbr){
+        return ResponseHelper.buildResponse(tplCateService.queryBySeq(sequenceNbr));
+    }
+
+    /**
+     * 列表全部数据查询
+     *
+     * @return List<ApiSourceDto>
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+    @ApiOperation(httpMethod = "GET", value = "列表全部数据查询", notes = "列表全部数据查询")
+    @GetMapping(value = "/list")
+    public ResponseModel<List<TplCateModel>> selectForList(){
+        return ResponseHelper.buildResponse(tplCateService.queryForTplCateList());
+    }
+    /**
+     * 列表树形结构查询
+     *
+     * @return List<ApiSourceDto>
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+    @ApiOperation(httpMethod = "GET", value = "列表树形结构查询", notes = "列表树形结构查询")
+    @GetMapping(value = "/tree")
+    public ResponseModel<List<TplCateTreeModel>> selectForTree(){
+        return ResponseHelper.buildResponse(visualDesignerService.getList());
+    }
+
+}

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

+package com.yeejoin.amos.api.tool.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.api.tool.face.model.TplModel;
+import com.yeejoin.amos.api.tool.face.service.TplService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
+@CrossOrigin
+@RestController
+@Api(tags = "模板管理Api")
+@RequestMapping(value = "/demo/tpl")
+public class TplResource {
+
+    @Autowired
+    TplService tplService;
+
+    /**
+     * 新增
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
+    @PostMapping(value = "/save")
+    @ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
+    public ResponseModel<TplModel> save(@RequestBody TplModel tplModel) throws Exception{
+        tplModel.setIsDel(false);
+        tplModel.setDisplayName(tplModel.getComName());
+        tplModel = tplService.createWithModel(tplModel);
+        System.out.println(tplModel.getThumb());
+        return ResponseHelper.buildResponse(tplModel);
+    }
+    /**
+     * 根据sequenceNbr更新
+     * @param sequenceNbr 主键
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
+    @PutMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新", notes = "根据sequenceNbr更新")
+    public ResponseModel<TplModel> updateBySequenceNbrTpl(@RequestBody TplModel tplModel,@PathVariable(value = "sequenceNbr")Long sequenceNbr) {
+        tplModel.setSequenceNbr(sequenceNbr);
+        return  ResponseHelper.buildResponse(tplService.updateWithModel(tplModel));
+    }
+
+    /**
+     * 根据sequenceNbr删除
+     * @param sequenceNbr 主键
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
+    @DeleteMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "DELETE", value = "根据sequenceNbr删除", notes = "根据sequenceNbr删除")
+    public ResponseModel<Boolean> deleteBySequenceNbr(HttpServletRequest request, @PathVariable(value = "sequenceNbr")Long sequenceNbr){
+        return  ResponseHelper.buildResponse(tplService.removeById(sequenceNbr));
+    }
+    /**
+     * 根据sequenceNbr查询
+     * @param sequenceNbr  主键
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
+    @GetMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个",  notes = "根据sequenceNbr查询单个")
+    public ResponseModel<TplModel> selectOne(@PathVariable Long sequenceNbr) throws Exception {
+        return ResponseHelper.buildResponse(tplService.queryBySeq(sequenceNbr));
+    }
+
+    /**
+     * 列表分页查询
+     *@param current 当前页
+     *@param current 每页大小
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
+    @GetMapping(value = "/page")
+    @ApiOperation(httpMethod = "GET",value = "分页查询",  notes = "分页查询")
+    public ResponseModel<Page<TplModel>> queryForPage(@RequestParam(value = "current") int current, @RequestParam(value = "size") int size,@RequestParam(value = "categorySeq")Long categorySeq){
+        Page<TplModel> page = new Page<TplModel>();
+        page.setCurrent(current);
+        page.setSize(size);
+        return ResponseHelper.buildResponse(tplService.queryForTplPage(page,categorySeq));
+    }
+    /**
+     *列表全部数据查询
+     *@return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
+    @ApiOperation(httpMethod = "GET",value = "列表全部数据查询",   notes = "列表全部数据查询")
+    @GetMapping(value = "/list")
+    public ResponseModel<List<TplModel>> selectForList(){
+        return ResponseHelper.buildResponse(tplService.queryForTplList());
+    }
+}

src/main/java/com/yeejoin/amos/api/tool/face/model/ApiInfoModel.java

+package com.yeejoin.amos.api.tool.face.model;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.typroject.tyboot.core.rdbms.model.BaseModel;
+
+import java.util.Date;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "ApiInfoDto", description = "")
+public class ApiInfoModel extends BaseModel {
+
+
+    @ApiModelProperty(value = "接口来源")
+    private String apiSource;
+
+    @ApiModelProperty(value = "接口名称")
+    private String apiName;
+
+    @ApiModelProperty(value = "接口方法")
+    private String httpMethod;
+
+    @ApiModelProperty(value = "接口地址")
+    private String apiPath;
+
+    @ApiModelProperty(value = "响应方式")
+    private String resType;
+
+    @ApiModelProperty(value = "请求参数配置")
+    private String bodyValue;
+
+    @ApiModelProperty(value = "解析规则配置")
+    private String ruleData;
+
+}

src/main/java/com/yeejoin/amos/api/tool/face/model/ApiSourceModel.java

+package com.yeejoin.amos.api.tool.face.model;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.typroject.tyboot.core.rdbms.model.BaseModel;
+
+import java.util.Date;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value="ApiSourceDto", description="")
+public class ApiSourceModel extends BaseModel {
+
+    @ApiModelProperty(value = "接口来源名称")
+    private String name;
+
+    @ApiModelProperty(value = "接口标识")
+    private String code;
+
+}
+

src/main/java/com/yeejoin/amos/api/tool/face/model/TplCateModel.java

+package com.yeejoin.amos.api.tool.face.model;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.typroject.tyboot.core.rdbms.model.BaseModel;
+
+import java.util.List;
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value="TplCateModel", description="")
+public class TplCateModel extends BaseModel {
+
+    @ApiModelProperty(value = "模板分类名称")
+    private String cateName;
+
+    @ApiModelProperty(value = "模板类型")
+    private String tplType;
+
+    @ApiModelProperty(value = "所用设计器类型")
+    private String designerType;
+
+    @ApiModelProperty(value = "图标路径")
+    private String icon;
+
+    @ApiModelProperty(value = "是否删除")
+    private Boolean isDel;
+    public void setIcon(String icon) {
+        this.icon = icon;
+    }
+
+    public void setIsDel(Boolean isDel) {
+        this.isDel = isDel;
+    }
+}

src/main/java/com/yeejoin/amos/api/tool/face/model/TplCateTreeModel.java

+package com.yeejoin.amos.api.tool.face.model;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Data
+@NoArgsConstructor
+@ApiModel(value="TplCateModel", description="")
+public class TplCateTreeModel {
+    @ApiModelProperty(value = "物理主键")
+    private Long sequenceNbr;
+
+    @ApiModelProperty(value = "父ID")
+    private Long parentId;
+
+    @ApiModelProperty(value = "名称")
+    private String name;
+
+    @ApiModelProperty(value = "设计器类型")
+    private String designerType;
+
+    @ApiModelProperty(value = "子列表")
+    private List<TplCateTreeModel> children = new ArrayList<TplCateTreeModel>();
+
+    public void setParentId(Long parentId) {
+        this.parentId = parentId;
+    }
+
+    public TplCateTreeModel(Long sequenceNbr, Long parentId, String name,String designerType){
+        this.sequenceNbr =sequenceNbr ;
+        this.parentId = parentId;
+        this.name = name;
+        this.designerType =designerType;
+    }
+    public TplCateTreeModel(Long sequenceNbr, Long parentId, String name,String designerType,List<TplCateTreeModel> children){
+        this.sequenceNbr =sequenceNbr ;
+        this.parentId = parentId;
+        this.name = name;
+        this.designerType =designerType;
+        this.children = children;
+    }
+
+}

src/main/java/com/yeejoin/amos/api/tool/face/model/TplModel.java

+package com.yeejoin.amos.api.tool.face.model;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springframework.web.multipart.MultipartFile;
+import org.typroject.tyboot.core.rdbms.model.BaseModel;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value="TplCateModel", description="")
+public class TplModel extends BaseModel {
+
+    @ApiModelProperty(value = "展示名称")
+    private String displayName;
+
+    @ApiModelProperty(value = "模板标识")
+    private String comKey;
+
+    @ApiModelProperty(value = "模板名称")
+    private String comName;
+
+    @ApiModelProperty(value = "模板内容")
+    private String content;
+
+    @ApiModelProperty(value = "分类ID")
+    private String cateSeq;
+
+    @ApiModelProperty(value = "模板状态")
+    private Boolean openStatus;
+
+    @ApiModelProperty(value = "缩略图")
+    private MultipartFile thumb;
+
+    @ApiModelProperty(value = "效果图")
+    private String sketch;
+
+    @ApiModelProperty(value = "是否删除")
+    private Boolean isDel;
+
+    public void setIsDel(Boolean isDel) {
+        this.isDel = isDel;
+    }
+
+    public String getComName() {
+        return comName;
+    }
+
+    public void setDisplayName(String displayName) {
+        this.displayName = displayName;
+    }
+
+
+}

src/main/java/com/yeejoin/amos/api/tool/face/model/VisualDesignerModel.java

+package com.yeejoin.amos.api.tool.face.model;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.typroject.tyboot.core.rdbms.model.BaseModel;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value="TplCateModel", description="")
+public class VisualDesignerModel extends BaseModel {
+    @ApiModelProperty(value = "设计器名称")
+    private String designerName;
+
+    @ApiModelProperty(value = "描述")
+    private String designerDesc;
+
+    @ApiModelProperty(value = "设计器类型")
+    private String designerType;
+
+    @ApiModelProperty(value = "图标路径")
+    private String icon;
+
+    public String getDesignerType() {
+        return designerType;
+    }
+
+}

src/main/java/com/yeejoin/amos/api/tool/face/orm/dao/ApiInfoMapper.java

+package com.yeejoin.amos.api.tool.face.orm.dao;
+
+import com.yeejoin.amos.api.tool.face.orm.entity.ApiInfo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+public interface ApiInfoMapper extends BaseMapper<ApiInfo>{
+
+
+}

src/main/java/com/yeejoin/amos/api/tool/face/orm/dao/ApiSourceMapper.java

+package com.yeejoin.amos.api.tool.face.orm.dao;
+
+import com.yeejoin.amos.api.tool.face.orm.entity.ApiSource;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ *  Mapper 接口
+ *
+ * @author system_generator
+ * @date 2023-06-01
+ */
+public interface ApiSourceMapper extends BaseMapper<ApiSource>{
+
+}

src/main/java/com/yeejoin/amos/api/tool/face/orm/dao/TplCateMapper.java

+package com.yeejoin.amos.api.tool.face.orm.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.api.tool.face.orm.entity.TplCate;
+
+public interface TplCateMapper extends BaseMapper<TplCate> {
+}

src/main/java/com/yeejoin/amos/api/tool/face/orm/dao/TplMapper.java

+package com.yeejoin.amos.api.tool.face.orm.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.api.tool.face.orm.entity.Tpl;
+
+public interface TplMapper extends BaseMapper<Tpl> {
+}

src/main/java/com/yeejoin/amos/api/tool/face/orm/dao/VisualDesignerMapper.java

+package com.yeejoin.amos.api.tool.face.orm.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.api.tool.face.orm.entity.VisualDesigner;
+
+public interface VisualDesignerMapper extends BaseMapper<VisualDesigner> {
+}

src/main/java/com/yeejoin/amos/api/tool/face/orm/entity/ApiInfo.java

+package com.yeejoin.amos.api.tool.face.orm.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("studio_data_api")
+public class ApiInfo extends BaseEntity{
+
+
+    /**
+     * 接口来源
+     */
+    @TableField("api_source")
+    private String apiSource;
+    /**
+     * 接口名称
+     */
+    @TableField("api_name")
+    private String apiName;
+    /**
+     * 接口方法
+     */
+    @TableField("http_method")
+    private String httpMethod;
+
+    /**
+     * 接口地址
+     */
+    @TableField("api_path")
+    private String apiPath;
+
+    /**
+     * 响应方式
+     */
+    @TableField("res_type")
+    private String resType;
+    /**
+     * 请求参数配置
+     */
+    @TableField("body_value")
+    private String bodyValue;
+    /**
+     * 解析规则配置
+     */
+    @TableField("rule_data")
+    private String ruleData;
+}

src/main/java/com/yeejoin/amos/api/tool/face/orm/entity/ApiSource.java

+package com.yeejoin.amos.api.tool.face.orm.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("studio_data_api_category")
+public class ApiSource extends BaseEntity {
+
+
+
+    /**
+     * 接口来源名称
+     */
+    @TableField("name")
+    private String name;
+    /**
+     * 接口标识
+     */
+    @TableField("code")
+    private String code;
+}

src/main/java/com/yeejoin/amos/api/tool/face/orm/entity/Tpl.java

+package com.yeejoin.amos.api.tool.face.orm.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("studio_template")
+public class Tpl extends BaseEntity {
+
+
+    /**
+     *展示名称
+     */
+    @TableField("DISPLAY_NAME")
+    private String displayName;
+
+    /**
+     *模板标识
+     */
+    @TableField("COMPONENT_KEY")
+    private String comKey;
+
+    /**
+     *模板名称
+     */
+    @TableField("COMPONENT_NAME")
+    private String comName;
+
+    /**
+     *模板内容
+     */
+    @TableField("CONTENT")
+    private String content;
+
+    /**
+     *分类ID
+     */
+    @TableField("CATEGORY_SEQ")
+    private String cateSeq;
+
+    /**
+     *模板状态
+     */
+    @TableField("OPEN_STATUS")
+    private Boolean openStatus;
+
+    /**
+     *缩略图
+     */
+    @TableField("THUMB")
+    private String[] thumb;
+
+    /**
+     *状态图
+     */
+    @TableField("SKETCH")
+    private String sketch;
+
+    /**
+     *是否删除
+     */
+    @TableField("IS_DELETE")
+    private Boolean isDel;
+}

src/main/java/com/yeejoin/amos/api/tool/face/orm/entity/TplCate.java

+package com.yeejoin.amos.api.tool.face.orm.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("studio_template_category")
+public class TplCate extends BaseEntity {
+
+    /**
+     *分类名称
+     */
+    @TableField("CATEGORY_NAME")
+    private String cateName;
+
+    /**
+     *模板类型
+     */
+    @TableField("TEMP_TYPE")
+    private String tplType;
+
+    /**
+     *所属设计器类型
+     */
+    @TableField("DESIGNER_TYPE")
+    private String designerType;
+
+    /**
+     *图标路径
+     */
+    @TableField("ICON")
+    private String icon;
+
+    /**
+     *是否删除
+     */
+    @TableField("IS_DELETE")
+    private Boolean isDel;
+}

src/main/java/com/yeejoin/amos/api/tool/face/orm/entity/VisualDesigner.java

+package com.yeejoin.amos.api.tool.face.orm.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity;
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("studio_visual_designer")
+public class VisualDesigner extends BaseEntity {
+
+    /**
+     * 设计器名称
+     */
+    @TableField("DESIGNER_NAME")
+    private String designerName;
+
+    /**
+     * 描述
+     */
+    @TableField("DESIGNER_DESC")
+    private String designerDesc;
+
+    /**
+     * 设计器类型
+     */
+    @TableField("DESIGNER_TYPE")
+    private String designerType;
+
+    /**
+     * 图标路径
+     */
+    @TableField("ICON")
+    private String icon;
+}

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

+package com.yeejoin.amos.api.tool.face.service;
+
+import com.yeejoin.amos.api.tool.face.orm.entity.ApiInfo;
+import com.yeejoin.amos.api.tool.face.orm.dao.ApiInfoMapper;
+import com.yeejoin.amos.api.tool.face.model.ApiInfoModel;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import java.util.List;
+
+@Service
+public class ApiInfoService extends BaseService<ApiInfoModel,ApiInfo,ApiInfoMapper> {
+    @Autowired
+    ApiSourceService apiSourceService;
+
+    /**
+     * 分页查询
+     */
+    public Page<ApiInfoModel> queryForApiInfoPage(Page<ApiInfoModel> page, String apiSource)   {
+        return this.queryForPage(page, null, false, apiSource);
+    }
+
+    /**
+     * 列表查询 示例
+     */
+    public List<ApiInfoModel> queryForApiInfoList()   {
+        return this.queryForList("" , false);
+    }
+
+}

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

+package com.yeejoin.amos.api.tool.face.service;
+
+
+import com.yeejoin.amos.api.tool.face.model.ApiSourceModel;
+import com.yeejoin.amos.api.tool.face.orm.entity.ApiSource;
+import com.yeejoin.amos.api.tool.face.orm.dao.ApiSourceMapper;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+import org.springframework.stereotype.Service;
+import java.util.List;
+
+@Service
+public class ApiSourceService extends BaseService<ApiSourceModel, ApiSource, ApiSourceMapper> {
+
+
+    /**
+     * 列表查询 示例
+     */
+    public List<ApiSourceModel> queryForApiSourceList() {
+        return this.queryForList("", false);
+    }
+
+    public String queryCodeById(Long sequenceNbr){
+        ApiSourceModel model = this.queryModelByParams(sequenceNbr);
+        return  model.getCode();
+    }
+}

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

+package com.yeejoin.amos.api.tool.face.service;
+
+import com.yeejoin.amos.api.tool.face.model.TplCateModel;
+import com.yeejoin.amos.api.tool.face.orm.dao.TplCateMapper;
+import com.yeejoin.amos.api.tool.face.orm.entity.TplCate;
+import org.typroject.tyboot.core.foundation.utils.Bean;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+import org.springframework.stereotype.Service;
+import java.util.List;
+
+@Service
+public class TplCateService extends BaseService<TplCateModel, TplCate, TplCateMapper> {
+
+
+    /**
+     * 列表查询 示例
+     */
+    public List<TplCateModel> queryForTplCateList() {
+        return this.queryForList("", false);
+    }
+
+
+
+}

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

+package com.yeejoin.amos.api.tool.face.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.api.tool.face.model.TplModel;
+import com.yeejoin.amos.api.tool.face.orm.dao.TplMapper;
+import com.yeejoin.amos.api.tool.face.orm.entity.Tpl;
+import org.springframework.stereotype.Service;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+
+import java.util.List;
+
+@Service
+public class TplService extends BaseService<TplModel, Tpl, TplMapper> {
+    /**
+     * 分页查询
+     */
+    public Page<TplModel> queryForTplPage(Page<TplModel> page, Long categorySeq)   {
+        return this.queryForPage(page, null, false, categorySeq);
+    }
+
+    /**
+     * 列表查询 示例
+     */
+    public List<TplModel> queryForTplList()   {
+        return this.queryForList("" , false);
+    }
+
+}

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

+package com.yeejoin.amos.api.tool.face.service;
+
+
+import com.yeejoin.amos.api.tool.face.model.TplCateModel;
+import com.yeejoin.amos.api.tool.face.model.TplCateTreeModel;
+import com.yeejoin.amos.api.tool.face.model.VisualDesignerModel;
+import com.yeejoin.amos.api.tool.face.orm.dao.VisualDesignerMapper;
+import com.yeejoin.amos.api.tool.face.orm.entity.VisualDesigner;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.typroject.tyboot.core.foundation.utils.Bean;
+import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+@Service
+public class VisualDesignerService extends BaseService<VisualDesignerModel, VisualDesigner, VisualDesignerMapper> {
+
+    @Autowired
+    TplCateService tplCateService;
+    @Autowired
+    VisualDesignerService visualDesignerService;
+
+    /**
+     * 列表查询 示例
+     */
+
+    //    父List
+    public List<VisualDesignerModel> queryForVisualDesignerList() {
+        return this.queryForList("", false);
+    }
+
+    public List<TplCateTreeModel> getList() {
+        List<TplCateTreeModel> treeList = new ArrayList<>();
+        List<TplCateModel> tplCateModels = tplCateService.queryForTplCateList();
+        List<VisualDesignerModel> visualDesignerModels = visualDesignerService.queryForVisualDesignerList();
+        for(int i = 0; i < visualDesignerModels.size();i++){
+            TplCateTreeModel tplCateTreeModel1 = new
+                    TplCateTreeModel(visualDesignerModels.get(i).getSequenceNbr(), 0L,
+                    visualDesignerModels.get(i).getDesignerName(),visualDesignerModels.get(i).getDesignerType());
+            for (int j = 0, index =0 ;j < tplCateModels.size();j++){
+                if(tplCateModels.get(j).getDesignerType().equals(tplCateTreeModel1.getDesignerType())){
+                    TplCateTreeModel tplCateTreeModel2 = new
+                            TplCateTreeModel(tplCateModels.get(j).getSequenceNbr(), tplCateTreeModel1.getSequenceNbr(),
+                            tplCateModels.get(j).getCateName(),tplCateTreeModel1.getDesignerType(),null);
+                    tplCateTreeModel1.getChildren().add(index++,tplCateTreeModel2);
+                }
+            }
+            treeList.add(i,tplCateTreeModel1);
+        }
+        return treeList;
+    }
+
+}
\ No newline at end of file

src/main/resources/application-dev.properties

+#DB properties:
 # jdbc_config
-spring.datasource.url=jdbc:mysql://172.16.3.18:3306/amos_studio?allowMultiQueries=true
+spring.datasource.url=jdbc:mysql://39.98.45.134:3306/amos_studio?allowMultiQueries=true
 spring.datasource.username=root
 spring.datasource.password=Yeejoin@2020
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 spring.datasource.type=com.zaxxer.hikari.HikariDataSource
 spring.datasource.hikari.minimum-idle=3
-spring.datasource.hikari.maximum-pool-size=5
+spring.datasource.hikari.maximum-pool-size=10
 spring.datasource.hikari.auto-commit=true
 spring.datasource.hikari.idle-timeout=30000
 spring.datasource.hikari.pool-name=DatebookHikariCP
@@ -13,30 +14,44 @@ spring.datasource.hikari.max-lifetime=1800000
 spring.datasource.hikari.connection-timeout=30000
 spring.datasource.hikari.connection-test-query=SELECT 1
 
-# REDIS (RedisProperties)
-spring.redis.database=1
-spring.redis.host=172.16.3.18
-spring.redis.port=6379
-spring.redis.password=yeejoin@2020
-spring.redis.timeout=0
-
-#注册中心地址
-eureka.client.service-url.defaultZone=http://admin:a1234560@172.16.3.18:10001/eureka/
+#??????
+eureka.instance.hostname=39.98.45.134
+eureka.client.serviceUrl.defaultZone=http://${eureka.instance.hostname}:10001/eureka/
 eureka.instance.prefer-ip-address=true
-management.endpoints.web.exposure.include=*
 eureka.instance.health-check-url=http://localhost:${server.port}${server.servlet.context-path}/actuator/health
 eureka.instance.metadata-map.management.context-path=${server.servlet.context-path}/actuator
 eureka.instance.status-page-url=http://localhost:${server.port}${server.servlet.context-path}/actuator/info
 eureka.instance.metadata-map.management.api-docs=http://localhost:${server.port}${server.servlet.context-path}/doc.html
 
+#redis
+spring.redis.database=1
+spring.redis.host=39.98.45.134
+spring.redis.port=6379
+spring.redis.password=yeejoin@2020
+spring.redis.timeout=0
+
+## emqx
+emqx.clean-session=true
+emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
+emqx.broker=tcp://39.98.45.134:2883
+emqx.client-user-name=super
+emqx.client-password=a123456
+emqx.max-inflight=1000
+emqx.keep-alive-interval=10
+
 knife4j.production=false
 knife4j.enable=true
 knife4j.basic.enable=true
 knife4j.basic.username=admin
 knife4j.basic.password=a1234560
 
-management.security.enabled=true
-management.endpoint.health.show-details=always
 spring.security.user.name=admin
 spring.security.user.password=a1234560
-
+spring.boot.admin.client.enabled=true
+spring.boot.admin.client.instance.metadata.user.name=${spring.security.user.name}
+spring.boot.admin.client.instance.metadata.user.password=${spring.security.user.password}
+spring.boot.admin.client.username=admin
+spring.boot.admin.client.password=a1234560
+management.security.enabled=false
+management.endpoint.health.show-details=always
+management.endpoints.web.exposure.include=*
\ No newline at end of file

src/main/resources/application-qa.properties

+#DB properties:
+spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
+spring.datasource.url=jdbc:mysql://172.16.3.67:3306/systemdeveloper?allowMultiQueries=true&serverTimezone=GMT%2B8&characterEncoding=utf8
+spring.datasource.username=root
+spring.datasource.password=root_123
+
+#eureka properties:
+eureka.instance.hostname=172.16.10.72
+eureka.client.serviceUrl.defaultZone=http://${eureka.instance.hostname}:10001/eureka/
+eureka.instance.prefer-ip-address=true
+eureka.instance.health-check-url=http://localhost:${server.port}${server.servlet.context-path}/actuator/health
+eureka.instance.metadata-map.management.context-path=${server.servlet.context-path}/actuator
+eureka.instance.status-page-url=http://localhost:${server.port}${server.servlet.context-path}/actuator/info
+eureka.instance.metadata-map.management.api-docs=http://localhost:${server.port}${server.servlet.context-path}/swagger-ui.html
+
+#redis
+spring.redis.database=0
+spring.redis.host=172.16.10.85
+spring.redis.port=6379
+spring.redis.password=amos2019Redis
+spring.redis.lettuce.pool.max-active=200
+spring.redis.lettuce.pool.max-wait=-1
+spring.redis.lettuce.pool.max-idle=10
+spring.redis.lettuce.pool.min-idle=0
+spring.redis.expire.time=300
+
+## emqx
+emqx.clean-session=true
+emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
+emqx.broker=tcp://172.16.10.85:1883
+emqx.user-name=super
+emqx.password=a123456
+security.systemctl.name=AMOS-API-SYSTEMCTL  
+
+knife4j.production=false
+knife4j.enable=true
+knife4j.basic.enable=true
+knife4j.basic.username=admin
+knife4j.basic.password=a1234560
+
+spring.security.user.name=admin
+spring.security.user.password=a1234560
+spring.boot.admin.client.enabled=true
+spring.boot.admin.client.instance.metadata.user.name=${spring.security.user.name}
+spring.boot.admin.client.instance.metadata.user.password=${spring.security.user.password}
+spring.boot.admin.client.username=admin
+spring.boot.admin.client.password=a1234560
+management.security.enabled=false
+management.endpoint.health.show-details=always
+management.endpoints.web.exposure.include=*
\ No newline at end of file

src/main/resources/application.properties

-spring.application.name=AMOS-API-TOOL
-server.port=30201
-server.servlet.context-path=/tool
-
+spring.application.name=DemoProject
+server.servlet.context-path=/jcs
+server.port=20000
 spring.profiles.active=dev
 
-spring.jackson.dateFormat=yyyy-MM-dd HH:mm:ss
+management.health.elasticsearch.enabled=false
+spring.jackson.time-zone=GMT+8
+spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
 logging.config=classpath:logback-${spring.profiles.active}.xml
+#mybatis-plus\uFFFD\uFFFD\uFFFD\uFFFD\u05BE\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u02B9\uFFFD\uFFFDmybatis\uFFFD\u0123\uFFFD\uFFFD\uFFFD\uFFFD\u04B2\uFFFD\uFFFD\uFFFD
+mybatis-plus.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
 
-# mybatis-plus
-mybatis-plus.mapper-locations=classpath*:mapper/*Mapper.xml
-mybatis-plus.type-aliases-super-type=org.typroject.tyboot.core.rdbms.orm.entity.BaseEntity
-mybatis-plus.global-config.db-config.id-type=id_worker
-mybatis-plus.global-config.db-config.logic-delete-field=is_delete
-mybatis-plus.global-config.db-config.logic-delete-value=1
-mybatis-plus.global-config.db-config.logic-not-delete-value=0
-mybatis.interceptor.enabled=true
+spring.datasource.type=com.zaxxer.hikari.HikariDataSource
+spring.datasource.hikari.minimum-idle=10
+spring.datasource.hikari.maximum-pool-size=25
+spring.datasource.hikari.auto-commit=true
+spring.datasource.hikari.idle-timeout=30000
+spring.datasource.hikari.pool-name=DatebookHikariCP
+spring.datasource.hikari.max-lifetime=120000
+spring.datasource.hikari.connection-timeout=30000
+spring.datasource.hikari.connection-test-query=SELECT 1
\ No newline at end of file

src/main/resources/logback-dev.xml

@@ -16,10 +16,11 @@
 
     <logger name="org.apache.activemq" level="INFO"/>
     <logger name="org.springframework" level="DEBUG"/>
-    <logger name="com.yeejoin.amos" level="DEBUG"/>
-
+    <logger name="org.typroject" level="DEBUG"/>
+    <logger name="com.yeejoin" level="DEBUG"/>
     <!-- 日志输出级别 -->
     <root level="INFO">
         <appender-ref ref="STDOUT" />
     </root>
-</configuration>
+
\ No newline at end of file
+</configuration>

src/main/resources/logback-qa.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<configuration debug="false">
+    <!--定义日志文件的存储地址 勿在 LogBack 的配置中使用相对路径-->
+    <property name="LOG_HOME" value="log" />
+    <!-- 按照每天生成日志文件 -->
+    <appender name="FILE"  class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!--日志文件输出的文件名-->
+            <FileNamePattern>${LOG_HOME}/jcs.log.%d{yyyy-MM-dd}.log</FileNamePattern>
+            <!--日志文件保留天数-->
+            <MaxHistory>7</MaxHistory>
+        </rollingPolicy>
+        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+            <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+        </encoder>
+        <!--日志文件最大的大小-->
+        <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
+            <MaxFileSize>30mb</MaxFileSize>
+        </triggeringPolicy>
+    </appender>
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+            <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+        </encoder>
+    </appender>
+    <!--myibatis log configure-->
+    <logger name="com.apache.ibatis" level="INFO"/>
+    <logger name="org.mybatis" level="INFO" />
+    <logger name="java.sql.Connection" level="INFO"/>
+    <logger name="java.sql.Statement" level="INFO"/>
+    <logger name="java.sql.PreparedStatement" level="INFO"/>
+    <logger name="com.baomidou.mybatisplus" level="INFO"/>
+
+    <logger name="org.typroject" level="INFO"/>
+    <logger name="com.yeejoin" level="INFO"/>
+    <logger name="org.springframework" level="INFO"/>
+
+
+    <!-- 日志输出级别 -->
+    <root level="INFO">
+        <appender-ref ref="FILE" />
+        <appender-ref ref="STDOUT" />
+    </root>
+</configuration>

src/main/resources/mapper/ApiInfoMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yeejoin.amos.api.tool.face.orm.dao.ApiInfoMapper">
+
+</mapper>
\ No newline at end of file

src/main/resources/mapper/ApiSourceMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yeejoin.amos.api.tool.face.orm.dao.ApiSourceMapper">
+
+</mapper>

src/main/resources/mapper/TplCateMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yeejoin.amos.api.tool.face.orm.dao.TplCateMapper">
+
+</mapper>

src/main/resources/mapper/TplMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yeejoin.amos.api.tool.face.orm.dao.TplMapper">
+
+</mapper>

src/main/resources/mapper/VisualDesignerMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yeejoin.amos.api.tool.face.orm.dao.VisualDesignerMapper">
+
+</mapper>