From 8eea5be3b36875bd4ffe70e6c3a5bb07b1d829bf Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Thu, 13 Jun 2024 10:50:09 +0800
Subject: [PATCH] 1
---
/dev/null | 5 -----
.idea/vcs.xml | 2 +-
trading-order-admin/src/main/resources/redisson/redisson-local.yml | 2 +-
trading-order-admin/src/main/resources/redisson/redisson-dev.yml | 2 +-
trading-order-admin/src/main/resources/redisson/redisson-spider.yml | 2 +-
trading-order-admin/src/main/resources/application-dev.yml | 10 +++++-----
.idea/misc.xml | 4 +---
trading-order-admin/target/classes/application-dev.yml | 4 ++--
8 files changed, 12 insertions(+), 19 deletions(-)
diff --git a/.idea/admin.iml b/.idea/admin.iml
deleted file mode 100644
index d6ebd48..0000000
--- a/.idea/admin.iml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
- <component name="NewModuleRootManager" inherit-compiler-output="true">
- <exclude-output />
- <content url="file://$MODULE_DIR$" />
- <orderEntry type="inheritedJdk" />
- <orderEntry type="sourceFolder" forTests="false" />
- </component>
-</module>
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
deleted file mode 100644
index 8d66637..0000000
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="InspectionProjectProfileManager">
- <profile version="1.0">
- <option name="myName" value="Project Default" />
- </profile>
-</component>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 4b661a5..b784bbc 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -8,7 +8,5 @@
</list>
</option>
</component>
- <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
- <output url="file://$PROJECT_DIR$/out" />
- </component>
+ <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK" />
</project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index 35eb1dd..94a25f7 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
- <mapping directory="" vcs="Git" />
+ <mapping directory="$PROJECT_DIR$" vcs="Git" />
</component>
</project>
\ No newline at end of file
diff --git a/trading-order-admin/src/main/resources/application-dev.yml b/trading-order-admin/src/main/resources/application-dev.yml
index 98242a1..4114b60 100644
--- a/trading-order-admin/src/main/resources/application-dev.yml
+++ b/trading-order-admin/src/main/resources/application-dev.yml
@@ -9,10 +9,10 @@
max-request-size: 100MB
datasource:
# 东八区时区
- url: jdbc:mysql://localhost:3306/auyeung-root?allowMultiQueries=true&useSSL=false&useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true
+ url: jdbc:mysql://localhost:3306/jys?allowMultiQueries=true&useSSL=false&useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true
# 纽约时区 - GMT-5
- username: auyeung-root
- password: auyeung-root
+ username: root
+ password: 123456
driver-class-name: com.mysql.jdbc.Driver
type: com.alibaba.druid.pool.DruidDataSource
druid:
@@ -60,7 +60,7 @@
config-spider: classpath:redisson/redisson-spider.yml
host: localhost
port: 6379
- password: auyeung-root
+# password: auyeung-root
freemarker:
check-template-location: false
logging:
@@ -102,7 +102,7 @@
maxTotal: 50
host: ${spring.redis.host}
port: ${spring.redis.port}
- password: ${spring.redis.password}
+# password: ${spring.redis.password}
database: 1
db:
diff --git a/trading-order-admin/src/main/resources/redisson/redisson-dev.yml b/trading-order-admin/src/main/resources/redisson/redisson-dev.yml
index 80a0cf4..9acfb88 100644
--- a/trading-order-admin/src/main/resources/redisson/redisson-dev.yml
+++ b/trading-order-admin/src/main/resources/redisson/redisson-dev.yml
@@ -2,7 +2,7 @@
singleServerConfig:
address: redis://localhost:6379
database: 0
- password: auyeung-root
+# password: auyeung-root
idleConnectionTimeout: 10000
connectTimeout: 10000
timeout: 3000
diff --git a/trading-order-admin/src/main/resources/redisson/redisson-local.yml b/trading-order-admin/src/main/resources/redisson/redisson-local.yml
index 80a0cf4..9acfb88 100644
--- a/trading-order-admin/src/main/resources/redisson/redisson-local.yml
+++ b/trading-order-admin/src/main/resources/redisson/redisson-local.yml
@@ -2,7 +2,7 @@
singleServerConfig:
address: redis://localhost:6379
database: 0
- password: auyeung-root
+# password: auyeung-root
idleConnectionTimeout: 10000
connectTimeout: 10000
timeout: 3000
diff --git a/trading-order-admin/src/main/resources/redisson/redisson-spider.yml b/trading-order-admin/src/main/resources/redisson/redisson-spider.yml
index 1a9e371..a3427e9 100644
--- a/trading-order-admin/src/main/resources/redisson/redisson-spider.yml
+++ b/trading-order-admin/src/main/resources/redisson/redisson-spider.yml
@@ -2,7 +2,7 @@
singleServerConfig:
address: redis://localhost:6379
database: 0
- password: auyeung-root
+# password: auyeung-root
idleConnectionTimeout: 10000
connectTimeout: 10000
timeout: 3000
diff --git a/trading-order-admin/target/classes/application-dev.yml b/trading-order-admin/target/classes/application-dev.yml
index 25c83bc..4114b60 100644
--- a/trading-order-admin/target/classes/application-dev.yml
+++ b/trading-order-admin/target/classes/application-dev.yml
@@ -60,7 +60,7 @@
config-spider: classpath:redisson/redisson-spider.yml
host: localhost
port: 6379
- password: auyeung-root
+# password: auyeung-root
freemarker:
check-template-location: false
logging:
@@ -102,7 +102,7 @@
maxTotal: 50
host: ${spring.redis.host}
port: ${spring.redis.port}
- password: ${spring.redis.password}
+# password: ${spring.redis.password}
database: 1
db:
--
Gitblit v1.9.3