去除无关模块

jeecg-boot/db/Dockerfile

@@ -1,6 +1,4 @@
-FROM registry.cn-hangzhou.aliyuncs.com/jeecgdocker/mysql:8.0.19
-
-MAINTAINER jeecgos@163.com
+FROM mysql:8.0.39
 
 ENV TZ=Asia/Shanghai
 
@@ -10,4 +8,4 @@ COPY ./tables_nacos.sql /docker-entrypoint-initdb.d
 
 COPY ./jeecgboot-mysql-5.7.sql /docker-entrypoint-initdb.d
 
-COPY ./tables_xxl_job.sql /docker-entrypoint-initdb.d
+COPY ./tables_xxl_job.sql /docker-entrypoint-initdb.d

jeecg-boot/db/版本升级说明.md

@@ -1,7 +1,5 @@
 # 版本升级方法
 
-> JeecgBoot属于平台级产品，每次升级改动较大，目前做不到平滑升级。
-
 ### 增量升级方案
 #### 1.代码合并
  本地通过svn或git做好主干，在分支上做业务开发，jeecg每次版本发布，可以手工覆盖主干的代码，对比合并代码；
@@ -12,4 +10,4 @@
 > 注意： 升级sql只提供mysql版本；如果有权限升级, 还需要手工角色授权，退出重新登录才好使。
 
 #### 3.兼容问题
- 每次发版，会针对不兼容地方重点说明。
+ 每次发版，会针对不兼容地方重点说明。

jeecg-boot/jeecg-boot-base-core/pom.xml

@@ -38,7 +38,7 @@
 			</snapshots>
 		</repository>
 	</repositories>
-	
+
 	<dependencies>
 		<!--jeecg-tools-->
 		<dependency>
@@ -163,7 +163,7 @@
 			<artifactId>DmDialect-for-hibernate5.0</artifactId>
 			<version>${dm8.version}</version>
 		</dependency>
-      
+
 		<!-- Quartz定时任务 -->
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
@@ -288,11 +288,5 @@
 			<groupId>cn.hutool</groupId>
 			<artifactId>hutool-crypto</artifactId>
 		</dependency>
-
-		<!-- chatgpt -->
-		<dependency>
-			<groupId>org.jeecgframework.boot</groupId>
-			<artifactId>jeecg-boot-starter-chatgpt</artifactId>
-		</dependency>
 	</dependencies>
-</project>
+</project>

jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/gpt/cache/LocalCache.java

@@ -1,34 +0,0 @@
-package org.jeecg.modules.demo.gpt.cache;
-
-import cn.hutool.cache.CacheUtil;
-import cn.hutool.cache.impl.TimedCache;
-import cn.hutool.core.date.DateUnit;
-
-//update-begin---author:chenrui ---date:20240126  for：【QQYUN-7932】AI助手------------
-
-/**
- * 聊天记录本地缓存
- * @author chenrui
- * @date 2024/1/26 20:06
- */
-public class LocalCache {
-    /**
-     * 缓存时长
-     */
-    public static final long TIMEOUT = 5 * DateUnit.MINUTE.getMillis();
-    /**
-     * 清理间隔
-     */
-    private static final long CLEAN_TIMEOUT = 5 * DateUnit.MINUTE.getMillis();
-    /**
-     * 缓存对象
-     */
-    public static final TimedCache<String, Object> CACHE = CacheUtil.newTimedCache(TIMEOUT);
-
-    static {
-        //启动定时任务
-        CACHE.schedulePrune(CLEAN_TIMEOUT);
-    }
-}
-
-//update-end---author:chenrui ---date:20240126  for：【QQYUN-7932】AI助手------------

jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/gpt/controller/ChatController.java

@@ -1,74 +0,0 @@
-package org.jeecg.modules.demo.gpt.controller;
-
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.modules.demo.gpt.service.ChatService;
-import org.jeecg.modules.demo.gpt.vo.ChatHistoryVO;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;
-
-//update-begin---author:chenrui ---date:20240126  for：【QQYUN-7932】AI助手------------
-
-/**
- * @Description: chatGpt-聊天接口
- * @Author: chenrui
- * @Date: 2024/1/9 16:30
- */
-@Controller
-@RequestMapping("/test/ai/chat")
-public class ChatController {
-
-    @Autowired
-    ChatService chatService;
-
-    /**
-     * 创建sse连接
-     *
-     * @return
-     */
-    @GetMapping(value = "/send")
-    public SseEmitter createConnect(@RequestParam(name = "topicId", required = false) String topicId, @RequestParam(name = "message", required = true) String message) {
-        SseEmitter sse = chatService.createChat();
-        chatService.sendMessage(topicId, message);
-        return sse;
-    }
-
-    //update-begin---author:chenrui ---date:20240223  for：[QQYUN-8225]聊天记录保存------------
-    /**
-     * 保存聊天记录
-     * @param chatHistoryVO
-     * @return
-     * @author chenrui
-     * @date 2024/2/22 13:54
-     */
-    @PostMapping(value = "/history/save")
-    @ResponseBody
-    public Result<?> saveHistory(@RequestBody ChatHistoryVO chatHistoryVO) {
-        return chatService.saveHistory(chatHistoryVO);
-    }
-
-    /**
-     * 查询聊天记录
-     * @return
-     * @author chenrui
-     * @date 2024/2/22 14:03
-     */
-    @GetMapping(value = "/history/get")
-    @ResponseBody
-    public Result<ChatHistoryVO> getHistoryByTopic() {
-        return chatService.getHistoryByTopic();
-    }
-    //update-end---author:chenrui ---date:20240223  for：[QQYUN-8225]聊天记录保存------------
-
-    /**
-     * 关闭连接
-     */
-    @GetMapping(value = "/close")
-    public void closeConnect() {
-        chatService.closeChat();
-    }
-
-
-}
-//update-end---author:chenrui ---date:20240126  for：【QQYUN-7932】AI助手------------

jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/gpt/listeners/OpenAISSEEventSourceListener.java

@@ -1,136 +0,0 @@
-package org.jeecg.modules.demo.gpt.listeners;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.unfbx.chatgpt.entity.chat.ChatCompletionResponse;
-import com.unfbx.chatgpt.entity.chat.Message;
-import lombok.SneakyThrows;
-import lombok.extern.slf4j.Slf4j;
-import okhttp3.Response;
-import okhttp3.ResponseBody;
-import okhttp3.sse.EventSource;
-import okhttp3.sse.EventSourceListener;
-import org.apache.commons.lang3.StringUtils;
-import org.jetbrains.annotations.NotNull;
-import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;
-
-import java.util.Objects;
-
-//update-begin---author:chenrui ---date:20240126  for：【QQYUN-7932】AI助手------------
-/**
- * OpenAI的SSE监听
- * @author chenrui
- * @date 2024/1/26 20:06
- */
-@Slf4j
-public class OpenAISSEEventSourceListener extends EventSourceListener {
-
-    private long tokens;
-
-    private SseEmitter sseEmitter;
-
-    private String topicId;
-
-    public OpenAISSEEventSourceListener(SseEmitter sseEmitter) {
-        this.sseEmitter = sseEmitter;
-    }
-
-    public OpenAISSEEventSourceListener(String topicId,SseEmitter sseEmitter){
-        this.topicId = topicId;
-        this.sseEmitter = sseEmitter;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void onOpen(@NotNull EventSource eventSource, @NotNull Response response) {
-        log.info("OpenAI建立sse连接...");
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @SneakyThrows
-    @Override
-    public void onEvent(@NotNull EventSource eventSource, String id, String type, @NotNull String data) {
-        log.debug("OpenAI返回数据：{}", data);
-        tokens += 1;
-        if (data.equals("[DONE]")) {
-            log.info("OpenAI返回数据结束了");
-            sseEmitter.send(SseEmitter.event()
-                    .id("[TOKENS]")
-                    .data("<br/><br/>tokens：" + tokens())
-                    .reconnectTime(3000));
-            sseEmitter.send(SseEmitter.event()
-                    .id("[DONE]")
-                    .data("[DONE]")
-                    .reconnectTime(3000));
-            // 传输完成后自动关闭sse
-            sseEmitter.complete();
-            return;
-        }
-        ObjectMapper mapper = new ObjectMapper();
-        ChatCompletionResponse completionResponse = mapper.readValue(data, ChatCompletionResponse.class); // 读取Json
-        try {
-            sseEmitter.send(SseEmitter.event()
-                    .id(this.topicId)
-                    .data(completionResponse.getChoices().get(0).getDelta())
-                    .reconnectTime(3000));
-        } catch (Exception e) {
-            log.error(e.getMessage(),e);
-            eventSource.cancel();
-        }
-    }
-
-
-    @Override
-    public void onClosed(@NotNull EventSource eventSource) {
-        log.info("流式输出返回值总共{}tokens", tokens() - 2);
-        log.info("OpenAI关闭sse连接...");
-    }
-
-
-    @SneakyThrows
-    @Override
-    public void onFailure(@NotNull EventSource eventSource, Throwable t, Response response) {
-        String errMsg = "";
-        ResponseBody body = null == response ? null:response.body();
-        if (Objects.nonNull(body)) {
-            log.error("OpenAI  sse连接异常data：{}，异常：{}", body.string(), t.getMessage());
-            errMsg = body.string();
-        } else {
-            log.error("OpenAI  sse连接异常data：{}，异常：{}", response, t.getMessage());
-            errMsg = t.getMessage();
-        }
-        eventSource.cancel();
-        sseEmitter.send(SseEmitter.event()
-                .id("[ERR]")
-                .data(Message.builder().content(explainErr(errMsg)).build())
-                .reconnectTime(3000));
-        sseEmitter.send(SseEmitter.event()
-                .id("[DONE]")
-                .data("[DONE]")
-                .reconnectTime(3000));
-        sseEmitter.complete();
-    }
-
-    private String explainErr(String errMsg){
-        if(StringUtils.isEmpty(errMsg)){
-            return "";
-        }
-        if(errMsg.contains("Rate limit")){
-            return "请求频率太快了,请等待20秒再试.";
-        }
-        return errMsg;
-    }
-
-    /**
-     * tokens
-     * @return
-     */
-    public long tokens() {
-        return tokens;
-    }
-}
-
-//update-end---author:chenrui ---date:20240126  for：【QQYUN-7932】AI助手------------

jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/gpt/service/ChatService.java

@@ -1,56 +0,0 @@
-package org.jeecg.modules.demo.gpt.service;
-
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.modules.demo.gpt.vo.ChatHistoryVO;
-import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;
-
-//update-begin---author:chenrui ---date:20240126  for：【QQYUN-7932】AI助手------------
-
-/**
- * AI助手聊天Service
- * @author chenrui
- * @date 2024/1/26 20:08
- */
-public interface ChatService {
-    /**
-     * 创建SSE
-     * @return
-     */
-    SseEmitter createChat();
-
-    /**
-     * 关闭SSE
-     */
-    void closeChat();
-
-    /**
-     * 客户端发送消息到服务端
-     *
-     * @param topicId
-     * @param message
-     * @author chenrui
-     * @date 2024/1/26 20:01
-     */
-    void sendMessage(String topicId, String message);
-
-    //update-begin---author:chenrui ---date:20240223  for：[QQYUN-8225]聊天记录保存------------
-    /**
-     * 保存聊天记录
-     * @param chatHistoryVO
-     * @return
-     * @author chenrui
-     * @date 2024/2/22 13:37
-     */
-    Result<?> saveHistory(ChatHistoryVO chatHistoryVO);
-
-    /**
-     * 查询聊天记录
-     * @return
-     * @author chenrui
-     * @date 2024/2/22 13:59
-     */
-    Result<ChatHistoryVO> getHistoryByTopic();
-    //update-end---author:chenrui ---date:20240223  for：[QQYUN-8225]聊天记录保存------------
-}
-
-//update-end---author:chenrui ---date:20240126  for：【QQYUN-7932】AI助手------------

jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/gpt/service/impl/ChatServiceImpl.java

@@ -1,233 +0,0 @@
-package org.jeecg.modules.demo.gpt.service.impl;
-
-import cn.hutool.core.util.StrUtil;
-import cn.hutool.json.JSONUtil;
-import com.alibaba.fastjson.JSONArray;
-import com.unfbx.chatgpt.OpenAiStreamClient;
-import com.unfbx.chatgpt.entity.chat.ChatCompletion;
-import com.unfbx.chatgpt.entity.chat.Message;
-import com.unfbx.chatgpt.exception.BaseException;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.shiro.SecurityUtils;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.exception.JeecgBootException;
-import org.jeecg.common.system.vo.LoginUser;
-import org.jeecg.common.util.SpringContextUtils;
-import org.jeecg.common.util.UUIDGenerator;
-import org.jeecg.modules.demo.gpt.cache.LocalCache;
-import org.jeecg.modules.demo.gpt.listeners.OpenAISSEEventSourceListener;
-import org.jeecg.modules.demo.gpt.service.ChatService;
-import org.jeecg.modules.demo.gpt.vo.ChatHistoryVO;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.stereotype.Service;
-import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
-//update-begin---author:chenrui ---date:20240126  for：【QQYUN-7932】AI助手------------
-
-/**
- * AI助手聊天Service
- * @author chenrui
- * @date 2024/1/26 20:07
- */
-@Service
-@Slf4j
-public class ChatServiceImpl implements ChatService {
-
-    //update-begin---author:chenrui ---date:20240223  for：[QQYUN-8225]聊天记录保存------------
-    private static final String CACHE_KEY_PREFIX = "ai:chart:";
-
-    /**
-     *
-     */
-    private static final String CACHE_KEY_MSG_CONTEXT = "msg_content";
-
-
-    /**
-     *
-     */
-    private static final String CACHE_KEY_MSG_HISTORY = "msg_history";
-
-    @Autowired
-    RedisTemplate redisTemplate;
-    //update-end---author:chenrui ---date:20240223  for：[QQYUN-8225]聊天记录保存------------
-
-    private OpenAiStreamClient openAiStreamClient = null;
-
-    //update-begin---author:chenrui ---date:20240131  for：[QQYUN-8212]fix 没有配置启动报错------------
-
-    /**
-     * 防止client不能成功注入
-     * @return
-     * @author chenrui
-     * @date 2024/2/3 23:08
-     */
-    private OpenAiStreamClient ensureClient(){
-        if (null == this.openAiStreamClient){
-            //update-begin---author:chenrui ---date:20240625  for：[TV360X-1570]给于更友好的提示，提示未配置ai------------
-            try {
-                this.openAiStreamClient = SpringContextUtils.getBean(OpenAiStreamClient.class);
-            } catch (Exception ignored) {
-                sendErrorMsg("如果您想使用AI助手，请先设置相应配置!");
-            }
-            //update-end---author:chenrui ---date:20240625  for：[TV360X-1570]给于更友好的提示，提示未配置ai------------
-        }
-        return this.openAiStreamClient;
-    }
-    //update-end---author:chenrui ---date:20240131  for：[QQYUN-8212]fix 没有配置启动报错------------
-
-    private String getUserId() {
-        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-        return sysUser.getId();
-    }
-
-    @Override
-    public SseEmitter createChat() {
-        String uid = getUserId();
-        //默认30秒超时,设置为0L则永不超时
-        SseEmitter sseEmitter = new SseEmitter(-0L);
-        //完成后回调
-        sseEmitter.onCompletion(() -> {
-            log.info("[{}]结束连接...................",uid);
-            LocalCache.CACHE.remove(uid);
-        });
-        //超时回调
-        sseEmitter.onTimeout(() -> {
-            log.info("[{}]连接超时...................", uid);
-        });
-        //异常回调
-        sseEmitter.onError(
-                throwable -> {
-                    try {
-                        log.info("[{}]连接异常,{}", uid, throwable.toString());
-                        sseEmitter.send(SseEmitter.event()
-                                .id(uid)
-                                .name("发生异常！")
-                                .data(Message.builder().content("发生异常请重试！").build())
-                                .reconnectTime(3000));
-                        LocalCache.CACHE.put(uid, sseEmitter);
-                    } catch (IOException e) {
-                        log.error(e.getMessage(),e);
-                    }
-                }
-        );
-        try {
-            sseEmitter.send(SseEmitter.event().reconnectTime(5000));
-        } catch (IOException e) {
-            log.error(e.getMessage(),e);
-        }
-        LocalCache.CACHE.put(uid, sseEmitter);
-        log.info("[{}]创建sse连接成功！", uid);
-        return sseEmitter;
-    }
-
-    @Override
-    public void closeChat() {
-        String uid = getUserId();
-        SseEmitter sse = (SseEmitter) LocalCache.CACHE.get(uid);
-        if (sse != null) {
-            sse.complete();
-            //移除
-            LocalCache.CACHE.remove(uid);
-        }
-    }
-
-    @Override
-    public void sendMessage(String topicId, String message) {
-        String uid = getUserId();
-        if (StrUtil.isBlank(message)) {
-            log.info("参数异常，message为null");
-            throw new BaseException("参数异常，message不能为空~");
-        }
-        if (StrUtil.isBlank(topicId)) {
-            topicId = UUIDGenerator.generate();
-        }
-        //update-begin---author:chenrui ---date:20240223  for：[QQYUN-8225]聊天记录保存------------
-        log.info("话题id:{}", topicId);
-        String cacheKey = CACHE_KEY_PREFIX + uid + "_" + topicId;
-        String messageContext = (String) redisTemplate.opsForHash().get(cacheKey, CACHE_KEY_MSG_CONTEXT);
-        List<Message> msgHistory = new ArrayList<>();
-        if (StrUtil.isNotBlank(messageContext)) {
-            List<Message> messages = JSONArray.parseArray(messageContext, Message.class);
-            msgHistory = messages == null ? new ArrayList<>() : messages;
-        }
-        Message currentMessage = Message.builder().content(message).role(Message.Role.USER).build();
-        msgHistory.add(currentMessage);
-
-        SseEmitter sseEmitter = (SseEmitter) LocalCache.CACHE.get(uid);
-        if (sseEmitter == null) {
-            log.info("聊天消息推送失败uid:[{}],没有创建连接，请重试。", uid);
-            throw new JeecgBootException("聊天消息推送失败uid:[{}],没有创建连接，请重试。~");
-        }
-        //update-begin---author:chenrui ---date:20240625  for：[TV360X-1570]给于更友好的提示，提示未配置ai------------
-        OpenAiStreamClient client = ensureClient();
-        if (null != client) {
-            OpenAISSEEventSourceListener openAIEventSourceListener = new OpenAISSEEventSourceListener(topicId, sseEmitter);
-            ChatCompletion completion = ChatCompletion
-                    .builder()
-                    .messages(msgHistory)
-                    .model(ChatCompletion.Model.GPT_3_5_TURBO.getName())
-                    .build();
-            client.streamChatCompletion(completion, openAIEventSourceListener);
-            redisTemplate.opsForHash().put(cacheKey, CACHE_KEY_MSG_CONTEXT, JSONUtil.toJsonStr(msgHistory));
-            //update-end---author:chenrui ---date:20240223  for：[QQYUN-8225]聊天记录保存------------
-            Result.ok(completion.tokens());
-        }
-        //update-end---author:chenrui ---date:20240625  for：[TV360X-1570]给于更友好的提示，提示未配置ai------------
-    }
-
-    //update-begin---author:chenrui ---date:20240223  for：[QQYUN-8225]聊天记录保存------------
-    @Override
-    public Result<?> saveHistory(ChatHistoryVO chatHistoryVO) {
-        String uid = getUserId();
-        String cacheKey = CACHE_KEY_PREFIX + CACHE_KEY_MSG_HISTORY + ":" + uid;
-        redisTemplate.opsForValue().set(cacheKey, chatHistoryVO.getContent());
-        return Result.OK("保存成功");
-    }
-
-    @Override
-    public Result<ChatHistoryVO> getHistoryByTopic() {
-        String uid = getUserId();
-        String cacheKey = CACHE_KEY_PREFIX + CACHE_KEY_MSG_HISTORY + ":" + uid;
-        String historyContent = (String) redisTemplate.opsForValue().get(cacheKey);
-        ChatHistoryVO chatHistoryVO = new ChatHistoryVO();
-        chatHistoryVO.setContent(historyContent);
-        return Result.OK(chatHistoryVO);
-    }
-    //update-end---author:chenrui ---date:20240223  for：[QQYUN-8225]聊天记录保存------------
-
-    /**
-     * 发送异常消息给前端
-     * [TV360X-1570]给于更友好的提示，提示未配置ai
-     *
-     * @param msg
-     * @author chenrui
-     * @date 2024/6/25 10:38
-     */
-    private void sendErrorMsg(String msg) {
-        String uid = getUserId();
-        SseEmitter sseEmitter = (SseEmitter) LocalCache.CACHE.get(uid);
-        if (sseEmitter == null) {
-            return;
-        }
-        try {
-            sseEmitter.send(SseEmitter.event()
-                    .id("[ERR]")
-                    .data(Message.builder().content(msg).build())
-                    .reconnectTime(3000));
-            sseEmitter.send(SseEmitter.event()
-                    .id("[DONE]")
-                    .data("[DONE]")
-                    .reconnectTime(3000));
-            sseEmitter.complete();
-        } catch (IOException e) {
-            log.error(e.getMessage(), e);
-        }
-    }
-}
-
-//update-end---author:chenrui ---date:20240126  for：【QQYUN-7932】AI助手------------

jeecg-boot/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/gpt/vo/ChatHistoryVO.java

@@ -1,25 +0,0 @@
-package org.jeecg.modules.demo.gpt.vo;
-
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * @Description: 聊天记录
- * @Author: chenrui
- * @Date: 2024/2/22 13:36
- */
-@Data
-public class ChatHistoryVO implements Serializable {
-    private static final long serialVersionUID = 3238429500037511283L;
-
-    /**
-     * 话题id
-     */
-    String topicId;
-
-    /**
-     * 聊天记录内容
-     */
-    String content;
-}

jeecg-boot/jeecg-module-system/jeecg-system-biz/pom.xml

@@ -19,10 +19,6 @@
 			<groupId>org.hibernate</groupId>
 			<artifactId>hibernate-core</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.jeecgframework.boot</groupId>
-			<artifactId>hibernate-re</artifactId>
-		</dependency>
 
 		<!-- 企业微信/钉钉 api -->
 		<dependency>
@@ -39,11 +35,11 @@
 			<groupId>org.jeecgframework.jimureport</groupId>
 			<artifactId>jimureport-dashboard-spring-boot-starter</artifactId>
 		</dependency>
-	<!-- 积木报表 mongo redis 支持包 
+	<!-- 积木报表 mongo redis 支持包
 		<dependency>
 			<groupId>org.jeecgframework.jimureport</groupId>
 			<artifactId>jimureport-nosql-starter</artifactId>
 		</dependency>-->
 	</dependencies>
-	
+
 </project>

jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/JeecgSystemApplication.java

@@ -33,12 +33,11 @@ public class JeecgSystemApplication extends SpringBootServletInitializer {
         String port = env.getProperty("server.port");
         String path = oConvertUtils.getString(env.getProperty("server.servlet.context-path"));
         log.info("\n----------------------------------------------------------\n\t" +
-                "Application Jeecg-Boot is running! Access URLs:\n\t" +
+                "Application is running! Access URLs:\n\t" +
                 "Local: \t\thttp://localhost:" + port + path + "/\n\t" +
                 "External: \thttp://" + ip + ":" + port + path + "/\n\t" +
-                "Swagger文档: \thttp://" + ip + ":" + port + path + "/doc.html\n" +
                 "----------------------------------------------------------");
 
     }
 
-}
+}

jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/application-dev.yml

@@ -47,17 +47,17 @@ spring:
     multipart:
       max-file-size: 10MB
       max-request-size: 10MB
-  mail:
-    host: smtp.163.com
-    username: jeecgos@163.com
-    password: ??
-    properties:
-      mail:
-        smtp:
-          auth: true
-          starttls:
-            enable: true
-            required: true
+#  mail:
+#    host: smtp.163.com
+#    username: jeecgos@163.com
+#    password: ??
+#    properties:
+#      mail:
+#        smtp:
+#          auth: true
+#          starttls:
+#            enable: true
+#            required: true
   ## quartz定时任务,采用数据库方式
   quartz:
     job-store-type: jdbc
@@ -124,7 +124,7 @@ spring:
   datasource:
     druid:
       stat-view-servlet:
-        enabled: true
+        enabled: false
         loginUsername: admin
         loginPassword: 123456
         allow:
@@ -163,7 +163,7 @@ spring:
         master:
           url: jdbc:mysql://127.0.0.1:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
           username: root
-          password: root
+          password: 123456
           driver-class-name: com.mysql.cj.jdbc.Driver
           # 多数据源配置
           #multi-datasource1:
@@ -242,7 +242,7 @@ jeecg:
   #大屏报表参数设置
   jmreport:
     #多租户模式，默认值为空(created:按照创建人隔离、tenant:按照租户隔离) (v1.6.2+ 新增)
-    saasMode: 
+    saasMode:
     # 平台上线安全配置(v1.6.2+ 新增)
     firewall:
       # 数据源安全 (开启后，不允许使用平台数据源、SQL解析加签并且不允许查询数据库)
@@ -266,29 +266,15 @@ jeecg:
     password:
     type: STANDALONE
     enabled: true
-  # ai-chat
-  ai-chat:
-    # 是否开启；必须。
-    enabled: false
-    # openAi接口秘钥，填写自己的apiKey；必须。
-    apiKey: "？？？？"
-    # openAi域名，有代理就填代理的域名。默认：openAI官方apiHost
-    apiHost: "https://api.openai.com"
-    # 超时时间单位:s。默认 60s
-    timeout: 60
-    # 本地代理地址
-#    proxy:
-#      host: "http://127.0.0.1"
-#      port: "7890"
   # 百度开放API配置
-  baidu-api:
-    app-id: ??
-    api-key: ??
-    secret-key: ??
+#  baidu-api:
+#    app-id: ??
+#    api-key: ??
+#    secret-key: ??
 
 #cas单点登录
 cas:
-  prefixUrl: http://cas.example.org:8443/cas
+  prefixUrl: ''
 #Mybatis输出sql日志
 logging:
   level:
@@ -305,27 +291,27 @@ knife4j:
     username: jeecg
     password: jeecg1314
 #第三方登录
-justauth:
-  enabled: true
-  type:
-    GITHUB:
-      client-id: ??
-      client-secret: ??
-      redirect-uri: http://sso.test.com:8080/jeecg-boot/sys/thirdLogin/github/callback
-    WECHAT_ENTERPRISE:
-      client-id: ??
-      client-secret: ??
-      redirect-uri: http://sso.test.com:8080/jeecg-boot/sys/thirdLogin/wechat_enterprise/callback
-      agent-id: ??
-    DINGTALK:
-      client-id: ??
-      client-secret: ??
-      redirect-uri: http://sso.test.com:8080/jeecg-boot/sys/thirdLogin/dingtalk/callback
-    WECHAT_OPEN:
-      client-id: ??
-      client-secret: ??
-      redirect-uri: http://sso.test.com:8080/jeecg-boot/sys/thirdLogin/wechat_open/callback
-  cache:
-    type: default
-    prefix: 'demo::'
-    timeout: 1h
+#justauth:
+#  enabled: true
+#  type:
+#    GITHUB:
+#      client-id: ??
+#      client-secret: ??
+#      redirect-uri: http://sso.test.com:8080/jeecg-boot/sys/thirdLogin/github/callback
+#    WECHAT_ENTERPRISE:
+#      client-id: ??
+#      client-secret: ??
+#      redirect-uri: http://sso.test.com:8080/jeecg-boot/sys/thirdLogin/wechat_enterprise/callback
+#      agent-id: ??
+#    DINGTALK:
+#      client-id: ??
+#      client-secret: ??
+#      redirect-uri: http://sso.test.com:8080/jeecg-boot/sys/thirdLogin/dingtalk/callback
+#    WECHAT_OPEN:
+#      client-id: ??
+#      client-secret: ??
+#      redirect-uri: http://sso.test.com:8080/jeecg-boot/sys/thirdLogin/wechat_open/callback
+#  cache:
+#    type: default
+#    prefix: 'demo::'
+#    timeout: 1h

jeecg-boot/jeecg-module-system/jeecg-system-start/src/main/resources/banner.txt

@@ -1,17 +1,4 @@
-${AnsiColor.BRIGHT_BLUE}
-   (_)                          | |               | |
-    _  ___  ___  ___ __ _ ______| |__   ___   ___ | |_ 
-   | |/ _ \/ _ \/ __/ _` |______| '_ \ / _ \ / _ \| __|
-   | |  __/  __/ (_| (_| |      | |_) | (_) | (_) | |_ 
-   | |\___|\___|\___\__, |      |_.__/ \___/ \___/ \__|
-  _/ |               __/ |                             
- |__/               |___/
-
-
 ${AnsiColor.BRIGHT_GREEN}
-Jeecg  Boot Version: 3.7.1
+软件版本: 3.7.1
 Spring Boot Version: ${spring-boot.version}${spring-boot.formatted-version}
-产品官网： www.jeecg.com
-版权所属： 北京国炬信息技术有限公司
-公司官网： www.guojusoft.com
-${AnsiColor.BLACK}
+${AnsiColor.WHITE}

jeecg-boot/pom.xml

@@ -19,7 +19,7 @@
 		<developerConnection>http://guojusoft.com</developerConnection>
 		<url>http://www.jeecg.com/vip</url>
 	</scm>
-	
+
   	<parent>
 	    <groupId>org.springframework.boot</groupId>
 	    <artifactId>spring-boot-starter-parent</artifactId>
@@ -53,7 +53,7 @@
 		<!-- 国产数据库驱动 -->
 		<kingbase8.version>9.0.0</kingbase8.version>
 		<dm8.version>8.1.1.49</dm8.version>
-		
+
 		<!-- 持久层 -->
 		<mybatis-plus.version>3.5.3.2</mybatis-plus.version>
 		<dynamic-datasource-spring-boot-starter.version>4.1.3</dynamic-datasource-spring-boot-starter.version>
@@ -255,11 +255,6 @@
 					</exclusion>
 				</exclusions>
 			</dependency>
-			<dependency>
-				<groupId>org.jeecgframework.boot</groupId>
-				<artifactId>hibernate-re</artifactId>
-				<version>3.7.1-RC</version>
-			</dependency>
 
 			<!--mongon db-->
 			<dependency>
@@ -504,7 +499,7 @@
 			<url>http://maven.jeecg.com:8090/nexus/content/repositories/snapshots/</url>
 		</snapshotRepository>
 	</distributionManagement>
-	
+
     <!-- 环境 -->
     <profiles>
         <!-- 开发 -->
@@ -586,4 +581,4 @@
 			</modules>
 		</profile>
     </profiles>
-</project>
+</project>