提取项目公共模块，添加定时任务模块

.idea/misc.xml

@@ -9,6 +9,9 @@
     <option name="ignoredFiles">
       <set>
         <option value="$PROJECT_DIR$/carbon-admin/pom.xml" />
+        <option value="$PROJECT_DIR$/carbon-back/carbon-back-mbg/pom.xml" />
+        <option value="$PROJECT_DIR$/carbon-bank/carbon-bank-mbg/pom.xml" />
+        <option value="$PROJECT_DIR$/carbon-h5/carbon-h5-mbg/pom.xml" />
       </set>
     </option>
   </component>

carbon-api-mbg/pom.xml

@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>carbon-platform</artifactId>
+        <groupId>com.hcloud.microserver</groupId>
+        <version>0.0.1-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <name>carbon-api-mbg</name>
+    <artifactId>carbon-api-mbg</artifactId>
+    <packaging>jar</packaging>
+    <dependencies>
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>druid-spring-boot-starter</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.mybatis.generator</groupId>
+            <artifactId>mybatis-generator-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>javax.validation</groupId>
+            <artifactId>validation-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.mybatis</groupId>
+            <artifactId>mybatis</artifactId>
+        </dependency>
+        <!-- https://mvnrepository.com/artifact/io.github.openfeign/feign-core -->
+        <dependency>
+            <groupId>io.github.openfeign</groupId>
+            <artifactId>feign-core</artifactId>
+            <version>11.0</version>
+        </dependency>
+        <dependency>
+            <artifactId>common-core</artifactId>
+            <groupId>com.hcloud.microserver</groupId>
+            <version>0.0.1-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>com.hcloud.microserver</groupId>
+            <artifactId>common-core</artifactId>
+            <version>0.0.1-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.hcloud.microserver</groupId>
+            <artifactId>common-core</artifactId>
+            <version>0.0.1-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.hcloud.microserver</groupId>
+            <artifactId>common-core</artifactId>
+            <version>0.0.1-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
+    </dependencies>
+
+
+</project>

carbon-h5/carbon-h5-mbg/src/main/java/com/hcloud/microserver/h5/mbg/CommentGenerator.java

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.h5.mbg;
+package com.hcloud.microserver;
 
 import org.mybatis.generator.api.IntrospectedColumn;
 import org.mybatis.generator.api.IntrospectedTable;

carbon-h5/carbon-h5-mbg/src/main/java/com/hcloud/microserver/h5/mbg/Generator.java

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.h5.mbg;
+package com.hcloud.microserver;
 
 import org.mybatis.generator.api.MyBatisGenerator;
 import org.mybatis.generator.config.Configuration;

common-core/src/main/java/com/hcloud/microserver/commoncore/web/domain/BaseEntity.java

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.commoncore.web.domain;
+package com.hcloud.microserver.api.domain;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;

common-core/src/main/java/com/hcloud/microserver/commoncore/domain/FileDO.java

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.commoncore.domain;
+package com.hcloud.microserver.api.domain;
 
 import lombok.Data;
 import lombok.ToString;

common-core/src/main/java/com/hcloud/microserver/commoncore/domain/LoginUser.java

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.commoncore.domain;
+package com.hcloud.microserver.api.domain;
 
 
 

common-core/src/main/java/com/hcloud/microserver/commoncore/domain/LoginUserDetails.java

@@ -1,6 +1,5 @@
-package com.hcloud.microserver.commoncore.domain;
+package com.hcloud.microserver.api.domain;
 
-import com.hcloud.microserver.commoncore.domain.LoginUser;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.authority.SimpleGrantedAuthority;
 import org.springframework.security.core.userdetails.UserDetails;

common-core/src/main/java/com/hcloud/microserver/commoncore/domain/R.java

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.commoncore.domain;
+package com.hcloud.microserver.api.domain;
 
 
 import com.hcloud.microserver.commoncore.constant.Constants;

common-core/src/main/java/com/hcloud/microserver/commoncore/domain/SysDept.java

@@ -1,8 +1,8 @@
-package com.hcloud.microserver.commoncore.domain;
+package com.hcloud.microserver.api.domain;
 
-import com.hcloud.microserver.commoncore.web.domain.BaseEntity;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
+
+import org.apache.commons.lang.builder.ToStringBuilder;
+import org.apache.commons.lang.builder.ToStringStyle;
 
 import javax.validation.constraints.Email;
 import javax.validation.constraints.NotBlank;

common-core/src/main/java/com/hcloud/microserver/commoncore/domain/SysDictData.java

@@ -1,9 +1,8 @@
-package com.hcloud.microserver.commoncore.domain;
+package com.hcloud.microserver.api.domain;
 
 import com.hcloud.microserver.commoncore.annotation.Excel;
 import com.hcloud.microserver.commoncore.annotation.Excel.ColumnType;
 import com.hcloud.microserver.commoncore.constant.UserConstants;
-import com.hcloud.microserver.commoncore.web.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 

common-core/src/main/java/com/hcloud/microserver/commoncore/domain/SysOperLog.java

@@ -1,8 +1,7 @@
-package com.hcloud.microserver.commoncore.domain;
+package com.hcloud.microserver.api.domain;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.hcloud.microserver.commoncore.annotation.Excel;
-import com.hcloud.microserver.commoncore.web.domain.BaseEntity;
 
 
 import java.io.Serializable;

common-core/src/main/java/com/hcloud/microserver/commoncore/domain/SysRole.java

@@ -1,8 +1,7 @@
-package com.hcloud.microserver.commoncore.domain;
+package com.hcloud.microserver.api.domain;
 
 import com.hcloud.microserver.commoncore.annotation.Excel;
 import com.hcloud.microserver.commoncore.annotation.Excel.ColumnType;
-import com.hcloud.microserver.commoncore.web.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 

common-core/src/main/java/com/hcloud/microserver/commoncore/domain/SysUser.java

@@ -1,10 +1,9 @@
-package com.hcloud.microserver.commoncore.domain;
+package com.hcloud.microserver.api.domain;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 import com.hcloud.microserver.commoncore.annotation.Excel;
 import com.hcloud.microserver.commoncore.annotation.Excels;
-import com.hcloud.microserver.commoncore.web.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 

common-core/src/main/java/com/hcloud/microserver/commoncore/web/domain/TreeEntity.java

@@ -1,4 +1,6 @@
-package com.hcloud.microserver.commoncore.web.domain;
+package com.hcloud.microserver.api.domain;
+
+import com.hcloud.microserver.api.domain.BaseEntity;
 
 import java.util.ArrayList;
 import java.util.List;

carbon-api-mbg/src/main/java/com/hcloud/microserver/api/factory/PlatformLogFallbackFactory.java

@@ -0,0 +1,41 @@
+package com.hcloud.microserver.api.factory;
+
+import com.hcloud.microserver.api.domain.R;
+import com.hcloud.microserver.api.domain.SysOperLog;
+import com.hcloud.microserver.api.service.PlatformLogService;
+import feign.hystrix.FallbackFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Component;
+
+/**
+ * 日志服务降级处理
+ * 
+ * @author ruoyi
+ */
+@Component
+public class PlatformLogFallbackFactory implements FallbackFactory<PlatformLogService>
+{
+    private static final Logger log = LoggerFactory.getLogger(PlatformLogFallbackFactory.class);
+
+    @Override
+    public PlatformLogService create(Throwable throwable)
+    {
+        log.error("日志服务调用失败:{}", throwable.getMessage());
+        return new PlatformLogService()
+        {
+            @Override
+            public R<Boolean> saveLog(SysOperLog sysOperLog)
+            {
+                return null;
+            }
+
+            @Override
+            public R<Boolean> saveLogininfor(String username, String status, String message)
+            {
+                return null;
+            }
+        };
+
+    }
+}

carbon-api-mbg/src/main/java/com/hcloud/microserver/api/service/PlatformLogService.java

@@ -0,0 +1,39 @@
+package com.hcloud.microserver.api.service;
+
+import com.hcloud.microserver.api.domain.R;
+import com.hcloud.microserver.api.domain.SysOperLog;
+import com.hcloud.microserver.api.factory.PlatformLogFallbackFactory;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+
+/**
+ * 日志服务
+ * 
+ * @author ruoyi
+ */
+@FeignClient(contextId = "platformLogService", value = "system", fallbackFactory = PlatformLogFallbackFactory.class)
+public interface PlatformLogService
+{
+    /**
+     * 保存系统日志
+     *
+     * @param sysOperLog 日志实体
+     * @return 结果
+     */
+    @PostMapping("/operlog")
+    R<Boolean> saveLog(@RequestBody SysOperLog sysOperLog);
+
+    /**
+     * 保存访问记录
+     *
+     * @param username 用户名称
+     * @param status 状态
+     * @param message 消息
+     * @return 结果
+     */
+    @PostMapping("/logininfor")
+    R<Boolean> saveLogininfor(@RequestParam("username") String username, @RequestParam("status") String status,
+                              @RequestParam("message") String message);
+}

carbon-bank/carbon-bank-mbg/src/main/resources/generatorConfig.xml

@@ -15,7 +15,7 @@
         <plugin type="org.mybatis.generator.plugins.ToStringPlugin"/>
         <!--生成mapper.xml时覆盖原文件-->
         <plugin type="org.mybatis.generator.plugins.UnmergeableXmlMappersPlugin" />
-        <commentGenerator type="com.hcloud.microserver.bank.mbg.CommentGenerator">
+        <commentGenerator type="com.hcloud.microserver.CommentGenerator">
             <!-- 是否去除自动生成的注释 true：是 ： false:否 -->
             <property name="suppressAllComments" value="true"/>
             <property name="suppressDate" value="true"/>
@@ -30,15 +30,15 @@
             <property name="nullCatalogMeansCurrent" value="true" />
         </jdbcConnection>
 
-        <javaModelGenerator targetPackage="com.hcloud.microserver.bank.mbg.modul" targetProject="carbon-bank\carbon-bank-mbg\src\main\java"/>
+        <javaModelGenerator targetPackage="com.hcloud.microserver.mbg.modul" targetProject="carbon-api-mbg\src\main\java"/>
 
-        <sqlMapGenerator targetPackage="com.hcloud.microserver.bank.mbg.mapper" targetProject="carbon-bank\carbon-bank-mbg\src\main\resources"/>
+        <sqlMapGenerator targetPackage="com.hcloud.microserver.mbg.mapper" targetProject="carbon-api-mbg\src\main\resources"/>
 
-        <javaClientGenerator type="XMLMAPPER" targetPackage="com.hcloud.microserver.bank.mbg.mapper"
-                             targetProject="carbon-bank\carbon-bank-mbg\src\main\java"/>
+        <javaClientGenerator type="XMLMAPPER" targetPackage="com.hcloud.microserver.mbg.mapper"
+                             targetProject="carbon-api-mbg\src\main\java"/>
         <!--生成全部表tableName设为%-->
         <table tableName="b_%">
-            <generatedKey column="id" sqlStatement="MySql" identity="true"/>
+            <generatedKey column="guid" sqlStatement="MySql" identity="true"/>
         </table>
     </context>
 </generatorConfiguration>

carbon-back/carbon-back-common/pom.xml

@@ -24,6 +24,11 @@
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-openfeign</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.hcloud.microserver</groupId>
+            <artifactId>carbon-api-mbg</artifactId>
+            <version>0.0.1-SNAPSHOT</version>
+        </dependency>
     </dependencies>
 
 

carbon-back/carbon-back-common/src/main/java/com/hcloud/microserver/system/facade/carbon/entity/CollectiveFarmer.java

@@ -75,6 +75,12 @@ public class CollectiveFarmer implements Serializable {
     @ApiModelProperty("银行卡状态")
     private Integer bankStatus;
 
+    @ApiModelProperty("区域信息")
+    public PovertyArea povertyArea;
+
+    @ApiModelProperty("农户信息")
+    private List<FarmerInfo> farmerInfos;
+
     public String getBankCode() {
         return bankCode;
     }
@@ -91,7 +97,7 @@ public class CollectiveFarmer implements Serializable {
         this.bankStatus = bankStatus;
     }
 
-    private List<FarmerInfo> farmerInfos;
+
 
     public String getGuid() {
         return guid;

carbon-back/carbon-back-common/src/main/java/com/hcloud/microserver/system/facade/carbon/entity/FarmerInfo.java

@@ -2,6 +2,7 @@ package com.hcloud.microserver.system.facade.carbon.entity;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 import lombok.ToString;
 
 import java.io.Serializable;
@@ -9,6 +10,7 @@ import java.math.BigDecimal;
 import java.util.Date;
 
 @ToString
+@Data
 @ApiModel("农户info")
 public class FarmerInfo implements Serializable {
 
@@ -103,243 +105,4 @@ public class FarmerInfo implements Serializable {
     @ApiModelProperty("区域信息")
     private PovertyArea povertyArea;
 
-    public String getBankName() {
-        return bankName;
-    }
-
-    public void setBankName(String bankName) {
-        this.bankName = bankName;
-    }
-
-    public String getBankCode() {
-        return bankCode;
-    }
-
-    public void setBankCode(String bankCode) {
-        this.bankCode = bankCode;
-    }
-
-    public Integer getBankStatus() {
-        return bankStatus;
-    }
-
-    public void setBankStatus(Integer bankStatus) {
-        this.bankStatus = bankStatus;
-    }
-
-    public String getGuid() {
-        return guid;
-    }
-
-    public void setGuid(String guid) {
-        this.guid = guid == null ? null : guid.trim();
-    }
-
-    public String getFkPovertyAreaId() {
-        return fkPovertyAreaId;
-    }
-
-    public void setFkPovertyAreaId(String fkPovertyAreaId) {
-        this.fkPovertyAreaId = fkPovertyAreaId == null ? null : fkPovertyAreaId.trim();
-    }
-
-    public String getFkCollectiveId() {
-        return fkCollectiveId;
-    }
-
-    public void setFkCollectiveId(String fkCollectiveId) {
-        this.fkCollectiveId = fkCollectiveId == null ? null : fkCollectiveId.trim();
-    }
-
-    public String getFarmerCode() {
-        return farmerCode;
-    }
-
-    public void setFarmerCode(String farmerCode) {
-        this.farmerCode = farmerCode == null ? null : farmerCode.trim();
-    }
-
-    public String getFarmerName() {
-        return farmerName;
-    }
-
-    public void setFarmerName(String farmerName) {
-        this.farmerName = farmerName == null ? null : farmerName.trim();
-    }
-
-    public Integer getFamilyNum() {
-        return familyNum;
-    }
-
-    public void setFamilyNum(Integer familyNum) {
-        this.familyNum = familyNum;
-    }
-
-    public Integer getSex() {
-        return sex;
-    }
-
-    public void setSex(Integer sex) {
-        this.sex = sex;
-    }
-
-    public String getPid() {
-        return pid;
-    }
-
-    public void setPid(String pid) {
-        this.pid = pid == null ? null : pid.trim();
-    }
-
-    public String getNation() {
-        return nation;
-    }
-
-    public void setNation(String nation) {
-        this.nation = nation == null ? null : nation.trim();
-    }
-
-    public String getEducation() {
-        return education;
-    }
-
-    public void setEducation(String education) {
-        this.education = education == null ? null : education.trim();
-    }
-
-    public String getPhone() {
-        return phone;
-    }
-
-    public void setPhone(String phone) {
-        this.phone = phone == null ? null : phone.trim();
-    }
-
-    public String getBankCardNo() {
-        return bankCardNo;
-    }
-
-    public void setBankCardNo(String bankCardNo) {
-        this.bankCardNo = bankCardNo == null ? null : bankCardNo.trim();
-    }
-
-    public BigDecimal getIncomeVal() {
-        return incomeVal;
-    }
-
-    public void setIncomeVal(BigDecimal incomeVal) {
-        this.incomeVal = incomeVal;
-    }
-
-    public String getFarmerType() {
-        return farmerType;
-    }
-
-    public void setFarmerType(String farmerType) {
-        this.farmerType = farmerType == null ? null : farmerType.trim();
-    }
-
-    public String getFarmerRemark() {
-        return farmerRemark;
-    }
-
-    public void setFarmerRemark(String farmerRemark) {
-        this.farmerRemark = farmerRemark == null ? null : farmerRemark.trim();
-    }
-
-    public String getFarmerImages() {
-        return farmerImages;
-    }
-
-    public void setFarmerImages(String farmerImages) {
-        this.farmerImages = farmerImages == null ? null : farmerImages.trim();
-    }
-
-    public String getVillageOrg() {
-        return villageOrg;
-    }
-
-    public void setVillageOrg(String villageOrg) {
-        this.villageOrg = villageOrg == null ? null : villageOrg.trim();
-    }
-
-    public Integer getIsEnable() {
-        return isEnable;
-    }
-
-    public void setIsEnable(Integer isEnable) {
-        this.isEnable = isEnable;
-    }
-
-    public Integer getState() {
-        return state;
-    }
-
-    public void setState(Integer state) {
-        this.state = state;
-    }
-
-    public String getCreateUser() {
-        return createUser;
-    }
-
-    public void setCreateUser(String createUser) {
-        this.createUser = createUser == null ? null : createUser.trim();
-    }
-
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-
-    public String getModifiedUser() {
-        return modifiedUser;
-    }
-
-    public void setModifiedUser(String modifiedUser) {
-        this.modifiedUser = modifiedUser == null ? null : modifiedUser.trim();
-    }
-
-    public Date getModifiedTime() {
-        return modifiedTime;
-    }
-
-    public void setModifiedTime(Date modifiedTime) {
-        this.modifiedTime = modifiedTime;
-    }
-
-    public String getBankClearingMsg() {
-        return bankClearingMsg;
-    }
-
-    public void setBankClearingMsg(String bankClearingMsg) {
-        this.bankClearingMsg = bankClearingMsg == null ? null : bankClearingMsg.trim();
-    }
-
-    public BigDecimal getRecieveMoney() {
-        return recieveMoney;
-    }
-
-    public void setRecieveMoney(BigDecimal recieveMoney) {
-        this.recieveMoney = recieveMoney;
-    }
-
-    public BigDecimal getActualMoney() {
-        return actualMoney;
-    }
-
-    public void setActualMoney(BigDecimal actualMoney) {
-        this.actualMoney = actualMoney;
-    }
-
-    public PovertyArea getPovertyArea() {
-        return povertyArea;
-    }
-
-    public void setPovertyArea(PovertyArea povertyArea) {
-        this.povertyArea = povertyArea;
-    }
 }

carbon-back/carbon-back-common/src/main/java/com/hcloud/microserver/system/facade/carbon/entity/SubscriptionApply.java

@@ -2,7 +2,7 @@ package com.hcloud.microserver.system.facade.carbon.entity;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.hcloud.microserver.commoncore.annotation.Excel;
-import com.hcloud.microserver.commoncore.web.domain.BaseEntity;
+import com.hcloud.microserver.api.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;

carbon-back/carbon-back-common/src/main/java/com/hcloud/microserver/system/facade/carbon/forms/CollectiveFarmerForm.java

@@ -73,7 +73,7 @@ public class CollectiveFarmerForm extends BaseForm {
     private String condition;
 
     @ApiModelProperty("关联贫困户")
-    private List<FarmerInfoForm> farmerInfoForms;
+    private List<FarmerInfoForm> farmerInfos;
 
     @ApiModelProperty("省")
     private String provinceId;

carbon-back/carbon-back-mbg/pom.xml

@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>carbon-back</artifactId>
-        <groupId>com.hcloud.microserver</groupId>
-        <version>0.0.1-SNAPSHOT</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>carbon-back-mbg</artifactId>
-    <packaging>jar</packaging>
-    <dependencies>
-        <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>druid-spring-boot-starter</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.mybatis.generator</groupId>
-            <artifactId>mybatis-generator-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.jetbrains</groupId>
-            <artifactId>annotations</artifactId>
-            <version>RELEASE</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.jetbrains</groupId>
-            <artifactId>annotations</artifactId>
-            <version>RELEASE</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>javax.validation</groupId>
-            <artifactId>validation-api</artifactId>
-        </dependency>
-    </dependencies>
-
-
-</project>

carbon-back/carbon-back-mbg/src/main/java/com/hcloud/microserver/system/mbg/CommentGenerator.java

@@ -1,73 +0,0 @@
-package com.hcloud.microserver.system.mbg;
-
-import org.mybatis.generator.api.IntrospectedColumn;
-import org.mybatis.generator.api.IntrospectedTable;
-import org.mybatis.generator.api.dom.java.CompilationUnit;
-import org.mybatis.generator.api.dom.java.Field;
-import org.mybatis.generator.api.dom.java.FullyQualifiedJavaType;
-import org.mybatis.generator.internal.DefaultCommentGenerator;
-import org.mybatis.generator.internal.util.StringUtility;
-
-import java.util.Properties;
-
-/**
- * 自定义注释生成器
- * Created by macro on 2018/4/26.
- */
-public class CommentGenerator extends DefaultCommentGenerator {
-    private boolean addRemarkComments = false;
-    private static final String EXAMPLE_SUFFIX="Example";
-    private static final String API_MODEL_PROPERTY_FULL_CLASS_NAME="io.swagger.annotations.ApiModelProperty";
-
-    /**
-     * 设置用户配置的参数
-     */
-    @Override
-    public void addConfigurationProperties(Properties properties) {
-        super.addConfigurationProperties(properties);
-        this.addRemarkComments = StringUtility.isTrue(properties.getProperty("addRemarkComments"));
-    }
-
-    /**
-     * 给字段添加注释
-     */
-    @Override
-    public void addFieldComment(Field field, IntrospectedTable introspectedTable,
-                                IntrospectedColumn introspectedColumn) {
-        String remarks = introspectedColumn.getRemarks();
-        //根据参数和备注信息判断是否添加备注信息
-        if(addRemarkComments&& StringUtility.stringHasValue(remarks)){
-//            addFieldJavaDoc(field, remarks);
-            //数据库中特殊字符需要转义
-            if(remarks.contains("\"")){
-                remarks = remarks.replace("\"","'");
-            }
-            //给model的字段添加swagger注解
-            field.addJavaDocLine("@ApiModelProperty(value = \""+remarks+"\")");
-        }
-    }
-
-    /**
-     * 给model的字段添加注释
-     */
-    private void addFieldJavaDoc(Field field, String remarks) {
-        //文档注释开始
-        field.addJavaDocLine("/**");
-        //获取数据库字段的备注信息
-        String[] remarkLines = remarks.split(System.getProperty("line.separator"));
-        for(String remarkLine:remarkLines){
-            field.addJavaDocLine(" * "+remarkLine);
-        }
-        addJavadocTag(field, false);
-        field.addJavaDocLine(" */");
-    }
-
-    @Override
-    public void addJavaFileComment(CompilationUnit compilationUnit) {
-        super.addJavaFileComment(compilationUnit);
-        //只在model中添加swagger注解类的导入
-        if(!compilationUnit.isJavaInterface()&&!compilationUnit.getType().getFullyQualifiedName().contains(EXAMPLE_SUFFIX)){
-            compilationUnit.addImportedType(new FullyQualifiedJavaType(API_MODEL_PROPERTY_FULL_CLASS_NAME));
-        }
-    }
-}

carbon-back/carbon-back-mbg/src/main/java/com/hcloud/microserver/system/mbg/Generator.java

@@ -1,38 +0,0 @@
-package com.hcloud.microserver.system.mbg;
-
-import org.mybatis.generator.api.MyBatisGenerator;
-import org.mybatis.generator.config.Configuration;
-import org.mybatis.generator.config.xml.ConfigurationParser;
-import org.mybatis.generator.internal.DefaultShellCallback;
-
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * 用于生产MBG的代码
- * Created by macro on 2018/4/26.
- */
-public class Generator {
-    public static void main(String[] args) throws Exception {
-        //MBG 执行过程中的警告信息
-        List<String> warnings = new ArrayList<String>();
-        //当生成的代码重复时，覆盖原代码
-        boolean overwrite = true;
-        //读取我们的 MBG 配置文件
-        InputStream is = Generator.class.getResourceAsStream("/generatorConfig.xml");
-        ConfigurationParser cp = new ConfigurationParser(warnings);
-        Configuration config = cp.parseConfiguration(is);
-        is.close();
-
-        DefaultShellCallback callback = new DefaultShellCallback(overwrite);
-        //创建 MBG
-        MyBatisGenerator myBatisGenerator = new MyBatisGenerator(config, callback, warnings);
-        //执行生成代码
-        myBatisGenerator.generate(null);
-        //输出警告信息
-        for (String warning : warnings) {
-            System.out.println(warning);
-        }
-    }
-}

carbon-back/carbon-back-mbg/src/main/resources/generatorConfig.xml

@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE generatorConfiguration
-        PUBLIC "-//mybatis.org//DTD MyBatis Generator Configuration 1.0//EN"
-        "http://mybatis.org/dtd/mybatis-generator-config_1_0.dtd">
-
-<generatorConfiguration>
-    <properties resource="generator.properties"/>
-    <context id="MySqlContext" targetRuntime="MyBatis3" defaultModelType="flat">
-        <property name="beginningDelimiter" value="`"/>
-        <property name="endingDelimiter" value="`"/>
-        <property name="javaFileEncoding" value="UTF-8"/>
-        <!-- 为模型生成序列化方法-->
-        <plugin type="org.mybatis.generator.plugins.SerializablePlugin"/>
-        <!-- 为生成的Java模型创建一个toString方法 -->
-        <plugin type="org.mybatis.generator.plugins.ToStringPlugin"/>
-        <!--生成mapper.xml时覆盖原文件-->
-        <plugin type="org.mybatis.generator.plugins.UnmergeableXmlMappersPlugin" />
-        <commentGenerator type="com.hcloud.microserver.system.mbg.CommentGenerator">
-            <!-- 是否去除自动生成的注释 true：是 ： false:否 -->
-            <property name="suppressAllComments" value="true"/>
-            <property name="suppressDate" value="true"/>
-            <property name="addRemarkComments" value="true"/>
-        </commentGenerator>
-
-        <jdbcConnection driverClass="${jdbc.driverClass}"
-                        connectionURL="${jdbc.connectionURL}"
-                        userId="${jdbc.userId}"
-                        password="${jdbc.password}">
-            <!--解决mysql驱动升级到8.0后不生成指定数据库代码的问题-->
-            <property name="nullCatalogMeansCurrent" value="true" />
-        </jdbcConnection>
-
-        <javaModelGenerator targetPackage="com.hcloud.microserver.system.mbg.modul" targetProject="carbon-back\carbon-back-mbg\src\main\java"/>
-
-        <sqlMapGenerator targetPackage="com.hcloud.microserver.system.mbg.mapper" targetProject="carbon-back\carbon-back-mbg\src\main\resources"/>
-
-        <javaClientGenerator type="XMLMAPPER" targetPackage="com.hcloud.microserver.system.mbg.mapper"
-                             targetProject="carbon-back\carbon-back-mbg\src\main\java"/>
-        <!--生成全部表tableName设为%-->
-        <table tableName="t_subscription_apply"/>
-<!--            <generatedKey column="id" sqlStatement="MySql" identity="true"/>-->
-<!--        </table>-->
-    </context>
-</generatorConfiguration>

carbon-back/carbon-back-service/pom.xml

@@ -114,26 +114,7 @@
             <version>3.1</version>
 
         </dependency>
-        <dependency>
-            <artifactId>carbon-back-mbg</artifactId>
-            <groupId>com.hcloud.microserver</groupId>
-            <version>0.0.1-SNAPSHOT</version>
-        </dependency>
 
     </dependencies>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>repackage</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
+
 </project>

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/system/CarbonSystemApplication.java

@@ -19,7 +19,7 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
 @EnableDiscoveryClient
 @EnableTransactionManagement
 @ComponentScan(basePackages = "com.hcloud")
-@MapperScan(basePackages = {"com.hcloud.microserver.system.mbg.mapper",
+@MapperScan(basePackages = {"com.hcloud.microserver.mbg.mapper",
 "com.hcloud.microserver.system.mapper",
 "com.hcloud.microserver.system.bank.dao"})
 @SpringBootApplication

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/system/bank/controller/BaseDictionaryController.java

@@ -1,5 +1,6 @@
 package com.hcloud.microserver.system.bank.controller;
 
+import com.hcloud.microserver.security.annotation.PreAuthorize;
 import com.hcloud.microserver.system.bank.service.BaseDictionaryService;
 import com.hcloud.microserver.commoncore.base.BaseController;
 import com.hcloud.microserver.commoncore.base.ResponseBase;

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/system/bank/controller/FarmerInfoController.java

@@ -1,6 +1,7 @@
 package com.hcloud.microserver.system.bank.controller;
 
 import com.github.pagehelper.PageInfo;
+import com.hcloud.microserver.security.annotation.PreAuthorize;
 import com.hcloud.microserver.system.bank.service.FarmerInfoService;
 import com.hcloud.microserver.commoncore.base.BaseController;
 import com.hcloud.microserver.commoncore.base.ResponseBase;

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/system/bank/controller/PovertyAreaController.java

@@ -9,6 +9,7 @@ import com.hcloud.microserver.system.facade.carbon.forms.PovertyAreaForm;
 import com.hcloud.microserver.system.util.CurrUserUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -31,6 +32,13 @@ public class PovertyAreaController extends BaseController {
         return responseSuccess(list);
     }
 
+    @ApiOperation("分页查询贫困区域")
+    @GetMapping("/search")
+    public ResponseBase<List<PovertyArea>> search(@ApiParam("区域名称")@RequestParam(value = "name",required = true) String name) {
+        List<PovertyArea> list = this.povertyAreaService.listAll(name);
+        return responseResultSuccess(list);
+    }
+
     @ApiOperation("新增贫困区域")
     @PostMapping("/save")
     public ResponseBase save(@RequestBody PovertyAreaForm povertyAreaForm) {

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/system/bank/controller/base/NormalController.java

@@ -1,15 +1,14 @@
 package com.hcloud.microserver.system.bank.controller.base;
 
+import com.hcloud.microserver.api.domain.FileDO;
 import com.hcloud.microserver.commoncore.annotation.AuthCarbonValidate;
 import com.hcloud.microserver.commoncore.base.BaseController;
 import com.hcloud.microserver.commoncore.base.ResponseBase;
 import com.hcloud.microserver.commoncore.base.ResultVO;
-import com.hcloud.microserver.commoncore.domain.FileDO;
 import com.hcloud.microserver.commoncore.enums.ResultEnum;
 import com.hcloud.microserver.commoncore.util.FileType;
 import com.hcloud.microserver.commoncore.util.FileUtil;
 import io.swagger.annotations.*;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/system/bank/dao/PovertyAreaMapper.java

@@ -6,6 +6,7 @@ import com.hcloud.microserver.commoncore.base.BaseMapper;
 import com.hcloud.microserver.system.facade.carbon.entity.PovertyArea;
 import com.hcloud.microserver.system.facade.carbon.forms.PovertyAreaForm;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 
 import java.util.List;
@@ -31,6 +32,8 @@ public interface PovertyAreaMapper extends BaseMapper<PovertyArea, String> {
      */
     Page<PovertyArea> getPovertyAreaListByPage(PovertyAreaForm povertyAreaForm);
 
+    List<PovertyArea> listAll(@Param("name") String name);
+
     /**
      * 贫困区域基本信息（包含：统计信息）
      * @param guid

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/system/bank/service/PovertyAreaService.java

@@ -21,6 +21,7 @@ public interface PovertyAreaService {
 
     PageInfo<Page<Map>> queryListByPage(PovertyAreaForm povertyAreaForm);
     PageInfo<PovertyArea> getListByPage(PovertyAreaForm povertyAreaForm);
+    List<PovertyArea> listAll(String name);
 
     List<PovertyArea> areaTree();
 

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/system/bank/service/impl/CollectiveFarmerServiceImpl.java

@@ -141,7 +141,7 @@ public class CollectiveFarmerServiceImpl implements CollectiveFarmerService {
             collectiveFarmer.setState(1);
             collectiveFarmer.setCollectiveCode(getMaxCode());
 
-            List<FarmerInfoForm> farmerInfoForms = collectiveFarmerForm.getFarmerInfoForms();
+            List<FarmerInfoForm> farmerInfoForms = collectiveFarmerForm.getFarmerInfos();
             List<FarmerInfo> farmerInfos = new ArrayList<>();
             if (Objects.nonNull(farmerInfoForms) && farmerInfoForms.size() > 0) {
                 for (FarmerInfoForm farmerInfoForm : farmerInfoForms) {
@@ -152,8 +152,11 @@ public class CollectiveFarmerServiceImpl implements CollectiveFarmerService {
                     farmerInfo.setIsEnable(1);
                     farmerInfos.add(farmerInfo);
                 }
-                result = farmerInfoMapper.batchUpdate(farmerInfos);
-                if (result < 1) throw new RuntimeException("添加贫困集体户失败,批量更新贫困集体户失败");
+                for (FarmerInfo fa : farmerInfos){
+                    farmerInfoMapper.updateByPrimaryKey(fa);
+                }
+//                result = farmerInfoMapper.batchUpdate(farmerInfos);
+//                if (result < 1) throw new RuntimeException("添加贫困集体户失败,批量更新贫困集体户失败");
             }
 
             collectiveFarmer.setCollectivePersonNum(farmerInfos.size());
@@ -191,8 +194,11 @@ public class CollectiveFarmerServiceImpl implements CollectiveFarmerService {
                 }
                 if (Objects.nonNull(farmerInfos) && farmerInfos.size() > 0) {
                     // 批量更新贫困户
-                    result = this.farmerInfoMapper.batchUpdate(farmerInfos);
-                    if (result < 1) throw new RuntimeException("删除贫困集体失败 -- 批量更新贫困户出错(将贫困户的外键设置为null)");
+                    for (FarmerInfo fa : farmerInfos){
+                        farmerInfoMapper.updateByPrimaryKey(fa);
+                    }
+//                    result = this.farmerInfoMapper.batchUpdate(farmerInfos);
+//                    if (result < 1) throw new RuntimeException("删除贫困集体失败 -- 批量更新贫困户出错(将贫困户的外键设置为null)");
                 }
                 // 更新贫困集体
                 result = this.collectiveFarmerMapper.updateByPrimaryKey(collectiveFarmer);
@@ -236,12 +242,16 @@ public class CollectiveFarmerServiceImpl implements CollectiveFarmerService {
                 // 批量更新贫困户
                 if (Objects.nonNull(farmerInfosInDb) && farmerInfosInDb.size() > 0) {
                     log.info("farmerInfosInDb =========> {}", farmerInfosInDb);
-                    result = this.farmerInfoMapper.batchUpdate(farmerInfosInDb);
+
+                    for (FarmerInfo fa : farmerInfosInDb){
+                        farmerInfoMapper.updateByPrimaryKey(fa);
+                    }
+//                    result = this.farmerInfoMapper.batchUpdate(farmerInfosInDb);
                     if (result < 0) throw new RuntimeException("编辑贫困集体失败 -- 批量更新贫困户出错(将贫困户的外键设置为null)");
                 }
 
                 // 重新关联贫困户
-                List<FarmerInfoForm> farmerInfoForms = collectiveFarmerForm.getFarmerInfoForms();
+                List<FarmerInfoForm> farmerInfoForms = collectiveFarmerForm.getFarmerInfos();
                 if (Objects.nonNull(farmerInfoForms) && farmerInfoForms.size() > 0) {
                     List<FarmerInfo> farmerInfosToAdd = new ArrayList<>();
                     for (FarmerInfoForm farmerInfoForm : farmerInfoForms) {
@@ -250,9 +260,12 @@ public class CollectiveFarmerServiceImpl implements CollectiveFarmerService {
                         farmerInfo.setModifiedTime(new Date());
                         farmerInfosToAdd.add(farmerInfo);
                     }
-                    log.info("farmerInfosToAdd ==========> {}", farmerInfosToAdd);
-                    result = this.farmerInfoMapper.batchUpdate(farmerInfosToAdd);
-                    if (result < 1) throw new RuntimeException("编辑贫困集体失败 -- 批量更新贫困户出错(重新关联贫困户时失败)");
+                    for (FarmerInfo fa : farmerInfosToAdd){
+                        farmerInfoMapper.updateByPrimaryKey(fa);
+                    }
+//                    log.info("farmerInfosToAdd ==========> {}", farmerInfosToAdd);
+//                    result = this.farmerInfoMapper.batchUpdate(farmerInfosToAdd);
+//                    if (result < 1) throw new RuntimeException("编辑贫困集体失败 -- 批量更新贫困户出错(重新关联贫困户时失败)");
                     // 设置贫困户数
                     collectiveFarmer.setCollectivePersonNum(farmerInfosToAdd.size());
                 } else {

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/system/bank/service/impl/FarmerInfoServiceImpl.java

@@ -68,7 +68,9 @@ public class FarmerInfoServiceImpl implements FarmerInfoService {
             farmerInfo.setCreateTime(new Date());
             farmerInfo.setModifiedTime(new Date());
             farmerInfo.setState(1);
+            farmerInfo.setBankStatus(0);
             farmerInfo.setIsEnable(0);
+            farmerInfo.setBankStatus(0);
             return this.farmerInfoMapper.insertSelective(farmerInfo);
         }
         return 0;
@@ -78,7 +80,8 @@ public class FarmerInfoServiceImpl implements FarmerInfoService {
     public int softRemove(FarmerInfoForm farmerInfoForm) {
         if (Objects.nonNull(farmerInfoForm)) {
             String guid = farmerInfoForm.getGuid();
-            if (StringUtils.isNotEmpty(guid) && guid.matches("^\\w{32}$")) {
+            //&& guid.matches("^\\w{32}$")
+            if (StringUtils.isNotEmpty(guid) ) {
                 FarmerInfo farmerInfo = BeanCopyUtil.convertBean(farmerInfoForm, FarmerInfo.class);
                 farmerInfo.setState(0);
                 farmerInfo.setModifiedTime(new Date());

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/system/bank/service/impl/PovertyAreaServiceImpl.java

@@ -95,6 +95,19 @@ public class PovertyAreaServiceImpl implements PovertyAreaService {
         return null;
     }
 
+    @Override
+    public List<PovertyArea> listAll(String name) {
+        if (StringUtils.isEmpty(name)){
+            return null;
+        }
+        List<PovertyArea> list = povertyAreaMapper.listAll(name);
+        if (Objects.nonNull(list) && list.size() > 0) {
+            return list;
+        }
+
+        return null;
+    }
+
     @Override
     public List<PovertyArea> areaTree() {
         return null;

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/system/controller/SysDeptController.java

@@ -1,7 +1,7 @@
 package com.hcloud.microserver.system.controller;
 
 import com.hcloud.microserver.commoncore.constant.UserConstants;
-import com.hcloud.microserver.commoncore.domain.SysDept;
+import com.hcloud.microserver.api.domain.SysDept;
 import com.hcloud.microserver.commoncore.util.string.StringUtils;
 import com.hcloud.microserver.commoncore.web.controller.RyBaseController;
 import  com.hcloud.microserver.commoncore.web.domain.AjaxResult;

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/system/controller/SysDictDataController.java

@@ -8,7 +8,7 @@ import com.hcloud.microserver.system.log.annotation.Log;
 import com.hcloud.microserver.system.log.enums.BusinessType;
 import com.hcloud.microserver.security.annotation.PreAuthorize;
 import com.hcloud.microserver.security.util.SecurityUtils;
-import com.hcloud.microserver.commoncore.domain.SysDictData;
+import com.hcloud.microserver.api.domain.SysDictData;
 import com.hcloud.microserver.system.service.ISysDictDataService;
 import com.hcloud.microserver.system.service.ISysDictTypeService;
 import org.springframework.beans.factory.annotation.Autowired;

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/system/controller/SysOperlogController.java

@@ -7,7 +7,7 @@ import com.hcloud.microserver.commoncore.web.page.TableDataInfo;
 import com.hcloud.microserver.system.log.annotation.Log;
 import com.hcloud.microserver.system.log.enums.BusinessType;
 import com.hcloud.microserver.security.annotation.PreAuthorize;
-import com.hcloud.microserver.commoncore.domain.SysOperLog;
+import com.hcloud.microserver.api.domain.SysOperLog;
 import com.hcloud.microserver.system.service.ISysOperLogService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/system/controller/SysProfileController.java

@@ -7,8 +7,8 @@ import com.hcloud.microserver.security.service.TokenService;
 import com.hcloud.microserver.system.log.annotation.Log;
 import com.hcloud.microserver.system.log.enums.BusinessType;
 import com.hcloud.microserver.security.util.SecurityUtils;
-import com.hcloud.microserver.commoncore.domain.SysUser;
-import com.hcloud.microserver.commoncore.domain.LoginUser;
+import com.hcloud.microserver.api.domain.SysUser;
+import com.hcloud.microserver.api.domain.LoginUser;
 import com.hcloud.microserver.system.service.ISysUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/system/controller/SysRoleController.java

@@ -1,7 +1,7 @@
 package com.hcloud.microserver.system.controller;
 
 import com.hcloud.microserver.commoncore.constant.UserConstants;
-import com.hcloud.microserver.commoncore.domain.SysRole;
+import com.hcloud.microserver.api.domain.SysRole;
 import com.hcloud.microserver.commoncore.util.ExcelUtil;
 import com.hcloud.microserver.commoncore.web.controller.RyBaseController;
 import  com.hcloud.microserver.commoncore.web.domain.AjaxResult;

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/system/controller/SysUserController.java

@@ -1,9 +1,9 @@
 package com.hcloud.microserver.system.controller;
 
 import com.hcloud.microserver.commoncore.constant.UserConstants;
-import com.hcloud.microserver.commoncore.domain.LoginUser;
-import com.hcloud.microserver.commoncore.domain.R;
-import com.hcloud.microserver.commoncore.domain.SysUser;
+import com.hcloud.microserver.api.domain.LoginUser;
+import com.hcloud.microserver.api.domain.R;
+import com.hcloud.microserver.api.domain.SysUser;
 import com.hcloud.microserver.commoncore.util.string.StringUtils;
 import com.hcloud.microserver.commoncore.util.ExcelUtil;
 import com.hcloud.microserver.commoncore.web.controller.RyBaseController;
@@ -13,7 +13,7 @@ import com.hcloud.microserver.system.log.annotation.Log;
 import com.hcloud.microserver.system.log.enums.BusinessType;
 import com.hcloud.microserver.security.annotation.PreAuthorize;
 import com.hcloud.microserver.security.util.SecurityUtils;
-import com.hcloud.microserver.commoncore.domain.SysRole;
+import com.hcloud.microserver.api.domain.SysRole;
 
 import com.hcloud.microserver.system.service.ISysPermissionService;
 import com.hcloud.microserver.system.service.ISysPostService;

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/system/controller/SysUserOnlineController.java

@@ -9,7 +9,7 @@ import com.hcloud.microserver.security.service.SystemRedisService;
 import com.hcloud.microserver.system.log.annotation.Log;
 import com.hcloud.microserver.system.log.enums.BusinessType;
 import com.hcloud.microserver.security.annotation.PreAuthorize;
-import com.hcloud.microserver.commoncore.domain.LoginUser;
+import com.hcloud.microserver.api.domain.LoginUser;
 import com.hcloud.microserver.system.domain.SysUserOnline;
 import com.hcloud.microserver.system.service.ISysUserOnlineService;
 import org.springframework.beans.factory.annotation.Autowired;

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/system/controller/token/TokenController.java

@@ -1,13 +1,16 @@
 package com.hcloud.microserver.system.controller.token;
 
+import com.anji.captcha.model.common.ResponseModel;
+import com.anji.captcha.model.vo.CaptchaVO;
+import com.anji.captcha.service.CaptchaService;
 import com.hcloud.microserver.commoncore.constant.CacheConstants;
-import com.hcloud.microserver.commoncore.domain.LoginUser;
-import com.hcloud.microserver.commoncore.domain.R;
+import com.hcloud.microserver.api.domain.LoginUser;
+import com.hcloud.microserver.api.domain.R;
 import com.hcloud.microserver.commoncore.util.string.StringUtils;
 import com.hcloud.microserver.security.service.RedisService;
 import com.hcloud.microserver.security.service.TokenService;
-import com.hcloud.microserver.system.domain.LoginBody;
-import com.hcloud.microserver.commoncore.domain.LoginUserDetails;
+import com.hcloud.microserver.api.domain.LoginUserDetails;
+import com.hcloud.microserver.system.domain.LoginBodyCap;
 import com.hcloud.microserver.system.service.LoginUserManagerCacheService;
 import com.hcloud.microserver.system.service.impl.SysLoginService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -38,11 +41,22 @@ public class TokenController
     @Value("${jwt.tokenHead}")
     private String tokenHead;
 
+    @Autowired
+    private CaptchaService captchaService;
+
     @Autowired
     private RedisService systemRedisService;
     @PostMapping("/login")
-    public R<?> login(@RequestBody LoginBody form)
+    public R<?> login(@RequestBody LoginBodyCap form)
     {
+
+        CaptchaVO captchaVO = new CaptchaVO();
+        captchaVO.setCaptchaVerification(form.getCaptchaVerification());
+        ResponseModel model = captchaService.verification(captchaVO);
+
+        if(!model.isSuccess()){
+            return R.ok(model);
+        }
         // 用户登录
         LoginUserDetails userInfo = sysLoginService.login(form.getUsername(), form.getPassword());
         // 获取登录token

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/system/dataScope/aspect/DataScopeAspect.java

@@ -1,21 +1,19 @@
 package com.hcloud.microserver.system.dataScope.aspect;
 
 
-import com.hcloud.microserver.commoncore.domain.LoginUser;
-import com.hcloud.microserver.commoncore.domain.SysRole;
-import com.hcloud.microserver.commoncore.domain.SysUser;
+import com.hcloud.microserver.api.domain.LoginUser;
+import com.hcloud.microserver.api.domain.SysRole;
+import com.hcloud.microserver.api.domain.SysUser;
 import com.hcloud.microserver.commoncore.util.string.StringUtils;
-import com.hcloud.microserver.commoncore.web.domain.BaseEntity;
+import com.hcloud.microserver.api.domain.BaseEntity;
 import com.hcloud.microserver.security.service.TokenService;
 import com.hcloud.microserver.system.dataScope.annotation.DataScope;
 import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.Signature;
-import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.annotation.Before;
 import org.aspectj.lang.annotation.Pointcut;
 import org.aspectj.lang.reflect.MethodSignature;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
 
 import java.lang.reflect.Method;
 

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/system/domain/LoginBodyCap.java

@@ -0,0 +1,29 @@
+package com.hcloud.microserver.system.domain;
+
+import com.anji.captcha.model.vo.CaptchaVO;
+import lombok.Data;
+
+@Data
+public class LoginBodyCap {
+    private static final long serialVersionUID = 1L;
+    /**
+     * 用户名
+     */
+    private String username;
+
+    /**
+     * 用户密码
+     */
+    private String password;
+
+    /**
+     * 验证码
+     */
+    private String code;
+
+    /**
+     * 唯一标识
+     */
+    private String uuid = "";
+    private String captchaVerification;
+}

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/system/domain/SysConfig.java

@@ -4,7 +4,7 @@ package com.hcloud.microserver.system.domain;
 import com.hcloud.microserver.commoncore.annotation.Excel;
 import com.hcloud.microserver.commoncore.annotation.Excel.ColumnType;
 
-import com.hcloud.microserver.commoncore.web.domain.BaseEntity;
+import com.hcloud.microserver.api.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/system/domain/SysDictType.java

@@ -2,7 +2,7 @@ package com.hcloud.microserver.system.domain;
 
 import com.hcloud.microserver.commoncore.annotation.Excel;
 import com.hcloud.microserver.commoncore.annotation.Excel.ColumnType;
-import com.hcloud.microserver.commoncore.web.domain.BaseEntity;
+import com.hcloud.microserver.api.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/system/domain/SysLogininfor.java

@@ -3,7 +3,7 @@ package com.hcloud.microserver.system.domain;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.hcloud.microserver.commoncore.annotation.Excel;
 import com.hcloud.microserver.commoncore.annotation.Excel.ColumnType;
-import com.hcloud.microserver.commoncore.web.domain.BaseEntity;
+import com.hcloud.microserver.api.domain.BaseEntity;
 
 import java.util.Date;
 

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/system/domain/SysMenu.java

@@ -1,6 +1,6 @@
 package com.hcloud.microserver.system.domain;
 
-import com.hcloud.microserver.commoncore.web.domain.BaseEntity;
+import com.hcloud.microserver.api.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/system/domain/SysNotice.java

@@ -1,6 +1,6 @@
 package com.hcloud.microserver.system.domain;
 
-import com.hcloud.microserver.commoncore.web.domain.BaseEntity;
+import com.hcloud.microserver.api.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/system/domain/SysPost.java

@@ -2,7 +2,7 @@ package com.hcloud.microserver.system.domain;
 
 import com.hcloud.microserver.commoncore.annotation.Excel;
 import com.hcloud.microserver.commoncore.annotation.Excel.ColumnType;
-import com.hcloud.microserver.commoncore.web.domain.BaseEntity;
+import com.hcloud.microserver.api.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/system/domain/vo/TreeSelect.java

@@ -1,7 +1,7 @@
 package com.hcloud.microserver.system.domain.vo;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
-import com.hcloud.microserver.commoncore.domain.SysDept;
+import com.hcloud.microserver.api.domain.SysDept;
 import com.hcloud.microserver.system.domain.SysMenu;
 
 import java.io.Serializable;

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/system/log/aspect/LogAspect.java

@@ -2,7 +2,7 @@ package com.hcloud.microserver.system.log.aspect;
 
 import com.alibaba.fastjson.JSON;
 
-import com.hcloud.microserver.commoncore.domain.SysOperLog;
+import com.hcloud.microserver.api.domain.SysOperLog;
 import com.hcloud.microserver.commoncore.constant.CacheConstants;
 import com.hcloud.microserver.commoncore.util.ServletUtils;
 import com.hcloud.microserver.commoncore.util.ip.IpUtils;

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/system/log/service/AsyncLogService.java

@@ -1,7 +1,7 @@
 package com.hcloud.microserver.system.log.service;
 
 
-import com.hcloud.microserver.commoncore.domain.SysOperLog;
+import com.hcloud.microserver.api.domain.SysOperLog;
 import com.hcloud.microserver.system.service.ISysOperLogService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/system/mapper/SysDeptMapper.java

@@ -1,6 +1,6 @@
 package com.hcloud.microserver.system.mapper;
 
-import com.hcloud.microserver.commoncore.domain.SysDept;
+import com.hcloud.microserver.api.domain.SysDept;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/system/mapper/SysDictDataMapper.java

@@ -1,6 +1,6 @@
 package com.hcloud.microserver.system.mapper;
 
-import com.hcloud.microserver.commoncore.domain.SysDictData;
+import com.hcloud.microserver.api.domain.SysDictData;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/system/mapper/SysOperLogMapper.java

@@ -1,6 +1,6 @@
 package com.hcloud.microserver.system.mapper;
 
-import com.hcloud.microserver.commoncore.domain.SysOperLog;
+import com.hcloud.microserver.api.domain.SysOperLog;
 
 import java.util.List;
 

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/system/mapper/SysRoleMapper.java

@@ -1,6 +1,6 @@
 package com.hcloud.microserver.system.mapper;
 
-import com.hcloud.microserver.commoncore.domain.SysRole;
+import com.hcloud.microserver.api.domain.SysRole;
 
 import java.util.List;
 

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/system/mapper/SysUserMapper.java

@@ -1,6 +1,6 @@
 package com.hcloud.microserver.system.mapper;
 
-import com.hcloud.microserver.commoncore.domain.SysUser;
+import com.hcloud.microserver.api.domain.SysUser;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/system/service/ISysDeptService.java

@@ -1,6 +1,6 @@
 package com.hcloud.microserver.system.service;
 
-import com.hcloud.microserver.commoncore.domain.SysDept;
+import com.hcloud.microserver.api.domain.SysDept;
 import com.hcloud.microserver.system.domain.vo.TreeSelect;
 
 import java.util.List;

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/system/service/ISysDictDataService.java

@@ -1,6 +1,6 @@
 package com.hcloud.microserver.system.service;
 
-import com.hcloud.microserver.commoncore.domain.SysDictData;
+import com.hcloud.microserver.api.domain.SysDictData;
 
 import java.util.List;
 

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/system/service/ISysDictTypeService.java

@@ -1,6 +1,6 @@
 package com.hcloud.microserver.system.service;
 
-import com.hcloud.microserver.commoncore.domain.SysDictData;
+import com.hcloud.microserver.api.domain.SysDictData;
 import com.hcloud.microserver.system.domain.SysDictType;
 
 import java.util.List;

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/system/service/ISysLogininforService.java

@@ -1,6 +1,6 @@
 package com.hcloud.microserver.system.service;
 
-import com.hcloud.microserver.commoncore.domain.LoginUserDetails;
+import com.hcloud.microserver.api.domain.LoginUserDetails;
 import com.hcloud.microserver.system.domain.SysLogininfor;
 
 import java.util.List;

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/system/service/ISysOperLogService.java

@@ -1,6 +1,6 @@
 package com.hcloud.microserver.system.service;
 
-import com.hcloud.microserver.commoncore.domain.SysOperLog;
+import com.hcloud.microserver.api.domain.SysOperLog;
 
 import java.util.List;
 

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/system/service/ISysRoleService.java

@@ -1,6 +1,6 @@
 package com.hcloud.microserver.system.service;
 
-import com.hcloud.microserver.commoncore.domain.SysRole;
+import com.hcloud.microserver.api.domain.SysRole;
 
 import java.util.List;
 import java.util.Set;

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/system/service/ISysUserOnlineService.java

@@ -1,6 +1,6 @@
 package com.hcloud.microserver.system.service;
 
-import com.hcloud.microserver.commoncore.domain.LoginUser;
+import com.hcloud.microserver.api.domain.LoginUser;
 import com.hcloud.microserver.system.domain.SysUserOnline;
 
 /**

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/system/service/ISysUserService.java

@@ -1,7 +1,7 @@
 package com.hcloud.microserver.system.service;
 
-import com.hcloud.microserver.commoncore.domain.SysUser;
-import com.hcloud.microserver.commoncore.domain.LoginUserDetails;
+import com.hcloud.microserver.api.domain.SysUser;
+import com.hcloud.microserver.api.domain.LoginUserDetails;
 
 import java.util.List;
 

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/system/service/LoginUserManagerCacheService.java

@@ -1,7 +1,7 @@
 package com.hcloud.microserver.system.service;
 
 
-import com.hcloud.microserver.commoncore.domain.LoginUser;
+import com.hcloud.microserver.api.domain.LoginUser;
 
 /**
  * 后台用户缓存操作类

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/system/service/impl/LoginUserManagerCacheServiceImpl.java

@@ -1,6 +1,6 @@
 package com.hcloud.microserver.system.service.impl;
 
-import com.hcloud.microserver.commoncore.domain.LoginUser;
+import com.hcloud.microserver.api.domain.LoginUser;
 import com.hcloud.microserver.security.service.RedisService;
 
 import com.hcloud.microserver.system.service.LoginUserManagerCacheService;

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/system/service/impl/SysDeptServiceImpl.java

@@ -1,11 +1,11 @@
 package com.hcloud.microserver.system.service.impl;
 
 import com.hcloud.microserver.commoncore.constant.UserConstants;
-import com.hcloud.microserver.commoncore.domain.SysDept;
+import com.hcloud.microserver.api.domain.SysDept;
 import com.hcloud.microserver.commoncore.exception.CustomException;
 import com.hcloud.microserver.commoncore.util.string.StringUtils;
 import com.hcloud.microserver.system.dataScope.annotation.DataScope;
-import com.hcloud.microserver.commoncore.domain.SysRole;
+import com.hcloud.microserver.api.domain.SysRole;
 import com.hcloud.microserver.system.domain.vo.TreeSelect;
 import com.hcloud.microserver.system.mapper.SysDeptMapper;
 import com.hcloud.microserver.system.mapper.SysRoleMapper;

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/system/service/impl/SysDictDataServiceImpl.java

@@ -1,6 +1,6 @@
 package com.hcloud.microserver.system.service.impl;
 
-import com.hcloud.microserver.commoncore.domain.SysDictData;
+import com.hcloud.microserver.api.domain.SysDictData;
 import com.hcloud.microserver.system.mapper.SysDictDataMapper;
 import com.hcloud.microserver.system.service.ISysDictDataService;
 import com.hcloud.microserver.system.utils.DictUtils;

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/system/service/impl/SysDictTypeServiceImpl.java

@@ -3,7 +3,7 @@ package com.hcloud.microserver.system.service.impl;
 import com.hcloud.microserver.commoncore.constant.UserConstants;
 import com.hcloud.microserver.commoncore.exception.CustomException;
 import com.hcloud.microserver.commoncore.util.string.StringUtils;
-import com.hcloud.microserver.commoncore.domain.SysDictData;
+import com.hcloud.microserver.api.domain.SysDictData;
 import com.hcloud.microserver.system.domain.SysDictType;
 import com.hcloud.microserver.system.mapper.SysDictDataMapper;
 import com.hcloud.microserver.system.mapper.SysDictTypeMapper;

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/system/service/impl/SysLoginService.java

@@ -2,15 +2,15 @@ package com.hcloud.microserver.system.service.impl;
 
 import com.hcloud.microserver.commoncore.constant.Constants;
 import com.hcloud.microserver.commoncore.constant.UserConstants;
-import com.hcloud.microserver.commoncore.domain.LoginUser;
-import com.hcloud.microserver.commoncore.domain.R;
-import com.hcloud.microserver.commoncore.domain.SysUser;
+import com.hcloud.microserver.api.domain.LoginUser;
+import com.hcloud.microserver.api.domain.R;
+import com.hcloud.microserver.api.domain.SysUser;
 import com.hcloud.microserver.commoncore.enums.UserStatus;
 import com.hcloud.microserver.commoncore.util.ServletUtils;
 import com.hcloud.microserver.commoncore.util.ip.IpUtils;
 import com.hcloud.microserver.commoncore.util.string.StringUtils;
 import com.hcloud.microserver.security.util.SecurityUtils;
-import com.hcloud.microserver.commoncore.domain.LoginUserDetails;
+import com.hcloud.microserver.api.domain.LoginUserDetails;
 import com.hcloud.microserver.system.domain.SysLogininfor;
 import com.hcloud.microserver.system.service.ISysLogininforService;
 import com.hcloud.microserver.system.service.ISysPermissionService;

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/system/service/impl/SysLogininforServiceImpl.java

@@ -1,6 +1,6 @@
 package com.hcloud.microserver.system.service.impl;
 
-import com.hcloud.microserver.commoncore.domain.LoginUserDetails;
+import com.hcloud.microserver.api.domain.LoginUserDetails;
 import com.hcloud.microserver.system.domain.SysLogininfor;
 import com.hcloud.microserver.system.mapper.SysLogininforMapper;
 import com.hcloud.microserver.system.service.ISysLogininforService;

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/system/service/impl/SysMenuServiceImpl.java

@@ -3,8 +3,8 @@ package com.hcloud.microserver.system.service.impl;
 import com.hcloud.microserver.commoncore.constant.UserConstants;
 import com.hcloud.microserver.commoncore.util.string.StringUtils;
 import com.hcloud.microserver.security.util.SecurityUtils;
-import com.hcloud.microserver.commoncore.domain.SysRole;
-import com.hcloud.microserver.commoncore.domain.SysUser;
+import com.hcloud.microserver.api.domain.SysRole;
+import com.hcloud.microserver.api.domain.SysUser;
 import com.hcloud.microserver.system.domain.SysMenu;
 import com.hcloud.microserver.system.domain.vo.MetaVo;
 import com.hcloud.microserver.system.domain.vo.RouterVo;

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/system/service/impl/SysOperLogServiceImpl.java

@@ -1,6 +1,6 @@
 package com.hcloud.microserver.system.service.impl;
 
-import com.hcloud.microserver.commoncore.domain.SysOperLog;
+import com.hcloud.microserver.api.domain.SysOperLog;
 import com.hcloud.microserver.system.mapper.SysOperLogMapper;
 import com.hcloud.microserver.system.service.ISysOperLogService;
 import org.springframework.beans.factory.annotation.Autowired;

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/system/service/impl/SysPermissionServiceImpl.java

@@ -1,6 +1,6 @@
 package com.hcloud.microserver.system.service.impl;
 
-import com.hcloud.microserver.commoncore.domain.SysUser;
+import com.hcloud.microserver.api.domain.SysUser;
 import com.hcloud.microserver.system.service.ISysMenuService;
 import com.hcloud.microserver.system.service.ISysPermissionService;
 import com.hcloud.microserver.system.service.ISysRoleService;

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/system/service/impl/SysRoleServiceImpl.java

@@ -5,7 +5,7 @@ import com.hcloud.microserver.commoncore.exception.CustomException;
 import com.hcloud.microserver.commoncore.util.SpringUtils;
 import com.hcloud.microserver.commoncore.util.string.StringUtils;
 import com.hcloud.microserver.system.dataScope.annotation.DataScope;
-import com.hcloud.microserver.commoncore.domain.SysRole;
+import com.hcloud.microserver.api.domain.SysRole;
 import com.hcloud.microserver.system.domain.SysRoleDept;
 import com.hcloud.microserver.system.domain.SysRoleMenu;
 import com.hcloud.microserver.system.mapper.SysRoleDeptMapper;

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/system/service/impl/SysUserOnlineServiceImpl.java

@@ -1,7 +1,7 @@
 package com.hcloud.microserver.system.service.impl;
 
 import com.hcloud.microserver.commoncore.util.string.StringUtils;
-import com.hcloud.microserver.commoncore.domain.LoginUser;
+import com.hcloud.microserver.api.domain.LoginUser;
 import com.hcloud.microserver.system.domain.SysUserOnline;
 import com.hcloud.microserver.system.service.ISysUserOnlineService;
 import org.springframework.stereotype.Service;

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/system/service/impl/SysUserServiceImpl.java

@@ -1,14 +1,14 @@
 package com.hcloud.microserver.system.service.impl;
 
 import com.hcloud.microserver.commoncore.constant.UserConstants;
-import com.hcloud.microserver.commoncore.domain.LoginUser;
+import com.hcloud.microserver.api.domain.LoginUser;
 import com.hcloud.microserver.commoncore.exception.CustomException;
 import com.hcloud.microserver.commoncore.util.string.StringUtils;
 import com.hcloud.microserver.system.dataScope.annotation.DataScope;
 import com.hcloud.microserver.security.util.SecurityUtils;
-import com.hcloud.microserver.commoncore.domain.SysRole;
-import com.hcloud.microserver.commoncore.domain.SysUser;
-import com.hcloud.microserver.commoncore.domain.LoginUserDetails;
+import com.hcloud.microserver.api.domain.SysRole;
+import com.hcloud.microserver.api.domain.SysUser;
+import com.hcloud.microserver.api.domain.LoginUserDetails;
 import com.hcloud.microserver.system.domain.SysPost;
 import com.hcloud.microserver.system.domain.SysUserPost;
 import com.hcloud.microserver.system.domain.SysUserRole;

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/system/util/CurrUserUtil.java

@@ -1,8 +1,8 @@
 package com.hcloud.microserver.system.util;
 
 import com.hcloud.microserver.commoncore.base.ResultCode;
-import com.hcloud.microserver.commoncore.domain.LoginUser;
-import com.hcloud.microserver.commoncore.domain.LoginUserDetails;
+import com.hcloud.microserver.api.domain.LoginUser;
+import com.hcloud.microserver.api.domain.LoginUserDetails;
 import com.hcloud.microserver.commoncore.exception.GlobalException;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;

carbon-back/carbon-back-service/src/main/java/com/hcloud/microserver/system/utils/DictUtils.java

@@ -4,7 +4,7 @@ import com.hcloud.microserver.commoncore.constant.Constants;
 import com.hcloud.microserver.commoncore.util.SpringUtils;
 import com.hcloud.microserver.security.service.RedisService;
 import com.hcloud.microserver.security.service.SystemRedisService;
-import com.hcloud.microserver.commoncore.domain.SysDictData;
+import com.hcloud.microserver.api.domain.SysDictData;
 
 import java.util.Collection;
 import java.util.List;

carbon-back/carbon-back-service/src/main/resources/carbon/CollectiveFarmerMapper.xml

@@ -1,7 +1,7 @@
 <?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.hcloud.microserver.system.bank.dao.CollectiveFarmerMapper">
-    <resultMap id="BaseResultMap" type="CollectiveFarmer">
+    <resultMap id="BaseResultMap" type="com.hcloud.microserver.system.facade.carbon.entity.CollectiveFarmer">
         <id column="guid" jdbcType="CHAR" property="guid"/>
         <result column="fk_poverty_area_id" jdbcType="CHAR" property="fkPovertyAreaId"/>
         <result column="collective_code" jdbcType="VARCHAR" property="collectiveCode"/>
@@ -23,6 +23,7 @@
         <result column="phone" jdbcType="VARCHAR" property="phone"/>
         <result column="bank_code" jdbcType="VARCHAR" property="bankCode"/>
         <result column="bank_status" jdbcType="INTEGER" property="bankStatus"/>
+        <association property="povertyArea" column="fk_poverty_area_id" select="com.hcloud.microserver.system.bank.dao.PovertyAreaMapper.selectByPrimaryKey"/>
         <collection property="farmerInfos" column="guid" select="com.hcloud.microserver.system.bank.dao.FarmerInfoMapper.selectByCollectiveId" />
     </resultMap>
 
@@ -315,7 +316,7 @@
         <where>
             cf.state = 1 and pa.state = 1
             <if test="condition != null and condition != ''">
-                and ((collective_name like concant('%', #{condition,jdbcType=VARCHAR}, '%')))
+                and ((collective_name like concat('%', #{condition,jdbcType=VARCHAR}, '%')))
             </if>
             <if test="provinceId != null and provinceId != ''">
                 and pa.province_id = #{provinceId,jdbcType=VARCHAR}

carbon-back/carbon-back-service/src/main/resources/carbon/FarmerInfoMapper.xml

@@ -1,7 +1,7 @@
 <?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.hcloud.microserver.system.bank.dao.FarmerInfoMapper">
-    <resultMap id="BaseResultMap" type="FarmerInfo">
+    <resultMap id="BaseResultMap" type="com.hcloud.microserver.system.facade.carbon.entity.FarmerInfo">
         <id column="guid" jdbcType="CHAR" property="guid"/>
         <result column="fk_poverty_area_id" jdbcType="CHAR" property="fkPovertyAreaId"/>
         <result column="fk_collective_id" jdbcType="CHAR" property="fkCollectiveId"/>
@@ -28,9 +28,9 @@
         <result column="bank_clearing_msg" jdbcType="VARCHAR" property="bankClearingMsg"/>
         <result column="recieve_money" jdbcType="DECIMAL" property="recieveMoney"/>
         <result column="actual_money" jdbcType="DECIMAL" property="actualMoney"/>
-        <result column="bank_name" jdbcType="VARCHAR" property="bank_name"/>
-        <result column="bank_code" jdbcType="VARCHAR" property="bank_code"/>
-        <result column="bank_status" jdbcType="INTEGER" property="bank_status"/>
+        <result column="bank_name" jdbcType="VARCHAR" property="bankName"/>
+        <result column="bank_code" jdbcType="VARCHAR" property="bankCode"/>
+        <result column="bank_status" jdbcType="INTEGER" property="bankStatus"/>
         <association property="povertyArea" column="fk_poverty_area_id" select="com.hcloud.microserver.system.bank.dao.PovertyAreaMapper.selectByPrimaryKey"/>
     </resultMap>
     <sql id="Base_Column_List">
@@ -67,7 +67,7 @@
             #{villageOrg,jdbcType=CHAR}, #{isEnable,jdbcType=INTEGER}, #{state,jdbcType=INTEGER},
             #{createUser,jdbcType=CHAR}, #{createTime,jdbcType=TIMESTAMP}, #{modifiedUser,jdbcType=CHAR},
             #{modifiedTime,jdbcType=TIMESTAMP}, #{bankClearingMsg,jdbcType=VARCHAR},
-             #{recieveMoney,jdbcType=DECIMAL}, #{actualMoney,jdbcType=DECIMAL},{bankName,jdbcType=VARCHAR},{bankCode,jdbcType=VARCHAR},{bankStatus,jdbcType=INTEGER})
+             #{recieveMoney,jdbcType=DECIMAL}, #{actualMoney,jdbcType=DECIMAL},#{bankName,jdbcType=VARCHAR},#{bankCode,jdbcType=VARCHAR},#{bankStatus,jdbcType=INTEGER})
     </insert>
     <insert id="insertSelective" parameterType="FarmerInfo">
         insert into t_farmer_info
@@ -246,7 +246,7 @@
                 #{bankCode,jdbcType=VARCHAR},
             </if>
             <if test="bankStatus != null">
-                {bankStatus,jdbcType=INTEGER},
+                #{bankStatus,jdbcType=INTEGER},
             </if>
         </trim>
     </insert>
@@ -335,7 +335,7 @@
                 bank_code = #{bankCode,jdbcType=VARCHAR},
             </if>
             <if test="bankStatus != null">
-                bank_status = {bankStatus,jdbcType=INTEGER},
+                bank_status = #{bankStatus,jdbcType=INTEGER},
             </if>
         </set>
         where guid = #{guid,jdbcType=CHAR}
@@ -369,7 +369,7 @@
           actual_money = #{actualMoney,jdbcType=DECIMAL},
           bank_name = #{bankName,jdbcType=VARCHAR},
           bank_code = #{bankCode,jdbcType=VARCHAR},
-          bank_status = {bankStatus,jdbcType=INTEGER}
+          bank_status = #{bankStatus,jdbcType=INTEGER}
 
         where guid = #{guid,jdbcType=CHAR}
     </update>
@@ -666,14 +666,14 @@
                 <if test="farmerInfo.actualMoney != null">
                     actual_money = #{farmerInfo.actualMoney,jdbcType=DECIMAL},
                 </if>
-                <if test="bankName != null and bankName != ''">
+                <if test="farmerInfo.bankName != null and farmerInfo.bankName != ''">
                     bank_name = #{farmerInfo.bankName,jdbcType=VARCHAR},
                 </if>
-                <if test="bankCode != null and bankCode != ''">
+                <if test="farmerInfo.bankCode != null and farmerInfo.bankCode != ''">
                     bank_code = #{farmerInfo.bankCode,jdbcType=VARCHAR},
                 </if>
-                <if test="bankStatus != null">
-                    bank_status = {farmerInfo.bankStatus,jdbcType=INTEGER},
+                <if test="farmerInfo.bankStatus != null">
+                    bank_status = #{farmerInfo.bankStatus,jdbcType=INTEGER},
                 </if>
             </set>
             <where>

carbon-back/carbon-back-service/src/main/resources/carbon/PovertyAreaMapper.xml

@@ -269,6 +269,21 @@
         </where>
         order by modified_time desc
     </select>
+
+    <select id="listAll" parameterType="java.lang.String"
+            resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List"/>
+        from t_poverty_area
+        <where>
+            state = 1
+            <if test="name != null and name != ''">
+                and poverty_area_name like concat('%', #{name,jdbcType=VARCHAR}, '%')
+            </if>
+
+        </where>
+        order by modified_time desc
+    </select>
     <select id="getPovertyAreaAnalysis" parameterType="java.lang.String"
             resultType="PovertyAreaBO">
         SELECT
@@ -319,11 +334,46 @@
         select <include refid="Base_Column_List"></include> from t_poverty_area
         <where>
             state = 1
-            <if test="provinceId != null "> and province_id = #{provinceId}</if>
-            <if test="cityId != null "> and city_id = #{cityId}</if>
-            <if test="townId != null "> and town_id = #{townId}</if>
-            <if test="countyId != null "> and county_id = #{countyId}</if>
-            <if test="villageId != null "> and village_id = #{villageId}</if>
+            <choose>
+                <when test="provinceId != null">
+                    and province_id = #{provinceId}
+                </when>
+                <otherwise>
+                    and  province_id is null
+                </otherwise>
+            </choose>
+            <choose>
+                <when test="cityId != null">
+                    and city_id = #{cityId}
+                </when>
+                <otherwise>
+                    and  city_id is null
+                </otherwise>
+            </choose>
+            <choose>
+                <when test="countyId != null">
+                    and county_id = #{countyId}
+                </when>
+                <otherwise>
+                    and  county_id is null
+                </otherwise>
+            </choose>
+            <choose>
+                <when test="townId != null">
+                    and town_id = #{townId}
+                </when>
+                <otherwise>
+                    and  town_id is null
+                </otherwise>
+            </choose>
+            <choose>
+                <when test="villageId != null">
+                    and village_id = #{villageId}
+                </when>
+                <otherwise>
+                    and  village_id is null
+                </otherwise>
+            </choose>
         </where>
     </select>
 

carbon-back/carbon-back-service/src/main/resources/logback-spring.xml

@@ -1,31 +1,55 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE configuration>
-<configuration>
-    <include resource="org/springframework/boot/logging/logback/defaults.xml"/>
-    <include resource="org/springframework/boot/logging/logback/console-appender.xml"/>
-    <!--应用名称-->
-    <property name="APP_NAME" value="mall-admin"/>
-    <!--日志文件保存路径-->
-    <property name="LOG_FILE_PATH" value="${LOG_FILE:-${LOG_PATH:-${LOG_TEMP:-${java.io.tmpdir:-/tmp}}}/logs}"/>
-    <contextName>${APP_NAME}</contextName>
-    <!--每天记录日志到文件appender-->
-    <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+<configuration scan="true" scanPeriod="60 seconds" debug="false">
+    <contextName>febs</contextName>
+    <springProperty scope="context" name="springAppName" source="spring.application.name"/>
+    <property name="log.path" value="log/carbon-back" />
+    <property name="log.maxHistory" value="15" />
+    <property name="log.colorPattern" value="%magenta(%d{yyyy-MM-dd HH:mm:ss}) %highlight(%-5level) %boldCyan([${springAppName:-},%X{X-B3-TraceId:-},%X{X-B3-SpanId:-},%X{X-Span-Export:-}]) %yellow(%thread) %green(%logger) %msg%n"/>
+    <property name="log.pattern" value="%d{yyyy-MM-dd HH:mm:ss} %-5level [${springAppName:-},%X{X-B3-TraceId:-},%X{X-B3-SpanId:-},%X{X-Span-Export:-}] %thread %logger %msg%n"/>
+
+    <!--输出到控制台-->
+    <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>${log.colorPattern}</pattern>
+        </encoder>
+    </appender>
+
+    <!--输出到文件-->
+    <appender name="file_info" class="ch.qos.logback.core.rolling.RollingFileAppender">
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <fileNamePattern>${LOG_FILE_PATH}/${APP_NAME}-%d{yyyy-MM-dd}.log</fileNamePattern>
-            <maxHistory>30</maxHistory>
+            <fileNamePattern>${log.path}/info/info.%d{yyyy-MM-dd}.log</fileNamePattern>
+            <MaxHistory>${log.maxHistory}</MaxHistory>
         </rollingPolicy>
         <encoder>
-            <pattern>${FILE_LOG_PATTERN}</pattern>
+            <pattern>${log.pattern}</pattern>
         </encoder>
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>INFO</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
     </appender>
-    <!--输出到logstash的appender-->
-    <appender name="LOGSTASH" class="net.logstash.logback.appender.LogstashTcpSocketAppender">
-        <destination>localhost:4560</destination>
-        <encoder charset="UTF-8" class="net.logstash.logback.encoder.LogstashEncoder"/>
+
+    <appender name="file_error" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <fileNamePattern>${log.path}/error/error.%d{yyyy-MM-dd}.log</fileNamePattern>
+        </rollingPolicy>
+        <encoder>
+            <pattern>${log.pattern}</pattern>
+        </encoder>
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <level>ERROR</level>
+            <onMatch>ACCEPT</onMatch>
+            <onMismatch>DENY</onMismatch>
+        </filter>
     </appender>
-    <root level="INFO">
-        <appender-ref ref="CONSOLE"/>
-        <appender-ref ref="FILE"/>
-        <appender-ref ref="LOGSTASH"/>
+
+    <root level="debug">
+        <appender-ref ref="console" />
+    </root>
+
+    <root level="info">
+        <appender-ref ref="file_info" />
+        <appender-ref ref="file_error" />
     </root>
 </configuration>

carbon-back/pom.xml

@@ -14,7 +14,6 @@
     <modules>
         <module>carbon-back-service</module>
         <module>carbon-back-common</module>
-        <module>carbon-back-mbg</module>
     </modules>
 
     <dependencies>

carbon-bank/carbon-bank-common/pom.xml

@@ -15,16 +15,8 @@
     <artifactId>carbon-bank-common</artifactId>
     <dependencies>
         <dependency>
-            <groupId>io.github.openfeign</groupId>
-            <artifactId>feign-hystrix</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-openfeign-core</artifactId>
-        </dependency>
-        <dependency>
-            <artifactId>carbon-bank-mbg</artifactId>
             <groupId>com.hcloud.microserver</groupId>
+            <artifactId>carbon-api-mbg</artifactId>
             <version>0.0.1-SNAPSHOT</version>
         </dependency>
     </dependencies>
@@ -32,5 +24,4 @@
 
 
 
-
 </project>

carbon-bank/carbon-bank-common/src/main/java/com/hcloud/microserver/system/bank/carbon/bo/BankResponseBase.java

@@ -2,11 +2,13 @@ package com.hcloud.microserver.system.bank.carbon.bo;
 
 import lombok.Data;
 
+import java.io.Serializable;
+
 /**
  * 银行系统响应参数公共实体类
  */
 @Data
-public class BankResponseBase {
+public class BankResponseBase implements Serializable {
 
     private String sessionId;
     private String serialNo;

carbon-bank/carbon-bank-common/src/main/java/com/hcloud/microserver/system/bank/carbon/bo/CurrentAccountDetailQueryParam.java

@@ -53,13 +53,13 @@ public class CurrentAccountDetailQueryParam implements Serializable {
         this.I1CYTP=form.getCurrency();
 
         /**起始日期	8P0	必输*/
-        if (form.getStartDate() != null){
-            this.I1STDT=simpleDateFormat.format(form.getStartDate());
+        if (form.getBeginTime() != null){
+            this.I1STDT=simpleDateFormat.format(form.getBeginTime());
         }
 
         /**终止日期	8P0	必输*/
-        if (form.getEndDate() != null){
-            this.I1EDDT=simpleDateFormat.format(form.getEndDate());
+        if (form.getEndTime() != null){
+            this.I1EDDT=simpleDateFormat.format(form.getEndTime());
         }
 
         /**起始金额	15P2	非必输*/

carbon-bank/carbon-bank-common/src/main/java/com/hcloud/microserver/system/bank/carbon/bo/CurrentAccountQueryDetailRespRecord.java

@@ -2,11 +2,13 @@ package com.hcloud.microserver.system.bank.carbon.bo;
 
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * 活期账户明细返回参数
  */
 @Data
 public class CurrentAccountQueryDetailRespRecord {
-   private CurrentAccountQueryDetailResp RECORD;
+   private List<CurrentAccountQueryDetailResp> RECORD;
 
 }

carbon-bank/carbon-bank-common/src/main/java/com/hcloud/microserver/system/bank/carbon/bo/CurrentAccountQueryDetailTotalResp.java

@@ -23,7 +23,7 @@ public class CurrentAccountQueryDetailTotalResp extends BankResponseBase impleme
     /**汇入总金额	15P2*/
     private BigDecimal O1INAT;
     /**查询明细*/
-    private List<CurrentAccountQueryDetailRespRecord> list;
+    private CurrentAccountQueryDetailRespRecord list;
 
     public CurrentAccountQueryDetailEntity getEntity(CurrentAccountQueryDetailEntity entity){
         if (StringUtils.isNotEmpty(this.O1TLNM)){
@@ -39,21 +39,21 @@ public class CurrentAccountQueryDetailTotalResp extends BankResponseBase impleme
         }
         entity.setExportTotalAmount(this.O1OTAT);
         entity.setImportTotalAmount(this.O1INAT);
-        if (this.list != null){
+        if (this.list != null&&list.getRECORD()!= null){
             entity.setDetails(getDetails(list));
         }
         return entity;
 
     }
 
-    public List<CurrentAccountQueryDetailEntityDetail> getDetails(List<CurrentAccountQueryDetailRespRecord> list){
-        if (list == null||list.size()<0){
+    public List<CurrentAccountQueryDetailEntityDetail> getDetails(CurrentAccountQueryDetailRespRecord list){
+        if (list.getRECORD() == null||list.getRECORD().size()<0){
             return null;
         }
         List<CurrentAccountQueryDetailEntityDetail> details = new ArrayList<>();
-        list.stream().forEach(b->{
+        list.getRECORD().stream().forEach(b->{
             CurrentAccountQueryDetailEntityDetail entity = new CurrentAccountQueryDetailEntityDetail();
-            details.add(b.getRECORD().getEntity(entity));
+            details.add(b.getEntity(entity));
         });
         return details;
 

carbon-bank/carbon-bank-common/src/main/java/com/hcloud/microserver/system/bank/carbon/bo/InquiryOfWithholdingInstructionDetailsParam.java

@@ -1,5 +1,8 @@
 package com.hcloud.microserver.system.bank.carbon.bo;
 
+import com.alibaba.fastjson.annotation.JSONField;
+import com.hcloud.microserver.commoncore.util.reflect.DateUtils;
+import com.hcloud.microserver.system.bank.carbon.form.InquiryOfWithholdingInstructionDetailsForm;
 import lombok.Data;
 
 import java.math.BigDecimal;
@@ -11,23 +14,59 @@ import java.math.BigDecimal;
 public class InquiryOfWithholdingInstructionDetailsParam {
 
     /**交易类型;可选01-代发、02-代扣;2A;*/
+    @JSONField(name = "BsnType")
     private String BsnType;
     /**账号1;可选，交易类型为“01”时，账号1为付款账号；交易类型为“02”时，账号1为收款账号；;32A;*/
+    @JSONField(name = "AcctNo")
     private String AcctNo;
     /**账号2;可选，交易类型为“01”时，账号2为收款账号；交易类型为“02”时，账号2为付款账号；;32A;*/
+    @JSONField(name = "AnAcctNo")
     private String AnAcctNo;
     /**操作方式;默认：0；0：账务处理1：数据校验;1A;*/
+    @JSONField(name = "OperFlg")
     private String OperFlg;
     /**开始金额;可选;15P2;*/
+    @JSONField(name = "StartAmt")
     private BigDecimal StartAmt;
     /**结束金额;可选;15P2;*/
+    @JSONField(name = "EndAmt")
     private BigDecimal EndAmt;
     /**起始日期;必输;8P0;*/
-    private BigDecimal StartDt;
+    @JSONField(name = "StartDt")
+    private String StartDt;
     /**终止日期;必输;8P0;*/
-    private BigDecimal EndDt;
+    @JSONField(name = "EndDt")
+    private String EndDt;
     /**起始条数;必输域;6P0;*/
-    private BigDecimal Num;
+    @JSONField(name = "Num")
+    private Integer Num;
     /**查询条数;必输域;4P0;*/
-    private BigDecimal QryNum;
+    @JSONField(name = "QryNum")
+    private Integer QryNum;
+    public InquiryOfWithholdingInstructionDetailsParam(){}
+
+    public InquiryOfWithholdingInstructionDetailsParam(InquiryOfWithholdingInstructionDetailsForm form){
+        this.BsnType = form.getBsnType();
+
+        this.AcctNo = form.getAcctNo();
+
+        this.AnAcctNo = form.getAnAcctNo();
+
+        this.OperFlg = form.getOperFlg();
+
+        this.StartAmt = form.getStartAmt();
+
+        this.EndAmt = form.getEndAmt();
+
+        if (form.getStartDt() != null){
+            this.StartDt = DateUtils.ymd(form.getStartDt());
+        }
+        if (form.getEndDt() !=null){
+            this.EndDt = DateUtils.ymd(form.getEndDt());
+        }
+
+        this.Num = form.getNum();
+
+        this.QryNum = form.getQryNum();
+    }
 }

carbon-bank/carbon-bank-common/src/main/java/com/hcloud/microserver/system/bank/carbon/bo/InquiryOfWithholdingInstructionDetailsRecord.java

@@ -2,11 +2,13 @@ package com.hcloud.microserver.system.bank.carbon.bo;
 
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * 2.15.	账务支付：代发/代扣指令详情信息查询CL0034
  */
 @Data
 public class InquiryOfWithholdingInstructionDetailsRecord {
-    private InquiryOfWithholdingInstructionDetailsRespDetail RECORD;
+    private List<InquiryOfWithholdingInstructionDetailsRespDetail> RECORD;
 
 }

carbon-bank/carbon-bank-common/src/main/java/com/hcloud/microserver/system/bank/carbon/bo/InquiryOfWithholdingInstructionDetailsResp.java

@@ -9,11 +9,11 @@ import java.util.List;
  * 2.15.	账务支付：代发/代扣指令详情信息查询CL0034
  */
 @Data
-public class InquiryOfWithholdingInstructionDetailsResp {
+public class InquiryOfWithholdingInstructionDetailsResp extends BankResponseBase {
     /**返回笔数;返回笔数;3P0;*/
-    private BigDecimal returnNum;
+    private Integer returnNum;
     /**查询总条数;满足条件总记录数;5P0;*/
-    private BigDecimal totalNum;
+    private Integer totalNum;
 
-    private List<InquiryOfWithholdingInstructionDetailsRecord> list;
+    private InquiryOfWithholdingInstructionDetailsRecord list;
 }