风险管理系统模块里风险指标、风险等级、风险程度添加修改功能及网关添加白名单

yxt_supervise/gateway/src/main/resources/application.yml

@@ -37,6 +37,13 @@ spring:
           uri: lb://supervise-crm
           filters:
             - StripPrefix=1
+        #风险管理系统
+        - id: supervise-rms
+          predicates:
+            - Path= /rms/**
+          uri: lb://supervise-rms
+          filters:
+            - StripPrefix=1
 ignore:
   whites:
     - /portal/v1/regions/treeList
@@ -89,7 +96,10 @@ ignore:
     - /portal/v1/regions/getCounty
     - /portal/v1/wxuser/test
     - /portal/v1/appuser/updateAppId  #解绑用户的appId
-
+    # 风险管理系统
+    - /rms/v1/riskIndicator/saveRiskIndicator
+    - /rms/v1/riskDegree/saveRiskDegree
+    - /rms/v1/riskLevel/saveRiskLevel
 
   whitesTwo: #包含所有
     ###swagger相关开始

yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/risk/RiskFeign.java

@@ -1,7 +1,11 @@
 package com.supervise.rms.api.risk;
 
+import com.supervise.rms.api.riskdegree.RiskDegreeDto;
+import com.yxt.common.core.result.ResultBean;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
 
 @Api(tags = "风险表")
 @FeignClient(
@@ -10,4 +14,5 @@ import org.springframework.cloud.openfeign.FeignClient;
         path = "v1/risk",
         fallback = RiskFeignFallback.class)
 public interface RiskFeign {
+
 }

yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskdegree/RiskDegree.java

@@ -0,0 +1,17 @@
+package com.supervise.rms.api.riskdegree;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "风险程度表", description = "风险名单表")
+@TableName("risk_degree")
+public class RiskDegree extends BaseEntity {
+    @ApiModelProperty("风险程度名称")
+    private String riskDegreeName;
+    @ApiModelProperty("风险程度代码")
+    private String riskDegreeCode;
+}

yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskdegree/RiskDegreeDto.java

@@ -0,0 +1,14 @@
+package com.supervise.rms.api.riskdegree;
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class RiskDegreeDto implements Dto {
+    private String sid;
+    @ApiModelProperty("风险程度名称")
+    private String riskDegreeName;
+    @ApiModelProperty("风险程度代码")
+    private String riskDegreeCode;
+}

yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskdegree/RiskDegreeFeign.java

@@ -0,0 +1,21 @@
+package com.supervise.rms.api.riskdegree;
+
+import com.yxt.common.core.result.ResultBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+@Api(tags = "风险指标等级表")
+@FeignClient(
+        contextId = "yxt-supervise-RiskDegree",
+        name = "yxt-supervise",
+        path = "v1/riskDegree",
+        fallback = RiskDegreeFeignFallback.class)
+public interface RiskDegreeFeign {
+
+    @ApiOperation("保存风险程度")
+    @PostMapping("/saveRiskDegree")
+    ResultBean saveRiskDegree(RiskDegreeDto riskDegreeDto);
+}

yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskdegree/RiskDegreeFeignFallback.java

@@ -0,0 +1,10 @@
+package com.supervise.rms.api.riskdegree;
+
+import com.yxt.common.core.result.ResultBean;
+import org.springframework.stereotype.Component;
+
+@Component
+public class RiskDegreeFeignFallback implements RiskDegreeFeign {
+    @Override
+    public ResultBean saveRiskDegree(RiskDegreeDto riskDegreeDto){return null;};
+}

yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskdegree/RiskDegreeVo.java

@@ -0,0 +1,14 @@
+package com.supervise.rms.api.riskdegree;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class RiskDegreeVo implements Vo {
+    private String sid;
+    @ApiModelProperty("风险程度名称")
+    private String riskDegreeName;
+    @ApiModelProperty("风险程度代码")
+    private String riskDegreeCode;
+}

yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskindicator/RiskIndicator.java

@@ -0,0 +1,21 @@
+package com.supervise.rms.api.riskindicator;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "风险指标表", description = "风险名单表")
+@TableName("risk_list")
+public class RiskIndicator extends BaseEntity {
+    @ApiModelProperty("风险指标名称")
+    private String riskIndicatorsName;
+    @ApiModelProperty("风险指标代码")
+    private String riskIndicatorsCode;
+    @ApiModelProperty("风险指标等级Sid")
+    private String riskIndicatorsLevelSid;
+    @ApiModelProperty("风险指标类别SId")
+    private String riskIndicatorsTypeSid;
+}

yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskindicator/RiskIndicatorDto.java

@@ -0,0 +1,18 @@
+package com.supervise.rms.api.riskindicator;
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class RiskIndicatorDto implements Dto {
+    private String sid;
+    @ApiModelProperty("风险指标名称")
+    private String riskIndicatorsName;
+    @ApiModelProperty("风险指标代码")
+    private String riskIndicatorsCode;
+    @ApiModelProperty("风险指标等级Sid")
+    private String riskIndicatorsLevelSid;
+    @ApiModelProperty("风险指标类别SId")
+    private String riskIndicatorsTypeSid;
+}

yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskindicator/RiskIndicatorFeign.java

@@ -0,0 +1,19 @@
+package com.supervise.rms.api.riskindicator;
+
+import com.yxt.common.core.result.ResultBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+
+@Api(tags = "风险指标表")
+@FeignClient(
+        contextId = "yxt-supervise-RiskIndicator",
+        name = "yxt-supervise",
+        path = "v1/superviseRiskIndicators",
+        fallback = RiskIndicatorFeignFallback.class)
+public interface RiskIndicatorFeign {
+    @ApiOperation("保存风险指标")
+    @PostMapping("/saveRiskIndicator")
+    ResultBean saveRiskIndicator(RiskIndicatorDto riskIndicatorDto);
+}

yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskindicator/RiskIndicatorFeignFallback.java

@@ -0,0 +1,10 @@
+package com.supervise.rms.api.riskindicator;
+
+import com.yxt.common.core.result.ResultBean;
+import org.springframework.stereotype.Component;
+
+@Component
+public class RiskIndicatorFeignFallback implements RiskIndicatorFeign {
+    @Override
+    public ResultBean saveRiskIndicator(RiskIndicatorDto riskIndicatorDto){return null;};
+}

yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskindicator/RiskIndicatorVo.java

@@ -0,0 +1,18 @@
+package com.supervise.rms.api.riskindicator;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class RiskIndicatorVo implements Vo {
+    private String sid;
+    @ApiModelProperty("风险指标名称")
+    private String riskIndicatorsName;
+    @ApiModelProperty("风险指标代码")
+    private String riskIndicatorsCode;
+    @ApiModelProperty("风险指标等级Sid")
+    private String riskIndicatorsLevelSid;
+    @ApiModelProperty("风险指标类别SId")
+    private String riskIndicatorsTypeSid;
+}

yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskindicators/RiskIndicators.java

@@ -1,17 +0,0 @@
-package com.supervise.rms.api.riskindicators;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.yxt.common.core.domain.BaseEntity;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@Data
-@ApiModel(value = "风险名单表", description = "风险名单表")
-@TableName("risk_list")
-public class RiskIndicators extends BaseEntity {
-    @ApiModelProperty("风险对象Sid")
-    private String riskObjectSid;
-    @ApiModelProperty("风险对象类型1.供应商2.仓库3.门店")
-    private Integer riskObjectType;
-}

yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskindicators/RiskIndicatorsDto.java

@@ -1,14 +0,0 @@
-package com.supervise.rms.api.riskindicators;
-
-import com.yxt.common.core.dto.Dto;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@Data
-public class RiskIndicatorsDto implements Dto {
-    private String sid;
-    @ApiModelProperty("风险对象Sid")
-    private String riskObjectSid;
-    @ApiModelProperty("风险对象类型1.供应商2.仓库3.门店")
-    private Integer riskObjectType;
-}

yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskindicators/RiskIndicatorsFeign.java

@@ -1,13 +0,0 @@
-package com.supervise.rms.api.riskindicators;
-
-import io.swagger.annotations.Api;
-import org.springframework.cloud.openfeign.FeignClient;
-
-@Api(tags = "风险指标表")
-@FeignClient(
-        contextId = "yxt-supervise-RiskIndicators",
-        name = "yxt-supervise",
-        path = "v1/superviseRiskIndicators",
-        fallback = RiskIndicatorsFeignFallback.class)
-public interface RiskIndicatorsFeign {
-}

yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskindicators/RiskIndicatorsFeignFallback.java

@@ -1,7 +0,0 @@
-package com.supervise.rms.api.riskindicators;
-
-import org.springframework.stereotype.Component;
-
-@Component
-public class RiskIndicatorsFeignFallback implements RiskIndicatorsFeign {
-}

yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskindicators/RiskIndicatorsVo.java

@@ -1,14 +0,0 @@
-package com.supervise.rms.api.riskindicators;
-
-import com.yxt.common.core.vo.Vo;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@Data
-public class RiskIndicatorsVo implements Vo {
-    private String sid;
-    @ApiModelProperty("风险对象Sid")
-    private String riskObjectSid;
-    @ApiModelProperty("风险对象类型1.供应商2.仓库3.门店")
-    private Integer riskObjectType;
-}

yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskindicatorslevel/RiskIndicatorsLevel.java

@@ -1,17 +0,0 @@
-package com.supervise.rms.api.riskindicatorslevel;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.yxt.common.core.domain.BaseEntity;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@Data
-@ApiModel(value = "风险名单表", description = "风险名单表")
-@TableName("risk_list")
-public class RiskIndicatorsLevel extends BaseEntity {
-    @ApiModelProperty("风险对象Sid")
-    private String riskObjectSid;
-    @ApiModelProperty("风险对象类型1.供应商2.仓库3.门店")
-    private Integer riskObjectType;
-}

yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskindicatorslevel/RiskIndicatorsLevelDto.java

@@ -1,14 +0,0 @@
-package com.supervise.rms.api.riskindicatorslevel;
-
-import com.yxt.common.core.dto.Dto;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@Data
-public class RiskIndicatorsLevelDto implements Dto {
-    private String sid;
-    @ApiModelProperty("风险对象Sid")
-    private String riskObjectSid;
-    @ApiModelProperty("风险对象类型1.供应商2.仓库3.门店")
-    private Integer riskObjectType;
-}

yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskindicatorslevel/RiskIndicatorsLevelFeign.java

@@ -1,13 +0,0 @@
-package com.supervise.rms.api.riskindicatorslevel;
-
-import io.swagger.annotations.Api;
-import org.springframework.cloud.openfeign.FeignClient;
-
-@Api(tags = "风险指标等级表")
-@FeignClient(
-        contextId = "yxt-supervise-RiskIndicatorsLevel",
-        name = "yxt-supervise",
-        path = "v1/riskIndicatorsLevel",
-        fallback = RiskIndicatorsLevelFeignFallback.class)
-public interface RiskIndicatorsLevelFeign {
-}

yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskindicatorslevel/RiskIndicatorsLevelFeignFallback.java

@@ -1,7 +0,0 @@
-package com.supervise.rms.api.riskindicatorslevel;
-
-import org.springframework.stereotype.Component;
-
-@Component
-public class RiskIndicatorsLevelFeignFallback implements RiskIndicatorsLevelFeign {
-}

yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskindicatorslevel/RiskIndicatorsLevelVo.java

@@ -1,14 +0,0 @@
-package com.supervise.rms.api.riskindicatorslevel;
-
-import com.yxt.common.core.vo.Vo;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@Data
-public class RiskIndicatorsLevelVo implements Vo {
-    private String sid;
-    @ApiModelProperty("风险对象Sid")
-    private String riskObjectSid;
-    @ApiModelProperty("风险对象类型1.供应商2.仓库3.门店")
-    private Integer riskObjectType;
-}

yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskindicatorstype/RiskIndicatorsType.java

@@ -1,21 +0,0 @@
-package com.supervise.rms.api.riskindicatorstype;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.yxt.common.core.domain.BaseEntity;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@Data
-@ApiModel(value = "风险名单表", description = "风险名单表")
-@TableName("risk_list")
-public class RiskIndicatorsType extends BaseEntity {
-    @ApiModelProperty("风险指标类别名称")
-    private String riskIndicatorsTypeName;
-    @ApiModelProperty("风险指标类别代码")
-    private String riskIndicatorsTypeCode;
-    @ApiModelProperty("层级")
-    private Integer Hierarchy;
-    @ApiModelProperty("父类Sid")
-    private String PSid;
-}

yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskindicatorstype/RiskIndicatorsTypeDto.java

@@ -1,18 +0,0 @@
-package com.supervise.rms.api.riskindicatorstype;
-
-import com.yxt.common.core.dto.Dto;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@Data
-public class RiskIndicatorsTypeDto implements Dto {
-    private String sid;
-    @ApiModelProperty("风险指标类别名称")
-    private String riskIndicatorsTypeName;
-    @ApiModelProperty("风险指标类别代码")
-    private String riskIndicatorsTypeCode;
-    @ApiModelProperty("层级")
-    private Integer Hierarchy;
-    @ApiModelProperty("父类Sid")
-    private String PSid;
-}

yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskindicatorstype/RiskIndicatorsTypeFeign.java

@@ -1,13 +0,0 @@
-package com.supervise.rms.api.riskindicatorstype;
-
-import io.swagger.annotations.Api;
-import org.springframework.cloud.openfeign.FeignClient;
-
-@Api(tags = "风险指标类别表")
-@FeignClient(
-        contextId = "yxt-supervise-RiskIndicatorsType",
-        name = "yxt-supervise",
-        path = "v1/riskIndicatorsType",
-        fallback = RiskIndicatorsTypeFeignFallback.class)
-public interface RiskIndicatorsTypeFeign {
-}

yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskindicatorstype/RiskIndicatorsTypeFeignFallback.java

@@ -1,7 +0,0 @@
-package com.supervise.rms.api.riskindicatorstype;
-
-import org.springframework.stereotype.Component;
-
-@Component
-public class RiskIndicatorsTypeFeignFallback implements RiskIndicatorsTypeFeign {
-}

yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskindicatorstype/RiskIndicatorsTypeVo.java

@@ -1,18 +0,0 @@
-package com.supervise.rms.api.riskindicatorstype;
-
-import com.yxt.common.core.vo.Vo;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@Data
-public class RiskIndicatorsTypeVo implements Vo {
-    private String sid;
-    @ApiModelProperty("风险指标类别名称")
-    private String riskIndicatorsTypeName;
-    @ApiModelProperty("风险指标类别代码")
-    private String riskIndicatorsTypeCode;
-    @ApiModelProperty("层级")
-    private Integer Hierarchy;
-    @ApiModelProperty("父类Sid")
-    private String PSid;
-}

yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/risklevel/RiskLevel.java

@@ -0,0 +1,19 @@
+package com.supervise.rms.api.risklevel;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "风险等级表", description = "风险名单表")
+@TableName("risk_level")
+public class RiskLevel extends BaseEntity {
+    @ApiModelProperty("风险等级名称")
+    private String riskLevelName;
+    @ApiModelProperty("风险等级代码")
+    private String riskLevelCode;
+    @ApiModelProperty("风险程度Sid")
+    private String riskDegreeSid;
+}

yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/risklevel/RiskLevelDto.java

@@ -0,0 +1,16 @@
+package com.supervise.rms.api.risklevel;
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class RiskLevelDto implements Dto {
+    private String sid;
+    @ApiModelProperty("风险等级名称")
+    private String riskLevelName;
+    @ApiModelProperty("风险等级代码")
+    private String riskLevelCode;
+    @ApiModelProperty("风险程度Sid")
+    private String riskDegreeSid;
+}

yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/risklevel/RiskLevelFeign.java

@@ -0,0 +1,19 @@
+package com.supervise.rms.api.risklevel;
+
+import com.yxt.common.core.result.ResultBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+
+@Api(tags = "风险指标类别表")
+@FeignClient(
+        contextId = "yxt-supervise-RiskLevel",
+        name = "yxt-supervise",
+        path = "v1/riskLevel",
+        fallback = RiskLevelFeignFallback.class)
+public interface RiskLevelFeign {
+    @ApiOperation("保存风险等级")
+    @PostMapping("/saveRiskLevel")
+    ResultBean saveRiskLevel(RiskLevelDto riskLevelDto);
+}

yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/risklevel/RiskLevelFeignFallback.java

@@ -0,0 +1,11 @@
+package com.supervise.rms.api.risklevel;
+
+import com.supervise.rms.api.riskdegree.RiskDegreeDto;
+import com.yxt.common.core.result.ResultBean;
+import org.springframework.stereotype.Component;
+
+@Component
+public class RiskLevelFeignFallback implements RiskLevelFeign {
+    @Override
+    public ResultBean saveRiskLevel(RiskLevelDto riskLevelDto){return null;};
+}

yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/risklevel/RiskLevelVo.java

@@ -0,0 +1,16 @@
+package com.supervise.rms.api.risklevel;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class RiskLevelVo implements Vo {
+    private String sid;
+    @ApiModelProperty("风险等级名称")
+    private String riskLevelName;
+    @ApiModelProperty("风险等级代码")
+    private String riskLevelCode;
+    @ApiModelProperty("风险程度Sid")
+    private String riskDegreeSid;
+}

yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskindicators/RiskIndicatorsMapper.java → yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskdegree/RiskDegreeMapper.java

@@ -23,13 +23,13 @@
  *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
  *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
  *********************************************************/
-package com.supervise.rms.biz.riskindicators;
+package com.supervise.rms.biz.riskdegree;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.supervise.rms.api.riskindicators.RiskIndicators;
+import com.supervise.rms.api.riskdegree.RiskDegree;
 import org.apache.ibatis.annotations.Mapper;
 
 @Mapper
-public interface RiskIndicatorsMapper extends BaseMapper<RiskIndicators> {
+public interface RiskDegreeMapper extends BaseMapper<RiskDegree> {
 
 
 }

yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskindicators/RiskIndicatorsMapper.xml → yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskdegree/RiskDegreeMapper.xml

@@ -1,5 +1,5 @@
 <?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.supervise.rms.biz.riskindicators.RiskIndicatorsMapper">
+<mapper namespace="com.supervise.rms.biz.riskdegree.RiskDegreeMapper">
 
 </mapper>

yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskdegree/RiskDegreeRest.java

@@ -0,0 +1,27 @@
+package com.supervise.rms.biz.riskdegree;
+
+import com.supervise.rms.api.risk.RiskFeign;
+import com.supervise.rms.api.riskdegree.RiskDegreeDto;
+import com.supervise.rms.api.riskdegree.RiskDegreeFeign;
+import com.yxt.common.core.result.ResultBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@Api(tags = "风险名单表")
+@RestController("com.supervise.rmc.biz.riskdegree.RiskDegreeRest")
+@RequestMapping("v1/riskDegree")
+public class RiskDegreeRest implements RiskDegreeFeign {
+    @Autowired
+    private RiskDegreeService riskDegreeService;
+
+    @Override
+    @ApiOperation("保存风险程度")
+    @PostMapping("/saveRiskDegree")
+    public ResultBean saveRiskDegree(RiskDegreeDto riskDegreeDto) {
+        return  riskDegreeService.saveRiskDegree(riskDegreeDto);
+    }
+}

yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskdegree/RiskDegreeService.java

@@ -0,0 +1,40 @@
+package com.supervise.rms.biz.riskdegree;
+
+import com.supervise.rms.api.riskdegree.RiskDegree;
+import com.supervise.rms.api.riskdegree.RiskDegreeDto;
+import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.core.result.ResultBean;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+
+@Service
+public class RiskDegreeService extends MybatisBaseService<RiskDegreeMapper, RiskDegree> {
+
+    public ResultBean saveRiskDegree(RiskDegreeDto riskDegreeDto) {
+        ResultBean rb = ResultBean.fireFail();
+        String sid = riskDegreeDto.getSid();
+        if(StringUtils.isBlank(sid)){
+            //新增
+            RiskDegree riskDegree = new RiskDegree();
+            BeanUtils.copyProperties(riskDegreeDto, riskDegree,"sid");
+            boolean isSave = save(riskDegree);
+            if(!isSave){
+                return rb.setMsg("保存失败");
+            }
+            sid = riskDegree.getSid();
+        }else{
+            //更新
+            RiskDegree riskDegree = fetchBySid(riskDegreeDto.getSid());
+            if(riskDegree == null){
+                return rb.setMsg("该条记录不存在");
+            }
+            BeanUtils.copyProperties(riskDegreeDto, riskDegree);
+            boolean isUpdate = updateById(riskDegree);
+            if(!isUpdate){
+                return rb.setMsg("更新失败");
+            }
+        }
+        return rb.success().setData(sid).setMsg("保存成功");
+    }
+}

yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskindicatorstype/RiskIndicatorsTypeMapper.java → yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskindicator/RiskIndicatorMapper.java

@@ -23,13 +23,13 @@
  *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
  *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
  *********************************************************/
-package com.supervise.rms.biz.riskindicatorstype;
+package com.supervise.rms.biz.riskindicator;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.supervise.rms.api.riskindicatorstype.RiskIndicatorsType;
+import com.supervise.rms.api.riskindicator.RiskIndicator;
 import org.apache.ibatis.annotations.Mapper;
 
 @Mapper
-public interface RiskIndicatorsTypeMapper extends BaseMapper<RiskIndicatorsType> {
+public interface RiskIndicatorMapper extends BaseMapper<RiskIndicator> {
 
 
 }

yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskindicatorstype/RiskIndicatorsTypeMapper.xml → yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskindicator/RiskIndicatorMapper.xml

@@ -1,5 +1,5 @@
 <?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.supervise.rms.biz.riskindicatorstype.RiskIndicatorsTypeMapper">
+<mapper namespace="com.supervise.rms.biz.riskindicator.RiskIndicatorMapper">
 
 </mapper>

yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskindicator/RiskIndicatorRest.java

@@ -0,0 +1,28 @@
+package com.supervise.rms.biz.riskindicator;
+
+import com.supervise.rms.api.riskdegree.RiskDegreeDto;
+import com.supervise.rms.api.riskindicator.RiskIndicatorDto;
+import com.supervise.rms.api.riskindicator.RiskIndicatorFeign;
+import com.supervise.rms.biz.riskdegree.RiskDegreeService;
+import com.yxt.common.core.result.ResultBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@Api(tags = "风险指标表")
+@RestController("com.supervise.rmc.biz.riskindicator.RiskIndicatorRest")
+@RequestMapping("v1/riskIndicator")
+public class RiskIndicatorRest implements RiskIndicatorFeign {
+    @Autowired
+    private RiskIndicatorService riskIndicatorService;
+
+    @Override
+    @ApiOperation("保存风险指标")
+    @PostMapping("/saveRiskIndicator")
+    public ResultBean saveRiskIndicator(RiskIndicatorDto riskIndicatorDto) {
+        return  riskIndicatorService.saveRiskIndicator(riskIndicatorDto);
+    }
+}

yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskindicator/RiskIndicatorService.java

@@ -0,0 +1,40 @@
+package com.supervise.rms.biz.riskindicator;
+
+import com.supervise.rms.api.riskindicator.RiskIndicatorDto;
+import com.yxt.common.base.service.MybatisBaseService;
+import com.supervise.rms.api.riskindicator.RiskIndicator;
+import com.yxt.common.core.result.ResultBean;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+
+@Service
+public class RiskIndicatorService extends MybatisBaseService<RiskIndicatorMapper, RiskIndicator> {
+
+    public ResultBean saveRiskIndicator(RiskIndicatorDto riskIndicatorDto) {
+        ResultBean rb = ResultBean.fireFail();
+        String sid = riskIndicatorDto.getSid();
+        if(StringUtils.isBlank(sid)){
+            //新增
+            RiskIndicator riskIndicator = new RiskIndicator();
+            BeanUtils.copyProperties(riskIndicatorDto, riskIndicator,"sid");
+            boolean isSave = save(riskIndicator);
+            if(!isSave){
+                return rb.setMsg("保存失败");
+            }
+            sid = riskIndicator.getSid();
+        }else{
+            //更新
+            RiskIndicator riskIndicator = fetchBySid(riskIndicatorDto.getSid());
+            if(riskIndicator == null){
+                return rb.setMsg("该条记录不存在");
+            }
+            BeanUtils.copyProperties(riskIndicatorDto, riskIndicator);
+            boolean isUpdate = updateById(riskIndicator);
+            if(!isUpdate){
+                return rb.setMsg("更新失败");
+            }
+        }
+        return rb.success().setData(sid).setMsg("保存成功");
+    }
+}

yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskindicators/RiskIndicatorsRest.java

@@ -1,13 +0,0 @@
-package com.supervise.rms.biz.riskindicators;
-
-import com.supervise.rms.api.riskindicators.RiskIndicatorsFeign;
-import io.swagger.annotations.Api;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-@Api(tags = "风险指标表")
-@RestController("com.supervise.rmc.biz.riskindicators.RiskIndicatorsRest")
-@RequestMapping("v1/riskIndicators")
-public class RiskIndicatorsRest implements RiskIndicatorsFeign {
-
-}

yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskindicators/RiskIndicatorsService.java

@@ -1,11 +0,0 @@
-package com.supervise.rms.biz.riskindicators;
-
-import com.yxt.common.base.service.MybatisBaseService;
-import com.supervise.rms.api.riskindicators.RiskIndicators;
-import org.springframework.stereotype.Service;
-
-@Service
-public class RiskIndicatorsService extends MybatisBaseService<RiskIndicatorsMapper, RiskIndicators> {
-
-
-}

yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskindicatorslevel/RiskIndicatorsLevelRest.java

@@ -1,13 +0,0 @@
-package com.supervise.rms.biz.riskindicatorslevel;
-
-import com.supervise.rms.api.risk.RiskFeign;
-import io.swagger.annotations.Api;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-@Api(tags = "风险名单表")
-@RestController("com.supervise.rmc.biz.riskindicatorslevel.RiskIndicatorsLevelRest")
-@RequestMapping("v1/risk")
-public class RiskIndicatorsLevelRest implements RiskFeign {
-
-}

yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskindicatorslevel/RiskIndicatorsLevelService.java

@@ -1,11 +0,0 @@
-package com.supervise.rms.biz.riskindicatorslevel;
-
-import com.yxt.common.base.service.MybatisBaseService;
-import com.supervise.rms.api.riskindicatorslevel.RiskIndicatorsLevel;
-import org.springframework.stereotype.Service;
-
-@Service
-public class RiskIndicatorsLevelService extends MybatisBaseService<RiskIndicatorsLevelMapper, RiskIndicatorsLevel> {
-
-
-}

yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskindicatorstype/RiskIndicatorsTypeRest.java

@@ -1,13 +0,0 @@
-package com.supervise.rms.biz.riskindicatorstype;
-
-import com.supervise.rms.api.risk.RiskFeign;
-import io.swagger.annotations.Api;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-@Api(tags = "风险名单表")
-@RestController("com.supervise.rmc.biz.riskindicatorstype.RiskIndicatorsTypeRest")
-@RequestMapping("v1/risk")
-public class RiskIndicatorsTypeRest implements RiskFeign {
-
-}

yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskindicatorstype/RiskIndicatorsTypeService.java

@@ -1,11 +0,0 @@
-package com.supervise.rms.biz.riskindicatorstype;
-
-import com.yxt.common.base.service.MybatisBaseService;
-import com.supervise.rms.api.riskindicatorstype.RiskIndicatorsType;
-import org.springframework.stereotype.Service;
-
-@Service
-public class RiskIndicatorsTypeService extends MybatisBaseService<RiskIndicatorsTypeMapper, RiskIndicatorsType> {
-
-
-}

yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskindicatorslevel/RiskIndicatorsLevelMapper.java → yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/risklevel/RiskLevelMapper.java

@@ -23,13 +23,13 @@
  *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
  *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
  *********************************************************/
-package com.supervise.rms.biz.riskindicatorslevel;
+package com.supervise.rms.biz.risklevel;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.supervise.rms.api.riskindicatorslevel.RiskIndicatorsLevel;
+import com.supervise.rms.api.risklevel.RiskLevel;
 import org.apache.ibatis.annotations.Mapper;
 
 @Mapper
-public interface RiskIndicatorsLevelMapper extends BaseMapper<RiskIndicatorsLevel> {
+public interface RiskLevelMapper extends BaseMapper<RiskLevel> {
 
 
 }

yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskindicatorslevel/RiskIndicatorsLevelMapper.xml → yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/risklevel/RiskLevelMapper.xml

@@ -1,5 +1,5 @@
 <?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.supervise.rms.biz.riskindicatorslevel.RiskIndicatorsLevelMapper">
+<mapper namespace="com.supervise.rms.biz.risklevel.RiskLevelMapper">
 
 </mapper>

yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/risklevel/RiskLevelRest.java

@@ -0,0 +1,29 @@
+package com.supervise.rms.biz.risklevel;
+
+import com.supervise.rms.api.risk.RiskFeign;
+import com.supervise.rms.api.riskdegree.RiskDegreeDto;
+import com.supervise.rms.api.risklevel.RiskLevelDto;
+import com.supervise.rms.api.risklevel.RiskLevelFeign;
+import com.supervise.rms.biz.riskdegree.RiskDegreeService;
+import com.yxt.common.core.result.ResultBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@Api(tags = "风险名单表")
+@RestController("com.supervise.rmc.biz.risklevel.RiskLevelRest")
+@RequestMapping("v1/riskLevel")
+public class RiskLevelRest implements RiskLevelFeign {
+    @Autowired
+    private RiskLevelService riskLevelService;
+
+    @Override
+    @ApiOperation("保存风险等级")
+    @PostMapping("/saveRiskLevel")
+    public ResultBean saveRiskLevel(RiskLevelDto riskLevelDto) {
+        return  riskLevelService.saveRiskLevel(riskLevelDto);
+    }
+}

yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/risklevel/RiskLevelService.java

@@ -0,0 +1,41 @@
+package com.supervise.rms.biz.risklevel;
+
+import com.supervise.rms.api.risklevel.RiskLevel;
+import com.supervise.rms.api.risklevel.RiskLevelDto;
+import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.core.result.ResultBean;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+
+@Service
+public class RiskLevelService extends MybatisBaseService<RiskLevelMapper, RiskLevel> {
+
+    public ResultBean saveRiskLevel(RiskLevelDto riskLevelDto) {
+        ResultBean rb = ResultBean.fireFail();
+        String sid = riskLevelDto.getSid();
+        if(StringUtils.isBlank(sid)){
+            //新增
+            RiskLevel riskLevel = new RiskLevel();
+            BeanUtils.copyProperties(riskLevelDto, riskLevel,"sid");
+            boolean isSave = save(riskLevel);
+            if(!isSave){
+                return rb.setMsg("保存失败");
+            }
+            sid = riskLevel.getSid();
+        }else{
+            //更新
+            RiskLevel riskLevel = fetchBySid(riskLevelDto.getSid());
+            if(riskLevel == null){
+                return rb.setMsg("该条记录不存在");
+            }
+            BeanUtils.copyProperties(riskLevelDto, riskLevel);
+            boolean isUpdate = updateById(riskLevel);
+            if(!isUpdate){
+                return rb.setMsg("更新失败");
+            }
+        }
+        return rb.success().setData(sid).setMsg("保存成功");
+    }
+
+}

yxt_supervise/supervise-rms/supervise-rms-biz/src/main/resources/application-devv.yml

@@ -0,0 +1,31 @@
+spring:
+  datasource:
+    hikari:
+      max-lifetime: 500000
+    driver-class-name: com.mysql.cj.jdbc.Driver
+    url: jdbc:mysql://127.0.0.1:3306/supervise_rms?serverTimezone=GMT%2B8&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true
+    username: root
+    password: root
+  cloud:
+    nacos:
+      discovery:
+        server-addr: 127.0.0.1:8848
+  redis:
+    database: 3  # Redis数据库索引（默认为0）
+    host: 127.0.0.1
+    jedis:
+      pool:
+        max-active: -1  #连接池最大连接数（使用负值表示没有限制）
+        max-idle: 8  #连接池中的最大空闲连接
+        max-wait: -1   # 连接池最大阻塞等待时间（使用负值表示没有限制）
+        min-idle: 0  # 连接池中的最小空闲连接
+    password:
+    port: 6379
+    timeout: 0  # 连接超时时间（毫秒）
+
+image:
+  upload:
+    path: D:\supervise\upload\
+  url:
+    prefix: http://127.0.0.1:8112/upload/
+

yxt_supervise/supervise-rms/supervise-rms-biz/src/main/resources/application-pro.yml

@@ -0,0 +1,28 @@
+spring:
+  datasource:
+    driver-class-name: com.mysql.cj.jdbc.Driver
+    url: jdbc:mysql://127.0.0.1:3306/supervise_rms?serverTimezone=GMT%2B8&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8
+    username: root
+    password: root
+  cloud:
+    nacos:
+      discovery:
+        server-addr: 127.0.0.1:8848
+  redis:
+    database: 3  # Redis数据库索引（默认为0）
+    host: 127.0.0.1
+    jedis:
+      pool:
+        max-active: -1  #连接池最大连接数（使用负值表示没有限制）
+        max-idle: 8  #连接池中的最大空闲连接
+        max-wait: -1   # 连接池最大阻塞等待时间（使用负值表示没有限制）
+        min-idle: 0  # 连接池中的最小空闲连接
+    password: 123456
+    port: 6379
+    timeout: 0  # 连接超时时间（毫秒）
+image:
+  upload:
+    path: D:\supervise\upload\
+  url:
+    prefix: http://127.0.0.1/api/upload/
+

yxt_supervise/supervise-rms/supervise-rms-biz/src/main/resources/application-test.yml

@@ -0,0 +1,31 @@
+spring:
+  datasource:
+    driver-class-name: com.mysql.cj.jdbc.Driver
+#    url: jdbc:mysql://122.14.222.186:3306/supervise_rms?serverTimezone=GMT%2B8&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true
+    url: jdbc:mysql://127.0.0.1:3306/supervise_crm?serverTimezone=GMT%2B8&autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&nullCatalogMeansCurrent=true
+    username: root
+    password: 1LAiGz$t1*Iw
+  cloud:
+    nacos:
+      discovery:
+        server-addr: 127.0.0.1:8848
+  redis:
+    database: 3  # Redis数据库索引（默认为0）
+    host: 127.0.0.1
+    jedis:
+      pool:
+        max-active: -1  #连接池最大连接数（使用负值表示没有限制）
+        max-idle: 8  #连接池中的最大空闲连接
+        max-wait: -1   # 连接池最大阻塞等待时间（使用负值表示没有限制）
+        min-idle: 0  # 连接池中的最小空闲连接
+    password: 123456
+    port: 6379
+    timeout: 0  # 连接超时时间（毫秒）
+
+
+image:
+  upload:
+    path: D:/webapps/supervise/static/upload/
+  url:
+    prefix: http://122.14.222.186:7003/upload/
+

yxt_supervise/supervise-rms/supervise-rms-biz/src/main/resources/application.yml

@@ -0,0 +1,47 @@
+spring:
+  application:
+    name: supervise-rms
+  profiles:
+#    active: devv
+    active: test
+  messages:
+    # 国际化资源文件路径
+    basename: i18n/messages
+  servlet:
+    #上传文件
+    multipart:
+      max-file-size: 50MB
+      max-request-size: 100MB
+  devtools:
+    restart:
+      # 热部署开关
+      enabled: true
+
+
+
+server:
+  port: 8001
+  max-http-header-size: 102400
+  undertow:
+    max-http-post-size: -1
+
+#mybatis
+mybatis-plus:
+  # 配置mapper的扫描，找到所有的mapper.xml映射文件
+  mapper-locations: classpath*:**Mapper.xml
+  global-config:
+    refresh: true
+    db-config:
+      #定义生成ID的类型
+      id-type: Auto
+      db-type: mysql
+  configuration:
+    map-underscore-to-camel-case: false
+    cache-enabled: true
+    call-setters-on-nulls: true
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+
+
+
+
+

yxt_supervise/supervise-rms/supervise-rms-biz/src/main/resources/logback-spring.xml

@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+
+	<property name="log.base" value="logs/supervise_rms" />
+
+	<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+		<encoder>
+			<!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符 ：
+			|%blue(%thread)  线程 如 ：DiscoveryClient-CacheRefreshExecutor-0-->
+			<!--<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>-->
+			<pattern>%yellow(%date{yyyy-MM-dd HH:mm:ss}) |%highlight(%-5level) |%green(%logger:%line) |%blue(%msg%n)
+			</pattern>
+			<!--<charset>UTF-8</charset> -->
+		</encoder>
+	</appender>
+
+	<!-- 彩色日志 -->
+	<!-- 彩色日志依赖的渲染类 -->
+	<conversionRule conversionWord="clr" converterClass="org.springframework.boot.logging.logback.ColorConverter" />
+	<conversionRule conversionWord="wex" converterClass="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter" />
+	<conversionRule conversionWord="wEx" converterClass="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter" />
+	<!-- 彩色日志格式 -->
+	<property name="CONSOLE_LOG_PATTERN" value="${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
+
+	<appender name="FILEOUT"
+			  class="ch.qos.logback.core.rolling.RollingFileAppender">
+		<file>${log.base}.log</file>
+		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+			<fileNamePattern>${log.base}.%d{yyyyMMdd}.%i.log.zip
+			</fileNamePattern>
+			<!-- 当文件大小超过10MB时触发滚动 -->
+			<timeBasedFileNamingAndTriggeringPolicy
+					class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+				<maxFileSize>1MB</maxFileSize>
+			</timeBasedFileNamingAndTriggeringPolicy>
+		</rollingPolicy>
+		<encoder>
+			<!--<pattern>%date [%thread] %-5level %logger{35} - %msg%n</pattern>-->
+			<Pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36}
+				-%msg%n</Pattern>
+			<!--<charset>UTF-8</charset> -->
+		</encoder>
+	</appender>
+
+	<root level="INFO">
+		<appender-ref ref="STDOUT" />
+		<appender-ref ref="FILEOUT" />
+	</root>
+
+</configuration>