1.修改机构代码

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

@@ -7,32 +7,48 @@ import com.ydtech.modules.admin.model.SysUser;
 import com.ydtech.modules.admin.service.SysDeptService;
 import com.ydtech.modules.base.controller.BaseController;
 import com.ydtech.utils.StringUtils;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
+
+@Api(tags = "机构管理", value = "机构管理")
 @RestController
-@RequestMapping("dept")
+@RequestMapping("/dept")
+@RequiredArgsConstructor
 public class SysDeptController extends BaseController {
     Logger logger = LoggerFactory.getLogger(getClass());
 
-    @Autowired
-    private SysDeptService sysDeptService;
-
+    private final SysDeptService sysDeptService;
 
     //    @PreAuthorize("hasAuthority('sys:dept:add')")
     @PostMapping(value = "/add")
-    public HttpResult add(@RequestBody SysDept record) {
-        if (StringUtils.isEmpty(record.getId())) {
-            if (StringUtils.isEmpty(record.getProvince()) || record.getProvince().equals("省"))
-                return HttpResult.error("省份为必填项");
-        }
-        return HttpResult.ok(sysDeptService.save(record));
-//        return HttpResult.ok(sysDeptService.add(record));
+    @ApiOperation("增加机构")
+    public HttpResult<Boolean> add(@RequestBody SysDept sysDept) {
+        sysDeptService.addDept(sysDept);
+        return HttpResult.ok();
+    }
+
+    @DeleteMapping(value = "/{deptId}")
+    @ApiOperation("删除机构")
+    public HttpResult<Object> deleteDept(@PathVariable String deptId) {
+        sysDeptService.deleteDept(deptId);
+        return HttpResult.ok();
+    }
+
+
+    //@PreAuthorize("hasAuthority('sys:dept:view')")
+    @ApiOperation(value = "获取树结构")
+    @GetMapping(value = "/findTree")
+    public HttpResult<List<SysDept>> findTree() {
+        SysUser user = getUser();
+        String deptId = user.getDeptId();
+        return HttpResult.ok(sysDeptService.findTree(deptId));
     }
 
     //    @PreAuthorize("hasAuthority('sys:dept:edit')")
@@ -48,42 +64,21 @@ public class SysDeptController extends BaseController {
         return HttpResult.ok(sysDeptService.removeByIds(records));
     }
 
-    //@PreAuthorize("hasAuthority('sys:dept:view')")
-    @ApiOperation(value = "获取树结构")
-    @GetMapping(value = "/findTree")
-    public HttpResult findTree(SysDept sysDept) {
-        SysUser user = getUser();
-        if (!user.getId().equals("admin")) {
-            SysDept sd = sysDeptService.getById(user.getDeptId());
-            sysDept.setId(user.getDeptId());
-//            if (sd.getDeptType().equals("D")) {
-//                sysDept.setId(user.getDeptId());
-//            }else{
-//                sysDept.setId(sd.getParentId());
-//            }
-        }
-
-        return HttpResult.ok(sysDeptService.findTree(sysDept));
-    }
-
     @GetMapping(value = "/findLeftDeptTree")
     public HttpResult findLeftDeptTree(String deptCode) {
-
         if (deptCode.contains("D")) {
             deptCode = deptCode.substring(0, deptCode.indexOf("D"));
         }
         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;
@@ -92,8 +87,7 @@ public class SysDeptController extends BaseController {
         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;
@@ -102,12 +96,10 @@ public class SysDeptController extends BaseController {
         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.getById(id);
-//        SysDept sysDept = sysDeptService.selectByPk(id);
         logger.info(sysDept.toString());
         return HttpResult.ok(sysDept);
     }

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

@@ -2,46 +2,55 @@ package com.ydtech.modules.admin.service;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.ydtech.modules.admin.model.SysDept;
-import com.ydtech.modules.admin.model.vo.TreeSysDeptVO;
 import com.ydtech.core.page.PageRequest;
 import com.ydtech.core.page.PageResult;
+import com.ydtech.modules.admin.model.SysDept;
+import com.ydtech.modules.admin.model.vo.TreeSysDeptVO;
 
 import java.util.List;
 
 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);
+    /**
+     * 查找自已有权限的部门树
+     *
+     * @param deptCode
+     * @return
+     */
+    List<TreeSysDeptVO> selectListTreeSysDeptVO(String deptCode);
 
     //
-//    public int add(SysDept record);
-//
-//    public int edit(SysDept record);
-//
-    public String findMaxDeptId(String deptId);
+    PageResult findSubDepts(PageRequest pageRequest);
 
-    //
-    public String findMaxHouseId(String deptId);
+    String findMaxDeptId(String deptId);
 
     //
-//    public SysDept selectByPk(String id);
-//
+    String findMaxHouseId(String deptId);
+
     List<TreeSysDeptVO> selectListWhere(String where, Object[] paramValues);
 
+    /**
+     * 获取树结构
+     *
+     * @param deptId 部门id
+     * @return 返回部门列表
+     */
+    List<SysDept> findTree(String deptId);
+
+    /**
+     * 增加机构
+     * @param sysDept 机构信息
+     */
+    void addDept(SysDept sysDept);
+
+
+    /**
+     * 删除机构
+     *
+     * @param deptId 机构id
+     */
+    void deleteDept(String deptId);
 
-    List<SysDept> findTree(SysDept sysDept);
 }
 
 

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

@@ -5,148 +5,87 @@ 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.modules.admin.dao.SysDeptMapper;
-import com.ydtech.modules.admin.model.vo.TreeSysDeptVO;
 import com.ydtech.core.page.PageRequest;
 import com.ydtech.core.page.PageResult;
+import com.ydtech.exception.SystemException;
+import com.ydtech.modules.admin.dao.SysDeptMapper;
 import com.ydtech.modules.admin.model.SysDept;
+import com.ydtech.modules.admin.model.vo.TreeSysDeptVO;
 import com.ydtech.modules.admin.service.SysDeptService;
+import com.ydtech.modules.protocol.utils.AssertionUtils;
 import com.ydtech.utils.StringUtils;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.stream.Collectors;
 
 
 @Service
 public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept>
         implements SysDeptService {
-    @Override
-    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(sysDept.getParentId()), SysDept::getParentId, sysDept.getParentId());
-//            lqw.like(StringUtils.isNotEmpty(sysDept.getParentId()), SysDept::getParentId, sysDept.getParentId());
-            lqw.like(StringUtils.isNotEmpty(sysDept.getId()), SysDept::getId, sysDept.getId());
-        }
-//        lqw.like(SysDept::getId,"99140109M13D01");
-
-        List<SysDept> list = new ArrayList<>();
-        List<SysDept> allList = list(lqw);
-
 
-        list.addAll(allList.stream().filter(s -> s.getParentId().equalsIgnoreCase("0")).collect(Collectors.toList()));
+    @Override
+    public List<SysDept> findTree(String deptId) {
+        SysDept sysDept = getById(deptId);
 
-//        allList.stream().forEach(r -> {
-//            if (StringUtils.isNullOrEmpty(r.getParentId()) || r.getParentId().equalsIgnoreCase("0")) {
-//                if (!exists(list, r)) {
-//                    list.add(r);
-//                }
-//            }
-//
-//        });
+        LambdaQueryWrapper<SysDept> lqw = new LambdaQueryWrapper<>();
+        lqw.eq(SysDept::getDelFlag, 0);
+        lqw.likeRight(SysDept::getId, deptId);
+        List<SysDept> sysDeptList = list(lqw);
+        Map<String, List<SysDept>> map = sysDeptList.stream().collect(Collectors.groupingBy(SysDept::getParentId));
+        sysDeptList.forEach(i -> i.setChildren(map.getOrDefault(i.getId(), new ArrayList<>())));
+        return map.get(sysDept.getParentId());
+    }
 
+    @Override
+    public void addDept(SysDept sysDept) {
+        SysDept dept = getById(sysDept.getId());
+        AssertionUtils.isEmpty(dept, "机构编号为:" + dept.getId() + " " + dept.getName() + "已被占用");
+        boolean b = save(sysDept);
+        AssertionUtils.isSucceed(b, "删除失败");
+    }
 
-        //指定部门
-        if (list.size() < 1) {
-            list.addAll(allList.stream().filter(s -> s.getId().equalsIgnoreCase(sysDept.getId())).collect(Collectors.toList()));
-//            allList.stream().forEach(r -> {
-//                list.add(r);
-//            });
+    @Override
+    public void deleteDept(String deptId) {
+        SysDept sysDept = getById(deptId);
+        List<SysDept> list = lambdaQuery().eq(SysDept::getParentId, sysDept.getId()).list();
+        if (list.isEmpty()) {
+            boolean b = removeById(deptId);
+            AssertionUtils.isSucceed(b, "删除失败");
+        } else {
+            throw new SystemException(sysDept.getName() + "下还有其他隶属机构");
         }
-
-
-        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);
-//    }
-//
+
     @Override
     public PageResult findSubDepts(PageRequest pageRequest) {
-
-
         String id = pageRequest.getColumnFilterValue(pageRequest, "id");
 
-        Page p = PageRequest.buildPageRequest(pageRequest);
-        LambdaQueryWrapper<SysDept> lqw = new LambdaQueryWrapper();
+        Page<SysDept> 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 = "";
+        if (id == null) {
+            id = "";
+        }
         LambdaQueryWrapper<SysDept> lqw = new LambdaQueryWrapper<>();
+
         lqw.like(StringUtils.isNotEmpty(id), SysDept::getId, id);
         List<SysDept> deptList = list(lqw);
-        List<TreeSysDeptVO> recordList = new ArrayList<TreeSysDeptVO>();
+        List<TreeSysDeptVO> recordList = new ArrayList<>();
 
-        deptList.stream().forEach(a -> {
+        deptList.forEach(a -> {
             TreeSysDeptVO model = new TreeSysDeptVO();
             model.setId(a.getId());
             model.setName(a.getName());
@@ -161,55 +100,11 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept>
 
         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";
-
-
         QueryWrapper<SysDept> qw = new QueryWrapper<>();
         qw.like(StringUtils.isNotEmpty(deptId), "id", deptId + "D%");
 
@@ -225,13 +120,12 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept>
 
     public String findMaxHouseId(String deptId) {
 
-        if (deptId == null) return "";
+        if (deptId == null) {
+            return "";
+        }
         String result = "00";
-
-
         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();
@@ -241,34 +135,21 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept>
 
         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;
+        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>();
 
-        sysDeptList.stream().forEach(a -> {
+        sysDeptList.forEach(a -> {
             TreeSysDeptVO model = new TreeSysDeptVO();
             model.setId(a.getId());
             model.setName(a.getName());
@@ -284,35 +165,6 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept>
         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/ins/controller/RedisTest.java

@@ -1,75 +0,0 @@
-package com.ydtech.modules.ins.controller;
-
-import redis.clients.jedis.Jedis;
-
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.*;
-
-/**
- * @author qinfenglong
- * @version 1.0.0
- * @description RedisTest
- * @since 2020/11/16 10:45
- */
-public class RedisTest {
-    private static Jedis jedis = new Jedis("localhost");
-
-    /**
-     * public static void main(String[] args){
-     * //        /连接本地的 Redis 服务
-     * Jedis jedis = new Jedis("localhost");
-     * // 如果 Redis 服务设置来密码，需要下面这行，没有就不需要
-     * // jedis.auth("123456");
-     * System.out.println("连接成功");
-     * <p>
-     * //设置 redis 字符串数据
-     * jedis.set("runoobkey", "www.runoob.com");
-     * // 获取存储的数据并输出
-     * System.out.println("redis 存储的字符串为: "+ jedis.get("runoobkey"));
-     * <p>
-     * //存储数据到列表中
-     * jedis.lpush("site-list", "Runoob");
-     * jedis.lpush("site-list", "Google");
-     * jedis.lpush("site-list", "Taobao");
-     * // 获取存储的数据并输出
-     * List<String> list = jedis.lrange("site-list", 0 ,2);
-     * for(int i=0; i<list.size(); i++) {
-     * System.out.println("列表项为: "+list.get(i));
-     * }
-     * <p>
-     * //keys 实例
-     * // 获取数据并输出
-     * Set<String> keys = jedis.keys("*");
-     * Iterator<String> it=keys.iterator() ;
-     * while(it.hasNext()){
-     * String key = it.next();
-     * System.out.println(key);
-     * }
-     **/
-
-    public static void main(String[] args) throws Exception {
-        String oldDateStr = "2021-01-01T16:00:00.000Z";
-
-        //2021-01-09T00:00:00+08:00
-
-//        DateFormat df = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss");
-//        Date date = df.parse(oldDateStr);
-//        SimpleDateFormat df1 = new SimpleDateFormat ("EEE MMM dd HH:mm:ss Z yyyy", Locale.UK);
-//        Date date1 =  df1.parse(date.toString());
-//        DateFormat df2 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-//        System.out.println(df2.format(date1));
-
-        String dateStr = "2021-01-01";
-        DateFormat df = new SimpleDateFormat("yyyy-MM-dd");
-        Date date = df.parse(dateStr);
-        Calendar calendar = Calendar.getInstance(); //创建Calendar 的实例
-        calendar.setTime(date);
-        calendar.add(Calendar.DAY_OF_MONTH, -1); //当前时间减去一天，即一天前的时间
-        date = calendar.getTime();
-        System.out.println(df.format(date));
-
-    }
-
-
-}

src/main/resources/application-prod.yml

@@ -19,18 +19,12 @@ aly:
     url_pre: http://baoxianzhanggui.com:8080
 apk:
   path: /usr/local/apache-tomcat-8.5.73/webapps/app/android/
-as:
-  audit:
-    url: /as/jiaofei
-  domain: http://47.92.254.66:8088
-  image:
-    url: /as/yxsc
-  quote:
-    url: /as/bfjs
+
+
 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
   HZHB_PUBLIC_KEY: MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCZ1qclSxQZYtZGpAV1I5P0ph/l9V9JBhopNLm9TF5zVDpPTQakUIzuhvQOsHYhs6PY/cNurubvUekeg3vON2DIYFuoiKA6HXsb2cyJ8UxPmGOdolAQwnJLB2ADO7h2QbXVyqL5vmxMy9J8GvPV8Os8rgpvMe3p6A4lc7P++VqKqwIDAQAB
-  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
+  ZJPT_PRIVATE_KEY: MIICdQIBADANBgkqhkiG9w0BAQEFAASCAl8wggJbAgEAAoGBAMpskeUA+JfNr0Dsrenbaox+zZwu/KwprkaN0y0bVBC/ygAOQCBx26NGrRodWM0VehWbtvUN2WEQB2EpcntfJj/bOgRumhThjHMh+2WgdnS93+Ti+ACDlt4f3vaOlZmPo3cRH4SBHvf5SLSnSl1chGMMXijyZZIvDxbxn3d4gu0uDQNw4jAgMBAAECgYAyOnqBPppw4KLqE1cQmIBcjA157c9vg9qxhTB6QSG3ciFd6QR0tQvZN5YCjpD7h4WjVkdlu+alBz+Io/MiDVVK1qt+EsqWBKSx7fAi5UFmoVPHcmw7ZrnBmQLlduo9CUbyTQKGvVlEY+lHwRjuko40jSDRJQVHCbIDc/kxmipukQJBAOqf44+b+agA3RJBYLPqsaUShK8ykor2nZptUNFtMBiuGPuQ0sT3cfZMB9upc586ckFDZcqChqFLUAfpmgMIgYUCQQDc3ay6RJ9owqkkPTKeeppeZqDoD5Nk3nipuMyJwTL0GR0A1AfUXcA0F8BxEQob1k65Tcw7ol2j7DmRqjA8uw2HAkAr92RUT/07r1W+CwRNEsjRTyQQFKEDa21jN+LyK8zcgxtpYN0uTdRMPDkov5tMFk68zh1wEn+aEBviL7NNqDVlAkBlu6mzBqbSj09vhMzLGLgAIY+eNIZ04NB9hMSZ8yawLt0gI4oTtLcyh3o52lpophcO3ZnkIg610bpWsSiU4KgDAkA+vyBe7spxLR1S/k4FhPP9YZay6vmuzwzSNUKF5JquTLuI9iqZRf+n3Yfy6wgQzkP2WIeQDRe074p09MFGc+pp
   ZJPT_PUBLIC_KEY: MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDKbJHlAPiXza9A7Mfs2cLvysKa5GjdMtG1QQv8oADkAgcdujRq0aHVjNFXoVm7b1DdlhEAdhKXJ7XyY/2zoEbpoU4YxzIftloHZ0vd/k4vgAg5beH972jpWZj6N3ER+EgR73+Ui0p0pdXIRjDF4o8mWSLw8W8Z93eILtLg0DcOIwIDAQAB
   aly:
     url_pre: http://39.101.143.165:8080/API/insCBIT

src/main/resources/application-test.yml

@@ -22,16 +22,6 @@ aly:
     url_pre: http://test.baoxianzhanggui.com:8080
 apk:
   path: /usr/local/apache-tomcat-8.5.73/webapps/app/android/
-# 安盛天平
-as:
-  audit:
-    url: /as/jiaofei
-    # 安盛天平爬虫接口
-  domain: http://47.92.254.66:8088
-  image:
-    url: /as/yxsc
-  quote:
-    url: /as/bfjs
 
 
 #================ 中保信接口对接--开始==============#