add 基础配置

egress-gateway-service-domain/pom.xml

@@ -17,19 +17,12 @@
     </properties>
 
     <dependencies>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter</artifactId>
-        </dependency>
+
         <dependency>
             <groupId>com.hrsk.cloud</groupId>
             <artifactId>egress-gateway-service-client</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
-        <dependency>
-            <groupId>com.hrsk.pangu</groupId>
-            <artifactId>pangu-component-domain-starter</artifactId>
-        </dependency>
         <dependency>
             <groupId>com.hrsk.pangu</groupId>
             <artifactId>pangu-component-tool</artifactId>
@@ -64,6 +57,13 @@
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
         </dependency>
-
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-expression</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context</artifactId>
+        </dependency>
     </dependencies>
 </project>

egress-gateway-service-domain/src/main/java/com/hrsk/cloud/eg/domain/api/ApiFactory.java

@@ -1,10 +1,10 @@
 package com.hrsk.cloud.eg.domain.api;
 
-import com.alibaba.cola.domain.DomainFactory;
 import com.hrsk.cloud.eg.domain.api.common.ApiTypeEnums;
 import com.hrsk.cloud.eg.domain.common.utils.BizPreconditions;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
+import com.alibaba.cola.domain.DomainFactory;
 import org.springframework.stereotype.Component;
 
 /**

egress-gateway-service-domain/src/main/java/com/hrsk/cloud/eg/domain/common/utils/GsonUtil.java

@@ -26,7 +26,7 @@ public class GsonUtil {
      * @date 2024/8/26 18:51
      * @version 1.0
      */
-   public static String doToJSONString(Object obj,String  formatDate, boolean ignoreNull,
+   private static String doToJSONString(Object obj,String  formatDate, boolean ignoreNull,
                                        boolean pretty){
       return getGson(formatDate,ignoreNull, pretty).toJson(obj);
 
@@ -42,6 +42,15 @@ public class GsonUtil {
     public static String toJSONString(Object obj) {
         return doToJSONString(obj, "yyyy-MM-dd HH:mm:ss", false, false);
     }
+    /**
+     * @description: 携带参数的转化为json
+     * @author zhangyy
+     * @date 2024/8/27 14:24
+     * @version 1.0
+     */
+    public static String toJSONString(Object obj,String formatDate) {
+        return doToJSONString(obj, formatDate, false, false);
+    }
 
     /**
      * 获取ObjectMapper。其本身是线程安全的，可以作为成员变量，但传入的参数不可能每次都一样，所以不使用成员变量。

egress-gateway-service-infrastructure/pom.xml

@@ -26,17 +26,13 @@
             <groupId>com.hrsk.cloud</groupId>
             <artifactId>egress-gateway-service-domain</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.hrsk.cloud</groupId>
-            <artifactId>egress-gateway-service-client</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.mybatis.spring.boot</groupId>
-            <artifactId>mybatis-spring-boot-starter</artifactId>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
         </dependency>
         <dependency>
             <groupId>mysql</groupId>
@@ -60,9 +56,8 @@
             <artifactId>commons-codec</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.h2database</groupId>
-            <artifactId>h2</artifactId>
-            <scope>runtime</scope>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-boot-starter</artifactId>
         </dependency>
     </dependencies>
 </project>

egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/package-info.java

@@ -1 +0,0 @@
-package com.hrsk.cloud.eg.infrastructure;

egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/repository/database/mapper/XdOrderInfoMapper.java

@@ -0,0 +1,19 @@
+package com.hrsk.cloud.eg.infrastructure.repository.database.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.hrsk.cloud.eg.infrastructure.repository.database.entity.XdOrderInfo;
+
+/**
+ * <p>
+ * 信贷经理订单表 Mapper 接口
+ * </p>
+ *
+ * @author Mybatis Plus Generator
+ * @since 2019-09-29
+ */
+public interface XdOrderInfoMapper extends BaseMapper<XdOrderInfo> {
+
+
+}
+
+

egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/repository/database/mapper/package-info.java

@@ -1 +0,0 @@
-package com.hrsk.cloud.eg.infrastructure.repository.database.mapper;

egress-gateway-service-infrastructure/src/main/java/com/hrsk/cloud/eg/infrastructure/repository/package-info.java

@@ -1 +0,0 @@
-package com.hrsk.cloud.eg.infrastructure.repository;

egress-gateway-service-infrastructure/src/main/resources/mapper/XdOrderInfoMapper.xml

@@ -0,0 +1,38 @@
+<?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.hrsk.cloud.eg.infrastructure.repository.database.mapper.XdOrderInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.hrsk.cloud.eg.infrastructure.repository.database.entity.XdOrderInfo">
+        <id column="id" property="id" />
+        <result column="apply_id" property="applyId" />
+        <result column="user_id" property="userId" jdbcType="BIGINT"/>
+        <result column="product_id" property="productId" />
+        <result column="status" property="status" />
+        <result column="o_status" property="oStatus" />
+        <result column="order_type" property="orderType" />
+        <result column="create_time" property="createTime" />
+        <result column="create_by" property="createBy" />
+        <result column="update_time" property="updateTime" />
+        <result column="update_by" property="updateBy" />
+        <result column="reason" property="reason" />
+        <result column="borrow_money" property="borrowMoney" />
+        <result column="borrow_limit" property="borrowLimit" />
+        <result column="borrow_purpose" property="borrowPurpose" />
+        <!--<result column="is_grab" property="isGrab" />-->
+        <!--<result column="is_apply" property="isApply" />-->
+        <result column="user_mobile" property="userMobile" />
+        <result column="real_name" property="realName" />
+        <result column="channel_name" property="channelName" />
+        <result column="channel_code" property="channelCode" />
+        <result column="product_name" property="productName" />
+        <result column="merchant_status" property="merchantStatus" />
+        <result column="merchant_remark" property="merchantRemark" />
+        <result column="price" property="price" />
+        <result column="trade_no" property="tradeNo" />
+        <result column="ip" property="ip"/>
+        <result column="view_status" property="viewStatus"/>
+
+    </resultMap>
+
+</mapper>

egress-gateway-service-infrastructure/src/main/resources/mybatis-config.xml

@@ -13,6 +13,6 @@
         <package name="com.hrsk.cloud.eg.infrastructure.repository.database.entity"/>
     </typeAliases>
     <mappers>
-        <!--<mapper resource="mybatis/ExampleMapper.xml"/>-->
+<!--        <mapper resource="mapper/*.xml"/>-->
     </mappers>
 </configuration>

egress-gateway-service-infrastructure/src/test/java/com/hrsk/cloud/op/eg/repository/CustomerMapperTest.java

@@ -0,0 +1,25 @@
+package com.hrsk.cloud.op.eg.repository;
+
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+
+/** 
+ * @description: 测试类
+ * @param:  
+ * @return:  
+ * @author zhangyy
+ * @date: 2024/8/27 14:30
+ */ 
+@SpringBootTest(classes = Appendable.class)
+@RunWith(SpringRunner.class)
+public class CustomerMapperTest {
+
+    @Test
+    public void test() {
+
+    }
+}

pom.xml

@@ -16,8 +16,6 @@
 
         <atlantis-component.version>1.0.0</atlantis-component.version>
         <spring-boot.version>2.7.6</spring-boot.version>
-        <spring-cloud-alibaba.version>2021.0.5.0</spring-cloud-alibaba.version>
-        <mybatis-starter.version>2.2.2</mybatis-starter.version>
         <mybatis-plus.version>3.5.4.1</mybatis-plus.version>
         <druid-starter.version>1.2.9</druid-starter.version>
         <commons-lang3.version>3.9</commons-lang3.version>
@@ -104,11 +102,6 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
-            <dependency>
-                <groupId>org.mybatis.spring.boot</groupId>
-                <artifactId>mybatis-spring-boot-starter</artifactId>
-                <version>${mybatis-starter.version}</version>
-            </dependency>
             <dependency>
                 <groupId>com.alibaba</groupId>
                 <artifactId>druid-spring-boot-starter</artifactId>
@@ -119,6 +112,11 @@
                 <artifactId>hessian</artifactId>
                 <version>${hessian.version}</version>
             </dependency>
+            <dependency>
+                <groupId>com.baomidou</groupId>
+                <artifactId>mybatis-plus-boot-starter</artifactId>
+                <version>${mybatis-plus.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
@@ -129,4 +127,36 @@
     <module>egress-gateway-service-infrastructure</module>
     <module>egress-gateway-service-domain</module>
   </modules>
+    <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <artifactId>maven-resources-plugin</artifactId>
+                    <version>3.3.0</version>
+                </plugin>
+                <plugin>
+                    <artifactId>maven-compiler-plugin</artifactId>
+                    <version>3.10.1</version>
+                </plugin>
+                <plugin>
+                    <artifactId>maven-source-plugin</artifactId>
+                    <version>3.2.1</version>
+                </plugin>
+                <plugin>
+                    <artifactId>maven-javadoc-plugin</artifactId>
+                    <version>3.4.0</version>
+                </plugin>
+                <plugin>
+                    <artifactId>maven-deploy-plugin</artifactId>
+                    <version>3.0.0</version>
+                </plugin>
+
+                <plugin>
+                    <groupId>org.springframework.boot</groupId>
+                    <artifactId>spring-boot-maven-plugin</artifactId>
+                    <version>${spring-boot.version}</version>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+    </build>
 </project>

start/src/main/java/com/hrsk/cloud/eg/Application.java

@@ -1,8 +1,8 @@
 package com.hrsk.cloud.eg;
 
+
 import lombok.extern.slf4j.Slf4j;
 import org.mybatis.spring.annotation.MapperScan;
-import org.springframework.beans.BeanUtils;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 

start/src/main/resources/logback-spring.xml

@@ -14,13 +14,7 @@
             <charset>UTF-8</charset> <!-- 此处设置字符集 -->
         </encoder>
     </appender>
-    <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
-        <encoder>
-            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS}[%X{X-B3-TraceId:-},%X{X-B3-SpanId:-}] [%thread] %-5level %logger{50} - %msg%n</pattern>
-            <!-- 记录日志的编码 -->
-            <charset>UTF-8</charset> <!-- 此处设置字符集 -->
-        </encoder>
-    </appender>
+
     <!-- 按照每天生成日志文件   -->
     <appender name="dailyFile"  class="ch.qos.logback.core.rolling.RollingFileAppender">
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
@@ -78,7 +72,6 @@
     </appender>
      <!-- 日志输出级别 -->
     <root level="info">
-        <appender-ref ref="console" />
         <appender-ref ref="STDOUT" level="info"/>
         <appender-ref ref="dailyFile" />
         <appender-ref ref="errorFile" />