1,fix auth column for skill

2,fix module auth

pom.xml

@@ -294,6 +294,13 @@
                 <version>${xueyi.version}</version>
             </dependency>
 
+            <!-- 模块auth模块 -->
+            <dependency>
+                <groupId>com.xueyi</groupId>
+                <artifactId>xueyi-api-modules-auth</artifactId>
+                <version>${xueyi.version}</version>
+            </dependency>
+
             <!-- huTool 工具类库 -->
             <dependency>
                 <groupId>cn.hutool</groupId>
@@ -327,18 +334,32 @@
     </dependencies>
 
     <profiles>
+        <profile>
+            <id>local</id>
+            <properties>
+                <!-- 环境标识，需要与配置文件的名称相对应 -->
+                <activatedProperties>local</activatedProperties>
+                <nacos.host>127.0.0.1</nacos.host>
+                <nacos.port>18848</nacos.port>
+                <nacos.namespace></nacos.namespace>
+            </properties>
+            <activation>
+                <!-- 默认环境 -->
+                <activeByDefault>true</activeByDefault>
+            </activation>
+        </profile>
         <profile>
             <id>dev</id>
             <properties>
                 <!-- 环境标识，需要与配置文件的名称相对应 -->
-                <activatedProperties>dev</activatedProperties>
+                <activatedProperties>dev1</activatedProperties>
                 <nacos.host>39.107.77.235</nacos.host>
                 <nacos.port>18848</nacos.port>
                 <nacos.namespace>6d0ee265-2a92-44cc-a6de-f34b3ea104e6</nacos.namespace>
             </properties>
             <activation>
                 <!-- 默认环境 -->
-                <activeByDefault>true</activeByDefault>
+<!--                <activeByDefault>true</activeByDefault>-->
             </activation>
         </profile>
         <profile>

xueyi-api/pom.xml

@@ -14,6 +14,7 @@
         <module>xueyi-api-tenant</module>
         <module>xueyi-api-file</module>
         <module>xueyi-api-job</module>
+        <module>xueyi-api-modules-auth</module>
 
     </modules>
 

xueyi-api/xueyi-api-modules-auth/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -0,0 +1 @@
+com.xueyi.modules.auth.api.feign.factory.RemoteTransferFallbackFactory

xueyi-common/xueyi-common-mqtt/src/main/java/com/xueyi/common/mqtt/service/MqttMessageHandlerService.java

@@ -1,22 +0,0 @@
-package com.xueyi.common.mqtt.service;
-
-/**
- * @author yk
- * @description
- * @date 2023-05-10 19:19
- */
-public class MqttMessageHandlerService{
-
-    private final MqttService mqttService;
-    private final MqttMessageHandler mqttMessageHandler;
-
-    public MqttMessageHandlerService(MqttService mqttService, MqttMessageHandler mqttMessageHandler) {
-        this.mqttService = mqttService;
-        this.mqttMessageHandler = mqttMessageHandler;
-        init();
-    }
-
-    private void init() {
-        mqttService.addObserver(mqttMessageHandler);
-    }
-}

xueyi-common/xueyi-common-mqtt/src/main/java/com/xueyi/common/mqtt/service/MqttService.java

@@ -1,108 +0,0 @@
-package com.xueyi.common.mqtt.service;
-
-import com.baomidou.mybatisplus.core.toolkit.StringUtils;
-import com.xueyi.common.mqtt.configure.MqttConfig;
-import org.eclipse.paho.client.mqttv3.IMqttDeliveryToken;
-import org.eclipse.paho.client.mqttv3.MqttCallback;
-import org.eclipse.paho.client.mqttv3.MqttClient;
-import org.eclipse.paho.client.mqttv3.MqttException;
-import org.eclipse.paho.client.mqttv3.MqttMessage;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * spring mqtt 工具类
- *
- * @author xueyi
- **/
-@Component
-@SuppressWarnings(value = {"unchecked", "rawtypes"})
-public class MqttService implements MqttCallback{
-
-    private List<MqttMessageHandler> observers = new ArrayList<>();
-
-    public void addObserver(MqttMessageHandler observer) {
-        observers.add(observer);
-    }
-
-    public void removeObserver(MqttMessageHandler observer) {
-        observers.remove(observer);
-    }
-    @Autowired
-    private MqttClient mqttClient;
-
-    @Autowired
-    private MqttConfig mqttConfig;
-
-    /**
-     * 发布消息到指定 topic
-     *
-     * @param topic 消息主题
-     * @param message 消息内容
-     */
-    public void sendMessage(String topic, Object message)  {
-        System.out.println("发送消息到 topic: " + topic);
-        System.out.println("消息内容: " + message);
-        MqttMessage msg = new MqttMessage();
-        msg.setPayload(message.toString().getBytes());
-        try {
-            mqttClient.publish(topic, msg);
-        } catch (MqttException e) {
-            e.printStackTrace();
-            System.err.println(e.getMessage());
-        }
-
-    }
-
-
-//    @PostConstruct
-    public void subscribe() {
-        mqttClient.setCallback(this);
-        for (String topic : Arrays.stream(mqttConfig.getTopics().split(",")).toList()) {
-            if (StringUtils.isNotEmpty(topic)) {
-                try {
-                    mqttClient.subscribe(topic, 0);
-                } catch (MqttException e) {
-                    e.printStackTrace();
-                    System.err.println(e.getMessage());
-                }
-            }
-        }
-    }
-
-    @Override
-    public void connectionLost(Throwable throwable) {
-        throwable.printStackTrace();
-        System.out.println("Connection lost: " + throwable.getMessage());
-        try {
-            mqttClient.reconnect();
-            subscribe();
-            System.out.println("Reconnected to MQTT broker");
-        } catch (MqttException e) {
-            System.out.println("Reconnect failed: " + e.getMessage());
-        }
-    }
-
-    @Override
-    public void messageArrived(String s, MqttMessage mqttMessage)  {
-        try{
-            for (MqttMessageHandler observer : observers) {
-                observer.handleMessage(s, new String(mqttMessage.getPayload(), StandardCharsets.UTF_8));
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-            System.err.println(e.getMessage());
-        }
-
-    }
-
-    @Override
-    public void deliveryComplete(IMqttDeliveryToken iMqttDeliveryToken) {
-
-    }
-}

xueyi-modules/xueyi-modules-auth/pom.xml

@@ -65,6 +65,11 @@
             <groupId>com.xueyi</groupId>
             <artifactId>xueyi-api-system</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>com.xueyi</groupId>
+            <artifactId>xueyi-api-modules-auth</artifactId>
+        </dependency>
     </dependencies>
 
     <build>