Browse Source

增加mdp模块扫码

master
qqkj 5 years ago
parent
commit
6617ecc0c0
  1. 13
      .idea/libraries/Maven__com_alibaba_fastjson_1_2_47.xml
  2. 13
      .idea/libraries/Maven__com_jcraft_jsch_0_1_54.xml
  3. 13
      .idea/libraries/Maven__org_eclipse_jgit_org_eclipse_jgit_5_1_3_201810200350_r.xml
  4. 1
      .idea/xm-backend.iml
  5. 16
      xm-bootstrap/pom.xml
  6. 3
      xm-bootstrap/src/main/java/com/xm/XmApplication.java
  7. 42
      xm-bootstrap/src/main/resources/application-dev.properties
  8. 41
      xm-bootstrap/src/main/resources/application-m1prod.properties
  9. 50
      xm-bootstrap/src/main/resources/mybatis/mybatis-config.xml
  10. 48
      xm-bootstrap/xm-bootstrap.iml
  11. 11
      xm-core/pom.xml
  12. 37
      xm-core/src/main/resources/application-dev.properties
  13. 3
      xm-core/src/test/java/com/xm/XmApplication.java
  14. 38
      xm-core/xm-core.iml

13
.idea/libraries/Maven__com_alibaba_fastjson_1_2_47.xml

@ -1,13 +0,0 @@
<component name="libraryTable">
<library name="Maven: com.alibaba:fastjson:1.2.47">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/com/alibaba/fastjson/1.2.47/fastjson-1.2.47.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/com/alibaba/fastjson/1.2.47/fastjson-1.2.47-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/com/alibaba/fastjson/1.2.47/fastjson-1.2.47-sources.jar!/" />
</SOURCES>
</library>
</component>

13
.idea/libraries/Maven__com_jcraft_jsch_0_1_54.xml

@ -1,13 +0,0 @@
<component name="libraryTable">
<library name="Maven: com.jcraft:jsch:0.1.54">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/com/jcraft/jsch/0.1.54/jsch-0.1.54.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/com/jcraft/jsch/0.1.54/jsch-0.1.54-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/com/jcraft/jsch/0.1.54/jsch-0.1.54-sources.jar!/" />
</SOURCES>
</library>
</component>

13
.idea/libraries/Maven__org_eclipse_jgit_org_eclipse_jgit_5_1_3_201810200350_r.xml

@ -1,13 +0,0 @@
<component name="libraryTable">
<library name="Maven: org.eclipse.jgit:org.eclipse.jgit:5.1.3.201810200350-r">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/eclipse/jgit/org.eclipse.jgit/5.1.3.201810200350-r/org.eclipse.jgit-5.1.3.201810200350-r.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/eclipse/jgit/org.eclipse.jgit/5.1.3.201810200350-r/org.eclipse.jgit-5.1.3.201810200350-r-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/eclipse/jgit/org.eclipse.jgit/5.1.3.201810200350-r/org.eclipse.jgit-5.1.3.201810200350-r-sources.jar!/" />
</SOURCES>
</library>
</component>

1
.idea/xm-backend.iml

@ -191,7 +191,6 @@
<orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" /> <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.13.1" level="project" /> <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.13.1" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:2.2" level="project" /> <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:2.2" level="project" />
<orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.47" level="project" />
<orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.16" level="project" /> <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.16" level="project" />
</component> </component>
</module> </module>

16
xm-bootstrap/pom.xml

@ -17,21 +17,15 @@
<version>${mdp.version}</version> <version>${mdp.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.xm</groupId>
<artifactId>xm-core</artifactId>
<groupId>com.mdp</groupId>
<artifactId>mdp-oauth2-client-cloud</artifactId>
<version>${mdp.version}</version>
</dependency> </dependency>
</dependencies>
<dependencyManagement>
<dependencies>
<dependency> <dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dependencies</artifactId>
<version>${spring-cloud.version}</version>
<type>pom</type>
<scope>import</scope>
<groupId>com.xm</groupId>
<artifactId>xm-core</artifactId>
</dependency> </dependency>
</dependencies> </dependencies>
</dependencyManagement>
<build> <build>
<plugins> <plugins>
<plugin> <plugin>

3
xm-bootstrap/src/main/java/com/xm/XmApplication.java

@ -2,10 +2,13 @@ package com.xm;
import org.springframework.boot.SpringApplication; import org.springframework.boot.SpringApplication;
import org.springframework.cloud.client.SpringCloudApplication; import org.springframework.cloud.client.SpringCloudApplication;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.session.data.redis.config.annotation.web.http.EnableRedisHttpSession; import org.springframework.session.data.redis.config.annotation.web.http.EnableRedisHttpSession;
import org.springframework.stereotype.Component;
@SpringCloudApplication @SpringCloudApplication
@EnableRedisHttpSession @EnableRedisHttpSession
@ComponentScan(basePackages={"com.mdp"})
public class XmApplication { public class XmApplication {

42
xm-bootstrap/src/main/resources/application-dev.properties

@ -2,7 +2,7 @@
spring.application.name=xm spring.application.name=xm
server.port=7067 server.port=7067
server.context-path=/${spring.application.name}
#server.context-path=/${spring.application.name}
#session失效时间 秒 #session失效时间 秒
server.session.timeout=43200 server.session.timeout=43200
spring.session.store-type=none spring.session.store-type=none
@ -13,7 +13,7 @@ spring.cloud.inetutils.preferredNetworks[1]=^172\.
#eureka.instance.instance-id=${spring.cloud.client.ipAddress}:${server.port} #eureka.instance.instance-id=${spring.cloud.client.ipAddress}:${server.port}
#eureka.instance.prefer-ip-address=true #eureka.instance.prefer-ip-address=true
spring.cloud.consul.host=localhost
spring.cloud.consul.host=134.175.57.249
spring.cloud.consul.port=8500 spring.cloud.consul.port=8500
@ -42,6 +42,42 @@ mdp.arc.file-upload-root-path=E:/arc/files
spring.http.multipart.maxFileSize=10Mb spring.http.multipart.maxFileSize=10Mb
spring.http.multipart.maxRequestSize=10Mb spring.http.multipart.maxRequestSize=10Mb
# mdp平台授权验证服务器访问地址 cloud环境下换成 http://gate,本地调试如果不起验证服务器,可改为 https://www.qingqinkj.com/api/m1/oauth2/oauth2
mdp.oauth2.server.uri=http://134.175.57.249:7000
# 客户端必须在数据库表adm.oauth_client_details中配置,否则无法访问
# 下面配置 password 模式
spring.security.oauth2.client.registration.password-client.provider=def-oauth-server
spring.security.oauth2.client.registration.password-client.client-id=${spring.application.name}
spring.security.oauth2.client.registration.password-client.client-secret= ${spring.application.name}-8888
spring.security.oauth2.client.registration.password-client.authorization-grant-type= password
spring.security.oauth2.client.registration.password-client.scope= all
# 下面配置 client_credentials 模式
spring.security.oauth2.client.registration.def-client.provider=def-oauth-server
spring.security.oauth2.client.registration.def-client.client-id=${spring.application.name}
spring.security.oauth2.client.registration.def-client.client-secret= ${spring.application.name}-8888
spring.security.oauth2.client.registration.def-client.authorization-grant-type= client_credentials
spring.security.oauth2.client.registration.def-client.scope= all
# 下面配置authorization_code模式
spring.security.oauth2.client.registration.code-client.provider=def-oauth-server
spring.security.oauth2.client.registration.code-client.client-id=${spring.application.name}
spring.security.oauth2.client.registration.code-client.client-secret= ${spring.application.name}-8888
spring.security.oauth2.client.registration.code-client.authorization-grant-type= authorization_code
# 授权码模式下需要配置重定向地址
spring.security.oauth2.client.registration.code-client.redirect-uri= ${messages.base-uri}/authorized
spring.security.oauth2.client.registration.code-client.scope= all
# 授权码方式获取code
spring.security.oauth2.client.provider.def-oauth-server.authorization-uri= ${mdp.oauth2.server.uri}/oauth2/authorize
# 获取token接口
spring.security.oauth2.client.provider.def-oauth-server.token-uri= ${mdp.oauth2.server.uri}/oauth2/token
# 资源服务器
spring.security.oauth2.resourceserver.jwt.jwk-set-uri= ${mdp.oauth2.server.uri}/oauth2/jwks
#配置数据源 #配置数据源
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
spring.datasource.jdbc-url=jdbc:mysql://123.207.117.5:3306/arc?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowMultiQueries=true&serverTimezone=CTT spring.datasource.jdbc-url=jdbc:mysql://123.207.117.5:3306/arc?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowMultiQueries=true&serverTimezone=CTT
@ -67,7 +103,7 @@ mdp.sms.app-secret=4b0659a2ee8ba4e54a570515fda94aef
# Redis数据库索引(默认为0) # Redis数据库索引(默认为0)
spring.redis.database=0 spring.redis.database=0
# Redis服务器地址 # Redis服务器地址
spring.redis.host=10.0.0.17
spring.redis.host=134.175.57.249
# Redis服务器连接端口 # Redis服务器连接端口
spring.redis.port=6379 spring.redis.port=6379
# Redis服务器连接密码(默认为空) # Redis服务器连接密码(默认为空)

41
xm-bootstrap/src/main/resources/application-m1prod.properties

@ -2,7 +2,7 @@
spring.application.name=xm spring.application.name=xm
server.port=7067 server.port=7067
server.context-path=/${spring.application.name}
#server.context-path=/${spring.application.name}
#session失效时间 秒 #session失效时间 秒
server.session.timeout=43200 server.session.timeout=43200
spring.session.store-type=none spring.session.store-type=none
@ -13,7 +13,7 @@ spring.cloud.inetutils.preferredNetworks[1]=^172\.
#eureka.instance.instance-id=${spring.cloud.client.ipAddress}:${server.port} #eureka.instance.instance-id=${spring.cloud.client.ipAddress}:${server.port}
#eureka.instance.prefer-ip-address=true #eureka.instance.prefer-ip-address=true
spring.cloud.consul.host=localhost
spring.cloud.consul.host=172.16.16.16
spring.cloud.consul.port=8500 spring.cloud.consul.port=8500
@ -48,6 +48,43 @@ mdp.platform-branch-id=platform-branch-001
spring.http.multipart.maxFileSize=10Mb spring.http.multipart.maxFileSize=10Mb
spring.http.multipart.maxRequestSize=10Mb spring.http.multipart.maxRequestSize=10Mb
# mdp平台授权验证服务器访问地址 cloud环境下换成 http://gate,本地调试如果不起验证服务器,可改为 https://www.qingqinkj.com/api/m1/oauth2/oauth2
mdp.oauth2.server.uri=http://172.16.16.16:7000
# 客户端必须在数据库表adm.oauth_client_details中配置,否则无法访问
# 下面配置 password 模式
spring.security.oauth2.client.registration.password-client.provider=def-oauth-server
spring.security.oauth2.client.registration.password-client.client-id=${spring.application.name}
spring.security.oauth2.client.registration.password-client.client-secret= ${spring.application.name}-8888
spring.security.oauth2.client.registration.password-client.authorization-grant-type= password
spring.security.oauth2.client.registration.password-client.scope= all
# 下面配置 client_credentials 模式
spring.security.oauth2.client.registration.def-client.provider=def-oauth-server
spring.security.oauth2.client.registration.def-client.client-id=${spring.application.name}
spring.security.oauth2.client.registration.def-client.client-secret= ${spring.application.name}-8888
spring.security.oauth2.client.registration.def-client.authorization-grant-type= client_credentials
spring.security.oauth2.client.registration.def-client.scope= all
# 下面配置authorization_code模式
spring.security.oauth2.client.registration.code-client.provider=def-oauth-server
spring.security.oauth2.client.registration.code-client.client-id=${spring.application.name}
spring.security.oauth2.client.registration.code-client.client-secret= ${spring.application.name}-8888
spring.security.oauth2.client.registration.code-client.authorization-grant-type= authorization_code
# 授权码模式下需要配置重定向地址
spring.security.oauth2.client.registration.code-client.redirect-uri= ${messages.base-uri}/authorized
spring.security.oauth2.client.registration.code-client.scope= all
# 授权码方式获取code
spring.security.oauth2.client.provider.def-oauth-server.authorization-uri= ${mdp.oauth2.server.uri}/oauth2/authorize
# 获取token接口
spring.security.oauth2.client.provider.def-oauth-server.token-uri= ${mdp.oauth2.server.uri}/oauth2/token
# 资源服务器
spring.security.oauth2.resourceserver.jwt.jwk-set-uri= ${mdp.oauth2.server.uri}/oauth2/jwks
#配置数据源 #配置数据源
#spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver #spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
#spring.datasource.jdbc-url=jdbc:oracle:thin:@193.112.138.144:1521:KEYUNSITDB #spring.datasource.jdbc-url=jdbc:oracle:thin:@193.112.138.144:1521:KEYUNSITDB

50
xm-bootstrap/src/main/resources/mybatis/mybatis-config.xml

@ -1,50 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE configuration PUBLIC "-//mybatis.org//DTD SQL Map Config 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-config.dtd">
<configuration>
<settings>
<setting name="cacheEnabled" value="true" /><!-- 全局映射器启用缓存 -->
<setting name="useGeneratedKeys" value="true" />
<setting name="defaultExecutorType" value="REUSE" />
<setting name="mapUnderscoreToCamelCase" value="true" />
<setting name="callSettersOnNulls" value="true" />
<setting name="jdbcTypeForNull" value="NULL"/>
</settings>
<typeHandlers>
<typeHandler javaType="String" jdbcType="CLOB" handler="org.apache.ibatis.type.ClobTypeHandler"/>
<!--<typeHandler javaType="oracle.sql.CLOB" jdbcType="CLOB" handler="org.apache.ibatis.type.ClobTypeHandler"/>-->
<!--<typeHandler javaType="oracle.sql.TIMESTAMP" jdbcType="TIMESTAMP" handler="org.apache.ibatis.type.DateTypeHandler"/>-->
</typeHandlers>
<objectWrapperFactory type="com.mdp.mybatis.MapWrapperFactory"></objectWrapperFactory>
<plugins>
<!-- com.github.pagehelper为PageHelper类所在包名 -->
<plugin interceptor="com.github.pagehelper.PageInterceptor">
<!-- 4.0.0以后版本可以不设置该参数-->
<!--<property name="dialect" value="oracle"/> -->
<!-- 该参数默认为false -->
<!-- 设置为true时,会将RowBounds第一个参数offset当成pageNum页码使用 -->
<!-- 和startPage中的pageNum效果一样-->
<property name="offsetAsPageNum" value="true"/>
<!-- 该参数默认为false -->
<!-- 设置为true时,使用RowBounds分页会进行count查询 -->
<property name="rowBoundsWithCount" value="true"/>
<!-- 设置为true时,如果pageSize=0或者RowBounds.limit = 0就会查询出全部的结果 -->
<!-- (相当于没有执行分页查询,但是返回结果仍然是Page类型)-->
<property name="pageSizeZero" value="true"/>
<!-- 3.3.0版本可用 - 分页参数合理化,默认false禁用 -->
<!-- 启用合理化时,如果pageNum<1会查询第一页,如果pageNum>pages会查询最后一页 -->
<!-- 禁用合理化时,如果pageNum<1或pageNum>pages会返回空数据 -->
<property name="reasonable" value="true"/>
<!-- 3.5.0版本可用 - 为了支持startPage(Object params)方法 -->
<!-- 增加了一个`params`参数来配置参数映射,用于从Map或ServletRequest中取值 -->
<!-- 可以配置pageNum,pageSize,count,pageSizeZero,reasonable,orderBy,不配置映射的用默认值 -->
<!-- 不理解该含义的前提下,不要随便复制该配置 -->
<!-- <property name="params" value="pageNum=currentPage;pageSize=limit;"/> -->
<!-- 支持通过Mapper接口参数来传递分页参数 -->
<!-- <property name="supportMethodsArguments" value="true"/>-->
<!-- always总是返回PageInfo类型,check检查返回类型是否为PageInfo,none返回Page -->
<!-- <property name="returnPageInfo" value="check"/>-->
</plugin>
<plugin interceptor="com.mdp.safe.mybatis.plugin.DbAccessAuthPlugin"></plugin>
</plugins>
</configuration>

48
xm-bootstrap/xm-bootstrap.iml

@ -1,16 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4"> <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8"> <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
<output url="file://$MODULE_DIR$/../xm-bootstrap/target/classes" />
<output-test url="file://$MODULE_DIR$/../xm-bootstrap/target/test-classes" />
<content url="file://$MODULE_DIR$/../xm-bootstrap">
<sourceFolder url="file://$MODULE_DIR$/../xm-bootstrap/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/../xm-bootstrap/src/main/resources" type="java-resource" />
<excludeFolder url="file://$MODULE_DIR$/../xm-bootstrap/target" />
<output url="file://$MODULE_DIR$/target/classes" />
<output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
<excludeFolder url="file://$MODULE_DIR$/target" />
</content> </content>
<orderEntry type="inheritedJdk" /> <orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="Maven: com.mdp:mdp-cloud-starter:M.1.0.0-RELEASE" level="project" /> <orderEntry type="library" name="Maven: com.mdp:mdp-cloud-starter:M.1.0.0-RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter:3.0.0" level="project" />
<orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-context:3.0.0" level="project" />
<orderEntry type="library" name="Maven: org.springframework.security:spring-security-rsa:1.0.9.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.bouncycastle:bcpkix-jdk15on:1.64" level="project" />
<orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk15on:1.64" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-actuator:2.4.1" level="project" /> <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-actuator:2.4.1" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-actuator-autoconfigure:2.4.1" level="project" /> <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-actuator-autoconfigure:2.4.1" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-actuator:2.4.1" level="project" /> <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-actuator:2.4.1" level="project" />
@ -19,13 +24,6 @@
<orderEntry type="library" name="Maven: org.hdrhistogram:HdrHistogram:2.1.12" level="project" /> <orderEntry type="library" name="Maven: org.hdrhistogram:HdrHistogram:2.1.12" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: org.latencyutils:LatencyUtils:2.0.3" level="project" /> <orderEntry type="library" scope="RUNTIME" name="Maven: org.latencyutils:LatencyUtils:2.0.3" level="project" />
<orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-netflix-hystrix:2.2.6.RELEASE" level="project" /> <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-netflix-hystrix:2.2.6.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter:3.0.0" level="project" />
<orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-context:3.0.0" level="project" />
<orderEntry type="library" name="Maven: org.springframework.security:spring-security-crypto:5.4.2" level="project" />
<orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-commons:3.0.0" level="project" />
<orderEntry type="library" name="Maven: org.springframework.security:spring-security-rsa:1.0.9.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.bouncycastle:bcpkix-jdk15on:1.64" level="project" />
<orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk15on:1.64" level="project" />
<orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-netflix-hystrix:2.2.6.RELEASE" level="project" /> <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-netflix-hystrix:2.2.6.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:2.4.1" level="project" /> <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:2.4.1" level="project" />
<orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-netflix-ribbon:2.2.6.RELEASE" level="project" /> <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-netflix-ribbon:2.2.6.RELEASE" level="project" />
@ -72,10 +70,11 @@
<orderEntry type="library" name="Maven: dk.brics.automaton:automaton:1.11-8" level="project" /> <orderEntry type="library" name="Maven: dk.brics.automaton:automaton:1.11-8" level="project" />
<orderEntry type="library" name="Maven: org.apache.commons:commons-text:1.9" level="project" /> <orderEntry type="library" name="Maven: org.apache.commons:commons-text:1.9" level="project" />
<orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-contract-spec-groovy:3.0.0" level="project" /> <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-contract-spec-groovy:3.0.0" level="project" />
<orderEntry type="library" name="Maven: org.eclipse.jgit:org.eclipse.jgit:5.1.3.201810200350-r" level="project" />
<orderEntry type="library" name="Maven: com.jcraft:jsch:0.1.54" level="project" />
<orderEntry type="library" name="Maven: org.eclipse.jgit:org.eclipse.jgit:5.5.1.201910021850-r" level="project" />
<orderEntry type="library" name="Maven: com.jcraft:jsch:0.1.55" level="project" />
<orderEntry type="library" name="Maven: com.jcraft:jzlib:1.1.1" level="project" /> <orderEntry type="library" name="Maven: com.jcraft:jzlib:1.1.1" level="project" />
<orderEntry type="library" name="Maven: com.googlecode.javaewah:JavaEWAH:1.1.6" level="project" /> <orderEntry type="library" name="Maven: com.googlecode.javaewah:JavaEWAH:1.1.6" level="project" />
<orderEntry type="library" name="Maven: org.bouncycastle:bcpg-jdk15on:1.61" level="project" />
<orderEntry type="library" name="Maven: com.jcraft:jsch.agentproxy.sshagent:0.0.9" level="project" /> <orderEntry type="library" name="Maven: com.jcraft:jsch.agentproxy.sshagent:0.0.9" level="project" />
<orderEntry type="library" name="Maven: com.jcraft:jsch.agentproxy.core:0.0.9" level="project" /> <orderEntry type="library" name="Maven: com.jcraft:jsch.agentproxy.core:0.0.9" level="project" />
<orderEntry type="library" name="Maven: com.jcraft:jsch.agentproxy.jsch:0.0.9" level="project" /> <orderEntry type="library" name="Maven: com.jcraft:jsch.agentproxy.jsch:0.0.9" level="project" />
@ -103,16 +102,11 @@
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-cache:2.4.1" level="project" /> <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-cache:2.4.1" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.3.2" level="project" /> <orderEntry type="library" name="Maven: org.springframework:spring-context-support:5.3.2" level="project" />
<orderEntry type="library" name="Maven: com.stoyanr:evictor:1.0.0" level="project" /> <orderEntry type="library" name="Maven: com.stoyanr:evictor:1.0.0" level="project" />
<orderEntry type="module" module-name="xm-core" />
<orderEntry type="library" name="Maven: com.mdp:mdp-oauth2-client:M.1.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:M.1.0.0-RELEASE" level="project" />
<orderEntry type="library" name="Maven: com.mdp:mdp-oauth2-client-cloud:M.1.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: 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.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: com.sun.activation:jakarta.activation:1.2.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-core:5.4.2" level="project" /> <orderEntry type="library" name="Maven: org.springframework.security:spring-security-core:5.4.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: 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.nimbusds:oauth2-oidc-sdk:8.23.1" level="project" />
@ -121,6 +115,15 @@
<orderEntry type="library" name="Maven: com.nimbusds:lang-tag:1.4.4" 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: 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: com.nimbusds:nimbus-jose-jwt:9.1.3" 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-web:5.4.2" level="project" />
<orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-commons:3.0.0" level="project" />
<orderEntry type="library" name="Maven: org.springframework.security:spring-security-crypto:5.4.2" level="project" />
<orderEntry type="module" module-name="xm-core" />
<orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.59" level="project" />
<orderEntry type="library" name="Maven: com.mdp:mdp-oauth2-client:M.1.0.0-RELEASE" level="project" />
<orderEntry type="library" name="Maven: com.mdp:mdp-qx-api:M.1.0.0-RELEASE" 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: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.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-handler:4.1.55.Final" level="project" />
@ -278,7 +281,6 @@
<orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" /> <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.13.1" level="project" /> <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.13.1" level="project" />
<orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:2.2" level="project" /> <orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:2.2" level="project" />
<orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.47" level="project" />
<orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.16" level="project" /> <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.16" level="project" />
</component> </component>
</module> </module>

11
xm-core/pom.xml

@ -13,6 +13,12 @@
</parent> </parent>
<dependencies> <dependencies>
<dependency>
<groupId>com.mdp</groupId>
<artifactId>mdp-oauth2-client</artifactId>
<version>${mdp.version}</version>
</dependency>
<dependency> <dependency>
<groupId>net.coobird</groupId> <groupId>net.coobird</groupId>
<artifactId>thumbnailator</artifactId> <artifactId>thumbnailator</artifactId>
@ -44,6 +50,11 @@
<artifactId>jsoup</artifactId> <artifactId>jsoup</artifactId>
<version>1.11.3</version> <version>1.11.3</version>
</dependency> </dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
<version>1.2.59</version>
</dependency>
</dependencies> </dependencies>

37
xm-core/src/main/resources/application-dev.properties

@ -81,6 +81,43 @@ mdp.auth.qx-regist-url=/sys/sys/sys/qx/autoRegist
mdp.audit.audit-log-url=/audit/audit/audit/base/operLog/add mdp.audit.audit-log-url=/audit/audit/audit/base/operLog/add
mdp.platform-branch-id=platform-branch-001 mdp.platform-branch-id=platform-branch-001
# mdp平台授权验证服务器访问地址 cloud环境下换成 http://gate,本地调试如果不起验证服务器,可改为 https://www.qingqinkj.com/api/m1/oauth2/oauth2
mdp.oauth2.server.uri=http://134.175.57.249:7000
# 客户端必须在数据库表adm.oauth_client_details中配置,否则无法访问
# 下面配置 password 模式
spring.security.oauth2.client.registration.password-client.provider=def-oauth-server
spring.security.oauth2.client.registration.password-client.client-id=${spring.application.name}
spring.security.oauth2.client.registration.password-client.client-secret= ${spring.application.name}-8888
spring.security.oauth2.client.registration.password-client.authorization-grant-type= password
spring.security.oauth2.client.registration.password-client.scope= all
# 下面配置 client_credentials 模式
spring.security.oauth2.client.registration.def-client.provider=def-oauth-server
spring.security.oauth2.client.registration.def-client.client-id=${spring.application.name}
spring.security.oauth2.client.registration.def-client.client-secret= ${spring.application.name}-8888
spring.security.oauth2.client.registration.def-client.authorization-grant-type= client_credentials
spring.security.oauth2.client.registration.def-client.scope= all
# 下面配置authorization_code模式
spring.security.oauth2.client.registration.code-client.provider=def-oauth-server
spring.security.oauth2.client.registration.code-client.client-id=${spring.application.name}
spring.security.oauth2.client.registration.code-client.client-secret= ${spring.application.name}-8888
spring.security.oauth2.client.registration.code-client.authorization-grant-type= authorization_code
# 授权码模式下需要配置重定向地址
spring.security.oauth2.client.registration.code-client.redirect-uri= ${messages.base-uri}/authorized
spring.security.oauth2.client.registration.code-client.scope= all
# 授权码方式获取code
spring.security.oauth2.client.provider.def-oauth-server.authorization-uri= ${mdp.oauth2.server.uri}/oauth2/authorize
# 获取token接口
spring.security.oauth2.client.provider.def-oauth-server.token-uri= ${mdp.oauth2.server.uri}/oauth2/token
# 资源服务器
spring.security.oauth2.resourceserver.jwt.jwk-set-uri= ${mdp.oauth2.server.uri}/oauth2/jwks
##begin 商户相关配置###顶级商户########################################################### ##begin 商户相关配置###顶级商户###########################################################
mdp.topMech.mechId=m1000 mdp.topMech.mechId=m1000
mdp.topMech.userid=m1000 mdp.topMech.userid=m1000

3
xm-core/src/test/java/com/xm/XmApplication.java

@ -2,8 +2,9 @@ package com.xm;
import org.springframework.boot.SpringApplication; import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.session.data.redis.config.annotation.web.http.EnableRedisHttpSession; import org.springframework.session.data.redis.config.annotation.web.http.EnableRedisHttpSession;
@ComponentScan(basePackages={"com.mdp"})
@SpringBootApplication @SpringBootApplication
@EnableRedisHttpSession @EnableRedisHttpSession
public class XmApplication { public class XmApplication {

38
xm-core/xm-core.iml

@ -11,24 +11,6 @@
</content> </content>
<orderEntry type="inheritedJdk" /> <orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="Maven: net.coobird:thumbnailator:0.4.8" level="project" />
<orderEntry type="library" name="Maven: org.apache.poi:poi:3.17" level="project" />
<orderEntry type="library" name="Maven: commons-codec:commons-codec:1.15" level="project" />
<orderEntry type="library" name="Maven: org.apache.commons:commons-collections4:4.1" level="project" />
<orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml:3.17" level="project" />
<orderEntry type="library" name="Maven: com.github.virtuald:curvesapi:1.04" level="project" />
<orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml-schemas:3.17" level="project" />
<orderEntry type="library" name="Maven: org.apache.xmlbeans:xmlbeans:2.6.0" level="project" />
<orderEntry type="library" name="Maven: stax:stax-api:1.0.1" level="project" />
<orderEntry type="library" name="Maven: com.alibaba:easyexcel:2.1.1" level="project" />
<orderEntry type="library" name="Maven: cglib:cglib:3.1" level="project" />
<orderEntry type="library" name="Maven: org.ow2.asm:asm:4.2" level="project" />
<orderEntry type="library" name="Maven: org.ehcache:ehcache:3.9.0" level="project" />
<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-oauth2-client:M.1.0.0-RELEASE" level="project" /> <orderEntry type="library" name="Maven: com.mdp:mdp-oauth2-client:M.1.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.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:spring-aop:5.3.2" level="project" />
@ -37,6 +19,7 @@
<orderEntry type="library" name="Maven: com.mdp:mdp-qx-api:M.1.0.0-RELEASE" level="project" /> <orderEntry type="library" name="Maven: com.mdp:mdp-qx-api:M.1.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: 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.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-core:5.4.2" level="project" /> <orderEntry type="library" name="Maven: org.springframework.security:spring-security-core:5.4.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: 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.nimbusds:oauth2-oidc-sdk:8.23.1" level="project" />
@ -74,6 +57,24 @@
<orderEntry type="library" name="Maven: org.reactivestreams:reactive-streams:1.0.3" 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-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: org.springframework.security:spring-security-oauth2-core:5.4.2" level="project" />
<orderEntry type="library" name="Maven: net.coobird:thumbnailator:0.4.8" level="project" />
<orderEntry type="library" name="Maven: org.apache.poi:poi:3.17" level="project" />
<orderEntry type="library" name="Maven: commons-codec:commons-codec:1.15" level="project" />
<orderEntry type="library" name="Maven: org.apache.commons:commons-collections4:4.1" level="project" />
<orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml:3.17" level="project" />
<orderEntry type="library" name="Maven: com.github.virtuald:curvesapi:1.04" level="project" />
<orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml-schemas:3.17" level="project" />
<orderEntry type="library" name="Maven: org.apache.xmlbeans:xmlbeans:2.6.0" level="project" />
<orderEntry type="library" name="Maven: stax:stax-api:1.0.1" level="project" />
<orderEntry type="library" name="Maven: com.alibaba:easyexcel:2.1.1" level="project" />
<orderEntry type="library" name="Maven: cglib:cglib:3.1" level="project" />
<orderEntry type="library" name="Maven: org.ow2.asm:asm:4.2" level="project" />
<orderEntry type="library" name="Maven: org.ehcache:ehcache:3.9.0" level="project" />
<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: org.jsoup:jsoup:1.11.3" level="project" />
<orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.59" level="project" />
<orderEntry type="library" name="Maven: com.mdp:mdp-audit-log-client:M.1.0.0-RELEASE" level="project" /> <orderEntry type="library" name="Maven: com.mdp:mdp-audit-log-client:M.1.0.0-RELEASE" level="project" />
<orderEntry type="library" name="Maven: com.mdp:mdp-micro-client:M.1.0.0-RELEASE" level="project" /> <orderEntry type="library" name="Maven: com.mdp:mdp-micro-client:M.1.0.0-RELEASE" level="project" />
<orderEntry type="library" name="Maven: com.mdp:mdp-core-api:M.1.0.0-RELEASE" level="project" /> <orderEntry type="library" name="Maven: com.mdp:mdp-core-api:M.1.0.0-RELEASE" level="project" />
@ -194,7 +195,6 @@
<orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" /> <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.13.1" level="project" /> <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.13.1" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:2.2" level="project" /> <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:2.2" level="project" />
<orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.47" level="project" />
<orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.16" level="project" /> <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.16" level="project" />
</component> </component>
</module> </module>
Loading…
Cancel
Save