增加本地jar依赖，调整工程pom关系，使其符合模块化设计

.gitignore

@@ -0,0 +1,4 @@
+.idea
+
+target/
+

README.md

@@ -2,3 +2,9 @@
 2: u/p mlxt_test /Tj2020
 3: my.cnf lower_case_table_names=1 
 4: cgw.sql需要导入3遍才能成功
+
+
+# 模块说明
+- cn.com.taiji.dependencies  可废弃，已将内容移植至根目录pom文件中
+- cn.com.taiji.myapp、security、sys、system均已将parent指向根目录pom文件
+

blue_theme/pom.xml

@@ -1,17 +1,31 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.sonatype.oss</groupId>
-        <artifactId>oss-parent</artifactId>
-        <version>7</version>
-    </parent>
   <groupId>org.webjars</groupId>
   <artifactId>blue_theme</artifactId>
   <packaging>jar</packaging>
   <name>blue_theme</name>
   <url>http://webjars.org</url>
-  <dependencies>
+
+    <parent>
+        <groupId>cn.com.taiji</groupId>
+        <artifactId>cn.com.taiji.zyml</artifactId>
+        <version>1.0.0</version>
+    </parent>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.sonatype.oss</groupId>
+                <artifactId>oss-parent</artifactId>
+                <version>7</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+    <dependencies>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>

cn.com.taiji.myapp/pom.xml

@@ -4,18 +4,19 @@
 	<groupId>cn.com.taiji</groupId>
 	<artifactId>cn.com.taiji.myapp</artifactId>
 	<version>1.0.0-SNAPSHOT</version>
-	<packaging>war</packaging>
+	<packaging>jar</packaging>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<java.version>1.7</java.version>
+		<java.version>1.8</java.version>
 		<maven.compiler.plugin.version>3.1</maven.compiler.plugin.version>
 		<start-class>cn.com.taiji.Application</start-class>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 	</properties>
+
 	<parent>
-		<groupId>io.spring.platform</groupId>
-		<artifactId>platform-bom</artifactId>
-		<version>Brussels-SR6</version>
+		<groupId>cn.com.taiji</groupId>
+		<artifactId>cn.com.taiji.zyml</artifactId>
+		<version>1.0.0</version>
 	</parent>
 
 	<dependencyManagement>
@@ -26,36 +27,31 @@
 			    <artifactId>jsoup</artifactId>
 			    <version>1.11.3</version>
 			</dependency>
-		
-			<dependency>
-				<groupId>cn.com.taiji</groupId>
-				<artifactId>cn.com.taiji.dependencies</artifactId>
-				<version>1.0.2</version>
-				<type>pom</type>
-				<scope>import</scope>
-			</dependency>
-			
 		</dependencies>
 	</dependencyManagement>
 	<dependencies>
+		<dependency>
+			<groupId>org.jsoup</groupId>
+			<artifactId>jsoup</artifactId>
+		</dependency>
 	<dependency>
         <groupId>com.github.ulisesbocchio</groupId>
         <artifactId>jasypt-spring-boot-starter</artifactId>
         <version>1.9</version>
-</dependency>
-<!-- https://mvnrepository.com/artifact/org.jasypt/jasypt -->
-<dependency>
-    <groupId>org.jasypt</groupId>
-    <artifactId>jasypt</artifactId>
-    <version>1.9.2</version>
-</dependency>
+	</dependency>
+	<!-- https://mvnrepository.com/artifact/org.jasypt/jasypt -->
+	<dependency>
+		<groupId>org.jasypt</groupId>
+		<artifactId>jasypt</artifactId>
+		<version>1.9.2</version>
+	</dependency>
 
 
 	   <!-- 添加redis支持-->
         <dependency>
-    <groupId>org.springframework.boot</groupId>
-    <artifactId>spring-boot-starter-data-redis</artifactId>
-</dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-data-redis</artifactId>
+		</dependency>
 <!-- <dependency> -->
 <!--     <groupId>org.springframework.session</groupId> -->
 <!--     <artifactId>spring-session-data-redis</artifactId> -->
@@ -225,10 +221,10 @@
 			<artifactId>mysql-connector-java</artifactId>
 			<version>8.0.23</version><!--$NO-MVN-MAN-VER$-->
 		</dependency>
-		<dependency>
-			<groupId>com.oracle</groupId>
-			<artifactId>ojdbc6</artifactId>
-		</dependency>
+<!--		<dependency>-->
+<!--			<groupId>com.oracle</groupId>-->
+<!--			<artifactId>ojdbc6</artifactId>-->
+<!--		</dependency>-->
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-actuator</artifactId>

cn.com.taiji.myapp/src/main/java/cn/com/taiji/Test.java

@@ -1,65 +0,0 @@
-package cn.com.taiji;
-
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.http.HttpEntity;
-import org.apache.http.HttpResponse;
-import org.apache.http.NameValuePair;
-import org.apache.http.client.ClientProtocolException;
-import org.apache.http.client.HttpClient;
-import org.apache.http.client.config.RequestConfig;
-import org.apache.http.client.entity.UrlEncodedFormEntity;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.impl.client.DefaultHttpClient;
-import org.apache.http.message.BasicNameValuePair;
-import org.apache.http.util.EntityUtils;
-import org.jasypt.util.text.BasicTextEncryptor;
-
-//import org.jasypt.util.text.BasicTextEncryptor;
-//
-public class Test {
-	public static void main(String[] args) throws ClientProtocolException, IOException {
-        BasicTextEncryptor textEncryptor = new BasicTextEncryptor();
-        //加密所需的salt(盐)
-        textEncryptor.setPassword("123456");
-        //要加密的数据（数据库的用户名或密码）
-        String username = textEncryptor.encrypt("tj_mlxt");
-        String password = textEncryptor.encrypt("TJmlxt@27");
-        System.out.println("username:"+username);
-        System.out.println("password:"+password);
-        System.out.println(""+textEncryptor.decrypt(username));
-
-//        List<NameValuePair> formparams = new ArrayList<NameValuePair>();
-//        // 所传参数
-//        formparams.add(new BasicNameValuePair("parentCode", "0"));
-//        formparams.add(new BasicNameValuePair("page", "1"));
-//        formparams.add(new BasicNameValuePair("size", "10"));
-//        HttpEntity reqEntity = new UrlEncodedFormEntity(formparams, "utf-8");  
-//    
-//        RequestConfig requestConfig = RequestConfig.custom()  
-//        .setConnectTimeout(5000)//一、连接超时：connectionTimeout-->指的是连接一个url的连接等待时间  
-//                .setSocketTimeout(5000)// 二、读取数据超时：SocketTimeout-->指的是连接上一个url，获取response的返回等待时间  
-//                .setConnectionRequestTimeout(5000)  
-//                .build();  
-//    
-//        HttpClient client = new DefaultHttpClient();  
-//        //采用post方式请求url
-//        HttpPost post = new HttpPost("http://47.106.11.241:9999/api/getOrganList");  
-//        post.setEntity(reqEntity);  
-//        post.setConfig(requestConfig);  
-//        HttpResponse response = client.execute(post);  
-//    
-//        if (response.getStatusLine().getStatusCode() == 200) {  
-//            HttpEntity resEntity = response.getEntity();  
-//            //此message为访问后的结果
-//            String message = EntityUtils.toString(resEntity, "utf-8");  
-//            System.out.println(message);  
-//        } else {  
-//            System.out.println("请求失败");  
-//        }
-    }
-}
-

cn.com.taiji.myapp/src/main/resources/application.properties

@@ -1,12 +1,18 @@
 database_type=mysql
 spring.thymeleaf.cache=false
-spring.datasource.url=jdbc:mysql://200.1.54.238:13306/zyml?useUnicode=true&characterEncoding=utf-8&useSSL=false
-spring.datasource.username=cgw
-spring.datasource.password=Cgw!1@2#3$4
+#spring.datasource.url=jdbc:mysql://200.1.54.238:13306/zyml?useUnicode=true&characterEncoding=utf-8&useSSL=false
+#spring.datasource.username=cgw
+#spring.datasource.password=Cgw!1@2#3$4
+spring.datasource.url=jdbc:mysql://127.0.0.1:9088/tjcgwzyml?useUnicode=true&characterEncoding=utf-8&useSSL=false
+spring.datasource.username=root
+spring.datasource.password=umisoft.cn
 spring.datasource.driverClassName=com.mysql.cj.jdbc.Driver
-spring.datasource2.url=jdbc:mysql://200.1.54.238:13306/zyml?useUnicode=true&characterEncoding=utf-8&useSSL=false
-spring.datasource2.username=cgw
-spring.datasource2.password=Cgw!1@2#3$4
+#spring.datasource2.url=jdbc:mysql://200.1.54.238:13306/zyml?useUnicode=true&characterEncoding=utf-8&useSSL=false
+#spring.datasource2.username=cgw
+#spring.datasource2.password=Cgw!1@2#3$4
+spring.datasource2.url=jdbc:mysql://127.0.0.1:9088/tjcgwzyml?useUnicode=true&characterEncoding=utf-8&useSSL=false
+spring.datasource2.username=root
+spring.datasource2.password=umisoft.cn
 spring.datasource2.driverClassName=com.mysql.cj.jdbc.Driver
 spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
 multipart.maxFileSize=10240404
@@ -59,11 +65,14 @@ spring.datasource.removeAbandonedTimeout=1000
 # database name
 spring.redis.database=0
 # server host1
-spring.redis.host=200.1.54.238
+#spring.redis.host=200.1.54.238
+spring.redis.host=127.0.0.1
 # server password
-spring.redis.password=Cgw!1#3%5
+#spring.redis.password=Cgw!1#3%5
+spring.redis.password=umisoft.cn
 #connection port
-spring.redis.port=16379
+#spring.redis.port=16379
+spring.redis.port=9004
 # pool settings ...
 spring.redis.pool.max-idle=8
 spring.redis.pool.min-idle=0

cn.com.taiji.security/pom.xml

@@ -6,27 +6,15 @@
 	<version>1.0.0</version>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<java.version>1.7</java.version>
+		<java.version>1.8</java.version>
 		<commons-lang3.version>3.3.2</commons-lang3.version>
 		<commons-codec.version>1.9</commons-codec.version>
 	</properties>
 	<parent>
-		<groupId>io.spring.platform</groupId>
-		<artifactId>platform-bom</artifactId>
-			<version>Brussels-SR6</version>
-<!-- 		2.0.8.RELEASE -->
-	</parent> 
-	<dependencyManagement>
-		<dependencies>
-			<dependency>
-				<groupId>cn.com.taiji</groupId>
-				<artifactId>cn.com.taiji.dependencies</artifactId>
-				<version>1.0.2</version>
-				<type>pom</type>
-				<scope>import</scope>
-			</dependency>
-		</dependencies>
-	</dependencyManagement>
+		<groupId>cn.com.taiji</groupId>
+		<artifactId>cn.com.taiji.zyml</artifactId>
+		<version>1.0.0</version>
+	</parent>
 	<dependencies>
 		<!-- Servlet add 2014-07-24 SunJingyan Start -->
 		<dependency>

cn.com.taiji.sys/pom.xml

@@ -6,27 +6,15 @@
 	<version>1.0.0</version>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<java.version>1.7</java.version>
+		<java.version>1.8</java.version>
 		<commons-lang3.version>3.3.2</commons-lang3.version>
 		<commons-codec.version>1.9</commons-codec.version>
 	</properties>
 	<parent>
-		<groupId>io.spring.platform</groupId>
-		<artifactId>platform-bom</artifactId>
-        	<version>Brussels-SR6</version>
-<!-- 		2.0.8.RELEASE -->
+		<groupId>cn.com.taiji</groupId>
+		<artifactId>cn.com.taiji.zyml</artifactId>
+		<version>1.0.0</version>
 	</parent>
-	<dependencyManagement>
-		<dependencies>
-			<dependency>
-				<groupId>cn.com.taiji</groupId>
-				<artifactId>cn.com.taiji.dependencies</artifactId>
-				<version>1.0.2</version>
-				<type>pom</type>
-				<scope>import</scope>
-			</dependency>
-		</dependencies>
-	</dependencyManagement>
 	<dependencies>
 		<dependency>
 			<groupId>javax.inject</groupId>
@@ -65,11 +53,11 @@
 			<groupId>mysql</groupId>
 			<artifactId>mysql-connector-java</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>com.oracle</groupId>
-			<artifactId>ojdbc6</artifactId>
-			<version>11.2.0.3</version>
-		</dependency>
+<!--		<dependency>-->
+<!--			<groupId>com.oracle</groupId>-->
+<!--			<artifactId>ojdbc6</artifactId>-->
+<!--			<version>11.2.0.3</version>-->
+<!--		</dependency>-->
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-data-jpa</artifactId>

cn.com.taiji.system/pom.xml

@@ -13,28 +13,19 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 	</properties>
 	<parent>
-		<groupId>io.spring.platform</groupId>
-		<artifactId>platform-bom</artifactId>
-			<version>Brussels-SR6</version>
-	</parent> 
-	<dependencyManagement>
-		<dependencies>
-			<dependency>
-				<groupId>cn.com.taiji</groupId>
-				<artifactId>cn.com.taiji.dependencies</artifactId>
-				<version>1.0.2</version>
-				<type>pom</type>
-				<scope>import</scope>
-			</dependency>
-		</dependencies>
-	</dependencyManagement>
+		<groupId>cn.com.taiji</groupId>
+		<artifactId>cn.com.taiji.zyml</artifactId>
+		<version>1.0.0</version>
+	</parent>
 	<dependencies>
 	<!-- https://mvnrepository.com/artifact/com.hankcs/hanlp -->
 	<dependency>
-    <groupId>bjca</groupId>
-  <artifactId>bjcaRestSdk</artifactId>
-  <version>1.0.0</version>
-</dependency>
+		<groupId>bjca</groupId>
+	  	<artifactId>bjcaRestSdk</artifactId>
+	  	<version>1.0.0</version>
+		<scope>system</scope>
+		<systemPath>${project.basedir}/lib/bjcaRestSdk-1.0.0.jar</systemPath>
+	</dependency>
 <dependency>
     <groupId>org.apache.lucene</groupId>
     <artifactId>lucene-core</artifactId>
@@ -172,10 +163,10 @@
 			<groupId>mysql</groupId>
 			<artifactId>mysql-connector-java</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>com.oracle</groupId>
-			<artifactId>ojdbc6</artifactId>
-			</dependency>
+<!--		<dependency>-->
+<!--			<groupId>com.oracle</groupId>-->
+<!--			<artifactId>ojdbc6</artifactId>-->
+<!--		</dependency>-->
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-data-jpa</artifactId>
@@ -357,10 +348,12 @@
 			<version>5.22.0</version>
 		</dependency>
 			<dependency>
-				 <groupId>com.ali</groupId>
-		  			<artifactId>http-sdk</artifactId>
-		  		 <version>1.0.4.2</version>
-		  </dependency>	
+				<groupId>com.ali</groupId>
+				<artifactId>http-sdk</artifactId>
+				<version>1.0.4.2</version>
+				<scope>system</scope>
+				<systemPath>${project.basedir}/lib/http-sdk-1.0.4.2.jar</systemPath>
+		  </dependency>
 		  <dependency>
     <groupId>org.codehaus.jackson</groupId>
     <artifactId>jackson-core-asl</artifactId>
@@ -374,7 +367,6 @@
 	</dependencies>
 	<build>
 		<plugins>
-		 
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>

database/cgw.sql

@@ -16,6 +16,7 @@
 
 SET NAMES utf8mb4;
 SET FOREIGN_KEY_CHECKS = 0;
+SET GLOABL log_bin_trust_function_creators=TRUE;
 
 -- ----------------------------
 -- Table structure for act_evt_log

pom.xml

@@ -0,0 +1,100 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>cn.com.taiji</groupId>
+    <artifactId>cn.com.taiji.zyml</artifactId>
+    <version>1.0.0</version>
+    <packaging>pom</packaging>
+
+    <name>cn.com.taiji.zyml</name>
+    <url>http://maven.apache.org</url>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <hazelcast.version>3.2.2</hazelcast.version>
+        <jquery.version>1.11.1</jquery.version>
+        <jquery-ui.version>1.10.4</jquery-ui.version>
+        <bootstrap.version>2.3.2</bootstrap.version>
+        <kendo.version>2014.1.416</kendo.version>
+        <openlayers.version>2.13.1</openlayers.version>
+        <zjw.version>1.0.0</zjw.version>
+    </properties>
+
+    <parent>
+        <groupId>io.spring.platform</groupId>
+        <artifactId>platform-bom</artifactId>
+        <version>Brussels-SR6</version>
+    </parent>
+    <modules>
+        <module>cn.com.taiji.myapp</module>
+        <module>cn.com.taiji.security</module>
+        <module>cn.com.taiji.sys</module>
+        <module>cn.com.taiji.system</module>
+        <module>blue_theme</module>
+    </modules>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>com.hazelcast</groupId>
+                <artifactId>hazelcast-all</artifactId>
+                <version>${hazelcast.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.webjars</groupId>
+                <artifactId>jquery</artifactId>
+                <version>${jquery.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.webjars</groupId>
+                <artifactId>jquery-ui</artifactId>
+                <version>${jquery-ui.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.webjars</groupId>
+                <artifactId>bootstrap</artifactId>
+                <version>${bootstrap.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.webjars</groupId>
+                <artifactId>kendo</artifactId>
+                <version>${kendo.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.webjars</groupId>
+                <artifactId>openlayers</artifactId>
+                <version>${openlayers.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>cn.com.taiji</groupId>
+                <artifactId>cn.com.taiji.sys</artifactId>
+                <version>1.0.0</version>
+            </dependency>
+            <dependency>
+                <groupId>org.webjars</groupId>
+                <artifactId>blue_theme</artifactId>
+                <version>${zjw.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>cn.com.taiji</groupId>
+                <artifactId>cn.com.taiji.security</artifactId>
+                <version>${zjw.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.webjars</groupId>
+                <artifactId>jquery-form</artifactId>
+                <version>3.28.0-2013.02.06-3</version>
+            </dependency>
+            <dependency>
+                <groupId>com.oracle</groupId>
+                <artifactId>ojdbc6</artifactId>
+                <version>11.2.0.3</version>
+            </dependency>
+            <dependency>
+                <groupId>cn.com.taiji</groupId>
+                <artifactId>cn.com.taiji.system</artifactId>
+                <version>1.0.0</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+</project>