兼容nacos 2.2.3 去除yml配置用户名/密码

sckw-common/sckw-common-core/src/main/java/com/sckw/core/web/config/com/sckw/core/web/config/GlobalTransactionalConfig.java

@@ -0,0 +1,28 @@
+package com.sckw.core.web.config.com.sckw.core.web.config;
+
+import io.seata.spring.annotation.AspectTransactionalInterceptor;
+import org.springframework.aop.Advisor;
+import org.springframework.aop.aspectj.AspectJExpressionPointcut;
+import org.springframework.aop.support.DefaultPointcutAdvisor;
+import org.springframework.context.annotation.Bean;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author lfdc
+ * @description 全局事务bean
+ * @date 2023/6/15 0015
+ */
+@Component
+public class GlobalTransactionalConfig {
+    @Bean
+    public AspectTransactionalInterceptor aspectTransactionalInterceptor () {
+        return new AspectTransactionalInterceptor();
+    }
+
+    @Bean
+    public Advisor txAdviceAdvisor(AspectTransactionalInterceptor aspectTransactionalInterceptor ) {
+        AspectJExpressionPointcut pointcut = new AspectJExpressionPointcut();
+        pointcut.setExpression("配置切点表达式使全局事务拦截器生效");
+        return new DefaultPointcutAdvisor(pointcut, aspectTransactionalInterceptor);
+    }
+}

sckw-modules/sckw-example/src/main/resources/bootstrap.yml

@@ -1,5 +1,5 @@
 server:
-  port: 10300
+  port: 10301
 
 spring:
   application:

sckw-modules/sckw-example/src/main/resources/mapper/SysUserDao.xml

@@ -1,55 +1,55 @@
-<!--<?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.sckw.example.dao.SysUserDao">-->
-<!--  <resultMap id="BaseResultMap" type="com.sckw.example.model.SysUser">-->
-<!--    <result column="id" property="id" />-->
-<!--    <result column="system_type" property="systemType" />-->
-<!--    <result column="account" property="account" />-->
-<!--    <result column="password" property="password" />-->
-<!--    <result column="name" property="name" />-->
-<!--    <result column="telephone" property="telephone" />-->
-<!--    <result column="photo" property="photo" />-->
-<!--    <result column="email" property="email" />-->
-<!--    <result column="is_main" property="isMain" />-->
-<!--    <result column="remark" property="remark" />-->
-<!--    <result column="status" property="status" />-->
-<!--    <result column="create_by" property="createBy" />-->
-<!--    <result column="create_time" property="createTime" />-->
-<!--    <result column="update_by" property="updateBy" />-->
-<!--    <result column="update_time" property="updateTime" />-->
-<!--    <result column="del_flag" property="delFlag" />-->
-<!--  </resultMap>-->
+<?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.sckw.example.dao.SysUserDao">
+  <resultMap id="BaseResultMap" type="com.sckw.example.model.SysUser">
+    <result column="id" property="id" />
+    <result column="system_type" property="systemType" />
+    <result column="account" property="account" />
+    <result column="password" property="password" />
+    <result column="name" property="name" />
+    <result column="telephone" property="telephone" />
+    <result column="photo" property="photo" />
+    <result column="email" property="email" />
+    <result column="is_main" property="isMain" />
+    <result column="remark" property="remark" />
+    <result column="status" property="status" />
+    <result column="create_by" property="createBy" />
+    <result column="create_time" property="createTime" />
+    <result column="update_by" property="updateBy" />
+    <result column="update_time" property="updateTime" />
+    <result column="del_flag" property="delFlag" />
+  </resultMap>
 
-<!--  <select id="findByAccount" parameterType="java.util.Map" resultType="com.sckw.example.model.SysUser">-->
-<!--    SELECT-->
-<!--      id, system_type systemType, account, password, name, telephone, photo, email, is_main isMain,-->
-<!--      remark, status, create_by createBy, create_time createTime, update_by updateBy, update_time updateTime-->
-<!--    FROM-->
-<!--    sys_user-->
-<!--    where del_flag = 0-->
-<!--    <if test="systemType != null and systemType != ''">-->
-<!--      and system_type = #{systemType, jdbcType=VARCHAR}-->
-<!--    </if>-->
-<!--    <if test="account != null and account != ''">-->
-<!--      and account = #{account, jdbcType=VARCHAR}-->
-<!--    </if>-->
-<!--  </select>-->
+  <select id="findByAccount" parameterType="java.util.Map" resultType="com.sckw.example.model.SysUser">
+    SELECT
+      id, system_type systemType, account, password, name, telephone, photo, email, is_main isMain,
+      remark, status, create_by createBy, create_time createTime, update_by updateBy, update_time updateTime
+    FROM
+    sys_user
+    where del_flag = 0
+    <if test="systemType != null and systemType != ''">
+      and system_type = #{systemType, jdbcType=VARCHAR}
+    </if>
+    <if test="account != null and account != ''">
+      and account = #{account, jdbcType=VARCHAR}
+    </if>
+  </select>
 
-<!--  <select id="findPage" resultType="java.util.Map" parameterType="java.util.Map" >-->
-<!--    SELECT-->
-<!--    id, system_type systemType, account, password, name, telephone, photo, email, is_main isMain,-->
-<!--    remark, status, create_by createBy, create_time createTime, update_by updateBy, update_time updateTime-->
-<!--    FROM-->
-<!--    sys_user u-->
-<!--    where del_flag = 0-->
-<!--    <if test="systemType != null and systemType != ''">-->
-<!--      and d.system_type = #{systemType, jdbcType=VARCHAR}-->
-<!--    </if>-->
-<!--    <if test="account != null and account != ''">-->
-<!--      and account = #{account, jdbcType=VARCHAR}-->
-<!--    </if>-->
-<!--    ORDER BY create_time desc-->
-<!--  </select>-->
+  <select id="findPage" resultType="java.util.Map" parameterType="java.util.Map" >
+    SELECT
+    id, system_type systemType, account, password, name, telephone, photo, email, is_main isMain,
+    remark, status, create_by createBy, create_time createTime, update_by updateBy, update_time updateTime
+    FROM
+    sys_user u
+    where del_flag = 0
+    <if test="systemType != null and systemType != ''">
+      and d.system_type = #{systemType, jdbcType=VARCHAR}
+    </if>
+    <if test="account != null and account != ''">
+      and account = #{account, jdbcType=VARCHAR}
+    </if>
+    ORDER BY create_time desc
+  </select>
 
 
-<!--</mapper>-->
+</mapper>

sckw-modules/sckw-file/src/main/java/com/sckw/file/controller/FileApiController.java

@@ -1,5 +1,6 @@
 package com.sckw.file.controller;
 
+import com.sckw.core.web.constant.HttpStatus;
 import com.sckw.core.web.response.HttpResult;
 import com.sckw.file.service.FileService;
 import lombok.AllArgsConstructor;
@@ -41,7 +42,7 @@ public class FileApiController {
             return fileService.uploadFile(file);
         } catch (Exception e) {
             log.error("文件上传失败:{}",e.getMessage(),e);
-            throw new RuntimeException(e);
+            return HttpResult.error(HttpStatus.GLOBAL_EXCEPTION_CODE,e.getMessage());
         }
 
     }

sckw-modules/sckw-file/src/main/resources/bootstrap-dev.yml

@@ -9,22 +9,20 @@ spring:
     nacos:
       discovery:
         # 服务注册地址
-        #        server-addr: 47.108.162.14:8848
-        server-addr: 127.0.0.1:8848
+        server-addr: 10.10.10.230:8848
         # 命名空间
         namespace: sckw-service-platform-dev
         # nacos用户名
-        username: nacos
+#        username: nacos
         # nacos密码
-        password: nacos
+#        password: nacos
         # 共享配置
         group: sckw-service-platform
         # 权重 1-100 数值越大权重越大分配的流量就越大，通常结合权重负载均衡策略
       #        weight: 100
       config:
         # 配置中心地址
-        #        server-addr: 47.108.162.14:8848
-        server-addr: 127.0.0.1:8848
+        server-addr: 10.10.10.230:8848
         # 配置文件格式
         file-extension: yaml
         # 命名空间
@@ -61,8 +59,7 @@ spring:
         client-ip: ${spring.cloud.client.ip-address} # 获取本机IP地址
         port: 8719  #默认8719端口,如果被占用会向上扫描。
         #控制台地址
-        #dashboard: 47.108.162.14:19527
-        dashboard: 127.0.0.1:19527
+        dashboard: 10.10.10.230:19527
       log:
         #日志路径
         dir: logs/sentinel

sckw-modules/sckw-file/src/main/resources/bootstrap.yml

@@ -5,6 +5,6 @@ spring:
   application:
     name: sckw-file
   profiles:
-    active: ${DEPLOY_MODE:local}
+    active: ${DEPLOY_MODE:dev}
   main:
     allow-bean-definition-overriding: true