Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
log-platform
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
赵啸非
log-platform
Commits
ff6de550
Commit
ff6de550
authored
Jan 13, 2023
by
赵啸非
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
重新设置配置文件
parent
d4a63ef8
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
90 additions
and
90 deletions
+90
-90
log-manager-ui/admin/.env.production
log-manager-ui/admin/.env.production
+1
-1
log-manager-ui/admin/.env.test
log-manager-ui/admin/.env.test
+1
-1
log-manager-ui/admin/.env.yibin
log-manager-ui/admin/.env.yibin
+1
-1
log-manager/pom.xml
log-manager/pom.xml
+7
-7
log-manager/src/main/java/com/mortals/xhx/base/framework/config/RedissonConfig.java
...com/mortals/xhx/base/framework/config/RedissonConfig.java
+80
-80
No files found.
log-manager-ui/admin/.env.production
View file @
ff6de550
...
@@ -8,5 +8,5 @@ VUE_APP_BASE_API = http://192.168.0.251:9005/m
...
@@ -8,5 +8,5 @@ VUE_APP_BASE_API = http://192.168.0.251:9005/m
VUE_APP_WEBSOCKET_API =192.168.0.251:18222/m
VUE_APP_WEBSOCKET_API =192.168.0.251:18222/m
# 门户登录地址
# 门户登录地址
VUE_APP_PORTAL_URL =
http://192.168.0.251:11072
VUE_APP_PORTAL_URL =
/portal_home
log-manager-ui/admin/.env.test
View file @
ff6de550
...
@@ -8,5 +8,5 @@ VUE_APP_BASE_API = http://192.168.0.98:11091/m
...
@@ -8,5 +8,5 @@ VUE_APP_BASE_API = http://192.168.0.98:11091/m
VUE_APP_WEBSOCKET_API
=
192.168
.
0.98
:
18222
/
m
VUE_APP_WEBSOCKET_API
=
192.168
.
0.98
:
18222
/
m
# 门户登录地址
# 门户登录地址
VUE_APP_PORTAL_URL
=
http
://
192.168
.
0.98
:
11072
VUE_APP_PORTAL_URL
=
/
portal_home
log-manager-ui/admin/.env.yibin
View file @
ff6de550
...
@@ -8,4 +8,4 @@ VUE_APP_BASE_API = http://192.168.2.144:11091/m
...
@@ -8,4 +8,4 @@ VUE_APP_BASE_API = http://192.168.2.144:11091/m
VUE_APP_WEBSOCKET_API =192.168.2.144:18222/m
VUE_APP_WEBSOCKET_API =192.168.2.144:18222/m
# 门户登录地址
# 门户登录地址
VUE_APP_PORTAL_URL = http://192.168.2.144:11072
VUE_APP_PORTAL_URL =/portal_home
\ No newline at end of file
\ No newline at end of file
log-manager/pom.xml
View file @
ff6de550
...
@@ -128,25 +128,25 @@
...
@@ -128,25 +128,25 @@
<profiles.server.path>
/sampleform
</profiles.server.path>
<profiles.server.path>
/sampleform
</profiles.server.path>
<profiles.publish.path>
/home/publish
</profiles.publish.path>
<profiles.publish.path>
/home/publish
</profiles.publish.path>
<profiles.datasource.uri>
<profiles.datasource.uri>
<![CDATA[jdbc:mysql://127.0.0.1:3306/
device
-platform?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Hongkong]]>
</profiles.datasource.uri>
<![CDATA[jdbc:mysql://127.0.0.1:3306/
log
-platform?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Hongkong]]>
</profiles.datasource.uri>
<profiles.datasource.username>
root
</profiles.datasource.username>
<profiles.datasource.username>
root
</profiles.datasource.username>
<profiles.datasource.password>
xhx@2022
</profiles.datasource.password>
<profiles.datasource.password>
xhx@2022
</profiles.datasource.password>
<profiles.redis.uri>
127.0.0.1
</profiles.redis.uri>
<profiles.redis.uri>
127.0.0.1
</profiles.redis.uri>
<profiles.redis.port>
6379
</profiles.redis.port>
<profiles.redis.port>
6379
</profiles.redis.port>
<profiles.redis.username></profiles.redis.username>
<profiles.redis.username></profiles.redis.username>
<profiles.redis.password>
12345678
</profiles.redis.password>
<profiles.redis.password>
hotel@2020
</profiles.redis.password>
<profiles.redis.database>
9
</profiles.redis.database>
<profiles.redis.database>
9
</profiles.redis.database>
<profiles.rabbitmq.host>
1
92.168.0.25
1
</profiles.rabbitmq.host>
<profiles.rabbitmq.host>
1
27.0.0.
1
</profiles.rabbitmq.host>
<profiles.rabbitmq.port>
5672
</profiles.rabbitmq.port>
<profiles.rabbitmq.port>
5672
</profiles.rabbitmq.port>
<profiles.rabbitmq.username>
root
</profiles.rabbitmq.username>
<profiles.rabbitmq.username>
taxi_mq
</profiles.rabbitmq.username>
<profiles.rabbitmq.password>
xhx@2022
</profiles.rabbitmq.password>
<profiles.rabbitmq.password>
admin@2020
</profiles.rabbitmq.password>
<profiles.rabbitmq.virtualhost>
/
</profiles.rabbitmq.virtualhost>
<profiles.rabbitmq.virtualhost>
/
</profiles.rabbitmq.virtualhost>
<profiles.log.level>
INFO
</profiles.log.level>
<profiles.log.level>
INFO
</profiles.log.level>
<profiles.nacos.server-addr>
127.0.0.1:8848
</profiles.nacos.server-addr>
<profiles.nacos.server-addr>
127.0.0.1:8848
</profiles.nacos.server-addr>
<profiles.nacos.group>
DEFAULT_GROUP
</profiles.nacos.group>
<profiles.nacos.group>
DEFAULT_GROUP
</profiles.nacos.group>
<profiles.nacos.namespace>
smart-gov
</profiles.nacos.namespace>
<profiles.nacos.namespace>
smart-gov
</profiles.nacos.namespace>
<profiles.log.path>
/mortals/app/logs
</profiles.log.path>
<profiles.log.path>
/
home/
mortals/app/logs
</profiles.log.path>
<profiles.filepath>
/mortals/app/data
</profiles.filepath>
<profiles.filepath>
/
home/
mortals/app/data
</profiles.filepath>
<package.environment>
yibin
</package.environment>
<package.environment>
yibin
</package.environment>
<skipDeploy>
false
</skipDeploy>
<skipDeploy>
false
</skipDeploy>
</properties>
</properties>
...
...
log-manager/src/main/java/com/mortals/xhx/base/framework/config/RedissonConfig.java
View file @
ff6de550
package
com.mortals.xhx.base.framework.config
;
//package com.mortals.xhx.base.framework.config;
//
import
lombok.Data
;
//import lombok.Data;
import
lombok.extern.slf4j.Slf4j
;
//import lombok.extern.slf4j.Slf4j;
import
org.redisson.Redisson
;
//import org.redisson.Redisson;
import
org.redisson.api.RedissonClient
;
//import org.redisson.api.RedissonClient;
import
org.redisson.client.codec.Codec
;
//import org.redisson.client.codec.Codec;
import
org.redisson.codec.JsonJacksonCodec
;
//import org.redisson.codec.JsonJacksonCodec;
import
org.redisson.config.Config
;
//import org.redisson.config.Config;
import
org.slf4j.Logger
;
//import org.slf4j.Logger;
import
org.slf4j.LoggerFactory
;
//import org.slf4j.LoggerFactory;
import
org.springframework.boot.context.properties.ConfigurationProperties
;
//import org.springframework.boot.context.properties.ConfigurationProperties;
import
org.springframework.context.annotation.Bean
;
//import org.springframework.context.annotation.Bean;
import
org.springframework.context.annotation.Configuration
;
//import org.springframework.context.annotation.Configuration;
//
/**
///**
* RedissonConfig配置
// * RedissonConfig配置
*
// *
* @author: zxfei
// * @author: zxfei
* @date: 2022/8/8 16:02
// * @date: 2022/8/8 16:02
*/
// */
@Configuration
//@Configuration
@ConfigurationProperties
(
prefix
=
"spring.redis"
)
//@ConfigurationProperties(prefix = "spring.redis")
@Slf4j
//@Slf4j
@Data
//@Data
public
class
RedissonConfig
{
//public class RedissonConfig {
//
private
String
host
;
// private String host;
//
private
int
port
;
// private int port;
//
private
String
password
;
// private String password;
//
private
int
database
;
// private int database;
//
@Bean
// @Bean
public
RedissonClient
redissonClient
()
{
// public RedissonClient redissonClient() {
RedissonClient
redissonClient
;
// RedissonClient redissonClient;
Config
config
=
new
Config
();
// Config config = new Config();
String
url
=
"redis://"
+
host
+
":"
+
port
;
// String url = "redis://" + host + ":" + port;
if
(
""
.
equalsIgnoreCase
(
password
))
password
=
null
;
// if("".equalsIgnoreCase(password)) password=null;
// 单节点配置
// // 单节点配置
config
.
useSingleServer
().
setAddress
(
url
).
setDatabase
(
database
).
setPassword
(
password
);
// config.useSingleServer().setAddress(url).setDatabase(database).setPassword(password);
//使用json序列化方式
// //使用json序列化方式
Codec
codec
=
new
JsonJacksonCodec
();
// Codec codec = new JsonJacksonCodec();
config
.
setCodec
(
codec
);
// config.setCodec(codec);
//
// 主从配置
// // 主从配置
/*config.useMasterSlaveServers()
// /*config.useMasterSlaveServers()
// 设置redis主节点
// // 设置redis主节点
.setMasterAddress("redis://192.168.1.120:6379")
// .setMasterAddress("redis://192.168.1.120:6379")
// 设置redis从节点
// // 设置redis从节点
.addSlaveAddress("redis://192.168.1.130:6379", "redis://192.168.1.140:6379");*/
// .addSlaveAddress("redis://192.168.1.130:6379", "redis://192.168.1.140:6379");*/
// 哨兵部署方式,sentinel是采用Paxos拜占庭协议,一般sentinel至少3个节点
// // 哨兵部署方式,sentinel是采用Paxos拜占庭协议,一般sentinel至少3个节点
/*config.useSentinelServers()
// /*config.useSentinelServers()
.setMasterName("my-sentinel-name")
// .setMasterName("my-sentinel-name")
.addSentinelAddress("redis://192.168.1.120:6379")
// .addSentinelAddress("redis://192.168.1.120:6379")
.addSentinelAddress("redis://192.168.1.130:6379")
// .addSentinelAddress("redis://192.168.1.130:6379")
.addSentinelAddress("redis://192.168.1.140:6379");*/
// .addSentinelAddress("redis://192.168.1.140:6379");*/
// 集群部署方式,cluster方式至少6个节点,3主3从,3主做sharding,3从用来保证主宕机后可以高可用
// // 集群部署方式,cluster方式至少6个节点,3主3从,3主做sharding,3从用来保证主宕机后可以高可用
/*config.useClusterServers()
// /*config.useClusterServers()
// 集群状态扫描间隔时间,单位是毫秒
// // 集群状态扫描间隔时间,单位是毫秒
.setScanInterval(2000)
// .setScanInterval(2000)
.addNodeAddress("redis://192.168.1.120:6379")
// .addNodeAddress("redis://192.168.1.120:6379")
.addNodeAddress("redis://192.168.1.130:6379")
// .addNodeAddress("redis://192.168.1.130:6379")
.addNodeAddress("redis://192.168.1.140:6379")
// .addNodeAddress("redis://192.168.1.140:6379")
.addNodeAddress("redis://192.168.1.150:6379")
// .addNodeAddress("redis://192.168.1.150:6379")
.addNodeAddress("redis://192.168.1.160:6379")
// .addNodeAddress("redis://192.168.1.160:6379")
.addNodeAddress("redis://192.168.1.170:6379");*/
// .addNodeAddress("redis://192.168.1.170:6379");*/
// 云托管部署方式,这种方式主要解决redis提供商为云服务的提供商的redis连接,比如亚马逊云、微软云
// // 云托管部署方式,这种方式主要解决redis提供商为云服务的提供商的redis连接,比如亚马逊云、微软云
/*config.useReplicatedServers()
// /*config.useReplicatedServers()
// 主节点变化扫描间隔时间
// // 主节点变化扫描间隔时间
.setScanInterval(2000)
// .setScanInterval(2000)
.addNodeAddress("redis://192.168.1.120:6379")
// .addNodeAddress("redis://192.168.1.120:6379")
.addNodeAddress("redis://192.168.1.130:6379")
// .addNodeAddress("redis://192.168.1.130:6379")
.addNodeAddress("redis://192.168.1.140:6379");*/
// .addNodeAddress("redis://192.168.1.140:6379");*/
redissonClient
=
Redisson
.
create
(
config
);
// redissonClient = Redisson.create(config);
return
redissonClient
;
// return redissonClient;
}
// }
}
//}
\ No newline at end of file
\ No newline at end of file
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment