modify resource

jinzhaopo · Apr 10, 2017 · 8e233c2 · 8e233c2
1 parent 7493a70
commit 8e233c2
Show file tree

Hide file tree

Showing 5 changed files with 174 additions and 39 deletions.
diff --git a/...src/main/resources/application.properties → ...-mybatis/env/local/application.properties b/...src/main/resources/application.properties → ...-mybatis/env/local/application.properties
diff --git a/springboot-mybatis/env/local/env.properties b/springboot-mybatis/env/local/env.properties
@@ -0,0 +1,89 @@
+#local
+
+################
+##this property file is used to export shell session-scoped variables by command 'source *.properties'
+################
+
+#app root
+prop_appRoot=/opt/apps
+
+
+#run postinstall or not.(It is not used any more.)
+prop_runPreinstall=false
+prop_runPostinstall=false
+
+#the package name
+prop_package=epp-manager
+#the package version
+prop_packageVersion=v1
+
+
+#Your Java Home
+prop_javaHome=/opt/apps/java/Contents/Home
+
+#owner and group for package
+prop_ownerGroup=root:root
+
+
+#folders which need to be created manually, the folder path will be relative to the app home folder
+#seperate multi folders with space, don't forget the double "
+prop_manualFolders="var/logs"
+#manual folders mode
+prop_manualFolderMode=777
+
+
+###################
+#Cluster config
+###################
+#used by install.sh to decide the install mode: cluster or single node(default false)
+prop_isCluster=false
+
+#single
+prop_singleNode=local
+
+#cluster
+#all the nodes for the cluster, only is is accepted now
+#seperated by , sign (EX di,d2,192.168.100.2)(If you want to use d1 d2,you must config the url in etc/local)
+prop_clusterNodes=d1
+
+
+###################
+#springboot config
+###################
+prop_springbootWarName=${prop_package}
+prop_springbootWarVersion=${prop_packageVersion}
+prop_springbootProcessKeyWord=${prop_springbootWarName}-${prop_springbootWarVersion}.war
+
+
+##############
+#docker config
+##############
+prop_dockerDestFolder=${prop_appRoot}/${prop_package}
+#docker daemon.(Docker is online or not.)
+prop_dockerProcessKeyWord='docker'
+#docker image name, e.g. cliff/nginx or nginx
+prop_dockerImageName=${prop_package}
+#docker image version, e.g. v1/v2 or latest
+prop_dockerImageVersion=${prop_packageVersion}
+#docker container count in each host server(1 in most situation.)
+prop_dockerContainerCount=1
+
+#docker config file mapping, multiple file mappings is supported so you can specify multiple -v xx:xx
+prop_dockerConfigFileMapping="env:${prop_dockerDestFolder}/current/env"
+prop_dockerLogFolderMapping="var/logs/nodexxx:${prop_dockerDestFolder}/var/logs"
+prop_dockerUploadFolderMapping="uploadFiles:${prop_dockerDestFolder}/uploadFiles"
+prop_dockerPortMappings=8080:8080
+
+##########################################
+#seconds config before start and stop
+##########################################
+
+#the sleep time to wail for each node starting up after another, the unit is second
+prop_startAllSleep=2
+
+#the sleep time to wail for one node starting up. 
+#sometimes we start up server by backend job so we need wait some time
+prop_startOneSleep=8
+
+#stop node timeout, if timeout we will kill -9, the unit is second
+prop_stopNodeTimeout=2
diff --git a/springboot-mybatis/env/local/log4j.properties b/springboot-mybatis/env/local/log4j.properties
@@ -0,0 +1,26 @@
+# Output pattern : date [thread] priority category - message
+log4j.rootLogger=INFO, Console, R
+
+#Console
+log4j.appender.Console=org.apache.log4j.ConsoleAppender
+log4j.appender.Console.layout=org.apache.log4j.PatternLayout
+log4j.appender.Console.layout.ConversionPattern=%d [%t] %-5p [%c] - %m%n
+
+
+log4j.appender.R=org.apache.log4j.RollingFileAppender
+log4j.appender.R.File=logs/cmbms.log
+log4j.appender.R.MaxFileSize=50kB
+log4j.appender.R.MaxBackupIndex=5
+log4j.appender.R.layout=org.apache.log4j.PatternLayout
+log4j.appender.R.layout.ConversionPattern=%d [%t] %-5p [%c] - %m%n
+
+
+log4j.appender.ServerDailyRollingFile=org.apache.log4j.DailyRollingFileAppender 
+log4j.appender.ServerDailyRollingFile.DatePattern='.'yyyy-MM-dd 
+log4j.appender.ServerDailyRollingFile.layout=org.apache.log4j.PatternLayout 
+#log4j.appender.ServerDailyRollingFile.Append=true
+
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender 
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout 
+log4j.appender.stdout.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %p [%c] %m%n
+
diff --git a/springboot-mybatis/pom.xml b/springboot-mybatis/pom.xml
@@ -27,6 +27,12 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.springframework.boot</groupId>
+                    <artifactId>spring-boot-starter-logging</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <!--db-->
         <dependency>
@@ -79,9 +85,61 @@
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
+        <!--log-->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-log4j</artifactId>
+        </dependency>
     </dependencies>
     <build>
         <plugins>
+            <!-- to generate compressed package（tar package） specified by package.xml begin -->
+            <plugin>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <version>2.5.5</version>
+                <configuration>
+                    <finalName>${package}-${package.version}</finalName>
+                    <ignorePermissions>true</ignorePermissions>
+                    <appendAssemblyId>false</appendAssemblyId>
+                    <descriptors>
+                        <descriptor>${basedir}/scripts/${package.format}/common/package.xml</descriptor>
+                    </descriptors>
+                </configuration>
+            </plugin>
+            <!-- to generate executable jar/war with standard style begin -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-war-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifest>
+                            <mainClass>${start-class}</mainClass>
+                        </manifest>
+                    </archive>
+                    <webappDirectory>${project.build.directory}/epp-manager</webappDirectory>
+                    <warSourceDirectory>src/main/webapp</warSourceDirectory>
+                    <webResources>
+                        <resource>
+                            <directory>env/${package.environment}</directory>
+                            <includes>
+                                <include>${package.resources}</include>
+                            </includes>
+                            <targetPath>WEB-INF/classes</targetPath>
+                        </resource>
+                    </webResources>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>default-war</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>war</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <!--test-->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
@@ -90,6 +148,7 @@
                 </configuration>
             </plugin>
 
+            <!--打依赖包-->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>

diff --git a/springboot-mybatis/src/main/resources/log4j.properties b/springboot-mybatis/src/main/resources/log4j.properties