项目配置

a2183028 · 苗卫卫 · 11cd6b1c · a2183028 · a2183028 · a2183028
--- a/config/application-dev.yml
+++ b/config/application-dev.yml
 datasource:
  def:
-    driver-class-name: com.mysql.cj.jdbc.Driver
+#    driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://rm-bp1n0a3b0vegq27qjzm.mysql.rds.aliyuncs.com:3306/wios-nbd?useUnicode=true&characterEncoding=utf8
+    type: com.alibaba.druid.pool.DruidDataSource
-    username: cams_warehouse
+    url: jdbc:mysql://111.229.205.39:3306/wios-test?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8
-    password: Dj3yVPttY
+    username: root
+    password: Xuri@2020!
    #type:
    filters: stat
    maxActive: 20
@@ -22,10 +23,11 @@ datasource:
    #filters: stat,wall,log4j2
    connectionProperties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
  extdb:
-    driver-class-name: com.mysql.cj.jdbc.Driver
+#    driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://rm-bp1n0a3b0vegq27qjzm.mysql.rds.aliyuncs.com:3306/warehouse?useUnicode=true&characterEncoding=utf8
+    type: com.alibaba.druid.pool.DruidDataSource
-    username: cams_warehouse
+    url: jdbc:mysql://111.229.205.39:3306/warehouse?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8
-    password: Dj3yVPttY
+    username: root
+    password: Xuri@2020!
    #type:
    filters: stat
    maxActive: 20
@@ -46,17 +48,19 @@ datasource:
 spring:
  redis:
-    timeout: 2000
+    host: 127.0.0.1
-    host: r-bp1chof5rigpzj6kcx.redis.rds.aliyuncs.com
    port: 6379
-    password: DVazx5wuv
+    password:
-    database: 0
+    database: 10
+    timeout: 2000
    lettuce:
      pool:
        max-active: 8
        max-wait: 1000
        max-idle: 100
        min-idle: 0
+  main:
+    allow-bean-definition-overriding: true
 jasypt.encryptor.password: 6dc19871-5299-4603-9b7a-2d7fa78defea
 swagger:
@@ -74,7 +78,29 @@ activiti:
  useDefDataSource: true
  #是否创建表
  database-schema-update: true
+activitiDataSource:
+  def:
+    type: com.alibaba.druid.pool.DruidDataSource
+    url: jdbc:mysql://111.229.205.39:3306/wios-test?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true
+    username: root
+    password: Xuri@2020!
+    #type:
+    filters: stat
+    maxActive: 20
+    initialSize: 1
+    maxWait: 30000
+    minIdle: 1
+    timeBetweenEvictionRunsMillis: 60000
+    minEvictableIdleTimeMillis: 90000
+    validationQuery: SELECT 1 FROM DUAL
+    testWhileIdle: true
+    testOnBorrow: false
+    testOnReturn: false
+    poolPreparedStatements: true
+    maxOpenPreparedStatements: 20
+    connection-test-query: SELECT 1 FROM DUAL
+    #filters: stat,wall,log4j2
+    connectionProperties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
 auth:
  allowRepeatLogin: true
@@ -91,7 +117,7 @@ url:
  api:
    wios: http://wios.api.dev.ccchong.com:8086
    push: http://push-gateway.test.k8s.star-charge.com/mts
-    warehouse: http://wios-warehouse.dev.k8s.star-charge.com/
+    warehouse: http://127.0.0.1:30350/
    #warehouse: http://10.8.9.86:8056/
    invoice: http://47.111.208.192:8028/mts
  h5: http://wios.2ust.com
@@ -132,3 +158,478 @@ sap:
 flow:
  flowCode: CamsOrder
  flowSuperGroupId: 836764183768485111
+cams:
+  name: cams配置
+  #枚举类数值配置
+  enumNumberConfig:
+    #是否
+    - key: yesOrNo
+      value: 0-否;1-是
+    #是否需要立柱
+    - key: needErectPile
+      value: 0-否;1-是
+    #是否需要特殊施工
+    - key: needSpecialConstruction
+      value: 0-否;1-是
+    #是否为售车前预勘测
+    - key: surveyBeforeSaleEnable
+      value: 0-否;1-是
+    #是否独立车位
+    - key: hasIndependentParking
+      value: 0-否;1-是
+    #是否需要勘测
+    - key: isNeedSurvey
+      value: 0-否;1-是
+    #是否联系上客户
+    - key: isConnect
+      value: 0-否;1-是
+    #是否进行电力报装
+    - key: electricExpand
+      value: 0-否;1-是
+    #报装状态
+    - key: expandStatus
+      value: 1-通过;2-不通过
+    #报装不通过后订单后续操作
+    - key: expandFailOperate
+      value: 1-换其他用电类型继续安装;2-不安装了
+    #报装方式
+    - key: expandMethod
+      value: 1-代报装;2-自主报装
+    #安装紧急程度
+    - key: installEmergencyLevel
+      value: 1-一般;2-紧急
+    #物业态度
+    - key: propertyAgree
+      value: 0-不同意;1-同意
+    #安装位置
+    - key: installPosition
+      value: 1-室内;2-室外
+    #类型
+    - key: type
+      value: 1-普通订单;2-移桩订单
+    #是否需要人工派单
+    - key: manuDispatchEnable
+      value: 0-否;1-是
+    #车主性别
+    - key: userSex
+      value: 0-女;1-男;2-未知
+    #车位环境
+    - key: parkingCondition
+      value: 1-地上;2-地下
+    #电力来源
+    - key: powerType
+      value: 1-电力报装;2-物业电;3-家用电;4-其他
+    #电源点类型
+    - key: installPowerType
+      value: 1-电力报装;2-物业电;3-家用电;4-其他
+    #住宅类型
+    - key: houseType
+      value: 1-普通高层;2-商业两住;3-别墅;4-公司;5-厂房;6-自建房;7-其他
+    #车位类型
+    - key: parkingType
+      value: 1-自主产权;2-长期租赁;3-不固定;4-其他
+    #是否露天
+    - key: openAir
+      value: 0-否;1-是
+    #安装方式
+    - key: installType
+      value: 1-壁挂;2-立式;3-其他
+    #实际安装方式
+    - key: realInstallType
+      value: 1-壁挂;2-立式
+    #物业态度
+    - key: propertyAgree
+      value: 1-同意;2-不同意
+    #信号类型
+    - key: signalType
+      value: 1-移动;2-电信;3-联通
+    #费用是否超标
+    - key: overStandard
+      value: 0-未超标;1-超标
+    #电缆敷设方式
+    - key: cableInstallType
+      value: 1-PVC电工管;2-JDG镀锌管;3-电缆桥架;4-其他
+    #实际电敷设方式
+    - key: realCableInstallType
+      value: 1-PVC电工管;2-JDG镀锌管;3-电缆桥架;4-其他
+    #选用电缆规格
+    - key: cableType
+      value: 1-ZR-YJV-3*6mm²;2-ZR-YJV-3*10mm²;3-ZR-YJV-3*16mm²;4-ZR-YJV-5*6mm²
+    #实际电缆规格
+    - key: realCableType
+      value: 1-ZR-YJV-3*6mm²;2-ZR-YJV-3*10mm²;3-ZR-YJV-3*16mm²;4-ZR-YJV-5*6mm²
+    #勘测结论
+    - key: surveyResult
+      value: 1-同意安装;2-不同意安装;3-待定
+    #现场培训内容
+    - key: trainContent
+      value: 1-使用操作培训;2-故障排查及处理培训;3-维护保养培训待定;4-售后服务
+    #附件交付
+    - key: attachment
+      value: 1-电卡2张;2-出厂检测报告;3-三年质保卡;4-使用说明书;5-其它
+    #需要的资料准备
+    - key: prepareInfo
+      value: 1-关于在停车位安装电工汽车充电设备的申请;2-停车车位产权复印件;3-身份证正反面复印件;4-车位使用权证明书;5-无需资料准备
+    #评分项
+    - key: scoreItem
+      value: 1-安全;2-快速响应;3-质量;4-时效;5-库存管理;6-采购;7-其它
+    #考核部门
+    - key: appraisalDepartment
+      value: 1-区域PM;0-自动计算;2-售后;3-质量;4-质量PM;5-物控;6-采购
+    #墙盒线缆的安装长度
+    - key: installLength
+      value: 1-10米以下;2-10-20米;3-20-30米;4-30-40米;5-40米以上
+  #枚举类字符配置
+  enumStringConfig:
+    - key: isPickCar
+      value: 是;否;已支付定金
+  #时限配置,单位天
+  dueDate:
+    - key: 101
+      value: 1
+    - key: 103
+      value: 1
+    - key: 104
+      value: 1
+    - key: 106
+      value: 3
+    - key: 107
+      value: 2
+    - key: 108
+      value: 1
+    - key: 111
+      value: 3
+    - key: 112
+      value: 2
+    - key: 115
+      value: 12
+  #报告实体
+  reportEntry:
+    - key: 10
+      parentKey: 1
+      name: 勘测报告材料
+    - key: 101
+      parentKey: 10
+      name: 勘测报告
+      describe: CAMS 墙盒安装服务勘测报告
+    - key: 102
+      parentKey: 10
+      name: 放弃电力报装声明
+      describe: 放弃电力报装声明（非电力报装顾客提供）
+    - key: 11
+      parentKey: 1
+      name: 勘测照片
+    - key: 111
+      parentKey: 11
+      name: 取电点
+      describe: 取电点方位，火零地线、参数清晰
+    - key: 112
+      parentKey: 11
+      name: 安装车位环境照片
+      describe: 车位号，墙盒安装位置可见
+    - key: 113
+      parentKey: 11
+      name: 线路走向
+      describe: 标识清楚大体线路走向
+    - key: 114
+      parentKey: 11
+      name: 现场信号
+      describe: 现场信号测量截图(三次测量)
+    - key: 20
+      parentKey: 2
+      name: 安装验收单材料
+    - key: 201
+      parentKey: 20
+      name: 安装验收单
+      describe: CAMS 墙盒安装服务验收单
+    - key: 202
+      parentKey: 20
+      name: 安装服务收费报价单
+      describe: CAMS 墙盒安装服务收费报价单
+    - key: 21
+      parentKey: 2
+      name: 安装照片
+    - key: 211
+      parentKey: 21
+      name: 充电墙盒编号
+      describe: 拍摄完整，数字清晰
+    - key: 212
+      parentKey: 21
+      name: 控制单元标签
+      describe:
+    - key: 213
+      parentKey: 21
+      name: 绿灯图
+      describe: 充电桩亮灯状态，开关盒及安装位置可见
+    - key: 214
+      parentKey: 21
+      name: 充电模拟图测试
+      describe:
+    - key: 215
+      parentKey: 21
+      name: 人桩合照
+      describe: 充电桩亮灯状态
+    - key: 216
+      parentKey: 21
+      name: 安装完成车位照
+      describe: 充电桩亮灯状态，车位号可见
+    - key: 217
+      parentKey: 21
+      name: 保护开关
+      describe: 火零地接线、线号、有电危险标识、线缆标识牌、开关参数、开关盒整体和接地、进出线杯梳可见
+    - key: 218
+      parentKey: 21
+      name: 取电点
+      describe: 火零地接线、线号、有电危险标识、线缆标识牌、开关参数、出线杯梳可见
+    - key: 219
+      parentKey: 21
+      name: 电缆起点、终点米标
+      describe: 数字清晰，以保护开关和取电点为背景，断头断尾
+    - key: 220
+      parentKey: 21
+      name: 电缆标识
+      describe: 品牌、型号可见，背景为相应安装现场
+    - key: 221
+      parentKey: 21
+      name: 管材标识
+      describe: 品牌、型号可见，背景为相应安装现场
+    - key: 222
+      parentKey: 21
+      name: 经纬度截图
+      describe:
+    - key: 223
+      parentKey: 21
+      name: 线路走向
+      describe: 标识清楚大体线路走向
+    - key: 224
+      parentKey: 21
+      name: 车架号
+      describe:
+  #评分自动计算算法
+  scoreAlgorithm:
+    - key: 1
+      parentKey: 0
+      describe: 接单时效
+      target: ≤2小时
+      algorithm: 服务商有与客服首联动作时间-派单时间
+    - key: 2
+      parentKey: 0
+      describe: 返工单数
+      target: 0
+      algorithm: 有一单扣二分，扣完为止
+    - key: 3
+      parentKey: 0
+      describe: 勘测时效
+      target: ≤3日
+      algorithm: 勘测完成时间-预约勘测时间 （完成的订单)
+    - key: 4
+      parentKey: 0
+      describe: 勘测资料上传
+      target: ≤24小时
+      algorithm: 勘测资料上传时间-勘测完成时间
+    - key: 5
+      parentKey: 0
+      describe: 安装完成时效
+      target: ≤9日
+      algorithm: 安装完成时间-预约安装时间（完成的订单)
+    - key: 6
+      parentKey: 0
+      describe: 安装资料上传
+      target: ≤24小时
+      algorithm: 安装资料上传时间-安装完成时间
+    - key: 7
+      parentKey: 0
+      describe: 总体安装时效(无电力报装)
+      target: ≤10日
+      algorithm: 安装审核完成时间-派单时间 （完成的订单)（剔除受阻时间以及呆滞订单）
+    - key: 8
+      parentKey: 0
+      describe: 总体安装时效(有电力报装)
+      target: ≤20日
+      algorithm: 安装审核完成时间-派单时间（完成的订单)(剔除受阻时间以及呆滞订单）
+    - key: 9
+      parentKey: 0
+      describe: 累计安装完成率
+      target: ≥90%
+      algorithm: 累计完成安装的数量/累计派单总量（剔除关单订单）
+    - key: 10
+      parentKey: 0
+      describe: 当月安装率
+      target: ≥95%
+      algorithm: 当月安装审核通过/当月派单
+    - key: 11
+      parentKey: 0
+      describe: 扣分
+      target:
+      algorithm: 勘测，安装未在约定时间内到达约定地点签到订单，每一单扣10分扣完为止
+    - key: 20
+      parentKey: 3
+      describe: 加分
+      target:
+      algorithm: 按照施工处罚单中实际分数进行扣减
+    - key: 21
+      parentKey: 3
+      describe: 减分
+      target:
+      algorithm: 按照施工处罚单中实际分数进行扣减
+womc:
+  name: cams配置
+  #枚举类字符配置
+  enumStringConfig:
+    #故障时间
+    - key: faultTime
+      value: 使用中;安装时
+    #紧急程度
+    - key: emergencyLevel
+      value: 投诉;抱怨;正常
+    #是否
+    - key: yesOrNo
+      value: 是;否
+    #处理结果
+    - key: processResult
+      value: 已解决;未解决;需要技术支持
+    #客户意见
+    - key: customerOpinion
+      value: 非常满意;满意;一般;不满意;非常不满意
+    #安装位置
+    - key: installPosition
+      value: 地上;地下
+    #故障场景
+    - key: faultScene
+      value: 使用中;安装中
+    #费用类型
+    - key: expenseType
+      value: 上门拆装;上门检修
+    #对接人
+    - key: recipients
+      value: 何建波;孟元逊
+    #一级故障
+    - key: oneLevelFault
+      value: 充电枪问题;主板硬件问题;线路问题;急停故障;接地故障;电源点问题;墙盒断网;操作问题;车桩匹配问题;APP问题;充电卡问题;其他
+  #二级故障
+  twoLevelFault:
+    - oneLevelFault: 充电枪问题
+      twoLevelFault: 充电枪问题
+      faultSolutionWay: 后续补充完善
+    - oneLevelFault: 主板硬件问题
+      twoLevelFault: 主板硬件问题
+      faultSolutionWay: 后续补充完善
+    - oneLevelFault: 线路问题
+      twoLevelFault: 线路问题
+      faultSolutionWay: 后续补充完善
+    - oneLevelFault: 急停故障
+      twoLevelFault: 急停故障
+      faultSolutionWay: 后续补充完善
+    - oneLevelFault: 接地故障
+      twoLevelFault: 零线带电
+      faultSolutionWay: 后续补充完善
+    - oneLevelFault: 接地故障
+      twoLevelFault: 接地问题
+      faultSolutionWay: 后续补充完善
+    - oneLevelFault: 电源点问题
+      twoLevelFault: 电源点问题
+      faultSolutionWay: 后续补充完善
+    - oneLevelFault: 墙盒断网
+      twoLevelFault: 墙盒断网
+      faultSolutionWay: 后续补充完善
+    - oneLevelFault: 操作问题
+      twoLevelFault: 车机操作
+      faultSolutionWay: 后续补充完善
+    - oneLevelFault: 操作问题
+      twoLevelFault: APP操作
+      faultSolutionWay: 后续补充完善
+    - oneLevelFault: 操作问题
+      twoLevelFault: 充电桩操作
+      faultSolutionWay: 后续补充完善
+    - oneLevelFault: 操作问题
+      twoLevelFault: 其他
+      faultSolutionWay: 后续补充完善
+    - oneLevelFault: 车桩匹配问题
+      twoLevelFault: 车桩匹配问题
+      faultSolutionWay: 后续补充完善
+    - oneLevelFault: APP问题
+      twoLevelFault: APP问题
+      faultSolutionWay: 后续补充完善
+    - oneLevelFault: 充电卡问题
+      twoLevelFault: 充电卡问题
+      faultSolutionWay: 后续补充完善
+    - oneLevelFault: 其他
+      twoLevelFault: 咨询误报
+      faultSolutionWay: 后续补充完善
+    - oneLevelFault: 其他
+      twoLevelFault: 客户自行处理
+      faultSolutionWay: 后续补充完善
+    - oneLevelFault: 其他
+      twoLevelFault: 其他
+      faultSolutionWay: 后续补充完善
+  #故障类型
+faultTypeEntry:
+  - key: 1201
+    parentKey: 12
+    faultType: 充电枪问题
+    faultSolutionWay: 后续补充完善
+  - key: 1202
+    parentKey: 12
+    faultType: 主板硬件问题
+    faultSolutionWay: 后续补充完善
+  - key: 1203
+    parentKey: 12
+    faultType: 线路问题
+    faultSolutionWay: 后续补充完善
+  - key: 1204
+    parentKey: 12
+    faultType: 急停故障
+    faultSolutionWay: 后续补充完善
+  - key: 1205
+    parentKey: 12
+    faultType: 接地故障
+    faultSolutionWay: 后续补充完善
+  - key: 1206
+    parentKey: 12
+    faultType: 电源点问题
+    faultSolutionWay: 后续补充完善
+  - key: 1207
+    parentKey: 12
+    faultType: 墙盒断网
+    faultSolutionWay: 后续补充完善
+  - key: 1208
+    parentKey: 12
+    faultType: 操作问题
+    faultSolutionWay: 后续补充完善
+  - key: 1209
+    parentKey: 12
+    faultType: 车桩匹配问题
+    faultSolutionWay: 后续补充完善
+  - key: 1210
+    parentKey: 12
+    faultType: APP问题
+    faultSolutionWay: 后续补充完善
+  - key: 1211
+    parentKey: 12
+    faultType: 充电卡问题
+    faultSolutionWay: 后续补充完善
+  - key: 1212
+    parentKey: 12
+    faultType: 其他
+    faultSolutionWay: 后续补充完善
+#调用第三方接口相关配置
+oss:
+  endpoint: oss-cn-hangzhou.aliyuncs.com
+  accessKeyId: LTAI4G53jcWvinAGWUk1ZkXt
+  accessKeySecret: 8NXH4qbByfS60NVNYMMH6GplZAVuTA
+  bucketName: oss-cams
+# flowable配置
+flowable:
+  database-schema-update: true
+  #pg用户使用指定，mysql不用
+  #  database-schema: base_data
+  activity-font-name: "宋体"
+  label-font-name: "宋体"
+  annotation-font-name: "宋体"
+  async-executor-activate: false
--- a/config/application-test.yml
+++ b/config/application-test.yml
 datasource:
  def:
    driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://rm-bp1n0a3b0vegq27qjzm.mysql.rds.aliyuncs.com:3306/wios-nbd?useUnicode=true&characterEncoding=utf8
+    url: jdbc:mysql://111.229.205.39:3306/wios-test?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8
-    username: cams_warehouse
+    username: root
-    password: Dj3yVPttY
+    password: Xuri@2020!
    #type:
    filters: stat
    maxActive: 20
@@ -23,9 +23,9 @@ datasource:
    connectionProperties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
  extdb:
    driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://rm-bp1n0a3b0vegq27qjzm.mysql.rds.aliyuncs.com:3306/warehouse?useUnicode=true&characterEncoding=utf8
+    url: jdbc:mysql://111.229.205.39:3306/warehouse?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8
-    username: cams_warehouse
+    username: root
-    password: Dj3yVPttY
+    password: Xuri@2020!
    #type:
    filters: stat
    maxActive: 20
@@ -46,17 +46,19 @@ datasource:
 spring:
  redis:
-    timeout: 2000
+    host: 127.0.0.1
-    host: r-bp1chof5rigpzj6kcx.redis.rds.aliyuncs.com
    port: 6379
-    password: DVazx5wuv
+    password:
-    database: 0
+    database: 10
+    timeout: 2000
    lettuce:
      pool:
        max-active: 8
        max-wait: 1000
        max-idle: 100
        min-idle: 0
+  main:
+    allow-bean-definition-overriding: true
 jasypt.encryptor.password: 6dc19871-5299-4603-9b7a-2d7fa78defea
 swagger:
@@ -132,3 +134,457 @@ sap:
 flow:
  flowCode: CamsOrder
  flowSuperGroupId: 836764183768485111
+cams:
+  name: cams配置
+  #枚举类数值配置
+  enumNumberConfig:
+    #是否
+    - key: yesOrNo
+      value: 0-否;1-是
+    #是否需要立柱
+    - key: needErectPile
+      value: 0-否;1-是
+    #是否需要特殊施工
+    - key: needSpecialConstruction
+      value: 0-否;1-是
+    #是否为售车前预勘测
+    - key: surveyBeforeSaleEnable
+      value: 0-否;1-是
+    #是否独立车位
+    - key: hasIndependentParking
+      value: 0-否;1-是
+    #是否需要勘测
+    - key: isNeedSurvey
+      value: 0-否;1-是
+    #是否联系上客户
+    - key: isConnect
+      value: 0-否;1-是
+    #是否进行电力报装
+    - key: electricExpand
+      value: 0-否;1-是
+    #报装状态
+    - key: expandStatus
+      value: 1-通过;2-不通过
+    #报装不通过后订单后续操作
+    - key: expandFailOperate
+      value: 1-换其他用电类型继续安装;2-不安装了
+    #报装方式
+    - key: expandMethod
+      value: 1-代报装;2-自主报装
+    #安装紧急程度
+    - key: installEmergencyLevel
+      value: 1-一般;2-紧急
+    #物业态度
+    - key: propertyAgree
+      value: 0-不同意;1-同意
+    #安装位置
+    - key: installPosition
+      value: 1-室内;2-室外
+    #类型
+    - key: type
+      value: 1-普通订单;2-移桩订单
+    #是否需要人工派单
+    - key: manuDispatchEnable
+      value: 0-否;1-是
+    #车主性别
+    - key: userSex
+      value: 0-女;1-男;2-未知
+    #车位环境
+    - key: parkingCondition
+      value: 1-地上;2-地下
+    #电力来源
+    - key: powerType
+      value: 1-电力报装;2-物业电;3-家用电;4-其他
+    #电源点类型
+    - key: installPowerType
+      value: 1-电力报装;2-物业电;3-家用电;4-其他
+    #住宅类型
+    - key: houseType
+      value: 1-普通高层;2-商业两住;3-别墅;4-公司;5-厂房;6-自建房;7-其他
+    #车位类型
+    - key: parkingType
+      value: 1-自主产权;2-长期租赁;3-不固定;4-其他
+    #是否露天
+    - key: openAir
+      value: 0-否;1-是
+    #安装方式
+    - key: installType
+      value: 1-壁挂;2-立式;3-其他
+    #实际安装方式
+    - key: realInstallType
+      value: 1-壁挂;2-立式
+    #物业态度
+    - key: propertyAgree
+      value: 1-同意;2-不同意
+    #信号类型
+    - key: signalType
+      value: 1-移动;2-电信;3-联通
+    #费用是否超标
+    - key: overStandard
+      value: 0-未超标;1-超标
+    #电缆敷设方式
+    - key: cableInstallType
+      value: 1-PVC电工管;2-JDG镀锌管;3-电缆桥架;4-其他
+    #实际电敷设方式
+    - key: realCableInstallType
+      value: 1-PVC电工管;2-JDG镀锌管;3-电缆桥架;4-其他
+    #选用电缆规格
+    - key: cableType
+      value: 1-ZR-YJV-3*6mm²;2-ZR-YJV-3*10mm²;3-ZR-YJV-3*16mm²;4-ZR-YJV-5*6mm²
+    #实际电缆规格
+    - key: realCableType
+      value: 1-ZR-YJV-3*6mm²;2-ZR-YJV-3*10mm²;3-ZR-YJV-3*16mm²;4-ZR-YJV-5*6mm²
+    #勘测结论
+    - key: surveyResult
+      value: 1-同意安装;2-不同意安装;3-待定
+    #现场培训内容
+    - key: trainContent
+      value: 1-使用操作培训;2-故障排查及处理培训;3-维护保养培训待定;4-售后服务
+    #附件交付
+    - key: attachment
+      value: 1-电卡2张;2-出厂检测报告;3-三年质保卡;4-使用说明书;5-其它
+    #需要的资料准备
+    - key: prepareInfo
+      value: 1-关于在停车位安装电工汽车充电设备的申请;2-停车车位产权复印件;3-身份证正反面复印件;4-车位使用权证明书;5-无需资料准备
+    #评分项
+    - key: scoreItem
+      value: 1-安全;2-快速响应;3-质量;4-时效;5-库存管理;6-采购;7-其它
+    #考核部门
+    - key: appraisalDepartment
+      value: 1-区域PM;0-自动计算;2-售后;3-质量;4-质量PM;5-物控;6-采购
+    #墙盒线缆的安装长度
+    - key: installLength
+      value: 1-10米以下;2-10-20米;3-20-30米;4-30-40米;5-40米以上
+  #枚举类字符配置
+  enumStringConfig:
+    - key: isPickCar
+      value: 是;否;已支付定金
+  #时限配置,单位天
+  dueDate:
+    - key: 101
+      value: 1
+    - key: 103
+      value: 1
+    - key: 104
+      value: 1
+    - key: 106
+      value: 3
+    - key: 107
+      value: 2
+    - key: 108
+      value: 1
+    - key: 111
+      value: 3
+    - key: 112
+      value: 2
+    - key: 115
+      value: 12
+  #报告实体
+  reportEntry:
+    - key: 10
+      parentKey: 1
+      name: 勘测报告材料
+    - key: 101
+      parentKey: 10
+      name: 勘测报告
+      describe: CAMS 墙盒安装服务勘测报告
+    - key: 102
+      parentKey: 10
+      name: 放弃电力报装声明
+      describe: 放弃电力报装声明（非电力报装顾客提供）
+    - key: 11
+      parentKey: 1
+      name: 勘测照片
+    - key: 111
+      parentKey: 11
+      name: 取电点
+      describe: 取电点方位，火零地线、参数清晰
+    - key: 112
+      parentKey: 11
+      name: 安装车位环境照片
+      describe: 车位号，墙盒安装位置可见
+    - key: 113
+      parentKey: 11
+      name: 线路走向
+      describe: 标识清楚大体线路走向
+    - key: 114
+      parentKey: 11
+      name: 现场信号
+      describe: 现场信号测量截图(三次测量)
+    - key: 20
+      parentKey: 2
+      name: 安装验收单材料
+    - key: 201
+      parentKey: 20
+      name: 安装验收单
+      describe: CAMS 墙盒安装服务验收单
+    - key: 202
+      parentKey: 20
+      name: 安装服务收费报价单
+      describe: CAMS 墙盒安装服务收费报价单
+    - key: 21
+      parentKey: 2
+      name: 安装照片
+    - key: 211
+      parentKey: 21
+      name: 充电墙盒编号
+      describe: 拍摄完整，数字清晰
+    - key: 212
+      parentKey: 21
+      name: 控制单元标签
+      describe:
+    - key: 213
+      parentKey: 21
+      name: 绿灯图
+      describe: 充电桩亮灯状态，开关盒及安装位置可见
+    - key: 214
+      parentKey: 21
+      name: 充电模拟图测试
+      describe:
+    - key: 215
+      parentKey: 21
+      name: 人桩合照
+      describe: 充电桩亮灯状态
+    - key: 216
+      parentKey: 21
+      name: 安装完成车位照
+      describe: 充电桩亮灯状态，车位号可见
+    - key: 217
+      parentKey: 21
+      name: 保护开关
+      describe: 火零地接线、线号、有电危险标识、线缆标识牌、开关参数、开关盒整体和接地、进出线杯梳可见
+    - key: 218
+      parentKey: 21
+      name: 取电点
+      describe: 火零地接线、线号、有电危险标识、线缆标识牌、开关参数、出线杯梳可见
+    - key: 219
+      parentKey: 21
+      name: 电缆起点、终点米标
+      describe: 数字清晰，以保护开关和取电点为背景，断头断尾
+    - key: 220
+      parentKey: 21
+      name: 电缆标识
+      describe: 品牌、型号可见，背景为相应安装现场
+    - key: 221
+      parentKey: 21
+      name: 管材标识
+      describe: 品牌、型号可见，背景为相应安装现场
+    - key: 222
+      parentKey: 21
+      name: 经纬度截图
+      describe:
+    - key: 223
+      parentKey: 21
+      name: 线路走向
+      describe: 标识清楚大体线路走向
+    - key: 224
+      parentKey: 21
+      name: 车架号
+      describe:
+  #评分自动计算算法
+  scoreAlgorithm:
+    - key: 1
+      parentKey: 0
+      describe: 接单时效
+      target: ≤2小时
+      algorithm: 服务商有与客服首联动作时间-派单时间
+    - key: 2
+      parentKey: 0
+      describe: 返工单数
+      target: 0
+      algorithm: 有一单扣二分，扣完为止
+    - key: 3
+      parentKey: 0
+      describe: 勘测时效
+      target: ≤3日
+      algorithm: 勘测完成时间-预约勘测时间 （完成的订单)
+    - key: 4
+      parentKey: 0
+      describe: 勘测资料上传
+      target: ≤24小时
+      algorithm: 勘测资料上传时间-勘测完成时间
+    - key: 5
+      parentKey: 0
+      describe: 安装完成时效
+      target: ≤9日
+      algorithm: 安装完成时间-预约安装时间（完成的订单)
+    - key: 6
+      parentKey: 0
+      describe: 安装资料上传
+      target: ≤24小时
+      algorithm: 安装资料上传时间-安装完成时间
+    - key: 7
+      parentKey: 0
+      describe: 总体安装时效(无电力报装)
+      target: ≤10日
+      algorithm: 安装审核完成时间-派单时间 （完成的订单)（剔除受阻时间以及呆滞订单）
+    - key: 8
+      parentKey: 0
+      describe: 总体安装时效(有电力报装)
+      target: ≤20日
+      algorithm: 安装审核完成时间-派单时间（完成的订单)(剔除受阻时间以及呆滞订单）
+    - key: 9
+      parentKey: 0
+      describe: 累计安装完成率
+      target: ≥90%
+      algorithm: 累计完成安装的数量/累计派单总量（剔除关单订单）
+    - key: 10
+      parentKey: 0
+      describe: 当月安装率
+      target: ≥95%
+      algorithm: 当月安装审核通过/当月派单
+    - key: 11
+      parentKey: 0
+      describe: 扣分
+      target:
+      algorithm: 勘测，安装未在约定时间内到达约定地点签到订单，每一单扣10分扣完为止
+    - key: 20
+      parentKey: 3
+      describe: 加分
+      target:
+      algorithm: 按照施工处罚单中实际分数进行扣减
+    - key: 21
+      parentKey: 3
+      describe: 减分
+      target:
+      algorithm: 按照施工处罚单中实际分数进行扣减
+womc:
+  name: cams配置
+  #枚举类字符配置
+  enumStringConfig:
+    #故障时间
+    - key: faultTime
+      value: 使用中;安装时
+    #紧急程度
+    - key: emergencyLevel
+      value: 投诉;抱怨;正常
+    #是否
+    - key: yesOrNo
+      value: 是;否
+    #处理结果
+    - key: processResult
+      value: 已解决;未解决;需要技术支持
+    #客户意见
+    - key: customerOpinion
+      value: 非常满意;满意;一般;不满意;非常不满意
+    #安装位置
+    - key: installPosition
+      value: 地上;地下
+    #故障场景
+    - key: faultScene
+      value: 使用中;安装中
+    #费用类型
+    - key: expenseType
+      value: 上门拆装;上门检修
+    #对接人
+    - key: recipients
+      value: 何建波;孟元逊
+    #一级故障
+    - key: oneLevelFault
+      value: 充电枪问题;主板硬件问题;线路问题;急停故障;接地故障;电源点问题;墙盒断网;操作问题;车桩匹配问题;APP问题;充电卡问题;其他
+  #二级故障
+  twoLevelFault:
+    - oneLevelFault: 充电枪问题
+      twoLevelFault: 充电枪问题
+      faultSolutionWay: 后续补充完善
+    - oneLevelFault: 主板硬件问题
+      twoLevelFault: 主板硬件问题
+      faultSolutionWay: 后续补充完善
+    - oneLevelFault: 线路问题
+      twoLevelFault: 线路问题
+      faultSolutionWay: 后续补充完善
+    - oneLevelFault: 急停故障
+      twoLevelFault: 急停故障
+      faultSolutionWay: 后续补充完善
+    - oneLevelFault: 接地故障
+      twoLevelFault: 零线带电
+      faultSolutionWay: 后续补充完善
+    - oneLevelFault: 接地故障
+      twoLevelFault: 接地问题
+      faultSolutionWay: 后续补充完善
+    - oneLevelFault: 电源点问题
+      twoLevelFault: 电源点问题
+      faultSolutionWay: 后续补充完善
+    - oneLevelFault: 墙盒断网
+      twoLevelFault: 墙盒断网
+      faultSolutionWay: 后续补充完善
+    - oneLevelFault: 操作问题
+      twoLevelFault: 车机操作
+      faultSolutionWay: 后续补充完善
+    - oneLevelFault: 操作问题
+      twoLevelFault: APP操作
+      faultSolutionWay: 后续补充完善
+    - oneLevelFault: 操作问题
+      twoLevelFault: 充电桩操作
+      faultSolutionWay: 后续补充完善
+    - oneLevelFault: 操作问题
+      twoLevelFault: 其他
+      faultSolutionWay: 后续补充完善
+    - oneLevelFault: 车桩匹配问题
+      twoLevelFault: 车桩匹配问题
+      faultSolutionWay: 后续补充完善
+    - oneLevelFault: APP问题
+      twoLevelFault: APP问题
+      faultSolutionWay: 后续补充完善
+    - oneLevelFault: 充电卡问题
+      twoLevelFault: 充电卡问题
+      faultSolutionWay: 后续补充完善
+    - oneLevelFault: 其他
+      twoLevelFault: 咨询误报
+      faultSolutionWay: 后续补充完善
+    - oneLevelFault: 其他
+      twoLevelFault: 客户自行处理
+      faultSolutionWay: 后续补充完善
+    - oneLevelFault: 其他
+      twoLevelFault: 其他
+      faultSolutionWay: 后续补充完善
+  #故障类型
+faultTypeEntry:
+  - key: 1201
+    parentKey: 12
+    faultType: 充电枪问题
+    faultSolutionWay: 后续补充完善
+  - key: 1202
+    parentKey: 12
+    faultType: 主板硬件问题
+    faultSolutionWay: 后续补充完善
+  - key: 1203
+    parentKey: 12
+    faultType: 线路问题
+    faultSolutionWay: 后续补充完善
+  - key: 1204
+    parentKey: 12
+    faultType: 急停故障
+    faultSolutionWay: 后续补充完善
+  - key: 1205
+    parentKey: 12
+    faultType: 接地故障
+    faultSolutionWay: 后续补充完善
+  - key: 1206
+    parentKey: 12
+    faultType: 电源点问题
+    faultSolutionWay: 后续补充完善
+  - key: 1207
+    parentKey: 12
+    faultType: 墙盒断网
+    faultSolutionWay: 后续补充完善
+  - key: 1208
+    parentKey: 12
+    faultType: 操作问题
+    faultSolutionWay: 后续补充完善
+  - key: 1209
+    parentKey: 12
+    faultType: 车桩匹配问题
+    faultSolutionWay: 后续补充完善
+  - key: 1210
+    parentKey: 12
+    faultType: APP问题
+    faultSolutionWay: 后续补充完善
+  - key: 1211
+    parentKey: 12
+    faultType: 充电卡问题
+    faultSolutionWay: 后续补充完善
+  - key: 1212
+    parentKey: 12
+    faultType: 其他
+    faultSolutionWay: 后续补充完善
--- a/pom.xml
+++ b/pom.xml
@@ -37,11 +37,11 @@
            <version>4.5.13</version>
        </dependency>
-        <dependency>
+<!--        <dependency>-->
-            <groupId>com.starcharge</groupId>
+<!--            <groupId>com.starcharge</groupId>-->
-            <artifactId>scit-api</artifactId>
+<!--            <artifactId>scit-api</artifactId>-->
-            <version>2.2.0</version>
+<!--            <version>2.2.0</version>-->
-        </dependency>
+<!--        </dependency>-->
        <dependency>
@@ -55,7 +55,11 @@
            <artifactId>aliyun-java-sdk-core</artifactId>
            <version>4.4.4</version>
        </dependency>
+        <dependency>
+            <groupId>com.ihidea</groupId>
+            <artifactId>frame.core</artifactId>
+            <version>2.2.2.20201022.082934-1</version>
+        </dependency>
        <dependency>
            <groupId>com.aliyun</groupId>
            <artifactId>aliyun-java-sdk-dysmsapi</artifactId>
@@ -107,11 +111,11 @@
            <version>3.4.1</version>
        </dependency>
-        <dependency>
+<!--        <dependency>-->
-            <groupId>com.aspose</groupId>
+<!--            <groupId>com.aspose</groupId>-->
-            <artifactId>aspose-words</artifactId>
+<!--            <artifactId>aspose-words</artifactId>-->
-            <version>15.8.0</version>
+<!--            <version>15.8.0</version>-->
-        </dependency>
+<!--        </dependency>-->
    </dependencies>

--- a/src/main/java/com/boco/nbd/wios/flow/service/impl/OrderServiceImpl.java
+++ b/src/main/java/com/boco/nbd/wios/flow/service/impl/OrderServiceImpl.java
@@ -1581,7 +1581,7 @@ public class OrderServiceImpl extends BaseDaoService3<OrderPO, FlowOrderMapper> 
                indexOne++;
            }
            blockPairBo.setExperiences(data);
-            pdfUtil.getWord(path, blockPairBo, fileName, response);
+          //  pdfUtil.getWord(path, blockPairBo, fileName, response);
        } catch (Exception e) {
            e.printStackTrace();
        }

--- a/src/main/java/com/boco/nbd/wios/flow/util/PdfUtil.java
+++ b/src/main/java/com/boco/nbd/wios/flow/util/PdfUtil.java
@@ -3,7 +3,7 @@ package com.boco.nbd.wios.flow.util;
 import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.date.DateUtil;
-import com.aspose.words.*;
+//import com.aspose.words.*;
 import com.boco.nbd.cams.core.constant.CamsConstant;
 import com.boco.nbd.wios.flow.entity.pdf.BlockPairBo;
 import com.boco.nbd.wios.flow.entity.pdf.SurveyDataBo;
@@ -40,20 +40,20 @@ public class PdfUtil {
        judgment = 0;
    }
-    private static boolean getLicense() {
+//    private static boolean getLicense() {
-        boolean result = false;
+//        boolean result = false;
+//
-        try {
+//        try {
-            InputStream is = PdfUtil.class.getClassLoader().getResourceAsStream("License.xml");
+//            InputStream is = PdfUtil.class.getClassLoader().getResourceAsStream("License.xml");
-            License aposeLic = new License();
+//            License aposeLic = new License();
-            aposeLic.setLicense(is);
+//            aposeLic.setLicense(is);
-            result = true;
+//            result = true;
-        } catch (Exception var3) {
+//        } catch (Exception var3) {
-            var3.printStackTrace();
+//            var3.printStackTrace();
-        }
+//        }
+//
-        return result;
+//        return result;
-    }
+//    }
    /**
     * 根据模板生成word
@@ -61,59 +61,59 @@ public class PdfUtil {
     * @param path     模板的路径
     * @param fileName 生成word文件的文件名
     */
-    public void getWord(String path, BlockPairBo blockPairBo, String fileName, HttpServletResponse response) throws Exception {
+//    public void getWord(String path, BlockPairBo blockPairBo, String fileName, HttpServletResponse response) throws Exception {
-        ClassPathResource resource = new ClassPathResource(path);
+//        ClassPathResource resource = new ClassPathResource(path);
-        InputStream is = resource.getInputStream();
+//        InputStream is = resource.getInputStream();
-        String saveRoute = path.substring(0, path.lastIndexOf("/"));
+//        String saveRoute = path.substring(0, path.lastIndexOf("/"));
-        XWPFTemplate xwpfTemplate = XWPFTemplate.compile(is);
+//        XWPFTemplate xwpfTemplate = XWPFTemplate.compile(is);
-        ByteArrayOutputStream output = new ByteArrayOutputStream();
+//        ByteArrayOutputStream output = new ByteArrayOutputStream();
-        if (judgment == 0) {
+//        if (judgment == 0) {
-            fileName = java.net.URLDecoder.decode(fileName, CamsConstant.UTF_8);
+//            fileName = java.net.URLDecoder.decode(fileName, CamsConstant.UTF_8);
-            xwpfTemplate.render(blockPairBo).write(output);
+//            xwpfTemplate.render(blockPairBo).write(output);
-            String pdf = fileName.substring(0, fileName.lastIndexOf(".")) + DateUtil.format(new Date(), DatePattern.PURE_DATETIME_PATTERN) + ".pdf";
+//            String pdf = fileName.substring(0, fileName.lastIndexOf(".")) + DateUtil.format(new Date(), DatePattern.PURE_DATETIME_PATTERN) + ".pdf";
-            ByteArrayInputStream input = new ByteArrayInputStream(output.toByteArray());
+//            ByteArrayInputStream input = new ByteArrayInputStream(output.toByteArray());
-            doc2pdf(input, saveRoute + "/" + pdf);
+//            doc2pdf(input, saveRoute + "/" + pdf);
-            File file = new File(saveRoute + "/" + pdf);
+//            File file = new File(saveRoute + "/" + pdf);
-            //判断文件大小，并压缩
+//            //判断文件大小，并压缩
-            if (file.length() > WiosConstant.FILE_SIZE) {
+//            if (file.length() > WiosConstant.FILE_SIZE) {
-                file.delete();
+//                file.delete();
-                for (SurveyDataBo bo : blockPairBo.getExperiences()) {
+//                for (SurveyDataBo bo : blockPairBo.getExperiences()) {
-                    compressPictures(bo);
+//                    compressPictures(bo);
-                }
+//                }
-                getWord(path, blockPairBo, fileName, response);
+//                getWord(path, blockPairBo, fileName, response);
-                return;
+//                return;
-            }
+//            }
-            try {
+//            try {
-                log.info("========================{}下载开始========================", pdf);
+//                log.info("========================{}下载开始========================", pdf);
-                is = new BufferedInputStream(new FileInputStream(saveRoute + "/" + pdf));
+//                is = new BufferedInputStream(new FileInputStream(saveRoute + "/" + pdf));
-                byte[] buffer = new byte[is.available()];
+//                byte[] buffer = new byte[is.available()];
-                is.read(buffer);
+//                is.read(buffer);
-                response.reset();
+//                response.reset();
-                // 设置response的Header
+//                // 设置response的Header
-                response.addHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode(file.getName(), CamsConstant.UTF_8));
+//                response.addHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode(file.getName(), CamsConstant.UTF_8));
-                response.addHeader("Content-Length", "" + file.length());
+//                response.addHeader("Content-Length", "" + file.length());
-                response.setContentType("application/octet-stream");
+//                response.setContentType("application/octet-stream");
-                response.setCharacterEncoding("utf-8");
+//                response.setCharacterEncoding("utf-8");
-                OutputStream os = new BufferedOutputStream(response.getOutputStream());
+//                OutputStream os = new BufferedOutputStream(response.getOutputStream());
-                os.write(buffer);
+//                os.write(buffer);
-                os.flush();
+//                os.flush();
-                log.info("========================{}下载结束========================", pdf);
+//                log.info("========================{}下载结束========================", pdf);
-                //删除缓存文件
+//                //删除缓存文件
-                file.delete();
+//                file.delete();
-            } catch (IOException ex) {
+//            } catch (IOException ex) {
-                log.error(pdf + "下载异常:", ex);
+//                log.error(pdf + "下载异常:", ex);
-                ex.printStackTrace();
+//                ex.printStackTrace();
-            }
+//            }
-        } else {
+//        } else {
-            fileName = java.net.URLDecoder.decode(fileName, CamsConstant.UTF_8);
+//            fileName = java.net.URLDecoder.decode(fileName, CamsConstant.UTF_8);
-            output = new ByteArrayOutputStream();
+//            output = new ByteArrayOutputStream();
-            response.setHeader("Content-Disposition", "attachment; filename=" + fileName);
+//            response.setHeader("Content-Disposition", "attachment; filename=" + fileName);
-            xwpfTemplate.write(output);
+//            xwpfTemplate.write(output);
-            judgment = 0;
+//            judgment = 0;
-        }
+//        }
-        this.close(output);
+//        this.close(output);
-        this.close(is);
+//        this.close(is);
-    }
+//    }
    /**
     * 关闭输入流
@@ -169,49 +169,49 @@ public class PdfUtil {
     * @param wordPath word 的路径 word 的路径
     * @param pdfPath  pdf 的路径
     */
-    public static void doc2pdf(String wordPath, String pdfPath) {
+//    public static void doc2pdf(String wordPath, String pdfPath) {
-        if (getLicense()) {
+//        if (getLicense()) {
-            try {
+//            try {
-                long old = System.currentTimeMillis();
+//                long old = System.currentTimeMillis();
-                File file = new File(pdfPath);
+//                File file = new File(pdfPath);
-                FileOutputStream os = new FileOutputStream(file);
+//                FileOutputStream os = new FileOutputStream(file);
-                Document doc = new Document(wordPath);
+//                Document doc = new Document(wordPath);
+//
-                doc.save(os, 40);
+//                doc.save(os, 40);
-                long now = System.currentTimeMillis();
+//                long now = System.currentTimeMillis();
-                os.close();
+//                os.close();
-                log.info("共耗时：" + (double) (now - old) / 1000.0D + "秒");
+//                log.info("共耗时：" + (double) (now - old) / 1000.0D + "秒");
-            } catch (Exception var9) {
+//            } catch (Exception var9) {
-                var9.printStackTrace();
+//                var9.printStackTrace();
-            }
+//            }
+//
-        }
+//        }
-    }
+//    }
-    public static void doc2pdf(InputStream is, String pdfPath) {
+//    public static void doc2pdf(InputStream is, String pdfPath) {
-        if (getLicense()) {
+//        if (getLicense()) {
-            try {
+//            try {
-                long old = System.currentTimeMillis();
+//                long old = System.currentTimeMillis();
-                File file = new File(pdfPath);
+//                File file = new File(pdfPath);
-                if (!file.getParentFile().exists()) {
+//                if (!file.getParentFile().exists()) {
-                    file.getParentFile().mkdirs();
+//                    file.getParentFile().mkdirs();
-                }
+//                }
-                FileOutputStream os = new FileOutputStream(pdfPath);
+//                FileOutputStream os = new FileOutputStream(pdfPath);
-                Document doc = new Document(is);
+//                Document doc = new Document(is);
-                PdfSaveOptions options = new PdfSaveOptions();
+//                PdfSaveOptions options = new PdfSaveOptions();
-                // 文字和图像压缩
+//                // 文字和图像压缩
-                options.setExportDocumentStructure(true);
+//                options.setExportDocumentStructure(true);
-                options.setTextCompression(PdfTextCompression.FLATE);
+//                options.setTextCompression(PdfTextCompression.FLATE);
-                options.setImageCompression(PdfImageCompression.AUTO);
+//                options.setImageCompression(PdfImageCompression.AUTO);
-                // 接收修订
+//                // 接收修订
-                doc.acceptAllRevisions();
+//                doc.acceptAllRevisions();
-                doc.save(os, options);
+//                doc.save(os, options);
-                long now = System.currentTimeMillis();
+//                long now = System.currentTimeMillis();
-                os.close();
+//                os.close();
-                log.info("共耗时：" + (double) (now - old) / 1000.0D + "秒");
+//                log.info("共耗时：" + (double) (now - old) / 1000.0D + "秒");
-            } catch (Exception var9) {
+//            } catch (Exception var9) {
-                var9.printStackTrace();
+//                var9.printStackTrace();
-            }
+//            }
-        }
+//        }
-    }
+//    }
 }
--- a/src/main/java/com/boco/nbd/wios/flow/util/ProcessUtil.java
+++ b/src/main/java/com/boco/nbd/wios/flow/util/ProcessUtil.java
@@ -50,7 +50,6 @@ import com.ihidea.core.support.exception.ServiceException;
 import com.ihidea.core.support.session.SessionInfo;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.poi.sl.usermodel.PictureData;
-import org.jacoco.agent.rt.internal_1f1cc91.core.data.SessionInfo;
 import org.springframework.util.StringUtils;
 import java.lang.reflect.Field;

--- a/src/main/java/com/boco/nbd/wios/manage/entity/bo/Dictionary.java
+++ b/src/main/java/com/boco/nbd/wios/manage/entity/bo/Dictionary.java
@@ -2,6 +2,7 @@ package com.boco.nbd.wios.manage.entity.bo;
 import cn.hutool.core.lang.TypeReference;
 import cn.hutool.json.JSONUtil;
+import com.ihidea.core.support.exception.ServiceException;
 import lombok.Data;
 import org.springframework.util.StringUtils;

--- a/src/main/java/com/boco/nbd/wios/manage/entity/bo/OrderBo.java
+++ b/src/main/java/com/boco/nbd/wios/manage/entity/bo/OrderBo.java
 package com.boco.nbd.wios.manage.entity.bo;
+import com.ihidea.core.support.exception.ServiceException;
 import io.swagger.annotations.ApiModelProperty;
 import org.springframework.util.StringUtils;

--- a/src/main/java/com/boco/nbd/wios/manage/entity/bo/SupplierContractItem.java
+++ b/src/main/java/com/boco/nbd/wios/manage/entity/bo/SupplierContractItem.java
@@ -2,6 +2,7 @@ package com.boco.nbd.wios.manage.entity.bo;
 import cn.hutool.core.lang.TypeReference;
 import cn.hutool.json.JSONUtil;
+import com.ihidea.core.support.exception.ServiceException;
 import lombok.Data;
 import org.springframework.util.StringUtils;

--- a/src/main/java/com/boco/nbd/wios/manage/entity/bo/SupplierContractPackPrice.java
+++ b/src/main/java/com/boco/nbd/wios/manage/entity/bo/SupplierContractPackPrice.java
@@ -2,6 +2,7 @@ package com.boco.nbd.wios.manage.entity.bo;
 import cn.hutool.core.lang.TypeReference;
 import cn.hutool.json.JSONUtil;
+import com.ihidea.core.support.exception.ServiceException;
 import lombok.Data;
 import org.springframework.util.StringUtils;

--- a/src/main/java/com/boco/nbd/wios/manage/entity/bo/SupplierContractPrice.java
+++ b/src/main/java/com/boco/nbd/wios/manage/entity/bo/SupplierContractPrice.java
@@ -2,6 +2,7 @@ package com.boco.nbd.wios.manage.entity.bo;
 import cn.hutool.core.lang.TypeReference;
 import cn.hutool.json.JSONUtil;
+import com.ihidea.core.support.exception.ServiceException;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.springframework.util.StringUtils;

--- a/src/main/java/com/boco/nbd/wios/manage/entity/common/bo/UploadFile.java
+++ b/src/main/java/com/boco/nbd/wios/manage/entity/common/bo/UploadFile.java
@@ -8,6 +8,8 @@ import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.ihidea.core.support.exception.ServiceException;
+import com.ihidea.core.util.StringUtilsEx;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.springframework.util.StringUtils;

--- a/src/main/java/com/boco/nbd/wios/manage/mapper/def/AccountRoleMapper.java
+++ b/src/main/java/com/boco/nbd/wios/manage/mapper/def/AccountRoleMapper.java
@@ -3,6 +3,7 @@ package com.boco.nbd.wios.manage.mapper.def;
 import com.boco.nbd.wios.manage.entity.bo.AccountRole;
 import com.boco.nbd.wios.manage.entity.bo.AccountRoleCriteria;
+import com.ihidea.core.base.CoreDao;
 import org.apache.ibatis.annotations.Param;
 import java.util.List;

--- a/src/main/java/com/boco/nbd/wios/manage/mapper/def/OemContractDao.java
+++ b/src/main/java/com/boco/nbd/wios/manage/mapper/def/OemContractDao.java
@@ -5,6 +5,8 @@ import com.boco.nbd.wios.manage.entity.bo.OemContract;
 import com.boco.nbd.wios.manage.entity.bo.OemContractBo2;
 import com.boco.nbd.wios.manage.entity.bo.OemContractVo;
 import com.boco.nbd.wios.manage.entity.cams.enums.ContractStatus;
+import com.ihidea.core.support.exception.ServiceException;
+import com.ihidea.core.support.session.SessionInfo;
 import org.springframework.stereotype.Repository;
 import javax.annotation.Resource;

--- a/src/main/java/com/boco/nbd/wios/manage/mapper/def/OemDao.java
+++ b/src/main/java/com/boco/nbd/wios/manage/mapper/def/OemDao.java
@@ -4,6 +4,7 @@ import com.boco.nbd.wios.flow.util.ProcessUtil;
 import com.boco.nbd.wios.manage.entity.bo.Oem;
 import com.boco.nbd.wios.manage.entity.bo.OemBo;
 import com.boco.nbd.wios.manage.entity.bo.OemVo;
+import com.ihidea.core.support.session.SessionInfo;
 import org.springframework.stereotype.Repository;
 import javax.annotation.Resource;

--- a/src/main/java/com/boco/nbd/wios/manage/mapper/def/OperateLogDao.java
+++ b/src/main/java/com/boco/nbd/wios/manage/mapper/def/OperateLogDao.java
@@ -7,6 +7,7 @@ import com.boco.nbd.wios.manage.entity.bo.OperateLog;
 import com.boco.nbd.wios.manage.entity.bo.OperateLogBo;
 import com.boco.nbd.wios.manage.entity.cams.enums.OperateLogType;
 import com.boco.nbd.wios.manage.entity.cams.enums.OrderStatus;
+import com.ihidea.core.support.session.SessionInfo;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Repository;

--- a/src/main/java/com/boco/nbd/wios/manage/mapper/def/OrderDao.java
+++ b/src/main/java/com/boco/nbd/wios/manage/mapper/def/OrderDao.java
@@ -10,6 +10,9 @@ import com.boco.nbd.wios.flow.util.ProcessUtil;
 import com.boco.nbd.wios.manage.entity.bo.*;
 import com.boco.nbd.wios.manage.entity.cams.enums.OrderStatus;
 import com.boco.nbd.wios.manage.entity.settlement.po.Invoice;
+import com.ihidea.core.support.pageLimit.PageLimit;
+import com.ihidea.core.support.pageLimit.PageLimitHolderFilter;
+import com.ihidea.core.support.session.SessionInfo;
 import org.springframework.stereotype.Repository;
 import org.springframework.util.StringUtils;

--- a/src/main/java/com/boco/nbd/wios/manage/mapper/def/RegionDao.java
+++ b/src/main/java/com/boco/nbd/wios/manage/mapper/def/RegionDao.java
@@ -2,6 +2,7 @@ package com.boco.nbd.wios.manage.mapper.def;
 import com.boco.nbd.cams.core.constant.CamsConstant;
 import com.boco.nbd.wios.manage.entity.bo.Region;
+import com.ihidea.core.support.exception.ServiceException;
 import org.springframework.stereotype.Repository;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;

--- a/src/main/java/com/boco/nbd/wios/manage/mapper/def/ScoreSupplierDao.java
+++ b/src/main/java/com/boco/nbd/wios/manage/mapper/def/ScoreSupplierDao.java
@@ -5,6 +5,7 @@ import com.boco.nbd.wios.manage.entity.bo.ScoreSupplier;
 import com.boco.nbd.wios.manage.entity.bo.ScoreSupplierDTO;
 import com.boco.nbd.wios.manage.entity.cams.enums.ScoreStatus;
 import com.boco.nbd.wios.manage.service.impl.TokenService;
+import com.ihidea.core.support.session.SessionInfo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Repository;

--- a/src/main/java/com/boco/nbd/wios/manage/mapper/def/SupplierContractDao.java
+++ b/src/main/java/com/boco/nbd/wios/manage/mapper/def/SupplierContractDao.java
@@ -6,6 +6,8 @@ import com.boco.nbd.wios.manage.entity.bo.SupplierContract;
 import com.boco.nbd.wios.manage.entity.bo.SupplierContractBo;
 import com.boco.nbd.wios.manage.entity.bo.SupplierContractVo;
 import com.boco.nbd.wios.manage.entity.cams.enums.ContractStatus;
+import com.ihidea.core.support.exception.ServiceException;
+import com.ihidea.core.support.session.SessionInfo;
 import org.springframework.stereotype.Repository;
 import javax.annotation.Resource;

--- a/src/main/java/com/boco/nbd/wios/manage/mapper/def/SystemInfoDao.java
+++ b/src/main/java/com/boco/nbd/wios/manage/mapper/def/SystemInfoDao.java
@@ -2,6 +2,7 @@ package com.boco.nbd.wios.manage.mapper.def;
 import com.boco.nbd.wios.flow.util.ProcessUtil;
 import com.boco.nbd.wios.manage.entity.bo.SystemInfo;
+import com.ihidea.core.support.session.SessionInfo;
 import org.springframework.stereotype.Repository;
 import javax.annotation.Resource;

--- a/src/main/java/com/boco/nbd/wios/manage/mapper/def/UploadFileDao.java
+++ b/src/main/java/com/boco/nbd/wios/manage/mapper/def/UploadFileDao.java
@@ -7,6 +7,7 @@ import com.boco.nbd.wios.flow.util.ProcessUtil;
 import com.boco.nbd.wios.manage.entity.cams.enums.UploadFileType;
 import com.boco.nbd.wios.manage.entity.common.bo.UploadFile;
 import com.boco.nbd.wios.manage.util.CommonUtils;
+import com.ihidea.core.support.session.SessionInfo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Repository;

--- a/src/main/java/com/boco/nbd/wios/manage/service/impl/AccountService.java
+++ b/src/main/java/com/boco/nbd/wios/manage/service/impl/AccountService.java
@@ -15,9 +15,14 @@ import com.boco.nbd.wios.manage.util.NumberUtil;
 import com.boco.nbd.wios.manage.util.SpringContextUtil;
 import com.boco.nbd.wios.wx.utils.WeChatDecryptUtils;
 import com.boco.nbd.wios.wx.utils.WeChatSessionKeyUtils;
+import com.ihidea.component.api.json.MJSONResultEntity;
+import com.ihidea.core.support.exception.ServiceException;
+import com.ihidea.core.support.orm.mybatis3.util.IbatisServiceUtils;
+import com.ihidea.core.support.pageLimit.PageLimit;
+import com.ihidea.core.support.pageLimit.PageLimitHolderFilter;
+import com.ihidea.core.support.session.SessionInfo;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.jacoco.agent.rt.internal_1f1cc91.core.data.SessionInfo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;

--- a/src/main/java/com/boco/nbd/wios/manage/service/impl/CamsAccountService.java
+++ b/src/main/java/com/boco/nbd/wios/manage/service/impl/CamsAccountService.java
@@ -5,6 +5,7 @@ import com.boco.nbd.wios.manage.contants.WiosConstant;
 import com.boco.nbd.wios.manage.entity.bo.*;
 import com.boco.nbd.wios.manage.entity.cams.enums.AlarmType;
 import com.boco.nbd.wios.manage.mapper.def.*;
+import com.ihidea.core.support.exception.ServiceException;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;

--- a/src/main/java/com/boco/nbd/wios/manage/service/impl/DictionaryService.java
+++ b/src/main/java/com/boco/nbd/wios/manage/service/impl/DictionaryService.java
@@ -2,6 +2,7 @@ package com.boco.nbd.wios.manage.service.impl;
 import com.boco.nbd.wios.manage.entity.bo.Dictionary;
 import com.boco.nbd.wios.manage.mapper.def.DictionaryDao;
+import com.ihidea.core.support.exception.ServiceException;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;

--- a/src/main/java/com/boco/nbd/wios/manage/service/impl/OrderScoreService.java
+++ b/src/main/java/com/boco/nbd/wios/manage/service/impl/OrderScoreService.java
@@ -9,6 +9,8 @@ import com.boco.nbd.wios.manage.mapper.def.OperateLogDao;
 import com.boco.nbd.wios.manage.mapper.def.OrderDao;
 import com.boco.nbd.wios.manage.mapper.def.OrderScoreDao;
+import com.ihidea.core.support.exception.ServiceException;
+import com.ihidea.core.support.session.SessionInfo;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

--- a/src/main/java/com/boco/nbd/wios/manage/service/impl/OrderService.java
+++ b/src/main/java/com/boco/nbd/wios/manage/service/impl/OrderService.java
@@ -34,6 +34,13 @@ import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.ihidea.component.api.v2.BaseResponse;
+import com.ihidea.component.cache.redis.RedisClient;
+import com.ihidea.core.support.pageLimit.PageLimit;
+import com.ihidea.core.support.pageLimit.PageLimitHolderFilter;
+import com.ihidea.core.support.session.SessionInfo;
+import com.ihidea.core.util.JSONUtilsEx;
+import com.ihidea.core.util.StringUtilsEx;
 import org.redisson.api.RLock;
 import org.redisson.api.RedissonClient;
 import org.slf4j.Logger;

--- a/src/main/java/com/boco/nbd/wios/manage/service/impl/PushService.java
+++ b/src/main/java/com/boco/nbd/wios/manage/service/impl/PushService.java
@@ -2,6 +2,8 @@ package com.boco.nbd.wios.manage.service.impl;
 import com.boco.nbd.wios.manage.call.PushApi;
 import com.boco.nbd.wios.manage.entity.bo.OrderVo;
+import com.ihidea.core.support.exception.ServiceException;
+import com.ihidea.core.util.JSONUtilsEx;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;

--- a/src/main/java/com/boco/nbd/wios/manage/service/impl/SecretPhoneService.java
+++ b/src/main/java/com/boco/nbd/wios/manage/service/impl/SecretPhoneService.java
@@ -6,6 +6,7 @@ import com.boco.nbd.wios.flow.entity.SecretPhone;
 import com.boco.nbd.wios.flow.util.PhoneNumProtectionUtil;
 import com.boco.nbd.wios.manage.contants.WiosConstant;
 import com.boco.nbd.wios.manage.mapper.def.SecretPhoneDao;
+import com.ihidea.core.support.exception.ServiceException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;

--- a/src/main/java/com/boco/nbd/wios/manage/service/impl/TokenService.java
+++ b/src/main/java/com/boco/nbd/wios/manage/service/impl/TokenService.java
@@ -7,7 +7,6 @@ import com.ihidea.core.support.servlet.ServletHolderFilter;
 import com.ihidea.core.support.session.SessionInfo;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
-import org.jacoco.agent.rt.internal_1f1cc91.core.data.SessionInfo;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;

--- a/src/main/java/com/boco/nbd/wios/manage/service/impl/WarehouseService.java
+++ b/src/main/java/com/boco/nbd/wios/manage/service/impl/WarehouseService.java
@@ -15,6 +15,14 @@ import com.boco.nbd.wios.manage.mapper.extdb.WarehouseLevenMapper;
 import com.boco.nbd.wios.manage.mapper.extdb.WarehouseMapper;
 import com.boco.nbd.wios.manage.mapper.extdb.WarehouseMapperEx;
 import com.boco.nbd.wios.manage.service.ISingleService;
+import com.ihidea.component.api.v2.BaseResponse;
+import com.ihidea.core.support.SpringContextLoader;
+import com.ihidea.core.support.exception.ServiceException;
+import com.ihidea.core.support.pageLimit.PageLimit;
+import com.ihidea.core.support.pageLimit.PageLimitHolderFilter;
+import com.ihidea.core.support.session.SessionInfo;
+import com.ihidea.core.util.JSONUtilsEx;
+import com.ihidea.core.util.StringUtilsEx;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;

--- a/src/main/java/com/boco/nbd/wios/microservice/Application.java
+++ b/src/main/java/com/boco/nbd/wios/microservice/Application.java
@@ -20,6 +20,7 @@ import org.springframework.boot.web.servlet.ServletRegistrationBean;
 import org.springframework.context.annotation.*;
 import org.springframework.core.type.AnnotatedTypeMetadata;
 import org.springframework.scheduling.annotation.EnableAsync;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
 import org.springframework.web.cors.CorsConfiguration;
 import org.springframework.web.cors.CorsConfigurationSource;
 import org.springframework.web.filter.CorsFilter;
@@ -39,6 +40,7 @@ import java.util.EventListener;
 @EnableConfigurationProperties(AliyunProperties.class)
 @EnableApiV2
 @EnableAsync
+@EnableTransactionManagement
 public class Application extends FrameworkMicroserviceApplication {
    public static void main(String[] args) {

--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -4,4 +4,4 @@ cdn.image.url=
 # db:
 database=mysql
 # 配置到bootstrap.yml不生效
-spring.main.allow-bean-definition-overriding=true
+spring.main.allow-bean-definition-overriding=false
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
+server:
+  tomcat:
+    uri-encoding: UTF-8
+spring:
+  http:
+    encoding:
+      charset: UTF-8
+      force: true
+      enabled: true
+  profiles:
+    active: dev
+  application:
+    name: wios
+  main:
+    allow-bean-definition-overriding: true
+  datasource:
+    type: com.alibaba.druid.pool.DruidDataSource
+    url: ${mysql.url}
+    username: ${mysql.username}
+    password: ${mysql.password}
+    initialSize: 5
+    minIdle: 5
+    maxActive: 20
+    maxWait: 60000
+    timeBetweenEvictionRunsMillis: 60000
+    minEvictableIdleTimeMillis: 300000
+    validationQuery: SELECT 'x'
+    queryTimeout: 5
+    testWhileIdle: true
+    testOnBorrow: false
+    testOnReturn: false
+    # filters: stat,wall 
+    poolPreparedStatements: true
+    maxPoolPreparedStatementPerConnectionSize: 20
+    logSlowSql: true
+    connectionProperties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=500
+    proxyFilters: '#{@catDataSourceFilter}'
+mybatis:
+  mapper-locations: classpath*:com/**/mappers/**/*.xml
+  plugins: '#{@maybatisPlugin}'
+  configuration:
+    map-underscore-to-camel-case: true
+support:
+  limit:
+    pageSize: 10
+filestore:
+  enable:
+    suffix: true
+auth:
+  token:
+    validSeconds: 900
+    minaValidSeconds: 86400
+  ignoreUrls: /account/login,/account/logout,/mts/*,/enum/get,/export.do,/import.do,/api/account/sendCaptcha,/api/account/updatePasswodByCaptcha,/api/sap/materials/add
+  ignoreUrlPath: /ignore
+api:
+  v2:
+    compatible: true
+    log: false
+womc:
+  flowUrl: http://cams-wios-test-v2.camsnetec.co
+  orderUrl: http://cams-wios-test-v2.camsnetec.co
\ No newline at end of file
--- a/src/main/resources/bootstrap-dev.yml
+++ b/src/main/resources/bootstrap-dev.yml
@@ -7,17 +7,17 @@ spring:
    zhname: 开迈斯WIOS服务
  cloud:
    nacos:
-      discovery:
+#      discovery:
-        server-addr: ${nacos-server-addr}
+#        server-addr: ${nacos-server-addr}
-        namespace: ${nacos-server-namespace}
+#        namespace: ${nacos-server-namespace}
-      config:
+#      config:
-        server-addr: ${nacos-server-addr}
+#        server-addr: ${nacos-server-addr}
-        namespace: ${nacos-server-namespace}
+#        namespace: ${nacos-server-namespace}
-        shared-configs[0].data-id: constant.yml
+#        shared-configs[0].data-id: constant.yml
-        shared-configs[0].group: DEFAULT_GROUP
+#        shared-configs[0].group: DEFAULT_GROUP
-        shared-configs[0].refresh: true
+#        shared-configs[0].refresh: true
-        file-extension: yml  #指定配置中心中对应的配置文件的格式
+#        file-extension: yml  #指定配置中心中对应的配置文件的格式
-        enabled: true
+#        enabled: true
    config:
      enabled: false
  jta:

--- a/src/main/resources/bootstrap-test.yml
+++ b/src/main/resources/bootstrap-test.yml
@@ -7,17 +7,17 @@ spring:
    zhname: 开迈斯WIOS服务
  cloud:
    nacos:
-      discovery:
+#      discovery:
-        server-addr: ${nacos-server-addr}
+#        server-addr: ${nacos-server-addr}
-        namespace: ${nacos-server-namespace}
+#        namespace: ${nacos-server-namespace}
-      config:
+#      config:
-        server-addr: ${nacos-server-addr}
+#        server-addr: ${nacos-server-addr}
-        namespace: ${nacos-server-namespace}
+#        namespace: ${nacos-server-namespace}
-        shared-configs[0].data-id: constant.yml
+#        shared-configs[0].data-id: constant.yml
-        shared-configs[0].group: DEFAULT_GROUP
+#        shared-configs[0].group: DEFAULT_GROUP
-        shared-configs[0].refresh: true
+#        shared-configs[0].refresh: true
-        file-extension: yml  #指定配置中心中对应的配置文件的格式
+#        file-extension: yml  #指定配置中心中对应的配置文件的格式
-        enabled: true
+#        enabled: true
    config:
      enabled: false
  jta:

--- a/src/main/resources/bootstrap.yml
+++ b/src/main/resources/bootstrap.yml
@@ -7,19 +7,27 @@ spring:
    name: nbd-wios-manage
    zhname: 开迈斯WIOS服务
  cloud:
+#    nacos:
+#      discovery:
+#        server-addr: 10.12.1.17:8848
+#        namespace: ce18ccbc-e054-45ad-893f-ed7ebee1704b
+#      config:
+#        server-addr: 10.12.1.17:8848
+#        namespace: ce18ccbc-e054-45ad-893f-ed7ebee1704b
+#        shared-configs[0].data-id: constant.yml
+#        shared-configs[0].group: DEFAULT_GROUP
+#        shared-configs[0].refresh: true
+#        file-extension: yml  #指定配置中心中对应的配置文件的格式
+#        enabled: true
+#    config:
+#      enabled: false
    nacos:
-      discovery:
-        server-addr: 10.12.1.17:8848
-        namespace: ce18ccbc-e054-45ad-893f-ed7ebee1704b
-      config:
-        server-addr: 10.12.1.17:8848
-        namespace: ce18ccbc-e054-45ad-893f-ed7ebee1704b
-        shared-configs[0].data-id: constant.yml
-        shared-configs[0].group: DEFAULT_GROUP
-        shared-configs[0].refresh: true
-        file-extension: yml  #指定配置中心中对应的配置文件的格式
-        enabled: true
      config:
        enabled: false
+        refresh-enabled: false
+      discovery:
+        enabled: false
+        instance-enabled: false
  jta:
    enabled: false
\ No newline at end of file
--- a/src/main/resources/config/application-boco.yml
+++ b/src/main/resources/config/application-boco.yml
+datasource:
+  def:
+    driver-class-name: com.mysql.cj.jdbc.Driver
+    url: jdbc:mysql://10.12.1.17:3306/wios?useSSL=false&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&serverTimezone=Asia/Shanghai
+    username: root
+    password: Boco@123
+    #type:
+    filters: stat
+    maxActive: 20
+    initialSize: 1
+    maxWait: 30000
+    minIdle: 1
+    timeBetweenEvictionRunsMillis: 60000
+    minEvictableIdleTimeMillis: 90000
+    validationQuery: SELECT 1 FROM DUAL
+    testWhileIdle: true
+    testOnBorrow: false
+    testOnReturn: false
+    poolPreparedStatements: true
+    maxOpenPreparedStatements: 20
+    connection-test-query: SELECT 1 FROM DUAL
+    connectionProperties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
+  extdb:
+    driver-class-name: com.mysql.cj.jdbc.Driver
+    url: jdbc:mysql://10.12.1.17:3306/warehouse?useSSL=false&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&serverTimezone=Asia/Shanghai
+    username: root
+    password: Boco@123
+    #type:
+    filters: stat
+    maxActive: 20
+    initialSize: 1
+    maxWait: 30000
+    minIdle: 1
+    timeBetweenEvictionRunsMillis: 60000
+    minEvictableIdleTimeMillis: 90000
+    validationQuery: SELECT 1 FROM DUAL
+    testWhileIdle: true
+    testOnBorrow: false
+    testOnReturn: false
+    poolPreparedStatements: true
+    maxOpenPreparedStatements: 20
+    connection-test-query: SELECT 1 FROM DUAL
+    connectionProperties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
+spring:
+  redis:
+    timeout: 10s
+    host: 10.12.1.17
+    port: 6379
+    password: Boco1234
+    database: 0
+    lettuce:
+      pool:
+        max-active: 8
+        max-wait: 1000
+        max-idle: 100
+        min-idle: 0
+jasypt.encryptor.password: 6dc19871-5299-4603-9b7a-2d7fa78defea
+swagger:
+  enable: true    #系统默认为false
+  serviceUrl: http://127.0.0.1:30350
+  version: v2.0
+  basePackage: com.boco.nbd.cams.*.controller,com.boco.nbd.wios.*.controller,com.boco.nbd.wios.export
+  app:
+    title: 开迈斯WIOS服务
+    desc: 开迈斯WIOS服务
+#流程数据源配置
+activiti:
+  #是否采用业务数据源
+  useDefDataSource: true
+  #是否创建表
+  database-schema-update: true
+auth:
+  allowRepeatLogin: true
+support:
+  limit:
+    pageSize: 10
+api:
+  v2:
+    compatible: true
+    log: false
+url:
+  api:
+    wios: http://wios.api.dev.ccchong.com:8086
+    push: http://push-gateway.test.k8s.star-charge.com/mts
+    warehouse: http://wios-warehouse.dev.k8s.star-charge.com/
+    #warehouse: http://10.8.9.86:8056/
+    invoice: http://47.111.208.192:8028/mts
+  h5: http://wios.2ust.com
+  FILE_UPLOAD_DEFAULT_URL: https://oss-cams.oss-cn-hangzhou.aliyuncs.com/wios/
+appkey:
+  warehouse: MA1YDN61X
+  invoice: MA1YDN61X
+mina:
+  appId: wxcc364b1431128ad7
+  appSecret: 2cc67ec6811ccb7dbdd57c2eadb627a5
+weixin:
+  appId: wxe343c909cc459c6a
+  appSecret: d4624c36b6795d1d99dcf0547af5443d
+sms:
+  aliyun:
+    enable: true
+    weight: 1
+    endpoint: cn-hangzhou
+    access-key-id: LTAI5tFo5PHXPUEGP7zrbSGe
+    access-key-secret: jU3mM34HWPdPKLnao9aF1ZFURt5sj3
+    sign-name: FC100000118866049
+    templates:
+      appointmentUser: SMS_255885013
+      businessRefused: SMS_256115007
+      appointmentTimeConfirm: SMS_256040012
+      appointmentTimeNotify: SMS_256030017
+sap:
+  url: https://dev-user-vqgd2we1.it-cpi010-rt.cpi.cn40.apps.platform.sapcloud.cn
+  username: sb-ed7ae553-63c3-41cb-93e7-6d9eddd35998!b904|it-rt-dev-user-vqgd2we1!b39
+  password: 3bc40402-dd4b-4400-bf61-29db7a5e9968$Ly2NGHzyxV6QJ1rphkrmHAy6nBSflaLEcEFAQLCQSUI=
+# flowCode 流程标识,flowSuperGroupId:流程超级用户组(存在配置)
+flow:
+  flowCode: CamsOrder
+  flowSuperGroupId: 836764183768485111
\ No newline at end of file
--- a/src/main/resources/config/application-dev.yml
+++ b/src/main/resources/config/application-dev.yml
+datasource:
+  def:
+    driver-class-name: com.mysql.cj.jdbc.Driver
+    url: jdbc:mysql://111.229.205.39:3306/wios-test?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8
+    username: root
+    password: Xuri@2020!
+    #type:
+    filters: stat
+    maxActive: 20
+    initialSize: 1
+    maxWait: 30000
+    minIdle: 1
+    timeBetweenEvictionRunsMillis: 60000
+    minEvictableIdleTimeMillis: 90000
+    validationQuery: SELECT 1 FROM DUAL
+    testWhileIdle: true
+    testOnBorrow: false
+    testOnReturn: false
+    poolPreparedStatements: true
+    maxOpenPreparedStatements: 20
+    connection-test-query: SELECT 1 FROM DUAL
+    #filters: stat,wall,log4j2
+    connectionProperties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
+  extdb:
+    driver-class-name: com.mysql.cj.jdbc.Driver
+    url: jdbc:mysql://111.229.205.39:3306/warehouse?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8
+    username: root
+    password: Xuri@2020!
+    #type:
+    filters: stat
+    maxActive: 20
+    initialSize: 1
+    maxWait: 30000
+    minIdle: 1
+    timeBetweenEvictionRunsMillis: 60000
+    minEvictableIdleTimeMillis: 90000
+    validationQuery: SELECT 1 FROM DUAL
+    testWhileIdle: true
+    testOnBorrow: false
+    testOnReturn: false
+    poolPreparedStatements: true
+    maxOpenPreparedStatements: 20
+    connection-test-query: SELECT 1 FROM DUAL
+    #filters: stat,wall,log4j2
+    connectionProperties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
+spring:
+  redis:
+    host: 127.0.0.1
+    port: 6379
+    password:
+    database: 10
+    timeout: 2000
+    lettuce:
+      pool:
+        max-active: 8
+        max-wait: 1000
+        max-idle: 100
+        min-idle: 0
+  main:
+    allow-bean-definition-overriding: true
+jasypt.encryptor.password: 6dc19871-5299-4603-9b7a-2d7fa78defea
+swagger:
+  enable: true    #系统默认为false
+  serviceUrl: http://127.0.0.1:30350
+  version: v2.0
+  basePackage: com.boco.nbd.wios.*.controller,com.boco.nbd.wios.export
+  app:
+    title: 开迈斯WIOS服务
+    desc: 开迈斯WIOS服务
+#流程数据源配置
+activiti:
+  #是否采用业务数据源
+  useDefDataSource: true
+  #是否创建表
+  database-schema-update: true
+boco:
+  flow:
+    url: jdbc:mysql://111.229.205.39:3306/wios-test?useUnicode=true&characterEncoding=UTF-8&useSSL=false&pinGlobalTxToPhysicalConnection=true&autoReconnect=true&nullCatalogMeansCurrent=true
+    username: root
+    password: Xuri@2020!
+    driver-class-name: com.mysql.jdbc.Driver
+auth:
+  allowRepeatLogin: true
+support:
+  limit:
+    pageSize: 10
+api:
+  v2:
+    compatible: true
+    log: false
+url:
+  api:
+    wios: http://wios.api.dev.ccchong.com:8086
+    push: http://push-gateway.test.k8s.star-charge.com/mts
+    warehouse: http://127.0.0.1:30350/
+    #warehouse: http://10.8.9.86:8056/
+    invoice: http://47.111.208.192:8028/mts
+  h5: http://wios.2ust.com
+  FILE_UPLOAD_DEFAULT_URL: https://oss-cams.oss-cn-hangzhou.aliyuncs.com/wios/
+appkey:
+  warehouse: MA1YDN61X
+  invoice: MA1YDN61X
+mina:
+  appId: wxcc364b1431128ad7
+  appSecret: 2cc67ec6811ccb7dbdd57c2eadb627a5
+weixin:
+  appId: wxe343c909cc459c6a
+  appSecret: d4624c36b6795d1d99dcf0547af5443d
+sms:
+  aliyun:
+    enable: true
+    weight: 1
+    endpoint: cn-hangzhou
+    access-key-id: LTAI5tFo5PHXPUEGP7zrbSGe
+    access-key-secret: jU3mM34HWPdPKLnao9aF1ZFURt5sj3
+    sign-name: FC100000118866049
+    templates:
+      appointmentUser: SMS_255885013
+      businessRefused: SMS_256115007
+      appointmentTimeConfirm: SMS_256040012
+      appointmentTimeNotify: SMS_256030017
+sap:
+  url: https://dev-user-vqgd2we1.it-cpi010-rt.cpi.cn40.apps.platform.sapcloud.cn
+  username: sb-ed7ae553-63c3-41cb-93e7-6d9eddd35998!b904|it-rt-dev-user-vqgd2we1!b39
+  password: 3bc40402-dd4b-4400-bf61-29db7a5e9968$Ly2NGHzyxV6QJ1rphkrmHAy6nBSflaLEcEFAQLCQSUI=
+# flowCode 流程标识,flowSuperGroupId:流程超级用户组(存在配置)
+flow:
+  flowCode: CamsOrder
+  flowSuperGroupId: 836764183768485111
+cams:
+  name: cams配置
+  #枚举类数值配置
+  enumNumberConfig:
+    #是否
+    - key: yesOrNo
+      value: 0-否;1-是
+    #是否需要立柱
+    - key: needErectPile
+      value: 0-否;1-是
+    #是否需要特殊施工
+    - key: needSpecialConstruction
+      value: 0-否;1-是
+    #是否为售车前预勘测
+    - key: surveyBeforeSaleEnable
+      value: 0-否;1-是
+    #是否独立车位
+    - key: hasIndependentParking
+      value: 0-否;1-是
+    #是否需要勘测
+    - key: isNeedSurvey
+      value: 0-否;1-是
+    #是否联系上客户
+    - key: isConnect
+      value: 0-否;1-是
+    #是否进行电力报装
+    - key: electricExpand
+      value: 0-否;1-是
+    #报装状态
+    - key: expandStatus
+      value: 1-通过;2-不通过
+    #报装不通过后订单后续操作
+    - key: expandFailOperate
+      value: 1-换其他用电类型继续安装;2-不安装了
+    #报装方式
+    - key: expandMethod
+      value: 1-代报装;2-自主报装
+    #安装紧急程度
+    - key: installEmergencyLevel
+      value: 1-一般;2-紧急
+    #物业态度
+    - key: propertyAgree
+      value: 0-不同意;1-同意
+    #安装位置
+    - key: installPosition
+      value: 1-室内;2-室外
+    #类型
+    - key: type
+      value: 1-普通订单;2-移桩订单
+    #是否需要人工派单
+    - key: manuDispatchEnable
+      value: 0-否;1-是
+    #车主性别
+    - key: userSex
+      value: 0-女;1-男;2-未知
+    #车位环境
+    - key: parkingCondition
+      value: 1-地上;2-地下
+    #电力来源
+    - key: powerType
+      value: 1-电力报装;2-物业电;3-家用电;4-其他
+    #电源点类型
+    - key: installPowerType
+      value: 1-电力报装;2-物业电;3-家用电;4-其他
+    #住宅类型
+    - key: houseType
+      value: 1-普通高层;2-商业两住;3-别墅;4-公司;5-厂房;6-自建房;7-其他
+    #车位类型
+    - key: parkingType
+      value: 1-自主产权;2-长期租赁;3-不固定;4-其他
+    #是否露天
+    - key: openAir
+      value: 0-否;1-是
+    #安装方式
+    - key: installType
+      value: 1-壁挂;2-立式;3-其他
+    #实际安装方式
+    - key: realInstallType
+      value: 1-壁挂;2-立式
+    #物业态度
+    - key: propertyAgree
+      value: 1-同意;2-不同意
+    #信号类型
+    - key: signalType
+      value: 1-移动;2-电信;3-联通
+    #费用是否超标
+    - key: overStandard
+      value: 0-未超标;1-超标
+    #电缆敷设方式
+    - key: cableInstallType
+      value: 1-PVC电工管;2-JDG镀锌管;3-电缆桥架;4-其他
+    #实际电敷设方式
+    - key: realCableInstallType
+      value: 1-PVC电工管;2-JDG镀锌管;3-电缆桥架;4-其他
+    #选用电缆规格
+    - key: cableType
+      value: 1-ZR-YJV-3*6mm²;2-ZR-YJV-3*10mm²;3-ZR-YJV-3*16mm²;4-ZR-YJV-5*6mm²
+    #实际电缆规格
+    - key: realCableType
+      value: 1-ZR-YJV-3*6mm²;2-ZR-YJV-3*10mm²;3-ZR-YJV-3*16mm²;4-ZR-YJV-5*6mm²
+    #勘测结论
+    - key: surveyResult
+      value: 1-同意安装;2-不同意安装;3-待定
+    #现场培训内容
+    - key: trainContent
+      value: 1-使用操作培训;2-故障排查及处理培训;3-维护保养培训待定;4-售后服务
+    #附件交付
+    - key: attachment
+      value: 1-电卡2张;2-出厂检测报告;3-三年质保卡;4-使用说明书;5-其它
+    #需要的资料准备
+    - key: prepareInfo
+      value: 1-关于在停车位安装电工汽车充电设备的申请;2-停车车位产权复印件;3-身份证正反面复印件;4-车位使用权证明书;5-无需资料准备
+    #评分项
+    - key: scoreItem
+      value: 1-安全;2-快速响应;3-质量;4-时效;5-库存管理;6-采购;7-其它
+    #考核部门
+    - key: appraisalDepartment
+      value: 1-区域PM;0-自动计算;2-售后;3-质量;4-质量PM;5-物控;6-采购
+    #墙盒线缆的安装长度
+    - key: installLength
+      value: 1-10米以下;2-10-20米;3-20-30米;4-30-40米;5-40米以上
+  #枚举类字符配置
+  enumStringConfig:
+    - key: isPickCar
+      value: 是;否;已支付定金
+  #时限配置,单位天
+  dueDate:
+    - key: 101
+      value: 1
+    - key: 103
+      value: 1
+    - key: 104
+      value: 1
+    - key: 106
+      value: 3
+    - key: 107
+      value: 2
+    - key: 108
+      value: 1
+    - key: 111
+      value: 3
+    - key: 112
+      value: 2
+    - key: 115
+      value: 12
+  #报告实体
+  reportEntry:
+    - key: 10
+      parentKey: 1
+      name: 勘测报告材料
+    - key: 101
+      parentKey: 10
+      name: 勘测报告
+      describe: CAMS 墙盒安装服务勘测报告
+    - key: 102
+      parentKey: 10
+      name: 放弃电力报装声明
+      describe: 放弃电力报装声明（非电力报装顾客提供）
+    - key: 11
+      parentKey: 1
+      name: 勘测照片
+    - key: 111
+      parentKey: 11
+      name: 取电点
+      describe: 取电点方位，火零地线、参数清晰
+    - key: 112
+      parentKey: 11
+      name: 安装车位环境照片
+      describe: 车位号，墙盒安装位置可见
+    - key: 113
+      parentKey: 11
+      name: 线路走向
+      describe: 标识清楚大体线路走向
+    - key: 114
+      parentKey: 11
+      name: 现场信号
+      describe: 现场信号测量截图(三次测量)
+    - key: 20
+      parentKey: 2
+      name: 安装验收单材料
+    - key: 201
+      parentKey: 20
+      name: 安装验收单
+      describe: CAMS 墙盒安装服务验收单
+    - key: 202
+      parentKey: 20
+      name: 安装服务收费报价单
+      describe: CAMS 墙盒安装服务收费报价单
+    - key: 21
+      parentKey: 2
+      name: 安装照片
+    - key: 211
+      parentKey: 21
+      name: 充电墙盒编号
+      describe: 拍摄完整，数字清晰
+    - key: 212
+      parentKey: 21
+      name: 控制单元标签
+      describe:
+    - key: 213
+      parentKey: 21
+      name: 绿灯图
+      describe: 充电桩亮灯状态，开关盒及安装位置可见
+    - key: 214
+      parentKey: 21
+      name: 充电模拟图测试
+      describe:
+    - key: 215
+      parentKey: 21
+      name: 人桩合照
+      describe: 充电桩亮灯状态
+    - key: 216
+      parentKey: 21
+      name: 安装完成车位照
+      describe: 充电桩亮灯状态，车位号可见
+    - key: 217
+      parentKey: 21
+      name: 保护开关
+      describe: 火零地接线、线号、有电危险标识、线缆标识牌、开关参数、开关盒整体和接地、进出线杯梳可见
+    - key: 218
+      parentKey: 21
+      name: 取电点
+      describe: 火零地接线、线号、有电危险标识、线缆标识牌、开关参数、出线杯梳可见
+    - key: 219
+      parentKey: 21
+      name: 电缆起点、终点米标
+      describe: 数字清晰，以保护开关和取电点为背景，断头断尾
+    - key: 220
+      parentKey: 21
+      name: 电缆标识
+      describe: 品牌、型号可见，背景为相应安装现场
+    - key: 221
+      parentKey: 21
+      name: 管材标识
+      describe: 品牌、型号可见，背景为相应安装现场
+    - key: 222
+      parentKey: 21
+      name: 经纬度截图
+      describe:
+    - key: 223
+      parentKey: 21
+      name: 线路走向
+      describe: 标识清楚大体线路走向
+    - key: 224
+      parentKey: 21
+      name: 车架号
+      describe:
+  #评分自动计算算法
+  scoreAlgorithm:
+    - key: 1
+      parentKey: 0
+      describe: 接单时效
+      target: ≤2小时
+      algorithm: 服务商有与客服首联动作时间-派单时间
+    - key: 2
+      parentKey: 0
+      describe: 返工单数
+      target: 0
+      algorithm: 有一单扣二分，扣完为止
+    - key: 3
+      parentKey: 0
+      describe: 勘测时效
+      target: ≤3日
+      algorithm: 勘测完成时间-预约勘测时间 （完成的订单)
+    - key: 4
+      parentKey: 0
+      describe: 勘测资料上传
+      target: ≤24小时
+      algorithm: 勘测资料上传时间-勘测完成时间
+    - key: 5
+      parentKey: 0
+      describe: 安装完成时效
+      target: ≤9日
+      algorithm: 安装完成时间-预约安装时间（完成的订单)
+    - key: 6
+      parentKey: 0
+      describe: 安装资料上传
+      target: ≤24小时
+      algorithm: 安装资料上传时间-安装完成时间
+    - key: 7
+      parentKey: 0
+      describe: 总体安装时效(无电力报装)
+      target: ≤10日
+      algorithm: 安装审核完成时间-派单时间 （完成的订单)（剔除受阻时间以及呆滞订单）
+    - key: 8
+      parentKey: 0
+      describe: 总体安装时效(有电力报装)
+      target: ≤20日
+      algorithm: 安装审核完成时间-派单时间（完成的订单)(剔除受阻时间以及呆滞订单）
+    - key: 9
+      parentKey: 0
+      describe: 累计安装完成率
+      target: ≥90%
+      algorithm: 累计完成安装的数量/累计派单总量（剔除关单订单）
+    - key: 10
+      parentKey: 0
+      describe: 当月安装率
+      target: ≥95%
+      algorithm: 当月安装审核通过/当月派单
+    - key: 11
+      parentKey: 0
+      describe: 扣分
+      target:
+      algorithm: 勘测，安装未在约定时间内到达约定地点签到订单，每一单扣10分扣完为止
+    - key: 20
+      parentKey: 3
+      describe: 加分
+      target:
+      algorithm: 按照施工处罚单中实际分数进行扣减
+    - key: 21
+      parentKey: 3
+      describe: 减分
+      target:
+      algorithm: 按照施工处罚单中实际分数进行扣减
+womc:
+  name: cams配置
+  #枚举类字符配置
+  enumStringConfig:
+    #故障时间
+    - key: faultTime
+      value: 使用中;安装时
+    #紧急程度
+    - key: emergencyLevel
+      value: 投诉;抱怨;正常
+    #是否
+    - key: yesOrNo
+      value: 是;否
+    #处理结果
+    - key: processResult
+      value: 已解决;未解决;需要技术支持
+    #客户意见
+    - key: customerOpinion
+      value: 非常满意;满意;一般;不满意;非常不满意
+    #安装位置
+    - key: installPosition
+      value: 地上;地下
+    #故障场景
+    - key: faultScene
+      value: 使用中;安装中
+    #费用类型
+    - key: expenseType
+      value: 上门拆装;上门检修
+    #对接人
+    - key: recipients
+      value: 何建波;孟元逊
+    #一级故障
+    - key: oneLevelFault
+      value: 充电枪问题;主板硬件问题;线路问题;急停故障;接地故障;电源点问题;墙盒断网;操作问题;车桩匹配问题;APP问题;充电卡问题;其他
+  #二级故障
+  twoLevelFault:
+    - oneLevelFault: 充电枪问题
+      twoLevelFault: 充电枪问题
+      faultSolutionWay: 后续补充完善
+    - oneLevelFault: 主板硬件问题
+      twoLevelFault: 主板硬件问题
+      faultSolutionWay: 后续补充完善
+    - oneLevelFault: 线路问题
+      twoLevelFault: 线路问题
+      faultSolutionWay: 后续补充完善
+    - oneLevelFault: 急停故障
+      twoLevelFault: 急停故障
+      faultSolutionWay: 后续补充完善
+    - oneLevelFault: 接地故障
+      twoLevelFault: 零线带电
+      faultSolutionWay: 后续补充完善
+    - oneLevelFault: 接地故障
+      twoLevelFault: 接地问题
+      faultSolutionWay: 后续补充完善
+    - oneLevelFault: 电源点问题
+      twoLevelFault: 电源点问题
+      faultSolutionWay: 后续补充完善
+    - oneLevelFault: 墙盒断网
+      twoLevelFault: 墙盒断网
+      faultSolutionWay: 后续补充完善
+    - oneLevelFault: 操作问题
+      twoLevelFault: 车机操作
+      faultSolutionWay: 后续补充完善
+    - oneLevelFault: 操作问题
+      twoLevelFault: APP操作
+      faultSolutionWay: 后续补充完善
+    - oneLevelFault: 操作问题
+      twoLevelFault: 充电桩操作
+      faultSolutionWay: 后续补充完善
+    - oneLevelFault: 操作问题
+      twoLevelFault: 其他
+      faultSolutionWay: 后续补充完善
+    - oneLevelFault: 车桩匹配问题
+      twoLevelFault: 车桩匹配问题
+      faultSolutionWay: 后续补充完善
+    - oneLevelFault: APP问题
+      twoLevelFault: APP问题
+      faultSolutionWay: 后续补充完善
+    - oneLevelFault: 充电卡问题
+      twoLevelFault: 充电卡问题
+      faultSolutionWay: 后续补充完善
+    - oneLevelFault: 其他
+      twoLevelFault: 咨询误报
+      faultSolutionWay: 后续补充完善
+    - oneLevelFault: 其他
+      twoLevelFault: 客户自行处理
+      faultSolutionWay: 后续补充完善
+    - oneLevelFault: 其他
+      twoLevelFault: 其他
+      faultSolutionWay: 后续补充完善
+  #故障类型
+faultTypeEntry:
+  - key: 1201
+    parentKey: 12
+    faultType: 充电枪问题
+    faultSolutionWay: 后续补充完善
+  - key: 1202
+    parentKey: 12
+    faultType: 主板硬件问题
+    faultSolutionWay: 后续补充完善
+  - key: 1203
+    parentKey: 12
+    faultType: 线路问题
+    faultSolutionWay: 后续补充完善
+  - key: 1204
+    parentKey: 12
+    faultType: 急停故障
+    faultSolutionWay: 后续补充完善
+  - key: 1205
+    parentKey: 12
+    faultType: 接地故障
+    faultSolutionWay: 后续补充完善
+  - key: 1206
+    parentKey: 12
+    faultType: 电源点问题
+    faultSolutionWay: 后续补充完善
+  - key: 1207
+    parentKey: 12
+    faultType: 墙盒断网
+    faultSolutionWay: 后续补充完善
+  - key: 1208
+    parentKey: 12
+    faultType: 操作问题
+    faultSolutionWay: 后续补充完善
+  - key: 1209
+    parentKey: 12
+    faultType: 车桩匹配问题
+    faultSolutionWay: 后续补充完善
+  - key: 1210
+    parentKey: 12
+    faultType: APP问题
+    faultSolutionWay: 后续补充完善
+  - key: 1211
+    parentKey: 12
+    faultType: 充电卡问题
+    faultSolutionWay: 后续补充完善
+  - key: 1212
+    parentKey: 12
+    faultType: 其他
+    faultSolutionWay: 后续补充完善
+#调用第三方接口相关配置
+oss:
+  endpoint: oss-cn-hangzhou.aliyuncs.com
+  accessKeyId: LTAI4G53jcWvinAGWUk1ZkXt
+  accessKeySecret: 8NXH4qbByfS60NVNYMMH6GplZAVuTA
+  bucketName: oss-cams
+## flowable配置
+#flowable:
+#  database-schema-update: true
+#  #pg用户使用指定，mysql不用
+#  #  database-schema: base_data
+#  activity-font-name: "宋体"
+#  label-font-name: "宋体"
+#  annotation-font-name: "宋体"
+#  async-executor-activate: false
\ No newline at end of file
--- a/src/main/resources/config/application-test.yml
+++ b/src/main/resources/config/application-test.yml
+datasource:
+  def:
+    driver-class-name: com.mysql.cj.jdbc.Driver
+    url: jdbc:mysql://111.229.205.39:3306/wios-test?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8
+    username: root
+    password: Xuri@2020!
+    #type:
+    filters: stat
+    maxActive: 20
+    initialSize: 1
+    maxWait: 30000
+    minIdle: 1
+    timeBetweenEvictionRunsMillis: 60000
+    minEvictableIdleTimeMillis: 90000
+    validationQuery: SELECT 1 FROM DUAL
+    testWhileIdle: true
+    testOnBorrow: false
+    testOnReturn: false
+    poolPreparedStatements: true
+    maxOpenPreparedStatements: 20
+    connection-test-query: SELECT 1 FROM DUAL
+    #filters: stat,wall,log4j2
+    connectionProperties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
+  extdb:
+    driver-class-name: com.mysql.cj.jdbc.Driver
+    url: jdbc:mysql://111.229.205.39:3306/warehouse?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8
+    username: root
+    password: Xuri@2020!
+    #type:
+    filters: stat
+    maxActive: 20
+    initialSize: 1
+    maxWait: 30000
+    minIdle: 1
+    timeBetweenEvictionRunsMillis: 60000
+    minEvictableIdleTimeMillis: 90000
+    validationQuery: SELECT 1 FROM DUAL
+    testWhileIdle: true
+    testOnBorrow: false
+    testOnReturn: false
+    poolPreparedStatements: true
+    maxOpenPreparedStatements: 20
+    connection-test-query: SELECT 1 FROM DUAL
+    #filters: stat,wall,log4j2
+    connectionProperties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
+spring:
+  redis:
+    host: 127.0.0.1
+    port: 6379
+    password:
+    database: 10
+    timeout: 2000
+    lettuce:
+      pool:
+        max-active: 8
+        max-wait: 1000
+        max-idle: 100
+        min-idle: 0
+  main:
+    allow-bean-definition-overriding: true
+jasypt.encryptor.password: 6dc19871-5299-4603-9b7a-2d7fa78defea
+swagger:
+  enable: true    #系统默认为false
+  serviceUrl: http://127.0.0.1:30350
+  version: v2.0
+  basePackage: com.boco.nbd.wios.*.controller,com.boco.nbd.wios.export
+  app:
+    title: 开迈斯WIOS服务
+    desc: 开迈斯WIOS服务
+#流程数据源配置
+activiti:
+  #是否采用业务数据源
+  useDefDataSource: true
+  #是否创建表
+  database-schema-update: true
+auth:
+  allowRepeatLogin: true
+support:
+  limit:
+    pageSize: 10
+api:
+  v2:
+    compatible: true
+    log: false
+url:
+  api:
+    wios: http://wios.api.dev.ccchong.com:8086
+    push: http://push-gateway.test.k8s.star-charge.com/mts
+    warehouse: http://wios-warehouse.dev.k8s.star-charge.com/
+    #warehouse: http://10.8.9.86:8056/
+    invoice: http://47.111.208.192:8028/mts
+  h5: http://wios.2ust.com
+  FILE_UPLOAD_DEFAULT_URL: https://oss-cams.oss-cn-hangzhou.aliyuncs.com/wios/
+appkey:
+  warehouse: MA1YDN61X
+  invoice: MA1YDN61X
+mina:
+  appId: wxcc364b1431128ad7
+  appSecret: 2cc67ec6811ccb7dbdd57c2eadb627a5
+weixin:
+  appId: wxe343c909cc459c6a
+  appSecret: d4624c36b6795d1d99dcf0547af5443d
+sms:
+  aliyun:
+    enable: true
+    weight: 1
+    endpoint: cn-hangzhou
+    access-key-id: LTAI5tFo5PHXPUEGP7zrbSGe
+    access-key-secret: jU3mM34HWPdPKLnao9aF1ZFURt5sj3
+    sign-name: FC100000118866049
+    templates:
+      appointmentUser: SMS_255885013
+      businessRefused: SMS_256115007
+      appointmentTimeConfirm: SMS_256040012
+      appointmentTimeNotify: SMS_256030017
+sap:
+  url: https://dev-user-vqgd2we1.it-cpi010-rt.cpi.cn40.apps.platform.sapcloud.cn
+  username: sb-ed7ae553-63c3-41cb-93e7-6d9eddd35998!b904|it-rt-dev-user-vqgd2we1!b39
+  password: 3bc40402-dd4b-4400-bf61-29db7a5e9968$Ly2NGHzyxV6QJ1rphkrmHAy6nBSflaLEcEFAQLCQSUI=
+# flowCode 流程标识,flowSuperGroupId:流程超级用户组(存在配置)
+flow:
+  flowCode: CamsOrder
+  flowSuperGroupId: 836764183768485111
+cams:
+  name: cams配置
+  #枚举类数值配置
+  enumNumberConfig:
+    #是否
+    - key: yesOrNo
+      value: 0-否;1-是
+    #是否需要立柱
+    - key: needErectPile
+      value: 0-否;1-是
+    #是否需要特殊施工
+    - key: needSpecialConstruction
+      value: 0-否;1-是
+    #是否为售车前预勘测
+    - key: surveyBeforeSaleEnable
+      value: 0-否;1-是
+    #是否独立车位
+    - key: hasIndependentParking
+      value: 0-否;1-是
+    #是否需要勘测
+    - key: isNeedSurvey
+      value: 0-否;1-是
+    #是否联系上客户
+    - key: isConnect
+      value: 0-否;1-是
+    #是否进行电力报装
+    - key: electricExpand
+      value: 0-否;1-是
+    #报装状态
+    - key: expandStatus
+      value: 1-通过;2-不通过
+    #报装不通过后订单后续操作
+    - key: expandFailOperate
+      value: 1-换其他用电类型继续安装;2-不安装了
+    #报装方式
+    - key: expandMethod
+      value: 1-代报装;2-自主报装
+    #安装紧急程度
+    - key: installEmergencyLevel
+      value: 1-一般;2-紧急
+    #物业态度
+    - key: propertyAgree
+      value: 0-不同意;1-同意
+    #安装位置
+    - key: installPosition
+      value: 1-室内;2-室外
+    #类型
+    - key: type
+      value: 1-普通订单;2-移桩订单
+    #是否需要人工派单
+    - key: manuDispatchEnable
+      value: 0-否;1-是
+    #车主性别
+    - key: userSex
+      value: 0-女;1-男;2-未知
+    #车位环境
+    - key: parkingCondition
+      value: 1-地上;2-地下
+    #电力来源
+    - key: powerType
+      value: 1-电力报装;2-物业电;3-家用电;4-其他
+    #电源点类型
+    - key: installPowerType
+      value: 1-电力报装;2-物业电;3-家用电;4-其他
+    #住宅类型
+    - key: houseType
+      value: 1-普通高层;2-商业两住;3-别墅;4-公司;5-厂房;6-自建房;7-其他
+    #车位类型
+    - key: parkingType
+      value: 1-自主产权;2-长期租赁;3-不固定;4-其他
+    #是否露天
+    - key: openAir
+      value: 0-否;1-是
+    #安装方式
+    - key: installType
+      value: 1-壁挂;2-立式;3-其他
+    #实际安装方式
+    - key: realInstallType
+      value: 1-壁挂;2-立式
+    #物业态度
+    - key: propertyAgree
+      value: 1-同意;2-不同意
+    #信号类型
+    - key: signalType
+      value: 1-移动;2-电信;3-联通
+    #费用是否超标
+    - key: overStandard
+      value: 0-未超标;1-超标
+    #电缆敷设方式
+    - key: cableInstallType
+      value: 1-PVC电工管;2-JDG镀锌管;3-电缆桥架;4-其他
+    #实际电敷设方式
+    - key: realCableInstallType
+      value: 1-PVC电工管;2-JDG镀锌管;3-电缆桥架;4-其他
+    #选用电缆规格
+    - key: cableType
+      value: 1-ZR-YJV-3*6mm²;2-ZR-YJV-3*10mm²;3-ZR-YJV-3*16mm²;4-ZR-YJV-5*6mm²
+    #实际电缆规格
+    - key: realCableType
+      value: 1-ZR-YJV-3*6mm²;2-ZR-YJV-3*10mm²;3-ZR-YJV-3*16mm²;4-ZR-YJV-5*6mm²
+    #勘测结论
+    - key: surveyResult
+      value: 1-同意安装;2-不同意安装;3-待定
+    #现场培训内容
+    - key: trainContent
+      value: 1-使用操作培训;2-故障排查及处理培训;3-维护保养培训待定;4-售后服务
+    #附件交付
+    - key: attachment
+      value: 1-电卡2张;2-出厂检测报告;3-三年质保卡;4-使用说明书;5-其它
+    #需要的资料准备
+    - key: prepareInfo
+      value: 1-关于在停车位安装电工汽车充电设备的申请;2-停车车位产权复印件;3-身份证正反面复印件;4-车位使用权证明书;5-无需资料准备
+    #评分项
+    - key: scoreItem
+      value: 1-安全;2-快速响应;3-质量;4-时效;5-库存管理;6-采购;7-其它
+    #考核部门
+    - key: appraisalDepartment
+      value: 1-区域PM;0-自动计算;2-售后;3-质量;4-质量PM;5-物控;6-采购
+    #墙盒线缆的安装长度
+    - key: installLength
+      value: 1-10米以下;2-10-20米;3-20-30米;4-30-40米;5-40米以上
+  #枚举类字符配置
+  enumStringConfig:
+    - key: isPickCar
+      value: 是;否;已支付定金
+  #时限配置,单位天
+  dueDate:
+    - key: 101
+      value: 1
+    - key: 103
+      value: 1
+    - key: 104
+      value: 1
+    - key: 106
+      value: 3
+    - key: 107
+      value: 2
+    - key: 108
+      value: 1
+    - key: 111
+      value: 3
+    - key: 112
+      value: 2
+    - key: 115
+      value: 12
+  #报告实体
+  reportEntry:
+    - key: 10
+      parentKey: 1
+      name: 勘测报告材料
+    - key: 101
+      parentKey: 10
+      name: 勘测报告
+      describe: CAMS 墙盒安装服务勘测报告
+    - key: 102
+      parentKey: 10
+      name: 放弃电力报装声明
+      describe: 放弃电力报装声明（非电力报装顾客提供）
+    - key: 11
+      parentKey: 1
+      name: 勘测照片
+    - key: 111
+      parentKey: 11
+      name: 取电点
+      describe: 取电点方位，火零地线、参数清晰
+    - key: 112
+      parentKey: 11
+      name: 安装车位环境照片
+      describe: 车位号，墙盒安装位置可见
+    - key: 113
+      parentKey: 11
+      name: 线路走向
+      describe: 标识清楚大体线路走向
+    - key: 114
+      parentKey: 11
+      name: 现场信号
+      describe: 现场信号测量截图(三次测量)
+    - key: 20
+      parentKey: 2
+      name: 安装验收单材料
+    - key: 201
+      parentKey: 20
+      name: 安装验收单
+      describe: CAMS 墙盒安装服务验收单
+    - key: 202
+      parentKey: 20
+      name: 安装服务收费报价单
+      describe: CAMS 墙盒安装服务收费报价单
+    - key: 21
+      parentKey: 2
+      name: 安装照片
+    - key: 211
+      parentKey: 21
+      name: 充电墙盒编号
+      describe: 拍摄完整，数字清晰
+    - key: 212
+      parentKey: 21
+      name: 控制单元标签
+      describe:
+    - key: 213
+      parentKey: 21
+      name: 绿灯图
+      describe: 充电桩亮灯状态，开关盒及安装位置可见
+    - key: 214
+      parentKey: 21
+      name: 充电模拟图测试
+      describe:
+    - key: 215
+      parentKey: 21
+      name: 人桩合照
+      describe: 充电桩亮灯状态
+    - key: 216
+      parentKey: 21
+      name: 安装完成车位照
+      describe: 充电桩亮灯状态，车位号可见
+    - key: 217
+      parentKey: 21
+      name: 保护开关
+      describe: 火零地接线、线号、有电危险标识、线缆标识牌、开关参数、开关盒整体和接地、进出线杯梳可见
+    - key: 218
+      parentKey: 21
+      name: 取电点
+      describe: 火零地接线、线号、有电危险标识、线缆标识牌、开关参数、出线杯梳可见
+    - key: 219
+      parentKey: 21
+      name: 电缆起点、终点米标
+      describe: 数字清晰，以保护开关和取电点为背景，断头断尾
+    - key: 220
+      parentKey: 21
+      name: 电缆标识
+      describe: 品牌、型号可见，背景为相应安装现场
+    - key: 221
+      parentKey: 21
+      name: 管材标识
+      describe: 品牌、型号可见，背景为相应安装现场
+    - key: 222
+      parentKey: 21
+      name: 经纬度截图
+      describe:
+    - key: 223
+      parentKey: 21
+      name: 线路走向
+      describe: 标识清楚大体线路走向
+    - key: 224
+      parentKey: 21
+      name: 车架号
+      describe:
+  #评分自动计算算法
+  scoreAlgorithm:
+    - key: 1
+      parentKey: 0
+      describe: 接单时效
+      target: ≤2小时
+      algorithm: 服务商有与客服首联动作时间-派单时间
+    - key: 2
+      parentKey: 0
+      describe: 返工单数
+      target: 0
+      algorithm: 有一单扣二分，扣完为止
+    - key: 3
+      parentKey: 0
+      describe: 勘测时效
+      target: ≤3日
+      algorithm: 勘测完成时间-预约勘测时间 （完成的订单)
+    - key: 4
+      parentKey: 0
+      describe: 勘测资料上传
+      target: ≤24小时
+      algorithm: 勘测资料上传时间-勘测完成时间
+    - key: 5
+      parentKey: 0
+      describe: 安装完成时效
+      target: ≤9日
+      algorithm: 安装完成时间-预约安装时间（完成的订单)
+    - key: 6
+      parentKey: 0
+      describe: 安装资料上传
+      target: ≤24小时
+      algorithm: 安装资料上传时间-安装完成时间
+    - key: 7
+      parentKey: 0
+      describe: 总体安装时效(无电力报装)
+      target: ≤10日
+      algorithm: 安装审核完成时间-派单时间 （完成的订单)（剔除受阻时间以及呆滞订单）
+    - key: 8
+      parentKey: 0
+      describe: 总体安装时效(有电力报装)
+      target: ≤20日
+      algorithm: 安装审核完成时间-派单时间（完成的订单)(剔除受阻时间以及呆滞订单）
+    - key: 9
+      parentKey: 0
+      describe: 累计安装完成率
+      target: ≥90%
+      algorithm: 累计完成安装的数量/累计派单总量（剔除关单订单）
+    - key: 10
+      parentKey: 0
+      describe: 当月安装率
+      target: ≥95%
+      algorithm: 当月安装审核通过/当月派单
+    - key: 11
+      parentKey: 0
+      describe: 扣分
+      target:
+      algorithm: 勘测，安装未在约定时间内到达约定地点签到订单，每一单扣10分扣完为止
+    - key: 20
+      parentKey: 3
+      describe: 加分
+      target:
+      algorithm: 按照施工处罚单中实际分数进行扣减
+    - key: 21
+      parentKey: 3
+      describe: 减分
+      target:
+      algorithm: 按照施工处罚单中实际分数进行扣减
+womc:
+  name: cams配置
+  #枚举类字符配置
+  enumStringConfig:
+    #故障时间
+    - key: faultTime
+      value: 使用中;安装时
+    #紧急程度
+    - key: emergencyLevel
+      value: 投诉;抱怨;正常
+    #是否
+    - key: yesOrNo
+      value: 是;否
+    #处理结果
+    - key: processResult
+      value: 已解决;未解决;需要技术支持
+    #客户意见
+    - key: customerOpinion
+      value: 非常满意;满意;一般;不满意;非常不满意
+    #安装位置
+    - key: installPosition
+      value: 地上;地下
+    #故障场景
+    - key: faultScene
+      value: 使用中;安装中
+    #费用类型
+    - key: expenseType
+      value: 上门拆装;上门检修
+    #对接人
+    - key: recipients
+      value: 何建波;孟元逊
+    #一级故障
+    - key: oneLevelFault
+      value: 充电枪问题;主板硬件问题;线路问题;急停故障;接地故障;电源点问题;墙盒断网;操作问题;车桩匹配问题;APP问题;充电卡问题;其他
+  #二级故障
+  twoLevelFault:
+    - oneLevelFault: 充电枪问题
+      twoLevelFault: 充电枪问题
+      faultSolutionWay: 后续补充完善
+    - oneLevelFault: 主板硬件问题
+      twoLevelFault: 主板硬件问题
+      faultSolutionWay: 后续补充完善
+    - oneLevelFault: 线路问题
+      twoLevelFault: 线路问题
+      faultSolutionWay: 后续补充完善
+    - oneLevelFault: 急停故障
+      twoLevelFault: 急停故障
+      faultSolutionWay: 后续补充完善
+    - oneLevelFault: 接地故障
+      twoLevelFault: 零线带电
+      faultSolutionWay: 后续补充完善
+    - oneLevelFault: 接地故障
+      twoLevelFault: 接地问题
+      faultSolutionWay: 后续补充完善
+    - oneLevelFault: 电源点问题
+      twoLevelFault: 电源点问题
+      faultSolutionWay: 后续补充完善
+    - oneLevelFault: 墙盒断网
+      twoLevelFault: 墙盒断网
+      faultSolutionWay: 后续补充完善
+    - oneLevelFault: 操作问题
+      twoLevelFault: 车机操作
+      faultSolutionWay: 后续补充完善
+    - oneLevelFault: 操作问题
+      twoLevelFault: APP操作
+      faultSolutionWay: 后续补充完善
+    - oneLevelFault: 操作问题
+      twoLevelFault: 充电桩操作
+      faultSolutionWay: 后续补充完善
+    - oneLevelFault: 操作问题
+      twoLevelFault: 其他
+      faultSolutionWay: 后续补充完善
+    - oneLevelFault: 车桩匹配问题
+      twoLevelFault: 车桩匹配问题
+      faultSolutionWay: 后续补充完善
+    - oneLevelFault: APP问题
+      twoLevelFault: APP问题
+      faultSolutionWay: 后续补充完善
+    - oneLevelFault: 充电卡问题
+      twoLevelFault: 充电卡问题
+      faultSolutionWay: 后续补充完善
+    - oneLevelFault: 其他
+      twoLevelFault: 咨询误报
+      faultSolutionWay: 后续补充完善
+    - oneLevelFault: 其他
+      twoLevelFault: 客户自行处理
+      faultSolutionWay: 后续补充完善
+    - oneLevelFault: 其他
+      twoLevelFault: 其他
+      faultSolutionWay: 后续补充完善
+  #故障类型
+faultTypeEntry:
+  - key: 1201
+    parentKey: 12
+    faultType: 充电枪问题
+    faultSolutionWay: 后续补充完善
+  - key: 1202
+    parentKey: 12
+    faultType: 主板硬件问题
+    faultSolutionWay: 后续补充完善
+  - key: 1203
+    parentKey: 12
+    faultType: 线路问题
+    faultSolutionWay: 后续补充完善
+  - key: 1204
+    parentKey: 12
+    faultType: 急停故障
+    faultSolutionWay: 后续补充完善
+  - key: 1205
+    parentKey: 12
+    faultType: 接地故障
+    faultSolutionWay: 后续补充完善
+  - key: 1206
+    parentKey: 12
+    faultType: 电源点问题
+    faultSolutionWay: 后续补充完善
+  - key: 1207
+    parentKey: 12
+    faultType: 墙盒断网
+    faultSolutionWay: 后续补充完善
+  - key: 1208
+    parentKey: 12
+    faultType: 操作问题
+    faultSolutionWay: 后续补充完善
+  - key: 1209
+    parentKey: 12
+    faultType: 车桩匹配问题
+    faultSolutionWay: 后续补充完善
+  - key: 1210
+    parentKey: 12
+    faultType: APP问题
+    faultSolutionWay: 后续补充完善
+  - key: 1211
+    parentKey: 12
+    faultType: 充电卡问题
+    faultSolutionWay: 后续补充完善
+  - key: 1212
+    parentKey: 12
+    faultType: 其他
+    faultSolutionWay: 后续补充完善
--- a/target/classes/application.properties
+++ b/target/classes/application.properties
@@ -4,4 +4,4 @@ cdn.image.url=
 # db:
 database=mysql
 # 配置到bootstrap.yml不生效
-spring.main.allow-bean-definition-overriding=true
+spring.main.allow-bean-definition-overriding=false
--- a/target/classes/bootstrap-dev.yml
+++ b/target/classes/bootstrap-dev.yml
@@ -7,17 +7,17 @@ spring:
    zhname: 开迈斯WIOS服务
  cloud:
    nacos:
-      discovery:
+#      discovery:
-        server-addr: ${nacos-server-addr}
+#        server-addr: ${nacos-server-addr}
-        namespace: ${nacos-server-namespace}
+#        namespace: ${nacos-server-namespace}
-      config:
+#      config:
-        server-addr: ${nacos-server-addr}
+#        server-addr: ${nacos-server-addr}
-        namespace: ${nacos-server-namespace}
+#        namespace: ${nacos-server-namespace}
-        shared-configs[0].data-id: constant.yml
+#        shared-configs[0].data-id: constant.yml
-        shared-configs[0].group: DEFAULT_GROUP
+#        shared-configs[0].group: DEFAULT_GROUP
-        shared-configs[0].refresh: true
+#        shared-configs[0].refresh: true
-        file-extension: yml  #指定配置中心中对应的配置文件的格式
+#        file-extension: yml  #指定配置中心中对应的配置文件的格式
-        enabled: true
+#        enabled: true
    config:
      enabled: false
  jta:

--- a/target/classes/bootstrap-test.yml
+++ b/target/classes/bootstrap-test.yml
@@ -7,17 +7,17 @@ spring:
    zhname: 开迈斯WIOS服务
  cloud:
    nacos:
-      discovery:
+#      discovery:
-        server-addr: ${nacos-server-addr}
+#        server-addr: ${nacos-server-addr}
-        namespace: ${nacos-server-namespace}
+#        namespace: ${nacos-server-namespace}
-      config:
+#      config:
-        server-addr: ${nacos-server-addr}
+#        server-addr: ${nacos-server-addr}
-        namespace: ${nacos-server-namespace}
+#        namespace: ${nacos-server-namespace}
-        shared-configs[0].data-id: constant.yml
+#        shared-configs[0].data-id: constant.yml
-        shared-configs[0].group: DEFAULT_GROUP
+#        shared-configs[0].group: DEFAULT_GROUP
-        shared-configs[0].refresh: true
+#        shared-configs[0].refresh: true
-        file-extension: yml  #指定配置中心中对应的配置文件的格式
+#        file-extension: yml  #指定配置中心中对应的配置文件的格式
-        enabled: true
+#        enabled: true
    config:
      enabled: false
  jta:

--- a/target/classes/bootstrap.yml
+++ b/target/classes/bootstrap.yml
@@ -7,19 +7,27 @@ spring:
    name: nbd-wios-manage
    zhname: 开迈斯WIOS服务
  cloud:
+#    nacos:
+#      discovery:
+#        server-addr: 10.12.1.17:8848
+#        namespace: ce18ccbc-e054-45ad-893f-ed7ebee1704b
+#      config:
+#        server-addr: 10.12.1.17:8848
+#        namespace: ce18ccbc-e054-45ad-893f-ed7ebee1704b
+#        shared-configs[0].data-id: constant.yml
+#        shared-configs[0].group: DEFAULT_GROUP
+#        shared-configs[0].refresh: true
+#        file-extension: yml  #指定配置中心中对应的配置文件的格式
+#        enabled: true
+#    config:
+#      enabled: false
    nacos:
-      discovery:
-        server-addr: 10.12.1.17:8848
-        namespace: ce18ccbc-e054-45ad-893f-ed7ebee1704b
-      config:
-        server-addr: 10.12.1.17:8848
-        namespace: ce18ccbc-e054-45ad-893f-ed7ebee1704b
-        shared-configs[0].data-id: constant.yml
-        shared-configs[0].group: DEFAULT_GROUP
-        shared-configs[0].refresh: true
-        file-extension: yml  #指定配置中心中对应的配置文件的格式
-        enabled: true
      config:
        enabled: false
+        refresh-enabled: false
+      discovery:
+        enabled: false
+        instance-enabled: false
  jta:
    enabled: false
\ No newline at end of file