【合并v3.8.2版本代码】 Merge remote-tracking branch 'origin/springboot3' into springboot3_sas

# Conflicts:
#	jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java
#	jeecg-boot/jeecg-module-system/jeecg-system-api/jeecg-system-cloud-api/src/main/java/org/jeecg/common/system/api/fallback/SysBaseAPIFallback.java
#	jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysRoleIndexController.java
#	jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/ThirdAppController.java
#	jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java
#	jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/banner.txt

jeecg-boot/jeecg-module-system/jeecg-system-api/jeecg-system-cloud-api/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>jeecg-system-api</artifactId>
         <groupId>org.jeecgframework.boot</groupId>
-        <version>3.8.1</version>
+        <version>3.8.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

jeecg-boot/jeecg-module-system/jeecg-system-api/jeecg-system-cloud-api/src/main/java/org/jeecg/common/system/api/ISysBaseAPI.java

@@ -6,6 +6,7 @@ import org.jeecg.common.api.dto.DataLogDTO;
 import org.jeecg.common.api.dto.OnlineAuthDTO;
 import org.jeecg.common.api.dto.message.*;
 import org.jeecg.common.constant.ServiceNameConstants;
+import org.jeecg.common.constant.enums.DySmsEnum;
 import org.jeecg.common.constant.enums.EmailTemplateEnum;
 import org.jeecg.common.desensitization.annotation.SensitiveDecode;
 import org.jeecg.common.system.api.factory.SysBaseAPIFallbackFactory;
@@ -523,6 +524,16 @@ public interface ISysBaseAPI extends CommonAPI {
      */
     @GetMapping("/sys/api/sendHtmlTemplateEmail")
     void sendHtmlTemplateEmail(@RequestParam("email") String email, @RequestParam("title") String title, @RequestParam("emailEnum") EmailTemplateEnum emailTemplateEnum, @RequestParam("params") JSONObject params);
+    /**
+    /**
+     * 发送短信消息
+     *
+     * @param phone  手机号码
+     * @param params  模版参数
+     * @param dySmsEnum 短信模版枚举
+     */
+    @GetMapping("/sys/api/sendSmsMsg")
+    void sendSmsMsg(@RequestParam("phone") String phone, @RequestParam("params") JSONObject params,@RequestParam("dySmsEnum") DySmsEnum dySmsEnum);
     /**
      * 41 获取公司下级部门和公司下所有用户id
      * @param orgCode 部门编号
@@ -791,6 +802,18 @@ public interface ISysBaseAPI extends CommonAPI {
             @RequestParam("tableOrDictCode") String tableOrDictCode,
             @RequestParam(value = "fields", required = false) String... fields
     );
+    /**
+     * 自动发布通告
+     *
+     * @param dataId 通告ID
+     * @param currentUserName 发送人
+     * @return
+     */
+    @GetMapping("/sys/api/announcementAutoRelease")
+    void announcementAutoRelease(
+            @RequestParam("dataId") String dataId,
+            @RequestParam(value = "currentUserName") String currentUserName
+    );
 
     @GetMapping("/sys/api/getUserByPhone")
     public LoginUser getUserByPhone(@RequestParam("phone") String phone);

jeecg-boot/jeecg-module-system/jeecg-system-api/jeecg-system-cloud-api/src/main/java/org/jeecg/common/system/api/fallback/SysBaseAPIFallback.java

@@ -6,6 +6,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.dto.DataLogDTO;
 import org.jeecg.common.api.dto.OnlineAuthDTO;
 import org.jeecg.common.api.dto.message.*;
+import org.jeecg.common.constant.enums.DySmsEnum;
 import org.jeecg.common.constant.enums.EmailTemplateEnum;
 import org.jeecg.common.system.api.ISysBaseAPI;
 import org.jeecg.common.system.vo.*;
@@ -341,6 +342,11 @@ public class SysBaseAPIFallback implements ISysBaseAPI {
 
     }
 
+    @Override
+    public void sendSmsMsg(String phone, JSONObject params, DySmsEnum dySmsEnum) {
+
+    }
+
     @Override
     public List<Map> getDeptUserByOrgCode(String orgCode) {
         return null;
@@ -465,17 +471,7 @@ public class SysBaseAPIFallback implements ISysBaseAPI {
     }
 
     @Override
-    public Map<String, List<DictModel>> queryAllDictItems() {
-        return null;
-    }
-
-    @Override
-    public List<SysDepartModel> queryUserDeparts(String userId) {
-        return null;
-    }
-
-    @Override
-    public void updateUserDepart(String username, String orgCode, Integer loginTenantId) {
+    public void announcementAutoRelease(String dataId, String currentUserName) {
 
     }
 
@@ -484,8 +480,24 @@ public class SysBaseAPIFallback implements ISysBaseAPI {
         return null;
     }
 
+    @Override
+    public Map<String, List<DictModel>> queryAllDictItems() {
+        return Map.of();
+    }
+
+    @Override
+    public List<SysDepartModel> queryUserDeparts(String userId) {
+        return List.of();
+    }
+
+    @Override
+    public void updateUserDepart(String username, String orgCode, Integer loginTenantId) {
+
+    }
+
     @Override
     public JSONObject setLoginTenant(String username) {
         return null;
     }
+
 }