Home Explore Help
Sign In
ipu
/
android-share
Watch 6
Star 0
Fork 0
Code Issues 1 Pull Requests 1 Commits 1367 Releases 4 Wiki
Browse Source

Merge branch 'master' of http://10.1.235.20:3000/ipu/android-share.git

wanyao 7 years ago
parent
282a1659d8 bf84705452
commit
0a1cc0a2e9
11 changed files with 701 additions and 1127 deletions
Split View Show Diff Stats
  1. 0 0
      display-client/assets/display-client/template/webapp/index.html
  2. 5 2
      display-server/pom.xml
  3. 514 503
      display-server/pom.xml.boot
  4. 0 525
      display-server/pom.xml.boot.test
  5. 157 0
      display-server/pom.xml.tomcat
  6. 10 0
      display-server/src/main/java/com/ai/server/ServerStart.java
  7. 0 17
      display-server/src/main/java/com/ai/server/springboot/DefaultFilter.java
  8. 0 65
      display-server/src/main/java/com/ai/server/springboot/MainModule.java
  9. 10 12
      display-server/src/main/resources/application.properties
  10. 4 3
      display-server/src/main/resources/banner.txt
  11. 1 0
      ipu-plugin-basic/src/main/java/com/ai/ipu/mobile/plugin/MobileUI.java

display-client/assets/display-client/template/webapp/Index.html → display-client/assets/display-client/template/webapp/index.html
View File


+ 5 - 2
display-server/pom.xml
View File 

@ -4,9 +4,8 @@
4 4
5 5 
	<parent>
6 6 
		<groupId>com.ai.ipu</groupId>
7 
		<artifactId>ipu-server-lib</artifactId>
7 
		<artifactId>ipu-server-libs</artifactId>
8 8 
		<version>3.0</version>
9 
		<relativePath>../ipu-server-lib/pom.xml</relativePath>
10 9 
	</parent>
11 10
12 11 
	<artifactId>display-server</artifactId>

@ -73,6 +72,10 @@
73 72 
		</dependency>
74 73 
		<dependency>
75 74 
			<groupId>com.ai.ipu</groupId>
75 
			<artifactId>ipu-spring-boot</artifactId>
76 
		</dependency>
77 
		<dependency>
78 
			<groupId>com.ai.ipu</groupId>
76 79 
			<artifactId>ipu-file-system</artifactId>
77 80 
		</dependency>
78 81 
		<dependency>

+ 514 - 503
display-server/pom.xml.boot
View File 

@ -1,258 +1,269 @@
1 
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1 
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2 2 
	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3 3 
	<modelVersion>4.0.0</modelVersion>
4 4
5 
	<parent>
6 
        <groupId>org.springframework.boot</groupId>
7 
        <artifactId>spring-boot-starter-parent</artifactId>
8 
        <!-- <version>1.2.1.RELEASE</version> -->
9 
        <version>1.4.0.RELEASE</version>
10 
    </parent>
11
12 
    <!-- 定义公共变量 -->
13 
    <properties>
14 
        <encoding>UTF-8</encoding>
15 
        <java.version>1.7</java.version>
16 
        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
17 
        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
18 
        <!-- Central jar -->
19 
        <junit>3.8.1</junit>
20 
        <servlet-api>3.0-alpha-1</servlet-api>
21 
        <log4j>1.2.8</log4j>
22 
        <unirest-java>1.3.8</unirest-java>
23 
        <dom4j>1.6.1</dom4j>
24 
        <jaxen>1.1.1</jaxen>
25 
        <commons-lang3>3.4</commons-lang3>
26 
        <beetl-core>2.2.3</beetl-core>
27 
        <velocity>1.7</velocity>
28 
        <jsoup>1.7.2</jsoup>
29 
        <commons-fileupload>1.3.1</commons-fileupload>
30 
        <commons-dbcp>1.4</commons-dbcp>
31 
        <mysql-connector-java>5.1.39</mysql-connector-java>
32 
        <commons-codec>1.3</commons-codec>
33 
        <jdom>1.1.3</jdom>
34 
        <commons-collections>3.2</commons-collections>
35 
        <quartz-all>1.6.3</quartz-all>
36 
        <jta>1.1</jta>
5 
	<parent>
6 
		<groupId>org.springframework.boot</groupId>
7 
		<artifactId>spring-boot-starter-parent</artifactId>
8 
		<!-- <version>1.2.1.RELEASE</version> -->
9 
		<version>1.4.0.RELEASE</version>
10 
	</parent>
37 11
38 
        <!-- 3rd party jar -->
39 
        <ojdbc>14</ojdbc>
40 
        <java_memcache-release>2.5.3</java_memcache-release>
41 
        <amail>1.0</amail>
42 
        <zxing>1.0</zxing>
43 
        <!-- ipu jar -->
44 
        <ipu>3.0</ipu>
45 
        <wade>1.0</wade>
12 
	<!-- 定义公共变量 -->
13 
	<properties>
14 
		<encoding>UTF-8</encoding>
15 
		<java.version>1.7</java.version>
16 
		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
17 
		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
18 
		<!-- Central jar -->
19 
		<junit>3.8.1</junit>
20 
		<servlet-api>3.0-alpha-1</servlet-api>
21 
		<log4j>1.2.8</log4j>
22 
		<unirest-java>1.3.8</unirest-java>
23 
		<dom4j>1.6.1</dom4j>
24 
		<jaxen>1.1.1</jaxen>
25 
		<commons-lang3>3.4</commons-lang3>
26 
		<beetl-core>2.2.3</beetl-core>
27 
		<velocity>1.7</velocity>
28 
		<jsoup>1.7.2</jsoup>
29 
		<commons-fileupload>1.3.1</commons-fileupload>
30 
		<commons-dbcp>1.4</commons-dbcp>
31 
		<mysql-connector-java>5.1.39</mysql-connector-java>
32 
		<commons-codec>1.3</commons-codec>
33 
		<jdom>1.1.3</jdom>
34 
		<commons-collections>3.2</commons-collections>
35 
		<quartz-all>1.6.3</quartz-all>
36 
		<jta>1.1</jta>
37
38 
		<!-- 3rd party jar -->
39 
		<ojdbc>14</ojdbc>
40 
		<java_memcache-release>2.5.3</java_memcache-release>
41 
		<amail>1.0</amail>
42 
		<zxing>1.0</zxing>
43 
		<!-- ipu jar -->
44 
		<ipu>3.0</ipu>
45 
		<wade>1.0</wade>
46
47 
		<!-- 公共插件 -->
48 
		<maven-clean-plugin>3.0.0</maven-clean-plugin>
49 
		<maven-resources-plugin>3.0.1</maven-resources-plugin>
50 
		<maven-compiler-plugin>3.1</maven-compiler-plugin>
51 
		<compiler-version>1.6</compiler-version>
52 
		<maven-surefire-plugin>2.5</maven-surefire-plugin>
53 
		<maven-war-plugin>2.6</maven-war-plugin>
54 
		<exec-maven-plugin>1.5.0</exec-maven-plugin>
55 
		<maven-dependency-plugin>2.4</maven-dependency-plugin>
46 56
47 
        <!-- 公共插件 -->
48 
        <maven-clean-plugin>3.0.0</maven-clean-plugin>
49 
        <maven-resources-plugin>3.0.1</maven-resources-plugin>
50 
        <maven-compiler-plugin>3.1</maven-compiler-plugin>
51 
        <compiler-version>1.6</compiler-version>
52 
        <maven-surefire-plugin>2.5</maven-surefire-plugin>
53 
        <maven-war-plugin>2.6</maven-war-plugin>
54 
        <exec-maven-plugin>1.5.0</exec-maven-plugin>
55 
        <maven-dependency-plugin>2.4</maven-dependency-plugin>
57 
		<!-- 本地jar路径all -->
58 
		<jar-path-all>${project.basedir}/all</jar-path-all>
56 59
57 
        <!-- 本地jar路径all -->
58 
        <jar-path-all>${project.basedir}/all</jar-path-all>
60 
	</properties>
59 61
60 
    </properties>
62 
	<dependencyManagement>
63 
		<dependencies>
64 
			<!-- Central jar -->
65 
			<dependency>
66 
				<groupId>commons-collections</groupId>
67 
				<artifactId>commons-collections</artifactId>
68 
				<version>${commons-collections}</version>
69 
			</dependency>
70 
			<dependency>
71 
				<groupId>javax.transaction</groupId>
72 
				<artifactId>jta</artifactId>
73 
				<version>${jta}</version>
74 
			</dependency>
75 
			<dependency>
76 
				<groupId>opensymphony</groupId>
77 
				<artifactId>quartz-all</artifactId>
78 
				<version>${quartz-all}</version>
79 
			</dependency>
80 
			<dependency>
81 
				<groupId>junit</groupId>
82 
				<artifactId>junit</artifactId>
83 
				<version>${junit}</version>
84 
				<scope>test</scope>
85 
			</dependency>
86 
			<dependency>
87 
				<groupId>javax.servlet</groupId>
88 
				<artifactId>servlet-api</artifactId>
89 
				<version>${servlet-api}</version>
90 
				<scope>provided</scope>
91 
			</dependency>
92 
			<dependency>
93 
				<groupId>org.apache.commons</groupId>
94 
				<artifactId>commons-lang3</artifactId>
95 
				<version>${commons-lang3}</version>
96 
			</dependency>
97 
			<dependency>
98 
				<groupId>log4j</groupId>
99 
				<artifactId>log4j</artifactId>
100 
				<version>${log4j}</version>
101 
			</dependency>
102 
			<dependency>
103 
				<groupId>dom4j</groupId>
104 
				<artifactId>dom4j</artifactId>
105 
				<version>${dom4j}</version>
106 
			</dependency>
107 
			<dependency>
108 
				<groupId>jaxen</groupId>
109 
				<artifactId>jaxen</artifactId>
110 
				<version>${jaxen}</version>
111 
			</dependency>
112 
			<dependency>
113 
				<groupId>com.mashape.unirest</groupId>
114 
				<artifactId>unirest-java</artifactId>
115 
				<version>${unirest-java}</version>
116 
			</dependency>
117 
			<dependency>
118 
				<groupId>org.beetl</groupId>
119 
				<artifactId>beetl-core</artifactId>
120 
				<version>${beetl-core}</version>
121 
			</dependency>
122 
			<dependency>
123 
				<groupId>org.apache.velocity</groupId>
124 
				<artifactId>velocity</artifactId>
125 
				<version>${velocity}</version>
126 
			</dependency>
127 
			<dependency>
128 
				<groupId>org.jsoup</groupId>
129 
				<artifactId>jsoup</artifactId>
130 
				<version>${jsoup}</version>
131 
			</dependency>
132 
			<dependency>
133 
				<groupId>commons-fileupload</groupId>
134 
				<artifactId>commons-fileupload</artifactId>
135 
				<version>${commons-fileupload}</version>
136 
			</dependency>
137 
			<dependency>
138 
				<groupId>commons-dbcp</groupId>
139 
				<artifactId>commons-dbcp</artifactId>
140 
				<version>${commons-dbcp}</version>
141 
			</dependency>
142 
			<dependency>
143 
				<groupId>mysql</groupId>
144 
				<artifactId>mysql-connector-java</artifactId>
145 
				<version>${mysql-connector-java}</version>
146 
			</dependency>
147 
			<dependency>
148 
				<groupId>commons-codec</groupId>
149 
				<artifactId>commons-codec</artifactId>
150 
				<version>${commons-codec}</version>
151 
			</dependency>
61 152
62 
    <dependencyManagement>
63 
        <dependencies>
64 
            <!-- Central jar -->
65 
            <dependency>
66 
                <groupId>commons-collections</groupId>
67 
                <artifactId>commons-collections</artifactId>
68 
                <version>${commons-collections}</version>
69 
            </dependency>
70 
            <dependency>
71 
                <groupId>javax.transaction</groupId>
72 
                <artifactId>jta</artifactId>
73 
                <version>${jta}</version>
74 
            </dependency>
75 
            <dependency>
76 
                <groupId>opensymphony</groupId>
77 
                <artifactId>quartz-all</artifactId>
78 
                <version>${quartz-all}</version>
79 
            </dependency>
80 
            <dependency>
81 
                <groupId>junit</groupId>
82 
                <artifactId>junit</artifactId>
83 
                <version>${junit}</version>
84 
                <scope>test</scope>
85 
            </dependency>
86 
            <dependency>
87 
                <groupId>javax.servlet</groupId>
88 
                <artifactId>servlet-api</artifactId>
89 
                <version>${servlet-api}</version>
90 
                <scope>provided</scope>
91 
            </dependency>
92 
            <dependency>
93 
                <groupId>org.apache.commons</groupId>
94 
                <artifactId>commons-lang3</artifactId>
95 
                <version>${commons-lang3}</version>
96 
            </dependency>
97 
            <dependency>
98 
                <groupId>log4j</groupId>
99 
                <artifactId>log4j</artifactId>
100 
                <version>${log4j}</version>
101 
            </dependency>
102 
            <dependency>
103 
                <groupId>dom4j</groupId>
104 
                <artifactId>dom4j</artifactId>
105 
                <version>${dom4j}</version>
106 
            </dependency>
107 
            <dependency>
108 
                <groupId>jaxen</groupId>
109 
                <artifactId>jaxen</artifactId>
110 
                <version>${jaxen}</version>
111 
            </dependency>
112 
            <dependency>
113 
                <groupId>com.mashape.unirest</groupId>
114 
                <artifactId>unirest-java</artifactId>
115 
                <version>${unirest-java}</version>
116 
            </dependency>
117 
            <dependency>
118 
                <groupId>org.beetl</groupId>
119 
                <artifactId>beetl-core</artifactId>
120 
                <version>${beetl-core}</version>
121 
            </dependency>
122 
            <dependency>
123 
                <groupId>org.apache.velocity</groupId>
124 
                <artifactId>velocity</artifactId>
125 
                <version>${velocity}</version>
126 
            </dependency>
127 
            <dependency>
128 
                <groupId>org.jsoup</groupId>
129 
                <artifactId>jsoup</artifactId>
130 
                <version>${jsoup}</version>
131 
            </dependency>
132 
            <dependency>
133 
                <groupId>commons-fileupload</groupId>
134 
                <artifactId>commons-fileupload</artifactId>
135 
                <version>${commons-fileupload}</version>
136 
            </dependency>
137 
            <dependency>
138 
                <groupId>commons-dbcp</groupId>
139 
                <artifactId>commons-dbcp</artifactId>
140 
                <version>${commons-dbcp}</version>
141 
            </dependency>
142 
            <dependency>
143 
                <groupId>mysql</groupId>
144 
                <artifactId>mysql-connector-java</artifactId>
145 
                <version>${mysql-connector-java}</version>
146 
            </dependency>
147 
            <dependency>
148 
                <groupId>commons-codec</groupId>
149 
                <artifactId>commons-codec</artifactId>
150 
                <version>${commons-codec}</version>
151 
            </dependency>
153 
			<!-- 3rd party jar -->
154 
			<dependency>
155 
				<groupId>com</groupId>
156 
				<artifactId>java_memcache-release</artifactId>
157 
				<version>${java_memcache-release}</version>
158 
			</dependency>
159 
			<dependency>
160 
				<groupId>com.amail</groupId>
161 
				<artifactId>amail</artifactId>
162 
				<version>${amail}</version>
163 
			</dependency>
164 
			<dependency>
165 
				<groupId>com.zxing</groupId>
166 
				<artifactId>zxing</artifactId>
167 
				<version>${zxing}</version>
168 
			</dependency>
169 
			<dependency>
170 
				<groupId>ojdbc</groupId>
171 
				<artifactId>ojdbc</artifactId>
172 
				<version>${ojdbc}</version>
173 
			</dependency>
152 174
153 
            <!-- 3rd party jar -->
154 
            <dependency>
155 
                <groupId>com</groupId>
156 
                <artifactId>java_memcache-release</artifactId>
157 
                <version>${java_memcache-release}</version>
158 
            </dependency>
159 
            <dependency>
160 
                <groupId>com.amail</groupId>
161 
                <artifactId>amail</artifactId>
162 
                <version>${amail}</version>
163 
            </dependency>
164 
            <dependency>
165 
                <groupId>com.zxing</groupId>
166 
                <artifactId>zxing</artifactId>
167 
                <version>${zxing}</version>
168 
            </dependency>
169 
            <dependency>
170 
                <groupId>ojdbc</groupId>
171 
                <artifactId>ojdbc</artifactId>
172 
                <version>${ojdbc}</version>
173 
            </dependency>
175 
			<!-- ipu jar -->
176 
			<dependency>
177 
				<groupId>com.ai.ipu</groupId>
178 
				<artifactId>ipu-basic</artifactId>
179 
				<version>${ipu}</version>
180 
			</dependency>
181 
			<dependency>
182 
				<groupId>com.ai.ipu</groupId>
183 
				<artifactId>ipu-common</artifactId>
184 
				<version>${ipu}</version>
185 
			</dependency>
186 
			<dependency>
187 
				<groupId>com.ai.ipu</groupId>
188 
				<artifactId>ipu-database</artifactId>
189 
				<version>${ipu}</version>
190 
			</dependency>
191 
			<dependency>
192 
				<groupId>com.ai.ipu</groupId>
193 
				<artifactId>ipu-remote-clinet</artifactId>
194 
				<version>${ipu}</version>
195 
			</dependency>
196 
			<dependency>
197 
				<groupId>com.ai.ipu</groupId>
198 
				<artifactId>ipu-server-web</artifactId>
199 
				<version>${ipu}</version>
200 
			</dependency>
201 
			<dependency>
202 
				<groupId>com.ai.ipu</groupId>
203 
				<artifactId>ipu-spring-boot</artifactId>
204 
				<version>${ipu}</version>
205 
			</dependency>
206 
			<dependency>
207 
				<groupId>com.ai.ipu</groupId>
208 
				<artifactId>ipu-file-system</artifactId>
209 
				<version>${ipu}</version>
210 
				<exclusions>
211 
					<exclusion>
212 
						<artifactId>slf4j-log4j12</artifactId>
213 
						<groupId>org.slf4j</groupId>
214 
					</exclusion>
215 
				</exclusions>
216 
			</dependency>
174 217
175 
            <!-- ipu jar -->
176 
            <dependency>
177 
                <groupId>com.ai.ipu</groupId>
178 
                <artifactId>ipu-basic</artifactId>
179 
                <version>${ipu}</version>
180 
            </dependency>
181 
            <dependency>
182 
                <groupId>com.ai.ipu</groupId>
183 
                <artifactId>ipu-common</artifactId>
184 
                <version>${ipu}</version>
185 
            </dependency>
186 
            <dependency>
187 
                <groupId>com.ai.ipu</groupId>
188 
                <artifactId>ipu-database</artifactId>
189 
                <version>${ipu}</version>
190 
            </dependency>
191 
            <dependency>
192 
                <groupId>com.ai.ipu</groupId>
193 
                <artifactId>ipu-remote-clinet</artifactId>
194 
                <version>${ipu}</version>
195 
            </dependency>
196 
            <dependency>
197 
                <groupId>com.ai.ipu</groupId>
198 
                <artifactId>ipu-server-web</artifactId>
199 
                <version>${ipu}</version>
200 
            </dependency>
201 
            <dependency>
202 
                <groupId>com.ai.ipu</groupId>
203 
                <artifactId>ipu-file-system</artifactId>
204 
                <version>${ipu}</version>
205 
            </dependency>
218 
			<dependency>
219 
				<!-- 不推荐使用，推荐使用wade-mobile-data -->
220 
				<groupId>com.ai.wade</groupId>
221 
				<artifactId>wade-data</artifactId>
222 
				<version>${wade}</version>
223 
			</dependency>
224 
			<dependency>
225 
				<!-- 不依赖其他jar -->
226 
				<groupId>com.ai.wade</groupId>
227 
				<artifactId>wade-mobile-data</artifactId>
228 
				<version>${wade}</version>
229 
			</dependency>
230 
			<dependency>
231 
				<!-- commons-collections-3.2.jar,quartz-all-1.6.3.jar,jdom1.0.jar,wade-apache,wade-common,wade-mobile-data -->
232 
				<groupId>com.ai.wade</groupId>
233 
				<artifactId>wade-cache</artifactId>
234 
				<version>${wade}</version>
235 
			</dependency>
236 
			<dependency>
237 
				<groupId>com.ai.wade</groupId>
238 
				<artifactId>wade-apache</artifactId>
239 
				<version>${wade}</version>
240 
			</dependency>
241 
			<dependency>
242 
				<groupId>com.ai.wade</groupId>
243 
				<artifactId>wade-common</artifactId>
244 
				<version>${wade}</version>
245 
			</dependency>
246 
			<dependency>
247 
				<!-- commons-dbcp-1.4.jar,dom4j-1.6.1.jar,jaxen-1.1.1.jar,jta.jar,ojdbc14.jar,mysql-connector-5.1.39.jar,wade-apache,wade-cache,wade-common,wade-mobile-data -->
248 
				<groupId>com.ai.wade</groupId>
249 
				<artifactId>wade-database</artifactId>
250 
				<version>${wade}</version>
251 
			</dependency>
252 
			<dependency>
253 
				<groupId>com.ai.wade</groupId>
254 
				<artifactId>wade-sqlite-jdbc</artifactId>
255 
				<version>${wade}</version>
256 
			</dependency>
257 
			<dependency>
258 
				<!-- ipu-basic,ipu-server-web,wade-apache,wade-cache,wade-common,wade-database,wade-mobile-data -->
259 
				<groupId>com.ai.wade</groupId>
260 
				<artifactId>wade-codecode</artifactId>
261 
				<version>${wade}</version>
262 
			</dependency>
206 263
207 
            <dependency>
208 
                <!-- 不推荐使用，推荐使用wade-mobile-data -->
209 
                <groupId>com.ai.wade</groupId>
210 
                <artifactId>wade-data</artifactId>
211 
                <version>${wade}</version>
212 
            </dependency>
213 
            <dependency>
214 
                <!-- 不依赖其他jar -->
215 
                <groupId>com.ai.wade</groupId>
216 
                <artifactId>wade-mobile-data</artifactId>
217 
                <version>${wade}</version>
218 
            </dependency>
219 
            <dependency>
220 
                <!-- commons-collections-3.2.jar,quartz-all-1.6.3.jar,jdom1.0.jar,wade-apache,wade-common,wade-mobile-data -->
221 
                <groupId>com.ai.wade</groupId>
222 
                <artifactId>wade-cache</artifactId>
223 
                <version>${wade}</version>
224 
            </dependency>
225 
            <dependency>
226 
                <groupId>com.ai.wade</groupId>
227 
                <artifactId>wade-apache</artifactId>
228 
                <version>${wade}</version>
229 
            </dependency>
230 
            <dependency>
231 
                <groupId>com.ai.wade</groupId>
232 
                <artifactId>wade-common</artifactId>
233 
                <version>${wade}</version>
234 
            </dependency>
235 
            <dependency>
236 
                <!-- commons-dbcp-1.4.jar,dom4j-1.6.1.jar,jaxen-1.1.1.jar,jta.jar,ojdbc14.jar,mysql-connector-5.1.39.jar,wade-apache,wade-cache,wade-common,wade-mobile-data -->
237 
                <groupId>com.ai.wade</groupId>
238 
                <artifactId>wade-database</artifactId>
239 
                <version>${wade}</version>
240 
            </dependency>
241 
            <dependency>
242 
                <groupId>com.ai.wade</groupId>
243 
                <artifactId>wade-sqlite-jdbc</artifactId>
244 
                <version>${wade}</version>
245 
            </dependency>
246 
            <dependency>
247 
                <!-- ipu-basic,ipu-server-web,wade-apache,wade-cache,wade-common,wade-database,wade-mobile-data -->
248 
                <groupId>com.ai.wade</groupId>
249 
                <artifactId>wade-codecode</artifactId>
250 
                <version>${wade}</version>
251 
            </dependency>
264 
		</dependencies>
265 
	</dependencyManagement>
252 266
253 
        </dependencies>
254 
    </dependencyManagement>
255
256 267 
	<artifactId>display-server</artifactId>
257 268 
	<packaging>war</packaging>
258 269 
	<name>展示平台</name>
 
@ -265,7 +276,7 @@
265 276 
			<groupId>junit</groupId>
266 277 
			<artifactId>junit</artifactId>
267 278 
		</dependency>
268
279
269 280 
		<dependency>
270 281 
			<groupId>org.apache.commons</groupId>
271 282 
			<artifactId>commons-lang3</artifactId>
 
@ -314,6 +325,10 @@
314 325 
		</dependency>
315 326 
		<dependency>
316 327 
			<groupId>com.ai.ipu</groupId>
328 
			<artifactId>ipu-spring-boot</artifactId>
329 
		</dependency>
330 
		<dependency>
331 
			<groupId>com.ai.ipu</groupId>
317 332 
			<artifactId>ipu-file-system</artifactId>
318 333 
		</dependency>
319 334 
		<dependency>
 
@ -364,272 +379,268 @@
364 379 
		</dependency>
365 380 
		<!-- 额外依赖 -->
366 381 
		<!-- 缺省用tomcat容器 -->
367
368 
        <dependency>
369 
            <groupId>org.springframework.boot</groupId>
370 
            <artifactId>spring-boot-starter-web</artifactId>
371 
        </dependency>
372
373 
        <!-- 使用jetty容器 -->
374 
        <!--
375 
        <dependency>
376 
            <groupId>org.springframework.boot</groupId>
377 
            <artifactId>spring-boot-starter-web</artifactId>
378 
            <exclusions>
379 
                <exclusion>
380 
                    <groupId>org.springframework.boot</groupId>
381 
                    <artifactId>spring-boot-starter-tomcat</artifactId>
382 
                </exclusion>
383 
            </exclusions>
384 
        </dependency>
385 
        <dependency>
386 
            <groupId>org.springframework.boot</groupId>
387 
            <artifactId>spring-boot-starter-jetty</artifactId>
388 
        </dependency>
389 
         -->
390 
        <dependency>
391 
           <groupId>org.springframework.boot</groupId>
392 
           <artifactId>spring-boot-starter-tomcat</artifactId>
393 
            <scope>provided</scope>
394 
        </dependency>
395
396 
        <dependency>
397 
            <groupId>org.springframework.boot</groupId>
398 
            <artifactId>spring-boot-starter-test</artifactId>
399 
        </dependency>
400
382
383 
		<dependency>
384 
			<groupId>org.springframework.boot</groupId>
385 
			<artifactId>spring-boot-starter-web</artifactId>
386 
		</dependency>
387
388 
		<!-- 使用jetty容器 -->
389 
		<!-- <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-web</artifactId>
390 
			<exclusions> <exclusion> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-tomcat</artifactId>
391 
			</exclusion> </exclusions> </dependency> <dependency> <groupId>org.springframework.boot</groupId>
392 
			<artifactId>spring-boot-starter-jetty</artifactId> </dependency> -->
393 
		<dependency>
394 
			<groupId>org.springframework.boot</groupId>
395 
			<artifactId>spring-boot-starter-tomcat</artifactId>
396 
			<scope>provided</scope>
397 
		</dependency>
398
399 
		<dependency>
400 
			<groupId>org.springframework.boot</groupId>
401 
			<artifactId>spring-boot-starter-test</artifactId>
402 
		</dependency>
403
401 404 
	</dependencies>
402 405
403 406 
	<build>
404 
	<pluginManagement>
405 
            <plugins>
406 
                <!-- 默认插件，不引入也可使用 -->
407 
                <!-- 默认jre编译版本:1.6 -->
408 
                <plugin>
409 
                    <groupId>org.apache.maven.plugins</groupId>
410 
                    <artifactId>maven-compiler-plugin</artifactId>
411 
                    <version>${maven-compiler-plugin}</version>
412 
                    <configuration>
413 
                        <source>${compiler-version}</source>
414 
                        <target>${compiler-version}</target>
415 
                        <encoding>${encoding}</encoding>
416 
                    </configuration>
417 
                </plugin>
418 
                <!-- war包去除servlet-api的jar包 -->
419 
                <!-- <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-war-plugin</artifactId>
420 
                    <version>${maven-war-plugin}</version> <configuration> servlet-api相关jar不打包,前面的scope=provided已解决
421 
                    <packagingExcludes> WEB-INF/lib/servlet-api*.jar </packagingExcludes> <webResources>
422 
                    <resource> <directory>${jar-path}</directory> <includes> <include>*.jar</include>
423 
                    </includes> <targetPath>WEB-INF/lib</targetPath> </resource> </webResources>
424 
                    </configuration> </plugin> -->
425 
                <!-- 跳过单元测试 -->
426 
                <plugin>
427 
                    <groupId>org.apache.maven.plugins</groupId>
428 
                    <artifactId>maven-surefire-plugin</artifactId>
429 
                    <version>${maven-surefire-plugin}</version>
430 
                    <configuration>
431 
                        <!-- 跳过单元测试 -->
432 
                        <skip>true</skip>
433 
                    </configuration>
434 
                </plugin>
435 
                <!-- clean中间文件 -->
436 
                <plugin>
437 
                    <artifactId>maven-clean-plugin</artifactId>
438 
                    <version>${maven-clean-plugin}</version>
439 
                    <executions>
440 
                        <execution>
441 
                            <id>clean-all</id>
442 
                            <phase>clean</phase>
443 
                            <goals>
444 
                                <goal>clean</goal>
445 
                            </goals>
446 
                            <configuration>
447 
                                <filesets>
448 
                                    <fileset>
449 
                                        <directory>${basedir}/src/main/webapp/encrypt</directory>
450 
                                        <includes>
451 
                                            <include>**/*</include>
452 
                                        </includes>
453 
                                    </fileset>
454 
                                    <fileset>
455 
                                        <directory>${basedir}/src/main/webapp</directory>
456 
                                        <includes>
457 
                                            <include>res.version.properties</include>
458 
                                        </includes>
459 
                                    </fileset>
460 
                                    <fileset>
461 
                                        <directory>${basedir}/src/main/webapp/template/lua</directory>
462 
                                        <includes>
463 
                                            <include>**/*</include>
464 
                                        </includes>
465 
                                    </fileset>
466 
                                </filesets>
467 
                            </configuration>
468 
                        </execution>
469 
                        <!-- 打包之前clean掉明文配置文件 -->
470 
                        <execution>
471 
                            <id>clean-config</id>
472 
                            <phase>prepare-package</phase><!-- 打包之前 -->
473 
                            <goals>
474 
                                <goal>clean</goal>
475 
                            </goals>
476 
                            <configuration>
477 
                                <excludeDefaultDirectories>true</excludeDefaultDirectories>
478 
                                <filesets>
479 
                                    <fileset>
480 
                                        <directory>${basedir}/src/main/webapp/template</directory>
481 
                                        <includes>
482 
                                            <include>server-config.xml</include>
483 
                                            <include>server-data.xml</include>
484 
                                            <include>server-page.xml</include>
485 
                                        </includes>
486 
                                    </fileset>
487 
                                </filesets>
488 
                            </configuration>
489 
                        </execution>
490 
                    </executions>
491 
                </plugin>
492 
                <!-- 复制资源 -->
493 
                <plugin>
494 
                    <artifactId>maven-resources-plugin</artifactId>
495 
                    <version>${maven-resources-plugin}</version>
496 
                    <configuration>
497 
                        <encoding>${encoding}</encoding>
498 
                    </configuration>
499 
                    <executions>
500 
                        <execution>
501 
                            <id>copy-config</id>
502 
                            <phase>process-resources</phase><!-- 编译之前处理文件 -->
503 
                            <goals>
504 
                                <goal>copy-resources</goal>
505 
                            </goals>
506 
                            <configuration>
507 
                                <outputDirectory>${basedir}/src/main/webapp/template</outputDirectory>
508 
                                <resources>
509 
                                    <resource>
510 
                                        <directory>${basedir}/src/main/resources</directory>
511 
                                        <includes>
512 
                                            <include>server-config.xml</include>
513 
                                            <include>server-data.xml</include>
514 
                                            <include>server-page.xml</include>
515 
                                        </includes>
516 
                                    </resource>
517 
                                </resources>
518 
                            </configuration>
519 
                        </execution>
520 
                        <execution>
521 
                            <id>copy-lua</id>
522 
                            <phase>process-resources</phase>
523 
                            <goals>
524 
                                <goal>copy-resources</goal>
525 
                            </goals>
526 
                            <configuration>
527 
                                <outputDirectory>${basedir}/src/main/webapp/template/lua</outputDirectory>
528 
                                <resources>
529 
                                    <resource>
530 
                                        <directory>${basedir}/src/main/resources/lua</directory>
531 
                                    </resource>
532 
                                </resources>
533 
                            </configuration>
534 
                        </execution>
535 
                    </executions>
536 
                </plugin>
537 
                <!-- 生成文件版本号和文件加密 -->
538 
                <plugin>
539 
                    <groupId>org.codehaus.mojo</groupId>
540 
                    <artifactId>exec-maven-plugin</artifactId>
541 
                    <version>${exec-maven-plugin}</version>
542 
                    <executions>
543 
                        <execution>
544 
                            <id>res-encrypt</id>
545 
                            <phase>test</phase>
546 
                            <goals>
547 
                                <goal>java</goal>
548 
                            </goals>
549 
                            <configuration>
550 
                                <classpathScope>compile</classpathScope>
551 
                                <includeProjectDependencies>true</includeProjectDependencies>
552 
                                <mainClass>com.ai.ipu.server.tool.FileEncryptToolMaven</mainClass>
553 
                                <arguments>
554 
                                    <argument>src/main/webapp/</argument>
555 
                                    <argument>false</argument>
556 
                                    <argument></argument>
557 
                                </arguments>
558 
                            </configuration>
559 
                        </execution>
560 
                        <execution>
561 
                            <id>res-version</id>
562 
                            <phase>prepare-package</phase>
563 
                            <goals>
564 
                                <goal>java</goal>
565 
                            </goals>
566 
                            <configuration>
567 
                                <classpathScope>compile</classpathScope>
568 
                                <includeProjectDependencies>true</includeProjectDependencies>
569 
                                <mainClass>com.ai.ipu.server.tool.VersionToolMaven</mainClass>
570 
                                <arguments>
571 
                                    <argument>src/main/webapp/</argument>
572 
                                    <argument>false</argument>
573 
                                    <argument>upload|setup|.gitignore|.DS_Store</argument>
574 
                                </arguments>
575 
                            </configuration>
576 
                        </execution>
577 
                    </executions>
578 
                </plugin>
579 
                <plugin>
580 
                    <groupId>org.apache.maven.plugins</groupId>
581 
                    <artifactId>maven-dependency-plugin</artifactId>
582 
                    <version>${maven-dependency-plugin}</version>
583 
                    <executions>
584 
                        <execution>
585 
                            <id>copy-dep</id>
586 
                            <phase>package</phase>
587 
                            <goals>
588 
                                <goal>copy-dependencies</goal>
589 
                            </goals>
590 
                            <configuration>
591 
                                <outputDirectory>${basedir}/src/main/webapp/WEB-INF/lib</outputDirectory>
592 
                                <excludeScope>provided</excludeScope>
593 
                                <excludeArtifactIds>junit</excludeArtifactIds>
594 
                            </configuration>
595 
                        </execution>
596 
                    </executions>
597 
                </plugin>
598 
            </plugins>
599 
        </pluginManagement>
407 
		<pluginManagement>
408 
			<plugins>
409 
				<!-- 默认插件，不引入也可使用 -->
410 
				<!-- 默认jre编译版本:1.6 -->
411 
				<plugin>
412 
					<groupId>org.apache.maven.plugins</groupId>
413 
					<artifactId>maven-compiler-plugin</artifactId>
414 
					<version>${maven-compiler-plugin}</version>
415 
					<configuration>
416 
						<source>${compiler-version}</source>
417 
						<target>${compiler-version}</target>
418 
						<encoding>${encoding}</encoding>
419 
					</configuration>
420 
				</plugin>
421 
				<!-- war包去除servlet-api的jar包 -->
422 
				<!-- <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-war-plugin</artifactId>
423 
					<version>${maven-war-plugin}</version> <configuration> servlet-api相关jar不打包,前面的scope=provided已解决
424 
					<packagingExcludes> WEB-INF/lib/servlet-api*.jar </packagingExcludes> <webResources>
425 
					<resource> <directory>${jar-path}</directory> <includes> <include>*.jar</include>
426 
					</includes> <targetPath>WEB-INF/lib</targetPath> </resource> </webResources>
427 
					</configuration> </plugin> -->
428 
				<!-- 跳过单元测试 -->
429 
				<plugin>
430 
					<groupId>org.apache.maven.plugins</groupId>
431 
					<artifactId>maven-surefire-plugin</artifactId>
432 
					<version>${maven-surefire-plugin}</version>
433 
					<configuration>
434 
						<!-- 跳过单元测试 -->
435 
						<skip>true</skip>
436 
					</configuration>
437 
				</plugin>
438 
				<!-- clean中间文件 -->
439 
				<plugin>
440 
					<artifactId>maven-clean-plugin</artifactId>
441 
					<version>${maven-clean-plugin}</version>
442 
					<executions>
443 
						<execution>
444 
							<id>clean-all</id>
445 
							<phase>clean</phase>
446 
							<goals>
447 
								<goal>clean</goal>
448 
							</goals>
449 
							<configuration>
450 
								<filesets>
451 
									<fileset>
452 
										<directory>${basedir}/src/main/webapp/encrypt</directory>
453 
										<includes>
454 
											<include>**/*</include>
455 
										</includes>
456 
									</fileset>
457 
									<fileset>
458 
										<directory>${basedir}/src/main/webapp</directory>
459 
										<includes>
460 
											<include>res.version.properties</include>
461 
										</includes>
462 
									</fileset>
463 
									<fileset>
464 
										<directory>${basedir}/src/main/webapp/template/lua</directory>
465 
										<includes>
466 
											<include>**/*</include>
467 
										</includes>
468 
									</fileset>
469 
									<fileset>
470 
										<directory>${basedir}/src/main/webapp/WEB-INF/lib</directory>
471 
										<includes>
472 
											<include>**/*</include>
473 
										</includes>
474 
									</fileset>
475 
								</filesets>
476 
							</configuration>
477 
						</execution>
478 
						<!-- 打包之前clean掉明文配置文件 -->
479 
						<execution>
480 
							<id>clean-config</id>
481 
							<phase>prepare-package</phase><!-- 打包之前 -->
482 
							<goals>
483 
								<goal>clean</goal>
484 
							</goals>
485 
							<configuration>
486 
								<excludeDefaultDirectories>true</excludeDefaultDirectories>
487 
								<filesets>
488 
									<fileset>
489 
										<directory>${basedir}/src/main/webapp/template</directory>
490 
										<includes>
491 
											<include>server-config.xml</include>
492 
											<include>server-data.xml</include>
493 
											<include>server-page.xml</include>
494 
										</includes>
495 
									</fileset>
496 
								</filesets>
497 
							</configuration>
498 
						</execution>
499 
					</executions>
500 
				</plugin>
501 
				<!-- 复制资源 -->
502 
				<plugin>
503 
					<artifactId>maven-resources-plugin</artifactId>
504 
					<version>${maven-resources-plugin}</version>
505 
					<configuration>
506 
						<encoding>${encoding}</encoding>
507 
					</configuration>
508 
					<executions>
509 
						<execution>
510 
							<id>copy-config</id>
511 
							<phase>process-resources</phase><!-- 编译之前处理文件 -->
512 
							<goals>
513 
								<goal>copy-resources</goal>
514 
							</goals>
515 
							<configuration>
516 
								<outputDirectory>${basedir}/src/main/webapp/template</outputDirectory>
517 
								<resources>
518 
									<resource>
519 
										<directory>${basedir}/src/main/resources</directory>
520 
										<includes>
521 
											<include>server-config.xml</include>
522 
											<include>server-data.xml</include>
523 
											<include>server-page.xml</include>
524 
										</includes>
525 
									</resource>
526 
								</resources>
527 
							</configuration>
528 
						</execution>
529 
						<execution>
530 
							<id>copy-lua</id>
531 
							<phase>process-resources</phase>
532 
							<goals>
533 
								<goal>copy-resources</goal>
534 
							</goals>
535 
							<configuration>
536 
								<outputDirectory>${basedir}/src/main/webapp/template/lua</outputDirectory>
537 
								<resources>
538 
									<resource>
539 
										<directory>${basedir}/src/main/resources/lua</directory>
540 
									</resource>
541 
								</resources>
542 
							</configuration>
543 
						</execution>
544 
					</executions>
545 
				</plugin>
546 
				<!-- 生成文件版本号和文件加密 -->
547 
				<plugin>
548 
					<groupId>org.codehaus.mojo</groupId>
549 
					<artifactId>exec-maven-plugin</artifactId>
550 
					<version>${exec-maven-plugin}</version>
551 
					<executions>
552 
						<execution>
553 
							<id>res-encrypt</id>
554 
							<phase>test</phase>
555 
							<goals>
556 
								<goal>java</goal>
557 
							</goals>
558 
							<configuration>
559 
								<classpathScope>compile</classpathScope>
560 
								<includeProjectDependencies>true</includeProjectDependencies>
561 
								<mainClass>com.ai.ipu.server.tool.FileEncryptToolMaven</mainClass>
562 
								<arguments>
563 
									<argument>src/main/webapp/</argument>
564 
									<argument>false</argument>
565 
									<argument></argument>
566 
								</arguments>
567 
							</configuration>
568 
						</execution>
569 
						<execution>
570 
							<id>res-version</id>
571 
							<phase>prepare-package</phase>
572 
							<goals>
573 
								<goal>java</goal>
574 
							</goals>
575 
							<configuration>
576 
								<classpathScope>compile</classpathScope>
577 
								<includeProjectDependencies>true</includeProjectDependencies>
578 
								<mainClass>com.ai.ipu.server.tool.VersionToolMaven</mainClass>
579 
								<arguments>
580 
									<argument>src/main/webapp/</argument>
581 
									<argument>false</argument>
582 
									<argument>upload|setup|.gitignore|.DS_Store</argument>
583 
								</arguments>
584 
							</configuration>
585 
						</execution>
586 
					</executions>
587 
				</plugin>
588 
				<plugin>
589 
					<groupId>org.apache.maven.plugins</groupId>
590 
					<artifactId>maven-dependency-plugin</artifactId>
591 
					<version>${maven-dependency-plugin}</version>
592 
					<executions>
593 
						<execution>
594 
							<id>copy-dep</id>
595 
							<phase>package</phase>
596 
							<goals>
597 
								<goal>copy-dependencies</goal>
598 
							</goals>
599 
							<configuration>
600 
								<outputDirectory>${basedir}/src/main/webapp/WEB-INF/lib</outputDirectory>
601 
								<excludeScope>provided</excludeScope>
602 
								<excludeArtifactIds>junit</excludeArtifactIds>
603 
							</configuration>
604 
						</execution>
605 
					</executions>
606 
				</plugin>
607 
			</plugins>
608 
		</pluginManagement>
600 609
601 
        <outputDirectory>${basedir}/src/main/webapp/WEB-INF/classes</outputDirectory>
602 
		<plugins>
610 
		<plugins>
611 
			<plugin>
612 
				<groupId>org.springframework.boot</groupId>
613 
				<artifactId>spring-boot-maven-plugin</artifactId>
614 
				<version>1.2.1.RELEASE</version>
615 
				<configuration>
616 
					<mainClass>com.ai.server.ServerStart</mainClass>
617 
				</configuration>
618 
			</plugin>
603 619
604 
			<plugin>
605 
                <groupId>org.springframework.boot</groupId>
606 
                <artifactId>spring-boot-maven-plugin</artifactId>
607 
                <version>1.2.1.RELEASE</version>
608 
                <configuration>
609 
                <mainClass>com.ai.server.springboot.MainModule</mainClass>
610 
            </configuration>
611
612 
            </plugin>
613 
            <!-- 生成文件版本号和文件加密 -->
614 
            <plugin>
615 
                <groupId>org.codehaus.mojo</groupId>
616 
                <artifactId>exec-maven-plugin</artifactId>
617 
            </plugin>
620 
			<!-- 生成文件版本号和文件加密 -->
621 
			<!-- clean中间文件 -->
622 
			<plugin>
623 
				<artifactId>maven-clean-plugin</artifactId>
624 
			</plugin>
625 
			<!-- 复制资源 -->
626 
			<plugin>
627 
				<artifactId>maven-resources-plugin</artifactId>
628 
			</plugin>
629 
			<!-- 编译 -->
630 
			<plugin>
631 
				<artifactId>maven-compiler-plugin</artifactId>
632 
			</plugin>
633 
			<!-- 生成文件版本号和文件加密 -->
634 
			<plugin>
635 
				<groupId>org.codehaus.mojo</groupId>
636 
				<artifactId>exec-maven-plugin</artifactId>
637 
			</plugin>
638 
			<plugin>
639 
				<artifactId>maven-dependency-plugin</artifactId>
640 
			</plugin>
618 641 
		</plugins>
619 642
643 
		<outputDirectory>${basedir}/src/main/webapp/WEB-INF/classes</outputDirectory>
620 644 
		<finalName>display</finalName>
621 645 
	</build>
622
623
624 
    <repositories>
625 
        <repository>
626 
            <id>spring-milestone</id>
627 
            <url>http://repo.spring.io/libs-release</url>
628 
        </repository>
629 
        <repository>
630 
        <id>nexus-service-ipu-repository</id>
631 
			<name>nexus service ipu repository</name>
632 
			<url>http://114.215.100.48:9090/nexus/content/repositories/ipu/</url>
633 
        </repository>
634 
    </repositories>
635 646 
</project>

+ 0 - 525
display-server/pom.xml.boot.test
View File 

@ -1,525 +0,0 @@
1 
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2 
	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3 
	<modelVersion>4.0.0</modelVersion>
4
5 
	<parent>
6 
		<groupId>org.springframework.boot</groupId>
7 
		<artifactId>spring-boot-starter-parent</artifactId>
8 
		<!-- <version>1.2.1.RELEASE</version> -->
9 
		<version>1.4.0.RELEASE</version>
10 
	</parent>
11
12 
	<artifactId>display-server</artifactId>
13 
	<packaging>war</packaging>
14 
	<name>展示平台</name>
15 
	<description>3.0以后的展示平台工程全部支持Maven和Ant两种构建方式</description>
16
17 
	<!-- 定义公共变量 -->
18 
	<properties>
19 
		<encoding>UTF-8</encoding>
20 
		<java.version>1.7</java.version>
21 
		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
22 
		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
23 
		<!-- Central jar -->
24 
		<junit>3.8.1</junit>
25 
		<servlet-api>3.0-alpha-1</servlet-api>
26 
		<log4j>1.2.8</log4j>
27 
		<unirest-java>1.3.8</unirest-java>
28 
		<dom4j>1.6.1</dom4j>
29 
		<jaxen>1.1.1</jaxen>
30 
		<commons-lang3>3.4</commons-lang3>
31 
		<beetl-core>2.2.3</beetl-core>
32 
		<velocity>1.7</velocity>
33 
		<jsoup>1.7.2</jsoup>
34 
		<commons-fileupload>1.3.1</commons-fileupload>
35 
		<commons-dbcp>1.4</commons-dbcp>
36 
		<mysql-connector-java>5.1.39</mysql-connector-java>
37 
		<commons-codec>1.3</commons-codec>
38 
		<jdom>1.1.3</jdom>
39 
		<commons-collections>3.2</commons-collections>
40 
		<quartz-all>1.6.3</quartz-all>
41 
		<jta>1.1</jta>
42
43 
		<!-- 3rd party jar -->
44 
		<ojdbc>14</ojdbc>
45 
		<java_memcache-release>2.5.3</java_memcache-release>
46 
		<amail>1.0</amail>
47 
		<zxing>1.0</zxing>
48 
		<!-- ipu jar -->
49 
		<ipu>3.0</ipu>
50 
		<wade>1.0</wade>
51
52 
		<!-- 公共插件 -->
53 
		<maven-clean-plugin>3.0.0</maven-clean-plugin>
54 
		<maven-resources-plugin>3.0.1</maven-resources-plugin>
55 
		<maven-compiler-plugin>3.1</maven-compiler-plugin>
56 
		<compiler-version>1.6</compiler-version>
57 
		<maven-surefire-plugin>2.5</maven-surefire-plugin>
58 
		<maven-war-plugin>2.6</maven-war-plugin>
59 
		<exec-maven-plugin>1.5.0</exec-maven-plugin>
60 
		<maven-dependency-plugin>2.4</maven-dependency-plugin>
61
62 
		<start-class>com.ai.server.springboot.MainModule</start-class>
63 
	</properties>
64
65 
	<dependencies>
66 
		<!-- Central jar -->
67 
		<dependency>
68 
			<groupId>commons-collections</groupId>
69 
			<artifactId>commons-collections</artifactId>
70 
			<version>${commons-collections}</version>
71 
		</dependency>
72 
		<dependency>
73 
			<groupId>javax.transaction</groupId>
74 
			<artifactId>jta</artifactId>
75 
			<version>${jta}</version>
76 
		</dependency>
77 
		<dependency>
78 
			<groupId>opensymphony</groupId>
79 
			<artifactId>quartz-all</artifactId>
80 
			<version>${quartz-all}</version>
81 
		</dependency>
82 
		<dependency>
83 
			<groupId>junit</groupId>
84 
			<artifactId>junit</artifactId>
85 
			<version>${junit}</version>
86 
			<scope>test</scope>
87 
		</dependency>
88 
		<dependency>
89 
			<groupId>javax.servlet</groupId>
90 
			<artifactId>servlet-api</artifactId>
91 
			<version>${servlet-api}</version>
92 
			<scope>provided</scope>
93 
		</dependency>
94 
		<dependency>
95 
			<groupId>org.apache.commons</groupId>
96 
			<artifactId>commons-lang3</artifactId>
97 
			<version>${commons-lang3}</version>
98 
		</dependency>
99 
		<dependency>
100 
			<groupId>log4j</groupId>
101 
			<artifactId>log4j</artifactId>
102 
			<version>${log4j}</version>
103 
		</dependency>
104 
		<dependency>
105 
			<groupId>dom4j</groupId>
106 
			<artifactId>dom4j</artifactId>
107 
			<version>${dom4j}</version>
108 
		</dependency>
109 
		<dependency>
110 
			<groupId>jaxen</groupId>
111 
			<artifactId>jaxen</artifactId>
112 
			<version>${jaxen}</version>
113 
		</dependency>
114 
		<dependency>
115 
			<groupId>com.mashape.unirest</groupId>
116 
			<artifactId>unirest-java</artifactId>
117 
			<version>${unirest-java}</version>
118 
		</dependency>
119 
		<dependency>
120 
			<groupId>org.beetl</groupId>
121 
			<artifactId>beetl-core</artifactId>
122 
			<version>${beetl-core}</version>
123 
		</dependency>
124 
		<dependency>
125 
			<groupId>org.apache.velocity</groupId>
126 
			<artifactId>velocity</artifactId>
127 
			<version>${velocity}</version>
128 
		</dependency>
129 
		<dependency>
130 
			<groupId>org.jsoup</groupId>
131 
			<artifactId>jsoup</artifactId>
132 
			<version>${jsoup}</version>
133 
		</dependency>
134 
		<dependency>
135 
			<groupId>commons-fileupload</groupId>
136 
			<artifactId>commons-fileupload</artifactId>
137 
			<version>${commons-fileupload}</version>
138 
		</dependency>
139 
		<dependency>
140 
			<groupId>commons-dbcp</groupId>
141 
			<artifactId>commons-dbcp</artifactId>
142 
			<version>${commons-dbcp}</version>
143 
		</dependency>
144 
		<dependency>
145 
			<groupId>mysql</groupId>
146 
			<artifactId>mysql-connector-java</artifactId>
147 
			<version>${mysql-connector-java}</version>
148 
		</dependency>
149 
		<dependency>
150 
			<groupId>commons-codec</groupId>
151 
			<artifactId>commons-codec</artifactId>
152 
			<version>${commons-codec}</version>
153 
		</dependency>
154
155 
		<!-- 3rd party jar -->
156 
		<dependency>
157 
			<groupId>com</groupId>
158 
			<artifactId>java_memcache-release</artifactId>
159 
			<version>${java_memcache-release}</version>
160 
		</dependency>
161 
		<dependency>
162 
			<groupId>com.amail</groupId>
163 
			<artifactId>amail</artifactId>
164 
			<version>${amail}</version>
165 
		</dependency>
166 
		<dependency>
167 
			<groupId>com.zxing</groupId>
168 
			<artifactId>zxing</artifactId>
169 
			<version>${zxing}</version>
170 
		</dependency>
171 
		<dependency>
172 
			<groupId>ojdbc</groupId>
173 
			<artifactId>ojdbc</artifactId>
174 
			<version>${ojdbc}</version>
175 
		</dependency>
176
177 
		<!-- ipu jar -->
178 
		<dependency>
179 
			<groupId>com.ai.ipu</groupId>
180 
			<artifactId>ipu-basic</artifactId>
181 
			<version>${ipu}</version>
182 
		</dependency>
183 
		<dependency>
184 
			<groupId>com.ai.ipu</groupId>
185 
			<artifactId>ipu-common</artifactId>
186 
			<version>${ipu}</version>
187 
		</dependency>
188 
		<dependency>
189 
			<groupId>com.ai.ipu</groupId>
190 
			<artifactId>ipu-database</artifactId>
191 
			<version>${ipu}</version>
192 
		</dependency>
193 
		<dependency>
194 
			<groupId>com.ai.ipu</groupId>
195 
			<artifactId>ipu-remote-clinet</artifactId>
196 
			<version>${ipu}</version>
197 
		</dependency>
198 
		<dependency>
199 
			<groupId>com.ai.ipu</groupId>
200 
			<artifactId>ipu-server-web</artifactId>
201 
			<version>${ipu}</version>
202 
		</dependency>
203 
		<dependency>
204 
			<groupId>com.ai.ipu</groupId>
205 
			<artifactId>ipu-file-system</artifactId>
206 
			<version>${ipu}</version>
207 
		</dependency>
208
209 
		<dependency>
210 
			<!-- 不推荐使用，推荐使用wade-mobile-data -->
211 
			<groupId>com.ai.wade</groupId>
212 
			<artifactId>wade-data</artifactId>
213 
			<version>${wade}</version>
214 
		</dependency>
215 
		<dependency>
216 
			<!-- 不依赖其他jar -->
217 
			<groupId>com.ai.wade</groupId>
218 
			<artifactId>wade-mobile-data</artifactId>
219 
			<version>${wade}</version>
220 
		</dependency>
221 
		<dependency>
222 
			<!-- commons-collections-3.2.jar,quartz-all-1.6.3.jar,jdom1.0.jar,wade-apache,wade-common,wade-mobile-data -->
223 
			<groupId>com.ai.wade</groupId>
224 
			<artifactId>wade-cache</artifactId>
225 
			<version>${wade}</version>
226 
		</dependency>
227 
		<dependency>
228 
			<groupId>com.ai.wade</groupId>
229 
			<artifactId>wade-apache</artifactId>
230 
			<version>${wade}</version>
231 
		</dependency>
232 
		<dependency>
233 
			<groupId>com.ai.wade</groupId>
234 
			<artifactId>wade-common</artifactId>
235 
			<version>${wade}</version>
236 
		</dependency>
237 
		<dependency>
238 
			<!-- commons-dbcp-1.4.jar,dom4j-1.6.1.jar,jaxen-1.1.1.jar,jta.jar,ojdbc14.jar,mysql-connector-5.1.39.jar,wade-apache,wade-cache,wade-common,wade-mobile-data -->
239 
			<groupId>com.ai.wade</groupId>
240 
			<artifactId>wade-database</artifactId>
241 
			<version>${wade}</version>
242 
		</dependency>
243 
		<dependency>
244 
			<groupId>com.ai.wade</groupId>
245 
			<artifactId>wade-sqlite-jdbc</artifactId>
246 
			<version>${wade}</version>
247 
		</dependency>
248 
		<dependency>
249 
			<!-- ipu-basic,ipu-server-web,wade-apache,wade-cache,wade-common,wade-database,wade-mobile-data -->
250 
			<groupId>com.ai.wade</groupId>
251 
			<artifactId>wade-codecode</artifactId>
252 
			<version>${wade}</version>
253 
		</dependency>
254
255 
		<dependency>
256 
			<groupId>org.springframework.boot</groupId>
257 
			<artifactId>spring-boot-starter-web</artifactId>
258 
		</dependency>
259
260 
		<!-- 使用jetty容器 -->
261 
		<!-- <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-web</artifactId>
262 
			<exclusions> <exclusion> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-tomcat</artifactId>
263 
			</exclusion> </exclusions> </dependency> <dependency> <groupId>org.springframework.boot</groupId>
264 
			<artifactId>spring-boot-starter-jetty</artifactId> </dependency> -->
265 
		<dependency>
266 
			<groupId>org.springframework.boot</groupId>
267 
			<artifactId>spring-boot-starter-tomcat</artifactId>
268 
			<scope>provided</scope>
269 
		</dependency>
270
271 
		<dependency>
272 
			<groupId>org.springframework.boot</groupId>
273 
			<artifactId>spring-boot-starter-test</artifactId>
274 
		</dependency>
275
276 
		<dependency>
277 
			<groupId>org.springframework.boot</groupId>
278 
			<artifactId>spring-boot-maven-plugin</artifactId>
279 
			<version>1.4.0.BUILD-SNAPSHOT</version>
280 
		</dependency>
281
282 
	</dependencies>
283
284 
	<build>
285 
		<plugins>
286 
			<!-- 默认插件，不引入也可使用 -->
287 
			<!-- 默认jre编译版本:1.6 -->
288 
			<plugin>
289 
				<groupId>org.apache.maven.plugins</groupId>
290 
				<artifactId>maven-compiler-plugin</artifactId>
291 
				<version>${maven-compiler-plugin}</version>
292 
				<configuration>
293 
					<source>${compiler-version}</source>
294 
					<target>${compiler-version}</target>
295 
					<encoding>${encoding}</encoding>
296 
				</configuration>
297 
			</plugin>
298 
			<!-- war包去除servlet-api的jar包 -->
299 
			<!-- <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-war-plugin</artifactId>
300 
				<version>${maven-war-plugin}</version> <configuration> servlet-api相关jar不打包,前面的scope=provided已解决
301 
				<packagingExcludes> WEB-INF/lib/servlet-api*.jar </packagingExcludes> <webResources>
302 
				<resource> <directory>${jar-path}</directory> <includes> <include>*.jar</include>
303 
				</includes> <targetPath>WEB-INF/lib</targetPath> </resource> </webResources>
304 
				</configuration> </plugin> -->
305 
			<!-- 跳过单元测试 -->
306 
			<plugin>
307 
				<groupId>org.apache.maven.plugins</groupId>
308 
				<artifactId>maven-surefire-plugin</artifactId>
309 
				<version>${maven-surefire-plugin}</version>
310 
				<configuration>
311 
					<!-- 跳过单元测试 -->
312 
					<skip>true</skip>
313 
				</configuration>
314 
			</plugin>
315 
			<!-- clean中间文件 -->
316 
			<plugin>
317 
				<artifactId>maven-clean-plugin</artifactId>
318 
				<version>${maven-clean-plugin}</version>
319 
				<executions>
320 
					<execution>
321 
						<id>clean-all</id>
322 
						<phase>clean</phase>
323 
						<goals>
324 
							<goal>clean</goal>
325 
						</goals>
326 
						<configuration>
327 
							<filesets>
328 
								<fileset>
329 
									<directory>${basedir}/src/main/webapp/encrypt</directory>
330 
									<includes>
331 
										<include>**/*</include>
332 
									</includes>
333 
								</fileset>
334 
								<fileset>
335 
									<directory>${basedir}/src/main/webapp</directory>
336 
									<includes>
337 
										<include>res.version.properties</include>
338 
									</includes>
339 
								</fileset>
340 
								<fileset>
341 
									<directory>${basedir}/src/main/webapp/template/lua</directory>
342 
									<includes>
343 
										<include>**/*</include>
344 
									</includes>
345 
								</fileset>
346 
							</filesets>
347 
						</configuration>
348 
					</execution>
349 
					<!-- 打包之前clean掉明文配置文件 -->
350 
					<execution>
351 
						<id>clean-config</id>
352 
						<phase>prepare-package</phase><!-- 打包之前 -->
353 
						<goals>
354 
							<goal>clean</goal>
355 
						</goals>
356 
						<configuration>
357 
							<excludeDefaultDirectories>true</excludeDefaultDirectories>
358 
							<filesets>
359 
								<fileset>
360 
									<directory>${basedir}/src/main/webapp/template</directory>
361 
									<includes>
362 
										<include>server-config.xml</include>
363 
										<include>server-data.xml</include>
364 
										<include>server-page.xml</include>
365 
									</includes>
366 
								</fileset>
367 
							</filesets>
368 
						</configuration>
369 
					</execution>
370 
				</executions>
371 
			</plugin>
372 
			<!-- 复制资源 -->
373 
			<plugin>
374 
				<artifactId>maven-resources-plugin</artifactId>
375 
				<version>${maven-resources-plugin}</version>
376 
				<configuration>
377 
					<encoding>${encoding}</encoding>
378 
					<delimiters>
379 
						<delimiter>${resource.delimiter}</delimiter>
380 
					</delimiters>
381 
					<useDefaultDelimiters>false</useDefaultDelimiters>
382 
				</configuration>
383 
				<executions>
384 
					<execution>
385 
						<id>copy-config</id>
386 
						<phase>process-resources</phase><!-- 编译之前处理文件 -->
387 
						<goals>
388 
							<goal>copy-resources</goal>
389 
						</goals>
390 
						<configuration>
391 
							<outputDirectory>${basedir}/src/main/webapp/template</outputDirectory>
392 
							<resources>
393 
								<resource>
394 
									<directory>${basedir}/src/main/resources</directory>
395 
									<includes>
396 
										<include>server-config.xml</include>
397 
										<include>server-data.xml</include>
398 
										<include>server-page.xml</include>
399 
									</includes>
400 
								</resource>
401 
							</resources>
402 
						</configuration>
403 
					</execution>
404 
					<execution>
405 
						<id>copy-lua</id>
406 
						<phase>process-resources</phase>
407 
						<goals>
408 
							<goal>copy-resources</goal>
409 
						</goals>
410 
						<configuration>
411 
							<outputDirectory>${basedir}/src/main/webapp/template/lua</outputDirectory>
412 
							<resources>
413 
								<resource>
414 
									<directory>${basedir}/src/main/resources/lua</directory>
415 
								</resource>
416 
							</resources>
417 
						</configuration>
418 
					</execution>
419 
				</executions>
420 
			</plugin>
421 
			<!-- 生成文件版本号和文件加密 -->
422 
			<plugin>
423 
				<groupId>org.codehaus.mojo</groupId>
424 
				<artifactId>exec-maven-plugin</artifactId>
425 
				<version>${exec-maven-plugin}</version>
426 
				<executions>
427 
					<execution>
428 
						<id>res-encrypt</id>
429 
						<phase>test</phase>
430 
						<goals>
431 
							<goal>java</goal>
432 
						</goals>
433 
						<configuration>
434 
							<classpathScope>compile</classpathScope>
435 
							<includeProjectDependencies>true</includeProjectDependencies>
436 
							<mainClass>com.ai.ipu.server.tool.FileEncryptToolMaven</mainClass>
437 
							<arguments>
438 
								<argument>src/main/webapp/</argument>
439 
								<argument>false</argument>
440 
								<argument></argument>
441 
							</arguments>
442 
						</configuration>
443 
					</execution>
444 
					<execution>
445 
						<id>res-version</id>
446 
						<phase>prepare-package</phase>
447 
						<goals>
448 
							<goal>java</goal>
449 
						</goals>
450 
						<configuration>
451 
							<classpathScope>compile</classpathScope>
452 
							<includeProjectDependencies>true</includeProjectDependencies>
453 
							<mainClass>com.ai.ipu.server.tool.VersionToolMaven</mainClass>
454 
							<arguments>
455 
								<argument>src/main/webapp/</argument>
456 
								<argument>false</argument>
457 
								<argument>upload|setup|.gitignore|.DS_Store</argument>
458 
							</arguments>
459 
						</configuration>
460 
					</execution>
461 
					<execution>
462 
						<configuration>
463 
							<mainClass>${start-class}</mainClass>
464 
						</configuration>
465 
					</execution>
466 
				</executions>
467 
			</plugin>
468 
			<plugin>
469 
				<groupId>org.apache.maven.plugins</groupId>
470 
				<artifactId>maven-dependency-plugin</artifactId>
471 
				<version>${maven-dependency-plugin}</version>
472 
				<executions>
473 
					<execution>
474 
						<id>copy-dep</id>
475 
						<phase>package</phase>
476 
						<goals>
477 
							<goal>copy-dependencies</goal>
478 
						</goals>
479 
						<configuration>
480 
							<outputDirectory>${basedir}/src/main/webapp/WEB-INF/lib</outputDirectory>
481 
							<excludeScope>provided</excludeScope>
482 
							<excludeArtifactIds>junit</excludeArtifactIds>
483 
						</configuration>
484 
					</execution>
485 
				</executions>
486 
			</plugin>
487
488 
			<!-- boot插件 -->
489 
			<plugin>
490 
				<groupId>org.springframework.boot</groupId>
491 
				<artifactId>spring-boot-maven-plugin</artifactId>
492 
				<configuration>
493 
					<mainClass>${start-class}</mainClass>
494 
				</configuration>
495 
			</plugin>
496 
		</plugins>
497
498 
		<outputDirectory>${basedir}/src/main/webapp/WEB-INF/classes</outputDirectory>
499
500 
		<finalName>display</finalName>
501 
	</build>
502
503 
	<repositories>
504 
		<repository>
505 
			<id>spring-libs-release</id>
506 
			<url>http://repo.spring.io/libs-release</url>
507 
		</repository>
508 
		<repository>
509 
			<id>spring-boot</id>
510 
			<url>http://projects.spring.io/spring-boot/</url>
511 
		</repository>
512 
		<repository>
513 
			<id>spring-snapshots</id>
514 
			<url>http://repo.spring.io/snapshot</url>
515 
			<snapshots>
516 
				<enabled>true</enabled>
517 
			</snapshots>
518 
		</repository>
519 
		<repository>
520 
			<id>spring-milestones</id>
521 
			<url>http://repo.spring.io/milestone</url>
522 
		</repository>
523 
	</repositories>
524
525 
</project>

+ 157 - 0
display-server/pom.xml.tomcat
View File 

@ -0,0 +1,157 @@
1 
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2 
	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3 
	<modelVersion>4.0.0</modelVersion>
4
5 
	<parent>
6 
		<groupId>com.ai.ipu</groupId>
7 
		<artifactId>ipu-server-libs</artifactId>
8 
		<version>3.0</version>
9 
	</parent>
10
11 
	<artifactId>display-server</artifactId>
12 
	<packaging>war</packaging>
13 
	<name>展示平台</name>
14 
	<description>3.0以后的展示平台工程全部支持Maven和Ant两种构建方式</description>
15
16 
	<dependencies>
17 
		<!-- 公共必选依赖 -->
18 
		<!-- Central jar -->
19 
		<dependency>
20 
			<groupId>junit</groupId>
21 
			<artifactId>junit</artifactId>
22 
		</dependency>
23 
		<dependency>
24 
			<groupId>javax.servlet</groupId>
25 
			<artifactId>servlet-api</artifactId>
26 
		</dependency>
27 
		<dependency>
28 
			<groupId>org.apache.commons</groupId>
29 
			<artifactId>commons-lang3</artifactId>
30 
		</dependency>
31 
		<dependency>
32 
			<groupId>log4j</groupId>
33 
			<artifactId>log4j</artifactId>
34 
		</dependency>
35 
		<dependency>
36 
			<groupId>dom4j</groupId>
37 
			<artifactId>dom4j</artifactId>
38 
		</dependency>
39 
		<dependency>
40 
			<groupId>jaxen</groupId>
41 
			<artifactId>jaxen</artifactId>
42 
		</dependency>
43 
		<dependency>
44 
			<groupId>com.mashape.unirest</groupId>
45 
			<artifactId>unirest-java</artifactId>
46 
		</dependency>
47 
		<dependency>
48 
			<groupId>org.beetl</groupId>
49 
			<artifactId>beetl-core</artifactId>
50 
		</dependency>
51 
		<dependency>
52 
			<groupId>org.apache.velocity</groupId>
53 
			<artifactId>velocity</artifactId>
54 
		</dependency>
55 
		<!-- 3rd party jar -->
56 
		<dependency>
57 
			<groupId>com</groupId>
58 
			<artifactId>java_memcache-release</artifactId>
59 
		</dependency>
60 
		<!-- ipu jar -->
61 
		<dependency>
62 
			<groupId>com.ai.ipu</groupId>
63 
			<artifactId>ipu-basic</artifactId>
64 
		</dependency>
65 
		<dependency>
66 
			<groupId>com.ai.ipu</groupId>
67 
			<artifactId>ipu-common</artifactId>
68 
		</dependency>
69 
		<dependency>
70 
			<groupId>com.ai.ipu</groupId>
71 
			<artifactId>ipu-server-web</artifactId>
72 
		</dependency>
73 
		<dependency>
74 
			<groupId>com.ai.ipu</groupId>
75 
			<artifactId>ipu-spring-boot</artifactId>
76 
		</dependency>
77 
		<dependency>
78 
			<groupId>com.ai.ipu</groupId>
79 
			<artifactId>ipu-file-system</artifactId>
80 
		</dependency>
81 
		<dependency>
82 
			<groupId>com.ai.wade</groupId>
83 
			<artifactId>wade-data</artifactId>
84 
		</dependency>
85 
		<dependency>
86 
			<groupId>com.ai.wade</groupId>
87 
			<artifactId>wade-cache</artifactId>
88 
		</dependency>
89 
		<dependency>
90 
			<groupId>com.ai.wade</groupId>
91 
			<artifactId>wade-database</artifactId>
92 
		</dependency>
93 
		<dependency>
94 
			<groupId>com.ai.wade</groupId>
95 
			<artifactId>wade-apache</artifactId>
96 
		</dependency>
97 
		<dependency>
98 
			<groupId>com.ai.wade</groupId>
99 
			<artifactId>wade-common</artifactId>
100 
		</dependency>
101 
		<dependency>
102 
			<groupId>com.ai.wade</groupId>
103 
			<artifactId>wade-sqlite-jdbc</artifactId>
104 
		</dependency>
105
106 
		<!-- 公共可选依赖 -->
107 
		<dependency>
108 
			<groupId>org.jsoup</groupId>
109 
			<artifactId>jsoup</artifactId>
110 
		</dependency>
111 
		<dependency>
112 
			<groupId>commons-dbcp</groupId>
113 
			<artifactId>commons-dbcp</artifactId>
114 
		</dependency>
115 
		<dependency>
116 
			<groupId>mysql</groupId>
117 
			<artifactId>mysql-connector-java</artifactId>
118 
		</dependency>
119 
		<dependency>
120 
			<groupId>commons-fileupload</groupId>
121 
			<artifactId>commons-fileupload</artifactId>
122 
		</dependency>
123 
		<dependency>
124 
			<groupId>commons-codec</groupId>
125 
			<artifactId>commons-codec</artifactId>
126 
		</dependency>
127 
		<!-- 额外依赖 -->
128
129 
	</dependencies>
130
131 
	<build>
132 
		<plugins>
133 
			<!-- clean中间文件 -->
134 
			<plugin>
135 
				<artifactId>maven-clean-plugin</artifactId>
136 
			</plugin>
137 
			<!-- 复制资源 -->
138 
			<plugin>
139 
				<artifactId>maven-resources-plugin</artifactId>
140 
			</plugin>
141 
			<!-- 编译 -->
142 
			<plugin>
143 
				<artifactId>maven-compiler-plugin</artifactId>
144 
			</plugin>
145 
			<!-- 生成文件版本号和文件加密 -->
146 
			<plugin>
147 
				<groupId>org.codehaus.mojo</groupId>
148 
				<artifactId>exec-maven-plugin</artifactId>
149 
			</plugin>
150 
			<plugin>
151 
				<artifactId>maven-dependency-plugin</artifactId>
152 
			</plugin>
153 
		</plugins>
154
155 
		<finalName>display</finalName>
156 
	</build>
157 
</project>

+ 10 - 0
display-server/src/main/java/com/ai/server/ServerStart.java
View File 

@ -0,0 +1,10 @@
1 
package com.ai.server;
2
3 
import com.ai.ipu.springboot.MainModule;
4
5 
public class ServerStart {
6
7 
	public static void main(String[] args) {
8 
		MainModule.start(args);
9 
	}
10 
}

+ 0 - 17
display-server/src/main/java/com/ai/server/springboot/DefaultFilter.java
View File 

@ -1,17 +0,0 @@
1 
package com.ai.server.springboot;
2
3 
import org.springframework.context.annotation.Configuration;
4 
import org.springframework.core.Ordered;
5 
import org.springframework.web.servlet.config.annotation.ViewControllerRegistry;
6 
import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
7
8 
@Configuration
9 
public class DefaultFilter extends WebMvcConfigurerAdapter{
10 
    @Override
11 
    public void addViewControllers( ViewControllerRegistry registry ) {
12 
        registry.addViewController( "/" ).setViewName( "forward:/mobile" );
13 
        registry.setOrder( Ordered.HIGHEST_PRECEDENCE );
14
15 
        super.addViewControllers( registry );
16 
    }
17 
}

+ 0 - 65
display-server/src/main/java/com/ai/server/springboot/MainModule.java
View File 

@ -1,65 +0,0 @@
1 
package com.ai.server.springboot;
2
3 
import org.springframework.boot.SpringApplication;
4 
import org.springframework.boot.autoconfigure.SpringBootApplication;
5 
import org.springframework.boot.web.servlet.FilterRegistrationBean;
6 
import org.springframework.boot.web.servlet.ServletRegistrationBean;
7 
import org.springframework.context.annotation.Bean;
8
9
10 
@SpringBootApplication
11 
public class MainModule {
12
13
14 
	@Bean
15 
	public ServletRegistrationBean getMobile(){
16
17 
	  //用ServletRegistrationBean包装servlet
18 
	  ServletRegistrationBean registrationBean
19 
	      = new ServletRegistrationBean(new com.ai.ipu.server.servlet.MobileUiServlet());
20 
	  registrationBean.setLoadOnStartup(0);
21 
	  //指定urlmapping
22 
	  registrationBean.addUrlMappings("/mobile/*");
23 
	  //指定name，如果不指定默认为dispatcherServlet
24 
	  registrationBean.setName("mobile");
25 
	  return registrationBean;
26 
	}
27
28 
	@Bean
29 
	public ServletRegistrationBean getMobiledata(){
30
31 
	  //用ServletRegistrationBean包装servlet
32 
	  ServletRegistrationBean registrationBean
33 
	      = new ServletRegistrationBean(new com.ai.ipu.server.servlet.MobileDataServlet());
34 
	  registrationBean.setLoadOnStartup(1);
35 
	  //指定urlmapping
36 
	  registrationBean.addUrlMappings("/mobiledata/*");
37 
	  //指定name，如果不指定默认为dispatcherServlet
38 
	  registrationBean.setName("mobiledata");
39 
	  return registrationBean;
40 
	}
41
42 
	@Bean
43 
    public FilterRegistrationBean indexFilterRegistration() {
44 
        FilterRegistrationBean registration = new FilterRegistrationBean();
45 
        com.ai.ipu.server.servlet.MobileFilter filter = new com.ai.ipu.server.servlet.MobileFilter();
46 
        registration.setFilter(filter);
47 
        registration.addUrlPatterns("/mobile");
48 
        registration.addUrlPatterns("/mobiledata");
49
50 
        return registration;
51 
    }
52
53 
	/*@Bean
54 
    public ServletListenerRegistrationBean servletListenerRegistrationBean(){
55 
        ServletListenerRegistrationBean servletListenerRegistrationBean = new ServletListenerRegistrationBean();
56 
        servletListenerRegistrationBean.setListener(new IndexListener());
57 
        return servletListenerRegistrationBean;
58 
    }*/
59
60 
	public static void main(String[] args) {
61 
		// TODO Auto-generated method stub
62 
		SpringApplication.run(MainModule.class, args);
63 
	}
64
65 
}

+ 10 - 12
display-server/src/main/resources/application.properties
View File 

@ -2,21 +2,19 @@
2 2 
#也可以通过启动命令行参数实现：java -jar myproject.jar --server.port=9084
3 3 
server.port=unknown
4 4
5 
SERVER_TYPE=embedded-tomcat
6 
#SERVER_TYPE=
7 
templateRoot=/home/aiosc/web/
8 
#templateRoot=e:/temp/display/
9
5 
is.spring.boot=false
6 
#web.root的配置只在开发态生效。运行态时，file:${web.root}根据war包安装路径动态生成
7 
web.root=src/main/webapp/
10 8 
spring.mvc.static-path-pattern=/**
11 
spring.resources.static-locations=classpath:/static/,file:${templateRoot}
9 
spring.resources.static-locations=classpath:/static/,file:${web.root}
12 10
13 
server.context-path=/display-server
14 
#server.servlet-path=/display-server
15 
spring.application.name=display-server
16 
spring.application.index=display-server
17 11
12 
server.context-path=/display
13 
spring.application.name=display
14 
spring.application.index=display
15 
#server.servlet-path=/display
18 16
19 
logging.file=/home/aiosc/logs/display.log
17 
logging.file=/home/aiosc/logs/display.log
20 18
21 19 
#spring.view.prefix=/jsp/
22 
#spring.view.suffix=.jsp
20 
#spring.view.suffix=.jsp

+ 4 - 3
display-server/src/main/resources/banner.txt
View File 

@ -1,3 +1,4 @@
1 
spring boot 开始跑起来了
2 
${application.formatted-version}
3 
${spring-boot.formatted-version}
1 
======================
2 
IPU service is running
3 
${spring-boot.formatted-version}
4 
======================

+ 1 - 0
ipu-plugin-basic/src/main/java/com/ai/ipu/mobile/plugin/MobileUI.java
View File 

@ -266,6 +266,7 @@ public class MobileUI extends Plugin {
266 266 
					}
267 267
268 268 
					((TemplateWebView) getWebView()).loadTemplate(templatePath, data);
269 
					ipumobile.getFlipperLayout().refreshTag(getWebView(), pageAction);
269 270 
				} catch (Exception e) {
270 271 
					IpuMobileLog.e(TAG, e.getMessage(), e);
271 272 
					HintUtil.tip(ipumobile.getActivity(), e.getMessage());