Răsfoiți Sursa

文件整理

xiatian 9 luni în urmă
părinte
comite
72a9f566a3

+ 18 - 0
install/config.ini

@@ -0,0 +1,18 @@
+[app]
+name=¼¯ÖÐɨÃè·þÎñ¶Ë
+version=1.0.0
+portal=http://localhost:7300/
+module=api
+depend=mysql,nginx
+
+[mysql]
+db=scan_db
+before=init.sql
+after=
+
+[upgrade]
+minmum_version=1.0.0
+
+[api]
+port=7380
+exec=%QMTH_HOME%\common\jdk\bin\java -Xms8g -Xmx8g -XX:MetaspaceSize=256m -XX:+UseG1GC -XX:MaxGCPauseMillis=100 -Dqmth.home=%QMTH_HOME% -jar scan-central.jar

+ 5 - 0
install/mysql/init/init.sql

@@ -0,0 +1,5 @@
+CREATE DATABASE IF NOT EXISTS scan_db default character set utf8mb4 collate utf8mb4_general_ci;
+
+GRANT ALL PRIVILEGES  ON `scan_central_db`.* TO 'scan_central'@'localhost' IDENTIFIED BY 'scan_central';
+
+FLUSH  PRIVILEGES;

+ 43 - 0
src/main/resources/script/init.sql → install/mysql/init/scan_central_db.sql

@@ -1,3 +1,46 @@
+CREATE TABLE IF NOT EXISTS `sc_student`
+(
+    `id`                 bigint      NOT NULL AUTO_INCREMENT,
+    `exam_id`            bigint      NOT NULL,
+    `exam_number`        varchar(64) NOT NULL,
+    `student_code`       varchar(64) NOT NULL,
+    `name`               varchar(64) NOT NULL,
+    `subject_code`       varchar(64) NOT NULL,
+    `package_code`       varchar(64) DEFAULT NULL,
+    `exam_site`          varchar(64) DEFAULT NULL,
+    `exam_site_name`     varchar(64) DEFAULT NULL,
+    `exam_room`          varchar(64) DEFAULT NULL,
+    `seat_number`        varchar(16) DEFAULT NULL,
+    `campus_name`        varchar(64) DEFAULT NULL,
+    `campus_code`        varchar(64) DEFAULT NULL,
+    `status`             varchar(16) NOT NULL,
+    `omr_absent`         bit(1)      NOT NULL,
+    `question_filled`    bit(1)      NOT NULL,
+    `subjective_filled`  bit(1)      NOT NULL,
+    `assigned`           bit(1)      NOT NULL,
+    `absent_suspect`     bit(1)      NOT NULL,
+    `incomplete`         bit(1)      NOT NULL,
+    `card_number`        int         DEFAULT NULL,
+    `device`             varchar(32) DEFAULT NULL,
+    `paper_type`         varchar(16) NOT NULL,
+    `exam_status`        varchar(32) DEFAULT NULL,
+    `breach_code`        varchar(32) DEFAULT NULL,
+    `file_upload_status` varchar(16) DEFAULT NULL,
+    `data_upload_status` varchar(16) DEFAULT NULL,
+    `check_mark`		 bit(1)      NOT NULL,
+    `assigned_check_count` int       DEFAULT NULL,
+    `assigned_suspect`	 bit(1)      NOT NULL,
+    `creator_id`         bigint      DEFAULT NULL,
+    `updater_id`         bigint      DEFAULT NULL,
+    `create_time`        bigint      DEFAULT NULL,
+    `update_time`        bigint      DEFAULT NULL,
+    PRIMARY KEY (`id`),
+    UNIQUE KEY `exam_number` (`exam_id`, `exam_number`),
+    UNIQUE KEY `exam_student_subject` (`exam_id`, `student_code`, `subject_code`),
+    KEY `exam_assigned` (`exam_id`, `assigned`, `assigned_check_count`)
+) ENGINE = InnoDB
+  DEFAULT CHARSET = utf8mb4;
+
 -- ----------------------------
 -- Table structure for sc_answer_card
 -- ----------------------------

+ 19 - 0
install/nginx/scan_central.conf

@@ -0,0 +1,19 @@
+server {
+        listen 7300;
+
+        proxy_read_timeout 300s;
+        proxy_connect_timeout 300s;
+        proxy_send_timeout 300s;
+ 
+        location /file/ {
+                alias ../../scancentral/static/;
+                add_header Access-Control-Allow-Origin *;
+        }
+ 
+        location ^~ /api/ {
+                proxy_pass http://127.0.0.1:7380;
+                proxy_set_header Host   $http_host;
+                proxy_set_header X-Real-IP $remote_addr;
+                proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        }
+}

+ 11 - 0
shell/jenkins.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+
+pwd
+
+cp target/scancentral.jar ~/project/scancentral
+BUILD_ID=DONTKILLME
+bash ~/project/scancentral/stop.sh
+sleep 5s
+bash ~/project/scancentral/start.sh
+
+echo "finished..."

+ 1 - 0
shell/start.args

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

+ 28 - 0
shell/start.sh

@@ -0,0 +1,28 @@
+#!/bin/bash
+
+FILE_PATH=$(cd `dirname $0`; pwd)
+
+APP_MAIN_JAR="scan-central.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
+
+
+
+echo "java options:"
+echo "$JAVA_OPTS"
+echo "args:"
+echo "$APP_ARGS"
+    
+nohup java $JAVA_OPTS -jar $FILE_PATH/$APP_MAIN_JAR $APP_ARGS >/dev/null 2>&1 &
+
+echo "starting......"
+
+exit 0

+ 1 - 0
shell/start.vmoptions

@@ -0,0 +1 @@
+-server -Xms256m -Xmx256m -XX:-UseGCOverheadLimit -Dlog.commonLevel=INFO

+ 17 - 0
shell/stop.sh

@@ -0,0 +1,17 @@
+#!/bin/bash
+FILE_PATH=$(cd `dirname $0`; pwd)
+
+APP_MAIN_JAR="scan-central.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

+ 5 - 4
src/main/java/cn/com/qmth/scancentral/config/SysProperty.java

@@ -6,18 +6,19 @@ import org.springframework.stereotype.Component;
 @Component
 public class SysProperty {
 
-    private String version = "1.0.3";
+    @Value("${com.qmth.solar.app-version}")
+    private String version;
 
     /**
      * 心跳超时时间(秒)
      */
-    @Value("${scancloud.heartbeat-timeout}")
+    @Value("${scancentral.heartbeat-timeout}")
     private Integer heartbeatTimeout;
 
-    @Value("${scancloud.file-uri-prefix}")
+    @Value("${scancentral.file-uri-prefix}")
     private String fileUriPrefix;
 
-    @Value("${scancloud.image-transfer.dir}")
+    @Value("${scancentral.image-transfer.dir}")
     private String transferDir;
 
     public Integer getHeartbeatTimeout() {

+ 11 - 12
src/main/resources/application.properties

@@ -1,31 +1,30 @@
 #
 # ********** server config **********
 #
-server.port=7080
+server.port=7380
 server.servlet.session.timeout=PT2H
 spring.servlet.multipart.max-request-size=100MB
 spring.servlet.multipart.max-file-size=100MB
 #
 # ********** db config **********
 #
-db.host=localhost
+db.host=192.168.10.30
 db.port=3306
-db.database=scan_db
-com.qmth.datasource.username=root
-com.qmth.datasource.password=12345678
+db.database=scan_central
+com.qmth.datasource.username=scan_central
+com.qmth.datasource.password=scan_central
 com.qmth.datasource.url=jdbc:mysql://${db.host}:${db.port}/${db.database}?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=GMT%2b8&rewriteBatchedStatements=true
 #
 # ********** sys config **********
 #
 com.qmth.logging.root-level=info
-com.qmth.logging.file-path=../log/scancloud.log
+com.qmth.logging.file-path=../log/scancentral.log
 com.qmth.auth.time-max-delay=3600s
 com.qmth.auth.time-max-ahead=3600s
 com.qmth.fss.config=../static
 com.qmth.fss.server=http://192.168.11.118
-scancloud.image-transfer.dir=../imagetransfer
-scancloud.thread.count=2
-scancloud.heartbeat-timeout=300
-scancloud.mode=STANDALONE
-scancloud.file-uri-prefix=file
-scancloud.swagger.enable=true
+scancentral.image-transfer.dir=../imagetransfer
+scancentral.thread.count=2
+scancentral.heartbeat-timeout=300
+scancentral.file-uri-prefix=file
+scancentral.swagger.enable=true

+ 0 - 42
src/main/resources/script/init_markingcloud.sql

@@ -1,42 +0,0 @@
-CREATE TABLE IF NOT EXISTS `sc_student`
-(
-    `id`                 bigint      NOT NULL AUTO_INCREMENT,
-    `exam_id`            bigint      NOT NULL,
-    `exam_number`        varchar(64) NOT NULL,
-    `student_code`       varchar(64) NOT NULL,
-    `name`               varchar(64) NOT NULL,
-    `subject_code`       varchar(64) NOT NULL,
-    `package_code`       varchar(64) DEFAULT NULL,
-    `exam_site`          varchar(64) DEFAULT NULL,
-    `exam_site_name`     varchar(64) DEFAULT NULL,
-    `exam_room`          varchar(64) DEFAULT NULL,
-    `seat_number`        varchar(16) DEFAULT NULL,
-    `campus_name`        varchar(64) DEFAULT NULL,
-    `campus_code`        varchar(64) DEFAULT NULL,
-    `status`             varchar(16) NOT NULL,
-    `omr_absent`         bit(1)      NOT NULL,
-    `question_filled`    bit(1)      NOT NULL,
-    `subjective_filled`  bit(1)      NOT NULL,
-    `assigned`           bit(1)      NOT NULL,
-    `absent_suspect`     bit(1)      NOT NULL,
-    `incomplete`         bit(1)      NOT NULL,
-    `card_number`        int         DEFAULT NULL,
-    `device`             varchar(32) DEFAULT NULL,
-    `paper_type`         varchar(16) NOT NULL,
-    `exam_status`        varchar(32) DEFAULT NULL,
-    `breach_code`        varchar(32) DEFAULT NULL,
-    `file_upload_status` varchar(16) DEFAULT NULL,
-    `data_upload_status` varchar(16) DEFAULT NULL,
-    `check_mark`		 bit(1)      NOT NULL,
-    `assigned_check_count` int       DEFAULT NULL,
-    `assigned_suspect`	 bit(1)      NOT NULL,
-    `creator_id`         bigint      DEFAULT NULL,
-    `updater_id`         bigint      DEFAULT NULL,
-    `create_time`        bigint      DEFAULT NULL,
-    `update_time`        bigint      DEFAULT NULL,
-    PRIMARY KEY (`id`),
-    UNIQUE KEY `exam_number` (`exam_id`, `exam_number`),
-    KEY `exam_student_subject` (`exam_id`, `student_code`, `subject_code`),
-    KEY `exam_assigned` (`exam_id`, `assigned`, `assigned_check_count`)
-) ENGINE = InnoDB
-  DEFAULT CHARSET = utf8mb4;

+ 0 - 42
src/main/resources/script/init_standalone.sql

@@ -1,42 +0,0 @@
-CREATE TABLE IF NOT EXISTS `sc_student`
-(
-    `id`                 bigint      NOT NULL AUTO_INCREMENT,
-    `exam_id`            bigint      NOT NULL,
-    `exam_number`        varchar(64) NOT NULL,
-    `student_code`       varchar(64) NOT NULL,
-    `name`               varchar(64) NOT NULL,
-    `subject_code`       varchar(64) NOT NULL,
-    `package_code`       varchar(64) DEFAULT NULL,
-    `exam_site`          varchar(64) DEFAULT NULL,
-    `exam_site_name`     varchar(64) DEFAULT NULL,
-    `exam_room`          varchar(64) DEFAULT NULL,
-    `seat_number`        varchar(16) DEFAULT NULL,
-    `campus_name`        varchar(64) DEFAULT NULL,
-    `campus_code`        varchar(64) DEFAULT NULL,
-    `status`             varchar(16) NOT NULL,
-    `omr_absent`         bit(1)      NOT NULL,
-    `question_filled`    bit(1)      NOT NULL,
-    `subjective_filled`  bit(1)      NOT NULL,
-    `assigned`           bit(1)      NOT NULL,
-    `absent_suspect`     bit(1)      NOT NULL,
-    `incomplete`         bit(1)      NOT NULL,
-    `card_number`        int         DEFAULT NULL,
-    `device`             varchar(32) DEFAULT NULL,
-    `paper_type`         varchar(16) NOT NULL,
-    `exam_status`        varchar(32) DEFAULT NULL,
-    `breach_code`        varchar(32) DEFAULT NULL,
-    `file_upload_status` varchar(16) DEFAULT NULL,
-    `data_upload_status` varchar(16) DEFAULT NULL,
-    `check_mark`		 bit(1)      NOT NULL,
-    `assigned_check_count` int       DEFAULT NULL,
-    `assigned_suspect`	 bit(1)      NOT NULL,
-    `creator_id`         bigint      DEFAULT NULL,
-    `updater_id`         bigint      DEFAULT NULL,
-    `create_time`        bigint      DEFAULT NULL,
-    `update_time`        bigint      DEFAULT NULL,
-    PRIMARY KEY (`id`),
-    UNIQUE KEY `exam_number` (`exam_id`, `exam_number`),
-    UNIQUE KEY `exam_student_subject` (`exam_id`, `student_code`, `subject_code`),
-    KEY `exam_assigned` (`exam_id`, `assigned`, `assigned_check_count`)
-) ENGINE = InnoDB
-  DEFAULT CHARSET = utf8mb4;