日志功能重构v1

pom.xml

@@ -11,20 +11,23 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.1.9.RELEASE</version>
-        <relativePath/> <!-- lookup parent from repository -->
+        <version>2.5.14</version>
+<!--        <version>2.1.9.RELEASE</version>-->
+        <relativePath/>
+
     </parent>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>1.8</java.version>
-        <swagger.version>2.9.2</swagger.version>
+<!--        <swagger.version>2.9.2</swagger.version>-->
         <druid.version>1.1.10</druid.version>
         <jwt.version>0.9.1</jwt.version>
         <fastjson.version>1.2.58</fastjson.version>
-        <log4j.version>1.2.17</log4j.version>
+<!--        <log4j.version>1.2.17</log4j.version>-->
         <kaptcha.version>0.0.9</kaptcha.version>
+        <mapstruct.version>1.5.4.Final</mapstruct.version>
     </properties>
 
     <dependencies>
@@ -32,10 +35,10 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
             <exclusions>
-                <exclusion>
-                    <groupId>org.springframework.boot</groupId>
-                    <artifactId>spring-boot-starter-logging</artifactId>
-                </exclusion>
+<!--                <exclusion>-->
+<!--                    <groupId>org.springframework.boot</groupId>-->
+<!--                    <artifactId>spring-boot-starter-logging</artifactId>-->
+<!--                </exclusion>-->
                 <!--                &lt;!&ndash; 打成war包，排除spring-boot-starter-web中的Tomcat&ndash;&gt;-->
                 <!--                <exclusion>-->
                 <!--                    <groupId>org.springframework.boot</groupId>-->
@@ -44,11 +47,11 @@
             </exclusions>
         </dependency>
 
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-log4j</artifactId>
-            <version>1.3.8.RELEASE</version>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>org.springframework.boot</groupId>-->
+<!--            <artifactId>spring-boot-starter-log4j</artifactId>-->
+<!--            <version>1.3.8.RELEASE</version>-->
+<!--        </dependency>-->
 
         <!--        <dependency>-->
         <!--            <groupId>org.springframework.boot</groupId>-->
@@ -315,18 +318,6 @@
             <version>2.53.1</version>
         </dependency>
 
-        <!--mapStruct依赖-->
-        <dependency>
-            <groupId>org.mapstruct</groupId>
-            <artifactId>mapstruct-jdk8</artifactId>
-            <version>1.2.0.Final</version>
-        </dependency>
-        <dependency>
-            <groupId>org.mapstruct</groupId>
-            <artifactId>mapstruct-processor</artifactId>
-            <scope>provided</scope>
-            <version>1.2.0.Final</version>
-        </dependency>
 
         <!--     EXCEL导出-->
         <dependency>
@@ -352,26 +343,37 @@
         <dependency>
             <groupId>com.github.pagehelper</groupId>
             <artifactId>pagehelper-spring-boot-starter</artifactId>
-            <version>1.2.12</version>
+            <version>1.4.6</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.mybatis</groupId>
+                    <artifactId>mybatis</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.mybatis</groupId>
+                    <artifactId>mybatis-spring</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <!--mybatis-->
         <dependency>
             <groupId>org.mybatis.spring.boot</groupId>
             <artifactId>mybatis-spring-boot-starter</artifactId>
-            <version>2.1.3</version>
+            <version>2.3.0</version>
         </dependency>
 
         <!--mapper -->
         <dependency>
             <groupId>tk.mybatis</groupId>
             <artifactId>mapper-spring-boot-starter</artifactId>
-            <version>1.1.4</version>
+            <version>2.1.5</version>
         </dependency>
         <!-- mybatis配置文件生成工具 -->
         <dependency>
             <groupId>org.mybatis.generator</groupId>
             <artifactId>mybatis-generator-core</artifactId>
-            <version>1.3.6</version>
+            <version>1.4.2</version>
+<!--            <version>1.3.6</version>-->
         </dependency>
         <dependency>
             <groupId>javax.el</groupId>
@@ -458,12 +460,11 @@
             <artifactId>reflections</artifactId>
             <version>0.9.10</version>
         </dependency>
-        <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter</artifactId>
-            <version>RELEASE</version>
-            <scope>test</scope>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>org.junit.jupiter</groupId>-->
+<!--            <artifactId>junit-jupiter</artifactId>-->
+<!--            <version>5.9.1</version>-->
+<!--        </dependency>-->
 
         <!--thumbnailator图片处理-->
         <dependency>
@@ -471,6 +472,30 @@
             <artifactId>thumbnailator</artifactId>
             <version>0.4.8</version>
         </dependency>
+
+
+        <!--mapStruct依赖-->
+        <dependency>
+            <groupId>org.mapstruct</groupId>
+            <artifactId>mapstruct</artifactId>
+            <version>${mapstruct.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.mapstruct</groupId>
+            <artifactId>mapstruct-processor</artifactId>
+            <!--            <scope>provided</scope>-->
+            <version>${mapstruct.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.13.2</version>
+<!--            <version>RELEASE</version>-->
+            <scope>test</scope>
+        </dependency>
+
+
+
         <!-- rabbitmq依赖 -->
         <!--        <dependency>-->
         <!--            <groupId>org.springframework.boot</groupId>-->
@@ -495,6 +520,7 @@
                     <!--                        <exclude>*.yaml</exclude>-->
                     <!--                    </excludes>-->
                     <archive>
+<!--                        <skipTests>true</skipTests>-->
                         <manifest>
                             <!-- 执行的主程序路径 -->
                             <mainClass>com.ydtech.SpringInsApplication</mainClass>
@@ -529,6 +555,22 @@
                 </executions>
             </plugin>
 
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-resources-plugin</artifactId>
+                <version>3.1.0</version>
+            </plugin>
+
+<!--            <plugin>-->
+<!--                <groupId>org.apache.maven.plugins</groupId>-->
+<!--                <artifactId>maven-compiler-plugin</artifactId>-->
+<!--                <version>3.1</version>-->
+<!--                <configuration>-->
+<!--                    <fork>true</fork>-->
+<!--                    <executable>C:/Program Files/Java/jdk1.8.0_351/bin/javac</executable>-->
+<!--                </configuration>-->
+<!--            </plugin>-->
+
             <!--            <plugin>-->
             <!--                <artifactId>maven-resources-plugin</artifactId>-->
             <!--                <executions>-->

src/main/java/com/ydtech/components/OrderComponents.java

@@ -360,7 +360,8 @@ public class OrderComponents {
         insOrder.setUserid(user.getId());
         insOrder.setUsername(user.getName());
         insOrder.setDeptid(user.getDeptId());
-        SysDept dept = sysDeptService.selectByPk(user.getDeptId());
+        SysDept dept = sysDeptService.getById(user.getDeptId());
+//        SysDept dept = sysDeptService.selectByPk(user.getDeptId());
         insOrder.setDeptname(dept == null ? "" : dept.getName());
 
         double retailRate = countRetail(user.getDeptId(), user.getId());

src/main/java/com/ydtech/config/MvcConfig.java

@@ -21,6 +21,7 @@ import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
 import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
@@ -36,6 +37,8 @@ public class MvcConfig implements WebMvcConfigurer {
     @Value("${upload.file.path}")
     private String uploadFilePath;
 
+
+
     @Bean
     public HttpMessageConverter<String> responseBody() {
         return new StringHttpMessageConverter(StandardCharsets.UTF_8);
@@ -49,7 +52,8 @@ public class MvcConfig implements WebMvcConfigurer {
     @Override
     public void addCorsMappings(CorsRegistry registry) {
         registry.addMapping("/**")    // 允许跨域访问的路径
-                .allowedOrigins("*")    // 允许跨域访问的源
+                .allowedOriginPatterns("*")
+//                .allowedOrigins("*")    // 允许跨域访问的源
                 .allowedMethods("POST", "GET", "PUT", "OPTIONS", "DELETE")    // 允许请求方法
                 .maxAge(168000)    // 预检间隔时间
                 .allowedHeaders("*")  // 允许头部设置

src/main/java/com/ydtech/core/page/BaseController.java

@@ -29,20 +29,20 @@ public class BaseController {
     }
 
 
-    /**
-     * 获取过滤字段的值
-     *
-     * @param filterName
-     * @return
-     */
-    public String getColumnFilterValue(PageRequest pageRequest, String filterName) {
-        String value = null;
-        ColumnFilter columnFilter = pageRequest.getColumnFilter(filterName);
-        if (columnFilter != null) {
-            value = columnFilter.getValue();
-        }
-        return value;
-    }
+//    /**
+//     * 获取过滤字段的值
+//     *
+//     * @param filterName
+//     * @return
+//     */
+//    public String getColumnFilterValue(PageRequest pageRequest, String filterName) {
+//        String value = null;
+//        ColumnFilter columnFilter = pageRequest.getColumnFilter(filterName);
+//        if (columnFilter != null) {
+//            value = columnFilter.getValue();
+//        }
+//        return value;
+//    }
 
     /**
      * 获取部门id

src/main/java/com/ydtech/core/page/PageRequest.java

@@ -65,4 +65,20 @@ public class PageRequest {
         p.setCurrent(pageNum);
         return p;
     }
+
+
+    /**
+     * 获取过滤字段的值
+     *
+     * @param filterName
+     * @return
+     */
+    public static String getColumnFilterValue(PageRequest pageRequest, String filterName) {
+        String value = null;
+        ColumnFilter columnFilter = pageRequest.getColumnFilter(filterName);
+        if (columnFilter != null) {
+            value = columnFilter.getValue();
+        }
+        return value;
+    }
 }

src/main/java/com/ydtech/modules/admin/controller/SysDeptController.java

@@ -4,6 +4,7 @@ import com.ydtech.core.page.HttpResult;
 import com.ydtech.core.page.PageRequest;
 import com.ydtech.modules.admin.model.SysDept;
 import com.ydtech.modules.admin.service.SysDeptService;
+import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -20,41 +21,32 @@ public class SysDeptController {
     @Autowired
     private SysDeptService sysDeptService;
 
-//	@PreAuthorize("hasAuthority('sys:dept:add') AND hasAuthority('sys:dept:edit')")
-//	@PostMapping(value="/save")
-//	public HttpResult save(@RequestBody SysDept record) {
-//		return HttpResult.ok(sysDeptService.save(record));
-//	}
 
-    @PreAuthorize("hasAuthority('sys:dept:add')")
+//    @PreAuthorize("hasAuthority('sys:dept:add')")
     @PostMapping(value = "/add")
     public HttpResult add(@RequestBody SysDept record) {
-        return HttpResult.ok(sysDeptService.add(record));
+        return HttpResult.ok(sysDeptService.save(record));
+//        return HttpResult.ok(sysDeptService.add(record));
     }
 
-    @PreAuthorize("hasAuthority('sys:dept:edit')")
+//    @PreAuthorize("hasAuthority('sys:dept:edit')")
     @PostMapping(value = "/edit")
     public HttpResult edit(@RequestBody SysDept record) {
-        return HttpResult.ok(sysDeptService.edit(record));
+        return HttpResult.ok(sysDeptService.updateById(record));
     }
 
-    @PreAuthorize("hasAuthority('sys:dept:delete')")
+//    @PreAuthorize("hasAuthority('sys:dept:delete')")
     @PostMapping(value = "/delete")
     public HttpResult delete(@RequestBody List<SysDept> records) {
         System.out.println("" + records);
-        return HttpResult.ok(sysDeptService.delete(records));
+        return HttpResult.ok(sysDeptService.removeByIds(records));
     }
 
-//	//@PreAuthorize("hasAuthority('sys:dept:delete')")
-//	@PostMapping(value="/delete")
-//	public HttpResult delete(@RequestBody List<SysDept> records) {
-//		return HttpResult.ok(sysDeptService.deletelike(Long.valueOf(id)));
-//	}
-
     //@PreAuthorize("hasAuthority('sys:dept:view')")
+    @ApiOperation(value = "获取树结构")
     @GetMapping(value = "/findTree")
-    public HttpResult findTree() {
-        return HttpResult.ok(sysDeptService.findTree());
+    public HttpResult findTree(SysDept sysDept) {
+        return HttpResult.ok(sysDeptService.findTree(sysDept));
     }
 
     @GetMapping(value = "/findLeftDeptTree")
@@ -65,14 +57,14 @@ public class SysDeptController {
         }
         return HttpResult.ok(sysDeptService.selectListTreeSysDeptVO(deptCode));
     }
-
-//    @PreAuthorize("hasAuthority('sys:dept:view')")
+//
+////    @PreAuthorize("hasAuthority('sys:dept:view')")
     @PostMapping(value = "/findSubDept")
     public HttpResult findSubDept(@RequestBody PageRequest pageRequest) {
         return HttpResult.ok(sysDeptService.findSubDepts(pageRequest));
     }
-
-//    @PreAuthorize("hasAuthority('sys:dept:view')")
+//
+////    @PreAuthorize("hasAuthority('sys:dept:view')")
     @GetMapping(value = "/findMaxDeptId")
     public HttpResult findMaxDeptId(String deptId) {
         int i = 100;
@@ -80,8 +72,8 @@ public class SysDeptController {
         maxDeptId = sysDeptService.findMaxDeptId(deptId);
         return HttpResult.ok(maxDeptId);
     }
-
-//    @PreAuthorize("hasAuthority('sys:dept:view')")
+//
+////    @PreAuthorize("hasAuthority('sys:dept:view')")
     @GetMapping(value = "/findMaxHouseId")
     public HttpResult findMaxHouseId(String deptId) {
         int i = 100;
@@ -89,11 +81,12 @@ public class SysDeptController {
         maxDeptId = sysDeptService.findMaxHouseId(deptId);
         return HttpResult.ok(maxDeptId);
     }
-
-    //    @PreAuthorize("hasAuthority('sys:dept:view')")
+//
+//    //    @PreAuthorize("hasAuthority('sys:dept:view')")
     @GetMapping(value = "/getDeptById")
     public HttpResult getDeptById(String id) {
-        SysDept sysDept = sysDeptService.selectByPk(id);
+        SysDept sysDept = sysDeptService.getById(id);
+//        SysDept sysDept = sysDeptService.selectByPk(id);
         logger.info(sysDept.toString());
         return HttpResult.ok(sysDept);
     }

src/main/java/com/ydtech/modules/admin/controller/SysDictController.java

@@ -108,7 +108,7 @@ public class SysDictController extends BaseController {
         return HttpResult.ok(sysDictService.findPage(pageRequest));
     }
 
-    //	@PreAuthorize("hasAuthority('sys:dict:view')")
+//    //	@PreAuthorize("hasAuthority('sys:dict:view')")
     @GetMapping(value = "/findByLable")
     public HttpResult findByLable(@RequestParam String lable, HttpServletRequest request) {
         List<SysDict> byLable = sysDictService.findByLable(lable);

src/main/java/com/ydtech/modules/admin/controller/SysUserController.java

@@ -132,10 +132,10 @@ public class SysUserController extends BaseController {
     public HttpResult queryPage(@RequestBody PageRequest pageRequest) {
         int pageNum = pageRequest.getPageNum();
         int pageSize = pageRequest.getPageSize();
-        String deptid = getColumnFilterValue(pageRequest, "deptid");
-        String name = getColumnFilterValue(pageRequest, "name");
-        String containsSubDept = getColumnFilterValue(pageRequest, "containsSubDept");
-        String mobile = getColumnFilterValue(pageRequest, "mobile");
+        String deptid = pageRequest.getColumnFilterValue(pageRequest, "deptid");
+        String name = pageRequest.getColumnFilterValue(pageRequest, "name");
+        String containsSubDept = pageRequest.getColumnFilterValue(pageRequest, "containsSubDept");
+        String mobile = pageRequest.getColumnFilterValue(pageRequest, "mobile");
         StringBuffer whereStr = new StringBuffer(" where 1=1");
         ArrayList array = new ArrayList();
         if (!StringUtils.isEmpty(deptid) && !StringUtils.isEmpty(containsSubDept) && "1".equals(containsSubDept)) {
@@ -194,8 +194,8 @@ public class SysUserController extends BaseController {
 
         int pageNum = pageRequest.getPageNum();
         int pageSize = pageRequest.getPageSize();
-        String name = getColumnFilterValue(pageRequest, "name");
-//		String email = getColumnFilterValue(pageRequest, "email");
+        String name = pageRequest.getColumnFilterValue(pageRequest, "name");
+//		String email = pageRequest.getColumnFilterValue(pageRequest, "email");
         //需要处理传入的部门
         PageResult pageResult = sysUserService.selectPagingCustom(pageNum, pageSize, name, "");
         sysUserService.findSysUseresmUserInternalVORoles(pageResult);

src/main/java/com/ydtech/modules/admin/dao/SysDeptMapper.java

@@ -0,0 +1,11 @@
+package com.ydtech.modules.admin.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ydtech.modules.admin.model.SysDept;
+
+public interface SysDeptMapper extends BaseMapper<SysDept> {
+
+}
+
+
+

src/main/java/com/ydtech/modules/admin/model/SysDept.java

@@ -1,274 +1,122 @@
 package com.ydtech.modules.admin.model;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
 import java.util.List;
 
+@TableName(value = "sys_dept")
+@Data
+@ApiModel(value = "机构管理")
 public class SysDept implements Serializable {
 
     private static final long serialVersionUID = 5394001562423038630L;
 
+    @TableId(value = "id")
+    @ApiModelProperty(value = "id")
     private String id;
+
+    @TableField(value = "name")
+    @ApiModelProperty(value = "机构名称")
     private String name;
+
+    @TableField(value = "parent_id")
+    @ApiModelProperty(value = "上级机构ID，一级机构为0")
     private String parentId;
+
+    @TableField(value = "order_num")
+    @ApiModelProperty(value = "排序")
     private Integer orderNum;
+
+    @TableField(value = "create_by")
+    @ApiModelProperty(value = "创建人")
     private String createBy;
+
+    @TableField(value = "create_time")
+    @ApiModelProperty(value = "创建时间")
     private Date createTime;
+
+    @TableField(value = "last_update_by")
+    @ApiModelProperty(value = "更新人")
     private String lastUpdateBy;
+
+    @TableField(value = "last_update_time")
+    @ApiModelProperty(value = "更新时间")
     private Date lastUpdateTime;
+
+    @TableField(value = "del_flag")
+    @ApiModelProperty(value = "是否删除  -1：已删除  0：正常")
     private Integer delFlag;
+
+    @TableField(value = "comtype")
+    @ApiModelProperty(value = "机构类型")
     private String comtype;
+
+    @TableField(value = "comlevel")
+    @ApiModelProperty(value = "机构级别")
     private String comlevel;
+
+    @TableField(value = "address")
+    @ApiModelProperty(value = "机构地址")
     private String address;
+
+    @TableField(value = "leadername")
+    @ApiModelProperty(value = "负责人姓名")
     private String leadername;
+
+    @TableField(value = "leaderphone")
+    @ApiModelProperty(value = "负责人电话")
     private String leaderphone;
+
+    @TableField(value = "comattribute")
+    @ApiModelProperty(value = "机构性质")
     private String comattribute;
+
+    @TableField(value = "isstop")
+    @ApiModelProperty(value = "是否停业")
     private String isstop;
+
+    @TableField(value = "dept_code")
+    @ApiModelProperty(value = "机构编码")
     private String deptCode;
+
+    @TableField(value = "province")
+    @ApiModelProperty(value = "省")
     private String province;
+
+    @TableField(value = "city")
+    @ApiModelProperty(value = "市")
     private String city;
+
+    @TableField(value = "area")
+    @ApiModelProperty(value = "区县")
     private String area;
+
+    @TableField(value = "house")
+    @ApiModelProperty(value = "门店")
     private String house;
+
+    @TableField(value = "dept_type")
+    @ApiModelProperty(value = "子公司C,门店M,部门D")
     private String deptType;
 
+    @TableField(exist = false)
     private List<SysDept> children;
 
     // 非数据库字段
+    @TableField(exist = false)
     private String parentName;
     // 非数据库字段
+    @TableField(exist = false)
     private Integer level;
 
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getParentId() {
-        return parentId;
-    }
-
-    public void setParentId(String parentId) {
-        this.parentId = parentId;
-    }
-
-    public Integer getOrderNum() {
-        return orderNum;
-    }
-
-    public void setOrderNum(Integer orderNum) {
-        this.orderNum = orderNum;
-    }
-
-    public String getCreateBy() {
-        return createBy;
-    }
-
-    public void setCreateBy(String createBy) {
-        this.createBy = createBy;
-    }
-
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-
-    public String getLastUpdateBy() {
-        return lastUpdateBy;
-    }
-
-    public void setLastUpdateBy(String lastUpdateBy) {
-        this.lastUpdateBy = lastUpdateBy;
-    }
-
-    public Date getLastUpdateTime() {
-        return lastUpdateTime;
-    }
-
-    public void setLastUpdateTime(Date lastUpdateTime) {
-        this.lastUpdateTime = lastUpdateTime;
-    }
-
-    public Integer getDelFlag() {
-        return delFlag;
-    }
-
-    public void setDelFlag(Integer delFlag) {
-        this.delFlag = delFlag;
-    }
-
-    public String getComtype() {
-        return comtype;
-    }
-
-    public void setComtype(String comtype) {
-        this.comtype = comtype;
-    }
-
-    public String getComlevel() {
-        return comlevel;
-    }
-
-    public void setComlevel(String comlevel) {
-        this.comlevel = comlevel;
-    }
-
-    public String getAddress() {
-        return address;
-    }
-
-    public void setAddress(String address) {
-        this.address = address;
-    }
-
-    public String getLeadername() {
-        return leadername;
-    }
-
-    public void setLeadername(String leadername) {
-        this.leadername = leadername;
-    }
-
-    public String getLeaderphone() {
-        return leaderphone;
-    }
 
-    public void setLeaderphone(String leaderphone) {
-        this.leaderphone = leaderphone;
-    }
-
-    public String getComattribute() {
-        return comattribute;
-    }
-
-    public void setComattribute(String comattribute) {
-        this.comattribute = comattribute;
-    }
-
-    public String getIsstop() {
-        return isstop;
-    }
-
-    public void setIsstop(String isstop) {
-        this.isstop = isstop;
-    }
-
-    public String getDeptCode() {
-        return deptCode;
-    }
-
-    public void setDeptCode(String deptCode) {
-        this.deptCode = deptCode;
-    }
-
-    public String getProvince() {
-        return province;
-    }
-
-    public void setProvince(String province) {
-        this.province = province;
-    }
-
-    public String getCity() {
-        return city;
-    }
-
-    public void setCity(String city) {
-        this.city = city;
-    }
-
-    public String getArea() {
-        return area;
-    }
-
-    public void setArea(String area) {
-        this.area = area;
-    }
-
-    public String getHouse() {
-        return house;
-    }
-
-    public void setHouse(String house) {
-        this.house = house;
-    }
-
-    public String getDeptType() {
-        return deptType;
-    }
-
-    public void setDeptType(String deptType) {
-        this.deptType = deptType;
-    }
-
-
-    public List<SysDept> getChildren() {
-        return children;
-    }
-
-    public void setChildren(List<SysDept> children) {
-        this.children = children;
-    }
-
-    public Integer getLevel() {
-        return level;
-    }
-
-    public void setLevel(Integer level) {
-        this.level = level;
-    }
-
-    public String getParentName() {
-        return parentName;
-    }
-
-    public void setParentName(String parentName) {
-        this.parentName = parentName;
-    }
-
-    @Override
-    public String toString() {
-        return "SysDept{" +
-                "id='" + id + '\'' +
-                ", name='" + name + '\'' +
-                ", parentId='" + parentId + '\'' +
-                ", orderNum=" + orderNum +
-                ", createBy='" + createBy + '\'' +
-                ", createTime=" + createTime +
-                ", lastUpdateBy='" + lastUpdateBy + '\'' +
-                ", lastUpdateTime=" + lastUpdateTime +
-                ", delFlag=" + delFlag +
-                ", comtype='" + comtype + '\'' +
-                ", comlevel='" + comlevel + '\'' +
-                ", address='" + address + '\'' +
-                ", leadername='" + leadername + '\'' +
-                ", leaderphone='" + leaderphone + '\'' +
-                ", comattribute='" + comattribute + '\'' +
-                ", isstop='" + isstop + '\'' +
-                ", deptCode='" + deptCode + '\'' +
-                ", province='" + province + '\'' +
-                ", city='" + city + '\'' +
-                ", area='" + area + '\'' +
-                ", house='" + house + '\'' +
-                ", deptType='" + deptType + '\'' +
-                ", children=" + children +
-                ", parentName='" + parentName + '\'' +
-                ", level=" + level +
-                '}';
-    }
 }
 
 

src/main/java/com/ydtech/modules/admin/service/SysDeptService.java

@@ -1,39 +1,47 @@
 package com.ydtech.modules.admin.service;
 
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.ydtech.modules.admin.dao.SysDeptDao;
 import com.ydtech.modules.admin.model.SysDept;
 import com.ydtech.modules.admin.vo.TreeSysDeptVO;
 import com.ydtech.core.page.PageRequest;
 import com.ydtech.core.page.PageResult;
+import com.ydtech.modules.esm.model.EsmInsCompany;
+import com.ydtech.modules.esm.vo.req.EsmInsCompanyReq;
 
 import java.util.List;
 
-public interface SysDeptService extends SysDeptDao {
-    /**
-     * 查询机构树
-     *
-     * @param
-     * @return
-     */
-    List<SysDept> findTree();
-
+public interface SysDeptService extends IService<SysDept> {
+//public interface SysDeptService extends SysDeptDao {
+//    /**
+//     * 查询机构树
+//     *
+//     * @param
+//     * @return
+//     */
+//    List<SysDept> findTree();
+//
     //查找自已有权限的部门树
     public List<TreeSysDeptVO> selectListTreeSysDeptVO(String deptCode);
-
+//
     public PageResult findSubDepts(PageRequest pageRequest);
-
-    public int add(SysDept record);
-
-    public int edit(SysDept record);
-
+//
+//    public int add(SysDept record);
+//
+//    public int edit(SysDept record);
+//
     public String findMaxDeptId(String deptId);
-
+//
     public String findMaxHouseId(String deptId);
+//
+//    public SysDept selectByPk(String id);
+//
+    List<TreeSysDeptVO> selectListWhere(String where, Object[] paramValues);
 
-    public SysDept selectByPk(String id);
 
-    List<TreeSysDeptVO> selectListWhere(String where, Object[] paramValues);
+
+    List<SysDept> findTree(SysDept sysDept);
 }
 
 

src/main/java/com/ydtech/modules/admin/service/impl/SysDeptServiceImpl.java

@@ -1,5 +1,12 @@
 package com.ydtech.modules.admin.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ydtech.core.page.HttpResult;
+import com.ydtech.modules.admin.dao.SysDeptMapper;
 import com.ydtech.modules.admin.vo.TreeSysDeptVO;
 import com.ydtech.core.page.ColumnFilter;
 import com.ydtech.core.page.PageRequest;
@@ -7,6 +14,8 @@ import com.ydtech.core.page.PageResult;
 import com.ydtech.modules.admin.dao.impl.SysDeptDaoImpl;
 import com.ydtech.modules.admin.model.SysDept;
 import com.ydtech.modules.admin.service.SysDeptService;
+import com.ydtech.modules.esm.dao.EsmInsCompanyMapper;
+import com.ydtech.modules.esm.model.EsmInsCompany;
 import com.ydtech.utils.StringUtils;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.core.RowCallbackHandler;
@@ -16,114 +25,188 @@ import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
+import java.util.concurrent.atomic.AtomicBoolean;
 
 
 @Service
-public class SysDeptServiceImpl extends SysDeptDaoImpl
+public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept>
         implements SysDeptService {
-
-
     @Override
-    public int add(SysDept record) {
-        return insertSelective(record);
-    }
+    public List<SysDept> findTree(SysDept sysDept) {
+        LambdaQueryWrapper<SysDept> lqw = new LambdaQueryWrapper();
+        lqw.eq(SysDept::getDelFlag,0);
+        if (null != sysDept) {
+            lqw.like(StringUtils.isNotEmpty(sysDept.getName()), SysDept::getName, sysDept.getName());
+//            lqw.like(StringUtils.isNotEmpty(req.getParentId()), EsmInsCompany::getParentId, req.getParentId());
+        }
 
-    @Override
-    public int edit(SysDept record) {
-        return updateSelective(record);
-    }
+        List<SysDept> list = new ArrayList<>();
+        List<SysDept> allList = list(lqw);
 
-    public PageResult findSubDepts(PageRequest pageRequest) {
-        //sysDeptDaoxx.selectPaging()
-        ColumnFilter columnFilter = pageRequest.getColumnFilter("id");
-        if (columnFilter != null) {
-            String id = columnFilter.getValue();
-            //只选后2位的
-            return selectPaging(pageRequest.getPageNum(), pageRequest.getPageSize(), " where parent_id=?", new Object[]{id});
-        }
-        return selectPaging(pageRequest.getPageNum(), pageRequest.getPageSize(), " ", null);
-    }
+        allList.stream().forEach(r -> {
+            if (StringUtils.isNullOrEmpty(r.getParentId()) || r.getParentId().equalsIgnoreCase("0")) {
+                if (!exists(list, r)) {
+                    list.add(r);
+                }
+            }
+
+        });
 
 
-    public SysDept findById(Long id) {
-        return selectByPk("" + id);
+        findChildren(list, allList);
+        return list;
     }
+//public class SysDeptServiceImpl extends SysDeptDaoImpl
+//        implements SysDeptService {
+
+
+//    @Override
+//    public int add(SysDept record) {
+//        return insertSelective(record);
+//    }
+//
+//    @Override
+//    public int edit(SysDept record) {
+//        return updateSelective(record);
+//    }
+//
+    public PageResult findSubDepts(PageRequest pageRequest) {
 
-//	public PageResult findPage(PageRequest pageRequest) {
-//		return MybatisPageHelper.findPage(pageRequest, sysDeptMapper);
-//	}
 
-    @Override
-    public List<SysDept> findTree() {
-        List<SysDept> sysDepts = new ArrayList<>();
-        List<SysDept> depts = selectAll();
-        for (SysDept dept : depts) {
-            if (StringUtils.isNullOrEmpty(dept.getParentId()) || dept.getParentId().equals("0") ) {
-                dept.setLevel(0);
-                sysDepts.add(dept);
-            }
-        }
-        findChildren(sysDepts, depts);
-        return sysDepts;
-    }
+        String id = pageRequest.getColumnFilterValue(pageRequest, "id");
 
-    private void findChildren(List<SysDept> sysDepts, List<SysDept> depts) {
-        for (SysDept sysDept : sysDepts) {
-            List<SysDept> children = new ArrayList<>();
-            for (SysDept dept : depts) {
-                if (sysDept.getId() != null && sysDept.getId().equals(dept.getParentId())) {
-//					dept.setParentName(dept.getName());
-                    dept.setParentName(dept.getParentName());
-                    dept.setLevel(sysDept.getLevel() + 1);
-                    children.add(dept);
-                }
-            }
-            sysDept.setChildren(children);
-            findChildren(children, depts);
-        }
-    }
+        Page p = PageRequest.buildPageRequest(pageRequest);
+        LambdaQueryWrapper<SysDept> lqw = new LambdaQueryWrapper();
+        lqw.eq(StringUtils.isNotEmpty(id),SysDept::getParentId,id);
+
+        IPage<SysDept> pResult = page(p,lqw);
 
-    //----------------------------------------------------------
+        //传入查询条件
+        PageResult pageResult = PageResult.buildPageResult(pResult);
+        return pageResult;
 
+    }
+//
+//
+//    public SysDept findById(Long id) {
+//        return selectByPk("" + id);
+//    }
+//
+////	public PageResult findPage(PageRequest pageRequest) {
+////		return MybatisPageHelper.findPage(pageRequest, sysDeptMapper);
+////	}
+//
+//    @Override
+//    public List<SysDept> findTree() {
+//        List<SysDept> sysDepts = new ArrayList<>();
+//        List<SysDept> depts = selectAll();
+//        for (SysDept dept : depts) {
+//            if (StringUtils.isNullOrEmpty(dept.getParentId()) || dept.getParentId().equals("0") ) {
+//                dept.setLevel(0);
+//                sysDepts.add(dept);
+//            }
+//        }
+//        findChildren(sysDepts, depts);
+//        return sysDepts;
+//    }
+//
+//    private void findChildren(List<SysDept> sysDepts, List<SysDept> depts) {
+//        for (SysDept sysDept : sysDepts) {
+//            List<SysDept> children = new ArrayList<>();
+//            for (SysDept dept : depts) {
+//                if (sysDept.getId() != null && sysDept.getId().equals(dept.getParentId())) {
+////					dept.setParentName(dept.getName());
+//                    dept.setParentName(dept.getParentName());
+//                    dept.setLevel(sysDept.getLevel() + 1);
+//                    children.add(dept);
+//                }
+//            }
+//            sysDept.setChildren(children);
+//            findChildren(children, depts);
+//        }
+//    }
+//
+//    //----------------------------------------------------------
+//
     //查找自已有权限的部门树
     public List<TreeSysDeptVO> selectListTreeSysDeptVO(String id) {
         if (id == null) id = "";
-
-        String sql = "select t1.id, t1.name, t1.parent_id, t1.dept_code, t1.province, t1.city, t1.area, t1.comlevel from  sys_dept t1 where id like ? order by order_num ";
-
-        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
-
+        LambdaQueryWrapper<SysDept> lqw = new LambdaQueryWrapper<>();
+        lqw.like(StringUtils.isNotEmpty(id),SysDept::getId,id);
+        List<SysDept> deptList = list(lqw);
         List<TreeSysDeptVO> recordList = new ArrayList<TreeSysDeptVO>();
 
-        jdbcTemplate.query(sql, new Object[]{id + "%"},
-                new RowCallbackHandler() {
-                    @Override
-                    public void processRow(ResultSet resultSet) throws SQLException {
-                        TreeSysDeptVO model = new TreeSysDeptVO();
-                        model.setId(resultSet.getString("id"));
-                        model.setName(resultSet.getString("name"));
-                        model.setParentId(resultSet.getString("parent_id"));
-                        model.setDeptCode(resultSet.getString("dept_code"));
-                        model.setProvince(resultSet.getString("province"));
-                        model.setCity(resultSet.getString("city"));
-                        model.setArea(resultSet.getString("area"));
-                        model.setComlevel(resultSet.getString("comlevel"));
-                        recordList.add(model);
-                    }
-                });
+        deptList.stream().forEach(a ->{
+            TreeSysDeptVO model = new TreeSysDeptVO();
+            model.setId(a.getId());
+            model.setName(a.getName());
+            model.setParentId(a.getParentId());
+            model.setDeptCode(a.getDeptCode());
+            model.setProvince(a.getProvince());
+            model.setCity(a.getCity());
+            model.setArea(a.getArea());
+            model.setComlevel(a.getComlevel());
+            recordList.add(model);
+        });
 
         return recordList;
     }
-
+//    public List<TreeSysDeptVO> selectListTreeSysDeptVO(String id) {
+//        if (id == null) id = "";
+//
+//        String sql = "select t1.id, t1.name, t1.parent_id, t1.dept_code, t1.province, t1.city, t1.area, t1.comlevel from  sys_dept t1 where id like ? order by order_num ";
+//
+//        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
+//
+//        List<TreeSysDeptVO> recordList = new ArrayList<TreeSysDeptVO>();
+//
+//        jdbcTemplate.query(sql, new Object[]{id + "%"},
+//                new RowCallbackHandler() {
+//                    @Override
+//                    public void processRow(ResultSet resultSet) throws SQLException {
+//                        TreeSysDeptVO model = new TreeSysDeptVO();
+//                        model.setId(resultSet.getString("id"));
+//                        model.setName(resultSet.getString("name"));
+//                        model.setParentId(resultSet.getString("parent_id"));
+//                        model.setDeptCode(resultSet.getString("dept_code"));
+//                        model.setProvince(resultSet.getString("province"));
+//                        model.setCity(resultSet.getString("city"));
+//                        model.setArea(resultSet.getString("area"));
+//                        model.setComlevel(resultSet.getString("comlevel"));
+//                        recordList.add(model);
+//                    }
+//                });
+//
+//        return recordList;
+//    }
+
+//    public String findMaxDeptId(String deptId) {
+//        if (deptId == null) return "";
+//        String result = "00";
+//
+//        String sql = "SELECT IFNULL(MAX(id),0) maxid FROM sys_dept t1 WHERE t1.id LIKE ? ";
+//
+//        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
+//        String maxId = jdbcTemplate.queryForObject(sql, new Object[]{deptId + "D%"}, String.class);
+//
+//        if (!maxId.equalsIgnoreCase("0") && !maxId.equalsIgnoreCase(deptId)) {
+//            result = maxId.substring(deptId.length() + 1);
+//        }
+//
+//        return result;
+//    }
     public String findMaxDeptId(String deptId) {
         if (deptId == null) return "";
         String result = "00";
 
-        String sql = "SELECT IFNULL(MAX(id),0) maxid FROM sys_dept t1 WHERE t1.id LIKE ? ";
 
-        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
-        String maxId = jdbcTemplate.queryForObject(sql, new Object[]{deptId + "D%"}, String.class);
+        QueryWrapper<SysDept> qw = new QueryWrapper<>();
+        qw.like(StringUtils.isNotEmpty(deptId),"id",deptId + "D%");
 
+        qw.select("IFNULL(MAX(id),0) maxid");
+        Map<String,Object> m = getMap(qw);
+        String maxId = m.get("maxid").toString();
         if (!maxId.equalsIgnoreCase("0") && !maxId.equalsIgnoreCase(deptId)) {
             result = maxId.substring(deptId.length() + 1);
         }
@@ -132,44 +215,95 @@ public class SysDeptServiceImpl extends SysDeptDaoImpl
     }
 
     public String findMaxHouseId(String deptId) {
+
         if (deptId == null) return "";
         String result = "00";
 
-        String sql = "SELECT IFNULL(MAX(id),0) maxid FROM sys_dept t1 WHERE t1.id LIKE ? ";
 
-        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
-        String maxId = jdbcTemplate.queryForObject(sql, new Object[]{deptId + "M%"}, String.class);
+        QueryWrapper<SysDept> qw = new QueryWrapper<>();
+        qw.like(StringUtils.isNotEmpty(deptId),"id",deptId + "M%");
 
+        qw.select("IFNULL(MAX(id),0) maxid");
+        Map<String,Object> m = getMap(qw);
+        String maxId = m.get("maxid").toString();
         if (!maxId.equalsIgnoreCase("0") && !maxId.equalsIgnoreCase(deptId)) {
             result = maxId.substring(deptId.length() + 1);
         }
 
         return result;
-    }
 
+
+//        if (deptId == null) return "";
+//        String result = "00";
+//
+//        String sql = "SELECT IFNULL(MAX(id),0) maxid FROM sys_dept t1 WHERE t1.id LIKE ? ";
+//
+//        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
+//        String maxId = jdbcTemplate.queryForObject(sql, new Object[]{deptId + "M%"}, String.class);
+//
+//        if (!maxId.equalsIgnoreCase("0") && !maxId.equalsIgnoreCase(deptId)) {
+//            result = maxId.substring(deptId.length() + 1);
+//        }
+//
+//        return result;
+    }
+//
     @Override
     public List<TreeSysDeptVO> selectListWhere(String where, Object[] paramValues) {
-        String sql = "select t1.id, t1.name, t1.parent_id, t1.dept_code, t1.province, t1.city, t1.area, t1.comlevel from  sys_dept t1 where del_flag='0' " + where;
 
-        JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource);
+        String sql = "select t1.id, t1.name, t1.parent_id, t1.dept_code, t1.province, t1.city, t1.area, t1.comlevel from  sys_dept t1 where del_flag='0' " + where;
+        QueryWrapper<SysDept> qw = new QueryWrapper<>();
+        qw.select(sql);
+        List<SysDept> sysDeptList = list(qw);
 
         List<TreeSysDeptVO> recordList = new ArrayList<TreeSysDeptVO>();
 
-        jdbcTemplate.query(sql, paramValues,
-                resultSet -> {
-                    TreeSysDeptVO model = new TreeSysDeptVO();
-                    model.setId(resultSet.getString("id"));
-                    model.setName(resultSet.getString("name"));
-                    model.setParentId(resultSet.getString("parent_id"));
-                    model.setDeptCode(resultSet.getString("dept_code"));
-                    model.setProvince(resultSet.getString("province"));
-                    model.setCity(resultSet.getString("city"));
-                    model.setArea(resultSet.getString("area"));
-                    model.setComlevel(resultSet.getString("comlevel"));
-                    recordList.add(model);
-                });
+        sysDeptList.stream().forEach(a ->{
+            TreeSysDeptVO model = new TreeSysDeptVO();
+            model.setId(a.getId());
+            model.setName(a.getName());
+            model.setParentId(a.getParentId());
+            model.setDeptCode(a.getDeptCode());
+            model.setProvince(a.getProvince());
+            model.setCity(a.getCity());
+            model.setArea(a.getArea());
+            model.setComlevel(a.getComlevel());
+            recordList.add(model);
+        });
+
         return recordList;
     }
+
+
+
+    private boolean exists(List<SysDept> insSysDeptList, SysDept insSysDept) {
+        AtomicBoolean exist = new AtomicBoolean(false);
+        insSysDeptList.stream().forEach(a -> {
+            if (a.getId().equals(insSysDept.getId())) {
+                exist.set(true);
+            }
+        });
+
+        return exist.get();
+    }
+
+
+    private void findChildren(List<SysDept> list, List<SysDept> allList) {
+        for (SysDept l : list) {
+            List<SysDept> children = new ArrayList<>();
+            for (SysDept sysDept : allList) {
+
+                if (l.getId() != null && l.getId().equals(sysDept.getParentId())) {
+                    if (!exists(children, sysDept)) {
+                        children.add(sysDept);
+                    }
+                }
+            }
+            l.setChildren(children);
+//            children.sort((o1, o2) -> o1.getOrderNum().compareTo(o2.getOrderNum()));
+            findChildren(children, allList);
+        }
+    }
 }
 
 

src/main/java/com/ydtech/modules/esm/controller/EsmAgreementCheckController.java

@@ -206,8 +206,8 @@ public class EsmAgreementCheckController extends BaseController {
     public HttpResult prodfeePage(@RequestBody PageRequest pageRequest) {
         int pageNum = pageRequest.getPageNum();
         int pageSize = pageRequest.getPageSize();
-//        String comcode = getColumnFilterValue(pageRequest, "comcode"); // 所属机构
-        String status = getColumnFilterValue(pageRequest, "status"); // 协议状态
+//        String comcode = pageRequest.getColumnFilterValue(pageRequest, "comcode"); // 所属机构
+        String status = pageRequest.getColumnFilterValue(pageRequest, "status"); // 协议状态
 //        StringBuffer whereStr = new StringBuffer(" where 1=1");
 //        ArrayList array = new ArrayList();
 
@@ -414,14 +414,14 @@ public class EsmAgreementCheckController extends BaseController {
 
         int pageNum = pageRequest.getPageNum();
         int pageSize = pageRequest.getPageSize();
-        String comcode = getColumnFilterValue(pageRequest, "comcode"); // 所属机构
-        String inscode = getColumnFilterValue(pageRequest, "inscode"); // 保险公司
-        String insshortcode = getColumnFilterValue(pageRequest, "insshortcode"); // 保险公司简称
-        String startdate = getColumnFilterValue(pageRequest, "startdate"); // 开始时间
-        String enddate = getColumnFilterValue(pageRequest, "enddate"); // 截止时间
-        String status = getColumnFilterValue(pageRequest, "status"); // 协议状态
-        String productid = getColumnFilterValue(pageRequest, "productid"); // 产品代码
-        String cancity = getColumnFilterValue(pageRequest, "cancity"); // 可承保城市
+        String comcode = pageRequest.getColumnFilterValue(pageRequest, "comcode"); // 所属机构
+        String inscode = pageRequest.getColumnFilterValue(pageRequest, "inscode"); // 保险公司
+        String insshortcode = pageRequest.getColumnFilterValue(pageRequest, "insshortcode"); // 保险公司简称
+        String startdate = pageRequest.getColumnFilterValue(pageRequest, "startdate"); // 开始时间
+        String enddate = pageRequest.getColumnFilterValue(pageRequest, "enddate"); // 截止时间
+        String status = pageRequest.getColumnFilterValue(pageRequest, "status"); // 协议状态
+        String productid = pageRequest.getColumnFilterValue(pageRequest, "productid"); // 产品代码
+        String cancity = pageRequest.getColumnFilterValue(pageRequest, "cancity"); // 可承保城市
         StringBuffer whereStr = new StringBuffer(" where 1=1");
         ArrayList array = new ArrayList();
 

src/main/java/com/ydtech/modules/esm/controller/EsmAgreementController.java

@@ -208,16 +208,16 @@ public class EsmAgreementController extends BaseController {
 
         int pageNum = pageRequest.getPageNum();
         int pageSize = pageRequest.getPageSize();
-        String comcode = getColumnFilterValue(pageRequest, "comcode"); // 所属机构
-        String inscode = getColumnFilterValue(pageRequest, "inscode"); // 保险公司
-        String insshortcode = getColumnFilterValue(pageRequest, "insshortcode"); // 保险公司简称
-        String startdate = getColumnFilterValue(pageRequest, "startdate"); // 开始时间
-        String enddate = getColumnFilterValue(pageRequest, "enddate"); // 截止时间
-        String status = getColumnFilterValue(pageRequest, "status"); // 协议状态
-        String feestatus = getColumnFilterValue(pageRequest, "feestatus"); // 费用状态
-        String feeflag = getColumnFilterValue(pageRequest, "feeflag"); // 费用标志
-        String productid = getColumnFilterValue(pageRequest, "productid"); // 产品代码
-        String cancity = getColumnFilterValue(pageRequest, "cancity"); // 可承保城市
+        String comcode = pageRequest.getColumnFilterValue(pageRequest, "comcode"); // 所属机构
+        String inscode = pageRequest.getColumnFilterValue(pageRequest, "inscode"); // 保险公司
+        String insshortcode = pageRequest.getColumnFilterValue(pageRequest, "insshortcode"); // 保险公司简称
+        String startdate = pageRequest.getColumnFilterValue(pageRequest, "startdate"); // 开始时间
+        String enddate = pageRequest.getColumnFilterValue(pageRequest, "enddate"); // 截止时间
+        String status = pageRequest.getColumnFilterValue(pageRequest, "status"); // 协议状态
+        String feestatus = pageRequest.getColumnFilterValue(pageRequest, "feestatus"); // 费用状态
+        String feeflag = pageRequest.getColumnFilterValue(pageRequest, "feeflag"); // 费用标志
+        String productid = pageRequest.getColumnFilterValue(pageRequest, "productid"); // 产品代码
+        String cancity = pageRequest.getColumnFilterValue(pageRequest, "cancity"); // 可承保城市
         StringBuffer whereStr = new StringBuffer(" where 1=1");
         ArrayList array = new ArrayList();
         if (comcode != null && comcode.length() > 0) {

src/main/java/com/ydtech/modules/esm/controller/EsmAgreementGroupController.java

@@ -83,13 +83,13 @@ public class EsmAgreementGroupController extends BaseController {
         int pageNum = pageRequest.getPageNum();
         int pageSize = pageRequest.getPageSize();
 
-        String agreename = getColumnFilterValue(pageRequest, "agreename");
-        String startdate = getColumnFilterValue(pageRequest, "startdate"); // 开始时间
-        String enddate = getColumnFilterValue(pageRequest, "enddate"); // 截止时间
-        String status = getColumnFilterValue(pageRequest, "status"); // 协议状态
-        String productid = getColumnFilterValue(pageRequest, "productid"); // 产品代码
-        String cancity = getColumnFilterValue(pageRequest, "cancity"); // 可承保城市
-        String agreeid = getColumnFilterValue(pageRequest, "agreeid");//查询所有包含该协议id的组合协议
+        String agreename = pageRequest.getColumnFilterValue(pageRequest, "agreename");
+        String startdate = pageRequest.getColumnFilterValue(pageRequest, "startdate"); // 开始时间
+        String enddate = pageRequest.getColumnFilterValue(pageRequest, "enddate"); // 截止时间
+        String status = pageRequest.getColumnFilterValue(pageRequest, "status"); // 协议状态
+        String productid = pageRequest.getColumnFilterValue(pageRequest, "productid"); // 产品代码
+        String cancity = pageRequest.getColumnFilterValue(pageRequest, "cancity"); // 可承保城市
+        String agreeid = pageRequest.getColumnFilterValue(pageRequest, "agreeid");//查询所有包含该协议id的组合协议
 
         StringBuffer whereStr = new StringBuffer(" where 1=1");
         ArrayList<String> params = new ArrayList<String>();

src/main/java/com/ydtech/modules/esm/controller/EsmInsAttributionController.java

@@ -124,7 +124,7 @@ public class EsmInsAttributionController extends BaseController {
     @Transactional
     public HttpResult save(@RequestBody EsmInsAttribution eia, HttpServletRequest request) {
 
-        int i = esmInsAttributionService.count(new LambdaQueryWrapper<EsmInsAttribution>().eq(EsmInsAttribution::getUsername, eia.getUsername()));
+        long i = esmInsAttributionService.count(new LambdaQueryWrapper<EsmInsAttribution>().eq(EsmInsAttribution::getUsername, eia.getUsername()));
         if (StringUtils.isEmpty(eia.getId()) && i > 0) return HttpResult.ok("保险公司账号不可重复！");
         if (StringUtils.isNotEmpty(eia.getId()) && i > 1) return HttpResult.ok("保险公司账号不可重复！");
 
@@ -172,7 +172,7 @@ public class EsmInsAttributionController extends BaseController {
         String userId = getUserId(request);
 //        int pageNum = pageRequest.getPageNum();
 //        int pageSize = pageRequest.getPageSize();
-        String insCompanyId = getColumnFilterValue(pageRequest, "ins_company_id"); // 保险公司ID
+        String insCompanyId = pageRequest.getColumnFilterValue(pageRequest, "ins_company_id"); // 保险公司ID
 
         LambdaQueryWrapper<EsmInsAttribution> lqw = new LambdaQueryWrapper<>();
         lqw.eq(StringUtils.isNotEmpty(insCompanyId),EsmInsAttribution::getInsCompanyId, insCompanyId);

src/main/java/com/ydtech/modules/esm/controller/EsmInsCompanyController.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.ydtech.constants.RedisConstant;
 import com.ydtech.core.page.BaseController;
 import com.ydtech.core.page.HttpResult;
@@ -61,23 +62,35 @@ public class EsmInsCompanyController extends BaseController {
 
     @PostMapping(value = "/saveInsCompany")
     @ApiOperation(value = "保存信息")
+    @ApiOperationSupport(ignoreParameters = "children")
     public HttpResult save(@RequestBody EsmInsCompany record) {
+//    public HttpResult save(@RequestBody EsmInsCompany record) {
         Integer result = 0;
         String msg = "保存成功";
-//        result = esmInsCompanyService.insertSelective(record);
+
+        if(StringUtils.isNullOrEmpty(record.getId()))return HttpResult.ok("编号必填");
+
+        LambdaQueryWrapper<EsmInsCompany> lqw = new LambdaQueryWrapper();
+        lqw.eq(EsmInsCompany::getId,record.getId());
+        long i = esmInsCompanyService.count(lqw);
+        if(i > 0) return HttpResult.ok("重复编码");
         esmInsCompanyService.save(record);
-//        esmInsCompanyService.allowQuote(record,null);
         return HttpResult.ok(msg);
     }
 
     @PostMapping(value = "/editInsCompany")
     @ApiOperation(value = "修改信息")
+    @ApiOperationSupport(ignoreParameters = "record.children")
     public HttpResult update(@RequestBody EsmInsCompany record) {
         Integer result = 0;
         String msg = "保存成功";
-//        result = esmInsCompanyService.updateSelective(record);
+
+        LambdaQueryWrapper<EsmInsCompany> lqw = new LambdaQueryWrapper();
+        lqw.eq(EsmInsCompany::getId,record.getId());
+        long i = esmInsCompanyService.count(lqw);
+        if(i > 1) return HttpResult.ok("重复编码");
+
         esmInsCompanyService.updateById(record);
-//        esmInsCompanyService.allowQuote(record,null);
         return HttpResult.ok(msg);
     }
 
@@ -120,9 +133,9 @@ public class EsmInsCompanyController extends BaseController {
     @PostMapping(value = "/findPage")
     public HttpResult findPage(@RequestBody PageRequest pageRequest) {
 
-        String id = getColumnFilterValue(pageRequest, "id");
-        String name = getColumnFilterValue(pageRequest, "name");
-        String parentId = getColumnFilterValue(pageRequest, "parentId");
+        String id = pageRequest.getColumnFilterValue(pageRequest, "id");
+        String name = pageRequest.getColumnFilterValue(pageRequest, "name");
+        String parentId = pageRequest.getColumnFilterValue(pageRequest, "parentId");
 
         Page p = PageRequest.buildPageRequest(pageRequest);
         LambdaQueryWrapper<EsmInsCompany> lqw = new LambdaQueryWrapper();
@@ -219,6 +232,7 @@ public class EsmInsCompanyController extends BaseController {
     @GetMapping(value = "/gainAllowQuoteList")
     public HttpResult gainAllowQuoteList() {
         LambdaQueryWrapper<EsmInsCompany> lqw = new LambdaQueryWrapper<>();
+        lqw.eq(EsmInsCompany::getDelFlag,0);
         lqw.eq(EsmInsCompany::getOpenQuote,1);
         lqw.eq(EsmInsCompany::getParentId,"0");
         List<EsmInsCompany> list = esmInsCompanyService.list(lqw);

src/main/java/com/ydtech/modules/esm/controller/EsmProductController.java

@@ -139,9 +139,9 @@ public class EsmProductController extends BaseController {
         int pageNum = pageRequest.getPageNum();
         int pageSize = pageRequest.getPageSize();
 
-        String id = getColumnFilterValue(pageRequest, "id");
-        String name = getColumnFilterValue(pageRequest, "name");
-        String parentId = getColumnFilterValue(pageRequest, "parentId");
+        String id = pageRequest.getColumnFilterValue(pageRequest, "id");
+        String name = pageRequest.getColumnFilterValue(pageRequest, "name");
+        String parentId = pageRequest.getColumnFilterValue(pageRequest, "parentId");
 
         StringBuffer whereStr = new StringBuffer(" where 1=1 and del_flag=0");  //不含已删除
         ArrayList<String> params = new ArrayList<String>();

src/main/java/com/ydtech/modules/esm/controller/EsmRetailController.java

@@ -73,10 +73,10 @@ public class EsmRetailController extends BaseController {
     public HttpResult findPage(@RequestBody PageRequest pageRequest) {
         int pageNum = pageRequest.getPageNum();
         int pageSize = pageRequest.getPageSize();
-        String deptid = getColumnFilterValue(pageRequest, "deptid"); //
-        String containsSubDept = getColumnFilterValue(pageRequest, "containsSubDept");
-        String retailtype = getColumnFilterValue(pageRequest, "retailtype");
-        String status = getColumnFilterValue(pageRequest, "status"); // 状态
+        String deptid = PageRequest.getColumnFilterValue(pageRequest, "deptid"); //
+        String containsSubDept = PageRequest.getColumnFilterValue(pageRequest, "containsSubDept");
+        String retailtype = PageRequest.getColumnFilterValue(pageRequest, "retailtype");
+        String status = PageRequest.getColumnFilterValue(pageRequest, "status"); // 状态
         StringBuffer whereStr = new StringBuffer(" where 1=1");
         ArrayList array = new ArrayList();
         if ("1".equals(containsSubDept) && !StringUtils.isEmpty(deptid)) {

src/main/java/com/ydtech/modules/esm/controller/EsmRuleCheckController.java

@@ -79,9 +79,9 @@ public class EsmRuleCheckController extends BaseController {
     public HttpResult findPage(@RequestBody PageRequest pageRequest) {
         int pageNum = pageRequest.getPageNum();
         int pageSize = pageRequest.getPageSize();
-        String market = getColumnFilterValue(pageRequest, "market"); // 投放区域
-        String insid = getColumnFilterValue(pageRequest, "insid"); // 保险公司id
-        String status = getColumnFilterValue(pageRequest, "status"); // 状态
+        String market = pageRequest.getColumnFilterValue(pageRequest, "market"); // 投放区域
+        String insid = pageRequest.getColumnFilterValue(pageRequest, "insid"); // 保险公司id
+        String status = pageRequest.getColumnFilterValue(pageRequest, "status"); // 状态
         StringBuffer whereStr = new StringBuffer(" where 1=1");
         ArrayList array = new ArrayList();
         if (!StringUtils.isEmpty(market)) {

src/main/java/com/ydtech/modules/esm/controller/EsmRuleController.java

@@ -36,9 +36,9 @@ public class EsmRuleController extends BaseController {
     public HttpResult findPage(@RequestBody PageRequest pageRequest) {
         int pageNum = pageRequest.getPageNum();
         int pageSize = pageRequest.getPageSize();
-        String market = getColumnFilterValue(pageRequest, "market"); // 投放区域
-        String insid = getColumnFilterValue(pageRequest, "insid"); // 保险公司id
-        String status = getColumnFilterValue(pageRequest, "status"); // 状态
+        String market = pageRequest.getColumnFilterValue(pageRequest, "market"); // 投放区域
+        String insid = pageRequest.getColumnFilterValue(pageRequest, "insid"); // 保险公司id
+        String status = pageRequest.getColumnFilterValue(pageRequest, "status"); // 状态
         StringBuffer whereStr = new StringBuffer(" where 1=1");
         ArrayList array = new ArrayList();
         if (!StringUtils.isEmpty(market)) {

src/main/java/com/ydtech/modules/esm/controller/EsmSettlementController.java

@@ -180,12 +180,12 @@ public class EsmSettlementController extends BaseController {
 
         int pageNum = pageRequest.getPageNum();
         int pageSize = pageRequest.getPageSize();
-        String comcode = getColumnFilterValue(pageRequest, "comcode");
-        String policyno = getColumnFilterValue(pageRequest, "policyno");
-        String inscode = getColumnFilterValue(pageRequest, "inscode");
-        String carno = getColumnFilterValue(pageRequest, "carno");
+        String comcode = pageRequest.getColumnFilterValue(pageRequest, "comcode");
+        String policyno = pageRequest.getColumnFilterValue(pageRequest, "policyno");
+        String inscode = pageRequest.getColumnFilterValue(pageRequest, "inscode");
+        String carno = pageRequest.getColumnFilterValue(pageRequest, "carno");
         // 清单查询类型：A 全部 B 保险公司已结算清单  C 保险公司未结算清单  D 业务已结算清单 E 业务未结算清单
-        String querytype = getColumnFilterValue(pageRequest, "querytype");
+        String querytype = pageRequest.getColumnFilterValue(pageRequest, "querytype");
 
         StringBuffer whereStr = new StringBuffer(" where 1=1");
         ArrayList array = new ArrayList();
@@ -231,11 +231,11 @@ public class EsmSettlementController extends BaseController {
     public HttpResult querySettlement(@RequestBody PageRequest pageRequest) {
         int pageNum = pageRequest.getPageNum();
         int pageSize = pageRequest.getPageSize();
-        String comcode = getColumnFilterValue(pageRequest, "comcode");
-        String settlecode = getColumnFilterValue(pageRequest, "settlecode"); //结算对象
-        String settletype = getColumnFilterValue(pageRequest, "settletype"); //结算类型
-        String startdate = getColumnFilterValue(pageRequest, "startdate"); //结算单生成时间区间
-        String enddate = getColumnFilterValue(pageRequest, "enddate"); //结算单生成时间区间
+        String comcode = pageRequest.getColumnFilterValue(pageRequest, "comcode");
+        String settlecode = pageRequest.getColumnFilterValue(pageRequest, "settlecode"); //结算对象
+        String settletype = pageRequest.getColumnFilterValue(pageRequest, "settletype"); //结算类型
+        String startdate = pageRequest.getColumnFilterValue(pageRequest, "startdate"); //结算单生成时间区间
+        String enddate = pageRequest.getColumnFilterValue(pageRequest, "enddate"); //结算单生成时间区间
 
         StringBuffer whereStr = new StringBuffer(" where 1=1");
         ArrayList array = new ArrayList();

src/main/java/com/ydtech/modules/esm/controller/EsmTeamController.java

@@ -92,7 +92,7 @@ public class EsmTeamController extends BaseController {
 
         int pageNum = pageRequest.getPageNum();
         int pageSize = pageRequest.getPageSize();
-        String comcode = getColumnFilterValue(pageRequest, "comcode");
+        String comcode = pageRequest.getColumnFilterValue(pageRequest, "comcode");
         if (comcode == null) comcode = "";
 
         //需要处理传入的部门

src/main/java/com/ydtech/modules/esm/controller/EsmUserInternalCheckController.java

@@ -251,15 +251,15 @@ public class EsmUserInternalCheckController extends BaseController {
     public HttpResult findPage(@RequestBody PageRequest pageRequest) {
         int pageNum = pageRequest.getPageNum();
         int pageSize = pageRequest.getPageSize();
-        String name = getColumnFilterValue(pageRequest, "name");
-        String deptId = getColumnFilterValue(pageRequest, "deptId");
-        String usertype = getColumnFilterValue(pageRequest, "usertype");
-        String status = getColumnFilterValue(pageRequest, "status");
-        String isteamleader = getColumnFilterValue(pageRequest, "isteamleader");
-        String mobile = getColumnFilterValue(pageRequest, "mobile");
-        String id = getColumnFilterValue(pageRequest, "id");
-        String startdate = getColumnFilterValue(pageRequest, "startdate");
-        String enddate = getColumnFilterValue(pageRequest, "enddate");
+        String name = pageRequest.getColumnFilterValue(pageRequest, "name");
+        String deptId = pageRequest.getColumnFilterValue(pageRequest, "deptId");
+        String usertype = pageRequest.getColumnFilterValue(pageRequest, "usertype");
+        String status = pageRequest.getColumnFilterValue(pageRequest, "status");
+        String isteamleader = pageRequest.getColumnFilterValue(pageRequest, "isteamleader");
+        String mobile = pageRequest.getColumnFilterValue(pageRequest, "mobile");
+        String id = pageRequest.getColumnFilterValue(pageRequest, "id");
+        String startdate = pageRequest.getColumnFilterValue(pageRequest, "startdate");
+        String enddate = pageRequest.getColumnFilterValue(pageRequest, "enddate");
 
         StringBuffer whereStr = new StringBuffer(" where 1=1 ");
         ArrayList<Object> params = new ArrayList<Object>();
@@ -277,7 +277,7 @@ public class EsmUserInternalCheckController extends BaseController {
         }
 
         if (deptId != null) {
-            String containsSubDept = getColumnFilterValue(pageRequest, "containsSubDept");
+            String containsSubDept = pageRequest.getColumnFilterValue(pageRequest, "containsSubDept");
             if (containsSubDept != null && containsSubDept.equalsIgnoreCase("1")) {
                 whereStr.append(" and t1.dept_id like ?");
                 params.add(deptId + "%");

src/main/java/com/ydtech/modules/esm/controller/EsmUserInternalController.java

@@ -136,15 +136,15 @@ public class EsmUserInternalController extends BaseController {
     public HttpResult findPage(@RequestBody PageRequest pageRequest) {
         int pageNum = pageRequest.getPageNum();
         int pageSize = pageRequest.getPageSize();
-        String name = getColumnFilterValue(pageRequest, "name");
-        String deptId = getColumnFilterValue(pageRequest, "deptId");
-        String usertype = getColumnFilterValue(pageRequest, "usertype");
-        String status = getColumnFilterValue(pageRequest, "status");
-        String isteamleader = getColumnFilterValue(pageRequest, "isteamleader");
-        String mobile = getColumnFilterValue(pageRequest, "mobile");
-        String id = getColumnFilterValue(pageRequest, "id");
-        String startdate = getColumnFilterValue(pageRequest, "startdate");
-        String enddate = getColumnFilterValue(pageRequest, "enddate");
+        String name = pageRequest.getColumnFilterValue(pageRequest, "name");
+        String deptId = pageRequest.getColumnFilterValue(pageRequest, "deptId");
+        String usertype = pageRequest.getColumnFilterValue(pageRequest, "usertype");
+        String status = pageRequest.getColumnFilterValue(pageRequest, "status");
+        String isteamleader = pageRequest.getColumnFilterValue(pageRequest, "isteamleader");
+        String mobile = pageRequest.getColumnFilterValue(pageRequest, "mobile");
+        String id = pageRequest.getColumnFilterValue(pageRequest, "id");
+        String startdate = pageRequest.getColumnFilterValue(pageRequest, "startdate");
+        String enddate = pageRequest.getColumnFilterValue(pageRequest, "enddate");
 
         StringBuffer whereStr = new StringBuffer(" where 1=1 ");
         ArrayList<Object> params = new ArrayList<Object>();
@@ -162,7 +162,7 @@ public class EsmUserInternalController extends BaseController {
         }
 
         if (deptId != null) {
-            String containsSubDept = getColumnFilterValue(pageRequest, "containsSubDept");
+            String containsSubDept = pageRequest.getColumnFilterValue(pageRequest, "containsSubDept");
             if (containsSubDept != null && containsSubDept.equalsIgnoreCase("1")) {
                 whereStr.append(" and t1.dept_id like ?");
                 params.add(deptId + "%");

src/main/java/com/ydtech/modules/esm/controller/InsPosterController.java

@@ -107,8 +107,8 @@ public class InsPosterController extends BaseController {
 
         int pageNum = pageRequest.getPageNum();
         int pageSize = pageRequest.getPageSize();
-        String taskid = getColumnFilterValue(pageRequest, "taskid");
-        String imgtype = getColumnFilterValue(pageRequest, "imgtype");
+        String taskid = pageRequest.getColumnFilterValue(pageRequest, "taskid");
+        String imgtype = pageRequest.getColumnFilterValue(pageRequest, "imgtype");
 
         StringBuffer whereStr = new StringBuffer(" where 1=1");
         ArrayList array = new ArrayList();

src/main/java/com/ydtech/modules/esm/controller/SysAppController.java

@@ -109,7 +109,7 @@ public class SysAppController extends BaseController {
 
         int pageNum = pageRequest.getPageNum();
         int pageSize = pageRequest.getPageSize();
-        String appname = getColumnFilterValue(pageRequest, "appname");
+        String appname = pageRequest.getColumnFilterValue(pageRequest, "appname");
 
         List params = new ArrayList();
         StringBuffer whereStr = new StringBuffer(" where 1=1 ");

src/main/java/com/ydtech/modules/esm/controller/SysVersionController.java

@@ -107,8 +107,8 @@ public class SysVersionController extends BaseController {
 
         int pageNum = pageRequest.getPageNum();
         int pageSize = pageRequest.getPageSize();
-        String appid = getColumnFilterValue(pageRequest, "appid");
-        String appname = getColumnFilterValue(pageRequest, "appname");
+        String appid = pageRequest.getColumnFilterValue(pageRequest, "appid");
+        String appname = pageRequest.getColumnFilterValue(pageRequest, "appname");
 
         List params = new ArrayList();
         StringBuffer whereStr = new StringBuffer(" where 1=1 ");

src/main/java/com/ydtech/modules/esm/model/EsmOfferChannel.java

@@ -7,7 +7,7 @@ import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 
 import io.swagger.annotations.ApiModelProperty;
-import org.hibernate.validator.constraints.Length;
+//import org.hibernate.validator.constraints.Length;
 
 /**
 * 报价渠道（保险公司）
@@ -28,7 +28,7 @@ public class EsmOfferChannel implements Serializable {
     @NotBlank(message="[渠道名称]不能为空")
     @Size(max= 256,message="编码长度不能超过256")
     @ApiModelProperty("渠道名称")
-    @Length(max= 256,message="编码长度不能超过256")
+//    @Length(max= 256,message="编码长度不能超过256")
     private String title;
     /**
     * 图标
@@ -36,7 +36,7 @@ public class EsmOfferChannel implements Serializable {
     @NotBlank(message="[图标]不能为空")
     @Size(max= 256,message="编码长度不能超过256")
     @ApiModelProperty("图标")
-    @Length(max= 256,message="编码长度不能超过256")
+//    @Length(max= 256,message="编码长度不能超过256")
     private String image;
     /**
     * 类别（1.API 2.极速）
@@ -50,7 +50,7 @@ public class EsmOfferChannel implements Serializable {
     @NotBlank(message="[请求路径]不能为空")
     @Size(max= 256,message="编码长度不能超过256")
     @ApiModelProperty("请求路径")
-    @Length(max= 256,message="编码长度不能超过256")
+//    @Length(max= 256,message="编码长度不能超过256")
     private String url;
     /**
     * 是否开启（1.开启 2.关闭）
@@ -63,21 +63,21 @@ public class EsmOfferChannel implements Serializable {
     */
     @Size(max= 256,message="编码长度不能超过256")
     @ApiModelProperty("用户名")
-    @Length(max= 256,message="编码长度不能超过256")
+//    @Length(max= 256,message="编码长度不能超过256")
     private String username;
     /**
     * 密码
     */
     @Size(max= 256,message="编码长度不能超过256")
     @ApiModelProperty("密码")
-    @Length(max= 256,message="编码长度不能超过256")
+//    @Length(max= 256,message="编码长度不能超过256")
     private String password;
     /**
     * 配置信息
     */
     @Size(max= -1,message="编码长度不能超过-1")
     @ApiModelProperty("配置信息")
-    @Length(max= -1,message="编码长度不能超过-1")
+//    @Length(max= -1,message="编码长度不能超过-1")
     private String configInfo;
     /**
     * 绑定协议id
@@ -85,7 +85,7 @@ public class EsmOfferChannel implements Serializable {
     @NotBlank(message="[绑定协议id]不能为空")
     @Size(max= 256,message="编码长度不能超过256")
     @ApiModelProperty("绑定协议id")
-    @Length(max= 256,message="编码长度不能超过256")
+//    @Length(max= 256,message="编码长度不能超过256")
     private String agreementId;
 
     public Integer getId() {

src/main/java/com/ydtech/modules/esm/model/EsmPolicyInformation.java

@@ -1,6 +1,7 @@
 package com.ydtech.modules.esm.model;
 
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;
 import java.math.BigDecimal;
@@ -16,7 +17,8 @@ public class EsmPolicyInformation implements Serializable {
     /**
      * 主键
      */
-    @TableField(value = "id")
+//    @TableField(value = "id")
+    @TableId(value = "id")
     private Long id;
 
     /**
@@ -128,4 +130,4 @@ public class EsmPolicyInformation implements Serializable {
         sb.append("]");
         return sb.toString();
     }
-}
+}

src/main/java/com/ydtech/modules/esm/model/EsmYaPolicyInformation.java

@@ -19,7 +19,7 @@ public class EsmYaPolicyInformation implements Serializable {
     /**
      * 主键
      */
-    @TableField(value = "id")
+    @TableId(value = "id")
     private Long id;
 
     /**
@@ -108,4 +108,4 @@ public class EsmYaPolicyInformation implements Serializable {
         sb.append("]");
         return sb.toString();
     }
-}
+}

src/main/java/com/ydtech/modules/esm/model/EsmYcPolicyInformation.java

@@ -1,6 +1,7 @@
 package com.ydtech.modules.esm.model;
 
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;
 import java.math.BigDecimal;
@@ -17,7 +18,7 @@ public class EsmYcPolicyInformation implements Serializable {
     /**
      * 主键
      */
-    @TableField(value = "id")
+    @TableId(value = "id")
     private Long id;
 
     /**
@@ -57,7 +58,7 @@ public class EsmYcPolicyInformation implements Serializable {
     private BigDecimal tax;
 
     /**
-     * 
+     *
      */
     @TableField(value = "issue_date")
     private LocalDate issueDate;
@@ -120,4 +121,4 @@ public class EsmYcPolicyInformation implements Serializable {
         sb.append("]");
         return sb.toString();
     }
-}
+}

src/main/java/com/ydtech/modules/esm/vo/EsmOfferChannelVo.java

@@ -3,7 +3,7 @@ package com.ydtech.modules.esm.vo;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import org.hibernate.validator.constraints.Length;
+//import org.hibernate.validator.constraints.Length;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
@@ -20,7 +20,7 @@ public class EsmOfferChannelVo implements Serializable {
     @NotBlank(message="[渠道名称]不能为空")
     @Size(max= 256,message="编码长度不能超过256")
     @ApiModelProperty("渠道名称")
-    @Length(max= 256,message="编码长度不能超过256")
+//    @Length(max= 256,message="编码长度不能超过256")
     private String title;
     /**
      * 图标
@@ -28,7 +28,7 @@ public class EsmOfferChannelVo implements Serializable {
     @NotBlank(message="[图标]不能为空")
     @Size(max= 256,message="编码长度不能超过256")
     @ApiModelProperty("图标")
-    @Length(max= 256,message="编码长度不能超过256")
+//    @Length(max= 256,message="编码长度不能超过256")
     private String image;
     /**
      * 类别（1.API 2.极速）
@@ -42,7 +42,7 @@ public class EsmOfferChannelVo implements Serializable {
     @NotBlank(message="[请求路径]不能为空")
     @Size(max= 256,message="编码长度不能超过256")
     @ApiModelProperty("请求路径")
-    @Length(max= 256,message="编码长度不能超过256")
+//    @Length(max= 256,message="编码长度不能超过256")
     private String url;
     /**
      * 是否开启（1.开启 2.关闭）
@@ -55,14 +55,14 @@ public class EsmOfferChannelVo implements Serializable {
      */
     @Size(max= 256,message="编码长度不能超过256")
     @ApiModelProperty("用户名")
-    @Length(max= 256,message="编码长度不能超过256")
+//    @Length(max= 256,message="编码长度不能超过256")
     private String username;
     /**
      * 密码
      */
     @Size(max= 256,message="编码长度不能超过256")
     @ApiModelProperty("密码")
-    @Length(max= 256,message="编码长度不能超过256")
+//    @Length(max= 256,message="编码长度不能超过256")
     private String password;
     /**
      * 配置信息
@@ -75,7 +75,7 @@ public class EsmOfferChannelVo implements Serializable {
     @NotBlank(message="[绑定协议id]不能为空")
     @Size(max= 256,message="编码长度不能超过256")
     @ApiModelProperty("绑定协议id")
-    @Length(max= 256,message="编码长度不能超过256")
+//    @Length(max= 256,message="编码长度不能超过256")
     private String agreementId;
 
 

src/main/java/com/ydtech/modules/ins/controller/InsALY_CBITAPIController.java

@@ -701,7 +701,7 @@ public class InsALY_CBITAPIController extends BaseController {
 
         insOrder.setUsername(user.getName());
         insOrder.setDeptid(user.getDeptId());
-        SysDept dept = sysDeptService.selectByPk(user.getDeptId());
+        SysDept dept = sysDeptService.getById(user.getDeptId());
         insOrder.setDeptname(dept == null ? "" : dept.getName());
 
 
@@ -884,4 +884,4 @@ public class InsALY_CBITAPIController extends BaseController {
 
         return retailRate;
     }
-}
+}

src/main/java/com/ydtech/modules/ins/controller/InsAllController.java

@@ -128,28 +128,28 @@ public class InsAllController extends BaseController {
         ArrayList<String> params = new ArrayList<String>();
 
         //任务阶段（例如待继续，核保中等）
-        String status = getColumnFilterValue(pageRequest, "status");
+        String status = pageRequest.getColumnFilterValue(pageRequest, "status");
         if (!StringUtils.isNullOrEmpty(status)) {
             whereStr.append(" and status like ?");
             params.add("%" + status + "%");
         }
 
         //车牌号
-        String licenseno = getColumnFilterValue(pageRequest, "licenseno");
+        String licenseno = pageRequest.getColumnFilterValue(pageRequest, "licenseno");
         if (!StringUtils.isNullOrEmpty(licenseno)) {
             whereStr.append(" and licenseno like ?");
             params.add("%" + licenseno + "%");
         }
 
         //2020-05    查询日期，都是查询月度订单（我传过去的字段值例如2020-04）
-        String querymonth = getColumnFilterValue(pageRequest, "querymonth");
+        String querymonth = pageRequest.getColumnFilterValue(pageRequest, "querymonth");
         if (!StringUtils.isNullOrEmpty(querymonth)) {
             whereStr.append(" and createtime like ?");
             params.add("%" + querymonth + "%");
         }
 
         //insuredname  被保险人
-        String insuredname = getColumnFilterValue(pageRequest, "insuredname");
+        String insuredname = pageRequest.getColumnFilterValue(pageRequest, "insuredname");
         if (!StringUtils.isNullOrEmpty(insuredname)) {
             whereStr.append(" and insuredname like ?");
             params.add("%" + insuredname + "%");

src/main/java/com/ydtech/modules/ins/controller/InsCBITAPIController.java

@@ -978,7 +978,7 @@ public class InsCBITAPIController extends BaseController {
 
         insOrder.setUsername(user.getName());
         insOrder.setDeptid(user.getDeptId());
-        SysDept dept = sysDeptService.selectByPk(user.getDeptId());
+        SysDept dept = sysDeptService.getById(user.getDeptId());
         insOrder.setDeptname(dept == null ? "" : dept.getName());
 
 
@@ -1420,4 +1420,4 @@ public class InsCBITAPIController extends BaseController {
         cbitLog.setCreatetime(new Date());
         sysCbitLogService.insert(cbitLog);
     }
-}
+}

src/main/java/com/ydtech/modules/ins/controller/InsFeeDetailController.java

@@ -48,27 +48,27 @@ public class InsFeeDetailController extends BaseController {
         int pageNum = pageRequest.getPageNum();
         int pageSize = pageRequest.getPageSize();
         //0未审核 1已审核
-        String auditstatus = getColumnFilterValue(pageRequest, "auditstatus"); // 审核状态
-        String auditid = getColumnFilterValue(pageRequest, "auditid"); // 核保人员
-        String deptid = getColumnFilterValue(pageRequest, "deptid"); // 所属机构
-        String startdate = getColumnFilterValue(pageRequest, "startdate"); // 开始时间
-        String enddate = getColumnFilterValue(pageRequest, "enddate"); // 截止时间
-        String policystartdate = getColumnFilterValue(pageRequest, "policystartdate"); // 开始时间
-        String policyenddate = getColumnFilterValue(pageRequest, "policyenddate"); // 截止时间
-        String insurestartdate = getColumnFilterValue(pageRequest, "insurestartdate"); // 承保开始时间
-        String insureenddate = getColumnFilterValue(pageRequest, "insureenddate"); // 承保截止时间
-        String frameNo = getColumnFilterValue(pageRequest, "frameNo"); // 车架号
-        String licenseNo = getColumnFilterValue(pageRequest, "licenseNo"); // 车牌号
-        String engineNo = getColumnFilterValue(pageRequest, "engineNo"); //发动机号
-
-        String quoteno = getColumnFilterValue(pageRequest, "quoteno"); // 报价单号
-        String orderno = getColumnFilterValue(pageRequest, "orderno"); // 报价单号
-        String userid = getColumnFilterValue(pageRequest, "userid"); // 出单员
-        String username = getColumnFilterValue(pageRequest, "username"); // 代理人名称
-        String riskCode = getColumnFilterValue(pageRequest, "riskCode"); // 险种代码
-        String insurename = getColumnFilterValue(pageRequest, "insurename"); // 被保人
-        String inscompany = getColumnFilterValue(pageRequest, "inscompany"); // 保险公司
-        String editId = getColumnFilterValue(pageRequest, "editId"); // 工号
+        String auditstatus = pageRequest.getColumnFilterValue(pageRequest, "auditstatus"); // 审核状态
+        String auditid = pageRequest.getColumnFilterValue(pageRequest, "auditid"); // 核保人员
+        String deptid = pageRequest.getColumnFilterValue(pageRequest, "deptid"); // 所属机构
+        String startdate = pageRequest.getColumnFilterValue(pageRequest, "startdate"); // 开始时间
+        String enddate = pageRequest.getColumnFilterValue(pageRequest, "enddate"); // 截止时间
+        String policystartdate = pageRequest.getColumnFilterValue(pageRequest, "policystartdate"); // 开始时间
+        String policyenddate = pageRequest.getColumnFilterValue(pageRequest, "policyenddate"); // 截止时间
+        String insurestartdate = pageRequest.getColumnFilterValue(pageRequest, "insurestartdate"); // 承保开始时间
+        String insureenddate = pageRequest.getColumnFilterValue(pageRequest, "insureenddate"); // 承保截止时间
+        String frameNo = pageRequest.getColumnFilterValue(pageRequest, "frameNo"); // 车架号
+        String licenseNo = pageRequest.getColumnFilterValue(pageRequest, "licenseNo"); // 车牌号
+        String engineNo = pageRequest.getColumnFilterValue(pageRequest, "engineNo"); //发动机号
+
+        String quoteno = pageRequest.getColumnFilterValue(pageRequest, "quoteno"); // 报价单号
+        String orderno = pageRequest.getColumnFilterValue(pageRequest, "orderno"); // 报价单号
+        String userid = pageRequest.getColumnFilterValue(pageRequest, "userid"); // 出单员
+        String username = pageRequest.getColumnFilterValue(pageRequest, "username"); // 代理人名称
+        String riskCode = pageRequest.getColumnFilterValue(pageRequest, "riskCode"); // 险种代码
+        String insurename = pageRequest.getColumnFilterValue(pageRequest, "insurename"); // 被保人
+        String inscompany = pageRequest.getColumnFilterValue(pageRequest, "inscompany"); // 保险公司
+        String editId = pageRequest.getColumnFilterValue(pageRequest, "editId"); // 工号
 
         StringBuffer whereStr = new StringBuffer(" where 1=1");
         ArrayList array = new ArrayList();
@@ -257,20 +257,20 @@ public class InsFeeDetailController extends BaseController {
         int pageNum = pageRequest.getPageNum();
         int pageSize = pageRequest.getPageSize();
 //增加保险公司 inscompany，车牌号 licenseNo，险种 riskCode，协议类型 agreetype，协议号 agreeid，日期筛选 startdate、enddate，工号 userid，姓名 username，机构 deptid
-        String settlestatus = getColumnFilterValue(pageRequest, "settlestatus"); // 结算状态 0未结算 1已结算
-        String agreetype = getColumnFilterValue(pageRequest, "agreetype"); //协议类型
-        String startdate = getColumnFilterValue(pageRequest, "startdate"); // 开始时间
-        String enddate = getColumnFilterValue(pageRequest, "enddate"); // 截止时间
-        String frameNo = getColumnFilterValue(pageRequest, "frameNo"); // 车架号
-        String licenseNo = getColumnFilterValue(pageRequest, "licenseNo"); // 车牌号
-        String orderno = getColumnFilterValue(pageRequest, "orderno"); // 订单号
-        String inscompany = getColumnFilterValue(pageRequest, "inscompany"); // 保险公司
-        String settletype = getColumnFilterValue(pageRequest, "settletype"); // 结算类型  A保险公司 B业务员
-        String userid = getColumnFilterValue(pageRequest, "userid"); // 业务员工号
-        String username = getColumnFilterValue(pageRequest, "username"); // 业务员
-        String deptid = getColumnFilterValue(pageRequest, "deptid"); // 机构
-        String agreeid = getColumnFilterValue(pageRequest, "agreeid"); // 协议号
-        String riskCode = getColumnFilterValue(pageRequest, "riskCode"); // 险种代码
+        String settlestatus = pageRequest.getColumnFilterValue(pageRequest, "settlestatus"); // 结算状态 0未结算 1已结算
+        String agreetype = pageRequest.getColumnFilterValue(pageRequest, "agreetype"); //协议类型
+        String startdate = pageRequest.getColumnFilterValue(pageRequest, "startdate"); // 开始时间
+        String enddate = pageRequest.getColumnFilterValue(pageRequest, "enddate"); // 截止时间
+        String frameNo = pageRequest.getColumnFilterValue(pageRequest, "frameNo"); // 车架号
+        String licenseNo = pageRequest.getColumnFilterValue(pageRequest, "licenseNo"); // 车牌号
+        String orderno = pageRequest.getColumnFilterValue(pageRequest, "orderno"); // 订单号
+        String inscompany = pageRequest.getColumnFilterValue(pageRequest, "inscompany"); // 保险公司
+        String settletype = pageRequest.getColumnFilterValue(pageRequest, "settletype"); // 结算类型  A保险公司 B业务员
+        String userid = pageRequest.getColumnFilterValue(pageRequest, "userid"); // 业务员工号
+        String username = pageRequest.getColumnFilterValue(pageRequest, "username"); // 业务员
+        String deptid = pageRequest.getColumnFilterValue(pageRequest, "deptid"); // 机构
+        String agreeid = pageRequest.getColumnFilterValue(pageRequest, "agreeid"); // 协议号
+        String riskCode = pageRequest.getColumnFilterValue(pageRequest, "riskCode"); // 险种代码
 
         if (StringUtils.isEmpty(settletype)) {
             return HttpResult.error("结算类型 settletype不能为空");
@@ -399,9 +399,9 @@ public class InsFeeDetailController extends BaseController {
         int pageNum = pageRequest.getPageNum();
         int pageSize = pageRequest.getPageSize();
 
-        String orderno = getColumnFilterValue(pageRequest, "orderno"); // 订单号
-        String userid = getColumnFilterValue(pageRequest, "userid");
-        String auditstatus = getColumnFilterValue(pageRequest, "auditstatus");
+        String orderno = pageRequest.getColumnFilterValue(pageRequest, "orderno"); // 订单号
+        String userid = pageRequest.getColumnFilterValue(pageRequest, "userid");
+        String auditstatus = pageRequest.getColumnFilterValue(pageRequest, "auditstatus");
 
         StringBuffer whereStr = new StringBuffer(" where 1=1");
         ArrayList array = new ArrayList();
@@ -438,12 +438,12 @@ public class InsFeeDetailController extends BaseController {
         int pageNum = pageRequest.getPageNum();
         int pageSize = pageRequest.getPageSize();
 
-        String orderno = getColumnFilterValue(pageRequest, "orderno"); // 订单号
-        String deptid = getColumnFilterValue(pageRequest, "deptid");
-        String auditstatus = getColumnFilterValue(pageRequest, "auditstatus");
-        String comcode = getColumnFilterValue(pageRequest, "comcode");
-        String comlevel = getColumnFilterValue(pageRequest, "comlevel");
-        String licenseno = getColumnFilterValue(pageRequest, "licenseno");
+        String orderno = pageRequest.getColumnFilterValue(pageRequest, "orderno"); // 订单号
+        String deptid = pageRequest.getColumnFilterValue(pageRequest, "deptid");
+        String auditstatus = pageRequest.getColumnFilterValue(pageRequest, "auditstatus");
+        String comcode = pageRequest.getColumnFilterValue(pageRequest, "comcode");
+        String comlevel = pageRequest.getColumnFilterValue(pageRequest, "comlevel");
+        String licenseno = pageRequest.getColumnFilterValue(pageRequest, "licenseno");
 
 
         StringBuffer whereStr = new StringBuffer(" where 1=1");
@@ -482,4 +482,4 @@ public class InsFeeDetailController extends BaseController {
     }
 
 
-}
+}

src/main/java/com/ydtech/modules/ins/controller/InsHengbangController.java

@@ -175,7 +175,7 @@ public class InsHengbangController {
         insOrder.setUserid(quoteInfo.getUserId());
         insOrder.setUsername(user.getName());
         insOrder.setDeptid(user.getDeptId());
-        SysDept dept = sysDeptService.selectByPk(user.getDeptId());
+        SysDept dept = sysDeptService.getById(user.getDeptId());
         insOrder.setDeptname(dept == null ? "" : dept.getName());
 
         double retailRate = countRetail(user.getDeptId(), user.getId());
@@ -803,4 +803,4 @@ public class InsHengbangController {
 
         return retailRate;
     }
-}
+}

src/main/java/com/ydtech/modules/ins/controller/InsHuanongController.java

@@ -178,7 +178,7 @@ public class InsHuanongController {
         insOrder.setUserid(quoteInfo.getUserId());
         insOrder.setUsername(user.getName());
         insOrder.setDeptid(user.getDeptId());
-        SysDept dept = sysDeptService.selectByPk(user.getDeptId());
+        SysDept dept = sysDeptService.getById(user.getDeptId());
         insOrder.setDeptname(dept == null ? "" : dept.getName());
 
         double retailRate = countRetail(user.getDeptId(), user.getId());

src/main/java/com/ydtech/modules/ins/controller/InsOrderController.java

@@ -89,25 +89,25 @@ public class InsOrderController extends BaseController {
         int pageNum = pageRequest.getPageNum();
         int pageSize = pageRequest.getPageSize();
         //0报价中 1待核保 2已核保 3核保退回 4核保不通过 5已核保待缴费 6已缴费 7已承保 99已关闭
-        String orderstatus = getColumnFilterValue(pageRequest, "orderstatus"); // 订单状态
-        String quotestatus = getColumnFilterValue(pageRequest, "quotestatus"); // 报价状态
-        String auditid = getColumnFilterValue(pageRequest, "auditid"); // 核保人员
-        String userid = getColumnFilterValue(pageRequest, "userid"); // 出单员
-        String deptid = getColumnFilterValue(pageRequest, "deptid"); // 所属机构
-        String startdate = getColumnFilterValue(pageRequest, "startdate"); // 开始时间
-        String enddate = getColumnFilterValue(pageRequest, "enddate"); // 截止时间
-        String policystartdate = getColumnFilterValue(pageRequest, "policystartdate"); // 开始时间
-        String policyenddate = getColumnFilterValue(pageRequest, "policyenddate"); // 截止时间
-        String frameNo = getColumnFilterValue(pageRequest, "frameNo"); // 车架号
-        String licenseNo = getColumnFilterValue(pageRequest, "licenseNo"); // 车牌号
-        String engineNo = getColumnFilterValue(pageRequest, "engineNo"); //发动机号
-        String quoteno = getColumnFilterValue(pageRequest, "quoteno"); // 报价单号
-        String orderno = getColumnFilterValue(pageRequest, "orderno"); // 报价单号
-        String username = getColumnFilterValue(pageRequest, "username"); // 代理人名称
-        String riskCode = getColumnFilterValue(pageRequest, "riskCode"); // 险种代码
-        String insurename = getColumnFilterValue(pageRequest, "insurename"); // 被保人
-        String inscompany = getColumnFilterValue(pageRequest, "inscompany"); // 保险公司
-        String editId = getColumnFilterValue(pageRequest, "editId"); // 工号
+        String orderstatus = pageRequest.getColumnFilterValue(pageRequest, "orderstatus"); // 订单状态
+        String quotestatus = pageRequest.getColumnFilterValue(pageRequest, "quotestatus"); // 报价状态
+        String auditid = pageRequest.getColumnFilterValue(pageRequest, "auditid"); // 核保人员
+        String userid = pageRequest.getColumnFilterValue(pageRequest, "userid"); // 出单员
+        String deptid = pageRequest.getColumnFilterValue(pageRequest, "deptid"); // 所属机构
+        String startdate = pageRequest.getColumnFilterValue(pageRequest, "startdate"); // 开始时间
+        String enddate = pageRequest.getColumnFilterValue(pageRequest, "enddate"); // 截止时间
+        String policystartdate = pageRequest.getColumnFilterValue(pageRequest, "policystartdate"); // 开始时间
+        String policyenddate = pageRequest.getColumnFilterValue(pageRequest, "policyenddate"); // 截止时间
+        String frameNo = pageRequest.getColumnFilterValue(pageRequest, "frameNo"); // 车架号
+        String licenseNo = pageRequest.getColumnFilterValue(pageRequest, "licenseNo"); // 车牌号
+        String engineNo = pageRequest.getColumnFilterValue(pageRequest, "engineNo"); //发动机号
+        String quoteno = pageRequest.getColumnFilterValue(pageRequest, "quoteno"); // 报价单号
+        String orderno = pageRequest.getColumnFilterValue(pageRequest, "orderno"); // 报价单号
+        String username = pageRequest.getColumnFilterValue(pageRequest, "username"); // 代理人名称
+        String riskCode = pageRequest.getColumnFilterValue(pageRequest, "riskCode"); // 险种代码
+        String insurename = pageRequest.getColumnFilterValue(pageRequest, "insurename"); // 被保人
+        String inscompany = pageRequest.getColumnFilterValue(pageRequest, "inscompany"); // 保险公司
+        String editId = pageRequest.getColumnFilterValue(pageRequest, "editId"); // 工号
         StringBuffer whereStr = new StringBuffer(" where 1=1");
         ArrayList<String> array = new ArrayList<>();
         if (!StringUtils.isEmpty(orderstatus)) {

src/main/java/com/ydtech/modules/ins/controller/InsOrderTaskController.java

@@ -41,9 +41,9 @@ public class InsOrderTaskController extends BaseController {
         int pageNum = pageRequest.getPageNum();
         int pageSize = pageRequest.getPageSize();
 
-        String insid = getColumnFilterValue(pageRequest, "insid");
-        String status = getColumnFilterValue(pageRequest, "status");
-        String orderstatus = getColumnFilterValue(pageRequest, "orderstatus");
+        String insid = pageRequest.getColumnFilterValue(pageRequest, "insid");
+        String status = pageRequest.getColumnFilterValue(pageRequest, "status");
+        String orderstatus = pageRequest.getColumnFilterValue(pageRequest, "orderstatus");
 
         StringBuffer whereStr = new StringBuffer(" where 1=1");
         ArrayList array = new ArrayList();
@@ -84,4 +84,4 @@ public class InsOrderTaskController extends BaseController {
         return HttpResult.ok("保存成功");
     }
 
-}
+}

src/main/java/com/ydtech/modules/ins/controller/InsPayApplyController.java

@@ -78,13 +78,13 @@ public class InsPayApplyController extends BaseController {
         int pageNum = pageRequest.getPageNum();
         int pageSize = pageRequest.getPageSize();
 
-        String applyno = getColumnFilterValue(pageRequest, "applyno");
-        String applystatus = getColumnFilterValue(pageRequest, "applystatus"); // 申请状态 0申请中 1支付中 2已支付
-        String userid = getColumnFilterValue(pageRequest, "userid"); // 出单员
-        String deptid = getColumnFilterValue(pageRequest, "deptid"); // 所属机构
-        String startdate = getColumnFilterValue(pageRequest, "startdate"); // 开始时间
-        String enddate = getColumnFilterValue(pageRequest, "enddate"); // 截止时间
-        String applytype = getColumnFilterValue(pageRequest, "applytype"); //A跟单绩效  B推广佣金 C机构费用
+        String applyno = pageRequest.getColumnFilterValue(pageRequest, "applyno");
+        String applystatus = pageRequest.getColumnFilterValue(pageRequest, "applystatus"); // 申请状态 0申请中 1支付中 2已支付
+        String userid = pageRequest.getColumnFilterValue(pageRequest, "userid"); // 出单员
+        String deptid = pageRequest.getColumnFilterValue(pageRequest, "deptid"); // 所属机构
+        String startdate = pageRequest.getColumnFilterValue(pageRequest, "startdate"); // 开始时间
+        String enddate = pageRequest.getColumnFilterValue(pageRequest, "enddate"); // 截止时间
+        String applytype = pageRequest.getColumnFilterValue(pageRequest, "applytype"); //A跟单绩效  B推广佣金 C机构费用
 
         StringBuffer whereStr = new StringBuffer(" where 1=1");
         ArrayList array = new ArrayList();
@@ -200,7 +200,7 @@ public class InsPayApplyController extends BaseController {
      */
     @PostMapping(value = "/deptAccountPage")
     public HttpResult deptAccountPage(@RequestBody PageRequest pageRequest) {
-        String deptid = getColumnFilterValue(pageRequest, "deptid");
+        String deptid = pageRequest.getColumnFilterValue(pageRequest, "deptid");
         StringBuffer whereStr = new StringBuffer(" where 1=1");
         ArrayList array = new ArrayList();
 
@@ -241,7 +241,7 @@ public class InsPayApplyController extends BaseController {
 //        apply.setUserid(userid);
 //        apply.setUsername(user.getName());
         apply.setDeptid(deptid);
-        SysDept dept = sysDeptService.selectByPk(deptid);
+        SysDept dept = sysDeptService.getById(deptid);
         apply.setDeptname(dept == null ? "" : dept.getName());
         BigDecimal decimal = new BigDecimal(accountBalance);
         decimal = decimal.setScale(2, BigDecimal.ROUND_HALF_UP);
@@ -329,7 +329,7 @@ public class InsPayApplyController extends BaseController {
         apply.setUserid(userid);
         apply.setUsername(user.getName());
         apply.setDeptid(user.getDeptId());
-        SysDept dept = sysDeptService.selectByPk(user.getDeptId());
+        SysDept dept = sysDeptService.getById(user.getDeptId());
         apply.setDeptname(dept == null ? "" : dept.getName());
         BigDecimal decimal = new BigDecimal(accountBalance);
         decimal = decimal.setScale(2, BigDecimal.ROUND_HALF_UP);
@@ -413,7 +413,7 @@ public class InsPayApplyController extends BaseController {
         apply.setUserid(userid);
         apply.setUsername(user.getName());
         apply.setDeptid(user.getDeptId());
-        SysDept dept = sysDeptService.selectByPk(user.getDeptId());
+        SysDept dept = sysDeptService.getById(user.getDeptId());
         apply.setDeptname(dept == null ? "" : dept.getName());
         BigDecimal decimal = new BigDecimal(accountBalance);
         decimal = decimal.setScale(2, BigDecimal.ROUND_HALF_UP);
@@ -740,4 +740,4 @@ public class InsPayApplyController extends BaseController {
     }
 
 
-}
+}

src/main/java/com/ydtech/modules/ins/controller/InsRenbaoController.java

@@ -122,7 +122,7 @@ public class InsRenbaoController {
         insOrder.setUserid(quoteInfo.getUserId());
         insOrder.setUsername(user.getName());
         insOrder.setDeptid(user.getDeptId());
-        SysDept dept = sysDeptService.selectByPk(user.getDeptId());
+        SysDept dept = sysDeptService.getById(user.getDeptId());
         insOrder.setDeptname(dept == null ? "" : dept.getName());
 
         double retailRate = countRetail(user.getDeptId(), user.getId());

src/main/java/com/ydtech/modules/ins/controller/InsTiananController.java

@@ -221,7 +221,7 @@ public class InsTiananController {
         insOrder.setUserid(quoteInfo.getUserId());
         insOrder.setUsername(user.getName());
         insOrder.setDeptid(user.getDeptId());
-        SysDept dept = sysDeptService.selectByPk(user.getDeptId());
+        SysDept dept = sysDeptService.getById(user.getDeptId());
         insOrder.setDeptname(dept == null ? "" : dept.getName());
 
         double retailRate = countRetail(user.getDeptId(), user.getId());
@@ -1083,4 +1083,4 @@ public class InsTiananController {
 
         return retailRate;
     }
-}
+}

src/main/java/com/ydtech/modules/ins/controller/InsYongChengApiController.java

@@ -13,6 +13,7 @@ import com.ydtech.modules.ins.service.InsYongchengApiService;
 import com.ydtech.modules.order.components.InsOrdersComponents;
 import com.ydtech.modules.order.entity.vo.BaseQuoteInfoVo;
 import com.ydtech.utils.Base64Utils;
+import com.ydtech.utils.RedisUtils;
 import com.ydtech.utils.StringUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -44,7 +45,7 @@ import javax.servlet.http.HttpServletRequest;
 @RequestMapping("/api/yongCheng")
 public class InsYongChengApiController {
 
-    private static final Logger log = LoggerFactory.getLogger("yongcheng");
+    private static final Logger log = LoggerFactory.getLogger("alltrust");
 
     @Autowired
     InsYongchengApiService insYongchengApiService;
@@ -205,6 +206,21 @@ public class InsYongChengApiController {
     }
 
 
+    /**
+     * 测试获取redis
+     */
+    @ApiOperation(value = "测试获取redis")
+    @GetMapping("/testRedis")
+    public HttpResult testRedis() {
+        log.info("this is a info log");
+        log.warn("this is a warn log");
+        log.error("this is a error log");
+        log.debug("ddddddddddddddd");
+        return HttpResult.ok(RedisUtils.exists("aaa"));
+
+    }
+
+
 //    @ApiOperation(value = "根据多个字典类型查询字典数据")
 //    @GetMapping("/listAllDataByTypes")
 //    public List<DictionaryManagement> listAllDataByTypes(@RequestParam Set<String> dictTypeList) {

src/main/java/com/ydtech/modules/ins/model/yc/audit/Audit.java

@@ -233,7 +233,11 @@ public class Audit {
      */
     public static Audit buildAuditParam(InsOrders order, AuthorityDataXml authorityDataXml,InsAreaCompany iac) {
 
+        //车主
+        CustomerInfoVo ownerInfo = JSONObject.parseObject(order.getOwnerinfo().toJSONString(), CustomerInfoVo.class);
+        //被保人
         CustomerInfoVo insureInfo = JSONObject.parseObject(order.getInsureinfo().toJSONString(), CustomerInfoVo.class);
+        //投保人
         CustomerInfoVo applyInfo = JSONObject.parseObject(order.getApplyinfo().toJSONString(), CustomerInfoVo.class);
 
         Audit m = new Audit();
@@ -260,7 +264,7 @@ public class Audit {
 
         //<condition>
         Customer customer = new Customer();
-        customer.setOwnerAddress(insureInfo.getAddr());
+        customer.setOwnerAddress(ownerInfo.getAddr());
         customer.setAppcIncome("0");
         customer.setInsuredcIncome("0");
         customer.setBenefitCustType("1");

src/main/java/com/ydtech/modules/ins/model/yc/ruote/Applicant.java

@@ -261,8 +261,8 @@ public class Applicant {
         applicant.setTBirthday(IDCardUtils.GetBirthday(policyHolderInfo.getIdentifyNumber()));
         applicant.setCSex(IDCardUtils.GetYcSex(policyHolderInfo.getIdentifyNumber()));
 
-        applicant.setCProvince(Province.buildProvince(policyHolderInfo.getAddr()));
-        applicant.setCCity(City.buildCity(policyHolderInfo.getAddr()));
+//        applicant.setCProvince(Province.buildProvince(policyHolderInfo.getAddr()));
+//        applicant.setCCity(City.buildCity(policyHolderInfo.getAddr()));
 
         applicant.setCRelCde(ownerInfo.getName().equals(policyHolderInfo.getName())?"601005":"601008");
 

src/main/java/com/ydtech/modules/ins/model/yc/ruote/Base.java

@@ -1,6 +1,7 @@
 package com.ydtech.modules.ins.model.yc.ruote;
 
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
+import com.ydtech.components.YongchengRequestApiComponents;
 import com.ydtech.modules.ins.model.ya.YaQuoteInfoVo;
 import com.ydtech.modules.ins.vo.RiskInfoVo;
 import com.ydtech.utils.DateTimeUtil;
@@ -281,7 +282,7 @@ public class Base {
     private String CBsnsTyp;
 
 
-    public static Base buildBase(YaQuoteInfoVo yaQuoteInfoVo) {
+    public static Base buildBase(YaQuoteInfoVo yaQuoteInfoVo, YongchengRequestApiComponents apiComponents) {
 //    public static Base buildBase(YaQuoteInfoVo yaQuoteInfoVo,Agent agent) {
         Base base = new Base();
 
@@ -292,7 +293,7 @@ public class Base {
         base.setNPrmRmbExch("1");
         base.setCAmtCur("01");
         base.setCPrmCur("01");
-        base.setCOprCde("100030057");
+        base.setCOprCde(apiComponents.getCBsnsTyp());
         base.setCImmeffMrk("1");
         base.setCUserType("0");
         base.setUserType("0");
@@ -306,8 +307,8 @@ public class Base {
         base.setTaxFlag("1");
         base.setRenewalFlagJQ("0");
         base.setRenewalFlagSY("0");
-        base.setCSlsCde("100030057");
-        base.setOperatorCode("100030057");
+        base.setCSlsCde(apiComponents.getCChaType());
+        base.setOperatorCode(apiComponents.getSalesmanNo());
         base.setTIssueTm(DateUtil.getDateFormat(new Date(), "yyyy-MM-dd"));
         base.setCChaType("191010");
 

src/main/java/com/ydtech/modules/ins/model/yc/ruote/CvrgListSY.java

@@ -80,6 +80,7 @@ public class CvrgListSY {
          */
         kindList.stream().forEach(a ->{
             CvrgListSY.CvrgSY bean = new CvrgListSY.CvrgSY();
+            String txt4 = (StringUtils.toDouble(a.getDeductibleRate(),0) / 100) + "";
 
             //第三者责任险
             if(a.getKindCode().equals(InsurKind.B.getCode())){
@@ -95,7 +96,7 @@ public class CvrgListSY {
             //机动车损失险
             if(a.getKindCode().equals(InsurKind.A.getCode())){
                 bean.setCCvrgNo("030006");
-                bean.setCResvTxt2("341003001");
+//                bean.setCResvTxt2("341003001");
                 bean.setNPerAmt(vhl.getNActualValue());
             }
             //司机责任险
@@ -106,23 +107,23 @@ public class CvrgListSY {
             //附加绝对免赔率特约条款（车损）
             if(a.getKindCode().equals(InsurKind.MJ1.getCode())){
                 bean.setCCvrgNo("030213");
-                bean.setCResvTxt4(a.getDeductibleRate());
+                bean.setCResvTxt4(txt4);
             }
             //绝对免赔率特约险（三者）
             if(a.getKindCode().equals(InsurKind.MJ2.getCode())){
                 bean.setCCvrgNo("030214");
-                bean.setCResvTxt4(a.getDeductibleRate());
+                bean.setCResvTxt4(txt4);
             }
             //绝对免赔率特约险（司机）
             if(a.getKindCode().equals(InsurKind.MJ3.getCode())){
                 bean.setCCvrgNo("030215");
-                bean.setCResvTxt4(a.getDeductibleRate());
+                bean.setCResvTxt4(txt4);
             }
             //绝对免赔率特约险（乘客）
             if(a.getKindCode().equals(InsurKind.MJ4.getCode())){
                 bean.setCCvrgNo("030216");
                 bean.setNLiabDaysLmt(passenger);
-                bean.setCResvTxt4(a.getDeductibleRate());
+                bean.setCResvTxt4(txt4);
                 bean.setNPerAmt(((int)a.getUnitAmount())+"");
             }
             //车身划痕险

src/main/java/com/ydtech/modules/ins/model/yc/ruote/Insured.java

@@ -281,8 +281,8 @@ public class Insured {
         insured.setTBirthday(IDCardUtils.GetBirthday(insuredPersonInfo.getIdentifyNumber()));
         insured.setCSex(IDCardUtils.GetYcSex(insuredPersonInfo.getIdentifyNumber()));
 
-        insured.setCProvince(Province.buildProvince(insuredPersonInfo.getAddr()));
-        insured.setCCity(City.buildCity(insuredPersonInfo.getAddr()));
+//        insured.setCProvince(Province.buildProvince(insuredPersonInfo.getAddr()));
+//        insured.setCCity(City.buildCity(insuredPersonInfo.getAddr()));
 
         insured.setTCertfClsValiDate("9999-12-31");
 

src/main/java/com/ydtech/modules/ins/model/yc/ruote/Ruote.java

@@ -3,6 +3,7 @@ package com.ydtech.modules.ins.model.yc.ruote;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
+import com.ydtech.components.YongchengRequestApiComponents;
 import com.ydtech.modules.ins.model.ya.YaQuoteInfoVo;
 import com.ydtech.modules.ins.model.yc.AuthorityDataXml;
 import com.ydtech.modules.ins.model.yc.YcBuildData;
@@ -150,7 +151,8 @@ public class Ruote {
      * @author: lig
      * @date: 2023年02月08日 0008
      */
-    public static Ruote buildQuoteParam(YaQuoteInfoVo yaQuoteInfoVo, AuthorityDataXml authorityDataXml,Agent agent) {
+    public static Ruote buildQuoteParam(YaQuoteInfoVo yaQuoteInfoVo, AuthorityDataXml authorityDataXml, Agent agent, YongchengRequestApiComponents apiComponents) {
+//    public static Ruote buildQuoteParam(YaQuoteInfoVo yaQuoteInfoVo, AuthorityDataXml authorityDataXml,Agent agent) {
 
         Ruote m = new Ruote();
         Ruote.RequestLabel requestLabel = new Ruote.RequestLabel();
@@ -166,7 +168,7 @@ public class Ruote {
         /**
          * 基本信息 base
          */
-        Base base = Base.buildBase(yaQuoteInfoVo);
+        Base base = Base.buildBase(yaQuoteInfoVo,apiComponents);
         condition.setBase(base);
 
         /**

src/main/java/com/ydtech/modules/ins/model/yc/ruote/Tax.java

@@ -138,6 +138,7 @@ public class Tax {
         tax.setIdType("120001");
         tax.setCalculatedType("349003001");
         tax.setVehecleTypeDetail("3490010013");
+        tax.setTaxpayerAddress(policyHolderInfo.getAddr());
 
         //纳税人识别号 =  投保人身份证号
         tax.setTaxpayerNO(policyHolderInfo.getIdentifyNumber());

src/main/java/com/ydtech/modules/ins/model/yc/ruote/Vhlowner.java

@@ -1,21 +1,11 @@
 package com.ydtech.modules.ins.model.yc.ruote;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
-import com.ydtech.constants.enums.City;
-import com.ydtech.constants.enums.Province;
-import com.ydtech.modules.ins.model.ya.YaQuoteInfoVo;
-import com.ydtech.modules.ins.vo.CarInfoVo;
 import com.ydtech.modules.ins.vo.CustomerInfoVo;
-import com.ydtech.utils.DateUtil;
 import com.ydtech.utils.IDCardUtils;
-import com.ydtech.utils.StringUtils;
 import lombok.Data;
 
-import java.text.DateFormat;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
 
 /**
  * @description: 车主信息 vhlowner
@@ -110,6 +100,13 @@ public class Vhlowner {
     @JacksonXmlProperty(localName = "CWorkdptKind")
     private String CWorkdptKind;
 
+    /**
+     *  地址   xml不转换
+     */
+//    @JsonIgnore
+    private String cWaddress;
+
+
 
 
 
@@ -132,11 +129,13 @@ public class Vhlowner {
 
         vhlowner.setCOwnerCls("1");
 
-        vhlowner.setCProvince(Province.buildProvince(ownerInfo.getAddr()));
-        vhlowner.setCCity(City.buildCity(ownerInfo.getAddr()));
+//        vhlowner.setCProvince(Province.buildProvince(ownerInfo.getAddr()));
+//        vhlowner.setCCity(City.buildCity(ownerInfo.getAddr()));
 
         //@TODO 不确定
         vhlowner.setCWorkdptKind("330");
+        //地址  自建
+        vhlowner.setCWaddress(ownerInfo.getAddr());
 
         return vhlowner;
     }

src/main/java/com/ydtech/modules/ins/service/impl/InsCmainServiceImpl.java

@@ -451,7 +451,7 @@ public class InsCmainServiceImpl implements InsCmainService {
         insCompanyFee.setUserid(insCmain.getHandlercode());
         insCompanyFee.setUsername(sysUserService.findByUserId(insCmain.getHandlercode()).getName());
         insCompanyFee.setDeptid(insCmain.getComcode());
-        insCompanyFee.setDeptname(sysDeptService.selectByPk(insCmain.getComcode()).getName());
+        insCompanyFee.setDeptname(sysDeptService.getById(insCmain.getComcode()).getName());
         insCompanyFee.setFeerate(feeDetail.getFeerate());//手续费比例
         insCompanyFee.setDisrate(feeDetail.getDisrate());
         insCompanyFee.setFeeamount(feeDetail.getFeeamount());  // 手续费

src/main/java/com/ydtech/modules/ins/service/impl/InsRenbaoServiceImpl.java

@@ -244,7 +244,7 @@ public class InsRenbaoServiceImpl implements InsRenbaoService {
         insOrder.setUserid(user.getId());
         insOrder.setUsername(user.getName());
         insOrder.setDeptid(user.getDeptId());
-        SysDept dept = sysDeptService.selectByPk(user.getDeptId());
+        SysDept dept = sysDeptService.getById(user.getDeptId());
         insOrder.setDeptname(dept == null ? "" : dept.getName());
 
         double retailRate = orderComponents.countRetail(user.getDeptId(), user.getId());

src/main/java/com/ydtech/modules/ins/service/impl/InsSettleServiceImpl.java

@@ -153,7 +153,7 @@ public class InsSettleServiceImpl implements InsSettleService {
             throw new DescribeException("请选选归属机构！");
         }
         // 查询机构名称
-        SysDept dept = sysDeptService.selectByPk(settle.getComcode());
+        SysDept dept = sysDeptService.getById(settle.getComcode());
 
         settle.setPageNum(0);
         settle.setPageSize(0);

src/main/java/com/ydtech/modules/ins/service/impl/InsYongchengApiServiceImpl.java

@@ -38,10 +38,7 @@ import com.ydtech.modules.ins.model.yc.pay.response.AccidentResponse;
 import com.ydtech.modules.ins.model.yc.pay.response.PayResponse;
 import com.ydtech.modules.ins.model.yc.policy.Policy;
 import com.ydtech.modules.ins.model.yc.policy.response.PolicyResponse;
-import com.ydtech.modules.ins.model.yc.ruote.Agent;
-import com.ydtech.modules.ins.model.yc.ruote.Applicant;
-import com.ydtech.modules.ins.model.yc.ruote.Insured;
-import com.ydtech.modules.ins.model.yc.ruote.Ruote;
+import com.ydtech.modules.ins.model.yc.ruote.*;
 import com.ydtech.modules.ins.model.yc.ruote.response.RuoteResponse;
 import com.ydtech.modules.ins.service.*;
 import com.ydtech.modules.ins.vo.*;
@@ -237,7 +234,7 @@ public class InsYongchengApiServiceImpl implements InsYongchengApiService {
         checkEmpty(yaQuoteInfoVo);
 
         //组装参数
-        Ruote m = Ruote.buildQuoteParam(yaQuoteInfoVo, gainAuthorityDataXml(), apiComponents.gainAgent());
+        Ruote m = Ruote.buildQuoteParam(yaQuoteInfoVo, gainAuthorityDataXml(), apiComponents.gainAgent(),apiComponents);
         //构造地区
         buildRegion(m);
 
@@ -1055,27 +1052,46 @@ public class InsYongchengApiServiceImpl implements InsYongchengApiService {
 
 
     private void buildRegion(Ruote m) {
+        //车主
+        Vhlowner owner = m.getRequestLabel().getCondition().getVhlowner();
         //被保人
         Insured i = m.getRequestLabel().getCondition().getInsured();
         //投保人
         Applicant a = m.getRequestLabel().getCondition().getApplicant();
 
+
+        String provinceCode = "provinceCode";
+        String cityCode = "cityCode";
+        String areaCode = "areaCode";
+//        owner.getCAreaCde()
+
+        Map<String,String> ownerMap = gainRegionCode(owner.getCWaddress());
+        if(null != ownerMap && ownerMap.size() > 0){
+            owner.setCProvince(ownerMap.get(provinceCode));
+            owner.setCCity(ownerMap.get(cityCode));
+            owner.setCCounty(ownerMap.get(areaCode));
+            //禁止格式化自建数据
+            owner.setCWaddress(null);
+        }else{
+            throw new SystemException("永诚 - 车主地区获取失败，请联系管理员");
+        }
+
         Map<String,String> iMap = gainRegionCode(i.getCClntAddr());
         if(null != iMap && iMap.size() > 0){
-            i.setCProvince(iMap.get("provinceCode"));
-            i.setCCity(iMap.get("cityCode"));
-            i.setCCounty(iMap.get("areaCode"));
+            i.setCProvince(iMap.get(provinceCode));
+            i.setCCity(iMap.get(cityCode));
+            i.setCCounty(iMap.get(areaCode));
         }else{
-            throw new SystemException("永诚 - 地区获取失败，请联系管理员");
+            throw new SystemException("永诚 - 被保人地区获取失败，请联系管理员");
         }
 
         Map<String,String> aMap = gainRegionCode(a.getCClntAddr());
         if(null != aMap && aMap.size() > 0){
-            a.setCProvince(aMap.get("provinceCode"));
-            a.setCCity(aMap.get("cityCode"));
-            a.setCCounty(aMap.get("areaCode"));
+            a.setCProvince(aMap.get(provinceCode));
+            a.setCCity(aMap.get(cityCode));
+            a.setCCounty(aMap.get(areaCode));
         }else{
-            throw new SystemException("永诚 - 地区获取失败，请联系管理员");
+            throw new SystemException("永诚 - 投保人地区获取失败，请联系管理员");
         }
     }
 

src/main/java/com/ydtech/modules/ins/service/impl/YongAnServiceImpl.java

@@ -449,7 +449,7 @@ public class YongAnServiceImpl implements YongAnService {
                 order.setSyappoint(""); //商业特别约定
 
                 insOrderService.update(order);
-                
+
 
                 insTaskHistoryService.insertByOrderStatus(order);
 
@@ -722,7 +722,7 @@ public class YongAnServiceImpl implements YongAnService {
         }
         return httpResult;
     }
-    
+
     @Autowired
     private InsAreaCompanyService insAreaCompanyService;
 
@@ -1024,7 +1024,7 @@ public class YongAnServiceImpl implements YongAnService {
         insOrder.setUserid(user.getId());
         insOrder.setUsername(user.getName());
         insOrder.setDeptid(user.getDeptId());
-        SysDept dept = sysDeptService.selectByPk(user.getDeptId());
+        SysDept dept = sysDeptService.getById(user.getDeptId());
         insOrder.setDeptname(dept == null ? "" : dept.getName());
 
         double retailRate = countRetail(user.getDeptId(), user.getId());

src/main/java/com/ydtech/modules/inv/service/impl/InvoiceServiceImpl.java

@@ -94,7 +94,7 @@ public class InvoiceServiceImpl implements InvoiceService {
         PageHelper.startPage(req.getPageNum(), req.getPageSize());
         List<InvoiceRes> list = invoiceMapper.select(req);
         for (InvoiceRes invoiceVo : list) {
-            SysDept sysDept = sysDeptService.selectByPk(invoiceVo.getComcode());
+            SysDept sysDept = sysDeptService.getById(invoiceVo.getComcode());
             invoiceVo.setComname(sysDept.getName());
         }
         return HttpResult.ok(msg, new PageResult<>(list));

src/main/java/com/ydtech/modules/order/service/impl/InsOrdersServiceImpl.java

@@ -130,7 +130,7 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
         insOrders.setUsername(user.getName());
         insOrders.setDeptid(user.getDeptId());
 
-        SysDept dept = sysDeptService.selectByPk(user.getDeptId());
+        SysDept dept = sysDeptService.getById(user.getDeptId());
         insOrders.setDeptname(dept == null ? "" : dept.getName());
 
         // 2.2 人员信息

src/main/java/com/ydtech/nai/controller/ChinaCoalInterface.java

@@ -348,7 +348,7 @@ public class ChinaCoalInterface {
 
         insOrder.setUsername(user.getName());
         insOrder.setDeptid(user.getDeptId());
-        SysDept dept = sysDeptService.selectByPk(user.getDeptId());
+        SysDept dept = sysDeptService.getById(user.getDeptId());
         insOrder.setDeptname(dept == null ? "" : dept.getName());
 
         double retailRate = countRetail(user.getDeptId(), user.getId());

src/main/java/com/ydtech/utils/JsonUtils.java

@@ -88,7 +88,7 @@ public final class JsonUtils {
      * @param typeReference 类型
      * @return 对象
      */
-    public static <T> T toObject(String json, TypeReference<?> typeReference) {
+    public static <T> T toObject(String json, TypeReference<T> typeReference) {
         Assert.hasText(json);
         Assert.notNull(typeReference);
 

src/main/resources/application-dev.properties

@@ -1,281 +1,286 @@
-## \u6570\u636E\u5E93\u8BBF\u95EE\u914D\u7F6E
-## \u4E3B\u6570\u636E\u6E90\uFF0C\u9ED8\u8BA4\u7684
-##spring.datasource.druid.type=com.alibaba.druid.pool.DruidDataSource
-##spring.datasource.druid.driver-class-name=com.mysql.jdbc.Driver
-#spring.datasource.druid.driver-class-name=com.mysql.cj.jdbc.Driver
-#spring.datasource.druid.url=jdbc:mysql://localhost:3306/zgdd?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=UTC
-#spring.datasource.druid.username=root
-#spring.datasource.druid.password=root
-server.servlet.encoding.force=true
-server.servlet.encoding.charset=UTF-8
-# \u6700\u5927\u652F\u6301\u6587\u4EF6\u5927\u5C0F
-spring.servlet.multipart.max-file-size=2000MB
-# \u6700\u5927\u652F\u6301\u8BF7\u6C42\u5927\u5C0F
-spring.servlet.multipart.max-request-size=2000MB
-## DataSource settings
-#spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
-##spring.datasource.url = jdbc:mysql://localhost:3306/zgdd?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
-#spring.datasource.url = jdbc:mysql://39.100.252.34:3306/zgdd?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
-#spring.datasource.username = root
-#spring.datasource.password = root
-#spring.datasource.driverClassName = com.mysql.jdbc.Driver
-spring.datasource.driver-class-name=com.p6spy.engine.spy.P6SpyDriver
-
-## \u5F00\u53D1\u5E93
-spring.datasource.url=jdbc:p6spy:mysql://127.0.0.1:3306/zgdd?serverTimezone=Asia/Shanghai&allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8
-spring.datasource.username=root
-spring.datasource.password=root
-## spring \u914D\u7F6E
-## \u5982\u679C\u914D\u7F6E\u4E86spring-resources\uFF0C\u5219\u5FC5\u987B\u5305\u542Bclasspath:/static/
-## \u8BBF\u95EE\u9759\u6001\u9875\u9762 /pages/\u6307\u5B9A\u8DEF\u5F84\u4E3A /static/pages/
-#spring.mvc.view.prefix=/
-## \u9759\u6001\u9875\u9762\u540E\u7F00
-#spring.mvc.view.suffix=.html
-## \u9759\u6001\u6587\u4EF6\u8DEF\u5F84, \u8D44\u6E90\u8DEF\u5F84\uFF0C\u535A\u5BA2\u8DEF\u5F84
-#spring.resources.static-locations=classpath:/static/
-# \u4E0B\u9762\u4E3A\u8FDE\u63A5\u6C60\u7684\u8865\u5145\u8BBE\u7F6E\uFF0C\u5E94\u7528\u5230\u4E0A\u9762\u6240\u6709\u6570\u636E\u6E90\u4E2D
-# \u521D\u59CB\u5316\u5927\u5C0F\uFF0C\u6700\u5C0F\uFF0C\u6700\u5927
-spring.datasource.druid.initial-size=5
-spring.datasource.druid.minIdle=5
-spring.datasource.druid.maxActive=20
-# \u914D\u7F6E\u83B7\u53D6\u8FDE\u63A5\u7B49\u5F85\u8D85\u65F6\u7684\u65F6\u95F4
-spring.datasource.druid.maxWait=60000
-# \u914D\u7F6E\u95F4\u9694\u591A\u4E45\u624D\u8FDB\u884C\u4E00\u6B21\u68C0\u6D4B\uFF0C\u68C0\u6D4B\u9700\u8981\u5173\u95ED\u7684\u7A7A\u95F2\u8FDE\u63A5\uFF0C\u5355\u4F4D\u662F\u6BEB\u79D2
-spring.datasource.druid.timeBetweenEvictionRunsMillis=60000
-# \u914D\u7F6E\u4E00\u4E2A\u8FDE\u63A5\u5728\u6C60\u4E2D\u6700\u5C0F\u751F\u5B58\u7684\u65F6\u95F4\uFF0C\u5355\u4F4D\u662F\u6BEB\u79D2
-spring.datasource.druid.minEvictableIdleTimeMillis=300000
-spring.datasource.druid.validationQuery=SELECT 1 FROM DUAL
-spring.datasource.druid.testWhileIdle=true
-spring.datasource.druid.testOnBorrow=true
-spring.datasource.druid.testOnReturn=true
-# \u6253\u5F00PSCache\uFF0C\u5E76\u4E14\u6307\u5B9A\u6BCF\u4E2A\u8FDE\u63A5\u4E0APSCache\u7684\u5927\u5C0F
-spring.datasource.druid.poolPreparedStatements=true
-spring.datasource.druid.maxPoolPreparedStatementPerConnectionSize=20
-# \u914D\u7F6E\u76D1\u63A7\u7EDF\u8BA1\u62E6\u622A\u7684filters\uFF0C\u53BB\u6389\u540E\u76D1\u63A7\u754C\u9762sql\u65E0\u6CD5\u7EDF\u8BA1\uFF0C'wall'\u7528\u4E8E\u9632\u706B\u5899
-spring.datasource.druid.filters=stat,wall,log4j
-# \u901A\u8FC7connectProperties\u5C5E\u6027\u6765\u6253\u5F00mergeSql\u529F\u80FD\uFF1B\u6162SQL\u8BB0\u5F55
-spring.datasource.druid.connectionProperties=druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
-# \u5408\u5E76\u591A\u4E2ADruidDataSource\u7684\u76D1\u63A7\u6570\u636E
-#spring.datasource.druid.useGlobalDataSourceStat=true
-#\u4E2D\u7164\u63A5\u53E3\u6D4B\u8BD5\u5730\u5740
-ZMUrl=https://test.echinacoal.com/singlePlatform/
-ZMIMGUrl=https://test.echinacoal.com/singlePlatform/others/
-ZMSMSUrl=https://test.echinacoal.com/singlePlatform/prpall/
-ZMToken=THIRDSCOuloft2020052818346904zmYBSX
-CallbackUrl=http://47.92.254.66:8080/zm/Underwriting
-RGCallbackUrl=http://47.92.254.66:8080/zm/ArtificialUnderwriting
-
-
-
+### \u6570\u636E\u5E93\u8BBF\u95EE\u914D\u7F6E
+### \u4E3B\u6570\u636E\u6E90\uFF0C\u9ED8\u8BA4\u7684
+###spring.datasource.druid.type=com.alibaba.druid.pool.DruidDataSource
+###spring.datasource.druid.driver-class-name=com.mysql.jdbc.Driver
+##spring.datasource.druid.driver-class-name=com.mysql.cj.jdbc.Driver
+##spring.datasource.druid.url=jdbc:mysql://localhost:3306/zgdd?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=UTC
+##spring.datasource.druid.username=root
+##spring.datasource.druid.password=root
+#server.servlet.encoding.force=true
+#server.servlet.encoding.charset=UTF-8
+## \u6700\u5927\u652F\u6301\u6587\u4EF6\u5927\u5C0F
+#spring.servlet.multipart.max-file-size=2000MB
+## \u6700\u5927\u652F\u6301\u8BF7\u6C42\u5927\u5C0F
+#spring.servlet.multipart.max-request-size=2000MB
+### DataSource settings
+##spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
+###spring.datasource.url = jdbc:mysql://localhost:3306/zgdd?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
+##spring.datasource.url = jdbc:mysql://39.100.252.34:3306/zgdd?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
+##spring.datasource.username = root
+##spring.datasource.password = root
+##spring.datasource.driverClassName = com.mysql.jdbc.Driver
+#spring.datasource.driver-class-name=com.p6spy.engine.spy.P6SpyDriver
+#
+### \u5F00\u53D1\u5E93
+#spring.datasource.url=jdbc:p6spy:mysql://127.0.0.1:3306/zgdd?serverTimezone=Asia/Shanghai&allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8
+#spring.datasource.username=root
+#spring.datasource.password=root
+### spring \u914D\u7F6E
+### \u5982\u679C\u914D\u7F6E\u4E86spring-resources\uFF0C\u5219\u5FC5\u987B\u5305\u542Bclasspath:/static/
+### \u8BBF\u95EE\u9759\u6001\u9875\u9762 /pages/\u6307\u5B9A\u8DEF\u5F84\u4E3A /static/pages/
+##spring.mvc.view.prefix=/
+### \u9759\u6001\u9875\u9762\u540E\u7F00
+##spring.mvc.view.suffix=.html
+### \u9759\u6001\u6587\u4EF6\u8DEF\u5F84, \u8D44\u6E90\u8DEF\u5F84\uFF0C\u535A\u5BA2\u8DEF\u5F84
+##spring.resources.static-locations=classpath:/static/
+## \u4E0B\u9762\u4E3A\u8FDE\u63A5\u6C60\u7684\u8865\u5145\u8BBE\u7F6E\uFF0C\u5E94\u7528\u5230\u4E0A\u9762\u6240\u6709\u6570\u636E\u6E90\u4E2D
+## \u521D\u59CB\u5316\u5927\u5C0F\uFF0C\u6700\u5C0F\uFF0C\u6700\u5927
+#spring.datasource.druid.initial-size=5
+#spring.datasource.druid.minIdle=5
+#spring.datasource.druid.maxActive=20
+## \u914D\u7F6E\u83B7\u53D6\u8FDE\u63A5\u7B49\u5F85\u8D85\u65F6\u7684\u65F6\u95F4
+#spring.datasource.druid.maxWait=60000
+## \u914D\u7F6E\u95F4\u9694\u591A\u4E45\u624D\u8FDB\u884C\u4E00\u6B21\u68C0\u6D4B\uFF0C\u68C0\u6D4B\u9700\u8981\u5173\u95ED\u7684\u7A7A\u95F2\u8FDE\u63A5\uFF0C\u5355\u4F4D\u662F\u6BEB\u79D2
+#spring.datasource.druid.timeBetweenEvictionRunsMillis=60000
+## \u914D\u7F6E\u4E00\u4E2A\u8FDE\u63A5\u5728\u6C60\u4E2D\u6700\u5C0F\u751F\u5B58\u7684\u65F6\u95F4\uFF0C\u5355\u4F4D\u662F\u6BEB\u79D2
+#spring.datasource.druid.minEvictableIdleTimeMillis=300000
+#spring.datasource.druid.validationQuery=SELECT 1 FROM DUAL
+#spring.datasource.druid.testWhileIdle=true
+#spring.datasource.druid.testOnBorrow=true
+#spring.datasource.druid.testOnReturn=true
+## \u6253\u5F00PSCache\uFF0C\u5E76\u4E14\u6307\u5B9A\u6BCF\u4E2A\u8FDE\u63A5\u4E0APSCache\u7684\u5927\u5C0F
+#spring.datasource.druid.poolPreparedStatements=true
+#spring.datasource.druid.maxPoolPreparedStatementPerConnectionSize=20
+## \u914D\u7F6E\u76D1\u63A7\u7EDF\u8BA1\u62E6\u622A\u7684filters\uFF0C\u53BB\u6389\u540E\u76D1\u63A7\u754C\u9762sql\u65E0\u6CD5\u7EDF\u8BA1\uFF0C'wall'\u7528\u4E8E\u9632\u706B\u5899
+#spring.datasource.druid.filters=stat,wall,log4j
+## \u901A\u8FC7connectProperties\u5C5E\u6027\u6765\u6253\u5F00mergeSql\u529F\u80FD\uFF1B\u6162SQL\u8BB0\u5F55
+#spring.datasource.druid.connectionProperties=druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
+## \u5408\u5E76\u591A\u4E2ADruidDataSource\u7684\u76D1\u63A7\u6570\u636E
+##spring.datasource.druid.useGlobalDataSourceStat=true
+##\u4E2D\u7164\u63A5\u53E3\u6D4B\u8BD5\u5730\u5740
+#ZMUrl=https://test.echinacoal.com/singlePlatform/
+#ZMIMGUrl=https://test.echinacoal.com/singlePlatform/others/
+#ZMSMSUrl=https://test.echinacoal.com/singlePlatform/prpall/
+#ZMToken=THIRDSCOuloft2020052818346904zmYBSX
+#CallbackUrl=http://47.92.254.66:8080/zm/Underwriting
+#RGCallbackUrl=http://47.92.254.66:8080/zm/ArtificialUnderwriting
+#
+#
+#
+###\u4E2D\u7164\u63A5\u53E3
+##zm.quote.url=http://192.168.1.7:5000/zm/quotedPrice
+##zm.audit.url=http://192.168.1.7:5000/zm/audit
+##zm.getPolicyPrint.url=http://192.168.1.7:5000/zm/getPolicyPrint
+##zm.image.url=http://47.92.254.66:8088/zm/yxsc
+#
+#
 ##\u4E2D\u7164\u63A5\u53E3
-#zm.quote.url=http://192.168.1.7:5000/zm/quotedPrice
-#zm.audit.url=http://192.168.1.7:5000/zm/audit
-#zm.getPolicyPrint.url=http://192.168.1.7:5000/zm/getPolicyPrint
+#zm.domain=http://47.92.254.66:8888/zm
+#zm.quote.url=${zm.domain}/quotedPrice
+#zm.audit.url=${zm.domain}/audit
+#zm.getPolicyPrint.url=${zm.domain}/getPolicyPrint
 #zm.image.url=http://47.92.254.66:8088/zm/yxsc
-
-
-#\u4E2D\u7164\u63A5\u53E3
-zm.domain=http://47.92.254.66:8888/zm
-zm.quote.url=${zm.domain}/quotedPrice
-zm.audit.url=${zm.domain}/audit
-zm.getPolicyPrint.url=${zm.domain}/getPolicyPrint
-zm.image.url=http://47.92.254.66:8088/zm/yxsc
-zm.verifyPayment.url=${zm.domain}/verifyPayment
-zm.modelQuery.url=${zm.domain}/modelQuery
-zm.vinSearch.url=${zm.domain}/vinSearch
-
-
-
-
-# \u6052\u90A6\u63A5\u53E3
-hb.quote.url=http://47.92.254.66:8088/hb/hb_bfjs
-hb.audit.url=http://47.92.254.66:8088/hb/hb_hebao
-hb.image.url=http://47.92.254.66:8088/hb/hb_phoup
-hb.getPolicyPrint.url=http://47.92.254.66:8088/hb/hb_bdsearch
-
-
-#\u4E2D\u7164\u63A5\u53E3\u751F\u4EA7\u5730\u5740
-#ZMUrl=https://www.echinacoal.com/singlePlatform/
-#ZMIMGUrl=https://www.echinacoal.com/singlePlatform/others/
-#ZMSMSUrl=https://www.echinacoal.com/singlePlatform/prpall/
-#ZMToken=THIRDSCOuloft2020052818346904zmYBSXQYTQ
-#CallbackUrl=http://39.101.143.165:8080/zm/Underwriting
-#RGCallbackUrl=http://39.101.143.165:8080/zm/ArtificialUnderwriting
-#\u5929\u5B89API\u6D4B\u8BD5\u53C2\u6570
-TASign=gIpr5j5haL7T8WJY7ZS54JdlYL/7PToQOy505Mr/iH3qN4SMpJJVdvxFE1/KsWH0EjDxR9qVwRC/t6kLCJo+Y1AB+FD1qNjkbLyEQ+9aeQEF2Af/4bJqUDArewHHT879o5IqzHg/lcg=
-TAModelUrl=https://testow.95505.cn/cpf/tianan_cpf/access/car/queryCarModel.mvc
-TAQuoteUrl=https://testow.95505.cn/cpf/tianan_cpf/access/car/premiumAccurate.mvc
-TAInsureUrl=https://testow.95505.cn/cpf/tianan_cpf/access/car/insureConfirmation.mvc
-TAPayUrl=https://testow.95505.cn/cpf/tianan_cpf/common/pay/applyPay.do
-TAUploadUrl=https://testow.95505.cn/cpf/tianan_cpf/access/car/thirdUploadAttach.mvc
-#\u5929\u5B89API\u751F\u4EA7\u53C2\u6570
+#zm.verifyPayment.url=${zm.domain}/verifyPayment
+#zm.modelQuery.url=${zm.domain}/modelQuery
+#zm.vinSearch.url=${zm.domain}/vinSearch
+#
+#
+#
+#
+## \u6052\u90A6\u63A5\u53E3
+#hb.quote.url=http://47.92.254.66:8088/hb/hb_bfjs
+#hb.audit.url=http://47.92.254.66:8088/hb/hb_hebao
+#hb.image.url=http://47.92.254.66:8088/hb/hb_phoup
+#hb.getPolicyPrint.url=http://47.92.254.66:8088/hb/hb_bdsearch
+#
+#
+##\u4E2D\u7164\u63A5\u53E3\u751F\u4EA7\u5730\u5740
+##ZMUrl=https://www.echinacoal.com/singlePlatform/
+##ZMIMGUrl=https://www.echinacoal.com/singlePlatform/others/
+##ZMSMSUrl=https://www.echinacoal.com/singlePlatform/prpall/
+##ZMToken=THIRDSCOuloft2020052818346904zmYBSXQYTQ
+##CallbackUrl=http://39.101.143.165:8080/zm/Underwriting
+##RGCallbackUrl=http://39.101.143.165:8080/zm/ArtificialUnderwriting
+##\u5929\u5B89API\u6D4B\u8BD5\u53C2\u6570
 #TASign=gIpr5j5haL7T8WJY7ZS54JdlYL/7PToQOy505Mr/iH3qN4SMpJJVdvxFE1/KsWH0EjDxR9qVwRC/t6kLCJo+Y1AB+FD1qNjkbLyEQ+9aeQEF2Af/4bJqUDArewHHT879o5IqzHg/lcg=
-#TAModelUrl=https://cpf.95505.cn/tianan_cpf/access/car/queryCarModel.mvc
-#TAQuoteUrl=https://cpf.95505.cn/tianan_cpf/access/car/premiumAccurate.mvc
-#TAInsureUrl=https://cpf.95505.cn/tianan_cpf/access/car/insureConfirmation.mvc
-#TAPayUrl=https://cpf.95505.cn/tianan_cpf/common/pay/applyPay.do
-#TAUploadUrl=https://cpf.95505.cn/tianan_cpf/access/car/thirdUploadAttach.mvc
-#\u6587\u4EF6\u4E0A\u4F20\u8DEF\u5F84\u6D4B\u8BD5
-filePath=C:/soft/apache-tomcat-8.5.75/webapps/upload/
-#\u6587\u4EF6\u4E0A\u4F20\u8DEF\u5F84\u751F\u4EA7
-#filePath=/usr/local/apache-tomcat-7.0.93/webapps/upload/
-# \u8DEF\u5F84\u5E26\u4E0A\u524D\u540E\u659C\u6746
-upload.basepath=${filePath}
-upload.host=
-upload.username=
-upload.password=
-upload.url=${netUrl}
-##\u6D4B\u8BD5\u5730\u5740
-netUrl=http://47.92.254.66:8080/
-##\u751F\u4EA7\u5730\u5740
-#netUrl=http://39.101.143.165:8080/
-#\u7279\u6B8A\u8D26\u53F7
-#Specialaccount=
-Specialaccount=99999999999999
-#mybatis xml\u6587\u4EF6\u626B\u63CF\u8DEF\u5F84
-mybatis.mapper-locations=classpath:mapper/**/*.xml
-mybatis.type-aliases-package=com.ydtech.modules.*.model
-#================ mybatis pagehelper ==============#
-pagehelper.helper-dialect=mysql
-pagehelper.reasonable=true
-pagehelper.support-methods-arguments=true
-pagehelper.params=count=countSql
-#================ \u4E2D\u4FDD\u4FE1\u63A5\u53E3\u5BF9\u63A5--\u5F00\u59CB==============#
-##\u63A5\u53E3\u5730\u5740
-cbit.url_pre=http://88.88.1.51:5017
-cbit.api2=/pjms/insurance/open/unify/order/getInitParams
-cbit.api3=/pjms/insurance/open/unify/order/generateOrderNo
-cbit.api4=/pjms/insurance/open/unify/vehicle/getTMBVerificationCode
-cbit.api5=/pjms/insurance/open/unify/vehicle/queryVehicleModel
-cbit.api6=/pjms/insurance/open/unify/vehicle/confirmVehicle
-cbit.api7=/pjms/insurance/open/unify/order/quote
-cbit.api8=/pjms/insurance/open/unify/order/postUnderwriting
-cbit.api9=/pjms/insurance/open/unify/order/applyPay
-cbit.api10=/pjms/insurance/open/unify/order/cancelUnderwriting
-cbit.api11=/pjms/insurance/open/unify/order/getVerificationCode
-cbit.api12=/pjms/insurance/open/unify/order/commitVerificationCode
-cbit.api14=/pjms/insurance/open/unify/order/sendEleApplicationSign
-cbit.api17=/pjms/insurance/open/unify/order/viewToPay
-##\u5176\u4ED6
-###\u4E2D\u4ECB\u673A\u6784id
-cbit.franchiserId=taiyuantianqin-001
-cbit.franchiserChannelId_pingan=CBIT01240000
-cbit.franchiserChannelCode_pingan=QIAOYRXX-00001
-cbit.carDealerCode_pingan=224189117001
-cbit.insurerBranchCode_pingan=140000
-cbit.franchiserChannelId_taiping=CBIT01240000
-cbit.groupCode_taiping=S132001
-cbit.insurerBranchCode_taiping=140000
-cbit.franchiserChannelId_taipingyang=CBIT01240000
-cbit.insurerBranchCode_taipingyang=140000
-###ip\u5730\u5740
-cbit.ip=10.23.69.89
-### \u4E2D\u4ECB\u5E73\u53F0-\u52A0\u89E3\u5BC6\u79D8\u94A5\u5BF9 \u79C1\u94A5+\u516C\u94A5
-#cbit.ZJPT_PRIVATE_KEY=MIICdQIBADANBgkqhkiG9w0BAQEFAASCAl8wggJbAgEAAoGBAMpskeUA+JfNr0Dsx+zZwu/KwprkaN0y0bVBC/ygAOQCBx26NGrRodWM0VehWbtvUN2WEQB2EpcntfJj/bOgRumhThjHMh+2WgdnS93+Ti+ACDlt4f3vaOlZmPo3cRH4SBHvf5SLSnSl1chGMMXijyZZIvDxbxn3d4gu0uDQNw4jAgMBAAECgYAyOnqBPppw4KLqE1cQmIBcjA157c9vg9qxhTB6QSG3ciFd6QR0tQvZN5YCjpD7h4WjVkdlu+alBz+Io/MiDVVK1qt+EsqWBKSx7fAi5UFmoVPHcmw7ZrnBmQLlduo9CUbyTQKGvVlEY+lHwRjuko40jSDRJQVHCbIDc/kxmipukQJBAOqf44+b+agA3RJBYLPqsaUShK8ykor2nZptUNFtMBiuGPuQ0sT3cfZMB9upc586ckFDZcqChqFLUAfpmgMIgYUCQQDc3ay6RJ9owqkkPTKeeppeZqDoD5Nk3nipuMyJwTL0GR0A1AfUXcA0F8BxEQob1k65Tcw7ol2j7DmRqjA8uw2HAkAr92RUT/07r1W+CwRNEsjRTyQQFKEDa21jN+LyK8zcgxtpYN0uTdRMPDkov5tMFk68zh1wEn+aEBviL7NNqDVlAkBlu6mzBqbSj09vhMzLGLgAIY+eNIZ04NB9hMSZ8yawLt0gI4oTtLcyh3o52lpophcO3ZnkIg610bpWsSiU4KgDAkA+vyBe7spxLR1S/k4FhPP9YZay6vmuzwzSNUKF5JquTLuI9iqZRf+n3Yfy6wgQzkP2WIeQDRe074p09MFGc+pp
-cbit.ZJPT_PUBLIC_KEY=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDKbJHlAPiXza9A7Mfs2cLvysKa5GjdMtG1QQv8oADkAgcdujRq0aHVjNFXoVm7b1DdlhEAdhKXJ7XyY/2zoEbpoU4YxzIftloHZ0vd/k4vgAg5beH972jpWZj6N3ER+EgR73+Ui0p0pdXIRjDF4o8mWSLw8W8Z93eILtLg0DcOIwIDAQAB
-### \u5408\u4F5C\u4F19\u4F34-\u52A0\u89E3\u5BC6\u79D8\u94A5\u5BF9  \u79C1\u94A5+\u516C\u94A5
-cbit.HZHB_PRIVATE_KEY=MIICeAIBADANBgkqhkiG9w0BAQEFAASCAmIwggJeAgEAAoGBAJnWpyVLFBli1kakBXUjk/SmH+X1X0kGGik0ub1MXnNUOk9NBqRQjO6G9A6wdiGzo9j9w26u5u9R6R6De843YMhgW6iIoDodexvZzInxTE+YY52iUBDCcksHYAM7uHZBtdXKovm+bEzL0nwa89Xw6zyuCm8x7enoDiVzs/75WoqrAgMBAAECgYAnEcC5U+vy1oscvaM1MKfuxhHr0Pk2DnquZFmXncGPAKEeaq15JYvlOBjbci1OOdUu0qPDhF/Z/694tGPI53+If0MkS3VpxaOYc+i/G/KQiYZIu1hjUb2F8j8xQrF60WkIsqwzjJYF9T5MCjLEZvDg9cPzFY+QpS8yl5Cbl0aOYQJBAMd+0VtQYV9q3nsZgEk4ux6Vz19SakRbk9zkz1yBUKRfWcLa1T9DleaBqGdkdZbO8v6PCtyz6Fdymq+USYWeV3UCQQDFaU5O8GeNr07J6quTgHgsbN8IV28Wp4wKmDAXCWlehkGGoTm11FOL2zxItjgmmHGyXBA08osPCojBPptOazWfAkEAmG3K04WwUPLcOZy7i7cAKpd3ErNrJP4AFcjytBDOqDl+4UbJp4QhljW9kfqNaoSH4H81YntIbQDRNpUMND9PPQJBAKWfnBuOhtLQagHt6NVvy2M6VETjVkhjeZLJ7E7njofHi+IwEgMDiLSl0wYOGz4GWB2UL+S8OP79j47Rv+si93ECQQCNqD8nMcVXIHKze7aM9c8v1yfgEdk8IpVhAbiXbRs3ANTT4Jx2M6GNBEeEAorHqO4eOTxdObNuz/RADoRnpzHk
-cbit.HZHB_PUBLIC_KEY=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCZ1qclSxQZYtZGpAV1I5P0ph/l9V9JBhopNLm9TF5zVDpPTQakUIzuhvQOsHYhs6PY/cNurubvUekeg3vON2DIYFuoiKA6HXsb2cyJ8UxPmGOdolAQwnJLB2ADO7h2QbXVyqL5vmxMy9J8GvPV8Os8rgpvMe3p6A4lc7P++VqKqwIDAQAB
-#================ \u4E2D\u4FDD\u4FE1\u63A5\u53E3\u5BF9\u63A5--\u7ED3\u675F==============#
-#================ \u963F\u91CC\u4E91\u90E8\u7F72\u5BF9\u63A5\u4FDD\u4FE1\u670D\u52A1\u5668--\u5F00\u59CB==============#
-aly.cbit.url_pre=http://223.70.186.115:8080/CBIT/API/insCBIT
-aly.pay.url_pre=http://test.baoxianzhanggui.com:8080
-aly.pay.html_path=C:\\soft\\apache-tomcat-8.5.75\\webapps\\html\\
-#================ \u963F\u91CC\u4E91\u90E8\u7F72\u5BF9\u63A5\u4FDD\u4FE1\u670D\u52A1\u5668--\u7ED3\u675F==============#
-##================ \u4FDD\u4FE1\u56DE\u8C03\u963F\u91CC\u4E91\u63A5\u670D\u52A1\u5668--\u5F00\u59CB==============#
-cbit.aly.url_pre=http://47.92.254.66:8080/API/insCBIT
-#================ \u963F\u91CC\u4E91\u90E8\u7F72\u5BF9\u63A5\u4FDD\u4FE1\u670D\u52A1\u5668--\u7ED3\u675F==============#
-resp_json={"code":200,"msg":null,"data":{"busUniqueId":"P_YBX_TESTT0NukiEN02OGDABB","total":3518.79,"insureId":null,"businessPolicy":{"specialTermItems":null,"coverages":null,"applicationNo":"53201093900246326035"},"trafficPolicy":{"specialTermItems":null,"coverages":null,"applicationNo":"53201093900246326036"},"propertyPolicies":null,"casualtyPolicies":null}}
-#================ \u6C38\u5B89\u5BF9\u63A5\u5F00\u59CB ==============#
-ya.url=https://tapi.yaic.com.cn/auto/issue
-ya.url.sign=https://tapi.yaic.com.cn/auto/debug/generate-access-key
-ya.consumerID=102120
-ya.consumerAccessKey=123456test
-ya.matchCode=10212014040001
-ya.userCode=10061765
-ya.comCode=0214040020000
-#================ \u6C38\u5B89\u5BF9\u63A5\u7ED3\u675F ==============#
-master.password.ciphertext=9d3b721959d63c10173d378e82aaecf2
-master.password.salt=7cb112e917a8446f8616
-# redis \u914D\u7F6E
-spring.redis.host=localhost
-spring.redis.port=6379
-spring.redis.password=
-spring.redis.database=0
-spring.redis.lettuce.pool.max-active=8
-spring.redis.lettuce.pool.max-idle=8
-spring.redis.lettuce.pool.min-idle=0
-spring.redis.lettuce.pool.max-wait=100
-spring.redis.timeOut=3000
-# \u4EBA\u4FDD\u63A5\u53E3
-rb.quote.url=http://47.92.254.66:8088/rb/bfjs
-rb.audit.url=http://47.92.254.66:8088/rb/jiaofei
-rb.car.search.url=http://47.92.254.66:8088/rb/carsearch
-rb.brand.search.url=http://47.92.254.66:8088/rb/brandsearch
-
-# \u6C38\u8BDA\u63A5\u53E3
-yc.domain=http://47.92.254.66:8088
-yc.quote.url=/yc/bfjs
-yc.audit.url=/yc/jiaofei
-yc.image.url=/yc/yxsc
-yc.getPolicyPrint.url=/yc/bdxz
-
-# ==========\u6C38\u57CEAPI\u65B9\u5F0F\u5BF9\u63A5 \u5F00\u59CB============================#
-yc.api.userName=yctest1
-yc.api.password=yc@20230202!
-yc.api.url=http://140.206.189.151:17000/
-
-# \u673A\u6784\u4EE3\u7801(dptCde)
-yc.api.agent.dptCde=14A4
-# \u6E20\u9053\u7F16\u7801(agentCode)
-yc.api.agent.agentCode=250000P00004
-# \u534F\u8BAE\u7F16\u7801(conferCode)
-yc.api.agent.agentType=250000P0000401
-# \u6E20\u9053\u5206\u7C7B(agentType)
-yc.api.agent.agentNme=191010
-# \u4EE3\u7406\u4EBA\u540D\u79F0(agentNme)
-yc.api.agent.qlftNo=\u6C38\u946B\u4FDD\u9669\u9500\u552E\u670D\u52A1\u6709\u9650\u516C\u53F8\u5C71\u897F\u5206\u516C\u53F8
-# \u4EE3\u7406\u4EBA\u8D44\u683C\u8BC1\u53F7(qlftNo)
-yc.api.agent.operatorCode=2752454675645
-# \u5F55\u5165\u4EBA(operatorCode)
-yc.api.agent.salesmanNo=100050029
-# \u4E1A\u52A1\u5458\u4EE3\u7801(salesmanNo)
-yc.api.agent.cChaType=100050029
-# \u65B0\u4E1A\u52A1\u6765\u6E90(CChaType)
-yc.api.agent.custNature=191010
-# \u5BA2\u6237\u6027\u8D28(custNature)
-yc.api.agent.cOprcde=192099
-# \u64CD\u4F5C\u4EBA\u5458\u4EE3\u7801(cOprcde)
-yc.api.agent.cBsnsTyp=100050029
-
-# \u652F\u4ED8\u56DE\u8C03\u5730\u5740
-yc.api.pay.callBack=http://127.0.0.1:8080/api/yongCheng/callBack?str=
-
-# ==========\u6C38\u57CEAPI\u65B9\u5F0F\u5BF9\u63A5 \u7ED3\u675F=============================#
-
-
-#\u534E\u519Cvin\u7801\u67E5\u8BE2
-hn.vin.search.url=http://47.92.254.66:8088/hn/vinsearch
-#\u5E73\u5B89vin\u7801\u67E5\u8BE2
-pa.vin.search.url=http://47.92.254.66:8088/pingan/vinSearch
-# \u5FAE\u4FE1\u53C2\u6570
-wechat.open.componentAppId=wx612ca90988c46947
-wechat.open.componentSecret=75b7d4cda453b2075dec23f849278bc0
-# mybatis-plus\u914D\u7F6E\u65E5\u5FD7
-mybatis-plus.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
-mybatis.configuration.map-underscore-to-camel-case=true
-#\u5FAE\u4FE1\u6CE8\u518C\u552F\u4E00\u4E0A\u7EA7\u4EBA\u5458
-pyramid.dept.id=99D05
-
-# \u5F00\u5173 ----------
-# \u65B9\u6CD5\u65E5\u5FD7\u5F00\u5173
-open.method.log=true
-
-
-# \u5B89\u76DB\u5929\u5E73\u722C\u866B\u63A5\u53E3
-as.domain=http://47.92.254.66:8088
-as.quote.url=/as/bfjs
-as.audit.url=/as/jiaofei
-as.image.url=/as/yxsc
-
-zm.ascription.url=${zm.domain}/ascription
+#TAModelUrl=https://testow.95505.cn/cpf/tianan_cpf/access/car/queryCarModel.mvc
+#TAQuoteUrl=https://testow.95505.cn/cpf/tianan_cpf/access/car/premiumAccurate.mvc
+#TAInsureUrl=https://testow.95505.cn/cpf/tianan_cpf/access/car/insureConfirmation.mvc
+#TAPayUrl=https://testow.95505.cn/cpf/tianan_cpf/common/pay/applyPay.do
+#TAUploadUrl=https://testow.95505.cn/cpf/tianan_cpf/access/car/thirdUploadAttach.mvc
+##\u5929\u5B89API\u751F\u4EA7\u53C2\u6570
+##TASign=gIpr5j5haL7T8WJY7ZS54JdlYL/7PToQOy505Mr/iH3qN4SMpJJVdvxFE1/KsWH0EjDxR9qVwRC/t6kLCJo+Y1AB+FD1qNjkbLyEQ+9aeQEF2Af/4bJqUDArewHHT879o5IqzHg/lcg=
+##TAModelUrl=https://cpf.95505.cn/tianan_cpf/access/car/queryCarModel.mvc
+##TAQuoteUrl=https://cpf.95505.cn/tianan_cpf/access/car/premiumAccurate.mvc
+##TAInsureUrl=https://cpf.95505.cn/tianan_cpf/access/car/insureConfirmation.mvc
+##TAPayUrl=https://cpf.95505.cn/tianan_cpf/common/pay/applyPay.do
+##TAUploadUrl=https://cpf.95505.cn/tianan_cpf/access/car/thirdUploadAttach.mvc
+##\u6587\u4EF6\u4E0A\u4F20\u8DEF\u5F84\u6D4B\u8BD5
+#filePath=C:/soft/apache-tomcat-8.5.75/webapps/upload/
+#apk.path=/usr/local/apache-tomcat-8.5.73/webapps/app/android/
+##\u6587\u4EF6\u4E0A\u4F20\u8DEF\u5F84\u751F\u4EA7
+##filePath=/usr/local/apache-tomcat-7.0.93/webapps/upload/
+## \u8DEF\u5F84\u5E26\u4E0A\u524D\u540E\u659C\u6746
+#upload.basepath=${filePath}
+#upload.host=
+#upload.username=
+#upload.password=
+#upload.url=${netUrl}
+###\u6D4B\u8BD5\u5730\u5740
+#netUrl=http://47.92.254.66:8080/
+###\u751F\u4EA7\u5730\u5740
+##netUrl=http://39.101.143.165:8080/
+##\u7279\u6B8A\u8D26\u53F7
+##Specialaccount=
+#Specialaccount=99999999999999
+##mybatis xml\u6587\u4EF6\u626B\u63CF\u8DEF\u5F84
+#mybatis.mapper-locations=classpath:mapper/**/*.xml
+#mybatis.type-aliases-package=com.ydtech.modules.*.model
+##================ mybatis pagehelper ==============#
+#pagehelper.helper-dialect=mysql
+#pagehelper.reasonable=true
+#pagehelper.support-methods-arguments=true
+#pagehelper.params=count=countSql
+##================ \u4E2D\u4FDD\u4FE1\u63A5\u53E3\u5BF9\u63A5--\u5F00\u59CB==============#
+###\u63A5\u53E3\u5730\u5740
+#cbit.url_pre=http://88.88.1.51:5017
+#cbit.api2=/pjms/insurance/open/unify/order/getInitParams
+#cbit.api3=/pjms/insurance/open/unify/order/generateOrderNo
+#cbit.api4=/pjms/insurance/open/unify/vehicle/getTMBVerificationCode
+#cbit.api5=/pjms/insurance/open/unify/vehicle/queryVehicleModel
+#cbit.api6=/pjms/insurance/open/unify/vehicle/confirmVehicle
+#cbit.api7=/pjms/insurance/open/unify/order/quote
+#cbit.api8=/pjms/insurance/open/unify/order/postUnderwriting
+#cbit.api9=/pjms/insurance/open/unify/order/applyPay
+#cbit.api10=/pjms/insurance/open/unify/order/cancelUnderwriting
+#cbit.api11=/pjms/insurance/open/unify/order/getVerificationCode
+#cbit.api12=/pjms/insurance/open/unify/order/commitVerificationCode
+#cbit.api14=/pjms/insurance/open/unify/order/sendEleApplicationSign
+#cbit.api17=/pjms/insurance/open/unify/order/viewToPay
+###\u5176\u4ED6
+####\u4E2D\u4ECB\u673A\u6784id
+#cbit.franchiserId=taiyuantianqin-001
+#cbit.franchiserChannelId_pingan=CBIT01240000
+#cbit.franchiserChannelCode_pingan=QIAOYRXX-00001
+#cbit.carDealerCode_pingan=224189117001
+#cbit.insurerBranchCode_pingan=140000
+#cbit.franchiserChannelId_taiping=CBIT01240000
+#cbit.groupCode_taiping=S132001
+#cbit.insurerBranchCode_taiping=140000
+#cbit.franchiserChannelId_taipingyang=CBIT01240000
+#cbit.insurerBranchCode_taipingyang=140000
+####ip\u5730\u5740
+#cbit.ip=10.23.69.89
+#### \u4E2D\u4ECB\u5E73\u53F0-\u52A0\u89E3\u5BC6\u79D8\u94A5\u5BF9 \u79C1\u94A5+\u516C\u94A5
+##cbit.ZJPT_PRIVATE_KEY=MIICdQIBADANBgkqhkiG9w0BAQEFAASCAl8wggJbAgEAAoGBAMpskeUA+JfNr0Dsx+zZwu/KwprkaN0y0bVBC/ygAOQCBx26NGrRodWM0VehWbtvUN2WEQB2EpcntfJj/bOgRumhThjHMh+2WgdnS93+Ti+ACDlt4f3vaOlZmPo3cRH4SBHvf5SLSnSl1chGMMXijyZZIvDxbxn3d4gu0uDQNw4jAgMBAAECgYAyOnqBPppw4KLqE1cQmIBcjA157c9vg9qxhTB6QSG3ciFd6QR0tQvZN5YCjpD7h4WjVkdlu+alBz+Io/MiDVVK1qt+EsqWBKSx7fAi5UFmoVPHcmw7ZrnBmQLlduo9CUbyTQKGvVlEY+lHwRjuko40jSDRJQVHCbIDc/kxmipukQJBAOqf44+b+agA3RJBYLPqsaUShK8ykor2nZptUNFtMBiuGPuQ0sT3cfZMB9upc586ckFDZcqChqFLUAfpmgMIgYUCQQDc3ay6RJ9owqkkPTKeeppeZqDoD5Nk3nipuMyJwTL0GR0A1AfUXcA0F8BxEQob1k65Tcw7ol2j7DmRqjA8uw2HAkAr92RUT/07r1W+CwRNEsjRTyQQFKEDa21jN+LyK8zcgxtpYN0uTdRMPDkov5tMFk68zh1wEn+aEBviL7NNqDVlAkBlu6mzBqbSj09vhMzLGLgAIY+eNIZ04NB9hMSZ8yawLt0gI4oTtLcyh3o52lpophcO3ZnkIg610bpWsSiU4KgDAkA+vyBe7spxLR1S/k4FhPP9YZay6vmuzwzSNUKF5JquTLuI9iqZRf+n3Yfy6wgQzkP2WIeQDRe074p09MFGc+pp
+#cbit.ZJPT_PUBLIC_KEY=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDKbJHlAPiXza9A7Mfs2cLvysKa5GjdMtG1QQv8oADkAgcdujRq0aHVjNFXoVm7b1DdlhEAdhKXJ7XyY/2zoEbpoU4YxzIftloHZ0vd/k4vgAg5beH972jpWZj6N3ER+EgR73+Ui0p0pdXIRjDF4o8mWSLw8W8Z93eILtLg0DcOIwIDAQAB
+#### \u5408\u4F5C\u4F19\u4F34-\u52A0\u89E3\u5BC6\u79D8\u94A5\u5BF9  \u79C1\u94A5+\u516C\u94A5
+#cbit.HZHB_PRIVATE_KEY=MIICeAIBADANBgkqhkiG9w0BAQEFAASCAmIwggJeAgEAAoGBAJnWpyVLFBli1kakBXUjk/SmH+X1X0kGGik0ub1MXnNUOk9NBqRQjO6G9A6wdiGzo9j9w26u5u9R6R6De843YMhgW6iIoDodexvZzInxTE+YY52iUBDCcksHYAM7uHZBtdXKovm+bEzL0nwa89Xw6zyuCm8x7enoDiVzs/75WoqrAgMBAAECgYAnEcC5U+vy1oscvaM1MKfuxhHr0Pk2DnquZFmXncGPAKEeaq15JYvlOBjbci1OOdUu0qPDhF/Z/694tGPI53+If0MkS3VpxaOYc+i/G/KQiYZIu1hjUb2F8j8xQrF60WkIsqwzjJYF9T5MCjLEZvDg9cPzFY+QpS8yl5Cbl0aOYQJBAMd+0VtQYV9q3nsZgEk4ux6Vz19SakRbk9zkz1yBUKRfWcLa1T9DleaBqGdkdZbO8v6PCtyz6Fdymq+USYWeV3UCQQDFaU5O8GeNr07J6quTgHgsbN8IV28Wp4wKmDAXCWlehkGGoTm11FOL2zxItjgmmHGyXBA08osPCojBPptOazWfAkEAmG3K04WwUPLcOZy7i7cAKpd3ErNrJP4AFcjytBDOqDl+4UbJp4QhljW9kfqNaoSH4H81YntIbQDRNpUMND9PPQJBAKWfnBuOhtLQagHt6NVvy2M6VETjVkhjeZLJ7E7njofHi+IwEgMDiLSl0wYOGz4GWB2UL+S8OP79j47Rv+si93ECQQCNqD8nMcVXIHKze7aM9c8v1yfgEdk8IpVhAbiXbRs3ANTT4Jx2M6GNBEeEAorHqO4eOTxdObNuz/RADoRnpzHk
+#cbit.HZHB_PUBLIC_KEY=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCZ1qclSxQZYtZGpAV1I5P0ph/l9V9JBhopNLm9TF5zVDpPTQakUIzuhvQOsHYhs6PY/cNurubvUekeg3vON2DIYFuoiKA6HXsb2cyJ8UxPmGOdolAQwnJLB2ADO7h2QbXVyqL5vmxMy9J8GvPV8Os8rgpvMe3p6A4lc7P++VqKqwIDAQAB
+##================ \u4E2D\u4FDD\u4FE1\u63A5\u53E3\u5BF9\u63A5--\u7ED3\u675F==============#
+##================ \u963F\u91CC\u4E91\u90E8\u7F72\u5BF9\u63A5\u4FDD\u4FE1\u670D\u52A1\u5668--\u5F00\u59CB==============#
+#aly.cbit.url_pre=http://223.70.186.115:8080/CBIT/API/insCBIT
+#aly.pay.url_pre=http://test.baoxianzhanggui.com:8080
+#aly.pay.html_path=C:\\soft\\apache-tomcat-8.5.75\\webapps\\html\\
+##================ \u963F\u91CC\u4E91\u90E8\u7F72\u5BF9\u63A5\u4FDD\u4FE1\u670D\u52A1\u5668--\u7ED3\u675F==============#
+###================ \u4FDD\u4FE1\u56DE\u8C03\u963F\u91CC\u4E91\u63A5\u670D\u52A1\u5668--\u5F00\u59CB==============#
+#cbit.aly.url_pre=http://47.92.254.66:8080/API/insCBIT
+##================ \u963F\u91CC\u4E91\u90E8\u7F72\u5BF9\u63A5\u4FDD\u4FE1\u670D\u52A1\u5668--\u7ED3\u675F==============#
+#resp_json={"code":200,"msg":null,"data":{"busUniqueId":"P_YBX_TESTT0NukiEN02OGDABB","total":3518.79,"insureId":null,"businessPolicy":{"specialTermItems":null,"coverages":null,"applicationNo":"53201093900246326035"},"trafficPolicy":{"specialTermItems":null,"coverages":null,"applicationNo":"53201093900246326036"},"propertyPolicies":null,"casualtyPolicies":null}}
+##================ \u6C38\u5B89\u5BF9\u63A5\u5F00\u59CB ==============#
+#ya.url=https://tapi.yaic.com.cn/auto/issue
+#ya.url.sign=https://tapi.yaic.com.cn/auto/debug/generate-access-key
+#ya.consumerID=102120
+#ya.consumerAccessKey=123456test
+#ya.matchCode=10212014040001
+#ya.userCode=10061765
+#ya.comCode=0214040020000
+##================ \u6C38\u5B89\u5BF9\u63A5\u7ED3\u675F ==============#
+#master.password.ciphertext=9d3b721959d63c10173d378e82aaecf2
+#master.password.salt=7cb112e917a8446f8616
+## redis \u914D\u7F6E
+#spring.redis.host=localhost
+#spring.redis.port=6379
+#spring.redis.password=
+#spring.redis.database=0
+#spring.redis.lettuce.pool.max-active=8
+#spring.redis.lettuce.pool.max-idle=8
+#spring.redis.lettuce.pool.min-idle=0
+#spring.redis.lettuce.pool.max-wait=100
+#spring.redis.timeOut=3000
+## \u4EBA\u4FDD\u63A5\u53E3
+#rb.quote.url=http://47.92.254.66:8088/rb/bfjs
+#rb.audit.url=http://47.92.254.66:8088/rb/jiaofei
+#rb.car.search.url=http://47.92.254.66:8088/rb/carsearch
+#rb.brand.search.url=http://47.92.254.66:8088/rb/brandsearch
+#
+## \u6C38\u8BDA\u63A5\u53E3
+#yc.domain=http://47.92.254.66:8088
+#yc.quote.url=/yc/bfjs
+#yc.audit.url=/yc/jiaofei
+#yc.image.url=/yc/yxsc
+#yc.getPolicyPrint.url=/yc/bdxz
+#
+## ==========\u6C38\u57CEAPI\u65B9\u5F0F\u5BF9\u63A5 \u5F00\u59CB============================#
+#yc.api.userName=yctest1
+#yc.api.password=yc@20230202!
+#yc.api.url=http://140.206.189.151:17000/
+#
+## \u673A\u6784\u4EE3\u7801(dptCde)
+#yc.api.agent.dptCde=14A4
+## \u6E20\u9053\u7F16\u7801(agentCode)
+#yc.api.agent.agentCode=250000P00004
+## \u534F\u8BAE\u7F16\u7801(conferCode)
+#yc.api.agent.agentType=250000P0000401
+## \u6E20\u9053\u5206\u7C7B(agentType)
+#yc.api.agent.agentNme=191010
+## \u4EE3\u7406\u4EBA\u540D\u79F0(agentNme)
+#yc.api.agent.qlftNo=\u6C38\u946B\u4FDD\u9669\u9500\u552E\u670D\u52A1\u6709\u9650\u516C\u53F8\u5C71\u897F\u5206\u516C\u53F8
+## \u4EE3\u7406\u4EBA\u8D44\u683C\u8BC1\u53F7(qlftNo)
+#yc.api.agent.operatorCode=2752454675645
+## \u5F55\u5165\u4EBA(operatorCode)
+#yc.api.agent.salesmanNo=100030057
+## \u4E1A\u52A1\u5458\u4EE3\u7801(salesmanNo)
+#yc.api.agent.cChaType=100030057
+## \u65B0\u4E1A\u52A1\u6765\u6E90(CChaType)
+#yc.api.agent.custNature=191010
+## \u5BA2\u6237\u6027\u8D28(custNature)
+#yc.api.agent.cOprcde=192099
+## \u64CD\u4F5C\u4EBA\u5458\u4EE3\u7801(cOprcde)
+#yc.api.agent.cBsnsTyp=100030057
+#
+## \u652F\u4ED8\u56DE\u8C03\u5730\u5740
+#yc.api.pay.callBack=http://127.0.0.1:8080/api/yongCheng/callBack?str=
+#
+## ==========\u6C38\u57CEAPI\u65B9\u5F0F\u5BF9\u63A5 \u7ED3\u675F=============================#
+#
+#
+##\u534E\u519Cvin\u7801\u67E5\u8BE2
+#hn.vin.search.url=http://47.92.254.66:8088/hn/vinsearch
+##\u5E73\u5B89vin\u7801\u67E5\u8BE2
+#pa.vin.search.url=http://47.92.254.66:8088/pingan/vinSearch
+## \u5FAE\u4FE1\u53C2\u6570
+#wechat.open.componentAppId=wx612ca90988c46947
+#wechat.open.componentSecret=75b7d4cda453b2075dec23f849278bc0
+## mybatis-plus\u914D\u7F6E\u65E5\u5FD7
+#mybatis-plus.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
+#mybatis.configuration.map-underscore-to-camel-case=true
+##\u5FAE\u4FE1\u6CE8\u518C\u552F\u4E00\u4E0A\u7EA7\u4EBA\u5458
+#pyramid.dept.id=99D05
+#
+## \u5F00\u5173 ----------
+## \u65B9\u6CD5\u65E5\u5FD7\u5F00\u5173
+#open.method.log=true
+#
+#
+## \u5B89\u76DB\u5929\u5E73\u722C\u866B\u63A5\u53E3
+#as.domain=http://47.92.254.66:8088
+#as.quote.url=/as/bfjs
+#as.audit.url=/as/jiaofei
+#as.image.url=/as/yxsc
+#
+#zm.ascription.url=${zm.domain}/ascription
+#zm.manualUnderwriting.url=${zm.domain}/manualUnderwriting
+#
+#
+#ya.callbackUrl=http://test.baoxianzhanggui.com:8080/order/yongAn/updatePolicy

src/main/resources/application-prod.properties

@@ -1,295 +1,298 @@
-## \u6570\u636E\u5E93\u8BBF\u95EE\u914D\u7F6E
-## \u4E3B\u6570\u636E\u6E90\uFF0C\u9ED8\u8BA4\u7684
-##spring.datasource.druid.type=com.alibaba.druid.pool.DruidDataSource
-##spring.datasource.druid.driver-class-name=com.mysql.jdbc.Driver
-#spring.datasource.druid.driver-class-name=com.mysql.cj.jdbc.Driver
-#spring.datasource.druid.url=jdbc:mysql://localhost:3306/zgdd?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=UTC
-#spring.datasource.druid.username=root
-#spring.datasource.druid.password=root
-server.servlet.encoding.force=true
-server.servlet.encoding.charset=UTF-8
-# \u6700\u5927\u652F\u6301\u6587\u4EF6\u5927\u5C0F
-spring.servlet.multipart.max-file-size=2000MB
-# \u6700\u5927\u652F\u6301\u8BF7\u6C42\u5927\u5C0F
-spring.servlet.multipart.max-request-size=2000MB
-## DataSource settings
-#spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
-##spring.datasource.url = jdbc:mysql://localhost:3306/zgdd?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
-#spring.datasource.url = jdbc:mysql://39.100.252.34:3306/zgdd?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
-#spring.datasource.username = root
-#spring.datasource.password = root
-#spring.datasource.driverClassName = com.mysql.jdbc.Driver
-
-
-spring.datasource.driver-class-name=com.p6spy.engine.spy.P6SpyDriver
-## \u6D4B\u8BD5\u5E93
-#spring.datasource.url=jdbc:p6spy:mysql://47.92.254.66:3306/zgdd?serverTimezone=Asia/Shanghai&allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8
-## \u751F\u4EA7\u5E93
-spring.datasource.url=jdbc:p6spy:mysql://39.99.227.124:3306/zgdd?serverTimezone=Asia/Shanghai&allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8
-spring.datasource.username = root
-spring.datasource.password = zgdd@2020
-
-## spring \u914D\u7F6E
-## \u5982\u679C\u914D\u7F6E\u4E86spring-resources\uFF0C\u5219\u5FC5\u987B\u5305\u542Bclasspath:/static/
-## \u8BBF\u95EE\u9759\u6001\u9875\u9762 /pages/\u6307\u5B9A\u8DEF\u5F84\u4E3A /static/pages/
-#spring.mvc.view.prefix=/
-## \u9759\u6001\u9875\u9762\u540E\u7F00
-#spring.mvc.view.suffix=.html
-## \u9759\u6001\u6587\u4EF6\u8DEF\u5F84, \u8D44\u6E90\u8DEF\u5F84\uFF0C\u535A\u5BA2\u8DEF\u5F84
-#spring.resources.static-locations=classpath:/static/
-
-# \u4E0B\u9762\u4E3A\u8FDE\u63A5\u6C60\u7684\u8865\u5145\u8BBE\u7F6E\uFF0C\u5E94\u7528\u5230\u4E0A\u9762\u6240\u6709\u6570\u636E\u6E90\u4E2D
-# \u521D\u59CB\u5316\u5927\u5C0F\uFF0C\u6700\u5C0F\uFF0C\u6700\u5927
-spring.datasource.druid.initial-size=5
-spring.datasource.druid.minIdle=5
-spring.datasource.druid.maxActive=20
-# \u914D\u7F6E\u83B7\u53D6\u8FDE\u63A5\u7B49\u5F85\u8D85\u65F6\u7684\u65F6\u95F4
-spring.datasource.druid.maxWait=60000
-# \u914D\u7F6E\u95F4\u9694\u591A\u4E45\u624D\u8FDB\u884C\u4E00\u6B21\u68C0\u6D4B\uFF0C\u68C0\u6D4B\u9700\u8981\u5173\u95ED\u7684\u7A7A\u95F2\u8FDE\u63A5\uFF0C\u5355\u4F4D\u662F\u6BEB\u79D2
-spring.datasource.druid.timeBetweenEvictionRunsMillis=60000
-# \u914D\u7F6E\u4E00\u4E2A\u8FDE\u63A5\u5728\u6C60\u4E2D\u6700\u5C0F\u751F\u5B58\u7684\u65F6\u95F4\uFF0C\u5355\u4F4D\u662F\u6BEB\u79D2
-spring.datasource.druid.minEvictableIdleTimeMillis=300000
-spring.datasource.druid.validationQuery=SELECT 1 FROM DUAL
-spring.datasource.druid.testWhileIdle=true
-spring.datasource.druid.testOnBorrow=true
-spring.datasource.druid.testOnReturn=true
-# \u6253\u5F00PSCache\uFF0C\u5E76\u4E14\u6307\u5B9A\u6BCF\u4E2A\u8FDE\u63A5\u4E0APSCache\u7684\u5927\u5C0F
-spring.datasource.druid.poolPreparedStatements=true
-spring.datasource.druid.maxPoolPreparedStatementPerConnectionSize=20
-# \u914D\u7F6E\u76D1\u63A7\u7EDF\u8BA1\u62E6\u622A\u7684filters\uFF0C\u53BB\u6389\u540E\u76D1\u63A7\u754C\u9762sql\u65E0\u6CD5\u7EDF\u8BA1\uFF0C'wall'\u7528\u4E8E\u9632\u706B\u5899
-spring.datasource.druid.filters=stat,wall,log4j
-# \u901A\u8FC7connectProperties\u5C5E\u6027\u6765\u6253\u5F00mergeSql\u529F\u80FD\uFF1B\u6162SQL\u8BB0\u5F55
-spring.datasource.druid.connectionProperties=druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
-# \u5408\u5E76\u591A\u4E2ADruidDataSource\u7684\u76D1\u63A7\u6570\u636E
-#spring.datasource.druid.useGlobalDataSourceStat=true
-#\u4E2D\u7164\u63A5\u53E3\u6D4B\u8BD5\u5730\u5740
-#ZMUrl=https://test.echinacoal.com/singlePlatform/
-#ZMIMGUrl=https://test.echinacoal.com/singlePlatform/others/
-#ZMSMSUrl=https://test.echinacoal.com/singlePlatform/prpall/
-#ZMToken=THIRDSCOuloft2020052818346904zmYBSX
-#CallbackUrl=http://47.92.254.66:8080/zm/Underwriting
-#RGCallbackUrl=http://47.92.254.66:8080/zm/ArtificialUnderwriting
-
-#\u4E2D\u7164\u63A5\u53E3\u751F\u4EA7\u5730\u5740
-ZMUrl=https://www.echinacoal.com/singlePlatform/
-ZMIMGUrl=https://www.echinacoal.com/singlePlatform/others/
-ZMSMSUrl=https://www.echinacoal.com/singlePlatform/prpall/
+### \u6570\u636E\u5E93\u8BBF\u95EE\u914D\u7F6E
+### \u4E3B\u6570\u636E\u6E90\uFF0C\u9ED8\u8BA4\u7684
+###spring.datasource.druid.type=com.alibaba.druid.pool.DruidDataSource
+###spring.datasource.druid.driver-class-name=com.mysql.jdbc.Driver
+##spring.datasource.druid.driver-class-name=com.mysql.cj.jdbc.Driver
+##spring.datasource.druid.url=jdbc:mysql://localhost:3306/zgdd?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=UTC
+##spring.datasource.druid.username=root
+##spring.datasource.druid.password=root
+#server.servlet.encoding.force=true
+#server.servlet.encoding.charset=UTF-8
+## \u6700\u5927\u652F\u6301\u6587\u4EF6\u5927\u5C0F
+#spring.servlet.multipart.max-file-size=2000MB
+## \u6700\u5927\u652F\u6301\u8BF7\u6C42\u5927\u5C0F
+#spring.servlet.multipart.max-request-size=2000MB
+### DataSource settings
+##spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
+###spring.datasource.url = jdbc:mysql://localhost:3306/zgdd?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
+##spring.datasource.url = jdbc:mysql://39.100.252.34:3306/zgdd?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
+##spring.datasource.username = root
+##spring.datasource.password = root
+##spring.datasource.driverClassName = com.mysql.jdbc.Driver
+#
+#
+#spring.datasource.driver-class-name=com.p6spy.engine.spy.P6SpyDriver
+### \u6D4B\u8BD5\u5E93
+##spring.datasource.url=jdbc:p6spy:mysql://47.92.254.66:3306/zgdd?serverTimezone=Asia/Shanghai&allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8
+### \u751F\u4EA7\u5E93
+#spring.datasource.url=jdbc:p6spy:mysql://rm-8vbaejxof1xh06o9r.mysql.zhangbei.rds.aliyuncs.com:3306/agent?serverTimezone=Asia/Shanghai&allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8
+#spring.datasource.username = sxzgkj
+#spring.datasource.password = Iy$@$koH@oURxyvw
+#
+### spring \u914D\u7F6E
+### \u5982\u679C\u914D\u7F6E\u4E86spring-resources\uFF0C\u5219\u5FC5\u987B\u5305\u542Bclasspath:/static/
+### \u8BBF\u95EE\u9759\u6001\u9875\u9762 /pages/\u6307\u5B9A\u8DEF\u5F84\u4E3A /static/pages/
+##spring.mvc.view.prefix=/
+### \u9759\u6001\u9875\u9762\u540E\u7F00
+##spring.mvc.view.suffix=.html
+### \u9759\u6001\u6587\u4EF6\u8DEF\u5F84, \u8D44\u6E90\u8DEF\u5F84\uFF0C\u535A\u5BA2\u8DEF\u5F84
+##spring.resources.static-locations=classpath:/static/
+#
+## \u4E0B\u9762\u4E3A\u8FDE\u63A5\u6C60\u7684\u8865\u5145\u8BBE\u7F6E\uFF0C\u5E94\u7528\u5230\u4E0A\u9762\u6240\u6709\u6570\u636E\u6E90\u4E2D
+## \u521D\u59CB\u5316\u5927\u5C0F\uFF0C\u6700\u5C0F\uFF0C\u6700\u5927
+#spring.datasource.druid.initial-size=5
+#spring.datasource.druid.minIdle=5
+#spring.datasource.druid.maxActive=20
+## \u914D\u7F6E\u83B7\u53D6\u8FDE\u63A5\u7B49\u5F85\u8D85\u65F6\u7684\u65F6\u95F4
+#spring.datasource.druid.maxWait=60000
+## \u914D\u7F6E\u95F4\u9694\u591A\u4E45\u624D\u8FDB\u884C\u4E00\u6B21\u68C0\u6D4B\uFF0C\u68C0\u6D4B\u9700\u8981\u5173\u95ED\u7684\u7A7A\u95F2\u8FDE\u63A5\uFF0C\u5355\u4F4D\u662F\u6BEB\u79D2
+#spring.datasource.druid.timeBetweenEvictionRunsMillis=60000
+## \u914D\u7F6E\u4E00\u4E2A\u8FDE\u63A5\u5728\u6C60\u4E2D\u6700\u5C0F\u751F\u5B58\u7684\u65F6\u95F4\uFF0C\u5355\u4F4D\u662F\u6BEB\u79D2
+#spring.datasource.druid.minEvictableIdleTimeMillis=300000
+#spring.datasource.druid.validationQuery=SELECT 1 FROM DUAL
+#spring.datasource.druid.testWhileIdle=true
+#spring.datasource.druid.testOnBorrow=true
+#spring.datasource.druid.testOnReturn=true
+## \u6253\u5F00PSCache\uFF0C\u5E76\u4E14\u6307\u5B9A\u6BCF\u4E2A\u8FDE\u63A5\u4E0APSCache\u7684\u5927\u5C0F
+#spring.datasource.druid.poolPreparedStatements=true
+#spring.datasource.druid.maxPoolPreparedStatementPerConnectionSize=20
+## \u914D\u7F6E\u76D1\u63A7\u7EDF\u8BA1\u62E6\u622A\u7684filters\uFF0C\u53BB\u6389\u540E\u76D1\u63A7\u754C\u9762sql\u65E0\u6CD5\u7EDF\u8BA1\uFF0C'wall'\u7528\u4E8E\u9632\u706B\u5899
+#spring.datasource.druid.filters=stat,wall,log4j
+## \u901A\u8FC7connectProperties\u5C5E\u6027\u6765\u6253\u5F00mergeSql\u529F\u80FD\uFF1B\u6162SQL\u8BB0\u5F55
+#spring.datasource.druid.connectionProperties=druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
+## \u5408\u5E76\u591A\u4E2ADruidDataSource\u7684\u76D1\u63A7\u6570\u636E
+##spring.datasource.druid.useGlobalDataSourceStat=true
+##\u4E2D\u7164\u63A5\u53E3\u6D4B\u8BD5\u5730\u5740
+##ZMUrl=https://test.echinacoal.com/singlePlatform/
+##ZMIMGUrl=https://test.echinacoal.com/singlePlatform/others/
+##ZMSMSUrl=https://test.echinacoal.com/singlePlatform/prpall/
+##ZMToken=THIRDSCOuloft2020052818346904zmYBSX
+##CallbackUrl=http://47.92.254.66:8080/zm/Underwriting
+##RGCallbackUrl=http://47.92.254.66:8080/zm/ArtificialUnderwriting
+#
+##\u4E2D\u7164\u63A5\u53E3\u751F\u4EA7\u5730\u5740
+#ZMUrl=https://www.echinacoal.com/singlePlatform/
+#ZMIMGUrl=https://www.echinacoal.com/singlePlatform/others/
+#ZMSMSUrl=https://www.echinacoal.com/singlePlatform/prpall/
+##ZMToken=THIRDSCOuloft2020052818346904zmYBSXQYTQ
+#
+##\uFFFD\uFFFD\uFFFD\uFFFD(\u027D\uFFFD\uFFFD\uFFFD\uFFFD\u0534\uFFFD\uFFFD\uFFFD\uFFFD)THIRDSCOuloft2020052818346904zmYBSXQYTQ
+##\uFFFD\uFFFD\uFFFD\uFFFD(\u027D\uFFFD\uFFFD\uFFFD\uFFFD\u052B\uFFFD\uFFFD\uFFFD\uFFFD)THIRDSCOuloft2020052818346904zmYBSXXHTQ
 #ZMToken=THIRDSCOuloft2020052818346904zmYBSXQYTQ
-
-#\uFFFD\uFFFD\uFFFD\uFFFD(\u027D\uFFFD\uFFFD\uFFFD\uFFFD\u0534\uFFFD\uFFFD\uFFFD\uFFFD)THIRDSCOuloft2020052818346904zmYBSXQYTQ
-#\uFFFD\uFFFD\uFFFD\uFFFD(\u027D\uFFFD\uFFFD\uFFFD\uFFFD\u052B\uFFFD\uFFFD\uFFFD\uFFFD)THIRDSCOuloft2020052818346904zmYBSXXHTQ
-ZMToken=THIRDSCOuloft2020052818346904zmYBSXQYTQ
-
-CallbackUrl=http://39.101.143.165:8080/zm/Underwriting
-RGCallbackUrl=http://39.101.143.165:8080/zm/ArtificialUnderwriting
-
-#\u5929\u5B89API\u6D4B\u8BD5\u53C2\u6570
+#
+#CallbackUrl=http://39.101.143.165:8080/zm/Underwriting
+#RGCallbackUrl=http://39.101.143.165:8080/zm/ArtificialUnderwriting
+#
+##\u5929\u5B89API\u6D4B\u8BD5\u53C2\u6570
+##TASign=gIpr5j5haL7T8WJY7ZS54JdlYL/7PToQOy505Mr/iH3qN4SMpJJVdvxFE1/KsWH0EjDxR9qVwRC/t6kLCJo+Y1AB+FD1qNjkbLyEQ+9aeQEF2Af/4bJqUDArewHHT879o5IqzHg/lcg=
+##TAModelUrl=https://testow.95505.cn/cpf/tianan_cpf/access/car/queryCarModel.mvc
+##TAQuoteUrl=https://testow.95505.cn/cpf/tianan_cpf/access/car/premiumAccurate.mvc
+##TAInsureUrl=https://testow.95505.cn/cpf/tianan_cpf/access/car/insureConfirmation.mvc
+##TAPayUrl=https://testow.95505.cn/cpf/tianan_cpf/common/pay/applyPay.do
+##TAUploadUrl=https://testow.95505.cn/cpf/tianan_cpf/access/car/thirdUploadAttach.mvc
+#
+##\u5929\u5B89API\u751F\u4EA7\u53C2\u6570
 #TASign=gIpr5j5haL7T8WJY7ZS54JdlYL/7PToQOy505Mr/iH3qN4SMpJJVdvxFE1/KsWH0EjDxR9qVwRC/t6kLCJo+Y1AB+FD1qNjkbLyEQ+9aeQEF2Af/4bJqUDArewHHT879o5IqzHg/lcg=
-#TAModelUrl=https://testow.95505.cn/cpf/tianan_cpf/access/car/queryCarModel.mvc
-#TAQuoteUrl=https://testow.95505.cn/cpf/tianan_cpf/access/car/premiumAccurate.mvc
-#TAInsureUrl=https://testow.95505.cn/cpf/tianan_cpf/access/car/insureConfirmation.mvc
-#TAPayUrl=https://testow.95505.cn/cpf/tianan_cpf/common/pay/applyPay.do
-#TAUploadUrl=https://testow.95505.cn/cpf/tianan_cpf/access/car/thirdUploadAttach.mvc
-
-#\u5929\u5B89API\u751F\u4EA7\u53C2\u6570
-TASign=gIpr5j5haL7T8WJY7ZS54JdlYL/7PToQOy505Mr/iH3qN4SMpJJVdvxFE1/KsWH0EjDxR9qVwRC/t6kLCJo+Y1AB+FD1qNjkbLyEQ+9aeQEF2Af/4bJqUDArewHHT879o5IqzHg/lcg=
-TAModelUrl=https://cpf.95505.cn/tianan_cpf/access/car/queryCarModel.mvc
-TAQuoteUrl=https://cpf.95505.cn/tianan_cpf/access/car/premiumAccurate.mvc
-TAInsureUrl=https://cpf.95505.cn/tianan_cpf/access/car/insureConfirmation.mvc
-TAPayUrl=https://cpf.95505.cn/tianan_cpf/common/pay/applyPay.do
-TAUploadUrl=https://cpf.95505.cn/tianan_cpf/access/car/thirdUploadAttach.mvc
-
-#\u6587\u4EF6\u4E0A\u4F20\u8DEF\u5F84\u6D4B\u8BD5
-#filePath=C:/soft/apache-tomcat-8.0.50/webapps/upload/
-#\u6587\u4EF6\u4E0A\u4F20\u8DEF\u5F84\u751F\u4EA7
-filePath=/usr/local/apache-tomcat-8.5.73/webapps/upload/
-apk.path=/usr/local/apache-tomcat-8.5.73/webapps/app/android/
-upload.file.path=D:/upload/
-##\u6D4B\u8BD5\u5730\u5740
-#netUrl=http://47.92.254.66:8080/
-##\u751F\u4EA7\u5730\u5740
-netUrl=http://baoxianzhanggui.com:8080/
-
-#\u7279\u6B8A\u8D26\u53F7
-#Specialaccount=
-Specialaccount=99999999999999
-#mybatis xml\u6587\u4EF6\u626B\u63CF\u8DEF\u5F84
-mybatis.mapper-locations=classpath:mapper/**/*.xml
-mybatis.type-aliases-package=com.ydtech.modules.*.model
-#================ mybatis pagehelper ==============#
-pagehelper.helper-dialect=mysql
-pagehelper.reasonable=true
-pagehelper.support-methods-arguments=true
-pagehelper.params=count=countSql
-
-#================ \u4E2D\u4FDD\u4FE1\u63A5\u53E3\u5BF9\u63A5--\u5F00\u59CB==============#
-##\u63A5\u53E3\u5730\u5740
-cbit.url_pre=http://88.88.1.52:5017
-cbit.api2=/pjms/insurance/open/unify/order/getInitParams
-cbit.api3=/pjms/insurance/open/unify/order/generateOrderNo
-cbit.api4=/pjms/insurance/open/unify/vehicle/getTMBVerificationCode
-cbit.api5=/pjms/insurance/open/unify/vehicle/queryVehicleModel
-cbit.api6=/pjms/insurance/open/unify/vehicle/confirmVehicle
-cbit.api7=/pjms/insurance/open/unify/order/quote
-cbit.api8=/pjms/insurance/open/unify/order/postUnderwriting
-cbit.api9=/pjms/insurance/open/unify/order/applyPay
-cbit.api10=/pjms/insurance/open/unify/order/cancelUnderwriting
-cbit.api11=/pjms/insurance/open/unify/order/getVerificationCode
-cbit.api12=/pjms/insurance/open/unify/order/commitVerificationCode
-cbit.api14=/pjms/insurance/open/unify/order/sendEleApplicationSign
-cbit.api17=/pjms/insurance/open/unify/order/viewToPay
-cbit.api18=/pjms/insurance/open/unify/order/queryPolicy
-##\u5176\u4ED6
-###\u4E2D\u4ECB\u673A\u6784id
-cbit.franchiserId=taiyuantianqin-001
-
-cbit.franchiserChannelId_pingan=CBIT01240000
-cbit.franchiserChannelCode_pingan=QIAOYRXX-00001
-cbit.carDealerCode_pingan=224189117001
-cbit.insurerBranchCode_pingan=140000
-
-cbit.franchiserChannelId_taiping=CBIT01240000
-cbit.groupCode_taiping=S132001
-cbit.insurerBranchCode_taiping=140000
-
-cbit.franchiserChannelId_taipingyang=CBIT01240000
-cbit.insurerBranchCode_taipingyang=140000
-
-###ip\u5730\u5740
-cbit.ip=10.23.69.91
-### \u4E2D\u4ECB\u5E73\u53F0-\u52A0\u89E3\u5BC6\u79D8\u94A5\u5BF9 \u79C1\u94A5+\u516C\u94A5
-cbit.ZJPT_PRIVATE_KEY=MIICdQIBADANBgkqhkiG9w0BAQEFAASCAl8wggJbAgEAAoGBAMpskeUA+JfNr0Dsx+zZwu/KwprkaN0y0bVBC/ygAOQCBx26NGrRodWM0VehWbtvUN2WEQB2EpcntfJj/bOgRumhThjHMh+2WgdnS93+Ti+ACDlt4f3vaOlZmPo3cRH4SBHvf5SLSnSl1chGMMXijyZZIvDxbxn3d4gu0uDQNw4jAgMBAAECgYAyOnqBPppw4KLqE1cQmIBcjA157c9vg9qxhTB6QSG3ciFd6QR0tQvZN5YCjpD7h4WjVkdlu+alBz+Io/MiDVVK1qt+EsqWBKSx7fAi5UFmoVPHcmw7ZrnBmQLlduo9CUbyTQKGvVlEY+lHwRjuko40jSDRJQVHCbIDc/kxmipukQJBAOqf44+b+agA3RJBYLPqsaUShK8ykor2nZptUNFtMBiuGPuQ0sT3cfZMB9upc586ckFDZcqChqFLUAfpmgMIgYUCQQDc3ay6RJ9owqkkPTKeeppeZqDoD5Nk3nipuMyJwTL0GR0A1AfUXcA0F8BxEQob1k65Tcw7ol2j7DmRqjA8uw2HAkAr92RUT/07r1W+CwRNEsjRTyQQFKEDa21jN+LyK8zcgxtpYN0uTdRMPDkov5tMFk68zh1wEn+aEBviL7NNqDVlAkBlu6mzBqbSj09vhMzLGLgAIY+eNIZ04NB9hMSZ8yawLt0gI4oTtLcyh3o52lpophcO3ZnkIg610bpWsSiU4KgDAkA+vyBe7spxLR1S/k4FhPP9YZay6vmuzwzSNUKF5JquTLuI9iqZRf+n3Yfy6wgQzkP2WIeQDRe074p09MFGc+pp
-cbit.ZJPT_PUBLIC_KEY=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDKbJHlAPiXza9A7Mfs2cLvysKa5GjdMtG1QQv8oADkAgcdujRq0aHVjNFXoVm7b1DdlhEAdhKXJ7XyY/2zoEbpoU4YxzIftloHZ0vd/k4vgAg5beH972jpWZj6N3ER+EgR73+Ui0p0pdXIRjDF4o8mWSLw8W8Z93eILtLg0DcOIwIDAQAB
-### \u5408\u4F5C\u4F19\u4F34-\u52A0\u89E3\u5BC6\u79D8\u94A5\u5BF9  \u79C1\u94A5+\u516C\u94A5
-cbit.HZHB_PRIVATE_KEY=MIICeAIBADANBgkqhkiG9w0BAQEFAASCAmIwggJeAgEAAoGBAJnWpyVLFBli1kakBXUjk/SmH+X1X0kGGik0ub1MXnNUOk9NBqRQjO6G9A6wdiGzo9j9w26u5u9R6R6De843YMhgW6iIoDodexvZzInxTE+YY52iUBDCcksHYAM7uHZBtdXKovm+bEzL0nwa89Xw6zyuCm8x7enoDiVzs/75WoqrAgMBAAECgYAnEcC5U+vy1oscvaM1MKfuxhHr0Pk2DnquZFmXncGPAKEeaq15JYvlOBjbci1OOdUu0qPDhF/Z/694tGPI53+If0MkS3VpxaOYc+i/G/KQiYZIu1hjUb2F8j8xQrF60WkIsqwzjJYF9T5MCjLEZvDg9cPzFY+QpS8yl5Cbl0aOYQJBAMd+0VtQYV9q3nsZgEk4ux6Vz19SakRbk9zkz1yBUKRfWcLa1T9DleaBqGdkdZbO8v6PCtyz6Fdymq+USYWeV3UCQQDFaU5O8GeNr07J6quTgHgsbN8IV28Wp4wKmDAXCWlehkGGoTm11FOL2zxItjgmmHGyXBA08osPCojBPptOazWfAkEAmG3K04WwUPLcOZy7i7cAKpd3ErNrJP4AFcjytBDOqDl+4UbJp4QhljW9kfqNaoSH4H81YntIbQDRNpUMND9PPQJBAKWfnBuOhtLQagHt6NVvy2M6VETjVkhjeZLJ7E7njofHi+IwEgMDiLSl0wYOGz4GWB2UL+S8OP79j47Rv+si93ECQQCNqD8nMcVXIHKze7aM9c8v1yfgEdk8IpVhAbiXbRs3ANTT4Jx2M6GNBEeEAorHqO4eOTxdObNuz/RADoRnpzHk
-cbit.HZHB_PUBLIC_KEY=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCZ1qclSxQZYtZGpAV1I5P0ph/l9V9JBhopNLm9TF5zVDpPTQakUIzuhvQOsHYhs6PY/cNurubvUekeg3vON2DIYFuoiKA6HXsb2cyJ8UxPmGOdolAQwnJLB2ADO7h2QbXVyqL5vmxMy9J8GvPV8Os8rgpvMe3p6A4lc7P++VqKqwIDAQAB
-
-#================ \u4E2D\u4FDD\u4FE1\u63A5\u53E3\u5BF9\u63A5--\u7ED3\u675F==============#
-
-resp_json={"status":"Z00001","msg":"success","data":{"invoiceType":[],"payWayList":[{"payWayCode":"Z000005"}],"switchList":[{"cityName":null,"insurerId":null,"configCode":"Z00002","configValue":"ON","remark":"\uFFFD\uFFFD\u04AA\uFFFD\uFFFD\uFFFD\uFFFD\u01E9\uFFFD\uFFFD"},{"cityName":null,"insurerId":null,"configCode":"Z00009","configValue":"ON","remark":"\uFFFD\uFFFD\u04AA\u01F0\uFFFD\uFFFD\uFFFD\u1F7B\uFFFD\uFFFD\u05EA\uFFFD\uFFFD\uFFFD\uFFFD\u0328\u05A7\uFFFD\uFFFD"},{"cityName":null,"insurerId":null,"configCode":"Z00007","configValue":"ON","remark":"\uFFFD\uFFFD\u04AA\uFFFD\uFFFD\uFFFD\u00F3\uFFFD\uFFFD\uFFFD\u0237\uFFFD\uFFFD"},{"cityName":null,"insurerId":null,"configCode":"Z00001","configValue":"ON","remark":"\uFFFD\uFFFD\u04AA\uFFFD\uFFFD\uFFFD\u0376\uFFFD\uFFFD\uFFFD(\uFFFD\u05BB\uFFFD\u02B5\uFFFD\uFFFD\uFFFD\uFFFD\u05A4)"}]},"insurerId":"000108","baseParam":{"requestNo":"baodafang-00197e79fcc-f39c-4c54-86fc-a88668b0647e"},"success":true}
-
-#================ \u963F\u91CC\u4E91\u90E8\u7F72\u5BF9\u63A5\u4FDD\u4FE1\u670D\u52A1\u5668--\u5F00\u59CB==============#
-aly.cbit.url_pre=http://223.70.186.115:80/CBIT/API/insCBIT
-aly.pay.url_pre=http://baoxianzhanggui.com:8080
-aly.pay.html_path=/usr/local/apache-tomcat-8.5.73/webapps/html/
-#================ \u963F\u91CC\u4E91\u90E8\u7F72\u5BF9\u63A5\u4FDD\u4FE1\u670D\u52A1\u5668--\u7ED3\u675F==============#
-
-
-##================ \u4FDD\u4FE1\u56DE\u8C03\u963F\u91CC\u4E91\u63A5\u670D\u52A1\u5668--\u5F00\u59CB==============#
-cbit.aly.url_pre=http://39.101.143.165:8080/API/insCBIT
-#================ \u963F\u91CC\u4E91\u90E8\u7F72\u5BF9\u63A5\u4FDD\u4FE1\u670D\u52A1\u5668--\u7ED3\u675F==============#
-
-#\u6587\u4EF6\u4E0A\u4F20\u4E0B\u8F7D\u76F8\u5173\u914D\u7F6E
-# \u8DEF\u5F84\u5E26\u4E0A\u524D\u540E\u659C\u6746
-upload.basepath=${filePath}
-upload.host=
-upload.username=
-upload.password=
-upload.url=${netUrl}
-
-#================ \u6C38\u5B89\u5BF9\u63A5\u5F00\u59CB ==============#
-ya.url=https://api.yaic.com.cn/auto/issue
-ya.url.sign=https://api.yaic.com.cn/auto/debug/generate-access-key
-ya.consumerID=102120
-ya.consumerAccessKey=xE1cA7dK
-ya.matchCode=10212014040001
-ya.userCode=10061765
-ya.comCode=0214040020000
-ya.callbackUrl=http://www.baoxianzhanggui.com:8080/order/yongAn/updatePolicy
-#================ \u6C38\u5B89\u5BF9\u63A5\u7ED3\u675F ==============#
-
-#================ \u5BF9\u63A5\u6C38\u5B89 \u7ED3\u675F==============#
-master.password.ciphertext=9d3b721959d63c10173d378e82aaecf2
-master.password.salt=7cb112e917a8446f8616
-# redis \u914D\u7F6E
-spring.redis.host=localhost
-spring.redis.port=6379
-spring.redis.password=
-spring.redis.database=0
-spring.redis.lettuce.pool.max-active=8
-spring.redis.lettuce.pool.max-idle=8
-spring.redis.lettuce.pool.min-idle=0
-spring.redis.lettuce.pool.max-wait=100
-spring.redis.timeOut=3000
-# \u4EBA\u4FDD\u63A5\u53E3
-rb.quote.url=http://172.24.144.213:8088/rb/bfjs
-rb.audit.url=http://172.24.144.213:8088/rb/jiaofei
-rb.car.search.url=http://172.24.144.213:8088/rb/carsearch
-rb.brand.search.url=http://172.24.144.213:8088/rb/brandsearch
-#\u4E2D\u7164\u63A5\u53E3
-zm.domain=http://172.24.144.213:8888/zm
-zm.quote.url=${zm.domain}/quotedPrice
-zm.audit.url=${zm.domain}/audit
-zm.getPolicyPrint.url=${zm.domain}/getPolicyPrint
-zm.image.url=${zm.domain}/yxsc
-zm.verifyPayment.url=${zm.domain}/verifyPayment
-zm.modelQuery.url=${zm.domain}/modelQuery
-zm.vinSearch.url=${zm.domain}/vinSearch
-zm.ascription.url=${zm.domain}/ascription
-zm.manualUnderwriting.url=${zm.domain}/manualUnderwriting
-#\u534E\u519Cvin\u7801\u67E5\u8BE2
-hn.vin.search.url=http://172.24.144.213:8088/hn/vinsearch
-#\u5E73\u5B89vin\u7801\u67E5\u8BE2
-pa.vin.search.url=http://172.24.144.213:8888/pingan/vinSearch
-# \u6052\u90A6\u63A5\u53E3
-hb.quote.url=http://172.24.144.213:8088/hb/hb_bfjs
-hb.audit.url=http://172.24.144.213:8088/hb/hb_hebao
-hb.image.url=http://172.24.144.213:8088/hb/hb_phoup
-hb.getPolicyPrint.url=http://172.24.144.213:8088/hb/hb_bdsearch
-# \u6C38\u8BDA\u63A5\u53E3
-yc.domain=http://47.92.254.66:8088
-yc.quote.url=/yc/bfjs
-yc.audit.url=/yc/jiaofei
-yc.image.url=/yc/yxsc
-yc.getPolicyPrint.url=/yc/bdxz
-# \u5B89\u76DB\u5929\u5E73\u722C\u866B\u63A5\u53E3
-as.domain=http://47.92.254.66:8088
-as.quote.url=/as/bfjs
-as.audit.url=/as/jiaofei
-as.image.url=/as/yxsc
-# \u5FAE\u4FE1\u53C2\u6570
-wechat.open.componentAppId=wx612ca90988c46947
-wechat.open.componentSecret=75b7d4cda453b2075dec23f849278bc0
-# mybatis-plus\u914D\u7F6E\u65E5\u5FD7
-mybatis-plus.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
-mybatis.configuration.map-underscore-to-camel-case=true
-#\u5FAE\u4FE1\u6CE8\u518C\u552F\u4E00\u4E0A\u7EA7\u4EBA\u5458
-pyramid.dept.id=99140109M03D01
-
-# ==========\u6C38\u57CEAPI\u65B9\u5F0F\u5BF9\u63A5 \u5F00\u59CB============================#
-yc.api.userName=yctest1
-yc.api.password=yc@20230202!
-yc.api.url=http://140.206.189.151:17000/
-
-# \u673A\u6784\u4EE3\u7801(dptCde)
-yc.api.agent.dptCde=14A4
-# \u6E20\u9053\u7F16\u7801(agentCode)
-yc.api.agent.agentCode=250000P00004
-# \u534F\u8BAE\u7F16\u7801(conferCode)
-yc.api.agent.agentType=250000P0000401
-# \u6E20\u9053\u5206\u7C7B(agentType)
-yc.api.agent.agentNme=191010
-# \u4EE3\u7406\u4EBA\u540D\u79F0(agentNme)
-yc.api.agent.qlftNo=\u6C38\u946B\u4FDD\u9669\u9500\u552E\u670D\u52A1\u6709\u9650\u516C\u53F8\u5C71\u897F\u5206\u516C\u53F8
-# \u4EE3\u7406\u4EBA\u8D44\u683C\u8BC1\u53F7(qlftNo)
-yc.api.agent.operatorCode=2752454675645
-# \u5F55\u5165\u4EBA(operatorCode)
-yc.api.agent.salesmanNo=100030057
-# \u4E1A\u52A1\u5458\u4EE3\u7801(salesmanNo)
-yc.api.agent.cChaType=100030057
-# \u65B0\u4E1A\u52A1\u6765\u6E90(CChaType)
-yc.api.agent.custNature=191010
-# \u5BA2\u6237\u6027\u8D28(custNature)
-yc.api.agent.cOprcde=192099
-# \u64CD\u4F5C\u4EBA\u5458\u4EE3\u7801(cOprcde)
-yc.api.agent.cBsnsTyp=100030057
-
-# \u652F\u4ED8\u56DE\u8C03\u5730\u5740
-yc.api.pay.callBack=http://127.0.0.1:8080/api/yongCheng/callBack
-
-# ==========\u6C38\u57CEAPI\u65B9\u5F0F\u5BF9\u63A5 \u7ED3\u675F=============================#
-
-
-# \u5F00\u5173 ----------
-# \u65B9\u6CD5\u65E5\u5FD7\u5F00\u5173
-open.method.log=true
+#TAModelUrl=https://cpf.95505.cn/tianan_cpf/access/car/queryCarModel.mvc
+#TAQuoteUrl=https://cpf.95505.cn/tianan_cpf/access/car/premiumAccurate.mvc
+#TAInsureUrl=https://cpf.95505.cn/tianan_cpf/access/car/insureConfirmation.mvc
+#TAPayUrl=https://cpf.95505.cn/tianan_cpf/common/pay/applyPay.do
+#TAUploadUrl=https://cpf.95505.cn/tianan_cpf/access/car/thirdUploadAttach.mvc
+#
+##\u6587\u4EF6\u4E0A\u4F20\u8DEF\u5F84\u6D4B\u8BD5
+##filePath=C:/soft/apache-tomcat-8.0.50/webapps/upload/
+##\u6587\u4EF6\u4E0A\u4F20\u8DEF\u5F84\u751F\u4EA7
+#filePath=/usr/local/apache-tomcat-8.5.73/webapps/upload/
+#apk.path=/usr/local/apache-tomcat-8.5.73/webapps/app/android/
+#upload.file.path=D:/upload/
+###\u6D4B\u8BD5\u5730\u5740
+##netUrl=http://47.92.254.66:8080/
+###\u751F\u4EA7\u5730\u5740
+#netUrl=http://baoxianzhanggui.com:8080/
+#
+##\u7279\u6B8A\u8D26\u53F7
+##Specialaccount=
+#Specialaccount=99999999999999
+##mybatis xml\u6587\u4EF6\u626B\u63CF\u8DEF\u5F84
+#mybatis.mapper-locations=classpath:mapper/**/*.xml
+#mybatis.type-aliases-package=com.ydtech.modules.*.model
+##================ mybatis pagehelper ==============#
+#pagehelper.helper-dialect=mysql
+#pagehelper.reasonable=true
+#pagehelper.support-methods-arguments=true
+#pagehelper.params=count=countSql
+#
+##================ \u4E2D\u4FDD\u4FE1\u63A5\u53E3\u5BF9\u63A5--\u5F00\u59CB==============#
+###\u63A5\u53E3\u5730\u5740
+#cbit.url_pre=http://88.88.1.52:5017
+#cbit.api2=/pjms/insurance/open/unify/order/getInitParams
+#cbit.api3=/pjms/insurance/open/unify/order/generateOrderNo
+#cbit.api4=/pjms/insurance/open/unify/vehicle/getTMBVerificationCode
+#cbit.api5=/pjms/insurance/open/unify/vehicle/queryVehicleModel
+#cbit.api6=/pjms/insurance/open/unify/vehicle/confirmVehicle
+#cbit.api7=/pjms/insurance/open/unify/order/quote
+#cbit.api8=/pjms/insurance/open/unify/order/postUnderwriting
+#cbit.api9=/pjms/insurance/open/unify/order/applyPay
+#cbit.api10=/pjms/insurance/open/unify/order/cancelUnderwriting
+#cbit.api11=/pjms/insurance/open/unify/order/getVerificationCode
+#cbit.api12=/pjms/insurance/open/unify/order/commitVerificationCode
+#cbit.api14=/pjms/insurance/open/unify/order/sendEleApplicationSign
+#cbit.api17=/pjms/insurance/open/unify/order/viewToPay
+#cbit.api18=/pjms/insurance/open/unify/order/queryPolicy
+###\u5176\u4ED6
+####\u4E2D\u4ECB\u673A\u6784id
+#cbit.franchiserId=taiyuantianqin-001
+#
+#cbit.franchiserChannelId_pingan=CBIT01240000
+#cbit.franchiserChannelCode_pingan=QIAOYRXX-00001
+#cbit.carDealerCode_pingan=224189117001
+#cbit.insurerBranchCode_pingan=140000
+#
+#cbit.franchiserChannelId_taiping=CBIT01240000
+#cbit.groupCode_taiping=S132001
+#cbit.insurerBranchCode_taiping=140000
+#
+#cbit.franchiserChannelId_taipingyang=CBIT01240000
+#cbit.insurerBranchCode_taipingyang=140000
+#
+####ip\u5730\u5740
+#cbit.ip=10.23.69.91
+#### \u4E2D\u4ECB\u5E73\u53F0-\u52A0\u89E3\u5BC6\u79D8\u94A5\u5BF9 \u79C1\u94A5+\u516C\u94A5
+#cbit.ZJPT_PRIVATE_KEY=MIICdQIBADANBgkqhkiG9w0BAQEFAASCAl8wggJbAgEAAoGBAMpskeUA+JfNr0Dsx+zZwu/KwprkaN0y0bVBC/ygAOQCBx26NGrRodWM0VehWbtvUN2WEQB2EpcntfJj/bOgRumhThjHMh+2WgdnS93+Ti+ACDlt4f3vaOlZmPo3cRH4SBHvf5SLSnSl1chGMMXijyZZIvDxbxn3d4gu0uDQNw4jAgMBAAECgYAyOnqBPppw4KLqE1cQmIBcjA157c9vg9qxhTB6QSG3ciFd6QR0tQvZN5YCjpD7h4WjVkdlu+alBz+Io/MiDVVK1qt+EsqWBKSx7fAi5UFmoVPHcmw7ZrnBmQLlduo9CUbyTQKGvVlEY+lHwRjuko40jSDRJQVHCbIDc/kxmipukQJBAOqf44+b+agA3RJBYLPqsaUShK8ykor2nZptUNFtMBiuGPuQ0sT3cfZMB9upc586ckFDZcqChqFLUAfpmgMIgYUCQQDc3ay6RJ9owqkkPTKeeppeZqDoD5Nk3nipuMyJwTL0GR0A1AfUXcA0F8BxEQob1k65Tcw7ol2j7DmRqjA8uw2HAkAr92RUT/07r1W+CwRNEsjRTyQQFKEDa21jN+LyK8zcgxtpYN0uTdRMPDkov5tMFk68zh1wEn+aEBviL7NNqDVlAkBlu6mzBqbSj09vhMzLGLgAIY+eNIZ04NB9hMSZ8yawLt0gI4oTtLcyh3o52lpophcO3ZnkIg610bpWsSiU4KgDAkA+vyBe7spxLR1S/k4FhPP9YZay6vmuzwzSNUKF5JquTLuI9iqZRf+n3Yfy6wgQzkP2WIeQDRe074p09MFGc+pp
+#cbit.ZJPT_PUBLIC_KEY=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDKbJHlAPiXza9A7Mfs2cLvysKa5GjdMtG1QQv8oADkAgcdujRq0aHVjNFXoVm7b1DdlhEAdhKXJ7XyY/2zoEbpoU4YxzIftloHZ0vd/k4vgAg5beH972jpWZj6N3ER+EgR73+Ui0p0pdXIRjDF4o8mWSLw8W8Z93eILtLg0DcOIwIDAQAB
+#### \u5408\u4F5C\u4F19\u4F34-\u52A0\u89E3\u5BC6\u79D8\u94A5\u5BF9  \u79C1\u94A5+\u516C\u94A5
+#cbit.HZHB_PRIVATE_KEY=MIICeAIBADANBgkqhkiG9w0BAQEFAASCAmIwggJeAgEAAoGBAJnWpyVLFBli1kakBXUjk/SmH+X1X0kGGik0ub1MXnNUOk9NBqRQjO6G9A6wdiGzo9j9w26u5u9R6R6De843YMhgW6iIoDodexvZzInxTE+YY52iUBDCcksHYAM7uHZBtdXKovm+bEzL0nwa89Xw6zyuCm8x7enoDiVzs/75WoqrAgMBAAECgYAnEcC5U+vy1oscvaM1MKfuxhHr0Pk2DnquZFmXncGPAKEeaq15JYvlOBjbci1OOdUu0qPDhF/Z/694tGPI53+If0MkS3VpxaOYc+i/G/KQiYZIu1hjUb2F8j8xQrF60WkIsqwzjJYF9T5MCjLEZvDg9cPzFY+QpS8yl5Cbl0aOYQJBAMd+0VtQYV9q3nsZgEk4ux6Vz19SakRbk9zkz1yBUKRfWcLa1T9DleaBqGdkdZbO8v6PCtyz6Fdymq+USYWeV3UCQQDFaU5O8GeNr07J6quTgHgsbN8IV28Wp4wKmDAXCWlehkGGoTm11FOL2zxItjgmmHGyXBA08osPCojBPptOazWfAkEAmG3K04WwUPLcOZy7i7cAKpd3ErNrJP4AFcjytBDOqDl+4UbJp4QhljW9kfqNaoSH4H81YntIbQDRNpUMND9PPQJBAKWfnBuOhtLQagHt6NVvy2M6VETjVkhjeZLJ7E7njofHi+IwEgMDiLSl0wYOGz4GWB2UL+S8OP79j47Rv+si93ECQQCNqD8nMcVXIHKze7aM9c8v1yfgEdk8IpVhAbiXbRs3ANTT4Jx2M6GNBEeEAorHqO4eOTxdObNuz/RADoRnpzHk
+#cbit.HZHB_PUBLIC_KEY=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCZ1qclSxQZYtZGpAV1I5P0ph/l9V9JBhopNLm9TF5zVDpPTQakUIzuhvQOsHYhs6PY/cNurubvUekeg3vON2DIYFuoiKA6HXsb2cyJ8UxPmGOdolAQwnJLB2ADO7h2QbXVyqL5vmxMy9J8GvPV8Os8rgpvMe3p6A4lc7P++VqKqwIDAQAB
+#
+##================ \u4E2D\u4FDD\u4FE1\u63A5\u53E3\u5BF9\u63A5--\u7ED3\u675F==============#
+#
+#resp_json={"status":"Z00001","msg":"success","data":{"invoiceType":[],"payWayList":[{"payWayCode":"Z000005"}],"switchList":[{"cityName":null,"insurerId":null,"configCode":"Z00002","configValue":"ON","remark":"\uFFFD\uFFFD\u04AA\uFFFD\uFFFD\uFFFD\uFFFD\u01E9\uFFFD\uFFFD"},{"cityName":null,"insurerId":null,"configCode":"Z00009","configValue":"ON","remark":"\uFFFD\uFFFD\u04AA\u01F0\uFFFD\uFFFD\uFFFD\u1F7B\uFFFD\uFFFD\u05EA\uFFFD\uFFFD\uFFFD\uFFFD\u0328\u05A7\uFFFD\uFFFD"},{"cityName":null,"insurerId":null,"configCode":"Z00007","configValue":"ON","remark":"\uFFFD\uFFFD\u04AA\uFFFD\uFFFD\uFFFD\u00F3\uFFFD\uFFFD\uFFFD\u0237\uFFFD\uFFFD"},{"cityName":null,"insurerId":null,"configCode":"Z00001","configValue":"ON","remark":"\uFFFD\uFFFD\u04AA\uFFFD\uFFFD\uFFFD\u0376\uFFFD\uFFFD\uFFFD(\uFFFD\u05BB\uFFFD\u02B5\uFFFD\uFFFD\uFFFD\uFFFD\u05A4)"}]},"insurerId":"000108","baseParam":{"requestNo":"baodafang-00197e79fcc-f39c-4c54-86fc-a88668b0647e"},"success":true}
+#
+##================ \u963F\u91CC\u4E91\u90E8\u7F72\u5BF9\u63A5\u4FDD\u4FE1\u670D\u52A1\u5668--\u5F00\u59CB==============#
+#aly.cbit.url_pre=http://223.70.186.115:80/CBIT/API/insCBIT
+#aly.pay.url_pre=http://baoxianzhanggui.com:8080
+#aly.pay.html_path=/usr/local/apache-tomcat-8.5.73/webapps/html/
+##================ \u963F\u91CC\u4E91\u90E8\u7F72\u5BF9\u63A5\u4FDD\u4FE1\u670D\u52A1\u5668--\u7ED3\u675F==============#
+#
+#
+###================ \u4FDD\u4FE1\u56DE\u8C03\u963F\u91CC\u4E91\u63A5\u670D\u52A1\u5668--\u5F00\u59CB==============#
+#cbit.aly.url_pre=http://39.101.143.165:8080/API/insCBIT
+##================ \u963F\u91CC\u4E91\u90E8\u7F72\u5BF9\u63A5\u4FDD\u4FE1\u670D\u52A1\u5668--\u7ED3\u675F==============#
+#
+##\u6587\u4EF6\u4E0A\u4F20\u4E0B\u8F7D\u76F8\u5173\u914D\u7F6E
+## \u8DEF\u5F84\u5E26\u4E0A\u524D\u540E\u659C\u6746
+#upload.basepath=${filePath}
+#upload.host=
+#upload.username=
+#upload.password=
+#upload.url=${netUrl}
+#
+##================ \u6C38\u5B89\u5BF9\u63A5\u5F00\u59CB ==============#
+#ya.url=https://api.yaic.com.cn/auto/issue
+#ya.url.sign=https://api.yaic.com.cn/auto/debug/generate-access-key
+#ya.consumerID=102120
+#ya.consumerAccessKey=xE1cA7dK
+#ya.matchCode=10212014040001
+#ya.userCode=10061765
+#ya.comCode=0214040020000
+#ya.callbackUrl=http://www.baoxianzhanggui.com:8080/order/yongAn/updatePolicy
+##================ \u6C38\u5B89\u5BF9\u63A5\u7ED3\u675F ==============#
+#
+##================ \u5BF9\u63A5\u6C38\u5B89 \u7ED3\u675F==============#
+#master.password.ciphertext=9d3b721959d63c10173d378e82aaecf2
+#master.password.salt=7cb112e917a8446f8616
+## redis \u914D\u7F6E
+#spring.redis.host=172.24.144.220
+#spring.redis.port=6379
+#spring.redis.password=sxzgkj@2023
+#spring.redis.database=0
+#spring.redis.lettuce.pool.max-active=8
+#spring.redis.lettuce.pool.max-idle=8
+#spring.redis.lettuce.pool.min-idle=0
+#spring.redis.lettuce.pool.max-wait=100
+#spring.redis.timeOut=3000
+## \u4EBA\u4FDD\u63A5\u53E3
+#rb.quote.url=http://172.24.144.213:8088/rb/bfjs
+#rb.audit.url=http://172.24.144.213:8088/rb/jiaofei
+#rb.car.search.url=http://172.24.144.213:8088/rb/carsearch
+#rb.brand.search.url=http://172.24.144.213:8088/rb/brandsearch
+##\u4E2D\u7164\u63A5\u53E3
+#zm.domain=http://172.24.144.213:8888/zm
+#zm.quote.url=${zm.domain}/quotedPrice
+#zm.audit.url=${zm.domain}/audit
+#zm.getPolicyPrint.url=${zm.domain}/getPolicyPrint
+#zm.image.url=${zm.domain}/yxsc
+#zm.verifyPayment.url=${zm.domain}/verifyPayment
+#zm.modelQuery.url=${zm.domain}/modelQuery
+#zm.vinSearch.url=${zm.domain}/vinSearch
+#zm.ascription.url=${zm.domain}/ascription
+#zm.manualUnderwriting.url=${zm.domain}/manualUnderwriting
+##\u534E\u519Cvin\u7801\u67E5\u8BE2
+#hn.vin.search.url=http://172.24.144.213:8088/hn/vinsearch
+##\u5E73\u5B89vin\u7801\u67E5\u8BE2
+#pa.vin.search.url=http://172.24.144.213:8888/pingan/vinSearch
+## \u6052\u90A6\u63A5\u53E3
+#hb.quote.url=http://172.24.144.213:8088/hb/hb_bfjs
+#hb.audit.url=http://172.24.144.213:8088/hb/hb_hebao
+#hb.image.url=http://172.24.144.213:8088/hb/hb_phoup
+#hb.getPolicyPrint.url=http://172.24.144.213:8088/hb/hb_bdsearch
+## \u6C38\u8BDA\u63A5\u53E3
+#yc.domain=http://47.92.254.66:8088
+#yc.quote.url=/yc/bfjs
+#yc.audit.url=/yc/jiaofei
+#yc.image.url=/yc/yxsc
+#yc.getPolicyPrint.url=/yc/bdxz
+## \u5B89\u76DB\u5929\u5E73\u722C\u866B\u63A5\u53E3
+#as.domain=http://47.92.254.66:8088
+#as.quote.url=/as/bfjs
+#as.audit.url=/as/jiaofei
+#as.image.url=/as/yxsc
+## \u5FAE\u4FE1\u53C2\u6570
+#wechat.open.componentAppId=wx612ca90988c46947
+#wechat.open.componentSecret=75b7d4cda453b2075dec23f849278bc0
+## mybatis-plus\u914D\u7F6E\u65E5\u5FD7
+#mybatis-plus.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
+#mybatis.configuration.map-underscore-to-camel-case=true
+##\u5FAE\u4FE1\u6CE8\u518C\u552F\u4E00\u4E0A\u7EA7\u4EBA\u5458
+#pyramid.dept.id=99140109M03D01
+#
+## ==========\u6C38\u57CEAPI\u65B9\u5F0F\u5BF9\u63A5 \u5F00\u59CB============================#
+#yc.api.userName=yctest1
+#yc.api.password=yc@20230202!
+#yc.api.url=http://140.206.189.151:17000/
+#
+## \u673A\u6784\u4EE3\u7801(dptCde)
+#yc.api.agent.dptCde=14A4
+## \u6E20\u9053\u7F16\u7801(agentCode)
+#yc.api.agent.agentCode=250000P00004
+## \u534F\u8BAE\u7F16\u7801(conferCode)
+#yc.api.agent.agentType=250000P0000401
+## \u6E20\u9053\u5206\u7C7B(agentType)
+#yc.api.agent.agentNme=191010
+## \u4EE3\u7406\u4EBA\u540D\u79F0(agentNme)
+#yc.api.agent.qlftNo=\u6C38\u946B\u4FDD\u9669\u9500\u552E\u670D\u52A1\u6709\u9650\u516C\u53F8\u5C71\u897F\u5206\u516C\u53F8
+## \u4EE3\u7406\u4EBA\u8D44\u683C\u8BC1\u53F7(qlftNo)
+#yc.api.agent.operatorCode=2752454675645
+## \u5F55\u5165\u4EBA(operatorCode)
+#yc.api.agent.salesmanNo=100030057
+## \u4E1A\u52A1\u5458\u4EE3\u7801(salesmanNo)
+#yc.api.agent.cChaType=100030057
+## \u65B0\u4E1A\u52A1\u6765\u6E90(CChaType)
+#yc.api.agent.custNature=191010
+## \u5BA2\u6237\u6027\u8D28(custNature)
+#yc.api.agent.cOprcde=192099
+## \u64CD\u4F5C\u4EBA\u5458\u4EE3\u7801(cOprcde)
+#yc.api.agent.cBsnsTyp=100030057
+#
+## \u652F\u4ED8\u56DE\u8C03\u5730\u5740
+#yc.api.pay.callBack=http://127.0.0.1:8080/api/yongCheng/callBack
+#
+## ==========\u6C38\u57CEAPI\u65B9\u5F0F\u5BF9\u63A5 \u7ED3\u675F=============================#
+#
+#
+## \u5F00\u5173 ----------
+## \u65B9\u6CD5\u65E5\u5FD7\u5F00\u5173
+#open.method.log=true
+#
+## \u65E5\u5FD7\u6587\u4EF6\u8DEF\u5F84
+#log.file.path=/ins

src/main/resources/application-test.properties

@@ -1,268 +1,293 @@
-## \u6570\u636E\u5E93\u8BBF\u95EE\u914D\u7F6E
-## \u4E3B\u6570\u636E\u6E90\uFF0C\u9ED8\u8BA4\u7684
-##spring.datasource.druid.type=com.alibaba.druid.pool.DruidDataSource
-##spring.datasource.druid.driver-class-name=com.mysql.jdbc.Driver
-#spring.datasource.druid.driver-class-name=com.mysql.cj.jdbc.Driver
-#spring.datasource.druid.url=jdbc:mysql://localhost:3306/zgdd?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=UTC
-#spring.datasource.druid.username=root
-#spring.datasource.druid.password=root
-server.servlet.encoding.force=true
-server.servlet.encoding.charset=UTF-8
-# \u6700\u5927\u652F\u6301\u6587\u4EF6\u5927\u5C0F
-spring.servlet.multipart.max-file-size=2000MB
-# \u6700\u5927\u652F\u6301\u8BF7\u6C42\u5927\u5C0F
-spring.servlet.multipart.max-request-size=2000MB
-## DataSource settings
-#spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
-##spring.datasource.url = jdbc:mysql://localhost:3306/zgdd?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
-#spring.datasource.url = jdbc:mysql://39.100.252.34:3306/zgdd?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
-#spring.datasource.username = root
-#spring.datasource.password = root
-#spring.datasource.driverClassName = com.mysql.jdbc.Driver
-spring.datasource.driver-class-name=com.p6spy.engine.spy.P6SpyDriver
-## \u6D4B\u8BD5\u5E93
-spring.datasource.url=jdbc:p6spy:mysql://47.92.254.66:3306/zgdd?serverTimezone=Asia/Shanghai&allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8
-## \u751F\u4EA7\u5E93
-#spring.datasource.url=jdbc:p6spy:mysql://39.99.227.124:3306/zgdd?serverTimezone=Asia/Shanghai&allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8
-spring.datasource.username=root
-spring.datasource.password=zgdd@2020
-## spring \u914D\u7F6E
-## \u5982\u679C\u914D\u7F6E\u4E86spring-resources\uFF0C\u5219\u5FC5\u987B\u5305\u542Bclasspath:/static/
-## \u8BBF\u95EE\u9759\u6001\u9875\u9762 /pages/\u6307\u5B9A\u8DEF\u5F84\u4E3A /static/pages/
-#spring.mvc.view.prefix=/
-## \u9759\u6001\u9875\u9762\u540E\u7F00
-#spring.mvc.view.suffix=.html
-## \u9759\u6001\u6587\u4EF6\u8DEF\u5F84, \u8D44\u6E90\u8DEF\u5F84\uFF0C\u535A\u5BA2\u8DEF\u5F84
-#spring.resources.static-locations=classpath:/static/
-# \u4E0B\u9762\u4E3A\u8FDE\u63A5\u6C60\u7684\u8865\u5145\u8BBE\u7F6E\uFF0C\u5E94\u7528\u5230\u4E0A\u9762\u6240\u6709\u6570\u636E\u6E90\u4E2D
-# \u521D\u59CB\u5316\u5927\u5C0F\uFF0C\u6700\u5C0F\uFF0C\u6700\u5927
-spring.datasource.druid.initial-size=5
-spring.datasource.druid.minIdle=5
-spring.datasource.druid.maxActive=20
-# \u914D\u7F6E\u83B7\u53D6\u8FDE\u63A5\u7B49\u5F85\u8D85\u65F6\u7684\u65F6\u95F4
-spring.datasource.druid.maxWait=60000
-# \u914D\u7F6E\u95F4\u9694\u591A\u4E45\u624D\u8FDB\u884C\u4E00\u6B21\u68C0\u6D4B\uFF0C\u68C0\u6D4B\u9700\u8981\u5173\u95ED\u7684\u7A7A\u95F2\u8FDE\u63A5\uFF0C\u5355\u4F4D\u662F\u6BEB\u79D2
-spring.datasource.druid.timeBetweenEvictionRunsMillis=60000
-# \u914D\u7F6E\u4E00\u4E2A\u8FDE\u63A5\u5728\u6C60\u4E2D\u6700\u5C0F\u751F\u5B58\u7684\u65F6\u95F4\uFF0C\u5355\u4F4D\u662F\u6BEB\u79D2
-spring.datasource.druid.minEvictableIdleTimeMillis=300000
-spring.datasource.druid.validationQuery=SELECT 1 FROM DUAL
-spring.datasource.druid.testWhileIdle=true
-spring.datasource.druid.testOnBorrow=true
-spring.datasource.druid.testOnReturn=true
-# \u6253\u5F00PSCache\uFF0C\u5E76\u4E14\u6307\u5B9A\u6BCF\u4E2A\u8FDE\u63A5\u4E0APSCache\u7684\u5927\u5C0F
-spring.datasource.druid.poolPreparedStatements=true
-spring.datasource.druid.maxPoolPreparedStatementPerConnectionSize=20
-# \u914D\u7F6E\u76D1\u63A7\u7EDF\u8BA1\u62E6\u622A\u7684filters\uFF0C\u53BB\u6389\u540E\u76D1\u63A7\u754C\u9762sql\u65E0\u6CD5\u7EDF\u8BA1\uFF0C'wall'\u7528\u4E8E\u9632\u706B\u5899
-spring.datasource.druid.filters=stat,wall,log4j
-# \u901A\u8FC7connectProperties\u5C5E\u6027\u6765\u6253\u5F00mergeSql\u529F\u80FD\uFF1B\u6162SQL\u8BB0\u5F55
-spring.datasource.druid.connectionProperties=druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
-# \u5408\u5E76\u591A\u4E2ADruidDataSource\u7684\u76D1\u63A7\u6570\u636E
-#spring.datasource.druid.useGlobalDataSourceStat=true
-#\u4E2D\u7164\u63A5\u53E3\u6D4B\u8BD5\u5730\u5740
-ZMUrl=https://test.echinacoal.com/singlePlatform/
-ZMIMGUrl=https://test.echinacoal.com/singlePlatform/others/
-ZMSMSUrl=https://test.echinacoal.com/singlePlatform/prpall/
-ZMToken=THIRDSCOuloft2020052818346904zmYBSX
-CallbackUrl=http://47.92.254.66:8080/zm/Underwriting
-RGCallbackUrl=http://47.92.254.66:8080/zm/ArtificialUnderwriting
-#\u4E2D\u7164\u63A5\u53E3\u751F\u4EA7\u5730\u5740
-#ZMUrl=https://www.echinacoal.com/singlePlatform/
-#ZMIMGUrl=https://www.echinacoal.com/singlePlatform/others/
-#ZMSMSUrl=https://www.echinacoal.com/singlePlatform/prpall/
-#ZMToken=THIRDSCOuloft2020052818346904zmYBSXQYTQ
-#CallbackUrl=http://39.101.143.165:8080/zm/Underwriting
-#RGCallbackUrl=http://39.101.143.165:8080/zm/ArtificialUnderwriting
-#\u5929\u5B89API\u6D4B\u8BD5\u53C2\u6570
-TASign=gIpr5j5haL7T8WJY7ZS54JdlYL/7PToQOy505Mr/iH3qN4SMpJJVdvxFE1/KsWH0EjDxR9qVwRC/t6kLCJo+Y1AB+FD1qNjkbLyEQ+9aeQEF2Af/4bJqUDArewHHT879o5IqzHg/lcg=
-TAModelUrl=https://testow.95505.cn/cpf/tianan_cpf/access/car/queryCarModel.mvc
-TAQuoteUrl=https://testow.95505.cn/cpf/tianan_cpf/access/car/premiumAccurate.mvc
-TAInsureUrl=https://testow.95505.cn/cpf/tianan_cpf/access/car/insureConfirmation.mvc
-TAPayUrl=https://testow.95505.cn/cpf/tianan_cpf/common/pay/applyPay.do
-TAUploadUrl=https://testow.95505.cn/cpf/tianan_cpf/access/car/thirdUploadAttach.mvc
-#\u5929\u5B89API\u751F\u4EA7\u53C2\u6570
+### \u6570\u636E\u5E93\u8BBF\u95EE\u914D\u7F6E
+### \u4E3B\u6570\u636E\u6E90\uFF0C\u9ED8\u8BA4\u7684
+###spring.datasource.druid.type=com.alibaba.druid.pool.DruidDataSource
+###spring.datasource.druid.driver-class-name=com.mysql.jdbc.Driver
+##spring.datasource.druid.driver-class-name=com.mysql.cj.jdbc.Driver
+##spring.datasource.druid.url=jdbc:mysql://localhost:3306/zgdd?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=UTC
+##spring.datasource.druid.username=root
+##spring.datasource.druid.password=root
+#
+#
+#
+#
+#server.servlet.encoding.force=true
+#server.servlet.encoding.charset=UTF-8
+## \u6700\u5927\u652F\u6301\u6587\u4EF6\u5927\u5C0F
+#spring.servlet.multipart.max-file-size=2000MB
+## \u6700\u5927\u652F\u6301\u8BF7\u6C42\u5927\u5C0F
+#spring.servlet.multipart.max-request-size=2000MB
+### DataSource settings
+##spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
+###spring.datasource.url = jdbc:mysql://localhost:3306/zgdd?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
+##spring.datasource.url = jdbc:mysql://39.100.252.34:3306/zgdd?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
+##spring.datasource.username = root
+##spring.datasource.password = root
+##spring.datasource.driverClassName = com.mysql.jdbc.Driver
+#spring.datasource.driver-class-name=com.p6spy.engine.spy.P6SpyDriver
+### \u6D4B\u8BD5\u5E93
+#spring.datasource.url=jdbc:p6spy:mysql://47.92.254.66:3306/zgdd?serverTimezone=Asia/Shanghai&allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8
+### \u751F\u4EA7\u5E93
+##spring.datasource.url=jdbc:p6spy:mysql://39.99.227.124:3306/zgdd?serverTimezone=Asia/Shanghai&allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8
+#spring.datasource.username=root
+#spring.datasource.password=zgdd@2020
+### spring \u914D\u7F6E
+### \u5982\u679C\u914D\u7F6E\u4E86spring-resources\uFF0C\u5219\u5FC5\u987B\u5305\u542Bclasspath:/static/
+### \u8BBF\u95EE\u9759\u6001\u9875\u9762 /pages/\u6307\u5B9A\u8DEF\u5F84\u4E3A /static/pages/
+##spring.mvc.view.prefix=/
+### \u9759\u6001\u9875\u9762\u540E\u7F00
+##spring.mvc.view.suffix=.html
+### \u9759\u6001\u6587\u4EF6\u8DEF\u5F84, \u8D44\u6E90\u8DEF\u5F84\uFF0C\u535A\u5BA2\u8DEF\u5F84
+##spring.resources.static-locations=classpath:/static/
+## \u4E0B\u9762\u4E3A\u8FDE\u63A5\u6C60\u7684\u8865\u5145\u8BBE\u7F6E\uFF0C\u5E94\u7528\u5230\u4E0A\u9762\u6240\u6709\u6570\u636E\u6E90\u4E2D
+## \u521D\u59CB\u5316\u5927\u5C0F\uFF0C\u6700\u5C0F\uFF0C\u6700\u5927
+#spring.datasource.druid.initial-size=5
+#spring.datasource.druid.minIdle=5
+#spring.datasource.druid.maxActive=20
+## \u914D\u7F6E\u83B7\u53D6\u8FDE\u63A5\u7B49\u5F85\u8D85\u65F6\u7684\u65F6\u95F4
+#spring.datasource.druid.maxWait=60000
+## \u914D\u7F6E\u95F4\u9694\u591A\u4E45\u624D\u8FDB\u884C\u4E00\u6B21\u68C0\u6D4B\uFF0C\u68C0\u6D4B\u9700\u8981\u5173\u95ED\u7684\u7A7A\u95F2\u8FDE\u63A5\uFF0C\u5355\u4F4D\u662F\u6BEB\u79D2
+#spring.datasource.druid.timeBetweenEvictionRunsMillis=60000
+## \u914D\u7F6E\u4E00\u4E2A\u8FDE\u63A5\u5728\u6C60\u4E2D\u6700\u5C0F\u751F\u5B58\u7684\u65F6\u95F4\uFF0C\u5355\u4F4D\u662F\u6BEB\u79D2
+#spring.datasource.druid.minEvictableIdleTimeMillis=300000
+#spring.datasource.druid.validationQuery=SELECT 1 FROM DUAL
+#spring.datasource.druid.testWhileIdle=true
+#spring.datasource.druid.testOnBorrow=true
+#spring.datasource.druid.testOnReturn=true
+## \u6253\u5F00PSCache\uFF0C\u5E76\u4E14\u6307\u5B9A\u6BCF\u4E2A\u8FDE\u63A5\u4E0APSCache\u7684\u5927\u5C0F
+#spring.datasource.druid.poolPreparedStatements=true
+#spring.datasource.druid.maxPoolPreparedStatementPerConnectionSize=20
+## \u914D\u7F6E\u76D1\u63A7\u7EDF\u8BA1\u62E6\u622A\u7684filters\uFF0C\u53BB\u6389\u540E\u76D1\u63A7\u754C\u9762sql\u65E0\u6CD5\u7EDF\u8BA1\uFF0C'wall'\u7528\u4E8E\u9632\u706B\u5899
+#spring.datasource.druid.filters=stat,wall,log4j
+## \u901A\u8FC7connectProperties\u5C5E\u6027\u6765\u6253\u5F00mergeSql\u529F\u80FD\uFF1B\u6162SQL\u8BB0\u5F55
+#spring.datasource.druid.connectionProperties=druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
+## \u5408\u5E76\u591A\u4E2ADruidDataSource\u7684\u76D1\u63A7\u6570\u636E
+##spring.datasource.druid.useGlobalDataSourceStat=true
+##\u4E2D\u7164\u63A5\u53E3\u6D4B\u8BD5\u5730\u5740
+#ZMUrl=https://test.echinacoal.com/singlePlatform/
+#ZMIMGUrl=https://test.echinacoal.com/singlePlatform/others/
+#ZMSMSUrl=https://test.echinacoal.com/singlePlatform/prpall/
+#ZMToken=THIRDSCOuloft2020052818346904zmYBSX
+#CallbackUrl=http://47.92.254.66:8080/zm/Underwriting
+#RGCallbackUrl=http://47.92.254.66:8080/zm/ArtificialUnderwriting
+##\u4E2D\u7164\u63A5\u53E3\u751F\u4EA7\u5730\u5740
+##ZMUrl=https://www.echinacoal.com/singlePlatform/
+##ZMIMGUrl=https://www.echinacoal.com/singlePlatform/others/
+##ZMSMSUrl=https://www.echinacoal.com/singlePlatform/prpall/
+##ZMToken=THIRDSCOuloft2020052818346904zmYBSXQYTQ
+##CallbackUrl=http://39.101.143.165:8080/zm/Underwriting
+##RGCallbackUrl=http://39.101.143.165:8080/zm/ArtificialUnderwriting
+##\u5929\u5B89API\u6D4B\u8BD5\u53C2\u6570
 #TASign=gIpr5j5haL7T8WJY7ZS54JdlYL/7PToQOy505Mr/iH3qN4SMpJJVdvxFE1/KsWH0EjDxR9qVwRC/t6kLCJo+Y1AB+FD1qNjkbLyEQ+9aeQEF2Af/4bJqUDArewHHT879o5IqzHg/lcg=
-#TAModelUrl=https://cpf.95505.cn/tianan_cpf/access/car/queryCarModel.mvc
-#TAQuoteUrl=https://cpf.95505.cn/tianan_cpf/access/car/premiumAccurate.mvc
-#TAInsureUrl=https://cpf.95505.cn/tianan_cpf/access/car/insureConfirmation.mvc
-#TAPayUrl=https://cpf.95505.cn/tianan_cpf/common/pay/applyPay.do
-#TAUploadUrl=https://cpf.95505.cn/tianan_cpf/access/car/thirdUploadAttach.mvc
-#\u6587\u4EF6\u4E0A\u4F20\u8DEF\u5F84\u6D4B\u8BD5
-filePath=C:/soft/apache-tomcat-8.5.75/webapps/upload/
-apk.path=/usr/local/apache-tomcat-8.5.73/webapps/app/android/
-upload.file.path=D:/upload/
-#\u6587\u4EF6\u4E0A\u4F20\u8DEF\u5F84\u751F\u4EA7
-#filePath=/usr/local/apache-tomcat-7.0.93/webapps/upload/
-# \u8DEF\u5F84\u5E26\u4E0A\u524D\u540E\u659C\u6746
-upload.basepath=${filePath}
-upload.host=
-upload.username=
-upload.password=
-upload.url=${netUrl}
-##\u6D4B\u8BD5\u5730\u5740
-netUrl=http://47.92.254.66:8080/
-##\u751F\u4EA7\u5730\u5740
-#netUrl=http://39.101.143.165:8080/
-#\u7279\u6B8A\u8D26\u53F7
-#Specialaccount=
-Specialaccount=99999999999999
-#mybatis xml\u6587\u4EF6\u626B\u63CF\u8DEF\u5F84
-mybatis.mapper-locations=classpath:mapper/**/*.xml
-mybatis.type-aliases-package=com.ydtech.modules.*.model
-#================ mybatis pagehelper ==============#
-pagehelper.helper-dialect=mysql
-pagehelper.reasonable=true
-pagehelper.support-methods-arguments=true
-pagehelper.params=count=countSql
-#================ \u4E2D\u4FDD\u4FE1\u63A5\u53E3\u5BF9\u63A5--\u5F00\u59CB==============#
-## \u63A5\u53E3\u5730\u5740
-cbit.url_pre=http://88.88.1.51:5017
-cbit.api2=/pjms/insurance/open/unify/order/getInitParams
-cbit.api3=/pjms/insurance/open/unify/order/generateOrderNo
-cbit.api4=/pjms/insurance/open/unify/vehicle/getTMBVerificationCode
-cbit.api5=/pjms/insurance/open/unify/vehicle/queryVehicleModel
-cbit.api6=/pjms/insurance/open/unify/vehicle/confirmVehicle
-cbit.api7=/pjms/insurance/open/unify/order/quote
-cbit.api8=/pjms/insurance/open/unify/order/postUnderwriting
-cbit.api9=/pjms/insurance/open/unify/order/applyPay
-cbit.api10=/pjms/insurance/open/unify/order/cancelUnderwriting
-cbit.api11=/pjms/insurance/open/unify/order/getVerificationCode
-cbit.api12=/pjms/insurance/open/unify/order/commitVerificationCode
-cbit.api14=/pjms/insurance/open/unify/order/sendEleApplicationSign
-cbit.api17=/pjms/insurance/open/unify/order/viewToPay
-## \u5176\u4ED6
-### \u4E2D\u4ECB\u673A\u6784id
-cbit.franchiserId=taiyuantianqin-001
-cbit.franchiserChannelId_pingan=CBIT01240000
-cbit.franchiserChannelCode_pingan=QIAOYRXX-00001
-cbit.carDealerCode_pingan=224189117001
-cbit.insurerBranchCode_pingan=140000
-cbit.franchiserChannelId_taiping=CBIT01240000
-cbit.groupCode_taiping=S132001
-cbit.insurerBranchCode_taiping=140000
-cbit.franchiserChannelId_taipingyang=CBIT01240000
-cbit.insurerBranchCode_taipingyang=140000
-### ip\u5730\u5740
-cbit.ip=10.23.69.89
-### \u4E2D\u4ECB\u5E73\u53F0-\u52A0\u89E3\u5BC6\u79D8\u94A5\u5BF9 \u79C1\u94A5+\u516C\u94A5
-#cbit.ZJPT_PRIVATE_KEY=MIICdQIBADANBgkqhkiG9w0BAQEFAASCAl8wggJbAgEAAoGBAMpskeUA+JfNr0Dsx+zZwu/KwprkaN0y0bVBC/ygAOQCBx26NGrRodWM0VehWbtvUN2WEQB2EpcntfJj/bOgRumhThjHMh+2WgdnS93+Ti+ACDlt4f3vaOlZmPo3cRH4SBHvf5SLSnSl1chGMMXijyZZIvDxbxn3d4gu0uDQNw4jAgMBAAECgYAyOnqBPppw4KLqE1cQmIBcjA157c9vg9qxhTB6QSG3ciFd6QR0tQvZN5YCjpD7h4WjVkdlu+alBz+Io/MiDVVK1qt+EsqWBKSx7fAi5UFmoVPHcmw7ZrnBmQLlduo9CUbyTQKGvVlEY+lHwRjuko40jSDRJQVHCbIDc/kxmipukQJBAOqf44+b+agA3RJBYLPqsaUShK8ykor2nZptUNFtMBiuGPuQ0sT3cfZMB9upc586ckFDZcqChqFLUAfpmgMIgYUCQQDc3ay6RJ9owqkkPTKeeppeZqDoD5Nk3nipuMyJwTL0GR0A1AfUXcA0F8BxEQob1k65Tcw7ol2j7DmRqjA8uw2HAkAr92RUT/07r1W+CwRNEsjRTyQQFKEDa21jN+LyK8zcgxtpYN0uTdRMPDkov5tMFk68zh1wEn+aEBviL7NNqDVlAkBlu6mzBqbSj09vhMzLGLgAIY+eNIZ04NB9hMSZ8yawLt0gI4oTtLcyh3o52lpophcO3ZnkIg610bpWsSiU4KgDAkA+vyBe7spxLR1S/k4FhPP9YZay6vmuzwzSNUKF5JquTLuI9iqZRf+n3Yfy6wgQzkP2WIeQDRe074p09MFGc+pp
-cbit.ZJPT_PUBLIC_KEY=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDKbJHlAPiXza9A7Mfs2cLvysKa5GjdMtG1QQv8oADkAgcdujRq0aHVjNFXoVm7b1DdlhEAdhKXJ7XyY/2zoEbpoU4YxzIftloHZ0vd/k4vgAg5beH972jpWZj6N3ER+EgR73+Ui0p0pdXIRjDF4o8mWSLw8W8Z93eILtLg0DcOIwIDAQAB
-### \u5408\u4F5C\u4F19\u4F34-\u52A0\u89E3\u5BC6\u79D8\u94A5\u5BF9  \u79C1\u94A5+\u516C\u94A5
-cbit.HZHB_PRIVATE_KEY=MIICeAIBADANBgkqhkiG9w0BAQEFAASCAmIwggJeAgEAAoGBAJnWpyVLFBli1kakBXUjk/SmH+X1X0kGGik0ub1MXnNUOk9NBqRQjO6G9A6wdiGzo9j9w26u5u9R6R6De843YMhgW6iIoDodexvZzInxTE+YY52iUBDCcksHYAM7uHZBtdXKovm+bEzL0nwa89Xw6zyuCm8x7enoDiVzs/75WoqrAgMBAAECgYAnEcC5U+vy1oscvaM1MKfuxhHr0Pk2DnquZFmXncGPAKEeaq15JYvlOBjbci1OOdUu0qPDhF/Z/694tGPI53+If0MkS3VpxaOYc+i/G/KQiYZIu1hjUb2F8j8xQrF60WkIsqwzjJYF9T5MCjLEZvDg9cPzFY+QpS8yl5Cbl0aOYQJBAMd+0VtQYV9q3nsZgEk4ux6Vz19SakRbk9zkz1yBUKRfWcLa1T9DleaBqGdkdZbO8v6PCtyz6Fdymq+USYWeV3UCQQDFaU5O8GeNr07J6quTgHgsbN8IV28Wp4wKmDAXCWlehkGGoTm11FOL2zxItjgmmHGyXBA08osPCojBPptOazWfAkEAmG3K04WwUPLcOZy7i7cAKpd3ErNrJP4AFcjytBDOqDl+4UbJp4QhljW9kfqNaoSH4H81YntIbQDRNpUMND9PPQJBAKWfnBuOhtLQagHt6NVvy2M6VETjVkhjeZLJ7E7njofHi+IwEgMDiLSl0wYOGz4GWB2UL+S8OP79j47Rv+si93ECQQCNqD8nMcVXIHKze7aM9c8v1yfgEdk8IpVhAbiXbRs3ANTT4Jx2M6GNBEeEAorHqO4eOTxdObNuz/RADoRnpzHk
-cbit.HZHB_PUBLIC_KEY=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCZ1qclSxQZYtZGpAV1I5P0ph/l9V9JBhopNLm9TF5zVDpPTQakUIzuhvQOsHYhs6PY/cNurubvUekeg3vON2DIYFuoiKA6HXsb2cyJ8UxPmGOdolAQwnJLB2ADO7h2QbXVyqL5vmxMy9J8GvPV8Os8rgpvMe3p6A4lc7P++VqKqwIDAQAB
-#================ \u4E2D\u4FDD\u4FE1\u63A5\u53E3\u5BF9\u63A5--\u7ED3\u675F==============#
-#================ \u963F\u91CC\u4E91\u90E8\u7F72\u5BF9\u63A5\u4FDD\u4FE1\u670D\u52A1\u5668--\u5F00\u59CB==============#
-aly.cbit.url_pre=http://223.70.186.115:8080/CBIT/API/insCBIT
-aly.pay.url_pre=http://test.baoxianzhanggui.com:8080
-aly.pay.html_path=C:\\soft\\apache-tomcat-8.5.75\\webapps\\html\\
-#================ \u963F\u91CC\u4E91\u90E8\u7F72\u5BF9\u63A5\u4FDD\u4FE1\u670D\u52A1\u5668--\u7ED3\u675F==============#
-##================ \u4FDD\u4FE1\u56DE\u8C03\u963F\u91CC\u4E91\u63A5\u670D\u52A1\u5668--\u5F00\u59CB==============#
-cbit.aly.url_pre=http://47.92.254.66:8080/API/insCBIT
-#================ \u963F\u91CC\u4E91\u90E8\u7F72\u5BF9\u63A5\u4FDD\u4FE1\u670D\u52A1\u5668--\u7ED3\u675F==============#
-resp_json={"code":200,"msg":null,"data":{"busUniqueId":"P_YBX_TESTT0NukiEN02OGDABB","total":3518.79,"insureId":null,"businessPolicy":{"specialTermItems":null,"coverages":null,"applicationNo":"53201093900246326035"},"trafficPolicy":{"specialTermItems":null,"coverages":null,"applicationNo":"53201093900246326036"},"propertyPolicies":null,"casualtyPolicies":null}}
-#================ \u6C38\u5B89\u5BF9\u63A5\u5F00\u59CB ==============#
-ya.url=https://tapi.yaic.com.cn/auto/issue
-ya.url.sign=https://tapi.yaic.com.cn/auto/debug/generate-access-key
-ya.consumerID=102120
-ya.consumerAccessKey=123456test
-ya.matchCode=10212014040001
-ya.userCode=10061765
-ya.comCode=0214040020000
-ya.callbackUrl=http://test.baoxianzhanggui.com:8080/order/yongAn/updatePolicy
-#================ \u6C38\u5B89\u5BF9\u63A5\u7ED3\u675F ==============#
-master.password.ciphertext=9d3b721959d63c10173d378e82aaecf2
-master.password.salt=7cb112e917a8446f8616
-# redis \u914D\u7F6E
-spring.redis.host=localhost
-spring.redis.port=6379
-spring.redis.password=
-spring.redis.database=0
-spring.redis.lettuce.pool.max-active=8
-spring.redis.lettuce.pool.max-idle=8
-spring.redis.lettuce.pool.min-idle=0
-spring.redis.lettuce.pool.max-wait=100
-spring.redis.timeOut=3000
-# \u4EBA\u4FDD\u63A5\u53E3
-rb.domain=http://47.92.254.66:8088/rb
-rb.quote.url=http://47.92.254.66:8088/rb/bfjs
-rb.audit.url=http://47.92.254.66:8088/rb/jiaofei
-rb.car.search.url=http://47.92.254.66:8088/rb/carsearch
-rb.brand.search.url=http://47.92.254.66:8088/rb/brandsearch
-#\u4E2D\u7164\u63A5\u53E3
-zm.domain=http://172.24.144.213:8888/zm
-zm.quote.url=${zm.domain}/quotedPrice
-zm.audit.url=${zm.domain}/audit
-zm.getPolicyPrint.url=${zm.domain}/getPolicyPrint
-zm.image.url=${zm.domain}/yxsc
-zm.verifyPayment.url=${zm.domain}/verifyPayment
-zm.modelQuery.url=${zm.domain}/modelQuery
-zm.vinSearch.url=${zm.domain}/vinSearch
-zm.ascription.url=${zm.domain}/ascription
-zm.manualUnderwriting.url=${zm.domain}/manualUnderwriting
-#\u534E\u519Cvin\u7801\u67E5\u8BE2
-hn.vin.search.url=http://47.92.254.66:8088/hn/vinsearch
-#\u5E73\u5B89vin\u7801\u67E5\u8BE2
-pa.vin.search.url=http://47.92.254.66:8888/pingan/vinSearch
-# \u6052\u90A6\u63A5\u53E3
-hb.quote.url=http://47.92.254.66:8088/hb/hb_bfjs
-hb.audit.url=http://47.92.254.66:8088/hb/hb_hebao
-hb.image.url=http://47.92.254.66:8088/hb/hb_phoup
-hb.getPolicyPrint.url=http://47.92.254.66:8088/hb/hb_bdsearch\u3002
-# \u6C38\u8BDA\u63A5\u53E3
-yc.domain=http://47.92.254.66:8088
-yc.quote.url=/yc/bfjs
-yc.audit.url=/yc/jiaofei
-yc.image.url=/yc/yxsc
-yc.getPolicyPrint.url=/yc/bdxz
-
-# \u5B89\u76DB\u5929\u5E73\u722C\u866B\u63A5\u53E3
-as.domain=http://47.92.254.66:8088
-as.quote.url=/as/bfjs
-as.audit.url=/as/jiaofei
-as.image.url=/as/yxsc
-
-# ==========\u6C38\u57CEAPI\u65B9\u5F0F\u5BF9\u63A5 \u5F00\u59CB=======lig 2023-02-23=====================#
-yc.api.userName=tianqin
-yc.api.password=123456
-#yc.api.userName=yctest1
-#yc.api.password=yc@20230202!
-yc.api.url=http://140.206.189.151:17000/
-
-# \u673A\u6784\u4EE3\u7801(dptCde)
-yc.api.agent.dptCde=14A4
-# \u6E20\u9053\u7F16\u7801(agentCode)
-yc.api.agent.agentCode=250000P00004
-# \u534F\u8BAE\u7F16\u7801(conferCode)
-yc.api.agent.agentType=250000P0000401
-# \u6E20\u9053\u5206\u7C7B(agentType)
-yc.api.agent.agentNme=191010
-# \u4EE3\u7406\u4EBA\u540D\u79F0(agentNme)
-yc.api.agent.qlftNo=\u6C38\u946B\u4FDD\u9669\u9500\u552E\u670D\u52A1\u6709\u9650\u516C\u53F8\u5C71\u897F\u5206\u516C\u53F8
-# \u4EE3\u7406\u4EBA\u8D44\u683C\u8BC1\u53F7(qlftNo)
-yc.api.agent.operatorCode=2752454675645
-# \u5F55\u5165\u4EBA(operatorCode)
-yc.api.agent.salesmanNo=100050029
-# \u4E1A\u52A1\u5458\u4EE3\u7801(salesmanNo)
-yc.api.agent.cChaType=100050029
-# \u65B0\u4E1A\u52A1\u6765\u6E90(CChaType)
-yc.api.agent.custNature=191010
-# \u5BA2\u6237\u6027\u8D28(custNature)
-yc.api.agent.cOprcde=192099
-# \u64CD\u4F5C\u4EBA\u5458\u4EE3\u7801(cOprcde)
-yc.api.agent.cBsnsTyp=100050029
-
-# \u652F\u4ED8\u56DE\u8C03\u5730\u5740
-yc.api.pay.callBack=http://47.92.254.66:8080/api/yongCheng/callBack
-
-# ==========\u6C38\u57CEAPI\u65B9\u5F0F\u5BF9\u63A5 \u7ED3\u675F=============================#
-# \u5FAE\u4FE1\u53C2\u6570
-wechat.open.componentAppId=wx612ca90988c46947
-wechat.open.componentSecret=75b7d4cda453b2075dec23f849278bc0
-# mybatis-plus\u914D\u7F6E\u65E5\u5FD7
-mybatis-plus.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
-mybatis.configuration.map-underscore-to-camel-case=true
-#\u5FAE\u4FE1\u6CE8\u518C\u552F\u4E00\u4E0A\u7EA7\u4EBA\u5458
-pyramid.dept.id=99D05
-
-# \u5F00\u5173 ----------
-# \u65B9\u6CD5\u65E5\u5FD7\u5F00\u5173
-open.method.log=true
+#TAModelUrl=https://testow.95505.cn/cpf/tianan_cpf/access/car/queryCarModel.mvc
+#TAQuoteUrl=https://testow.95505.cn/cpf/tianan_cpf/access/car/premiumAccurate.mvc
+#TAInsureUrl=https://testow.95505.cn/cpf/tianan_cpf/access/car/insureConfirmation.mvc
+#TAPayUrl=https://testow.95505.cn/cpf/tianan_cpf/common/pay/applyPay.do
+#TAUploadUrl=https://testow.95505.cn/cpf/tianan_cpf/access/car/thirdUploadAttach.mvc
+##\u5929\u5B89API\u751F\u4EA7\u53C2\u6570
+##TASign=gIpr5j5haL7T8WJY7ZS54JdlYL/7PToQOy505Mr/iH3qN4SMpJJVdvxFE1/KsWH0EjDxR9qVwRC/t6kLCJo+Y1AB+FD1qNjkbLyEQ+9aeQEF2Af/4bJqUDArewHHT879o5IqzHg/lcg=
+##TAModelUrl=https://cpf.95505.cn/tianan_cpf/access/car/queryCarModel.mvc
+##TAQuoteUrl=https://cpf.95505.cn/tianan_cpf/access/car/premiumAccurate.mvc
+##TAInsureUrl=https://cpf.95505.cn/tianan_cpf/access/car/insureConfirmation.mvc
+##TAPayUrl=https://cpf.95505.cn/tianan_cpf/common/pay/applyPay.do
+##TAUploadUrl=https://cpf.95505.cn/tianan_cpf/access/car/thirdUploadAttach.mvc
+##\u6587\u4EF6\u4E0A\u4F20\u8DEF\u5F84\u6D4B\u8BD5
+#filePath=C:/soft/apache-tomcat-8.5.75/webapps/upload/
+#apk.path=/usr/local/apache-tomcat-8.5.73/webapps/app/android/
+#upload.file.path=D:/upload/
+##\u6587\u4EF6\u4E0A\u4F20\u8DEF\u5F84\u751F\u4EA7
+##filePath=/usr/local/apache-tomcat-7.0.93/webapps/upload/
+## \u8DEF\u5F84\u5E26\u4E0A\u524D\u540E\u659C\u6746
+#upload.basepath=${filePath}
+#upload.host=
+#upload.username=
+#upload.password=
+#upload.url=${netUrl}
+###\u6D4B\u8BD5\u5730\u5740
+#netUrl=http://47.92.254.66:8080/
+###\u751F\u4EA7\u5730\u5740
+##netUrl=http://39.101.143.165:8080/
+##\u7279\u6B8A\u8D26\u53F7
+##Specialaccount=
+#Specialaccount=99999999999999
+##mybatis xml\u6587\u4EF6\u626B\u63CF\u8DEF\u5F84
+#mybatis.mapper-locations=classpath:mapper/**/*.xml
+#mybatis.type-aliases-package=com.ydtech.modules.*.model
+##================ mybatis pagehelper ==============#
+#pagehelper.helper-dialect=mysql
+#pagehelper.reasonable=true
+#pagehelper.support-methods-arguments=true
+#pagehelper.params=count=countSql
+##================ \u4E2D\u4FDD\u4FE1\u63A5\u53E3\u5BF9\u63A5--\u5F00\u59CB==============#
+### \u63A5\u53E3\u5730\u5740
+#cbit.url_pre=http://88.88.1.51:5017
+#cbit.api2=/pjms/insurance/open/unify/order/getInitParams
+#cbit.api3=/pjms/insurance/open/unify/order/generateOrderNo
+#cbit.api4=/pjms/insurance/open/unify/vehicle/getTMBVerificationCode
+#cbit.api5=/pjms/insurance/open/unify/vehicle/queryVehicleModel
+#cbit.api6=/pjms/insurance/open/unify/vehicle/confirmVehicle
+#cbit.api7=/pjms/insurance/open/unify/order/quote
+#cbit.api8=/pjms/insurance/open/unify/order/postUnderwriting
+#cbit.api9=/pjms/insurance/open/unify/order/applyPay
+#cbit.api10=/pjms/insurance/open/unify/order/cancelUnderwriting
+#cbit.api11=/pjms/insurance/open/unify/order/getVerificationCode
+#cbit.api12=/pjms/insurance/open/unify/order/commitVerificationCode
+#cbit.api14=/pjms/insurance/open/unify/order/sendEleApplicationSign
+#cbit.api17=/pjms/insurance/open/unify/order/viewToPay
+### \u5176\u4ED6
+#### \u4E2D\u4ECB\u673A\u6784id
+#cbit.franchiserId=taiyuantianqin-001
+#cbit.franchiserChannelId_pingan=CBIT01240000
+#cbit.franchiserChannelCode_pingan=QIAOYRXX-00001
+#cbit.carDealerCode_pingan=224189117001
+#cbit.insurerBranchCode_pingan=140000
+#cbit.franchiserChannelId_taiping=CBIT01240000
+#cbit.groupCode_taiping=S132001
+#cbit.insurerBranchCode_taiping=140000
+#cbit.franchiserChannelId_taipingyang=CBIT01240000
+#cbit.insurerBranchCode_taipingyang=140000
+#### ip\u5730\u5740
+#cbit.ip=10.23.69.89
+#### \u4E2D\u4ECB\u5E73\u53F0-\u52A0\u89E3\u5BC6\u79D8\u94A5\u5BF9 \u79C1\u94A5+\u516C\u94A5
+##cbit.ZJPT_PRIVATE_KEY=MIICdQIBADANBgkqhkiG9w0BAQEFAASCAl8wggJbAgEAAoGBAMpskeUA+JfNr0Dsx+zZwu/KwprkaN0y0bVBC/ygAOQCBx26NGrRodWM0VehWbtvUN2WEQB2EpcntfJj/bOgRumhThjHMh+2WgdnS93+Ti+ACDlt4f3vaOlZmPo3cRH4SBHvf5SLSnSl1chGMMXijyZZIvDxbxn3d4gu0uDQNw4jAgMBAAECgYAyOnqBPppw4KLqE1cQmIBcjA157c9vg9qxhTB6QSG3ciFd6QR0tQvZN5YCjpD7h4WjVkdlu+alBz+Io/MiDVVK1qt+EsqWBKSx7fAi5UFmoVPHcmw7ZrnBmQLlduo9CUbyTQKGvVlEY+lHwRjuko40jSDRJQVHCbIDc/kxmipukQJBAOqf44+b+agA3RJBYLPqsaUShK8ykor2nZptUNFtMBiuGPuQ0sT3cfZMB9upc586ckFDZcqChqFLUAfpmgMIgYUCQQDc3ay6RJ9owqkkPTKeeppeZqDoD5Nk3nipuMyJwTL0GR0A1AfUXcA0F8BxEQob1k65Tcw7ol2j7DmRqjA8uw2HAkAr92RUT/07r1W+CwRNEsjRTyQQFKEDa21jN+LyK8zcgxtpYN0uTdRMPDkov5tMFk68zh1wEn+aEBviL7NNqDVlAkBlu6mzBqbSj09vhMzLGLgAIY+eNIZ04NB9hMSZ8yawLt0gI4oTtLcyh3o52lpophcO3ZnkIg610bpWsSiU4KgDAkA+vyBe7spxLR1S/k4FhPP9YZay6vmuzwzSNUKF5JquTLuI9iqZRf+n3Yfy6wgQzkP2WIeQDRe074p09MFGc+pp
+#cbit.ZJPT_PUBLIC_KEY=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDKbJHlAPiXza9A7Mfs2cLvysKa5GjdMtG1QQv8oADkAgcdujRq0aHVjNFXoVm7b1DdlhEAdhKXJ7XyY/2zoEbpoU4YxzIftloHZ0vd/k4vgAg5beH972jpWZj6N3ER+EgR73+Ui0p0pdXIRjDF4o8mWSLw8W8Z93eILtLg0DcOIwIDAQAB
+#### \u5408\u4F5C\u4F19\u4F34-\u52A0\u89E3\u5BC6\u79D8\u94A5\u5BF9  \u79C1\u94A5+\u516C\u94A5
+#cbit.HZHB_PRIVATE_KEY=MIICeAIBADANBgkqhkiG9w0BAQEFAASCAmIwggJeAgEAAoGBAJnWpyVLFBli1kakBXUjk/SmH+X1X0kGGik0ub1MXnNUOk9NBqRQjO6G9A6wdiGzo9j9w26u5u9R6R6De843YMhgW6iIoDodexvZzInxTE+YY52iUBDCcksHYAM7uHZBtdXKovm+bEzL0nwa89Xw6zyuCm8x7enoDiVzs/75WoqrAgMBAAECgYAnEcC5U+vy1oscvaM1MKfuxhHr0Pk2DnquZFmXncGPAKEeaq15JYvlOBjbci1OOdUu0qPDhF/Z/694tGPI53+If0MkS3VpxaOYc+i/G/KQiYZIu1hjUb2F8j8xQrF60WkIsqwzjJYF9T5MCjLEZvDg9cPzFY+QpS8yl5Cbl0aOYQJBAMd+0VtQYV9q3nsZgEk4ux6Vz19SakRbk9zkz1yBUKRfWcLa1T9DleaBqGdkdZbO8v6PCtyz6Fdymq+USYWeV3UCQQDFaU5O8GeNr07J6quTgHgsbN8IV28Wp4wKmDAXCWlehkGGoTm11FOL2zxItjgmmHGyXBA08osPCojBPptOazWfAkEAmG3K04WwUPLcOZy7i7cAKpd3ErNrJP4AFcjytBDOqDl+4UbJp4QhljW9kfqNaoSH4H81YntIbQDRNpUMND9PPQJBAKWfnBuOhtLQagHt6NVvy2M6VETjVkhjeZLJ7E7njofHi+IwEgMDiLSl0wYOGz4GWB2UL+S8OP79j47Rv+si93ECQQCNqD8nMcVXIHKze7aM9c8v1yfgEdk8IpVhAbiXbRs3ANTT4Jx2M6GNBEeEAorHqO4eOTxdObNuz/RADoRnpzHk
+#cbit.HZHB_PUBLIC_KEY=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCZ1qclSxQZYtZGpAV1I5P0ph/l9V9JBhopNLm9TF5zVDpPTQakUIzuhvQOsHYhs6PY/cNurubvUekeg3vON2DIYFuoiKA6HXsb2cyJ8UxPmGOdolAQwnJLB2ADO7h2QbXVyqL5vmxMy9J8GvPV8Os8rgpvMe3p6A4lc7P++VqKqwIDAQAB
+##================ \u4E2D\u4FDD\u4FE1\u63A5\u53E3\u5BF9\u63A5--\u7ED3\u675F==============#
+##================ \u963F\u91CC\u4E91\u90E8\u7F72\u5BF9\u63A5\u4FDD\u4FE1\u670D\u52A1\u5668--\u5F00\u59CB==============#
+#aly.cbit.url_pre=http://223.70.186.115:8080/CBIT/API/insCBIT
+#aly.pay.url_pre=http://test.baoxianzhanggui.com:8080
+#aly.pay.html_path=C:\\soft\\apache-tomcat-8.5.75\\webapps\\html\\
+##================ \u963F\u91CC\u4E91\u90E8\u7F72\u5BF9\u63A5\u4FDD\u4FE1\u670D\u52A1\u5668--\u7ED3\u675F==============#
+###================ \u4FDD\u4FE1\u56DE\u8C03\u963F\u91CC\u4E91\u63A5\u670D\u52A1\u5668--\u5F00\u59CB==============#
+#cbit.aly.url_pre=http://47.92.254.66:8080/API/insCBIT
+##================ \u963F\u91CC\u4E91\u90E8\u7F72\u5BF9\u63A5\u4FDD\u4FE1\u670D\u52A1\u5668--\u7ED3\u675F==============#
+#resp_json={"code":200,"msg":null,"data":{"busUniqueId":"P_YBX_TESTT0NukiEN02OGDABB","total":3518.79,"insureId":null,"businessPolicy":{"specialTermItems":null,"coverages":null,"applicationNo":"53201093900246326035"},"trafficPolicy":{"specialTermItems":null,"coverages":null,"applicationNo":"53201093900246326036"},"propertyPolicies":null,"casualtyPolicies":null}}
+##================ \u6C38\u5B89\u5BF9\u63A5\u5F00\u59CB ==============#
+#ya.url=https://tapi.yaic.com.cn/auto/issue
+#ya.url.sign=https://tapi.yaic.com.cn/auto/debug/generate-access-key
+#ya.consumerID=102120
+#ya.consumerAccessKey=123456test
+#ya.matchCode=10212014040001
+#ya.userCode=10061765
+#ya.comCode=0214040020000
+#ya.callbackUrl=http://test.baoxianzhanggui.com:8080/order/yongAn/updatePolicy
+##================ \u6C38\u5B89\u5BF9\u63A5\u7ED3\u675F ==============#
+#master.password.ciphertext=9d3b721959d63c10173d378e82aaecf2
+#master.password.salt=7cb112e917a8446f8616
+## redis \u914D\u7F6E
+#spring.redis.host=localhost
+#spring.redis.port=6379
+#spring.redis.password=
+#spring.redis.database=0
+#spring.redis.lettuce.pool.max-active=8
+#spring.redis.lettuce.pool.max-idle=8
+#spring.redis.lettuce.pool.min-idle=0
+#spring.redis.lettuce.pool.max-wait=100
+#spring.redis.timeOut=3000
+## \u4EBA\u4FDD\u63A5\u53E3
+#rb.domain=http://47.92.254.66:8088/rb
+#rb.quote.url=http://47.92.254.66:8088/rb/bfjs
+#rb.audit.url=http://47.92.254.66:8088/rb/jiaofei
+#rb.car.search.url=http://47.92.254.66:8088/rb/carsearch
+#rb.brand.search.url=http://47.92.254.66:8088/rb/brandsearch
+##\u4E2D\u7164\u63A5\u53E3
+#zm.domain=http://172.24.144.213:8888/zm
+#zm.quote.url=${zm.domain}/quotedPrice
+#zm.audit.url=${zm.domain}/audit
+#zm.getPolicyPrint.url=${zm.domain}/getPolicyPrint
+#zm.image.url=${zm.domain}/yxsc
+#zm.verifyPayment.url=${zm.domain}/verifyPayment
+#zm.modelQuery.url=${zm.domain}/modelQuery
+#zm.vinSearch.url=${zm.domain}/vinSearch
+#zm.ascription.url=${zm.domain}/ascription
+#zm.manualUnderwriting.url=${zm.domain}/manualUnderwriting
+##\u534E\u519Cvin\u7801\u67E5\u8BE2
+#hn.vin.search.url=http://47.92.254.66:8088/hn/vinsearch
+##\u5E73\u5B89vin\u7801\u67E5\u8BE2
+#pa.vin.search.url=http://47.92.254.66:8888/pingan/vinSearch
+## \u6052\u90A6\u63A5\u53E3
+#hb.quote.url=http://47.92.254.66:8088/hb/hb_bfjs
+#hb.audit.url=http://47.92.254.66:8088/hb/hb_hebao
+#hb.image.url=http://47.92.254.66:8088/hb/hb_phoup
+#hb.getPolicyPrint.url=http://47.92.254.66:8088/hb/hb_bdsearch\u3002
+## \u6C38\u8BDA\u63A5\u53E3
+#yc.domain=http://47.92.254.66:8088
+#yc.quote.url=/yc/bfjs
+#yc.audit.url=/yc/jiaofei
+#yc.image.url=/yc/yxsc
+#yc.getPolicyPrint.url=/yc/bdxz
+#
+## \u5B89\u76DB\u5929\u5E73\u722C\u866B\u63A5\u53E3
+#as.domain=http://47.92.254.66:8088
+#as.quote.url=/as/bfjs
+#as.audit.url=/as/jiaofei
+#as.image.url=/as/yxsc
+#
+## ==========\u6C38\u57CEAPI\u65B9\u5F0F\u5BF9\u63A5 \u5F00\u59CB=======lig 2023-02-23=====================#
+#yc.api.userName=tianqin
+#yc.api.password=123456
+##yc.api.userName=yctest1
+##yc.api.password=yc@20230202!
+#yc.api.url=http://140.206.189.151:17000/
+#
+## \u673A\u6784\u4EE3\u7801(dptCde)
+#yc.api.agent.dptCde=14A4
+## \u6E20\u9053\u7F16\u7801(agentCode)
+#yc.api.agent.agentCode=250000P00004
+## \u534F\u8BAE\u7F16\u7801(conferCode)
+#yc.api.agent.agentType=250000P0000401
+## \u6E20\u9053\u5206\u7C7B(agentType)
+#yc.api.agent.agentNme=191010
+## \u4EE3\u7406\u4EBA\u540D\u79F0(agentNme)
+#yc.api.agent.qlftNo=\u6C38\u946B\u4FDD\u9669\u9500\u552E\u670D\u52A1\u6709\u9650\u516C\u53F8\u5C71\u897F\u5206\u516C\u53F8
+## \u4EE3\u7406\u4EBA\u8D44\u683C\u8BC1\u53F7(qlftNo)
+#yc.api.agent.operatorCode=2752454675645
+## \u5F55\u5165\u4EBA(operatorCode)
+#yc.api.agent.salesmanNo=100030057
+## \u4E1A\u52A1\u5458\u4EE3\u7801(salesmanNo)
+#yc.api.agent.cChaType=100030057
+## \u65B0\u4E1A\u52A1\u6765\u6E90(CChaType)
+#yc.api.agent.custNature=191010
+## \u5BA2\u6237\u6027\u8D28(custNature)
+#yc.api.agent.cOprcde=192099
+## \u64CD\u4F5C\u4EBA\u5458\u4EE3\u7801(cOprcde)
+#yc.api.agent.cBsnsTyp=100030057
+#
+## \u652F\u4ED8\u56DE\u8C03\u5730\u5740
+#yc.api.pay.callBack=http://47.92.254.66:8080/api/yongCheng/callBack
+#
+## ==========\u6C38\u57CEAPI\u65B9\u5F0F\u5BF9\u63A5 \u7ED3\u675F=============================#
+## \u5FAE\u4FE1\u53C2\u6570
+#wechat.open.componentAppId=wx612ca90988c46947
+#wechat.open.componentSecret=75b7d4cda453b2075dec23f849278bc0
+## mybatis-plus\u914D\u7F6E\u65E5\u5FD7
+#mybatis-plus.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
+#mybatis.configuration.map-underscore-to-camel-case=true
+##\u5FAE\u4FE1\u6CE8\u518C\u552F\u4E00\u4E0A\u7EA7\u4EBA\u5458
+#pyramid.dept.id=99D05
+#
+## \u5F00\u5173 ----------
+## \u65B9\u6CD5\u65E5\u5FD7\u5F00\u5173
+#open.method.log=true
+#
+#
+##
+### \u8BBE\u7F6E\u6240\u6709\u76EE\u5F55\u7684\u65E5\u5FD7\u7EA7\u522B
+##logging.level.root=debug
+##logging.level.root=debug
+#
+##logging.level.com.ydtech=trace
+##logging.config=classpath:logback.xml
+##
+### \u8BBE\u7F6E\u65E5\u5FD7\u6587\u4EF6\u7684\u76EE\u5F55\uFF0C\u7CFB\u7EDF\u81EA\u52A8\u547D\u540D spring.log
+##logging.file.path=E:/123/
+##
+### \u8BBE\u7F6E\u65E5\u5FD7\u6587\u4EF6\u7684\u6587\u4EF6\u540D
+##logging.file.name=E:/123/Springlogging.log
+#
+### \u8BBE\u7F6Ecom.example.demo.Controller\u76EE\u5F55\u7684\u65E5\u5FD7\u7EA7\u522B
+##logging.level.root.com.example.demo.Controller: trace
+### \u8BBE\u7F6Ecom.example.demo.DemoApplication\u7684\u65E5\u5FD7\u7EA7\u522B
+##logging.level.root.com.example.demo.Controller.DemoApplication: info
+#

src/main/resources/application.properties

@@ -1 +1 @@
-spring.profiles.active=test
+#spring.profiles.active=test

src/main/resources/log4j.properties

@@ -10,11 +10,13 @@ log4j.appender.console.layout.ConversionPattern=[%p][%d{yyyy-MM-dd HH\:mm\:ss\:S
 # File (day a file)
 log4j.appender.logfile=org.apache.log4j.DailyRollingFileAppender
 log4j.appender.logfile.Threshold=debug
-log4j.appender.logfile.File=./logs/log.log
+log4j.appender.logfile.File=logs/log.log
 log4j.appender.logfile.DatePattern = '.'yyyy-MM-dd
 log4j.appender.logfile.layout=org.apache.log4j.PatternLayout
 #[%p][%d{yyyy-MM-dd HH\:mm\:ss\:SSS}][%F] %m%n
 log4j.appender.logfile.layout.ConversionPattern=[%p][%d{yyyy-MM-dd HH\:mm\:ss\:SSS}][%c] %m%n
+#\u8BBE\u7F6E\u8F93\u51FA\u65E5\u5FD7\u6587\u4EF6\u7F16\u7801\uFF08\u53EF\u4EE5\u63A7\u5236\u4E71\u7801\u60C5\u51B5\uFF09
+log4j.appender.logfile.encoding=UTF-8
 
 log4j.logger.org.apache.axis.ConfigurationException=INFO
 log4j.logger.com.mchange.v2=ERROR
@@ -52,7 +54,9 @@ log4j.appender.D.Append=true
 #\u65E5\u5FD7\u8F93\u51FA\u7B49\u7EA7\u5206\u79BB\uFF1A\u53EA\u8F93\u51FA\u8BE5\u7B49\u7EA7\u4EE5\u4E0A\u7684\u65E5\u5FD7
 log4j.appender.D.Threshold=DEBUG
 #\u65E5\u5FD7\u6587\u4EF6\u4FDD\u5B58\u8DEF\u5F84
-log4j.appender.D.File=./logs/debug.log
+#log4j.appender.D.File=logs/debug.log
+log4j.appender.D.File=logs/debug.log
+#log4j.appender.D.File=${LogFile.Location}/debug.log
 #log4j.appender.D.File=${catalina.home}/logs/debug.log
 #\u53EF\u4EE5\u81EA\u5B9A\u4E49\u751F\u6210\u65E5\u5FD7\u7684\u95F4\u9694\uFF0C\u65F6\u95F4\u683C\u5F0F\u7CBE\u786E\u5230mm\u5373\u662F\u6BCF\u5206\u949F\u751F\u6210\u4E00\u4E2A\u6587\u4EF6\uFF0C\u6587\u4EF6\u540D\u4E3Adebug_'yyyy-MM-dd-HH-mm'.log
 #log4j.appender.dufLog.DatePattern = '_'yyyy-MM-dd-HH-mm'.log'
@@ -63,7 +67,7 @@ log4j.appender.D.layout.ConversionPattern=[\u65F6\u95F4\:%d{yyyy-MM-dd hh\:mm\:s
 log4j.appender.E=org.apache.log4j.RollingFileAppender
 log4j.appender.E.Append=true
 log4j.appender.E.Threshold=ERROR
-log4j.appender.E.File=./logs/error.log
+log4j.appender.E.File=logs/error.log
 log4j.appender.E.layout=org.apache.log4j.PatternLayout
 log4j.appender.E.layout.ConversionPattern=[\u65F6\u95F4\:%d{yyyy-MM-dd hh\:mm\:ss}] [\u7EA7\u522B\:%p] [\u7C7B\:%c]  [\u6D88\u606F\:%m] %n
 #\u6307\u5B9A\u65E5\u5FD7\u6587\u4EF6\u5927\u5C0F\uFF1A\u5355\u4F4D\u53EF\u4EE5\u662FKB\u3001MB\u3001GB\uFF0C\u5728\u65E5\u5FD7\u6587\u4EF6\u5230\u8FBE\u8BE5\u5927\u5C0F\u65F6\uFF0C\u5C06\u4F1A\u81EA\u52A8\u6EDA\u52A8\uFF0C\u5373\u5C06\u539F\u6765\u7684\u5185\u5BB9\u79FB\u5230error.log.1\u6587\u4EF6
@@ -76,7 +80,7 @@ log4j.appender.E.MaxBackupIndex=3
 log4j.logger.yongcheng=ALL,yongcheng
 log4j.appender.yongcheng=org.apache.log4j.RollingFileAppender
 log4j.appender.yongcheng.Append=true
-log4j.appender.yongcheng.File=./logs/yongcheng.log
+log4j.appender.yongcheng.File=logs/yongcheng.log
 log4j.appender.yongcheng.layout=org.apache.log4j.PatternLayout
 log4j.appender.yongcheng.layout.ConversionPattern=[\u65F6\u95F4\:%d{yyyy-MM-dd hh\:mm\:ss}] [\u7EA7\u522B\:%p] [\u7C7B\:%c]  [\u6D88\u606F\:%m] %n
 #\u6307\u5B9A\u65E5\u5FD7\u6587\u4EF6\u5927\u5C0F\uFF1A\u5355\u4F4D\u53EF\u4EE5\u662FKB\u3001MB\u3001GB\uFF0C\u5728\u65E5\u5FD7\u6587\u4EF6\u5230\u8FBE\u8BE5\u5927\u5C0F\u65F6\uFF0C\u5C06\u4F1A\u81EA\u52A8\u6EDA\u52A8\uFF0C\u5373\u5C06\u539F\u6765\u7684\u5185\u5BB9\u79FB\u5230error.log.1\u6587\u4EF6