change configs

pom.xml

@@ -4,16 +4,13 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>cn.com.qmth.examcloud</groupId>
     <artifactId>examcloud-app-api</artifactId>
-    <version>2.0-SNAPSHOT</version>
-    <packaging>war</packaging>
+    <version>master-SNAPSHOT</version>
+    <packaging>jar</packaging>
 
     <parent>
-        <!--<groupId>cn.com.qmth.examcloud</groupId>
+        <groupId>cn.com.qmth.examcloud</groupId>
         <artifactId>examcloud-parent</artifactId>
-        <version>2.0-SNAPSHOT</version>-->
-        <groupId>org.springframework.boot</groupId>
-        <artifactId>spring-boot-starter-parent</artifactId>
-        <version>1.5.18.RELEASE</version>
+        <version>master-SNAPSHOT</version>
     </parent>
 
     <properties>
@@ -22,39 +19,38 @@
         <java.version>1.8</java.version>
     </properties>
 
-    <repositories>
-        <repository>
-            <id>qmth-public</id>
-            <url>http://192.168.10.30:8081/repository/maven-public/</url>
-        </repository>
-        <repository>
-            <id>central-repository</id>
-            <url>https://repo.maven.apache.org/maven2</url>
-        </repository>
-    </repositories>
-    <pluginRepositories>
-        <pluginRepository>
-            <id>qmth-public</id>
-            <url>http://192.168.10.30:8081/repository/maven-public/</url>
-        </pluginRepository>
-        <pluginRepository>
-            <id>central-repository</id>
-            <url>https://repo.maven.apache.org/maven2</url>
-        </pluginRepository>
-    </pluginRepositories>
-    <distributionManagement>
-        <repository>
-            <id>qmth-releases</id>
-            <name>Snapshots Repository</name>
-            <url>http://192.168.10.30:8081/repository/maven-releases/</url>
-        </repository>
-        <snapshotRepository>
-            <id>qmth-snapshots</id>
-            <url>http://192.168.10.30:8081/repository/maven-snapshots/</url>
-        </snapshotRepository>
-    </distributionManagement>
-
     <dependencies>
+        <dependency>
+            <groupId>cn.com.qmth.examcloud.rmi</groupId>
+            <artifactId>examcloud-commons-api</artifactId>
+            <version>${examcloud.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>mysql</groupId>
+                    <artifactId>mysql-connector-java</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.google.guava</groupId>
+                    <artifactId>guava</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>commons-io</groupId>
+                    <artifactId>commons-io</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>commons-codec</groupId>
+                    <artifactId>commons-codec</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.commons</groupId>
+                    <artifactId>commons-lang3</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.alibaba</groupId>
+                    <artifactId>fastjson</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
@@ -109,7 +105,7 @@
         <dependency>
             <groupId>com.github.xiaoymin</groupId>
             <artifactId>swagger-bootstrap-ui</artifactId>
-            <version>1.8.1</version>
+            <version>1.8.9</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -174,7 +170,7 @@
                 <configuration>
                     <archive>
                         <manifest>
-                            <mainClass>cn.com.qmth.examcloud.app.api.ApiApplication</mainClass>
+                            <mainClass>cn.com.qmth.examcloud.app.ApiApplication</mainClass>
                             <addClasspath>true</addClasspath>
                             <classpathPrefix>./</classpathPrefix>
                         </manifest>
@@ -193,7 +189,7 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-assembly-plugin</artifactId>
                 <configuration>
-                    <finalName>examcloud-core-print</finalName>
+                    <finalName>examcloud-app-api</finalName>
                     <descriptors>
                         <descriptor>assembly.xml</descriptor>
                     </descriptors>
@@ -210,4 +206,5 @@
             </plugin>
         </plugins>
     </build>
+
 </project>

shell/start.args

@@ -0,0 +1 @@
+--spring.profiles.active=dev

shell/start.sh

@@ -0,0 +1,26 @@
+#!/bin/bash
+
+FILE_PATH=$(cd `dirname $0`; pwd)
+APP_VERSION=`cat $FILE_PATH/version`
+APP_MAIN_JAR="examcloud-app-api-"$APP_VERSION"-SNAPSHOT.jar"
+JAVA_OPTS=`cat $FILE_PATH/start.vmoptions`
+APP_ARGS=`cat $FILE_PATH/start.args`
+
+PID_LIST=`ps -ef|grep $APP_MAIN_JAR|grep java|awk '{print $2}'`
+if [ ! -z "$PID_LIST" ]; then
+    echo "[ERROR] : APP is already running!"
+    exit -1
+fi
+
+APP_ARGS=$APP_ARGS" --startup.securityCode="$$
+
+echo "java options:"
+echo "$JAVA_OPTS"
+echo "args:"
+echo "$APP_ARGS"
+
+nohup java $JAVA_OPTS -jar $FILE_PATH/lib/$APP_MAIN_JAR $APP_ARGS >/dev/null 2>&1 &
+
+echo "starting......"
+
+exit 0

shell/start.vmoptions

@@ -0,0 +1 @@
+-server -Xms512m -Xmx512m

shell/stop.sh

@@ -0,0 +1,18 @@
+#!/bin/bash
+
+FILE_PATH=$(cd `dirname $0`; pwd)
+APP_VERSION=`cat $FILE_PATH/version`
+APP_MAIN_JAR="examcloud-app-api-"$APP_VERSION"-SNAPSHOT.jar"
+
+PID_LIST=`ps -ef|grep $APP_MAIN_JAR|grep java|awk '{print $2}'`
+
+if [ ! -z "$PID_LIST" ]; then
+    echo "Runnable jar is $APP_MAIN_JAR."
+    for PID in $PID_LIST 
+    do
+        kill -9 $PID
+    done
+    echo "stopped !"
+fi
+
+exit 0

shell/version

@@ -0,0 +1 @@
+master

src/main/java/cn/com/qmth/examcloud/app/ApiApplication.java

@@ -7,6 +7,7 @@
 
 package cn.com.qmth.examcloud.app;
 
+import cn.com.qmth.examcloud.commons.web.boot.ExamCloudApp;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.builder.SpringApplicationBuilder;
@@ -19,6 +20,7 @@ public class ApiApplication extends SpringBootServletInitializer {
 
     public static void main(String[] args) {
         SpringApplication.run(ApiApplication.class, args);
+//        ExamCloudApp.run(ApiApplication.class, "app-api", args);
     }
 
     @Override

src/main/resources/application-dev.properties

@@ -8,12 +8,7 @@ spring.freemarker.suffix=.ftl
 spring.http.multipart.max-file-size=50Mb
 spring.http.multipart.max-request-size=50Mb
 # logs config
-logging.file=logs/debug.log
-logging.level.org.springframework=WARN
-logging.level.org.hibernate=WARN
-logging.level.org.apache=WARN
-logging.level.com.qmth=DEBUG
-logging.level.cn.com.qmth=DEBUG
+logging.config=classpath:logback-spring.xml
 # mysql config
 spring.datasource.url=jdbc:mysql://192.168.10.30:3306/app_api?useUnicode=true&characterEncoding=utf-8&useSSL=false
 spring.datasource.username=root

src/main/resources/application-prod.properties

@@ -8,27 +8,25 @@ spring.freemarker.suffix=.ftl
 spring.http.multipart.max-file-size=50Mb
 spring.http.multipart.max-request-size=50Mb
 # logs config
-logging.file=logs/debug.log
-logging.level.org.springframework=WARN
-logging.level.org.hibernate=WARN
-logging.level.org.apache=WARN
-logging.level.com.qmth=DEBUG
-logging.level.cn.com.qmth=DEBUG
-
+logging.config=classpath:logback-spring.xml
 # 基础信息服务地址
 examcloud.base.info.url=http://192.168.1.72:8000
 # 考务服务地址
 examcloud.exam.admin.url=http://192.168.1.72:8001
 # 网考服务地址
-examcloud.net.exam.url=http://192.168.1.30:8003
+examcloud.net.exam.url=http://192.168.1.72:8003
+# 网考后端
+examcloud.admin.exam.url=http://192.168.1.72:8013
 # 题库服务地址
 examcloud.question.pool.url=http://192.168.1.71:8868
-
 # 认证中心服务地址
-examcloud.user.auth.url=http://192.168.10.39
+examcloud.user.auth.url=http://192.168.1.72
 # 又拍云文件服务地址
-examcloud.upyun.url=https://ecs-test-static.qmth.com.cn
+examcloud.upyun.url=https://ecs-static.qmth.com.cn
 # 短信服务配置
-examcloud.sms.url=http://192.168.10.30:8007
+examcloud.sms.url=http://192.168.1.72:8007
 examcloud.sms.sign=\u8003\u8BD5\u4E91\u5E73\u53F0
-examcloud.sms.template=SMS_138073780
+examcloud.sms.template=SMS_138073780
+$test=test
+$dir=dir
+$tempDir=tempDir

src/main/resources/application-test.properties

@@ -8,12 +8,7 @@ spring.freemarker.suffix=.ftl
 spring.http.multipart.max-file-size=50Mb
 spring.http.multipart.max-request-size=50Mb
 # logs config
-logging.file=logs/debug.log
-logging.level.org.springframework=WARN
-logging.level.org.hibernate=WARN
-logging.level.org.apache=WARN
-logging.level.com.qmth=DEBUG
-logging.level.cn.com.qmth=DEBUG
+logging.config=classpath:logback-spring.xml
 # mysql config
 spring.datasource.url=jdbc:mysql://192.168.10.30:3306/app_api?useUnicode=true&characterEncoding=utf-8&useSSL=false
 spring.datasource.username=root

src/main/resources/application.properties

@@ -1,2 +1,3 @@
 #debug=true
-spring.profiles.active=dev
+spring.profiles.active=dev
+eureka.client.serviceUrl.defaultZone=http://192.168.10.39:1111/eureka/

src/main/resources/logback-spring.xml

@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration debug="true" scan="true" scanPeriod="30 seconds">
+
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS}| %level | %X{TRACE_ID} - %X{KEY} | %m | [%class:%line]%n</pattern>
+        </encoder>
+    </appender>
+
+    <!-- debug 日志 -->
+    <appender name="DEBUG_APPENDER" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>logs/debug/examcloud.app.api.debug.log</file>
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS}| %level | %X{TRACE_ID} - %X{KEY} | %m | [%class:%line]%n</pattern>
+        </encoder>
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+            <fileNamePattern>logs/debug/examcloud.app.api.debug.log.%d{yyyy-MM-dd}.%i</fileNamePattern>
+            <maxHistory>10</maxHistory>
+            <totalSizeCap>1GB</totalSizeCap>
+            <maxFileSize>100MB</maxFileSize>
+        </rollingPolicy>
+    </appender>
+
+    <!-- 接口日志 -->
+    <appender name="INTERFACE_APPENDER" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <file>logs/interface/examcloud.app.api.interface.log</file>
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS}| %level | %X{TRACE_ID} - %X{KEY} | %m%n</pattern>
+        </encoder>
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+            <fileNamePattern>logs/interface/examcloud.app.api.interface.log.%d{yyyy-MM-dd}.%i</fileNamePattern>
+            <maxHistory>30</maxHistory>
+            <totalSizeCap>10GB</totalSizeCap>
+            <maxFileSize>100MB</maxFileSize>
+        </rollingPolicy>
+    </appender>
+
+    <logger name="cn.com.qmth.examcloud" level="DEBUG" additivity="false">
+        <appender-ref ref="DEBUG_APPENDER"/>
+        <appender-ref ref="STDOUT"/>
+    </logger>
+
+    <logger name="INTERFACE_LOGGER" level="DEBUG" additivity="false">
+        <appender-ref ref="INTERFACE_APPENDER"/>
+        <appender-ref ref="STDOUT"/>
+    </logger>
+
+    <logger name="org.hibernate" level="WARN"/>
+    <logger name="org.hibernate.type" level="WARN"/>
+    <logger name="org.hibernate.engine" level="WARN"/>
+    <logger name="org.hibernate.SQL" level="WARN"/>
+
+    <logger name="org.springframework" level="WARN"/>
+    <logger name="org.springframework.jdbc.core.JdbcTemplate" level="WARN"/>
+    <logger name="org.springframework.data.mongodb" level="WARN"/>
+
+    <logger name="com.netflix" level="WARN"/>
+    <logger name="com.netflix.discovery" level="WARN"/>
+    <logger name="springfox.documentation" level="WARN"/>
+    <logger name="cn.afterturn.easypoi" level="WARN"/>
+    <logger name="org.apache" level="WARN"/>
+    <logger name="cn.com.qmth.examcloud.app" level="DEBUG"/>
+
+    <root level="DEBUG">
+        <appender-ref ref="DEBUG_APPENDER"/>
+        <appender-ref ref="STDOUT"/>
+    </root>
+
+</configuration>

src/main/resources/security-exclusions.conf

@@ -0,0 +1,3 @@
+regexp:.*swagger.*
+[][/doc.html][GET]
+[][/][GET]