Merge branch 'dev' of ssh://10.10.100.21/source/saas-platform into dev

applications/document/document-server/src/main/java/com/usoftchina/saas/document/controller/BankinformationController.java

@@ -2,6 +2,7 @@ package com.usoftchina.saas.document.controller;
 
 import com.github.pagehelper.PageInfo;
 import com.usoftchina.saas.base.Result;
+import com.usoftchina.saas.commons.dto.ComboDTO;
 import com.usoftchina.saas.commons.dto.ListReqDTO;
 import com.usoftchina.saas.document.entities.Bankinformation;
 import com.usoftchina.saas.document.service.BankinformationService;
@@ -38,4 +39,10 @@ public class BankinformationController {
         PageInfo<Bankinformation> bankinformationList = bankinformationService.selectList(page, condition);
         return Result.success(bankinformationList);
     }
+
+    @GetMapping("/getCombo")
+    public Result getCombo(){
+        List<ComboDTO> comboDTOList = bankinformationService.getCombo();
+        return Result.success(comboDTOList);
+    }
 }

applications/document/document-server/src/main/java/com/usoftchina/saas/document/mapper/BankinformationMapper.java

@@ -1,6 +1,7 @@
 package com.usoftchina.saas.document.mapper;
 
 import com.usoftchina.saas.base.mapper.CommonBaseMapper;
+import com.usoftchina.saas.commons.dto.ComboDTO;
 import com.usoftchina.saas.document.entities.Bankinformation;
 import org.apache.ibatis.annotations.Param;
 
@@ -22,4 +23,6 @@ public interface BankinformationMapper extends CommonBaseMapper<Bankinformation>
     int updateByPrimaryKey(Bankinformation record);
 
     List<Bankinformation> selectBankinformationBycondition(@Param("con") String con, @Param("companyId") Long companyId);
+
+    List<ComboDTO> getCombo(@Param("companyId") Long companyId);
 }

applications/document/document-server/src/main/java/com/usoftchina/saas/document/service/BankinformationService.java

@@ -2,6 +2,7 @@ package com.usoftchina.saas.document.service;
 
 import com.github.pagehelper.PageInfo;
 import com.usoftchina.saas.base.service.CommonBaseService;
+import com.usoftchina.saas.commons.dto.ComboDTO;
 import com.usoftchina.saas.commons.dto.ListReqDTO;
 import com.usoftchina.saas.document.entities.Bankinformation;
 import com.usoftchina.saas.document.mapper.BankinformationMapper;
@@ -21,5 +22,5 @@ public interface BankinformationService extends CommonBaseService<Bankinformatio
 
     PageInfo<Bankinformation> selectList(PageRequest page, ListReqDTO condition);
 
-
+    List<ComboDTO> getCombo();
 }

applications/document/document-server/src/main/java/com/usoftchina/saas/document/service/impl/BankinformationServiceImpl.java

@@ -3,6 +3,7 @@ package com.usoftchina.saas.document.service.impl;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.usoftchina.saas.base.service.CommonBaseServiceImpl;
+import com.usoftchina.saas.commons.dto.ComboDTO;
 import com.usoftchina.saas.commons.dto.ListReqDTO;
 import com.usoftchina.saas.context.BaseContextHolder;
 import com.usoftchina.saas.document.entities.Bankinformation;
@@ -69,4 +70,9 @@ public class BankinformationServiceImpl extends CommonBaseServiceImpl<Bankinform
         recbalancesList = bankinformationMapper.selectBankinformationBycondition(con, companyId);
         return recbalancesList;
     }
+
+    @Override
+    public List<ComboDTO> getCombo() {
+        return getMapper().getCombo(BaseContextHolder.getCompanyId());
+    }
 }

applications/document/document-server/src/main/resources/mapper/BankinformationMapper.xml

@@ -334,4 +334,7 @@
       </if>
     </where>  order by bk_id
   </select>
+  <select id="getCombo" resultType="com.usoftchina.saas.commons.dto.ComboDTO">
+        SELECT CONCAT(bk_bankcode,' ',bk_bankname) display,bk_bankname value FROM bankinformation WHERE COMPANYID=#{companyId}
+    </select>
 </mapper>

applications/money/money-server/src/main/java/com/usoftchina/saas/money/controller/SubledgerController.java

@@ -20,7 +20,7 @@ public class SubledgerController {
     @Autowired
     private SubledgerService subledgerService;
 
-    @GetMapping("/list")
+    @RequestMapping("/list")
     public Result getListData(PageRequest page, ListReqDTO condition){
         return Result.success(subledgerService.seleteList(page, condition));
     }

applications/money/money-server/src/main/java/com/usoftchina/saas/money/service/impl/FundtransferServiceImpl.java

@@ -11,6 +11,7 @@ import com.usoftchina.saas.commons.po.BillCodeSeq;
 import com.usoftchina.saas.commons.po.Status;
 import com.usoftchina.saas.context.BaseContextHolder;
 import com.usoftchina.saas.exception.BizException;
+import com.usoftchina.saas.money.mapper.BanksubledgerMapper;
 import com.usoftchina.saas.money.mapper.FundtransferMapper;
 import com.usoftchina.saas.money.mapper.FundtransferdetailMapper;
 import com.usoftchina.saas.money.po.*;
@@ -35,6 +36,8 @@ public class FundtransferServiceImpl implements FundtransferService {
     private FundtransferdetailMapper fundtransferdetailMapper;
     @Autowired
     private MaxnumberService maxnumberService;
+    @Autowired
+    private BanksubledgerMapper banksubledgerMapper;
 
     @Override
     public DocBaseDTO insert(Fundtran fundtran) {
@@ -84,6 +87,7 @@ public class FundtransferServiceImpl implements FundtransferService {
         fundtransfer.setFt_status(Status.AUDITED.getDisplay());
         fundtransfer.setFt_statuscode(Status.AUDITED.name());
         fundtransfer.setCompanyId(companyId);
+        this.changBankUntil(fundtran);
         if ( fundtransfer == null || "".equals(fundtransfer)){
             this.insert(fundtran);
         }else {
@@ -98,6 +102,10 @@ public class FundtransferServiceImpl implements FundtransferService {
         fundtransfer.setFt_status(com.usoftchina.saas.commons.po.Status.UNAUDITED.getDisplay());
         fundtransfer.setFt_statuscode(Status.UNAUDITED.name());
         fundtransferMapper.updateByPrimaryKeySelective(fundtransfer);
+
+        //删除中间表
+        fundtransfer = fundtransferMapper.selectByPrimaryKey(id);
+        banksubledgerMapper.deleteByPrimaryKey(fundtransfer.getFt_code(), "其他收入单");
     }
 
 
@@ -130,6 +138,8 @@ public class FundtransferServiceImpl implements FundtransferService {
             fundtransfer.setId(Long.valueOf(docBaseDTO.getId()));
             fundtransfer.setFt_status(com.usoftchina.saas.commons.po.Status.AUDITED.getDisplay());
             fundtransfer.setFt_statuscode(Status.AUDITED.name());
+            Fundtran fundtran = this.select(Math.toIntExact(fundtransfer.getId()));
+            this.changBankUntil(fundtran);
             fundtransferMapper.updateByPrimaryKeySelective(fundtransfer);
         }
     }
@@ -200,4 +210,34 @@ public class FundtransferServiceImpl implements FundtransferService {
         }
         return fundtransferList;
     }
+
+    //插入bank中间表
+    public void changBankUntil(Fundtran fundtran){
+        Banksubledger banksubledger = new Banksubledger();
+        Fundtransfer fundtransfer = fundtran.getMain();
+        List<Fundtransferdetail> fundtransferdetailsList = fundtran.getItems();
+        Iterator isList = fundtransferdetailsList.iterator();
+        while (isList.hasNext()) {
+            Fundtransferdetail fundtransferdetail = (Fundtransferdetail) isList.next();
+            banksubledger.setCompanyId(BaseContextHolder.getCompanyId());
+            banksubledger.setBl_ym(fundtransferdetail.getFtd_ym());
+            banksubledger.setBl_bankid(fundtransferdetail.getFtd_bankid());
+            banksubledger.setBl_bankcode(fundtransferdetail.getFtd_bankcode());
+            banksubledger.setBl_bankname(fundtransferdetail.getFtd_bankname());
+            banksubledger.setBl_code(fundtransfer.getFt_code());
+            banksubledger.setBl_kind("资金转账");
+            banksubledger.setBl_date(fundtransfer.getFt_date());
+
+//            if (fundtransferdetail.getOs_vendid() == null || fundtransferdetail.getOs_vendid() != 0){
+//                banksubledger.setBl_asstype("供应商往来 ");
+//            }else {
+//                banksubledger.setBl_asstype(null);
+//            }
+            banksubledger.setBl_assid(0);
+            banksubledger.setBl_spending(fundtransferdetail.getFtd_nowbalance());
+            banksubledger.setBl_remark(fundtransferdetail.getFtd_remark());
+            banksubledger.setBl_orderamount(fundtransferdetail.getFtd_nowbalance() * -1);
+            banksubledgerMapper.insertSelective(banksubledger);
+        }
+    }
 }

applications/money/money-server/src/main/java/com/usoftchina/saas/money/service/impl/OthreceiptsServiceImpl.java

@@ -11,6 +11,7 @@ import com.usoftchina.saas.commons.po.BillCodeSeq;
 import com.usoftchina.saas.commons.po.Status;
 import com.usoftchina.saas.context.BaseContextHolder;
 import com.usoftchina.saas.exception.BizException;
+import com.usoftchina.saas.money.mapper.BanksubledgerMapper;
 import com.usoftchina.saas.money.mapper.OthreceiptsMapper;
 import com.usoftchina.saas.money.mapper.OthreceiptsdetailMapper;
 import com.usoftchina.saas.money.po.*;
@@ -36,6 +37,8 @@ public class OthreceiptsServiceImpl implements OthreceiptsService {
     private OthreceiptsdetailMapper othreceiptsdetailMapper;
     @Autowired
     private MaxnumberService maxnumberService;
+    @Autowired
+    private BanksubledgerMapper banksubledgerMapper;
 
     @Override
     public DocBaseDTO insert(Othte othte) {
@@ -85,6 +88,7 @@ public class OthreceiptsServiceImpl implements OthreceiptsService {
         othreceipts.setOr_status(Status.AUDITED.getDisplay());
         othreceipts.setOr_statuscode(Status.AUDITED.name());
         othreceipts.setCompanyId(companyId);
+        this.changBankUntil(othte);
         if ( othreceipts == null || "".equals(othreceipts)){
             this.insert(othte);
         }else {
@@ -99,6 +103,10 @@ public class OthreceiptsServiceImpl implements OthreceiptsService {
         othreceipts.setOr_status(com.usoftchina.saas.commons.po.Status.UNAUDITED.getDisplay());
         othreceipts.setOr_statuscode(Status.UNAUDITED.name());
         othreceiptsMapper.updateByPrimaryKeySelective(othreceipts);
+
+        //删除中间表
+        othreceipts = othreceiptsMapper.selectByPrimaryKey(id);
+        banksubledgerMapper.deleteByPrimaryKey(othreceipts.getOr_code(), "其他收入单");
     }
 
 
@@ -153,6 +161,8 @@ public class OthreceiptsServiceImpl implements OthreceiptsService {
             othreceipts.setId(Long.valueOf(docBaseDTO.getId()));
             othreceipts.setOr_status(com.usoftchina.saas.commons.po.Status.AUDITED.getDisplay());
             othreceipts.setOr_statuscode(Status.AUDITED.name());
+            Othte othte = this.select(Math.toIntExact(othreceipts.getId()));
+            this.changBankUntil(othte);
             othreceiptsMapper.updateByPrimaryKeySelective(othreceipts);
         }
     }
@@ -200,4 +210,36 @@ public class OthreceiptsServiceImpl implements OthreceiptsService {
         }
         return othreceiptsList;
     }
+
+    //插入bank中间表
+    public void changBankUntil(Othte othte){
+        Banksubledger banksubledger = new Banksubledger();
+        Othreceipts othreceipts = othte.getMain();
+        List<Othreceiptsdetail> othreceiptsdetailList = othte.getItems();
+        Iterator isList = othreceiptsdetailList.iterator();
+        while (isList.hasNext()) {
+            Othreceiptsdetail othreceiptsdetail = (Othreceiptsdetail) isList.next();
+            banksubledger.setCompanyId(BaseContextHolder.getCompanyId());
+            banksubledger.setBl_ym(othreceiptsdetail.getOrd_ym());
+            banksubledger.setBl_bankid(othreceipts.getOr_bankid());
+            banksubledger.setBl_bankcode(othreceipts.getOr_bankcode());
+            banksubledger.setBl_bankname(othreceipts.getOr_bankname());
+            banksubledger.setBl_code(othreceipts.getOr_code());
+            banksubledger.setBl_kind("其他收入单");
+            banksubledger.setBl_date(othreceipts.getOr_date());
+
+            if (othreceipts.getOr_custid() == null || othreceipts.getOr_custid() != 0){
+                banksubledger.setBl_asstype("客户往来");
+            }else {
+                banksubledger.setBl_asstype(null);
+            }
+            banksubledger.setBl_assid(othreceipts.getOr_custid());
+            banksubledger.setBl_asscode(othreceipts.getOr_custcode());
+            banksubledger.setBl_assname(othreceipts.getOr_custname());
+            banksubledger.setBl_income(othreceiptsdetail.getOrd_nowbalance());
+            banksubledger.setBl_remark(othreceiptsdetail.getOrd_remark());
+            banksubledger.setBl_orderamount(othreceiptsdetail.getOrd_nowbalance());
+            banksubledgerMapper.insertSelective(banksubledger);
+        }
+    }
 }

applications/money/money-server/src/main/java/com/usoftchina/saas/money/service/impl/OthspendingsServiceImpl.java

@@ -11,10 +11,7 @@ import com.usoftchina.saas.commons.po.BillCodeSeq;
 import com.usoftchina.saas.commons.po.Status;
 import com.usoftchina.saas.context.BaseContextHolder;
 import com.usoftchina.saas.exception.BizException;
-import com.usoftchina.saas.money.mapper.OthreceiptsMapper;
-import com.usoftchina.saas.money.mapper.OthreceiptsdetailMapper;
-import com.usoftchina.saas.money.mapper.OthspendingsMapper;
-import com.usoftchina.saas.money.mapper.OthspendingsdetailMapper;
+import com.usoftchina.saas.money.mapper.*;
 import com.usoftchina.saas.money.po.*;
 import com.usoftchina.saas.money.service.OthspendingsService;
 import com.usoftchina.saas.page.PageRequest;
@@ -37,6 +34,8 @@ public class OthspendingsServiceImpl implements OthspendingsService {
     private OthspendingsdetailMapper othspendingsdetailMapper;
     @Autowired
     private MaxnumberService maxnumberService;
+    @Autowired
+    private BanksubledgerMapper banksubledgerMapper;
 
     @Override
     public DocBaseDTO insert(Othsp othsp) {
@@ -117,6 +116,7 @@ public class OthspendingsServiceImpl implements OthspendingsService {
         othspendings.setOs_status(Status.AUDITED.getDisplay());
         othspendings.setOs_statuscode(Status.AUDITED.name());
         othspendings.setCompanyId(companyId);
+        this.changBankUntil(othsp);
         if ( othspendings == null || "".equals(othspendings)){
             this.insert(othsp);
         }else {
@@ -131,6 +131,10 @@ public class OthspendingsServiceImpl implements OthspendingsService {
         othspendings.setOs_status(com.usoftchina.saas.commons.po.Status.UNAUDITED.getDisplay());
         othspendings.setOs_statuscode(Status.UNAUDITED.name());
         othspendingsMapper.updateByPrimaryKeySelective(othspendings);
+
+        //删除中间表
+        othspendings = othspendingsMapper.selectByPrimaryKey(id);
+        banksubledgerMapper.deleteByPrimaryKey(othspendings.getOs_code(), "其他收入单");
     }
 
     @Override
@@ -151,6 +155,8 @@ public class OthspendingsServiceImpl implements OthspendingsService {
             othspendings.setId(Long.valueOf(docBaseDTO.getId()));
             othspendings.setOs_status(com.usoftchina.saas.commons.po.Status.AUDITED.getDisplay());
             othspendings.setOs_statuscode(Status.AUDITED.name());
+            Othsp othsp = this.select(Math.toIntExact(othspendings.getId()));
+            this.changBankUntil(othsp);
             othspendingsMapper.updateByPrimaryKeySelective(othspendings);
         }
     }
@@ -198,4 +204,36 @@ public class OthspendingsServiceImpl implements OthspendingsService {
         }
         return othspendingsList;
     }
+
+    //插入bank中间表
+    public void changBankUntil(Othsp othsp){
+        Banksubledger banksubledger = new Banksubledger();
+        Othspendings othspendings = othsp.getMain();
+        List<Othspendingsdetail> othspendingsdetailList = othsp.getItems();
+        Iterator isList = othspendingsdetailList.iterator();
+        while (isList.hasNext()) {
+            Othspendingsdetail othspendingsdetail = (Othspendingsdetail) isList.next();
+            banksubledger.setCompanyId(BaseContextHolder.getCompanyId());
+            banksubledger.setBl_ym(othspendingsdetail.getOsd_ym());
+            banksubledger.setBl_bankid(othspendings.getOs_bankid());
+            banksubledger.setBl_bankcode(othspendings.getOs_bankcode());
+            banksubledger.setBl_bankname(othspendings.getOs_bankname());
+            banksubledger.setBl_code(othspendings.getOs_code());
+            banksubledger.setBl_kind("其他支出单");
+            banksubledger.setBl_date(othspendings.getOs_date());
+
+            if (othspendings.getOs_vendid() == null || othspendings.getOs_vendid() != 0){
+                banksubledger.setBl_asstype("供应商往来 ");
+            }else {
+                banksubledger.setBl_asstype(null);
+            }
+            banksubledger.setBl_assid(othspendings.getOs_vendid());
+            banksubledger.setBl_asscode(othspendings.getOs_vendcode());
+            banksubledger.setBl_assname(othspendings.getOs_vendname());
+            banksubledger.setBl_income(othspendingsdetail.getOsd_nowbalance());
+            banksubledger.setBl_remark(othspendingsdetail.getOsd_remark());
+            banksubledger.setBl_orderamount(othspendingsdetail.getOsd_nowbalance() * -1);
+            banksubledgerMapper.insertSelective(banksubledger);
+        }
+    }
 }

applications/money/money-server/src/main/java/com/usoftchina/saas/money/service/impl/PaybalanceServiceImpl.java

@@ -106,7 +106,6 @@ public class PaybalanceServiceImpl implements PaybalanceService {
         subledgerMapper.insertSelective(subledger);
         this.changBankUntil(pay);
         System.out.println("新增");
-        this.changBankUntil(pay);
         if ( paybalance == null || "".equals(paybalance)){
             this.insert(pay);
         }else {
@@ -185,6 +184,8 @@ public class PaybalanceServiceImpl implements PaybalanceService {
             paybalance.setId(Long.valueOf(docBaseDTO.getId()));
             paybalance.setPb_status(com.usoftchina.saas.commons.po.Status.AUDITED.getDisplay());
             paybalance.setPb_statuscode(Status.AUDITED.name());
+            Pay pay = this.select(Math.toIntExact(paybalance.getId()));
+            this.changBankUntil(pay);
             paybalanceMapper.updateByPrimaryKeySelective(paybalance);
         }
     }
@@ -293,10 +294,10 @@ public class PaybalanceServiceImpl implements PaybalanceService {
             banksubledger.setBl_date(paybalance.getPb_date());
 
             if (paybalance.getPb_vendid() == null || paybalance.getPb_vendid() != 0){
-                banksubledger.setBl_asscode("供应商往来");
+                banksubledger.setBl_asstype("供应商往来");
             }
             banksubledger.setBl_assid(paybalance.getPb_vendid());
-            banksubledger.setBl_code(paybalance.getPb_code());
+            banksubledger.setBl_asscode(paybalance.getPb_vendcode());
             banksubledger.setBl_assname(paybalance.getPb_vendname());
             banksubledger.setBl_spending(paybalancedet.getPd_amount());
             banksubledger.setBl_manname(paybalance.getPb_manname());

applications/money/money-server/src/main/java/com/usoftchina/saas/money/service/impl/RecbalanceServiceImpl.java

@@ -11,9 +11,7 @@ import com.usoftchina.saas.commons.po.BillCodeSeq;
 import com.usoftchina.saas.commons.po.Status;
 import com.usoftchina.saas.context.BaseContextHolder;
 import com.usoftchina.saas.exception.BizException;
-import com.usoftchina.saas.money.mapper.RecbalanceMapper;
-import com.usoftchina.saas.money.mapper.RecbalancedetMapper;
-import com.usoftchina.saas.money.mapper.RecbalancedetailMapper;
+import com.usoftchina.saas.money.mapper.*;
 import com.usoftchina.saas.money.po.*;
 import com.usoftchina.saas.money.service.RecbalanceService;
 import com.usoftchina.saas.page.PageRequest;
@@ -38,6 +36,10 @@ public class RecbalanceServiceImpl implements RecbalanceService {
     RecbalancedetailMapper recbalancedetailMapper;
     @Autowired
     private MaxnumberService maxnumberService;
+    @Autowired
+    private BanksubledgerMapper banksubledgerMapper;
+    @Autowired
+    private SubledgerMapper subledgerMapper;
 
     @Override
     public DocBaseDTO insert(Rec rec) {
@@ -128,6 +130,9 @@ public class RecbalanceServiceImpl implements RecbalanceService {
         recbalance.setRb_status(Status.AUDITED.getDisplay());
         recbalance.setRb_statuscode(Status.AUDITED.name());
         recbalance.setCompanyId(companyId);
+        Subledger subledger = this.changSubledgerUntil(recbalance);
+        subledgerMapper.insertSelective(subledger);
+        this.changBankUntil(rec);
         if ( recbalance == null || "".equals(recbalance)){
             this.insert(rec);
         }else {
@@ -142,6 +147,11 @@ public class RecbalanceServiceImpl implements RecbalanceService {
         recbalance.setRb_status(Status.UNAUDITED.getDisplay());
         recbalance.setRb_statuscode(Status.UNAUDITED.name());
         recbalanceMapper.updateByPrimaryKeySelective(recbalance);
+
+        //删除中间表
+        recbalance = recbalanceMapper.selectByPrimaryKey(id);
+        subledgerMapper.deleteByPrimaryKey(recbalance.getRb_code(), recbalance.getRb_kind());
+        banksubledgerMapper.deleteByPrimaryKey(recbalance.getRb_code(), recbalance.getRb_kind());
     }
 
     public PageInfo<Recbalance> selectList(PageRequest page, ListReqDTO reqDTO) {
@@ -176,6 +186,8 @@ public class RecbalanceServiceImpl implements RecbalanceService {
             recbalance.setId(Long.valueOf(docBaseDTO.getId()));
             recbalance.setRb_status(com.usoftchina.saas.commons.po.Status.AUDITED.getDisplay());
             recbalance.setRb_statuscode(Status.AUDITED.name());
+            Rec rec = this.select(Math.toIntExact(recbalance.getId()));
+            this.changBankUntil(rec);
             recbalanceMapper.updateByPrimaryKeySelective(recbalance);
         }
     }
@@ -223,4 +235,75 @@ public class RecbalanceServiceImpl implements RecbalanceService {
         }
         return recbalancesList;
     }
+
+    //插入中间表
+    public Subledger changSubledgerUntil(Recbalance recbalance){
+        Subledger subledger = new Subledger();
+        subledger.setCompanyId(BaseContextHolder.getCompanyId());
+        subledger.setSl_code(recbalance.getRb_code());
+        subledger.setSl_kind(recbalance.getRb_kind());
+        subledger.setSl_custid(recbalance.getRb_custid());
+        subledger.setSl_vendid(0);
+        subledger.setSl_date(recbalance.getRb_date());
+        if (recbalance.getRb_rdamount() == null){
+            subledger.setSl_amount((double) 0);
+        }else {
+            subledger.setSl_amount(recbalance.getRb_rdamount() * -1);
+        }
+        subledger.setSl_orderamount(recbalance.getRb_rdamount());
+
+        Double yamount = recbalance.getRb_preamount();
+        if (yamount == null){
+            yamount = Double.valueOf(0);
+        }
+        if (yamount > 0 || yamount < 0){
+            subledger.setSl_yamount(yamount);
+        }else {
+            subledger.setSl_yamount((double) 0);
+        }
+        if (subledger.getSl_orderamount() == null){
+            subledger.setSl_orderamount((double) 0);
+        }
+
+        if (subledger.getSl_discount() == null){
+            subledger.setSl_discount((double) 0);
+        }
+        subledger.setSl_namount(subledger.getSl_orderamount() + subledger.getSl_discount() - subledger.getSl_yamount());
+        subledger.setSl_remark(subledger.getSl_remark());
+        subledger.setSl_preamount(subledger.getSl_preamount());
+
+        return subledger;
+    }
+
+    //插入bank中间表
+    public void changBankUntil(Rec rec){
+        Banksubledger banksubledger = new Banksubledger();
+        Recbalance recbalance = rec.getMain();
+        List<Recbalancedet> recbalancedetList = rec.getItems1();
+        Iterator isList = recbalancedetList.iterator();
+        while (isList.hasNext()) {
+            Recbalancedet recbalancedet = (Recbalancedet) isList.next();
+            banksubledger.setCompanyId(BaseContextHolder.getCompanyId());
+            banksubledger.setBl_ym(recbalancedet.getRd_ym());
+            banksubledger.setBl_bankid(recbalancedet.getRd_bankid());
+            banksubledger.setBl_bankcode(recbalancedet.getRd_bankcode());
+            banksubledger.setBl_bankname(recbalancedet.getRd_bankname());
+            banksubledger.setBl_code(recbalance.getRb_code());
+            banksubledger.setBl_kind(recbalance.getRb_kind());
+            banksubledger.setBl_date(recbalance.getRb_date());
+
+            if (recbalance.getRb_custid() == null || recbalance.getRb_custid() != 0){
+                banksubledger.setBl_asstype("供应商往来");
+            }
+            banksubledger.setBl_assid(recbalance.getRb_custid());
+            banksubledger.setBl_asscode(recbalance.getRb_custcode());
+            banksubledger.setBl_assname(recbalance.getRb_custname());
+            banksubledger.setBl_spending(recbalancedet.getRd_amount());
+            banksubledger.setBl_manname(recbalance.getRb_manname());
+            banksubledger.setBl_remark(recbalancedet.getRd_remark());
+            banksubledger.setBl_orderamount(recbalancedet.getRd_amount());
+            banksubledgerMapper.insertSelective(banksubledger);
+
+        }
+    }
 }

base-servers/account/account-api/src/main/java/com/usoftchina/saas/account/cache/AccountCache.java

@@ -4,6 +4,7 @@ import com.usoftchina.saas.account.api.AccountApi;
 import com.usoftchina.saas.account.dto.AccountDTO;
 import com.usoftchina.saas.base.Result;
 import com.usoftchina.saas.cache.RedisHashCache;
+import com.usoftchina.saas.context.BaseContextHolder;
 import com.usoftchina.saas.context.SpringContextHolder;
 import com.usoftchina.saas.exception.BizException;
 import com.usoftchina.saas.utils.JsonUtils;
@@ -31,6 +32,15 @@ public class AccountCache extends RedisHashCache<String, String, String> {
         return new AccountCache(id);
     }
 
+    /**
+     * 当前登录用户的缓存信息
+     *
+     * @return
+     */
+    public static AccountCache current() {
+        return new AccountCache(BaseContextHolder.getUserId());
+    }
+
     @Override
     protected String field() {
         return String.valueOf(id);

base-servers/account/account-api/src/main/java/com/usoftchina/saas/account/cache/ResourceCache.java

@@ -4,6 +4,7 @@ import com.usoftchina.saas.account.api.ResourceApi;
 import com.usoftchina.saas.account.dto.UrlResourceDTO;
 import com.usoftchina.saas.base.Result;
 import com.usoftchina.saas.cache.RedisHashCache;
+import com.usoftchina.saas.context.BaseContextHolder;
 import com.usoftchina.saas.context.SpringContextHolder;
 import com.usoftchina.saas.exception.BizException;
 import com.usoftchina.saas.utils.JsonUtils;
@@ -33,6 +34,15 @@ public class ResourceCache extends RedisHashCache<String, String, String> {
         return new ResourceCache(appId);
     }
 
+    /**
+     * 当前登录应用的资源缓存
+     *
+     * @return
+     */
+    public static ResourceCache current() {
+        return new ResourceCache(BaseContextHolder.getAppId());
+    }
+
     @Override
     protected String field() {
         return appId;

base-servers/account/account-server/src/main/java/com/usoftchina/saas/account/controller/AccountController.java

@@ -100,6 +100,24 @@ public class AccountController {
         return Result.success(getAccountDTO(account));
     }
 
+    /**
+     * 重置当前登录账户的密码
+     *
+     * @param password
+     * @return
+     */
+    @PostMapping(value = "/pwd/reset")
+    public Result resetPad(@RequestParam(value = "password") String password) {
+        Account account = accountService.findByPrimaryKey(BaseContextHolder.getUserId());
+        if (null == account) {
+            return Result.error(ExceptionCode.USER_NOT_EXIST);
+        }
+
+        account.setPassword(accountService.getEncryptedPassword(password, account.getSalt()));
+        accountService.updateByPrimaryKey(account);
+        return Result.success();
+    }
+
     /**
      * 账户 + 账户的全部绑定信息
      *

base-servers/account/account-server/src/main/java/com/usoftchina/saas/account/controller/ResourceController.java

@@ -61,7 +61,7 @@ public class ResourceController {
      */
     @GetMapping("/cache/clear")
     public Result clearCache() {
-        ResourceCache.of(BaseContextHolder.getAppId()).hdel();
+        ResourceCache.current().hdel();
         return Result.success();
     }
 

base-servers/account/account-server/src/main/java/com/usoftchina/saas/account/mapper/AccountMapper.java

@@ -26,6 +26,22 @@ public interface AccountMapper {
      */
     int insertSelective(Account account);
 
+    /**
+     * 按主键更新
+     *
+     * @param account
+     * @return
+     */
+    int updateByPrimaryKey(Account account);
+
+    /**
+     * 按主键更新非空字段
+     *
+     * @param account
+     * @return
+     */
+    int updateByPrimaryKeySelective(Account account);
+
     /**
      * 按ID查找
      *

base-servers/account/account-server/src/main/java/com/usoftchina/saas/account/service/AccountService.java

@@ -18,6 +18,14 @@ public interface AccountService {
      */
     boolean save(Account account);
 
+    /**
+     * 更新
+     *
+     * @param account
+     * @return
+     */
+    boolean updateByPrimaryKey(Account account);
+
     /**
      * 按用户名查找
      *

base-servers/account/account-server/src/main/java/com/usoftchina/saas/account/service/impl/AccountServiceImpl.java

@@ -10,11 +10,13 @@ import com.usoftchina.saas.account.po.Role;
 import com.usoftchina.saas.account.po.RoleResource;
 import com.usoftchina.saas.account.service.AccountService;
 import com.usoftchina.saas.account.service.RoleService;
+import com.usoftchina.saas.context.BaseContextHolder;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.DigestUtils;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -41,9 +43,21 @@ public class AccountServiceImpl implements AccountService {
 
     @Override
     public boolean save(Account account) {
+        account.setCreateTime(new Date());
+        account.setCreatorId(BaseContextHolder.getUserId());
+        account.setUpdateTime(new Date());
+        account.setUpdaterId(BaseContextHolder.getUserId());
+
         return accountMapper.insert(account) > 0;
     }
 
+    @Override
+    public boolean updateByPrimaryKey(Account account) {
+        account.setUpdateTime(new Date());
+        account.setUpdaterId(BaseContextHolder.getUserId());
+        return accountMapper.updateByPrimaryKeySelective(account) > 0;
+    }
+
     @Override
     public Account findByUsername(String username) {
         return accountMapper.selectByUsername(username);

base-servers/account/account-server/src/main/resources/application.yml

@@ -38,6 +38,9 @@ spring:
   redis:
     host: 192.168.253.12
     port: 6379
+  jackson:
+    date-format: yyyy-MM-dd HH:mm:ss
+    time-zone: GMT+8
 eureka:
   instance:
     leaseRenewalIntervalInSeconds: 10

base-servers/account/account-server/src/main/resources/mapper/AccountMapper.xml

@@ -106,6 +106,64 @@
             </if>
         </trim>
     </insert>
+    <update id="updateByPrimaryKey" parameterType="com.usoftchina.saas.account.po.Account">
+        update ac_account set
+        username=#{username,jdbcType=VARCHAR},
+        password=#{password,jdbcType=VARCHAR},
+        salt=#{salt,jdbcType=VARCHAR},
+        realname=#{realname,jdbcType=VARCHAR},
+        email=#{email,jdbcType=VARCHAR},
+        mobile=#{mobile,jdbcType=VARCHAR},
+        type=#{type,jdbcType=INTEGER},
+        enabled=#{enabled,jdbcType=BOOLEAN},
+        creator_id=#{creatorId,jdbcType=BIGINT},
+        create_time=#{createTime,jdbcType=TIMESTAMP},
+        updater_id=#{updaterId,jdbcType=BIGINT},
+        update_time=#{updateTime,jdbcType=TIMESTAMP})
+        where id=#{id,jdbcType=BIGINT}
+    </update>
+    <update id="updateByPrimaryKeySelective" parameterType="com.usoftchina.saas.account.po.Account">
+        update ac_account
+        <set>
+            <if test="username != null">
+                username=#{username,jdbcType=VARCHAR},
+            </if>
+            <if test="password != null">
+                password=#{password,jdbcType=VARCHAR},
+            </if>
+            <if test="salt != null">
+                salt=#{salt,jdbcType=VARCHAR},
+            </if>
+            <if test="realname != null">
+                realname=#{realname,jdbcType=VARCHAR},
+            </if>
+            <if test="email != null">
+                email=#{email,jdbcType=VARCHAR},
+            </if>
+            <if test="mobile != null">
+                mobile=#{mobile,jdbcType=VARCHAR},
+            </if>
+            <if test="type != null">
+                type=#{type,jdbcType=INTEGER},
+            </if>
+            <if test="enabled != null">
+                enabled=#{enabled,jdbcType=BOOLEAN},
+            </if>
+            <if test="creatorId != null">
+                creator_id=#{creatorId,jdbcType=BIGINT},
+            </if>
+            <if test="createTime != null">
+                create_time=#{createTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="updaterId != null">
+                updater_id=#{updaterId,jdbcType=BIGINT},
+            </if>
+            <if test="updateTime != null">
+                update_time=#{updateTime,jdbcType=TIMESTAMP})
+            </if>
+        </set>
+        where id=#{id,jdbcType=BIGINT}
+    </update>
     <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
         select <include refid="baseColumns"/> from ac_account where id=#{id}
     </select>

base-servers/auth/auth-server/pom.xml

@@ -38,6 +38,10 @@
             <groupId>org.mybatis.spring.boot</groupId>
             <artifactId>mybatis-spring-boot-starter</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.github.pagehelper</groupId>
+            <artifactId>pagehelper-spring-boot-starter</artifactId>
+        </dependency>
         <!-- api doc -->
         <dependency>
             <groupId>io.springfox</groupId>
@@ -61,6 +65,11 @@
             <groupId>net.logstash.logback</groupId>
             <artifactId>logstash-logback-encoder</artifactId>
         </dependency>
+        <!-- test -->
+        <dependency>
+            <groupId>com.usoftchina.saas</groupId>
+            <artifactId>test-starter</artifactId>
+        </dependency>
     </dependencies>
 
     <build>

base-servers/auth/auth-server/src/main/java/com/usoftchina/saas/auth/AuthApplication.java

@@ -1,5 +1,6 @@
 package com.usoftchina.saas.auth;
 
+import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
@@ -12,6 +13,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
 @SpringBootApplication
 @EnableEurekaClient
 @EnableFeignClients(basePackages = "com.usoftchina.saas.account.api")
+@MapperScan(basePackages = "com.usoftchina.saas.auth.mapper")
 public class AuthApplication {
     public static void main(String[] args) {
         SpringApplication.run(AuthApplication.class, args);

base-servers/auth/auth-server/src/main/java/com/usoftchina/saas/auth/controller/AuthController.java

@@ -1,14 +1,21 @@
 package com.usoftchina.saas.auth.controller;
 
+import com.github.pagehelper.PageInfo;
 import com.usoftchina.saas.account.api.AccountApi;
 import com.usoftchina.saas.account.dto.AccountDTO;
 import com.usoftchina.saas.auth.common.jwt.JwtHelper;
 import com.usoftchina.saas.auth.common.jwt.JwtInfo;
 import com.usoftchina.saas.auth.common.jwt.TokenVO;
 import com.usoftchina.saas.auth.dto.AuthDTO;
+import com.usoftchina.saas.auth.dto.AuthorizeLogDTO;
 import com.usoftchina.saas.auth.dto.TokenDTO;
+import com.usoftchina.saas.auth.po.AuthorizeLog;
+import com.usoftchina.saas.auth.service.AuthorizeCountService;
+import com.usoftchina.saas.auth.service.AuthorizeLogService;
 import com.usoftchina.saas.base.Result;
 import com.usoftchina.saas.exception.ExceptionCode;
+import com.usoftchina.saas.page.PageDefault;
+import com.usoftchina.saas.page.PageRequest;
 import com.usoftchina.saas.utils.BeanMapper;
 import com.usoftchina.saas.utils.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -40,6 +47,15 @@ public class AuthController {
     @Value("${auth.expire:18000}")
     private int expire;
 
+    @Value("${auth.max-errors:5}")
+    private int maxErrors;
+
+    @Autowired
+    private AuthorizeLogService authorizeLogService;
+
+    @Autowired
+    private AuthorizeCountService authorizeCountService;
+
     /**
      * 登录认证获取token
      *
@@ -48,9 +64,16 @@ public class AuthController {
      * @return
      */
     @PostMapping("/authorize")
-    public Result<AuthDTO> authorize(@RequestParam String username, @RequestParam String password) {
+    public Result<AuthDTO> authorize(HttpServletRequest request, @RequestParam String username, @RequestParam String password) {
+        // 非法操作（登录失败次数过多...）导致被冻结
+        if (authorizeCountService.isFrozen(username)) {
+            return Result.error(ExceptionCode.AUTH_FROZEN);
+        }
+
         Result<AccountDTO> result = accountApi.validByUsernameAndPwd(username, password);
         if (result.isSuccess()) {
+            authorizeCountService.clear(username);
+
             AccountDTO accountDTO = result.getData();
             Long companyId = null;
             if (!CollectionUtils.isEmpty(accountDTO.getCompanies())) {
@@ -62,7 +85,16 @@ public class AuthController {
             JwtInfo info = new JwtInfo(appId, companyId, accountDTO.getId(), accountDTO.getUsername());
             TokenVO tokenVO = JwtHelper.generateToken(info, privateKeyPath, expire);
             TokenDTO tokenDTO = BeanMapper.map(tokenVO, TokenDTO.class);
+            // 登录日志
+            authorizeLogService.save(AuthorizeLog.from(request)
+                    .setAccountId(accountDTO.getId())
+                    .setAppId(appId).build());
             return Result.success(new AuthDTO(tokenDTO, accountDTO));
+        } else {
+            // 失败次数超过最大限制
+            if (authorizeCountService.increaseAndGet(username) > maxErrors) {
+                return Result.error(ExceptionCode.AUTH_MAX_ERRORS);
+            }
         }
         return Result.error(result.getCode(), result.getMessage());
     }
@@ -121,4 +153,15 @@ public class AuthController {
         }
         return false;
     }
+
+    /**
+     * 查询当前用户登录日志
+     *
+     * @param page
+     * @return
+     */
+    @GetMapping("/log")
+    public Result<PageInfo<AuthorizeLogDTO>> getLogs(@PageDefault PageRequest page) {
+        return Result.success(authorizeLogService.findByPage(page));
+    }
 }

base-servers/auth/auth-server/src/main/java/com/usoftchina/saas/auth/dto/AuthorizeLogDTO.java

@@ -0,0 +1,47 @@
+package com.usoftchina.saas.auth.dto;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author yingp
+ * @date 2018/11/7
+ */
+public class AuthorizeLogDTO implements Serializable{
+    private String clientIp;
+    private String userAgent;
+    private Date loginTime;
+
+    public String getClientIp() {
+        return clientIp;
+    }
+
+    public void setClientIp(String clientIp) {
+        this.clientIp = clientIp;
+    }
+
+    public String getUserAgent() {
+        return userAgent;
+    }
+
+    public void setUserAgent(String userAgent) {
+        this.userAgent = userAgent;
+    }
+
+    public Date getLoginTime() {
+        return loginTime;
+    }
+
+    public void setLoginTime(Date loginTime) {
+        this.loginTime = loginTime;
+    }
+
+    @Override
+    public String toString() {
+        return "AuthorizeLogDTO{" +
+                "clientIp='" + clientIp + '\'' +
+                ", userAgent='" + userAgent + '\'' +
+                ", loginTime=" + loginTime +
+                '}';
+    }
+}

base-servers/auth/auth-server/src/main/java/com/usoftchina/saas/auth/mapper/AuthorizeLogMapper.java

@@ -0,0 +1,29 @@
+package com.usoftchina.saas.auth.mapper;
+
+import com.usoftchina.saas.auth.po.AuthorizeLog;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * @author yingp
+ * @date 2018/11/6
+ */
+public interface AuthorizeLogMapper {
+    /**
+     * 保存
+     *
+     * @param authorizeLog
+     * @return
+     */
+    int insert(AuthorizeLog authorizeLog);
+
+    /**
+     * 查找个人日志
+     *
+     * @param appId
+     * @param accountId
+     * @return
+     */
+    List<AuthorizeLog> selectByAppIdAndAccountId(@Param("appId") String appId, @Param("accountId") Long accountId);
+}

base-servers/auth/auth-server/src/main/java/com/usoftchina/saas/auth/po/AuthorizeLog.java

@@ -0,0 +1,117 @@
+package com.usoftchina.saas.auth.po;
+
+import javax.servlet.http.HttpServletRequest;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author yingp
+ * @date 2018/11/6
+ */
+public class AuthorizeLog implements Serializable{
+    private Long id;
+    private Long accountId;
+    private String clientIp;
+    private String userAgent;
+    private Date loginTime;
+    private String appId;
+
+    public AuthorizeLog() {
+    }
+
+    public AuthorizeLog(Long accountId, String clientIp, String userAgent, String appId) {
+        this.accountId = accountId;
+        this.clientIp = clientIp;
+        this.userAgent = userAgent;
+        this.loginTime = new Date();
+        this.appId = appId;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getAccountId() {
+        return accountId;
+    }
+
+    public void setAccountId(Long accountId) {
+        this.accountId = accountId;
+    }
+
+    public String getClientIp() {
+        return clientIp;
+    }
+
+    public void setClientIp(String clientIp) {
+        this.clientIp = clientIp;
+    }
+
+    public String getUserAgent() {
+        return userAgent;
+    }
+
+    public void setUserAgent(String userAgent) {
+        this.userAgent = userAgent;
+    }
+
+    public Date getLoginTime() {
+        return loginTime;
+    }
+
+    public void setLoginTime(Date loginTime) {
+        this.loginTime = loginTime;
+    }
+
+    public String getAppId() {
+        return appId;
+    }
+
+    public void setAppId(String appId) {
+        this.appId = appId;
+    }
+
+    public static Builder from(HttpServletRequest request) {
+        return new Builder(request);
+    }
+
+    public static class Builder {
+        private Long accountId;
+        private String clientIp;
+        private String userAgent;
+        private String appId;
+
+        public Builder(HttpServletRequest request) {
+            this.clientIp = request.getRemoteAddr();
+            this.userAgent = request.getHeader("User-Agent");
+        }
+
+        public Builder setAccountId(Long accountId) {
+            this.accountId = accountId;
+            return this;
+        }
+
+        public Builder setClientIp(String clientIp) {
+            this.clientIp = clientIp;
+            return this;
+        }
+
+        public Builder setUserAgent(String userAgent) {
+            this.userAgent = userAgent;
+            return this;
+        }
+
+        public Builder setAppId(String appId) {
+            this.appId = appId;
+            return this;
+        }
+
+        public AuthorizeLog build() {
+            return new AuthorizeLog(accountId, clientIp, userAgent, appId);
+        }
+    }
+}

base-servers/auth/auth-server/src/main/java/com/usoftchina/saas/auth/service/AuthorizeCountService.java

@@ -0,0 +1,68 @@
+package com.usoftchina.saas.auth.service;
+
+import com.usoftchina.saas.cache.CacheKeyHelper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.stereotype.Service;
+
+import java.util.concurrent.TimeUnit;
+
+/**
+ * 登录失败记录
+ *
+ * @author yingp
+ * @date 2018/11/6
+ */
+@Service
+public class AuthorizeCountService {
+
+    @Autowired
+    private StringRedisTemplate redisTemplate;
+
+    @Value("${auth.max-errors:5}")
+    private int maxErrors;
+
+    /**
+     * 账户锁定时间
+     */
+    @Value("${auth.error-lock-time:30}")
+    private int lockTime;
+
+    /**
+     * 记录一次
+     *
+     * @param username
+     * @return
+     */
+    public Long increaseAndGet(String username) {
+        String key = generateKey(username);
+        Long value = redisTemplate.opsForValue().increment(key, 1);
+        redisTemplate.expire(key, lockTime, TimeUnit.MINUTES);
+        return value;
+    }
+
+    private String generateKey(String username) {
+        return CacheKeyHelper.generatePrivateKey("auth", "authorize", username);
+    }
+
+    /**
+     * 清零
+     *
+     * @param username
+     */
+    public void clear(String username) {
+        redisTemplate.delete(generateKey(username));
+    }
+
+    /**
+     * 账户是否冻结
+     *
+     * @param username
+     * @return
+     */
+    public boolean isFrozen(String username) {
+        Object value = redisTemplate.opsForValue().get(generateKey(username));
+        return null != value && Integer.parseInt(value.toString()) > maxErrors;
+    }
+}

base-servers/auth/auth-server/src/main/java/com/usoftchina/saas/auth/service/AuthorizeLogService.java

@@ -0,0 +1,28 @@
+package com.usoftchina.saas.auth.service;
+
+import com.github.pagehelper.PageInfo;
+import com.usoftchina.saas.auth.dto.AuthorizeLogDTO;
+import com.usoftchina.saas.auth.po.AuthorizeLog;
+import com.usoftchina.saas.page.PageRequest;
+
+/**
+ * @author yingp
+ * @date 2018/11/6
+ */
+public interface AuthorizeLogService {
+    /**
+     * 保存
+     *
+     * @param authorizeLog
+     * @return
+     */
+    boolean save(AuthorizeLog authorizeLog);
+
+    /**
+     * 分页查询
+     *
+     * @param page
+     * @return
+     */
+    PageInfo<AuthorizeLogDTO> findByPage(PageRequest page);
+}

base-servers/auth/auth-server/src/main/java/com/usoftchina/saas/auth/service/impl/AuthorizeLogServiceImpl.java

@@ -0,0 +1,42 @@
+package com.usoftchina.saas.auth.service.impl;
+
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.usoftchina.saas.auth.dto.AuthorizeLogDTO;
+import com.usoftchina.saas.auth.mapper.AuthorizeLogMapper;
+import com.usoftchina.saas.auth.po.AuthorizeLog;
+import com.usoftchina.saas.auth.service.AuthorizeLogService;
+import com.usoftchina.saas.context.BaseContextHolder;
+import com.usoftchina.saas.page.PageRequest;
+import com.usoftchina.saas.utils.BeanMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @author yingp
+ * @date 2018/11/6
+ */
+@Service
+public class AuthorizeLogServiceImpl implements AuthorizeLogService{
+
+    @Autowired
+    private AuthorizeLogMapper authorizeLogMapper;
+
+    @Override
+    @Async
+    public boolean save(AuthorizeLog authorizeLog) {
+        return authorizeLogMapper.insert(authorizeLog) > 0;
+    }
+
+    @Override
+    public PageInfo<AuthorizeLogDTO> findByPage(PageRequest page) {
+        PageHelper.startPage(page.getNumber(), page.getSize());
+        List<AuthorizeLog> logs = authorizeLogMapper.selectByAppIdAndAccountId(
+                BaseContextHolder.getAppId(), BaseContextHolder.getCompanyId()
+        );
+        return new PageInfo<>(BeanMapper.mapList(logs, AuthorizeLogDTO.class));
+    }
+}

base-servers/auth/auth-server/src/main/resources/application.yml

@@ -38,6 +38,9 @@ spring:
   redis:
     host: 192.168.253.12
     port: 6379
+  jackson:
+    date-format: yyyy-MM-dd HH:mm:ss
+    time-zone: GMT+8
 eureka:
   instance:
     leaseRenewalIntervalInSeconds: 10

base-servers/auth/auth-server/src/main/resources/mapper/AuthorizeLogMapper.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.usoftchina.saas.auth.mapper.AuthorizeLogMapper">
+    <insert id="insert">
+        insert into au_authorize_log(app_id,account_id,client_ip,user_agent,login_time)
+        values (#{appId,jdbcType=VARCHAR}, #{accountId,jdbcType=BIGINT}, #{clientIp,jdbcType=VARCHAR},
+        #{userAgent,jdbcType=VARCHAR}, #{loginTime,jdbcType=TIMESTAMP})
+    </insert>
+    <resultMap id="BaseResultMap" type="com.usoftchina.saas.auth.po.AuthorizeLog">
+        <id column="id" property="id" jdbcType="BIGINT" />
+        <result column="account_id" property="accountId" jdbcType="BIGINT" />
+        <result column="client_ip" property="clientIp" jdbcType="VARCHAR" />
+        <result column="user_agent" property="userAgent" jdbcType="VARCHAR" />
+        <result column="login_time" property="loginTime" jdbcType="TIMESTAMP" />
+        <result column="app_id" property="appId" jdbcType="VARCHAR" />
+    </resultMap>
+    <select id="selectByAppIdAndAccountId" resultMap="BaseResultMap">
+        select * from au_authorize_log where app_id=#{appId} and account_id=#{accountId}
+        order by login_time desc
+    </select>
+</mapper>

base-servers/auth/auth-server/src/test/java/com/usoftchina/saas/auth/controller/AuthControllerTest.java

@@ -0,0 +1,48 @@
+package com.usoftchina.saas.auth.controller;
+
+import com.github.pagehelper.PageInfo;
+import com.usoftchina.saas.auth.dto.AuthDTO;
+import com.usoftchina.saas.auth.dto.AuthorizeLogDTO;
+import com.usoftchina.saas.base.Result;
+import com.usoftchina.saas.test.BaseControllerTest;
+import com.usoftchina.saas.utils.JsonUtils;
+import org.junit.FixMethodOrder;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.MethodSorters;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.test.web.servlet.MvcResult;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest
+@FixMethodOrder(MethodSorters.NAME_ASCENDING)
+public class AuthControllerTest extends BaseControllerTest {
+
+    private static String TOKEN;
+
+    @Test
+    public void testA_authorize() throws Exception {
+        MvcResult mvcResult = mockMvc.perform(post("/authorize")
+                .param("username", "18888888888")
+                .param("password", "select111***"))
+                .andExpect(isSuccess())
+                .andReturn();
+        Result<AuthDTO> result = result(mvcResult, AuthDTO.class);
+        System.out.println(result.getData());
+        TOKEN = result.getData().getToken().getToken();
+    }
+
+    @Test
+    public void testB_getLogs() throws Exception {
+        MvcResult mvcResult = mockMvc.perform(get("/log")
+                .param("size", "5")
+                .header("Authorization", TOKEN))
+                .andExpect(isSuccess())
+                .andReturn();
+        Result<PageInfo<AuthorizeLogDTO>> result = result(mvcResult,
+                JsonUtils.getJavaType(PageInfo.class, AuthorizeLogDTO.class));
+        System.out.println(result.getData());
+    }
+
+}

base-servers/gateway-server/src/main/java/com/usoftchina/saas/gateway/config/AuthFilter.java

@@ -50,7 +50,7 @@ public class AuthFilter implements GlobalFilter, Ordered {
                 BaseContextHolder.setUserId(jwt.getUserId());
                 BaseContextHolder.setCompanyId(jwt.getCompanyId());
                 BaseContextHolder.setToken(token);
-                AccountDTO accountDTO = AccountCache.of(jwt.getUserId()).getAccount();
+                AccountDTO accountDTO = AccountCache.current().getAccount();
                 if (null == accountDTO) {
                     throw new BizException(ExceptionCode.USER_NOT_EXIST);
                 }
@@ -73,7 +73,7 @@ public class AuthFilter implements GlobalFilter, Ordered {
     private void checkPermission(ServerHttpRequest request, JwtInfo jwt, AccountDTO accountDTO) {
         if (!accountDTO.isAdmin(jwt.getCompanyId())) {
             // 非管理账户，需要鉴权
-            List<UrlResourceDTO> resources = ResourceCache.of(jwt.getAppId()).getUrlResources();
+            List<UrlResourceDTO> resources = ResourceCache.current().getUrlResources();
             if (!CollectionUtils.isEmpty(resources)) {
                 // 本次请求相关的资源
                 List<UrlResourceDTO> permissions = resources.parallelStream().filter(resource -> {

base-servers/gateway-server/src/main/resources/application.yml

@@ -107,6 +107,9 @@ spring:
   redis:
     host: 192.168.253.12
     port: 6379
+  jackson:
+    date-format: yyyy-MM-dd HH:mm:ss
+    time-zone: GMT+8
 server:
   port: 8560
   tomcat:

base-servers/ui-server/src/main/resources/application.yml

@@ -25,6 +25,9 @@ spring:
   data:
     mongodb:
       uri: mongodb://192.168.253.12:27017/saas_ui
+  jackson:
+    date-format: yyyy-MM-dd HH:mm:ss
+    time-zone: GMT+8
 server:
   port: 8620
   tomcat:

framework/core/pom.xml

@@ -34,6 +34,12 @@
             <scope>provided</scope>
             <optional>true</optional>
         </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-web</artifactId>
+            <scope>provided</scope>
+            <optional>true</optional>
+        </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>

framework/core/src/main/java/com/usoftchina/saas/base/Result.java

@@ -1,5 +1,6 @@
 package com.usoftchina.saas.base;
 
+import com.fasterxml.jackson.databind.JavaType;
 import com.usoftchina.saas.exception.BaseException;
 import com.usoftchina.saas.exception.BaseExceptionCode;
 import com.usoftchina.saas.utils.JsonUtils;
@@ -138,7 +139,19 @@ public class Result<T> implements Serializable {
      * @param <T>
      * @return
      */
-    public static <T> Result<T> fromJsonString(String jsonString, Class<T> targetCls) {
-        return JsonUtils.fromJsonString(jsonString, Result.class, targetCls);
+    public static <T> Result<T> fromJsonString(String jsonString, Class<T> targetClass) {
+        return JsonUtils.fromJsonString(jsonString, Result.class, targetClass);
+    }
+
+    /**
+     * json字符串转换Result对象
+     *
+     * @param jsonString
+     * @param targetType
+     * @param <T>
+     * @return
+     */
+    public static <T> Result<T> fromJsonString(String jsonString, JavaType targetType) {
+        return JsonUtils.fromJsonString(jsonString, JsonUtils.getJavaType(Result.class, targetType));
     }
 }

framework/core/src/main/java/com/usoftchina/saas/cache/BaseRedisCache.java

@@ -1,11 +1,9 @@
 package com.usoftchina.saas.cache;
 
-import com.usoftchina.saas.context.SpringContextHolder;
 import org.springframework.data.redis.core.RedisTemplate;
 
 import java.util.Objects;
 import java.util.Optional;
-import java.util.StringJoiner;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Supplier;
 
@@ -108,11 +106,7 @@ public abstract class BaseRedisCache<K, V> implements Cache<V> {
      * @return
      */
     protected String generatePrivateKey(CharSequence... values) {
-        return new StringJoiner(":")
-                .add(SpringContextHolder.getActiveProfile())
-                .add(SpringContextHolder.getApplicationName())
-                .add(String.join(":", values))
-                .toString();
+        return CacheKeyHelper.generatePrivateKey(values);
     }
 
     /**
@@ -123,9 +117,6 @@ public abstract class BaseRedisCache<K, V> implements Cache<V> {
      * @return
      */
     protected String generatePublicKey(CharSequence... values) {
-        return new StringJoiner(":")
-                .add(SpringContextHolder.getActiveProfile())
-                .add(String.join(":", values))
-                .toString();
+        return CacheKeyHelper.generatePublicKey(values);
     }
 }

framework/core/src/main/java/com/usoftchina/saas/cache/CacheKeyHelper.java

@@ -0,0 +1,40 @@
+package com.usoftchina.saas.cache;
+
+import com.usoftchina.saas.context.SpringContextHolder;
+
+import java.util.StringJoiner;
+
+/**
+ * @author yingp
+ * @date 2018/11/6
+ */
+public class CacheKeyHelper {
+    /**
+     * 产生key (每个应用会不一样)
+     * 规则：[env profile]:[application name]:[business key]
+     *
+     * @param values
+     * @return
+     */
+    public static String generatePrivateKey(CharSequence... values) {
+        return new StringJoiner(":")
+                .add(SpringContextHolder.getActiveProfile())
+                .add(SpringContextHolder.getApplicationName())
+                .add(String.join(":", values))
+                .toString();
+    }
+
+    /**
+     * 产生key (所有应用一样)
+     * 规则：[env profile]:[business key]
+     *
+     * @param values
+     * @return
+     */
+    public static String generatePublicKey(CharSequence... values) {
+        return new StringJoiner(":")
+                .add(SpringContextHolder.getActiveProfile())
+                .add(String.join(":", values))
+                .toString();
+    }
+}

framework/core/src/main/java/com/usoftchina/saas/exception/ExceptionCode.java

@@ -9,6 +9,7 @@ public enum ExceptionCode implements BaseExceptionCode {
     SYSTEM_BUSY(-1, "系统繁忙，请稍候再试"),
     SYSTEM_TIMEOUT(-2, "系统超时，请稍候再试"),
 
+    INVALID_DEFAULT_PAGE(10001, "无效默认分页参数"),
     // jwt token 相关 start
     // 过期
     JWT_TOKEN_EXPIRED(40001, "token超时，请检查 token 的有效期"),
@@ -21,6 +22,10 @@ public enum ExceptionCode implements BaseExceptionCode {
     JWT_APPID_SECRET_INVALID(40006, "获取 access_token 时 AppSecret 错误，或者 AppId 无效！"),
     JWT_APPID_ENABLED(40007, "AppId 已经被禁用！请联系管理员"),
 
+    // authorize相关
+    AUTH_MAX_ERRORS(43001, "超过登录次数限制，账户已被冻结，请30分钟后再尝试"),
+    AUTH_FROZEN(43002, "账户已被冻结，请30分钟后再尝试"),
+
     // 账户管理相关
     COMPANY_NAME_EXIST(52000, "公司名称已注册"),
     COMPANY_CODE_EXIST(52001, "公司商业登记证号已注册"),

framework/core/src/main/java/com/usoftchina/saas/page/PageDefault.java

@@ -0,0 +1,23 @@
+package com.usoftchina.saas.page;
+
+import java.lang.annotation.*;
+
+/**
+ * 默认分页参数
+ *
+ * @author yingp
+ * @date 2018/11/7
+ */
+@Documented
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.PARAMETER)
+public @interface PageDefault {
+    /**
+     * 页码
+     */
+    int number() default 1;
+    /**
+     * 每页条数
+     */
+    int size() default 20;
+}

framework/core/src/main/java/com/usoftchina/saas/page/PageRequest.java

@@ -16,6 +16,18 @@ public class PageRequest implements Serializable{
      */
     private int size;
 
+    public PageRequest() {
+    }
+
+    public PageRequest(int number, int size) {
+        this.number = number;
+        this.size = size;
+    }
+
+    public static PageRequest of(int number, int size) {
+        return new PageRequest(number, size);
+    }
+
     public int getNumber() {
         return number;
     }

framework/core/src/main/java/com/usoftchina/saas/page/PageRequestArgumentResolver.java

@@ -0,0 +1,96 @@
+package com.usoftchina.saas.page;
+
+import com.usoftchina.saas.exception.BizException;
+import com.usoftchina.saas.exception.ExceptionCode;
+import org.springframework.core.MethodParameter;
+import org.springframework.lang.Nullable;
+import org.springframework.util.StringUtils;
+import org.springframework.web.bind.support.WebDataBinderFactory;
+import org.springframework.web.context.request.NativeWebRequest;
+import org.springframework.web.method.support.HandlerMethodArgumentResolver;
+import org.springframework.web.method.support.ModelAndViewContainer;
+
+import java.util.Optional;
+
+/**
+ * 分页参数处理器，设置分页默认参数
+ *
+ * @author yingp
+ * @date 2018/11/7
+ */
+public class PageRequestArgumentResolver implements HandlerMethodArgumentResolver {
+
+    static final PageRequest DEFAULT_PAGE_REQUEST = PageRequest.of(1, 20);
+
+    private PageRequest fallbackPageable = DEFAULT_PAGE_REQUEST;
+
+    private static final int DEFAULT_MAX_PAGE_SIZE = 2000;
+
+    private int maxPageSize = DEFAULT_MAX_PAGE_SIZE;
+
+    @Nullable
+    @Override
+    public Object resolveArgument(MethodParameter parameter, @Nullable ModelAndViewContainer mavContainer, NativeWebRequest webRequest, @Nullable WebDataBinderFactory binderFactory) throws Exception {
+        PageRequest defaultOrFallback = getDefaultFromAnnotationOrFallback(parameter);
+
+        Optional<Integer> pageNumber = parseAndApplyBoundaries(webRequest.getParameter("number"),
+                Integer.MAX_VALUE);
+        Optional<Integer> pageSize = parseAndApplyBoundaries(webRequest.getParameter("size"),
+                maxPageSize);
+
+        int pn = pageNumber.orElseGet(defaultOrFallback::getNumber);
+        int ps = pageSize.orElseGet(defaultOrFallback::getSize);
+
+        return PageRequest.of(pn, ps);
+    }
+
+    @Override
+    public boolean supportsParameter(MethodParameter parameter) {
+        return parameter.hasParameterAnnotation(PageDefault.class);
+    }
+
+    private PageRequest getDefaultFromAnnotationOrFallback(MethodParameter parameter) {
+        PageDefault pageDefault = parameter.getParameterAnnotation(PageDefault.class);
+        if (pageDefault != null) {
+            return getDefaultPageRequestFrom(parameter, pageDefault);
+        }
+        return fallbackPageable;
+    }
+
+    private static PageRequest getDefaultPageRequestFrom(MethodParameter parameter, PageDefault pageDefault) {
+        Integer defaultPageNumber = pageDefault.number();
+        Integer defaultPageSize = pageDefault.size();
+
+        if (defaultPageNumber < 1 || defaultPageSize < 1) {
+            throw new BizException(ExceptionCode.INVALID_DEFAULT_PAGE);
+        }
+
+        return new PageRequest(defaultPageNumber, defaultPageSize);
+    }
+
+    /**
+     * Tries to parse the given {@link String} into an integer and applies the given boundaries. Will return 0 if the
+     * {@link String} cannot be parsed.
+     *
+     * @param parameter the parameter value.
+     * @param upper the upper bound to be applied.
+     * @return
+     */
+    private Optional<Integer> parseAndApplyBoundaries(@Nullable String parameter, int upper) {
+
+        if (!StringUtils.hasText(parameter)) {
+            return Optional.empty();
+        }
+
+        try {
+            int parsed = Integer.parseInt(parameter);
+            return Optional.of(parsed < 0 ? 0 : parsed > upper ? upper : parsed);
+        } catch (NumberFormatException e) {
+            return Optional.of(0);
+        }
+    }
+
+    public void setMaxPageSize(int maxPageSize) {
+        this.maxPageSize = maxPageSize;
+    }
+}

framework/core/src/main/java/com/usoftchina/saas/utils/JsonUtils.java

@@ -4,7 +4,9 @@ import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.JavaType;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
+import java.text.SimpleDateFormat;
 import java.util.List;
+import java.util.TimeZone;
 
 /**
  * @author yingp
@@ -12,7 +14,13 @@ import java.util.List;
  */
 public class JsonUtils {
 
-    private static ObjectMapper mapper = new ObjectMapper();
+    private static ObjectMapper mapper;
+
+    static {
+        mapper = new ObjectMapper()
+                .setDateFormat(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"))
+                .setTimeZone(TimeZone.getTimeZone("GMT+8"));
+    }
 
     public static String toJsonString(Object object) {
         try {
@@ -33,22 +41,14 @@ public class JsonUtils {
         }
     }
 
-    public static <T> T fromJsonString(String json, TypeReference valueTypeRef) {
-        if (StringUtils.isEmpty(json)) {
-            return null;
-        }
-        try {
-            return mapper.readValue(json, valueTypeRef);
-        } catch (Exception e) {
-            e.printStackTrace();
-            return null;
-        }
-    }
-
     public static JavaType getJavaType(Class<?> targetClass, Class<?>... elementClasses) {
         return mapper.getTypeFactory().constructParametricType(targetClass, elementClasses);
     }
 
+    public static JavaType getJavaType(Class<?> targetClass, JavaType... parameterTypes) {
+        return mapper.getTypeFactory().constructParametricType(targetClass, parameterTypes);
+    }
+
     public static <T> T fromJsonString(String json, Class<?> targetClass, Class<?>... elementClasses) {
         if (StringUtils.isEmpty(json)) {
             return null;

framework/server-starter/src/main/java/com/usoftchina/saas/server/web/DefaultWebMvcConfig.java

@@ -0,0 +1,29 @@
+package com.usoftchina.saas.server.web;
+
+import com.usoftchina.saas.page.PageRequestArgumentResolver;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.method.support.HandlerMethodArgumentResolver;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+import java.util.List;
+
+/**
+ * @author yingp
+ * @date 2018/11/7
+ */
+@Configuration
+public class DefaultWebMvcConfig implements WebMvcConfigurer{
+
+    @Bean
+    @ConditionalOnMissingBean
+    public PageRequestArgumentResolver pageRequestArgumentResolver() {
+        return new PageRequestArgumentResolver();
+    }
+
+    @Override
+    public void addArgumentResolvers(List<HandlerMethodArgumentResolver> resolvers) {
+        resolvers.add(pageRequestArgumentResolver());
+    }
+}

framework/test-starter/src/main/java/com.usoftchina.saas.test/BaseControllerTest.java

@@ -1,5 +1,6 @@
 package com.usoftchina.saas.test;
 
+import com.fasterxml.jackson.databind.JavaType;
 import com.usoftchina.saas.base.Result;
 import com.usoftchina.saas.utils.JsonUtils;
 import org.junit.Before;
@@ -110,9 +111,23 @@ public abstract class BaseControllerTest {
      * @return
      * @throws Exception
      */
-    public static <T> Result<T> result(MvcResult mvcResult, Class<T> targetCls) throws Exception {
+    public static <T> Result<T> result(MvcResult mvcResult, Class<T> targetClass) throws Exception {
         String content = mvcResult.getResponse().getContentAsString();
-        return Result.fromJsonString(content, targetCls);
+        return Result.fromJsonString(content, targetClass);
+    }
+
+    /**
+     * Result转换
+     *
+     * @param mvcResult
+     * @param targetType
+     * @param <T>
+     * @return
+     * @throws Exception
+     */
+    public static <T> Result<T> result(MvcResult mvcResult, JavaType targetType) throws Exception {
+        String content = mvcResult.getResponse().getContentAsString();
+        return Result.fromJsonString(content, targetType);
     }
 
 }

frontend/saas-web/app/view/core/query/QueryFormPanel.js

@@ -21,10 +21,10 @@ Ext.define('saas.view.core.query.QueryFormPanel', {
             'border-bottom': '1px solid #35baf6 !important'
         },
         items: ['->', {
-            xtype: 'button',
-            text: '更多查询',
-            handler: 'moreQuery'
-        }, {
+        //     xtype: 'button',
+        //     text: '更多查询',
+        //     handler: 'moreQuery'
+        // }, {
             xtype: 'button',
             text: '查询',
             handler: 'onQuery'

frontend/saas-web/app/view/core/query/QueryGridPanel.js

@@ -38,6 +38,7 @@ Ext.define('saas.view.core.query.QueryGridPanel', {
     initComponent: function () {
         var me = this;
         Ext.apply(me, {
+            columns: me.initColumns(),
             store: Ext.create('Ext.data.Store', {
                 fields: me.getFields(),
                 autoLoad: true,
@@ -96,9 +97,9 @@ Ext.define('saas.view.core.query.QueryGridPanel', {
                         mode = queryPanel.getQueryMode();
                         
                         if(mode=="MAIN"){
-                            me.reconfigure(store, me.baseColumn);
+                            me.reconfigure(store, me.initColumns(me.baseColumn));
                         }else{
-                            me.reconfigure(store, me.relativeColumn);
+                            me.reconfigure(store, me.initColumns(me.relativeColumn));
                         }
                     }
                 }
@@ -214,23 +215,10 @@ Ext.define('saas.view.core.query.QueryGridPanel', {
     listeners: {
         boxready: function(grid, width, height, eOpts) {
             var store = grid.getStore(),
-            dockedItems = grid.getDockedItems(),
-            toolbar = dockedItems[0],
-            header = dockedItems[1],
-            pagingtoolbar = dockedItems[2];
+            gridBodyBox = grid.body.dom.getBoundingClientRect(),
+            gridBodyBoxHeight = gridBodyBox.height;
 
-            var gridEl = grid.el.dom,
-            gridHeight = gridEl.getBoundingClientRect().height,
-            toolbarEl = toolbar.el.dom,
-            toolbarHeight = toolbarEl.getBoundingClientRect().height,
-            headerEl = header.el.dom,
-            headerHeight = headerEl.getBoundingClientRect().height,
-            pagingtoolbarEl = pagingtoolbar.el.dom,
-            pagingtoolbarHeight = pagingtoolbarEl.getBoundingClientRect().height;
-
-            var gridBodyHeight = gridHeight - toolbarHeight - headerHeight - pagingtoolbarHeight;
-
-            var pageSize = Math.floor(gridBodyHeight / 32);
+            var pageSize = Math.floor(gridBodyBoxHeight / 32);
 
             store.setPageSize(pageSize);
         },
@@ -246,6 +234,20 @@ Ext.define('saas.view.core.query.QueryGridPanel', {
             }
         },
     },
+    initColumns: function(columns) {
+        var me = this,
+        columns = columns || me.columns;
+
+        Ext.Array.each(columns, function(c) {
+            if(c.dataIndex == me.codeField) {
+                Ext.applyIf(c, {
+                    tdCls: 'x-querygrid-code-column'
+                });
+            }
+        });
+
+        return columns;
+    },
     getFields: function() {
         var me = this;
         return me.columns.filter(function(c) {

frontend/saas-web/app/view/core/query/QueryPanel.js

@@ -103,11 +103,6 @@ Ext.define('saas.view.core.query.QueryPanel', {
                     align: 'end'
                 });
             }
-            if(c.dataIndex == queryGridConfig.codeField) {
-                Ext.applyIf(c, {
-                    tdCls: 'x-querygrid-code-column'
-                });
-            }
         });
 
         if(columns[columns.length - 1].flex != 1) {

frontend/saas-web/app/view/core/report/ReportPanel.js

@@ -132,9 +132,6 @@ Ext.define('saas.view.core.report.ReportPanel', {
                 store: store,
                 columns: me.initColumns(),
                 dockedItems: [{
-                    style: {
-                        'border-top': '1px solid #35baf6 !important'
-                    },
                     xtype: 'pagingtoolbar',
                     dock: 'bottom',
                     displayInfo: true,
@@ -146,6 +143,19 @@ Ext.define('saas.view.core.report.ReportPanel', {
         me.callParent(arguments);
     },
 
+    listeners: {
+        boxready: function(p) {
+            var grid = p.down('grid');
+            var store = grid.getStore();
+            var gridBodyBox = grid.body.dom.getBoundingClientRect();
+            var gridBodyBoxHeight = gridBodyBox.height;
+
+            var pageSize = Math.floor(gridBodyBoxHeight / 32);
+
+            store.setPageSize(pageSize);
+        }
+    },
+
     getListGrid: function() {
         var me = this,
         grid = me.items.items[1];

frontend/saas-web/app/view/core/report/ReportPanel.scss

@@ -29,6 +29,11 @@
                     border-bottom: 1px solid #999;
                 }
             }
+
+            .x-toolbar-docked-bottom {
+                border-color: #999 !important;
+                border-width: 1px !important;
+            }
         }
     }
 }

frontend/saas-web/app/view/home/Home.js

@@ -15,7 +15,7 @@ Ext.define('saas.view.home.Home', {
         align: 'stretch'
     },
 
-    padding: '20',
+    bodyPadding: 5,
 
     defaults: {
         xtype: 'container'

frontend/saas-web/app/view/money/payBalance/FormPanel.js

@@ -89,6 +89,7 @@ Ext.define('saas.view.money.payBalance.FormPanel', {
         xtype: "detailGridField",
         storeModel: 'saas.model.money.PayBalance1',
         detnoColumn: 'pd_detno',
+        allowEmpty: true,
         deleteDetailUrl: '/api/money/paybalance/deleteDetail1/',
         columns: [{
             text: 'ID',
@@ -114,30 +115,32 @@ Ext.define('saas.view.money.payBalance.FormPanel', {
             text: '资金账户',
             dataIndex: 'pd_bankname',
             editable:false,
-            // xtype : "remotecombo",
-            // storeUrl:'/api/document/bankinformation/getCombo',
-            // name : "bk_bankname",
-            // fieldLabel : "资金账户",
-            // allowBlank : false, //不能为空
-            // columnWidth : 0.25,//布局
-            // hiddenBtn:false,//true 则会关闭新增按钮功能
-            // addHandler:function(b){
-            //     var document = Ext.create('saas.view.document.kind.Kind',{});
-            //     var form = this.ownerCmp.ownerCt;
-            //     this.dialog = form.getController().getView().add({
-            //         xtype: 'document-kind-childwin',
-            //         bind: {
-            //             title: '新增资金账户'
-            //         },
-            //         dataKind:'bankinformation',
-            //         belong:document.etc['bankinformation'],
-            //         _parent:form,
-            //         _combo:this.ownerCmp,
-            //         record:null,
-            //         session: true
-            //     });
-            //     this.dialog.show();
-            // }
+            editor:{
+                xtype : "remotecombo",
+                storeUrl:'/api/document/bankinformation/getCombo',
+                name : "bk_bankname",
+                allowBlank : false, //不能为空
+                columnWidth : 0.25,//布局
+                hiddenBtn:false,//true 则会关闭新增按钮功能
+                addHandler:function(b){
+                    var document = Ext.create('saas.view.document.kind.Kind',{});
+                    var form = this.ownerCmp.ownerCt;
+                    this.dialog = form.getController().getView().add({
+                        xtype: 'document-kind-childwin',
+                        bind: {
+                            title: '新增资金账户'
+                        },
+                        dataKind:'bankinformation',
+                        belong:document.etc['bankinformation'],
+                        _parent:form,
+                        _combo:this.ownerCmp,
+                        record:null,
+                        session: true
+                    });
+                    this.dialog.show();
+                }
+            }
+
         }, {
             text: "付款金额",
             dataIndex: "pd_amount",
@@ -190,14 +193,15 @@ Ext.define('saas.view.money.payBalance.FormPanel', {
             }
         }]
     }, {
-        xtype:'button',
-        text:'选择源单',
-        width:100
-
+        xtype:'dbfindtrigger',
+        columnWidth: 1,
+        fieldLabel:'选择源单',
+        name: 'choseSource'
     },{
         xtype: "detailGridField",
         storeModel: 'saas.model.money.PayBalance2',
         detnoColumn: 'pbd_detno',
+        allowEmpty: true,
         deleteDetailUrl: '/api/money/paybalance/deleteDetail2/',
         columns: [{
             text: 'ID',
@@ -255,7 +259,7 @@ Ext.define('saas.view.money.payBalance.FormPanel', {
             }
         }, {
             text: "已核销金额",
-            dataIndex: "pb_remark",
+            dataIndex: "pb_havebalance",
             // editor : {
             //     xtype : "numberfield",
             //     decimalPrecision: 2
@@ -275,7 +279,7 @@ Ext.define('saas.view.money.payBalance.FormPanel', {
             }
         }, {
             text: "未核销金额",
-            dataIndex: "pb_remark",
+            dataIndex: "pb_pbdamount",
             // editor : {
             //     xtype : "numberfield",
             //     decimalPrecision: 2

frontend/saas-web/app/view/money/payBalance/FormPanelController.js

@@ -100,6 +100,74 @@ Ext.define('saas.view.money.payBalance.FormPanelController', {
 
                 }
             },
+            'dbfindtrigger[name=choseSource]': {
+                beforerender: function (f) {
+                    Ext.apply(f, {
+                        dataUrl: '/api/money/subledger/list',
+                        addTitle: '源单资料',
+                        dbfinds: [{
+                            from: 'id',
+                            to: 'pbd_slid'
+                        }, {
+                            from: 'sl_code',
+                            to: 'pbd_slcode'
+                        },{
+                            from: 'sl_orderamount',
+                            to: 'pbd_amount'
+                        },{
+                            from: 'sl_yamount',
+                            to: 'pb_havebalance'
+                        },{
+                            from: 'sl_namount',
+                            to: 'pb_pbdamount'
+                        }],
+                        dbtpls: [{
+                            field: 'sl_code',
+                            width: 100
+                        }],
+                        defaultCondition: "sl_vendtid<>0 and sl_kind in ('期初余额','采购验收单','采购验退单') and sl_namount<>0",
+                        dbSearchFields:[{
+                            emptyText:'输入源单编号',
+                            xtype : "textfield",
+                            name : "search",
+                            getCondition: function(v) {
+                                return "(upper(sl_code) like '%"+v.toUpperCase()+"%')";
+                            },
+                            allowBlank : true,
+                            columnWidth : 0.25
+                        }],
+                        dbColumns:[{
+                            "text": "源单id",
+                            "hidden": true,
+                            "dataIndex": "id",
+                            "width": 100,
+                            "xtype": "numbercolumn"
+                        },{
+                            "text": "源单编号",
+                            "flex": 1,
+                            "dataIndex": "sl_code",
+                            "width": 100
+                        }, {
+                            "text": "单据金额",
+                            "flex": 1,
+                            "dataIndex": "sl_orderamount",
+                            "width": 100
+                        }, {
+                            "text": "已核销金额",
+                            "flex": 0,
+                            "dataIndex": "sl_yamount",
+                            "width": 200,
+                            "items": null
+                        }, {
+                            "text": "未核销金额",
+                            "flex": 1,
+                            "dataIndex": "sl_namount",
+                            "width": 100
+                        }]
+                    });
+
+                }
+            }
         });
 
     },

frontend/saas-web/app/view/money/recBalance/FormPanel.js

@@ -111,10 +111,32 @@ Ext.define('saas.view.money.recBalance.FormPanel', {
             hidden: true
         }, {
             text: '资金账户',
-            dataIndex: 'rd_bankname',
-            width : 200.0, 
-            editor: {
-                xtype: 'textfield'
+            dataIndex: 'pd_bankname',
+            editable:false,
+            editor:{
+                xtype : "remotecombo",
+                storeUrl:'/api/document/bankinformation/getCombo',
+                name : "bk_bankname",
+                allowBlank : false, //不能为空
+                columnWidth : 0.25,//布局
+                hiddenBtn:false,//true 则会关闭新增按钮功能
+                addHandler:function(b){
+                    var document = Ext.create('saas.view.document.kind.Kind',{});
+                    var form = this.ownerCmp.ownerCt;
+                    this.dialog = form.getController().getView().add({
+                        xtype: 'document-kind-childwin',
+                        bind: {
+                            title: '新增资金账户'
+                        },
+                        dataKind:'bankinformation',
+                        belong:document.etc['bankinformation'],
+                        _parent:form,
+                        _combo:this.ownerCmp,
+                        record:null,
+                        session: true
+                    });
+                    this.dialog.show();
+                }
             }
         }, {
             text: "收款金额",
@@ -167,11 +189,11 @@ Ext.define('saas.view.money.recBalance.FormPanel', {
                 xtype: 'textfield'
             }
         }]
-    }, {
-        xtype:'button',
-        text:'选择源单',
-        width:100
-
+    },{
+        xtype:'dbfindtrigger',
+        columnWidth: 1,
+        fieldLabel:'选择源单',
+        name: 'choseSource'
     },{
         xtype: "detailGridField",
         storeModel: 'saas.model.money.RecBalance2',

frontend/saas-web/app/view/money/recBalance/FormPanelController.js

@@ -154,8 +154,75 @@ Ext.define('saas.view.money.recBalance.FormPanelController', {
 
                 }
             },
-        });
+            'dbfindtrigger[name=choseSource]': {
+                beforerender: function (f) {
+                    Ext.apply(f, {
+                        dataUrl: '/api/money/subledger/list',
+                        addTitle: '源单资料',
+                        dbfinds: [{
+                            from: 'id',
+                            to: 'rbd_slid'
+                        }, {
+                            from: 'sl_code',
+                            to: 'rbd_slcode'
+                        },{
+                            from: 'sl_orderamount',
+                            to: 'rbd_amount'
+                        },{
+                            from: 'sl_yamount',
+                            to: 'rbd_havebalance'
+                        },{
+                            from: 'sl_namount',
+                            to: 'rbd_pbdamount'
+                        }],
+                        dbtpls: [{
+                            field: 'sl_code',
+                            width: 100
+                        }],
+                        defaultCondition: "sl_vendtid<>0 and sl_kind in ('期初余额','采购验收单','采购验退单') and sl_namount<>0",
+                        dbSearchFields:[{
+                            emptyText:'输入源单编号',
+                            xtype : "textfield",
+                            name : "search",
+                            getCondition: function(v) {
+                                return "(upper(sl_code) like '%"+v.toUpperCase()+"%')";
+                            },
+                            allowBlank : true,
+                            columnWidth : 0.25
+                        }],
+                        dbColumns:[{
+                            "text": "源单id",
+                            "hidden": true,
+                            "dataIndex": "id",
+                            "width": 100,
+                            "xtype": "numbercolumn"
+                        },{
+                            "text": "源单编号",
+                            "flex": 1,
+                            "dataIndex": "sl_code",
+                            "width": 100
+                        }, {
+                            "text": "单据金额",
+                            "flex": 1,
+                            "dataIndex": "sl_orderamount",
+                            "width": 100
+                        }, {
+                            "text": "已核销金额",
+                            "flex": 0,
+                            "dataIndex": "sl_yamount",
+                            "width": 200,
+                            "items": null
+                        }, {
+                            "text": "未核销金额",
+                            "flex": 1,
+                            "dataIndex": "sl_namount",
+                            "width": 100
+                        }]
+                    });
 
+                }
+            }
+        });
     },
     addCombo:function(){
         var combo=this.ownerCmp;

frontend/saas-web/app/view/purchase/purchase/QueryPanel.js

@@ -138,7 +138,7 @@ Ext.define('saas.view.purchase.purchase.QueryPanel', {
             text: 'id',
             dataIndex: 'pu_id',
             width: 100,
-            xtype: 'numbercolumn'
+            hidden: true
         }, {
             text: '单据编号',
             dataIndex: 'pu_code',

frontend/saas-web/app/view/sys/maxnumbers/DataList.js

@@ -74,32 +74,39 @@ Ext.define('saas.view.sys.maxnumbers.DataList', {
     }],
 
     columns : [{
-        text : "id", 
+        text : 'id', 
         width : 0, 
-        dataIndex : "id", 
-        xtype : "numbercolumn", 
+        dataIndex : 'id', 
+        xtype : 'numbercolumn', 
     },{
-        text : "单据名称", 
+        text : '单据名称', 
         width : 200.0, 
-        dataIndex : "mn_name", 
-        xtype : "", 
+        dataIndex : 'mn_name', 
+        xtype : '', 
     }, 
     {
-        text : "单据前缀", 
-        dataIndex : "mn_leadcode", 
+        text : '单据前缀', 
+        dataIndex : 'mn_leadcode', 
         width : 120.0, 
-        xtype : "", 
+        xtype : '', 
     }, 
     {
-        text : "单据规则", 
-        dataIndex : "mn_rule", 
-        width : 220.0, 
-        xtype : "", 
+        text : '单据规则', 
+        dataIndex : 'mn_rule', 
+        width : 220.0,
+        renderer: function(v) {
+            var o = {
+                yyyymmdd: '年月日',
+                yyyymm: '年月',
+                无: '无'
+            }
+            return o[v];
+        },
     },{
-        text : "流水长度", 
-        dataIndex : "mn_number", 
+        text : '流水长度', 
+        dataIndex : 'mn_number', 
         width : 120.0, 
-        xtype : "", 
+        xtype : '', 
     }],
 
     dbSearchFields: [],
@@ -132,7 +139,7 @@ Ext.define('saas.view.sys.maxnumbers.DataList', {
                     beforeload: function (store, op) {
                         var condition = me.condition;
                         if (Ext.isEmpty(condition)) {
-                            condition = "";
+                            condition = '';
                         }
                         Ext.apply(store.proxy.extraParams, {
                             number: op._page,

frontend/saas-web/resources/json/navigation.json

@@ -260,6 +260,11 @@
     "items": [{
         "text": "系统设置",
         "items": [{
+            "id":"sys-config-formpanel",
+            "text": "系统参数",
+            "viewType": "sys-config-formpanel",
+            "leaf": true
+        }, {
             "id":"sys-messagelog-datalist",
             "text": "操作日志",
             "viewType": "sys-messagelog-datalist",
@@ -274,11 +279,6 @@
             "text": "结账/反结账",
             "viewType": "sys-finish-datalist",
             "leaf": true
-        },{
-            "id":"sys-config-formpanel",
-            "text": "参数设置",
-            "viewType": "sys-config-formpanel",
-            "leaf": true
         }]
     }]
 }]

script/mysql/init/auth.sql

@@ -0,0 +1,11 @@
+CREATE DATABASE `saas_auth` DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci;
+use `saas_auth`;
+
+create table `au_authorize_log` (
+  id int unsigned primary key not null auto_increment,
+  app_id varchar(30) comment '应用',
+  account_id int unsigned not null comment '账号',
+  client_ip varchar(100) comment '客户端IP',
+  user_agent varchar(300) comment 'User Agent',
+  login_time datetime comment '登录时间'
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='登录日志';