From eabca20d196501ee15a75f06624f49ae11077382 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=81?= <993668622@qq.com>
Date: Tue, 27 Feb 2024 18:18:09 +0800
Subject: [PATCH] update
---
xm-bootstrap/pom.xml | 7 +-
.../src/main/java/com/XmApplication.java | 7 +-
.../src/main/resources/application-prod.yml | 24 +-
xm-bootstrap/xm-bootstrap.iml | 290 +++++++-----------
xm-cloud-bootstrap/xm-cloud-bootstrap.iml | 229 ++++++++++++++
xm-core/xm-core.iml | 89 +++---
6 files changed, 407 insertions(+), 239 deletions(-)
create mode 100644 xm-cloud-bootstrap/xm-cloud-bootstrap.iml
diff --git a/xm-bootstrap/pom.xml b/xm-bootstrap/pom.xml
index 39fd8f83..a543513d 100644
--- a/xm-bootstrap/pom.xml
+++ b/xm-bootstrap/pom.xml
@@ -20,6 +20,11 @@
com.xm
xm-core
+
+
+ org.springframework.boot
+ spring-boot-starter-web
+
@@ -44,4 +49,4 @@
唛盟云-项目管理系统微服务启动器
-
\ No newline at end of file
+
diff --git a/xm-bootstrap/src/main/java/com/XmApplication.java b/xm-bootstrap/src/main/java/com/XmApplication.java
index fe8eb5ff..e8ee4071 100644
--- a/xm-bootstrap/src/main/java/com/XmApplication.java
+++ b/xm-bootstrap/src/main/java/com/XmApplication.java
@@ -1,12 +1,13 @@
package com;
import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.session.data.redis.config.annotation.web.http.EnableRedisHttpSession;
-
+@SpringBootApplication
@EnableRedisHttpSession
public class XmApplication {
-
-
+
+
public static void main(String[] args) {
SpringApplication.run(XmApplication.class,args);
diff --git a/xm-bootstrap/src/main/resources/application-prod.yml b/xm-bootstrap/src/main/resources/application-prod.yml
index 4700b290..34c78ec7 100644
--- a/xm-bootstrap/src/main/resources/application-prod.yml
+++ b/xm-bootstrap/src/main/resources/application-prod.yml
@@ -56,20 +56,20 @@ spring:
client-secret: ${spring.application.name}-8888
authorization-grant-type: password
scope: all
- # 下面配置 client_credentials 模式
+ # 下面配置 client_credentials 模式
def-client:
provider: def-oauth-server
client-id: ${spring.application.name}
client-secret: ${spring.application.name}-8888
authorization-grant-type: client_credentials
scope: all
- # 下面配置authorization_code模式
+ # 下面配置authorization_code模式
code-client:
provider: def-oauth-server
client-id: ${spring.application.name}
client-secret: ${spring.application.name}-8888
authorization-grant-type: authorization_code
- # 授权码模式下需要配置重定向地址
+ # 授权码模式下需要配置重定向地址
redirect-uri: ${messages.base-uri}/authorized
scope: all
provider:
@@ -205,9 +205,9 @@ spring:
#password: zchcgl123!@#
#driver-class-name: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://123.207.117.5:3306/xm?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowMultiQueries=true&serverTimezone=CTT
+ url: jdbc:mysql://172.16.1.121:3307/xm?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowMultiQueries=true&serverTimezone=CTT
username: root
- password: 1qaz@WSX
+ password: mysql
driver-class-name: com.mysql.cj.jdbc.Driver
@@ -218,19 +218,19 @@ spring:
#password: root
#driver-class-name: com.mysql.cj.jdbc.Driver
mem-ds:
- url: jdbc:mysql://123.207.117.5:3306/adm?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowMultiQueries=true&serverTimezone=CTT
+ url: jdbc:mysql://172.16.1.121:3307/lcode?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowMultiQueries=true&serverTimezone=CTT
username: root
- password: 1qaz@WSX
+ password: mysql
driver-class-name: com.mysql.cj.jdbc.Driver
mall-ds:
- url: jdbc:mysql://123.207.117.5:3306/adm?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowMultiQueries=true&serverTimezone=CTT
+ url: jdbc:mysql://172.16.1.121:3307/lcode?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowMultiQueries=true&serverTimezone=CTT
username: root
- password: 1qaz@WSX
+ password: mysql
driver-class-name: com.mysql.cj.jdbc.Driver
#redis 配置
redis:
- database: 0
- host: 134.175.57.249
+ database: 9
+ host: 127.0.0.1
timeout: 300s
lettuce:
pool:
@@ -239,7 +239,7 @@ spring:
max-wait: 10000 #最大建立连接等待时间。如果超过此时间将接到异常。设为-1表示无限制。
min-idle: 8 #最小等待连接中的数量,设 0 为没有限制
shutdown-timeout: 100ms
- password: QqKj*123
+ password:
port: 6379
#mybatis plus 设置
mybatis-plus:
diff --git a/xm-bootstrap/xm-bootstrap.iml b/xm-bootstrap/xm-bootstrap.iml
index e7c277c8..28457f40 100644
--- a/xm-bootstrap/xm-bootstrap.iml
+++ b/xm-bootstrap/xm-bootstrap.iml
@@ -1,5 +1,15 @@
+
+
+
+
+
+
+
+
+
+
@@ -10,140 +20,67 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
+
+
+
+
@@ -167,54 +104,24 @@
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
@@ -227,6 +134,25 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -249,30 +175,30 @@
-
-
-
+
+
+
-
-
+
+
-
-
-
-
+
+
+
+
-
+
-
-
+
+
-
-
+
+
@@ -299,7 +225,7 @@
-
+
\ No newline at end of file
diff --git a/xm-cloud-bootstrap/xm-cloud-bootstrap.iml b/xm-cloud-bootstrap/xm-cloud-bootstrap.iml
new file mode 100644
index 00000000..2f7ddfdb
--- /dev/null
+++ b/xm-cloud-bootstrap/xm-cloud-bootstrap.iml
@@ -0,0 +1,229 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/xm-core/xm-core.iml b/xm-core/xm-core.iml
index ebd278ab..6a16f56d 100644
--- a/xm-core/xm-core.iml
+++ b/xm-core/xm-core.iml
@@ -1,5 +1,19 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -11,6 +25,8 @@
+
+
@@ -44,7 +60,7 @@
-
+
@@ -53,7 +69,6 @@
-
@@ -77,45 +92,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -132,6 +108,7 @@
+
@@ -156,8 +133,19 @@
+
+
+
+
+
+
+
+
+
+
+
@@ -170,6 +158,25 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+