Merge remote-tracking branch 'refs/remotes/origin/dev' into nanguangmall

mhd_thrid_party/Dockerfile

@@ -1,5 +1,5 @@
 # 基础镜像
-FROM  kdvolder/jdk8
+FROM arm64v8/openjdk:8
 # author
 MAINTAINER manhuoda
 #指定东八区时区
@@ -10,7 +10,7 @@ ENV JAVA_TOOL_OPTIONS="-Dfile.encoding=UTF-8"
 # 其效果是在主机 /var/lib/docker 目录下创建了一个临时文件，并链接到容器的/tmp
 VOLUME /tmp
 #将当前mhd_thrid_party.jar 复制到容器根目录下
-ADD mhd_thrid_party.jar mhd_thrid_party.jar
+ADD target/mhd_thrid_party.jar mhd_thrid_party.jar
 #暴露容器端口 Docker镜像告知Docker宿主机应用监听了端口
 EXPOSE 8012
 # 运行jar包

mhd_thrid_party/pom.xml

@@ -80,9 +80,14 @@
         <artifactId>seata-spring-boot-starter</artifactId>
       </dependency>
         <!-- Mysql Connector -->
-        <dependency>
+        <!--<dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
+        </dependency>-->
+        <dependency>
+            <groupId>com.dameng</groupId>
+            <artifactId>DmJdbcDriver18</artifactId>
+            <version>8.1.1.193</version>
         </dependency>
         <!--添加druid连接池 依赖 -->
         <dependency>
@@ -272,5 +277,17 @@
         </resources>
     </build>
 
-
+    <profiles>
+        <profile>
+            <id>mhd_thrid_party</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>com.spotify</groupId>
+                        <artifactId>dockerfile-maven-plugin</artifactId>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
 </project>

mhd_thrid_party/src/main/java/com/linke/thirdParty/infrastructure/config/CamelCaseMapPlugin.java

@@ -0,0 +1,57 @@
+package com.linke.thirdParty.infrastructure.config;
+
+import com.linke.thirdParty.infrastructure.utils.CamelCaseUtils;
+import org.apache.ibatis.executor.resultset.ResultSetHandler;
+import org.apache.ibatis.plugin.*;
+import org.springframework.stereotype.Component;
+
+import java.sql.Statement;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+
+/**
+ * MyBatis插件：拦截Map类型结果，转换Key为驼峰
+ */
+@Intercepts({@Signature(
+        type = ResultSetHandler.class,
+        method = "handleResultSets",
+        args = {Statement.class}
+)})
+@Component
+public class CamelCaseMapPlugin implements Interceptor {
+
+    @Override
+    public Object intercept(Invocation invocation) throws Throwable {
+        // 执行原方法获取结果
+        Object result = invocation.proceed();
+        // 处理结果：如果是List且元素是Map，转换Key
+        if (result instanceof List<?>) {
+            List<Map<String, Object>> list = (List<Map<String, Object>>) result;
+            for (int i = 0; i < list.size(); i++) {
+                Object item = list.get(i);
+                if (item instanceof Map<?, ?>) {
+                    @SuppressWarnings("unchecked")
+                    Map<String, Object> map = (Map<String, Object>) item;
+                    // 转换Key为驼峰
+                    list.set(i, CamelCaseUtils.convertMapKeyToCamel(map));
+                }
+            }
+        }
+        return result;
+    }
+
+    @Override
+    public Object plugin(Object target) {
+        // 只拦截ResultSetHandler类型
+        if (target instanceof ResultSetHandler) {
+            return Plugin.wrap(target, this);
+        }
+        return target;
+    }
+
+    @Override
+    public void setProperties(Properties properties) {
+        // 可配置参数，此处无需处理
+    }
+}

mhd_thrid_party/src/main/java/com/linke/thirdParty/infrastructure/utils/CamelCaseUtils.java

@@ -0,0 +1,54 @@
+package com.linke.thirdParty.infrastructure.utils;
+
+import org.apache.commons.lang3.StringUtils;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 字符串工具类扩展：下划线/大写转驼峰
+ */
+public class CamelCaseUtils {
+
+    /**
+     * 大写下划线转驼峰（如：USER_NAME → userName）
+     */
+    public static String toCamelCase(String str) {
+        if (StringUtils.isBlank(str)) {
+            return str;
+        }
+        // 先转小写，再处理下划线
+        str = str.toLowerCase();
+        StringBuilder sb = new StringBuilder();
+        boolean nextUpperCase = false;
+        for (int i = 0; i < str.length(); i++) {
+            char c = str.charAt(i);
+            if (c == '_') {
+                nextUpperCase = true;
+            } else {
+                if (nextUpperCase) {
+                    sb.append(Character.toUpperCase(c));
+                    nextUpperCase = false;
+                } else {
+                    sb.append(c);
+                }
+            }
+        }
+        return sb.toString();
+    }
+
+    /**
+     * 批量转换Map的Key为驼峰
+     */
+    public static <V> Map<String, V> convertMapKeyToCamel(Map<String, V> map) {
+        if (map == null || map.isEmpty()) {
+            return map;
+        }
+        Map<String, V> newMap = new HashMap<>(map.size());
+        for (Map.Entry<String, V> entry : map.entrySet()) {
+            String camelKey = toCamelCase(entry.getKey());
+            newMap.put(camelKey, entry.getValue());
+        }
+        return newMap;
+    }
+}

mhd_thrid_party/src/main/resources/bootstrap.yml

@@ -18,13 +18,13 @@ spring:
   cloud:
     nacos:
       discovery:
-        server-addr: 127.0.0.1:8848
+#        server-addr: 127.0.0.1:8848
         # 线上测试环境配置 容器名+端口号
-        #server-addr: mhd-nacos:8848
+        server-addr: 10.33.0.129:6010
       config:
-        server-addr: 127.0.0.1:8848
+#        server-addr: 127.0.0.1:8848
         # 线上测试环境配置 容器名+端口号
-        #server-addr: mhd-nacos:8848
+        server-addr: 10.33.0.129:6010
         group: DEFAULT_GROUP  # 默认分组就是DEFAULT_GROUP，如果使用默认分组可以不配置
         file-extension: yml   #默认properties
         # 共享配置