优化代码

java110-bean/src/main/java/com/java110/dto/importFee/ImportFeeDto.java

@@ -1,6 +1,7 @@
 package com.java110.dto.importFee;
 
 import com.java110.dto.PageDto;
+
 import java.io.Serializable;
 import java.util.Date;
 
@@ -15,8 +16,9 @@ import java.util.Date;
 public class ImportFeeDto extends PageDto implements Serializable {
 
     private String feeTypeCd;
-private String importFeeId;
-private String communityId;
+    private String feeTypeCdName;
+    private String importFeeId;
+    private String communityId;
 
 
     private Date createTime;
@@ -27,19 +29,24 @@ private String communityId;
     public String getFeeTypeCd() {
         return feeTypeCd;
     }
-public void setFeeTypeCd(String feeTypeCd) {
+
+    public void setFeeTypeCd(String feeTypeCd) {
         this.feeTypeCd = feeTypeCd;
     }
-public String getImportFeeId() {
+
+    public String getImportFeeId() {
         return importFeeId;
     }
-public void setImportFeeId(String importFeeId) {
+
+    public void setImportFeeId(String importFeeId) {
         this.importFeeId = importFeeId;
     }
-public String getCommunityId() {
+
+    public String getCommunityId() {
         return communityId;
     }
-public void setCommunityId(String communityId) {
+
+    public void setCommunityId(String communityId) {
         this.communityId = communityId;
     }
 
@@ -59,4 +66,12 @@ public void setCommunityId(String communityId) {
     public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
+
+    public String getFeeTypeCdName() {
+        return feeTypeCdName;
+    }
+
+    public void setFeeTypeCdName(String feeTypeCdName) {
+        this.feeTypeCdName = feeTypeCdName;
+    }
 }

java110-bean/src/main/java/com/java110/dto/importFeeDetail/ImportFeeDetailDto.java

@@ -1,6 +1,7 @@
 package com.java110.dto.importFeeDetail;
 
 import com.java110.dto.PageDto;
+
 import java.io.Serializable;
 import java.util.Date;
 
@@ -15,17 +16,18 @@ import java.util.Date;
 public class ImportFeeDetailDto extends PageDto implements Serializable {
 
     private String amount;
-private String unitNum;
-private String feeId;
-private String floorNum;
-private String roomId;
-private String roomNum;
-private String ifdId;
-private String feeName;
-private String startTime;
-private String endTime;
-private String state;
-private String communityId;
+    private String unitNum;
+    private String feeId;
+    private String floorNum;
+    private String roomId;
+    private String roomNum;
+    private String ifdId;
+    private String feeName;
+    private String startTime;
+    private String endTime;
+    private String state;
+    private String communityId;
+    private String importFeeId;
 
 
     private Date createTime;
@@ -36,73 +38,96 @@ private String communityId;
     public String getAmount() {
         return amount;
     }
-public void setAmount(String amount) {
+
+    public void setAmount(String amount) {
         this.amount = amount;
     }
-public String getUnitNum() {
+
+    public String getUnitNum() {
         return unitNum;
     }
-public void setUnitNum(String unitNum) {
+
+    public void setUnitNum(String unitNum) {
         this.unitNum = unitNum;
     }
-public String getFeeId() {
+
+    public String getFeeId() {
         return feeId;
     }
-public void setFeeId(String feeId) {
+
+    public void setFeeId(String feeId) {
         this.feeId = feeId;
     }
-public String getFloorNum() {
+
+    public String getFloorNum() {
         return floorNum;
     }
-public void setFloorNum(String floorNum) {
+
+    public void setFloorNum(String floorNum) {
         this.floorNum = floorNum;
     }
-public String getRoomId() {
+
+    public String getRoomId() {
         return roomId;
     }
-public void setRoomId(String roomId) {
+
+    public void setRoomId(String roomId) {
         this.roomId = roomId;
     }
-public String getRoomNum() {
+
+    public String getRoomNum() {
         return roomNum;
     }
-public void setRoomNum(String roomNum) {
+
+    public void setRoomNum(String roomNum) {
         this.roomNum = roomNum;
     }
-public String getIfdId() {
+
+    public String getIfdId() {
         return ifdId;
     }
-public void setIfdId(String ifdId) {
+
+    public void setIfdId(String ifdId) {
         this.ifdId = ifdId;
     }
-public String getFeeName() {
+
+    public String getFeeName() {
         return feeName;
     }
-public void setFeeName(String feeName) {
+
+    public void setFeeName(String feeName) {
         this.feeName = feeName;
     }
-public String getStartTime() {
+
+    public String getStartTime() {
         return startTime;
     }
-public void setStartTime(String startTime) {
+
+    public void setStartTime(String startTime) {
         this.startTime = startTime;
     }
-public String getEndTime() {
+
+    public String getEndTime() {
         return endTime;
     }
-public void setEndTime(String endTime) {
+
+    public void setEndTime(String endTime) {
         this.endTime = endTime;
     }
-public String getState() {
+
+    public String getState() {
         return state;
     }
-public void setState(String state) {
+
+    public void setState(String state) {
         this.state = state;
     }
-public String getCommunityId() {
+
+    public String getCommunityId() {
         return communityId;
     }
-public void setCommunityId(String communityId) {
+
+    public void setCommunityId(String communityId) {
         this.communityId = communityId;
     }
 
@@ -122,4 +147,12 @@ public void setCommunityId(String communityId) {
     public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
+
+    public String getImportFeeId() {
+        return importFeeId;
+    }
+
+    public void setImportFeeId(String importFeeId) {
+        this.importFeeId = importFeeId;
+    }
 }

java110-bean/src/main/java/com/java110/po/importFeeDetail/ImportFeeDetailPo.java

@@ -1,102 +1,134 @@
 package com.java110.po.importFeeDetail;
 
 import java.io.Serializable;
-import java.util.Date;
 
 public class ImportFeeDetailPo implements Serializable {
 
     private String amount;
-private String unitNum;
-private String statusCd = "0";
-private String feeId;
-private String floorNum;
-private String roomId;
-private String roomNum;
-private String ifdId;
-private String feeName;
-private String startTime;
-private String endTime;
-private String state;
-private String communityId;
-public String getAmount() {
+    private String unitNum;
+    private String statusCd = "0";
+    private String feeId;
+    private String floorNum;
+    private String roomId;
+    private String roomNum;
+    private String ifdId;
+    private String feeName;
+    private String startTime;
+    private String endTime;
+    private String state;
+    private String communityId;
+
+    private String importFeeId;
+
+    public String getAmount() {
         return amount;
     }
-public void setAmount(String amount) {
+
+    public void setAmount(String amount) {
         this.amount = amount;
     }
-public String getUnitNum() {
+
+    public String getUnitNum() {
         return unitNum;
     }
-public void setUnitNum(String unitNum) {
+
+    public void setUnitNum(String unitNum) {
         this.unitNum = unitNum;
     }
-public String getStatusCd() {
+
+    public String getStatusCd() {
         return statusCd;
     }
-public void setStatusCd(String statusCd) {
+
+    public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
-public String getFeeId() {
+
+    public String getFeeId() {
         return feeId;
     }
-public void setFeeId(String feeId) {
+
+    public void setFeeId(String feeId) {
         this.feeId = feeId;
     }
-public String getFloorNum() {
+
+    public String getFloorNum() {
         return floorNum;
     }
-public void setFloorNum(String floorNum) {
+
+    public void setFloorNum(String floorNum) {
         this.floorNum = floorNum;
     }
-public String getRoomId() {
+
+    public String getRoomId() {
         return roomId;
     }
-public void setRoomId(String roomId) {
+
+    public void setRoomId(String roomId) {
         this.roomId = roomId;
     }
-public String getRoomNum() {
+
+    public String getRoomNum() {
         return roomNum;
     }
-public void setRoomNum(String roomNum) {
+
+    public void setRoomNum(String roomNum) {
         this.roomNum = roomNum;
     }
-public String getIfdId() {
+
+    public String getIfdId() {
         return ifdId;
     }
-public void setIfdId(String ifdId) {
+
+    public void setIfdId(String ifdId) {
         this.ifdId = ifdId;
     }
-public String getFeeName() {
+
+    public String getFeeName() {
         return feeName;
     }
-public void setFeeName(String feeName) {
+
+    public void setFeeName(String feeName) {
         this.feeName = feeName;
     }
-public String getStartTime() {
+
+    public String getStartTime() {
         return startTime;
     }
-public void setStartTime(String startTime) {
+
+    public void setStartTime(String startTime) {
         this.startTime = startTime;
     }
-public String getEndTime() {
+
+    public String getEndTime() {
         return endTime;
     }
-public void setEndTime(String endTime) {
+
+    public void setEndTime(String endTime) {
         this.endTime = endTime;
     }
-public String getState() {
+
+    public String getState() {
         return state;
     }
-public void setState(String state) {
+
+    public void setState(String state) {
         this.state = state;
     }
-public String getCommunityId() {
+
+    public String getCommunityId() {
         return communityId;
     }
-public void setCommunityId(String communityId) {
+
+    public void setCommunityId(String communityId) {
         this.communityId = communityId;
     }
 
+    public String getImportFeeId() {
+        return importFeeId;
+    }
 
-
+    public void setImportFeeId(String importFeeId) {
+        this.importFeeId = importFeeId;
+    }
 }

java110-db/src/main/java/com/java110/db/Java110MybatisInterceptor.java

@@ -15,30 +15,17 @@ import org.apache.ibatis.mapping.BoundSql;
 import org.apache.ibatis.mapping.MappedStatement;
 import org.apache.ibatis.mapping.ParameterMapping;
 import org.apache.ibatis.mapping.SqlCommandType;
-import org.apache.ibatis.plugin.Interceptor;
-import org.apache.ibatis.plugin.Intercepts;
-import org.apache.ibatis.plugin.Invocation;
-import org.apache.ibatis.plugin.Plugin;
-import org.apache.ibatis.plugin.Signature;
+import org.apache.ibatis.plugin.*;
 import org.apache.ibatis.reflection.MetaObject;
 import org.apache.ibatis.session.Configuration;
 import org.apache.ibatis.type.TypeHandlerRegistry;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.http.HttpEntity;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpMethod;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
+import org.springframework.http.*;
 
 import java.sql.Timestamp;
 import java.text.DateFormat;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Properties;
+import java.util.*;
 
 @Intercepts({
         @Signature(type = Executor.class, method = "update", args = {MappedStatement.class,
@@ -216,9 +203,9 @@ public class Java110MybatisInterceptor implements Interceptor {
                 Date date = new Date(((Timestamp) value).getTime());
                 String tmpValue = DateUtil.getFormatTimeString(date, DateUtil.DATE_FORMATE_STRING_A);
                 map.put(key, "'" + tmpValue + "'");
-            } else if(value instanceof Double){
+            } else if (value instanceof Double) {
                 map.put(key, "'" + map.get(key) + "'");
-            }else {
+            } else {
                 if (value != null) {
                     map.put(key, "'" + value.toString() + "'");
                 } else {
@@ -242,27 +229,42 @@ public class Java110MybatisInterceptor implements Interceptor {
         JSONArray preValues = new JSONArray();
 
         JSONArray afterValues = new JSONArray();
-        JSONObject afterValue = new JSONObject();
+
         String tmpTable = sql.substring(sql.toLowerCase().indexOf("into") + 4, sql.indexOf("("));
         String tmpKey = sql.substring(sql.indexOf("(") + 1, sql.indexOf(")"));
-        String tmpValue = sql.substring(sql.lastIndexOf("(") + 1, sql.lastIndexOf(")"));
         String[] tmpKeys = tmpKey.split(",");
-        String[] tmpValues = tmpValue.split(",");
-
-        if (tmpKeys.length != tmpValues.length) {
-            throw new IllegalArgumentException("sql 错误 key 和value 个数不等" + sql);
+        int valuePos = 0;
+        if (sql.contains("VALUES")) {
+            valuePos = sql.indexOf("VALUES") + 6;
+        } else {
+            valuePos = sql.indexOf("values") + 6;
         }
+        String sqlValues = sql.substring(valuePos);
+        //说明批操作
+
+        String[] sqlVauleses = sqlValues.split("\\)");
+        JSONObject afterValue = null;
+        for (String sqlV : sqlVauleses) {
+            String tmpValue = sqlV.substring(sqlV.lastIndexOf("(") + 1);
+            String[] tmpValues = tmpValue.split(",");
+            afterValue = new JSONObject();
+
+            if (tmpKeys.length != tmpValues.length) {
+                throw new IllegalArgumentException("sql 错误 key 和value 个数不等" + sql);
+            }
 
-        if (tmpKeys.length < 1) {
-            throw new IllegalArgumentException("sql 错误 未找到key" + sql);
-        }
-        for (int keyIndex = 0; keyIndex < tmpKeys.length; keyIndex++) {
-            if("''".equals(tmpValues[keyIndex])){
-                continue;
+            if (tmpKeys.length < 1) {
+                throw new IllegalArgumentException("sql 错误 未找到key" + sql);
             }
-            afterValue.put(tmpKeys[keyIndex], tmpValues[keyIndex]);
+            for (int keyIndex = 0; keyIndex < tmpKeys.length; keyIndex++) {
+                if ("''".equals(tmpValues[keyIndex])) {
+                    continue;
+                }
+                afterValue.put(tmpKeys[keyIndex], tmpValues[keyIndex]);
+            }
+            afterValues.add(afterValue);
         }
-        afterValues.add(afterValue);
+
 
         JSONObject logText = new JSONObject();
         logText.put("preValue", preValues);

java110-db/src/main/resources/mapper/community/MenuServiceDaoImplMapper.xml

@@ -304,7 +304,7 @@
             AND ppr.status_cd = '0'
             )
         </if>
-        order by t.seq desc
+        order by t.seq asc
         <if test="page != -1 and page != null ">
             limit #{page}, #{row}
         </if>

java110-db/src/main/resources/mapper/fee/FeeAttrServiceDaoImplMapper.xml

@@ -170,7 +170,7 @@
 
     <!-- 批量插入费用 -->
     <insert id="saveFeeAttrs" parameterType="Map">
-        insert into pay_fee_attrs (attr_id,operate,spec_cd,community_id,b_id,fee_id,value)
+        insert into pay_fee_attrs (attr_id,status_cd,spec_cd,community_id,b_id,fee_id,value)
         VALUES
         <foreach collection="feeAttrPos" item="item" separator=",">
             (#{item.attrId},'0',#{item.specCd},#{item.communityId},'-1',#{item.feeId},#{item.value})

java110-db/src/main/resources/mapper/fee/ImportFeeDetailServiceDaoImplMapper.xml

@@ -8,9 +8,9 @@
     <!-- 保存费用导入明细信息 add by wuxw 2018-07-03 -->
     <insert id="saveImportFeeDetailInfo" parameterType="Map">
         insert into import_fee_detail(
-        amount,unit_num,fee_id,floor_num,room_id,room_num,ifd_id,fee_name,start_time,end_time,state,community_id
+        amount,unit_num,fee_id,floor_num,room_id,room_num,ifd_id,fee_name,start_time,end_time,state,community_id,import_fee_id
         ) values (
-        #{amount},#{unitNum},#{feeId},#{floorNum},#{roomId},#{roomNum},#{ifdId},#{feeName},#{startTime},#{endTime},#{state},#{communityId}
+        #{amount},#{unitNum},#{feeId},#{floorNum},#{roomId},#{roomNum},#{ifdId},#{feeName},#{startTime},#{endTime},#{state},#{communityId},#{importFeeId}
         )
     </insert>
 
@@ -62,6 +62,9 @@
         <if test="communityId !=null and communityId != ''">
             and t.community_id= #{communityId}
         </if>
+        <if test="importFeeId !=null and importFeeId != ''">
+            and t.import_fee_id= #{importFeeId}
+        </if>
         order by t.create_time desc
         <if test="page != -1 and page != null ">
             limit #{page}, #{row}
@@ -160,6 +163,9 @@
         <if test="communityId !=null and communityId != ''">
             and t.community_id= #{communityId}
         </if>
+        <if test="importFeeId !=null and importFeeId != ''">
+            and t.import_fee_id= #{importFeeId}
+        </if>
 
 
     </select>
@@ -169,10 +175,11 @@
     <!-- 批量插入费用 -->
     <insert id="saveImportFeeDetails" parameterType="Map">
         insert into import_fee_detail(
-        amount,unit_num,fee_id,floor_num,room_id,room_num,ifd_id,fee_name,start_time,end_time,state,community_id
+        amount,unit_num,fee_id,floor_num,room_id,room_num,ifd_id,fee_name,start_time,end_time,state,community_id,import_fee_id
         ) values
         <foreach collection="importFeeDetailPos" item="item" separator=",">
-          (#{amount},#{unitNum},#{feeId},#{floorNum},#{roomId},#{roomNum},#{ifdId},#{feeName},#{startTime},#{endTime},#{state},#{communityId})
+          (#{item.amount},#{item.unitNum},#{item.feeId},#{item.floorNum},#{item.roomId},#{item.roomNum},#{item.ifdId},#{item.feeName},
+            #{item.startTime},#{item.endTime},#{item.state},#{item.communityId},#{item.importFeeId})
         </foreach>
     </insert>
 

java110-db/src/main/resources/mapper/fee/ImportFeeServiceDaoImplMapper.xml

@@ -18,8 +18,9 @@
     <!-- 查询费用导入信息 add by wuxw 2018-07-03 -->
     <select id="getImportFeeInfo" parameterType="Map" resultType="Map">
         select t.fee_type_cd,t.fee_type_cd feeTypeCd,t.status_cd,t.status_cd statusCd,t.import_fee_id,t.import_fee_id
-        importFeeId,t.community_id,t.community_id communityId
+        importFeeId,t.community_id,t.community_id communityId,t.create_time createTime,d.name feeTypeCdName
         from import_fee t
+        left join t_dict d on t.fee_type_cd = d.status_cd and d.table_name = 'pay_fee_config' and d.table_columns = 'fee_type_cd'
         where 1 =1
         <if test="feeTypeCd !=null and feeTypeCd != ''">
             and t.fee_type_cd= #{feeTypeCd}

service-fee/src/main/java/com/java110/fee/api/ImportFeeApi.java

@@ -38,8 +38,8 @@ public class ImportFeeApi {
      *
      * @param reqJson
      * @return
-     * @serviceCode /importFeeDetail/saveImportFeeDetail
-     * @path /app/importFeeDetail/saveImportFeeDetail
+     * @serviceCode /importFee/saveImportFeeDetail
+     * @path /app/importFee/saveImportFeeDetail
      */
     @RequestMapping(value = "/saveImportFeeDetail", method = RequestMethod.POST)
     public ResponseEntity<String> saveImportFeeDetail(@RequestBody JSONObject reqJson) {
@@ -56,8 +56,8 @@ public class ImportFeeApi {
      *
      * @param reqJson
      * @return
-     * @serviceCode /importFeeDetail/updateImportFeeDetail
-     * @path /app/importFeeDetail/updateImportFeeDetail
+     * @serviceCode /importFee/updateImportFeeDetail
+     * @path /app/importFee/updateImportFeeDetail
      */
     @RequestMapping(value = "/updateImportFeeDetail", method = RequestMethod.POST)
     public ResponseEntity<String> updateImportFeeDetail(@RequestBody JSONObject reqJson) {
@@ -75,8 +75,8 @@ public class ImportFeeApi {
      *
      * @param reqJson
      * @return
-     * @serviceCode /importFeeDetail/deleteImportFeeDetail
-     * @path /app/importFeeDetail/deleteImportFeeDetail
+     * @serviceCode /importFee/deleteImportFeeDetail
+     * @path /app/importFee/deleteImportFeeDetail
      */
     @RequestMapping(value = "/deleteImportFeeDetail", method = RequestMethod.POST)
     public ResponseEntity<String> deleteImportFeeDetail(@RequestBody JSONObject reqJson) {
@@ -94,17 +94,25 @@ public class ImportFeeApi {
      *
      * @param communityId 小区ID
      * @return
-     * @serviceCode /importFeeDetail/queryImportFeeDetail
-     * @path /app/importFeeDetail/queryImportFeeDetail
+     * @serviceCode /importFee/queryImportFeeDetail
+     * @path /app/importFee/queryImportFeeDetail
      */
     @RequestMapping(value = "/queryImportFeeDetail", method = RequestMethod.GET)
     public ResponseEntity<String> queryImportFeeDetail(@RequestParam(value = "communityId") String communityId,
                                                        @RequestParam(value = "page") int page,
-                                                       @RequestParam(value = "row") int row) {
+                                                       @RequestParam(value = "row") int row,
+                                                       @RequestParam(value = "floorNum", required = false) String floorNum,
+                                                       @RequestParam(value = "unitNum", required = false) String unitNum,
+                                                       @RequestParam(value = "roomNum", required = false) String roomNum,
+                                                       @RequestParam(value = "importFeeId") String importFeeId) {
         ImportFeeDetailDto importFeeDetailDto = new ImportFeeDetailDto();
         importFeeDetailDto.setPage(page);
         importFeeDetailDto.setRow(row);
         importFeeDetailDto.setCommunityId(communityId);
+        importFeeDetailDto.setImportFeeId(importFeeId);
+        importFeeDetailDto.setFloorNum(floorNum);
+        importFeeDetailDto.setUnitNum(unitNum);
+        importFeeDetailDto.setRoomNum(roomNum);
         return getImportFeeDetailBMOImpl.get(importFeeDetailDto);
     }
 
@@ -114,13 +122,13 @@ public class ImportFeeApi {
      *
      * @param communityId 小区ID
      * @return
-     * @serviceCode /importFeeDetail/queryImportFeeDetail
+     * @serviceCode /importFee/queryImportFee
      * @path /app/importFee/queryImportFee
      */
     @RequestMapping(value = "/queryImportFee", method = RequestMethod.GET)
     public ResponseEntity<String> queryImportFee(@RequestParam(value = "communityId") String communityId,
-                                                       @RequestParam(value = "page") int page,
-                                                       @RequestParam(value = "row") int row) {
+                                                 @RequestParam(value = "page") int page,
+                                                 @RequestParam(value = "row") int row) {
         ImportFeeDto importFeeDto = new ImportFeeDto();
         importFeeDto.setPage(page);
         importFeeDto.setRow(row);

service-fee/src/main/java/com/java110/fee/bmo/impl/ImportRoomFeeImpl.java

@@ -124,6 +124,7 @@ public class ImportRoomFeeImpl implements IImportRoomFee {
             payFeePo.setFeeTypeCd(feeTypeCd);
             payFeePo.setFeeFlag(FeeDto.FEE_FLAG_ONCE);
             payFeePo.setAmount(importRoomFee.getAmount());
+            payFeePo.setStartTime(importRoomFee.getStartTime());
 
             payFeePos.add(payFeePo);
 
@@ -132,6 +133,7 @@ public class ImportRoomFeeImpl implements IImportRoomFee {
             feeAttrPo.setAttrId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_attrId));
             feeAttrPo.setSpecCd(FeeAttrDto.SPEC_CD_IMPORT_FEE_NAME);
             feeAttrPo.setValue(importRoomFee.getFeeName());
+            feeAttrPo.setFeeId(payFeePo.getFeeId());
             feeAttrPos.add(feeAttrPo);
             importFeeDetailPo = new ImportFeeDetailPo();
             importFeeDetailPo.setAmount(importRoomFee.getAmount());
@@ -146,6 +148,7 @@ public class ImportRoomFeeImpl implements IImportRoomFee {
             importFeeDetailPo.setStartTime(importRoomFee.getStartTime());
             importFeeDetailPo.setIfdId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_feeId));
             importFeeDetailPo.setState("1000");
+            importFeeDetailPo.setImportFeeId(importFeeId);
             importFeeDetailPos.add(importFeeDetailPo);
         }
 

service-fee/src/main/resources/application-dev.yml

@@ -45,27 +45,13 @@ spring:
       max-idle: 100
       min-idle: 0
       timeout: 0
-#  datasource:
-#    connectionProperties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
-#    minIdle: 5
-#    validationQuery: SELECT 1 FROM DUAL
-#    initialSize: 5
-#    maxWait: 60000
-#    filters: stat,wall,log4j
-#    poolPreparedStatements: true
-#    type: com.alibaba.druid.pool.DruidDataSource
-#    url: jdbc:mysql://dev.db.java110.com:3306/TT?useUnicode=true&characterEncoding=utf-8
-#    maxPoolPreparedStatementPerConnectionSize: 20
-#    password: TT@12345678
-#    testOnBorrow: false
-#    testWhileIdle: true
-#    minEvictableIdleTimeMillis: 300000
-#    timeBetweenEvictionRunsMillis: 60000
-#    testOnReturn: false
-#    driverClassName: com.mysql.jdbc.Driver
-#    maxActive: 20
-#    username: TT
 
+feign:
+  client:
+    config:
+      default:
+        connect-timeout: 10000
+        read-timeout: 20000
 #============== kafka ===================
 kafka:
   consumer: