|
@@ -48,7 +48,7 @@
|
|
|
<!-- windows开发环境 -->
|
|
|
<id>dev</id>
|
|
|
<properties>
|
|
|
- <profiles.active>dev</profiles.active>
|
|
|
+ <profiles.active>dev</profiles.active>
|
|
|
<!-- 项目端口 -->
|
|
|
<server.port>9527</server.port>
|
|
|
<!--数据库-->
|
|
@@ -56,8 +56,11 @@
|
|
|
<sql.driver>com.mysql.cj.jdbc.Driver</sql.driver>
|
|
|
<sql.username>ningmengyun</sql.username>
|
|
|
<sql.driver>com.mysql.cj.jdbc.Driver</sql.driver>
|
|
|
- <sql.password>bMy+ItDFRg1Ta+6/3lVcNMxrG9QndabVc62++GbqbQNJ4rRtLh5KRnhNxkjUkc5UxvBCbP8ZWRBiefk4L4QAjQ==</sql.password>
|
|
|
- <sql.publicKey>MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALGfA1zLrrvqPXDRbUTpjWBD87+/IRNAJaxSk3fsVUuOPedRkAfZKk6891uJ+ZKc9PePr0BN/VzaNZnBu1cTau8CAwEAAQ==</sql.publicKey>
|
|
|
+ <sql.password>bMy+ItDFRg1Ta+6/3lVcNMxrG9QndabVc62++GbqbQNJ4rRtLh5KRnhNxkjUkc5UxvBCbP8ZWRBiefk4L4QAjQ==
|
|
|
+ </sql.password>
|
|
|
+ <sql.publicKey>
|
|
|
+ MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALGfA1zLrrvqPXDRbUTpjWBD87+/IRNAJaxSk3fsVUuOPedRkAfZKk6891uJ+ZKc9PePr0BN/VzaNZnBu1cTau8CAwEAAQ==
|
|
|
+ </sql.publicKey>
|
|
|
<!-- 文件上传方是,目前支持三种local、oss、fdfs -->
|
|
|
<upload.type>local</upload.type>
|
|
|
<!-- 缓冲 -->
|
|
@@ -79,7 +82,7 @@
|
|
|
<logging.level.root>INFO</logging.level.root>
|
|
|
<logging.level.jeesharp>INFO</logging.level.jeesharp>
|
|
|
<logging.level.baomidou>ERROR</logging.level.baomidou>
|
|
|
- <logging.level.ehcache>ERROR</logging.level.ehcache>
|
|
|
+ <logging.level.ehcache>ERROR</logging.level.ehcache>
|
|
|
</properties>
|
|
|
<activation>
|
|
|
<activeByDefault>true</activeByDefault>
|
|
@@ -97,8 +100,11 @@
|
|
|
<sql.url>jdbc:mysql://10.8.8.9:3306/ningmengyun</sql.url>
|
|
|
<sql.driver>com.mysql.cj.jdbc.Driver</sql.driver>
|
|
|
<sql.username>ningmengyun</sql.username>
|
|
|
- <sql.password>bMy+ItDFRg1Ta+6/3lVcNMxrG9QndabVc62++GbqbQNJ4rRtLh5KRnhNxkjUkc5UxvBCbP8ZWRBiefk4L4QAjQ==</sql.password>
|
|
|
- <sql.publicKey>MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALGfA1zLrrvqPXDRbUTpjWBD87+/IRNAJaxSk3fsVUuOPedRkAfZKk6891uJ+ZKc9PePr0BN/VzaNZnBu1cTau8CAwEAAQ==</sql.publicKey>
|
|
|
+ <sql.password>bMy+ItDFRg1Ta+6/3lVcNMxrG9QndabVc62++GbqbQNJ4rRtLh5KRnhNxkjUkc5UxvBCbP8ZWRBiefk4L4QAjQ==
|
|
|
+ </sql.password>
|
|
|
+ <sql.publicKey>
|
|
|
+ MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALGfA1zLrrvqPXDRbUTpjWBD87+/IRNAJaxSk3fsVUuOPedRkAfZKk6891uJ+ZKc9PePr0BN/VzaNZnBu1cTau8CAwEAAQ==
|
|
|
+ </sql.publicKey>
|
|
|
<!-- 文件上传方是,目前支持三种local、oss、fdfs -->
|
|
|
<upload.type>local</upload.type>
|
|
|
<!-- 缓冲 -->
|
|
@@ -120,7 +126,7 @@
|
|
|
<logging.level.root>INFO</logging.level.root>
|
|
|
<logging.level.jeesharp>INFO</logging.level.jeesharp>
|
|
|
<logging.level.baomidou>ERROR</logging.level.baomidou>
|
|
|
- <logging.level.ehcache>ERROR</logging.level.ehcache>
|
|
|
+ <logging.level.ehcache>ERROR</logging.level.ehcache>
|
|
|
</properties>
|
|
|
<activation>
|
|
|
<activeByDefault>true</activeByDefault>
|
|
@@ -132,15 +138,18 @@
|
|
|
<!-- 生产环境 -->
|
|
|
<id>pro</id>
|
|
|
<properties>
|
|
|
- <profiles.active>pro</profiles.active>
|
|
|
+ <profiles.active>pro</profiles.active>
|
|
|
<!-- 项目端口 -->
|
|
|
<server.port>9527</server.port>
|
|
|
<!-- 数据库 -->
|
|
|
<sql.url></sql.url>
|
|
|
<sql.driver>com.mysql.cj.jdbc.Driver</sql.driver>
|
|
|
<sql.username>ningmengyun</sql.username>
|
|
|
- <sql.password>A0wN5N7D87WejXbsHnZUPnEV2O1pEOoq3J6T/M3fCmsJzhhGUN2Q6vKUJO1CD7x6zywN/bSbPVHEzswsjlwBug==</sql.password>
|
|
|
- <sql.publicKey>MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAJN19Pbq7byVNZtqrraiAIzjDjel3Rfuk4dhvytYrCfTTDmJR2MRY2d35pDf5R6ge3/TkgROBigN12oWzjEXq30CAwEAAQ==</sql.publicKey>
|
|
|
+ <sql.password>A0wN5N7D87WejXbsHnZUPnEV2O1pEOoq3J6T/M3fCmsJzhhGUN2Q6vKUJO1CD7x6zywN/bSbPVHEzswsjlwBug==
|
|
|
+ </sql.password>
|
|
|
+ <sql.publicKey>
|
|
|
+ MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAJN19Pbq7byVNZtqrraiAIzjDjel3Rfuk4dhvytYrCfTTDmJR2MRY2d35pDf5R6ge3/TkgROBigN12oWzjEXq30CAwEAAQ==
|
|
|
+ </sql.publicKey>
|
|
|
<!-- 文件上传方是,目前支持三种local、oss、fdfs -->
|
|
|
<upload.type>local</upload.type>
|
|
|
<!-- 缓冲 -->
|
|
@@ -251,7 +260,6 @@
|
|
|
<groupId>org.springframework.boot</groupId>
|
|
|
<artifactId>spring-boot-starter-freemarker</artifactId>
|
|
|
</dependency>
|
|
|
-
|
|
|
<dependency>
|
|
|
<groupId>org.springframework.boot</groupId>
|
|
|
<artifactId>spring-boot-starter</artifactId>
|
|
@@ -260,6 +268,12 @@
|
|
|
<groupId>org.springframework.boot</groupId>
|
|
|
<artifactId>spring-boot-starter-test</artifactId>
|
|
|
<scope>test</scope>
|
|
|
+ <exclusions>
|
|
|
+ <exclusion>
|
|
|
+ <groupId>com.vaadin.external.google</groupId>
|
|
|
+ <artifactId>android-json</artifactId>
|
|
|
+ </exclusion>
|
|
|
+ </exclusions>
|
|
|
</dependency>
|
|
|
<dependency>
|
|
|
<groupId>org.springframework.boot</groupId>
|
|
@@ -274,53 +288,20 @@
|
|
|
<groupId>org.springframework.boot</groupId>
|
|
|
<artifactId>spring-boot-starter-jdbc</artifactId>
|
|
|
</dependency>
|
|
|
- <dependency>
|
|
|
- <groupId>org.mybatis.spring.boot</groupId>
|
|
|
- <artifactId>mybatis-spring-boot-starter</artifactId>
|
|
|
- <version>1.3.2</version>
|
|
|
- </dependency>
|
|
|
-
|
|
|
- <!-- 核心 -->
|
|
|
- <dependency>
|
|
|
- <groupId>org.jeesharp.platform</groupId>
|
|
|
- <artifactId>jeesharp-core</artifactId>
|
|
|
- <version>${jeesharp.platform.version}</version>
|
|
|
- </dependency>
|
|
|
- <dependency>
|
|
|
- <groupId>org.jeesharp.platform</groupId>
|
|
|
- <artifactId>jeesharp-admin</artifactId>
|
|
|
- <version>${jeesharp.platform.version}</version>
|
|
|
- </dependency>
|
|
|
-
|
|
|
<dependency>
|
|
|
<groupId>com.baomidou</groupId>
|
|
|
<artifactId>mybatis-plus-boot-starter</artifactId>
|
|
|
- <version>3.0.7.1</version>
|
|
|
- </dependency>
|
|
|
- <dependency>
|
|
|
- <groupId>com.baomidou</groupId>
|
|
|
- <artifactId>mybatis-plus-extension</artifactId>
|
|
|
- <version>3.0.7.1</version>
|
|
|
- </dependency>
|
|
|
- <dependency>
|
|
|
- <groupId>com.baomidou</groupId>
|
|
|
- <artifactId>kisso</artifactId>
|
|
|
- <version>3.7.6</version>
|
|
|
- </dependency>
|
|
|
- <dependency>
|
|
|
- <groupId>com.diboot</groupId>
|
|
|
- <artifactId>diboot-core-spring-boot-starter</artifactId>
|
|
|
- <version>2.0.5</version>
|
|
|
+ <version>3.5.1</version>
|
|
|
</dependency>
|
|
|
<dependency>
|
|
|
<groupId>com.fasterxml.jackson.dataformat</groupId>
|
|
|
<artifactId>jackson-dataformat-xml</artifactId>
|
|
|
</dependency>
|
|
|
- <!--<dependency>-->
|
|
|
- <!--<groupId>org.springframework.boot</groupId>-->
|
|
|
- <!--<artifactId>spring-boot-configuration-processor</artifactId>-->
|
|
|
- <!--<optional>true</optional>-->
|
|
|
- <!--</dependency>-->
|
|
|
+ <dependency>
|
|
|
+ <groupId>org.springframework.boot</groupId>
|
|
|
+ <artifactId>spring-boot-configuration-processor</artifactId>
|
|
|
+ <optional>true</optional>
|
|
|
+ </dependency>
|
|
|
<dependency>
|
|
|
<groupId>org.springframework.boot</groupId>
|
|
|
<artifactId>spring-boot-starter-validation</artifactId>
|
|
@@ -334,7 +315,6 @@
|
|
|
<groupId>com.fasterxml.jackson.core</groupId>
|
|
|
</exclusion>
|
|
|
</exclusions>
|
|
|
-
|
|
|
</dependency>
|
|
|
<dependency>
|
|
|
<groupId>org.springframework.boot</groupId>
|
|
@@ -349,24 +329,55 @@
|
|
|
<artifactId>spring-boot-devtools</artifactId>
|
|
|
<optional>false</optional>
|
|
|
</dependency>
|
|
|
+ <dependency>
|
|
|
+ <groupId>org.springframework.boot</groupId>
|
|
|
+ <artifactId>spring-boot-starter-tomcat</artifactId>
|
|
|
+ </dependency>
|
|
|
+
|
|
|
|
|
|
+ <dependency>
|
|
|
+ <groupId>commons-logging</groupId>
|
|
|
+ <artifactId>commons-logging</artifactId>
|
|
|
+ <version>1.0.4</version>
|
|
|
+ </dependency>
|
|
|
|
|
|
<!-- Echarts图表依赖包结束 -->
|
|
|
<dependency>
|
|
|
<groupId>org.jeeplus</groupId>
|
|
|
<artifactId>jeeplus-mybatis-dynamic</artifactId>
|
|
|
<version>6.0</version>
|
|
|
+ <exclusions>
|
|
|
+ <exclusion>
|
|
|
+ <groupId>dom4j</groupId>
|
|
|
+ <artifactId>dom4j</artifactId>
|
|
|
+ </exclusion>
|
|
|
+ <exclusion>
|
|
|
+ <groupId>commons-dbcp</groupId>
|
|
|
+ <artifactId>commons-dbcp</artifactId>
|
|
|
+ </exclusion>
|
|
|
+ <exclusion>
|
|
|
+ <groupId>commons-lang</groupId>
|
|
|
+ <artifactId>commons-lang</artifactId>
|
|
|
+ </exclusion>
|
|
|
+ <exclusion>
|
|
|
+ <groupId>commons-logging</groupId>
|
|
|
+ <artifactId>commons-logging</artifactId>
|
|
|
+ </exclusion>
|
|
|
+ <exclusion>
|
|
|
+ <groupId>commons-collections</groupId>
|
|
|
+ <artifactId>commons-collections</artifactId>
|
|
|
+ </exclusion>
|
|
|
+ <exclusion>
|
|
|
+ <groupId>commons-beanutils</groupId>
|
|
|
+ <artifactId>commons-beanutils</artifactId>
|
|
|
+ </exclusion>
|
|
|
+ </exclusions>
|
|
|
</dependency>
|
|
|
-
|
|
|
<!--<dependency>-->
|
|
|
<!--<groupId>org.springframework.boot</groupId>-->
|
|
|
<!--<artifactId>spring-boot-devtools</artifactId>-->
|
|
|
<!--<optional>true</optional>-->
|
|
|
<!--</dependency>-->
|
|
|
- <dependency>
|
|
|
- <groupId>org.springframework.boot</groupId>
|
|
|
- <artifactId>spring-boot-starter-tomcat</artifactId>
|
|
|
- </dependency>
|
|
|
<dependency>
|
|
|
<groupId>com.microsoft.sqlserver</groupId>
|
|
|
<artifactId>mssql-jdbc</artifactId>
|
|
@@ -399,6 +410,12 @@
|
|
|
<groupId>com.alibaba</groupId>
|
|
|
<artifactId>druid-spring-boot-starter</artifactId>
|
|
|
<version>1.1.14</version>
|
|
|
+ <exclusions>
|
|
|
+ <exclusion>
|
|
|
+ <groupId>com.alibaba</groupId>
|
|
|
+ <artifactId>druid</artifactId>
|
|
|
+ </exclusion>
|
|
|
+ </exclusions>
|
|
|
</dependency>
|
|
|
|
|
|
|
|
@@ -406,6 +423,12 @@
|
|
|
<groupId>cglib</groupId>
|
|
|
<artifactId>cglib</artifactId>
|
|
|
<version>3.1</version>
|
|
|
+ <exclusions>
|
|
|
+ <exclusion>
|
|
|
+ <groupId>org.ow2.asm</groupId>
|
|
|
+ <artifactId>asm</artifactId>
|
|
|
+ </exclusion>
|
|
|
+ </exclusions>
|
|
|
</dependency>
|
|
|
<dependency>
|
|
|
<groupId>javax.servlet.jsp</groupId>
|
|
@@ -471,17 +494,11 @@
|
|
|
<artifactId>commons-io</artifactId>
|
|
|
<version>2.4</version>
|
|
|
</dependency>
|
|
|
- <!-- jackson json -->
|
|
|
- <dependency>
|
|
|
- <groupId>com.fasterxml.jackson.module</groupId>
|
|
|
- <artifactId>jackson-module-jaxb-annotations</artifactId>
|
|
|
- <version>2.9.1</version>
|
|
|
- </dependency>
|
|
|
<!-- fastjson json-->
|
|
|
<dependency>
|
|
|
<groupId>com.alibaba</groupId>
|
|
|
<artifactId>fastjson</artifactId>
|
|
|
- <version>1.2.45</version>
|
|
|
+ <version>1.2.76</version>
|
|
|
</dependency>
|
|
|
|
|
|
|
|
@@ -490,6 +507,12 @@
|
|
|
<groupId>net.sf.dozer</groupId>
|
|
|
<artifactId>dozer</artifactId>
|
|
|
<version>5.5.1</version>
|
|
|
+ <exclusions>
|
|
|
+ <exclusion>
|
|
|
+ <groupId>commons-beanutils</groupId>
|
|
|
+ <artifactId>commons-beanutils</artifactId>
|
|
|
+ </exclusion>
|
|
|
+ </exclusions>
|
|
|
</dependency>
|
|
|
|
|
|
<!-- poi office -->
|
|
@@ -517,6 +540,12 @@
|
|
|
<version>4.5.2</version>
|
|
|
</dependency>
|
|
|
|
|
|
+ <dependency>
|
|
|
+ <groupId>com.google.guava</groupId>
|
|
|
+ <artifactId>guava</artifactId>
|
|
|
+ <version>20.0</version>
|
|
|
+ </dependency>
|
|
|
+
|
|
|
<dependency>
|
|
|
<groupId>commons-lang</groupId>
|
|
|
<artifactId>commons-lang</artifactId>
|
|
@@ -527,13 +556,27 @@
|
|
|
<groupId>com.centit.support</groupId>
|
|
|
<artifactId>centit-utils</artifactId>
|
|
|
<version>2.3.2101</version>
|
|
|
- </dependency>
|
|
|
- <dependency>
|
|
|
- <groupId>javax.servlet</groupId>
|
|
|
- <artifactId>javax.servlet-api</artifactId>
|
|
|
- <version>3.1.0</version>
|
|
|
+ <exclusions>
|
|
|
+ <exclusion>
|
|
|
+ <groupId>com.alibaba</groupId>
|
|
|
+ <artifactId>fastjson</artifactId>
|
|
|
+ </exclusion>
|
|
|
+ <exclusion>
|
|
|
+ <groupId>org.dom4j</groupId>
|
|
|
+ <artifactId>dom4j</artifactId>
|
|
|
+ </exclusion>
|
|
|
+ <exclusion>
|
|
|
+ <groupId>dom4j</groupId>
|
|
|
+ <artifactId>dom4j</artifactId>
|
|
|
+ </exclusion>
|
|
|
+ <exclusion>
|
|
|
+ <groupId>org.apache.httpcomponents</groupId>
|
|
|
+ <artifactId>httpclient</artifactId>
|
|
|
+ </exclusion>
|
|
|
+ </exclusions>
|
|
|
</dependency>
|
|
|
|
|
|
+
|
|
|
<dependency>
|
|
|
<groupId>net.sf.json-lib</groupId>
|
|
|
<artifactId>json-lib</artifactId>
|
|
@@ -562,35 +605,21 @@
|
|
|
<dependency>
|
|
|
<groupId>org.projectlombok</groupId>
|
|
|
<artifactId>lombok</artifactId>
|
|
|
+ <version>1.16.20</version>
|
|
|
<scope>provided</scope>
|
|
|
</dependency>
|
|
|
|
|
|
- <!--hibernate多数据源-->
|
|
|
- <!--<dependency>-->
|
|
|
- <!--<groupId>org.hibernate</groupId>-->
|
|
|
- <!--<artifactId>hibernate-core</artifactId>-->
|
|
|
- <!--<version>5.2.12.Final</version>-->
|
|
|
- <!--<exclusions>-->
|
|
|
- <!--<exclusion>-->
|
|
|
- <!--<groupId>com.fasterxml</groupId>-->
|
|
|
- <!--<artifactId>classmate</artifactId>-->
|
|
|
- <!--</exclusion>-->
|
|
|
- <!--<exclusion>-->
|
|
|
- <!--<groupId>dom4j</groupId>-->
|
|
|
- <!--<artifactId>dom4j</artifactId>-->
|
|
|
- <!--</exclusion>-->
|
|
|
- <!--</exclusions>-->
|
|
|
- <!--</dependency>-->
|
|
|
<!-- jdbc连接池 -->
|
|
|
- <dependency>
|
|
|
- <groupId>com.mchange</groupId>
|
|
|
- <artifactId>c3p0</artifactId>
|
|
|
- <version>0.9.2.1</version>
|
|
|
- </dependency>
|
|
|
<dependency>
|
|
|
<groupId>com.google.code.maven-play-plugin.com.mchange</groupId>
|
|
|
<artifactId>c3p0-oracle-thin-extras</artifactId>
|
|
|
<version>0.9.5</version>
|
|
|
+ <exclusions>
|
|
|
+ <exclusion>
|
|
|
+ <groupId>com.mchange</groupId>
|
|
|
+ <artifactId>mchange-commons-java</artifactId>
|
|
|
+ </exclusion>
|
|
|
+ </exclusions>
|
|
|
</dependency>
|
|
|
<dependency>
|
|
|
<groupId>dom4j</groupId>
|
|
@@ -614,26 +643,6 @@
|
|
|
</exclusion>
|
|
|
</exclusions>
|
|
|
</dependency>
|
|
|
- <dependency>
|
|
|
- <groupId>com.fasterxml.jackson.core</groupId>
|
|
|
- <artifactId>jackson-databind</artifactId>
|
|
|
- <version>2.9.6</version>
|
|
|
- </dependency>
|
|
|
- <dependency>
|
|
|
- <groupId>com.fasterxml.jackson.datatype</groupId>
|
|
|
- <artifactId>jackson-datatype-hibernate5</artifactId>
|
|
|
- <version>2.9.6</version>
|
|
|
- <exclusions>
|
|
|
- <exclusion>
|
|
|
- <artifactId>jackson-databind</artifactId>
|
|
|
- <groupId>com.fasterxml.jackson.core</groupId>
|
|
|
- </exclusion>
|
|
|
- <exclusion>
|
|
|
- <artifactId>jackson-databind</artifactId>
|
|
|
- <groupId>com.fasterxml.jackson.core</groupId>
|
|
|
- </exclusion>
|
|
|
- </exclusions>
|
|
|
- </dependency>
|
|
|
|
|
|
<!--<dependency>-->
|
|
|
<!--<groupId>p6spy</groupId>-->
|
|
@@ -660,28 +669,15 @@
|
|
|
<artifactId>p6spy</artifactId>
|
|
|
<version>3.8.0</version>
|
|
|
</dependency>
|
|
|
-
|
|
|
- <dependency>
|
|
|
- <groupId>io.github.yedaxia</groupId>
|
|
|
- <artifactId>japidocs</artifactId>
|
|
|
- <version>1.2</version>
|
|
|
- </dependency>
|
|
|
-
|
|
|
<!-- 阿里巴巴数据库密码加密 -->
|
|
|
<dependency>
|
|
|
<groupId>com.alibaba</groupId>
|
|
|
<artifactId>druid</artifactId>
|
|
|
<version>1.1.20</version>
|
|
|
</dependency>
|
|
|
-
|
|
|
- <dependency>
|
|
|
- <groupId>com.google.guava</groupId>
|
|
|
- <artifactId>guava</artifactId>
|
|
|
- <version>20.0</version>
|
|
|
- </dependency>
|
|
|
+ </dependencies>
|
|
|
|
|
|
|
|
|
- </dependencies>
|
|
|
|
|
|
<build>
|
|
|
<plugins>
|