为了降低入门使用难度，改为默认单体运行，不对接cloud、不对接oauth2,

默认对接lcode
2 years ago · 0a5f3b63af
4 changed files with 50 additions and 55 deletions
--- a/.idea/xm-backend.iml
+++ b/.idea/xm-backend.iml
@ -8,52 +8,11 @@
    </content>
    <orderEntry type="inheritedJdk" />
    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Maven: com.mdp:mdp-oauth2-client:2.0.0-RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: com.mdp:mdp-tpa-client:2.0.0-RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-security:2.4.1" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.3.2" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-config:5.4.2" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-web:5.4.2" level="project" />
-    <orderEntry type="library" name="Maven: com.mdp:mdp-qx-api:2.0.0-RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-oauth2-client:2.4.1" level="project" />
-    <orderEntry type="library" name="Maven: com.sun.mail:jakarta.mail:1.6.5" level="project" />
-    <orderEntry type="library" name="Maven: com.sun.activation:jakarta.activation:1.2.2" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-oauth2-client:5.4.2" level="project" />
-    <orderEntry type="library" name="Maven: com.nimbusds:oauth2-oidc-sdk:8.23.1" level="project" />
-    <orderEntry type="library" name="Maven: com.github.stephenc.jcip:jcip-annotations:1.0-1" level="project" />
-    <orderEntry type="library" name="Maven: com.nimbusds:content-type:2.1" level="project" />
-    <orderEntry type="library" name="Maven: com.nimbusds:lang-tag:1.4.4" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-oauth2-jose:5.4.2" level="project" />
-    <orderEntry type="library" name="Maven: com.nimbusds:nimbus-jose-jwt:9.1.3" level="project" />
-    <orderEntry type="library" name="Maven: io.projectreactor.netty:reactor-netty:1.0.2" level="project" />
-    <orderEntry type="library" name="Maven: io.projectreactor.netty:reactor-netty-core:1.0.2" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-handler:4.1.55.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-common:4.1.55.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-resolver:4.1.55.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-buffer:4.1.55.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-transport:4.1.55.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-codec:4.1.55.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-handler-proxy:4.1.55.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-codec-socks:4.1.55.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-resolver-dns:4.1.55.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-codec-dns:4.1.55.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-transport-native-epoll:linux-x86_64:4.1.55.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-transport-native-unix-common:4.1.55.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.projectreactor.netty:reactor-netty-http:1.0.2" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-codec-http:4.1.55.Final" level="project" />
-    <orderEntry type="library" name="Maven: io.netty:netty-codec-http2:4.1.55.Final" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: io.projectreactor.netty:reactor-netty-http-brave:1.0.2" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: io.zipkin.brave:brave-instrumentation-http:5.13.2" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: io.zipkin.brave:brave:5.13.2" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: io.zipkin.reporter2:zipkin-reporter-brave:2.16.1" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: io.zipkin.reporter2:zipkin-reporter:2.16.1" level="project" />
-    <orderEntry type="library" scope="RUNTIME" name="Maven: io.zipkin.zipkin2:zipkin:2.23.0" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-webflux:5.3.2" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.3.2" level="project" />
-    <orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.4.1" level="project" />
-    <orderEntry type="library" name="Maven: org.reactivestreams:reactive-streams:1.0.3" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-oauth2-resource-server:5.4.2" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-oauth2-core:5.4.2" level="project" />
-    <orderEntry type="library" name="Maven: com.mdp:mdp-tpa-client:2.0.0-RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-redis:2.4.2" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-keyvalue:2.4.2" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.data:spring-data-commons:2.4.2" level="project" />
@ -77,9 +36,11 @@
    <orderEntry type="library" name="Maven: org.glassfish.jaxb:jaxb-runtime:2.3.3" level="project" />
    <orderEntry type="library" name="Maven: org.glassfish.jaxb:txw2:2.3.3" level="project" />
    <orderEntry type="library" name="Maven: com.sun.istack:istack-commons-runtime:3.0.11" level="project" />
+    <orderEntry type="library" name="Maven: com.sun.activation:jakarta.activation:1.2.2" level="project" />
    <orderEntry type="library" name="Maven: org.jsoup:jsoup:1.11.3" level="project" />
    <orderEntry type="library" name="Maven: com.mdp:mdp-ext-utils:2.0.0-RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework:spring-web:5.3.2" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.3.2" level="project" />
    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:9.0.41" level="project" />
    <orderEntry type="library" name="Maven: org.apache.tomcat:tomcat-annotations-api:9.0.41" level="project" />
    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.11.3" level="project" />
@ -115,6 +76,7 @@
    <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:9.0.41" level="project" />
    <orderEntry type="library" name="Maven: com.mdp:mdp-utils:2.0.0-RELEASE" level="project" />
    <orderEntry type="library" name="Maven: cn.hutool:hutool-all:5.8.0.M4" level="project" />
+    <orderEntry type="library" name="Maven: com.mdp:mdp-qx-api:2.0.0-RELEASE" level="project" />
    <orderEntry type="library" name="Maven: com.mdp:mdp-mybatis-enhance:2.0.0-RELEASE" level="project" />
    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-boot-starter:3.5.3.1" level="project" />
    <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus:3.5.3.1" level="project" />
@ -130,8 +92,19 @@
    <orderEntry type="library" name="Maven: org.javassist:javassist:3.20.0-GA" level="project" />
    <orderEntry type="library" name="Maven: com.mdp:mdp-email-client:2.0.0-RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-mail:2.4.1" level="project" />
+    <orderEntry type="library" name="Maven: com.sun.mail:jakarta.mail:1.6.5" level="project" />
    <orderEntry type="library" name="Maven: com.mdp:mdp-safe-client:2.0.0-RELEASE" level="project" />
    <orderEntry type="library" name="Maven: io.jsonwebtoken:jjwt:0.9.1" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-oauth2-client:2.4.1" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-oauth2-client:5.4.2" level="project" />
+    <orderEntry type="library" name="Maven: com.nimbusds:oauth2-oidc-sdk:8.23.1" level="project" />
+    <orderEntry type="library" name="Maven: com.github.stephenc.jcip:jcip-annotations:1.0-1" level="project" />
+    <orderEntry type="library" name="Maven: com.nimbusds:content-type:2.1" level="project" />
+    <orderEntry type="library" name="Maven: com.nimbusds:lang-tag:1.4.4" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-oauth2-jose:5.4.2" level="project" />
+    <orderEntry type="library" name="Maven: com.nimbusds:nimbus-jose-jwt:9.1.3" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-oauth2-resource-server:5.4.2" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.security:spring-security-oauth2-core:5.4.2" level="project" />
    <orderEntry type="library" name="Maven: com.mdp:mdp-sensitive-word:2.0.0-RELEASE" level="project" />
    <orderEntry type="library" name="Maven: com.mdp:mdp-meta-client:2.0.0-RELEASE" level="project" />
    <orderEntry type="library" name="Maven: com.mdp:mdp-mq:2.0.0-RELEASE" level="project" />
@ -144,6 +117,25 @@
    <orderEntry type="library" name="Maven: com.mdp:mdp-micro-client:2.0.0-RELEASE" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-webflux:2.4.1" level="project" />
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-reactor-netty:2.4.1" level="project" />
+    <orderEntry type="library" name="Maven: io.projectreactor.netty:reactor-netty-http:1.0.2" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-codec-http:4.1.55.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-common:4.1.55.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-buffer:4.1.55.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-transport:4.1.55.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-codec:4.1.55.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-handler:4.1.55.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-codec-http2:4.1.55.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-resolver-dns:4.1.55.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-resolver:4.1.55.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-codec-dns:4.1.55.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-transport-native-epoll:linux-x86_64:4.1.55.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-transport-native-unix-common:4.1.55.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.projectreactor.netty:reactor-netty-core:1.0.2" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-handler-proxy:4.1.55.Final" level="project" />
+    <orderEntry type="library" name="Maven: io.netty:netty-codec-socks:4.1.55.Final" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework:spring-webflux:5.3.2" level="project" />
+    <orderEntry type="library" name="Maven: io.projectreactor:reactor-core:3.4.1" level="project" />
+    <orderEntry type="library" name="Maven: org.reactivestreams:reactive-streams:1.0.3" level="project" />
    <orderEntry type="library" name="Maven: com.mdp:mdp-msg-client:2.0.0-RELEASE" level="project" />
    <orderEntry type="library" name="Maven: com.mdp:mdp-plat-client:2.0.0-RELEASE" level="project" />
    <orderEntry type="library" name="Maven: com.mdp:mdp-ds:2.0.0-RELEASE" level="project" />
--- a/pom.xml
+++ b/pom.xml
@ -34,11 +34,6 @@
 		</dependencies>
 	</dependencyManagement>
 	<dependencies>
-		<dependency>
-			<groupId>com.mdp</groupId>
-			<artifactId>mdp-oauth2-client</artifactId>
-			<version>${mdp.version}</version>
-		</dependency>
 		<dependency>
 			<groupId>com.mdp</groupId>
 			<artifactId>mdp-tpa-client</artifactId>
--- a/xm-core/pom.xml
+++ b/xm-core/pom.xml
@ -29,11 +29,6 @@
 			<artifactId>mdp-ds</artifactId>
 			<version>${mdp.version}</version>
 		</dependency>
-		<dependency>
-			<groupId>com.mdp</groupId>
-			<artifactId>mdp-oauth2-client</artifactId>
-			<version>${mdp.version}</version>
-		</dependency>
 		<dependency>
 			<groupId>net.coobird</groupId>
 			<artifactId>thumbnailator</artifactId>
--- a/xm-core/src/main/resources/application-dev.yml
+++ b/xm-core/src/main/resources/application-dev.yml
@ -262,17 +262,30 @@ logging:
  level:
    org.jeecg.modules.system.mapper : info

-# mdp平台授权验证服务器访问地址 cloud环境下换成 http://gate，本地调试如果不起验证服务器，可改为 https://www.qingqinkj.com/api/m1/oauth2/oauth2
-# 客户端必须在数据库表adm.oauth_client_details中配置，否则无法访问
 mdp:
+  # 网关地址 如果接入cloud,指cpringcloud的gate服务的访问地址 http://gate，如果不接入cloud,这里填写nginx的地址，或者注释掉
  api-gate: http://134.175.57.249:6101
  platform-branch-id: platform-branch-001
+  # 平台信息查询，由lcode提供服务，单体应用直接填写完整路径 http://127.0.0.1:7014/lcode/plat/platform/detail，cloud环境下注释掉，则使用默认的http://gate/lcode/plat/platform/detail
+  platform-query-uri: http://127.0.0.1:7014/lcode/plat/platform/detail
+  meta:
+    # 数据字典元数据查询，由lcode提供服务 ，单体应用直接填写完整路径http://127.0.0.1:7014/lcode/meta/item/dicts，cloud环境下注释掉，则使用默认的http://gate/lcode/meta/item/dicts
+    dicts-query-uri: http://127.0.0.1:7014/lcode/meta/item/dicts
+  #配置图片文件上传下载的相关参数
+  arc:
+    image-upload-root-path: D:/arcfile/images
+    image-download-base-uri: https://www.maimengcloud.com/api/m1/arc/
+    file-upload-root-path: D:/arcfile/files
+    file-download-base-uri: https://www.maimengcloud.com/api/m1/arc/
  # 站点语言类型cn\en等
  site-type: cn
  jwt:
    # 是否进行密钥检查，在开发环境中，涉及多个认证中心签发的jwt的时候，为了调试方便，可以暂时设为false
    valid-secure: false
+    # 如果不需要对接统一认证中心，connect-oauth2-server设为false,则对jwt token的解析将采用HS256算法解密，默认为true
+    # 接入统一认证中心时，客户端必须在数据库表oauth_client_details中配置，否则无法访问
+    connect-oauth2-server: false
+  # 接入统一认证中心时 mdp平台授权验证服务器访问地址 cloud环境下换成 http://gate，本地调试如果不起验证服务器，可改为 https://www.qingqinkj.com/api/m1/oauth2/oauth2
  oauth2:
    server:
      uri: http://134.175.57.249:7000
-