Ver código fonte

去除重复pom引入

hanqingsong 2 anos atrás
pai
commit
de3a7245cf

+ 0 - 24
pom.xml

@@ -19,14 +19,6 @@
19
         <version>2.0.2.RELEASE</version>
19
         <version>2.0.2.RELEASE</version>
20
         <relativePath/> <!-- lookup parent from repository -->
20
         <relativePath/> <!-- lookup parent from repository -->
21
     </parent>
21
     </parent>
22
-    <distributionManagement>
23
-        <repository>
24
-            <id>nexus</id>
25
-            <!--名称自己定义-->
26
-            <name>release</name>
27
-            <url>http://10.10.1.25:8081/repository/host_repository/</url>
28
-        </repository>
29
-    </distributionManagement>
30
     <properties>
22
     <properties>
31
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
23
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
32
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
24
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
@@ -95,11 +87,6 @@
95
             <version>2.6.1</version>
87
             <version>2.6.1</version>
96
         </dependency>
88
         </dependency>
97
         <dependency>
89
         <dependency>
98
-            <groupId>org.springframework.boot</groupId>
99
-            <artifactId>spring-boot-starter-test</artifactId>
100
-            <scope>test</scope>
101
-        </dependency>
102
-        <dependency>
103
             <groupId>org.apache.poi</groupId>
90
             <groupId>org.apache.poi</groupId>
104
             <artifactId>poi-ooxml</artifactId>
91
             <artifactId>poi-ooxml</artifactId>
105
             <version>3.9</version>
92
             <version>3.9</version>
@@ -136,13 +123,10 @@
136
             <artifactId>quartz</artifactId>
123
             <artifactId>quartz</artifactId>
137
             <version>2.3.0</version>
124
             <version>2.3.0</version>
138
         </dependency>
125
         </dependency>
139
-
140
         <dependency>
126
         <dependency>
141
             <groupId>org.springframework.boot</groupId>
127
             <groupId>org.springframework.boot</groupId>
142
             <artifactId>spring-boot-starter-test</artifactId>
128
             <artifactId>spring-boot-starter-test</artifactId>
143
         </dependency>
129
         </dependency>
144
-
145
-       
146
         <!--短信发送平台jar包-->
130
         <!--短信发送平台jar包-->
147
         <dependency>
131
         <dependency>
148
             <groupId>org.projectlombok</groupId>
132
             <groupId>org.projectlombok</groupId>
@@ -179,14 +163,6 @@
179
                 <groupId>org.springframework.boot</groupId>
163
                 <groupId>org.springframework.boot</groupId>
180
                 <artifactId>spring-boot-maven-plugin</artifactId>
164
                 <artifactId>spring-boot-maven-plugin</artifactId>
181
             </plugin>
165
             </plugin>
182
-            <!--<plugin>
183
-                <groupId>org.apache.maven.plugins</groupId>
184
-                <artifactId>maven-jar-plugin</artifactId>
185
-                <version>2.6</version>
186
-                <configuration>
187
-                    <failOnMissingWebXml>false</failOnMissingWebXml>
188
-                </configuration>
189
-            </plugin>-->
190
         </plugins>
166
         </plugins>
191
 
167
 
192
         <!-- 如果不添加此节点mybatis的mapper.xml文件都会被漏掉。 -->
168
         <!-- 如果不添加此节点mybatis的mapper.xml文件都会被漏掉。 -->

BIN
src/main/resources/RXTXcomm-2.0.1.jar


+ 6 - 6
src/main/resources/bootstrap.yml

@@ -1,6 +1,6 @@
1
 spring:
1
 spring:
2
   profiles:
2
   profiles:
3
-    active: clouda
3
+    active: locala
4
   servlet:
4
   servlet:
5
     multipart:
5
     multipart:
6
       #单个文件上传大小
6
       #单个文件上传大小
@@ -34,7 +34,7 @@ spring:
34
   # 数据库配置
34
   # 数据库配置
35
   datasource:
35
   datasource:
36
     driver-class-name: com.mysql.jdbc.Driver
36
     driver-class-name: com.mysql.jdbc.Driver
37
-    url: jdbc:mysql://localhost:3306/depot_yunnan?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=UTC
37
+    url: jdbc:mysql://101.36.160.140:10311/depot-yunnan?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=UTC
38
     username: root
38
     username: root
39
     password: 123456
39
     password: 123456
40
   # 缓存配置
40
   # 缓存配置
@@ -42,14 +42,14 @@ spring:
42
     store-type: redis
42
     store-type: redis
43
   redis:
43
   redis:
44
     database: 0
44
     database: 0
45
-    host: 10.10.1.25
45
+    host: 127.0.0.1
46
     port: 6379
46
     port: 6379
47
-    password: 123456
48
-    timeout: 3000
47
+    password:
48
+    timeout: 3000ms
49
     jedis:
49
     jedis:
50
       pool:
50
       pool:
51
         max-active: 8
51
         max-active: 8
52
-        max-wait: -1
52
+        max-wait: -1ms
53
         max-idle: 8
53
         max-idle: 8
54
         min-idle: 0
54
         min-idle: 0
55
   # 静态资源配置
55
   # 静态资源配置

BIN
src/main/resources/smslib-3.5.4.jar