+# * Licensed under the Apache License, Version 2.0 (the "License"); +# * you may not use this file except in compliance with the License. +# * You may obtain a copy of the License at +# *
+# * http://www.apache.org/licenses/LICENSE-2.0 +# *
+# * Unless required by applicable law or agreed to in writing, software
+# * distributed under the License is distributed on an "AS IS" BASIS,
+# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# * See the License for the specific language governing permissions and
+# * limitations under the License.
+# */
+services:
+ postgresql:
+ image: timescale/timescaledb:latest-pg17
+ container_name: postgresql
+ # 保持容器在没有守护程序的情况下运行
+ tty: true
+ restart: always
+ privileged: true
+ ports:
+ - "5432:5432"
+ volumes:
+ - ./postgresql17/data:/var/lib/postgresql/data
+ environment:
+ - POSTGRES_USER=root
+ - POSTGRES_PASSWORD=laokou123
+ - TZ=Asia/Shanghai
+ networks:
+ - laokou_network
+ redis:
+ image: redis:7.4.2
+ container_name: redis
+ # 保持容器在没有守护程序的情况下运行
+ tty: true
+ restart: always
+ privileged: true
+ ports:
+ - "6379:6379"
+ volumes:
+ - ./redis7/conf/redis.conf:/etc/redis/redis.conf
+ - ./redis7/data:/data
+ command: redis-server --appendonly yes --requirepass 'laokou123'
+ environment:
+ - TZ=Asia/Shanghai
+ networks:
+ - laokou_network
+ rocketmq-namesrv:
+ image: apache/rocketmq:5.3.1
+ container_name: rocketmq-namesrv
+ # 保持容器在没有守护程序的情况下运行
+ tty: true
+ restart: always
+ privileged: true
+ ports:
+ - "9876:9876"
+ command: sh mqnamesrv
+ environment:
+ - JAVA_OPT_EXT=-server -Xmx512m -Xms512m -Xmn256m
+ - TZ=Asia/Shanghai
+ networks:
+ - laokou_network
+ rocketmq-broker:
+ image: apache/rocketmq:5.3.1
+ container_name: rocketmq-broker
+ # 保持容器在没有守护程序的情况下运行
+ tty: true
+ restart: always
+ privileged: true
+ ports:
+ - "10909:10909"
+ - "10911:10911"
+ - "10912:10912"
+ # 自动创建主题
+ command: sh mqbroker -n rocketmq-namesrv:9876 -c /home/rocketmq/conf/broker.conf autoCreateTopicEnable=true
+ environment:
+ - JAVA_OPT_EXT=-server -Xmx512m -Xms512m -Xmn256m
+ - TZ=Asia/Shanghai
+ volumes:
+ - ./rocketmq5/broker/conf/broker.conf:/home/rocketmq/conf/broker.conf
+ # 挂载数据
+ - ./rocketmq5/broker/store:/home/rocketmq/store
+ # 挂载日志
+ - ./rocketmq5/broker/logs:/home/rocketmq/logs
+ networks:
+ - laokou_network
+ depends_on:
+ - rocketmq-namesrv
+networks:
+ laokou_network:
+ driver: bridge
diff --git a/laokou-common/laokou-common-core/src/main/java/org/laokou/common/core/config/RestClientConfig.java b/laokou-common/laokou-common-core/src/main/java/org/laokou/common/core/config/RestClientConfig.java
index f105c14d48..deb8ac54eb 100644
--- a/laokou-common/laokou-common-core/src/main/java/org/laokou/common/core/config/RestClientConfig.java
+++ b/laokou-common/laokou-common-core/src/main/java/org/laokou/common/core/config/RestClientConfig.java
@@ -18,18 +18,13 @@
package org.laokou.common.core.config;
import lombok.extern.slf4j.Slf4j;
-import org.laokou.common.core.utils.ThreadUtil;
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
-import org.springframework.http.client.JdkClientHttpRequestFactory;
import org.springframework.web.client.RestClient;
-import java.net.http.HttpClient;
-import java.util.concurrent.ExecutorService;
import static org.laokou.common.core.utils.HttpUtil.getHttpClient;
-import static org.laokou.common.i18n.utils.SslUtil.sslContext;
/**
* @author laokou
@@ -39,16 +34,6 @@
@ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.SERVLET)
public class RestClientConfig {
- @Bean(bootstrap = Bean.Bootstrap.BACKGROUND)
- public RestClient jdkRestClient() {
- log.info("{} => Initializing JDK RestClient", Thread.currentThread().getName());
- // 虚拟线程
- ExecutorService executor = ThreadUtil.newVirtualTaskExecutor();
- HttpClient httpClient = HttpClient.newBuilder().sslContext(sslContext()).build();
- JdkClientHttpRequestFactory factory = new JdkClientHttpRequestFactory(httpClient, executor);
- return RestClient.builder().requestFactory(factory).build();
- }
-
@Bean
public RestClient restClient() {
log.info("{} => Initializing Default RestClient", Thread.currentThread().getName());
diff --git a/laokou-common/laokou-common-mybatis-plus/src/main/java/org/laokou/common/mybatisplus/config/FuryFactory.java b/laokou-common/laokou-common-mybatis-plus/src/main/java/org/laokou/common/mybatisplus/config/FuryFactory.java
index 33e8d7355f..c734b1b742 100644
--- a/laokou-common/laokou-common-mybatis-plus/src/main/java/org/laokou/common/mybatisplus/config/FuryFactory.java
+++ b/laokou-common/laokou-common-mybatis-plus/src/main/java/org/laokou/common/mybatisplus/config/FuryFactory.java
@@ -258,6 +258,7 @@ public FuryFactory() {
FURY.register(net.sf.jsqlparser.statement.select.MySqlSqlCacheFlags.class);
FURY.register(net.sf.jsqlparser.statement.select.PlainSelect.BigQuerySelectQualifier.class);
FURY.register(net.sf.jsqlparser.statement.update.UpdateModifierPriority.class);
+ FURY.register(net.sf.jsqlparser.expression.operators.relational.LikeExpression.KeyWord.class);
}
public static FuryFactory getFuryFactory() {
diff --git a/laokou-service/laokou-admin/laokou-admin-infrastructure/src/main/resources/mapper/menu/MenuMapper.xml b/laokou-service/laokou-admin/laokou-admin-infrastructure/src/main/resources/mapper/menu/MenuMapper.xml
index a219a4bf2c..55c5081f13 100644
--- a/laokou-service/laokou-admin/laokou-admin-infrastructure/src/main/resources/mapper/menu/MenuMapper.xml
+++ b/laokou-service/laokou-admin/laokou-admin-infrastructure/src/main/resources/mapper/menu/MenuMapper.xml
@@ -29,6 +29,7 @@
icon,
"sort",
"status",
+ permission,
create_time
@@ -40,6 +41,12 @@