Browse Source

feat(server): 测试环境监理

Go 4 years ago
parent
commit
da898bdb83
33 changed files with 1553 additions and 496 deletions
  1. 34 2
      deploy/upload.sh
  2. 1 2
      front/config/index.js
  3. 7 7
      front/config/local.json
  4. 5 2
      server/data/build.gradle
  5. 0 7
      server/data/src/main/java/com/qxgmat/data/dao/ExercisePaperQuestionMapper.java
  6. 12 12
      server/data/src/main/java/com/qxgmat/data/dao/entity/Comment.java
  7. 12 12
      server/data/src/main/java/com/qxgmat/data/dao/entity/ExaminationStruct.java
  8. 0 229
      server/data/src/main/java/com/qxgmat/data/dao/entity/ExercisePaperQuestion.java
  9. 12 12
      server/data/src/main/java/com/qxgmat/data/dao/entity/ExerciseStruct.java
  10. 12 12
      server/data/src/main/java/com/qxgmat/data/dao/entity/Faq.java
  11. 12 12
      server/data/src/main/java/com/qxgmat/data/dao/entity/UserAskCourse.java
  12. 12 12
      server/data/src/main/java/com/qxgmat/data/dao/entity/UserAskQuestion.java
  13. 2 2
      server/data/src/main/java/com/qxgmat/data/dao/mapping/CommentMapper.xml
  14. 2 2
      server/data/src/main/java/com/qxgmat/data/dao/mapping/ExaminationStructMapper.xml
  15. 0 21
      server/data/src/main/java/com/qxgmat/data/dao/mapping/ExercisePaperQuestionMapper.xml
  16. 2 2
      server/data/src/main/java/com/qxgmat/data/dao/mapping/ExerciseStructMapper.xml
  17. 2 2
      server/data/src/main/java/com/qxgmat/data/dao/mapping/FaqMapper.xml
  18. 2 2
      server/data/src/main/java/com/qxgmat/data/dao/mapping/UserAskCourseMapper.xml
  19. 2 2
      server/data/src/main/java/com/qxgmat/data/dao/mapping/UserAskQuestionMapper.xml
  20. 0 1
      server/data/src/main/java/com/qxgmat/data/relation/ExercisePaperRelationMapper.java
  21. 1375 27
      server/data/src/main/resources/db/migration/V1__init_table.sql
  22. 2 2
      server/data/src/main/resources/jdbc.properties.d
  23. 1 0
      server/dependencyDefine.gradle
  24. 2 2
      server/gateway-api/src/main/java/com/qxgmat/controller/admin/SettingController.java
  25. 0 3
      server/gateway-api/src/main/java/com/qxgmat/dto/admin/response/ExerciseQuestionListDto.java
  26. 5 5
      server/gateway-api/src/main/java/com/qxgmat/service/inline/CommentService.java
  27. 0 73
      server/gateway-api/src/main/java/com/qxgmat/service/inline/ExerciseQuestionService.java
  28. 5 5
      server/gateway-api/src/main/java/com/qxgmat/service/inline/FaqService.java
  29. 5 5
      server/gateway-api/src/main/java/com/qxgmat/service/inline/UserAskCourseService.java
  30. 5 5
      server/gateway-api/src/main/java/com/qxgmat/service/inline/UserAskQuestionService.java
  31. 2 2
      server/gateway-api/src/main/profile/dev/application-runtime.yml
  32. 9 5
      server/gateway-api/src/main/profile/prod/application-runtime.yml
  33. 11 7
      server/gateway-api/src/main/profile/test/application-runtime.yml

+ 34 - 2
deploy/upload.sh

@@ -17,7 +17,15 @@ rm -rf ${PROJECT_PATH}/dist
 if [[ $TARGET = "admin" ]]
 then
   cd front;
-  npm run deploy:prod ${TARGET}
+  if [[ $ENV = "test" ]]
+  then
+    npm run deploy:test ${TARGET}
+  elif [[ $ENV = "dev" ]]
+  then
+    npm run deploy ${TARGET}
+  else
+    npm run deploy:prod ${TARGET}
+  fi
   cd ../;
   # mv admin/dist ./;
   export UPLOAD=front/dist
@@ -25,7 +33,31 @@ then
 elif [[ $TARGET = "www" ]]
 then
   cd front;
-  npm run deploy:prod ${TARGET};
+  if [[ $ENV = "test" ]]
+  then
+    npm run deploy:test ${TARGET}
+  elif [[ $ENV = "dev" ]]
+  then
+    npm run deploy ${TARGET}
+  else
+    npm run deploy:prod ${TARGET}
+  fi
+  cd ../;
+  # mv web/dist  ./;
+  export UPLOAD=front/dist
+  export UPLOADED=static-${TARGET}
+elif [[ $TARGET = "h5" ]]
+then
+  cd front;
+  if [[ $ENV = "test" ]]
+  then
+    npm run deploy:test ${TARGET}
+  elif [[ $ENV = "dev" ]]
+  then
+    npm run deploy ${TARGET}
+  else
+    npm run deploy:prod ${TARGET}
+  fi
   cd ../;
   # mv web/dist  ./;
   export UPLOAD=front/dist

+ 1 - 2
front/config/index.js

@@ -2,8 +2,7 @@ const path = require('path');
 const debug = require('debug')('app:config');
 let config = require('./local');
 
-const NODE_ENV = process.env.NODE_ENV || 'development';
-
+const NODE_ENV = process.env.NODE_ENV || process.env.ENV || 'development';
 debug('Creating default configuration.');
 const argv = JSON.parse(process.env.npm_config_argv);
 const project = argv.remain.length > 0 ? argv.remain[0] : 'admin';

+ 7 - 7
front/config/local.json

@@ -15,10 +15,10 @@
         "to": "/"
       }
     ],
-    "PcUrl": "http://www.baidu.com",
+    "PcUrl": "http://127.0.0.1:3000",
     "WechatPcAppId": "wx324965bb6800f9b9",
     "H5Url": "http://127.0.0.1:3000",
-    "WechatH5AppId": "wxbee75af2ece94ed7"
+    "WechatH5AppId": "wx65c7d378b4184bcc"
   },
   "test": {
     "serverHost": "127.0.0.1",
@@ -29,10 +29,10 @@
     "scripts": [],
     "publicPath": "/",
     "basename": "/",
-    "PcUrl": "http://www.baidu.com",
+    "PcUrl": "http://test.duoshaojiaoyu.com",
     "WechatPcAppId": "wx324965bb6800f9b9",
-    "H5Url": "http://127.0.0.1:3000",
-    "WechatH5AppId": "wxbee75af2ece94ed7"
+    "H5Url": "http://mobiletest.duoshaojiaoyu.com",
+    "WechatH5AppId": "wx65c7d378b4184bcc"
   },
   "production": {
     "serverHost": "127.0.0.1",
@@ -43,9 +43,9 @@
     "scripts": [],
     "publicPath": "/",
     "basename": "/",
-    "PcUrl": "http://www.baidu.com",
+    "PcUrl": "http://www.duoshaojiaoyu.com",
     "WechatPcAppId": "wx324965bb6800f9b9",
-    "H5Url": "http://127.0.0.1:3000",
+    "H5Url": "http://h5.duoshaojiaoyu.com",
     "WechatH5AppId": "wxbee75af2ece94ed7"
   }
 }

+ 5 - 2
server/data/build.gradle

@@ -51,16 +51,19 @@ mybatisGenerator {
 // flyway -------- start
 buildscript {
     dependencies {
-//        classpath libraries."flyway-h2"
         classpath "gradle.plugin.com.boxfuse.client:gradle-plugin-publishing:6.0.0-beta2"
     }
 }
+dependencies {
+    compileClasspath libraries."flyway-mysql"
+}
 apply plugin: "org.flywaydb.flyway"
 flyway {
     // 写自己本地测试数据库
-    url = 'jdbc:mysql://127.0.0.1:3306/qianxing'
+    url = 'jdbc:mysql://127.0.0.1:3306/qianxing-test'
     user = 'qianxing'
     password = 'qianxing'
+    configurations = [ 'compileClasspath']
     // 线上:mvn package exec:java -Dexec.mainClass=com.qxgmat.Flyway
 }
 // flyway ------ end

+ 0 - 7
server/data/src/main/java/com/qxgmat/data/dao/ExercisePaperQuestionMapper.java

@@ -1,7 +0,0 @@
-package com.qxgmat.data.dao;
-
-import com.nuliji.tools.mybatis.Mapper;
-import com.qxgmat.data.dao.entity.ExercisePaperQuestion;
-
-public interface ExercisePaperQuestionMapper extends Mapper<ExercisePaperQuestion> {
-}

+ 12 - 12
server/data/src/main/java/com/qxgmat/data/dao/entity/Comment.java

@@ -62,8 +62,8 @@ public class Comment implements Serializable {
     /**
      * 排序
      */
-    @Column(name = "`order`")
-    private Integer order;
+    @Column(name = "`sort`")
+    private Integer sort;
 
     @Column(name = "`create_time`")
     private Date createTime;
@@ -234,19 +234,19 @@ public class Comment implements Serializable {
     /**
      * 获取排序
      *
-     * @return order - 排序
+     * @return sort - 排序
      */
-    public Integer getOrder() {
-        return order;
+    public Integer getSort() {
+        return sort;
     }
 
     /**
      * 设置排序
      *
-     * @param order 排序
+     * @param sort 排序
      */
-    public void setOrder(Integer order) {
-        this.order = order;
+    public void setSort(Integer sort) {
+        this.sort = sort;
     }
 
     /**
@@ -292,7 +292,7 @@ public class Comment implements Serializable {
         sb.append(", isShow=").append(isShow);
         sb.append(", isSpecial=").append(isSpecial);
         sb.append(", isSystem=").append(isSystem);
-        sb.append(", order=").append(order);
+        sb.append(", sort=").append(sort);
         sb.append(", createTime=").append(createTime);
         sb.append(", content=").append(content);
         sb.append("]");
@@ -401,10 +401,10 @@ public class Comment implements Serializable {
         /**
          * 设置排序
          *
-         * @param order 排序
+         * @param sort 排序
          */
-        public Builder order(Integer order) {
-            obj.setOrder(order);
+        public Builder sort(Integer sort) {
+            obj.setSort(sort);
             return this;
         }
 

+ 12 - 12
server/data/src/main/java/com/qxgmat/data/dao/entity/ExaminationStruct.java

@@ -31,8 +31,8 @@ public class ExaminationStruct implements Serializable {
     /**
      * 排序:从大到小
      */
-    @Column(name = "`order`")
-    private Integer order;
+    @Column(name = "`sort`")
+    private Integer sort;
 
     /**
      * 层级:从1开始
@@ -137,19 +137,19 @@ public class ExaminationStruct implements Serializable {
     /**
      * 获取排序:从大到小
      *
-     * @return order - 排序:从大到小
+     * @return sort - 排序:从大到小
      */
-    public Integer getOrder() {
-        return order;
+    public Integer getSort() {
+        return sort;
     }
 
     /**
      * 设置排序:从大到小
      *
-     * @param order 排序:从大到小
+     * @param sort 排序:从大到小
      */
-    public void setOrder(Integer order) {
-        this.order = order;
+    public void setSort(Integer sort) {
+        this.sort = sort;
     }
 
     /**
@@ -252,7 +252,7 @@ public class ExaminationStruct implements Serializable {
         sb.append(", titleZh=").append(titleZh);
         sb.append(", titleEn=").append(titleEn);
         sb.append(", parentId=").append(parentId);
-        sb.append(", order=").append(order);
+        sb.append(", sort=").append(sort);
         sb.append(", level=").append(level);
         sb.append(", isAdapt=").append(isAdapt);
         sb.append(", questionStatus=").append(questionStatus);
@@ -314,10 +314,10 @@ public class ExaminationStruct implements Serializable {
         /**
          * 设置排序:从大到小
          *
-         * @param order 排序:从大到小
+         * @param sort 排序:从大到小
          */
-        public Builder order(Integer order) {
-            obj.setOrder(order);
+        public Builder sort(Integer sort) {
+            obj.setSort(sort);
             return this;
         }
 

+ 0 - 229
server/data/src/main/java/com/qxgmat/data/dao/entity/ExercisePaperQuestion.java

@@ -1,229 +0,0 @@
-package com.qxgmat.data.dao.entity;
-
-import java.io.Serializable;
-import javax.persistence.*;
-
-@Table(name = "exercise_paper_question")
-public class ExercisePaperQuestion implements Serializable {
-    @Id
-    @Column(name = "`id`")
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Integer id;
-
-    /**
-     * 练习册:组卷id
-     */
-    @Column(name = "`paper_id`")
-    private Integer paperId;
-
-    /**
-     * 题目id
-     */
-    @Column(name = "`question_id`")
-    private Integer questionId;
-
-    /**
-     * 题目编号id
-     */
-    @Column(name = "`question_no_id`")
-    private Integer questionNoId;
-
-    /**
-     * 序号
-     */
-    @Column(name = "`no`")
-    private Integer no;
-
-    @Column(name = "`status`")
-    private Integer status;
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * @return id
-     */
-    public Integer getId() {
-        return id;
-    }
-
-    /**
-     * @param id
-     */
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    /**
-     * 获取练习册:组卷id
-     *
-     * @return paper_id - 练习册:组卷id
-     */
-    public Integer getPaperId() {
-        return paperId;
-    }
-
-    /**
-     * 设置练习册:组卷id
-     *
-     * @param paperId 练习册:组卷id
-     */
-    public void setPaperId(Integer paperId) {
-        this.paperId = paperId;
-    }
-
-    /**
-     * 获取题目id
-     *
-     * @return question_id - 题目id
-     */
-    public Integer getQuestionId() {
-        return questionId;
-    }
-
-    /**
-     * 设置题目id
-     *
-     * @param questionId 题目id
-     */
-    public void setQuestionId(Integer questionId) {
-        this.questionId = questionId;
-    }
-
-    /**
-     * 获取题目编号id
-     *
-     * @return question_no_id - 题目编号id
-     */
-    public Integer getQuestionNoId() {
-        return questionNoId;
-    }
-
-    /**
-     * 设置题目编号id
-     *
-     * @param questionNoId 题目编号id
-     */
-    public void setQuestionNoId(Integer questionNoId) {
-        this.questionNoId = questionNoId;
-    }
-
-    /**
-     * 获取序号
-     *
-     * @return no - 序号
-     */
-    public Integer getNo() {
-        return no;
-    }
-
-    /**
-     * 设置序号
-     *
-     * @param no 序号
-     */
-    public void setNo(Integer no) {
-        this.no = no;
-    }
-
-    /**
-     * @return status
-     */
-    public Integer getStatus() {
-        return status;
-    }
-
-    /**
-     * @param status
-     */
-    public void setStatus(Integer status) {
-        this.status = status;
-    }
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append(getClass().getSimpleName());
-        sb.append(" [");
-        sb.append("Hash = ").append(hashCode());
-        sb.append(", id=").append(id);
-        sb.append(", paperId=").append(paperId);
-        sb.append(", questionId=").append(questionId);
-        sb.append(", questionNoId=").append(questionNoId);
-        sb.append(", no=").append(no);
-        sb.append(", status=").append(status);
-        sb.append("]");
-        return sb.toString();
-    }
-
-    public static ExercisePaperQuestion.Builder builder() {
-        return new ExercisePaperQuestion.Builder();
-    }
-
-    public static class Builder {
-        private ExercisePaperQuestion obj;
-
-        public Builder() {
-            this.obj = new ExercisePaperQuestion();
-        }
-
-        /**
-         * @param id
-         */
-        public Builder id(Integer id) {
-            obj.setId(id);
-            return this;
-        }
-
-        /**
-         * 设置练习册:组卷id
-         *
-         * @param paperId 练习册:组卷id
-         */
-        public Builder paperId(Integer paperId) {
-            obj.setPaperId(paperId);
-            return this;
-        }
-
-        /**
-         * 设置题目id
-         *
-         * @param questionId 题目id
-         */
-        public Builder questionId(Integer questionId) {
-            obj.setQuestionId(questionId);
-            return this;
-        }
-
-        /**
-         * 设置题目编号id
-         *
-         * @param questionNoId 题目编号id
-         */
-        public Builder questionNoId(Integer questionNoId) {
-            obj.setQuestionNoId(questionNoId);
-            return this;
-        }
-
-        /**
-         * 设置序号
-         *
-         * @param no 序号
-         */
-        public Builder no(Integer no) {
-            obj.setNo(no);
-            return this;
-        }
-
-        /**
-         * @param status
-         */
-        public Builder status(Integer status) {
-            obj.setStatus(status);
-            return this;
-        }
-
-        public ExercisePaperQuestion build() {
-            return this.obj;
-        }
-    }
-}

+ 12 - 12
server/data/src/main/java/com/qxgmat/data/dao/entity/ExerciseStruct.java

@@ -31,8 +31,8 @@ public class ExerciseStruct implements Serializable {
     /**
      * 排序:从大到小
      */
-    @Column(name = "`order`")
-    private Integer order;
+    @Column(name = "`sort`")
+    private Integer sort;
 
     /**
      * 层级:从1开始
@@ -152,19 +152,19 @@ public class ExerciseStruct implements Serializable {
     /**
      * 获取排序:从大到小
      *
-     * @return order - 排序:从大到小
+     * @return sort - 排序:从大到小
      */
-    public Integer getOrder() {
-        return order;
+    public Integer getSort() {
+        return sort;
     }
 
     /**
      * 设置排序:从大到小
      *
-     * @param order 排序:从大到小
+     * @param sort 排序:从大到小
      */
-    public void setOrder(Integer order) {
-        this.order = order;
+    public void setSort(Integer sort) {
+        this.sort = sort;
     }
 
     /**
@@ -317,7 +317,7 @@ public class ExerciseStruct implements Serializable {
         sb.append(", titleZh=").append(titleZh);
         sb.append(", titleEn=").append(titleEn);
         sb.append(", parentId=").append(parentId);
-        sb.append(", order=").append(order);
+        sb.append(", sort=").append(sort);
         sb.append(", level=").append(level);
         sb.append(", questionStatus=").append(questionStatus);
         sb.append(", isCourse=").append(isCourse);
@@ -382,10 +382,10 @@ public class ExerciseStruct implements Serializable {
         /**
          * 设置排序:从大到小
          *
-         * @param order 排序:从大到小
+         * @param sort 排序:从大到小
          */
-        public Builder order(Integer order) {
-            obj.setOrder(order);
+        public Builder sort(Integer sort) {
+            obj.setSort(sort);
             return this;
         }
 

+ 12 - 12
server/data/src/main/java/com/qxgmat/data/dao/entity/Faq.java

@@ -80,8 +80,8 @@ public class Faq implements Serializable {
     /**
      * 排序
      */
-    @Column(name = "`order`")
-    private Integer order;
+    @Column(name = "`sort`")
+    private Integer sort;
 
     @Column(name = "`create_time`")
     private Date createTime;
@@ -315,19 +315,19 @@ public class Faq implements Serializable {
     /**
      * 获取排序
      *
-     * @return order - 排序
+     * @return sort - 排序
      */
-    public Integer getOrder() {
-        return order;
+    public Integer getSort() {
+        return sort;
     }
 
     /**
      * 设置排序
      *
-     * @param order 排序
+     * @param sort 排序
      */
-    public void setOrder(Integer order) {
-        this.order = order;
+    public void setSort(Integer sort) {
+        this.sort = sort;
     }
 
     /**
@@ -398,7 +398,7 @@ public class Faq implements Serializable {
         sb.append(", answerStatus=").append(answerStatus);
         sb.append(", answerTime=").append(answerTime);
         sb.append(", isSystem=").append(isSystem);
-        sb.append(", order=").append(order);
+        sb.append(", sort=").append(sort);
         sb.append(", createTime=").append(createTime);
         sb.append(", content=").append(content);
         sb.append(", answer=").append(answer);
@@ -548,10 +548,10 @@ public class Faq implements Serializable {
         /**
          * 设置排序
          *
-         * @param order 排序
+         * @param sort 排序
          */
-        public Builder order(Integer order) {
-            obj.setOrder(order);
+        public Builder sort(Integer sort) {
+            obj.setSort(sort);
             return this;
         }
 

+ 12 - 12
server/data/src/main/java/com/qxgmat/data/dao/entity/UserAskCourse.java

@@ -80,8 +80,8 @@ public class UserAskCourse implements Serializable {
     /**
      * 排序:从大到小
      */
-    @Column(name = "`order`")
-    private Integer order;
+    @Column(name = "`sort`")
+    private Integer sort;
 
     @Column(name = "`create_time`")
     private Date createTime;
@@ -318,19 +318,19 @@ public class UserAskCourse implements Serializable {
     /**
      * 获取排序:从大到小
      *
-     * @return order - 排序:从大到小
+     * @return sort - 排序:从大到小
      */
-    public Integer getOrder() {
-        return order;
+    public Integer getSort() {
+        return sort;
     }
 
     /**
      * 设置排序:从大到小
      *
-     * @param order 排序:从大到小
+     * @param sort 排序:从大到小
      */
-    public void setOrder(Integer order) {
-        this.order = order;
+    public void setSort(Integer sort) {
+        this.sort = sort;
     }
 
     /**
@@ -415,7 +415,7 @@ public class UserAskCourse implements Serializable {
         sb.append(", managerId=").append(managerId);
         sb.append(", showStatus=").append(showStatus);
         sb.append(", answerTime=").append(answerTime);
-        sb.append(", order=").append(order);
+        sb.append(", sort=").append(sort);
         sb.append(", createTime=").append(createTime);
         sb.append(", updateTime=").append(updateTime);
         sb.append(", content=").append(content);
@@ -566,10 +566,10 @@ public class UserAskCourse implements Serializable {
         /**
          * 设置排序:从大到小
          *
-         * @param order 排序:从大到小
+         * @param sort 排序:从大到小
          */
-        public Builder order(Integer order) {
-            obj.setOrder(order);
+        public Builder sort(Integer sort) {
+            obj.setSort(sort);
             return this;
         }
 

+ 12 - 12
server/data/src/main/java/com/qxgmat/data/dao/entity/UserAskQuestion.java

@@ -98,8 +98,8 @@ public class UserAskQuestion implements Serializable {
     /**
      * 排序:从大到小
      */
-    @Column(name = "`order`")
-    private Integer order;
+    @Column(name = "`sort`")
+    private Integer sort;
 
     @Column(name = "`create_time`")
     private Date createTime;
@@ -396,19 +396,19 @@ public class UserAskQuestion implements Serializable {
     /**
      * 获取排序:从大到小
      *
-     * @return order - 排序:从大到小
+     * @return sort - 排序:从大到小
      */
-    public Integer getOrder() {
-        return order;
+    public Integer getSort() {
+        return sort;
     }
 
     /**
      * 设置排序:从大到小
      *
-     * @param order 排序:从大到小
+     * @param sort 排序:从大到小
      */
-    public void setOrder(Integer order) {
-        this.order = order;
+    public void setSort(Integer sort) {
+        this.sort = sort;
     }
 
     /**
@@ -514,7 +514,7 @@ public class UserAskQuestion implements Serializable {
         sb.append(", managerId=").append(managerId);
         sb.append(", showStatus=").append(showStatus);
         sb.append(", answerTime=").append(answerTime);
-        sb.append(", order=").append(order);
+        sb.append(", sort=").append(sort);
         sb.append(", createTime=").append(createTime);
         sb.append(", updateTime=").append(updateTime);
         sb.append(", originContent=").append(originContent);
@@ -696,10 +696,10 @@ public class UserAskQuestion implements Serializable {
         /**
          * 设置排序:从大到小
          *
-         * @param order 排序:从大到小
+         * @param sort 排序:从大到小
          */
-        public Builder order(Integer order) {
-            obj.setOrder(order);
+        public Builder sort(Integer sort) {
+            obj.setSort(sort);
             return this;
         }
 

+ 2 - 2
server/data/src/main/java/com/qxgmat/data/dao/mapping/CommentMapper.xml

@@ -14,7 +14,7 @@
     <result column="is_show" jdbcType="INTEGER" property="isShow" />
     <result column="is_special" jdbcType="INTEGER" property="isSpecial" />
     <result column="is_system" jdbcType="INTEGER" property="isSystem" />
-    <result column="order" jdbcType="INTEGER" property="order" />
+    <result column="sort" jdbcType="INTEGER" property="sort" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
   </resultMap>
   <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.qxgmat.data.dao.entity.Comment">
@@ -28,7 +28,7 @@
       WARNING - @mbg.generated
     -->
     `id`, `user_id`, `nickname`, `avatar`, `channel`, `position`, `is_show`, `is_special`, 
-    `is_system`, `order`, `create_time`
+    `is_system`, `sort`, `create_time`
   </sql>
   <sql id="Blob_Column_List">
     <!--

+ 2 - 2
server/data/src/main/java/com/qxgmat/data/dao/mapping/ExaminationStructMapper.xml

@@ -9,7 +9,7 @@
     <result column="title_zh" jdbcType="VARCHAR" property="titleZh" />
     <result column="title_en" jdbcType="VARCHAR" property="titleEn" />
     <result column="parent_id" jdbcType="INTEGER" property="parentId" />
-    <result column="order" jdbcType="INTEGER" property="order" />
+    <result column="sort" jdbcType="INTEGER" property="sort" />
     <result column="level" jdbcType="INTEGER" property="level" />
     <result column="is_adapt" jdbcType="INTEGER" property="isAdapt" />
     <result column="question_status" jdbcType="INTEGER" property="questionStatus" />
@@ -25,7 +25,7 @@
     <!--
       WARNING - @mbg.generated
     -->
-    `id`, `title_zh`, `title_en`, `parent_id`, `order`, `level`, `is_adapt`, `question_status`, 
+    `id`, `title_zh`, `title_en`, `parent_id`, `sort`, `level`, `is_adapt`, `question_status`, 
     `extend`
   </sql>
   <sql id="Blob_Column_List">

+ 0 - 21
server/data/src/main/java/com/qxgmat/data/dao/mapping/ExercisePaperQuestionMapper.xml

@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.qxgmat.data.dao.ExercisePaperQuestionMapper">
-  <resultMap id="BaseResultMap" type="com.qxgmat.data.dao.entity.ExercisePaperQuestion">
-    <!--
-      WARNING - @mbg.generated
-    -->
-    <id column="id" jdbcType="INTEGER" property="id" />
-    <result column="paper_id" jdbcType="INTEGER" property="paperId" />
-    <result column="question_id" jdbcType="INTEGER" property="questionId" />
-    <result column="question_no_id" jdbcType="INTEGER" property="questionNoId" />
-    <result column="no" jdbcType="INTEGER" property="no" />
-    <result column="status" jdbcType="INTEGER" property="status" />
-  </resultMap>
-  <sql id="Base_Column_List">
-    <!--
-      WARNING - @mbg.generated
-    -->
-    `id`, `paper_id`, `question_id`, `question_no_id`, `no`, `status`
-  </sql>
-</mapper>

+ 2 - 2
server/data/src/main/java/com/qxgmat/data/dao/mapping/ExerciseStructMapper.xml

@@ -9,7 +9,7 @@
     <result column="title_zh" jdbcType="VARCHAR" property="titleZh" />
     <result column="title_en" jdbcType="VARCHAR" property="titleEn" />
     <result column="parent_id" jdbcType="INTEGER" property="parentId" />
-    <result column="order" jdbcType="INTEGER" property="order" />
+    <result column="sort" jdbcType="INTEGER" property="sort" />
     <result column="level" jdbcType="INTEGER" property="level" />
     <result column="question_status" jdbcType="INTEGER" property="questionStatus" />
     <result column="is_course" jdbcType="INTEGER" property="isCourse" />
@@ -28,7 +28,7 @@
     <!--
       WARNING - @mbg.generated
     -->
-    `id`, `title_zh`, `title_en`, `parent_id`, `order`, `level`, `question_status`, `is_course`, 
+    `id`, `title_zh`, `title_en`, `parent_id`, `sort`, `level`, `question_status`, `is_course`, 
     `is_data`, `is_sentence`, `is_examination`, `extend`
   </sql>
   <sql id="Blob_Column_List">

+ 2 - 2
server/data/src/main/java/com/qxgmat/data/dao/mapping/FaqMapper.xml

@@ -17,7 +17,7 @@
     <result column="answer_status" jdbcType="INTEGER" property="answerStatus" />
     <result column="answer_time" jdbcType="TIMESTAMP" property="answerTime" />
     <result column="is_system" jdbcType="INTEGER" property="isSystem" />
-    <result column="order" jdbcType="INTEGER" property="order" />
+    <result column="sort" jdbcType="INTEGER" property="sort" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
   </resultMap>
   <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.qxgmat.data.dao.entity.Faq">
@@ -32,7 +32,7 @@
       WARNING - @mbg.generated
     -->
     `id`, `user_id`, `email`, `message`, `channel`, `position`, `manager_id`, `is_show`, 
-    `is_special`, `answer_status`, `answer_time`, `is_system`, `order`, `create_time`
+    `is_special`, `answer_status`, `answer_time`, `is_system`, `sort`, `create_time`
   </sql>
   <sql id="Blob_Column_List">
     <!--

+ 2 - 2
server/data/src/main/java/com/qxgmat/data/dao/mapping/UserAskCourseMapper.xml

@@ -17,7 +17,7 @@
     <result column="manager_id" jdbcType="INTEGER" property="managerId" />
     <result column="show_status" jdbcType="INTEGER" property="showStatus" />
     <result column="answer_time" jdbcType="TIMESTAMP" property="answerTime" />
-    <result column="order" jdbcType="INTEGER" property="order" />
+    <result column="sort" jdbcType="INTEGER" property="sort" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
   </resultMap>
@@ -33,7 +33,7 @@
       WARNING - @mbg.generated
     -->
     `id`, `user_id`, `course_id`, `course_no_id`, `record_id`, `position`, `ask_time`, 
-    `expire_time`, `answer_status`, `manager_id`, `show_status`, `answer_time`, `order`, 
+    `expire_time`, `answer_status`, `manager_id`, `show_status`, `answer_time`, `sort`, 
     `create_time`, `update_time`
   </sql>
   <sql id="Blob_Column_List">

+ 2 - 2
server/data/src/main/java/com/qxgmat/data/dao/mapping/UserAskQuestionMapper.xml

@@ -20,7 +20,7 @@
     <result column="manager_id" jdbcType="INTEGER" property="managerId" />
     <result column="show_status" jdbcType="INTEGER" property="showStatus" />
     <result column="answer_time" jdbcType="TIMESTAMP" property="answerTime" />
-    <result column="order" jdbcType="INTEGER" property="order" />
+    <result column="sort" jdbcType="INTEGER" property="sort" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
   </resultMap>
@@ -38,7 +38,7 @@
     -->
     `id`, `user_id`, `user_question_id`, `ask_module`, `question_module`, `question_id`, 
     `question_no_id`, `record_id`, `target`, `ask_time`, `expire_time`, `answer_status`, 
-    `manager_id`, `show_status`, `answer_time`, `order`, `create_time`, `update_time`
+    `manager_id`, `show_status`, `answer_time`, `sort`, `create_time`, `update_time`
   </sql>
   <sql id="Blob_Column_List">
     <!--

+ 0 - 1
server/data/src/main/java/com/qxgmat/data/relation/ExercisePaperRelationMapper.java

@@ -1,7 +1,6 @@
 package com.qxgmat.data.relation;
 
 import com.qxgmat.data.dao.entity.ExercisePaper;
-import com.qxgmat.data.dao.entity.ExercisePaperQuestion;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

File diff suppressed because it is too large
+ 1375 - 27
server/data/src/main/resources/db/migration/V1__init_table.sql


+ 2 - 2
server/data/src/main/resources/jdbc.properties.d

@@ -3,5 +3,5 @@ jdbc.driverClassName=com.mysql.cj.jdbc.Driver
 # JDBC URL: jdbc:mysql:// + 数据库主机地址 + 端口号 + 数据库名
 jdbc.url=jdbc:mysql://127.0.0.1:3306/qianxing?useUnicode=true&amp;characterEncoding=utf-8&amp;allowMultiQueries=true
 # JDBC 用户名及密码
-jdbc.username=huoxing
-jdbc.password=huoxing
+jdbc.username=qianxing
+jdbc.password=qianxing

+ 1 - 0
server/dependencyDefine.gradle

@@ -42,4 +42,5 @@ ext.libraries = [
         // flyway
         "flyway": "org.flywaydb:flyway-core:5.2.4",
         "flyway-h2": "com.h2database:h2:1.4.197",
+        "flyway-mysql": "mysql:mysql-connector-java",
 ]

+ 2 - 2
server/gateway-api/src/main/java/com/qxgmat/controller/admin/SettingController.java

@@ -299,7 +299,7 @@ public class SettingController {
     @RequestMapping(value = "/service_qx_cat", method = RequestMethod.PUT)
     @ApiOperation(value = "修改千行CAT服务", httpMethod = "PUT")
     private Response<Boolean> editServiceQXCat(@RequestBody @Validated JSONObject dto){
-        Setting entity = settingService.getByKey(SettingKey.SCORE_SWITCH);
+        Setting entity = settingService.getByKey(SettingKey.SERVICE_QX_CAT);
         entity.setValue(dto);
         settingService.edit(entity);
         return ResponseHelp.success(true);
@@ -308,7 +308,7 @@ public class SettingController {
     @RequestMapping(value = "/service_qx_cat", method = RequestMethod.GET)
     @ApiOperation(value = "获取千行CAT服务", httpMethod = "GET")
     private Response<JSONObject> getServiceQXCat(){
-        Setting entity = settingService.getByKey(SettingKey.SCORE_SWITCH);
+        Setting entity = settingService.getByKey(SettingKey.SERVICE_QX_CAT);
 
         return ResponseHelp.success(entity.getValue());
     }

+ 0 - 3
server/gateway-api/src/main/java/com/qxgmat/dto/admin/response/ExerciseQuestionListDto.java

@@ -1,12 +1,9 @@
 package com.qxgmat.dto.admin.response;
 
 import com.nuliji.tools.annotation.Dto;
-import com.qxgmat.data.dao.entity.ExercisePaperQuestion;
-import com.qxgmat.data.dao.entity.QuestionNo;
 import com.qxgmat.data.relation.entity.QuestionNoRelation;
 import com.qxgmat.dto.admin.extend.ExercisePaperExtendDto;
 import com.qxgmat.dto.admin.extend.QuestionExtendDto;
-import com.qxgmat.dto.admin.extend.QuestionNoExtendDto;
 
 
 @Dto(entity = QuestionNoRelation.class)

+ 5 - 5
server/gateway-api/src/main/java/com/qxgmat/service/inline/CommentService.java

@@ -78,7 +78,7 @@ public class CommentService extends AbstractService {
                 example.createCriteria()
                     .orEqualTo("isShow", 1)
         );
-        example.orderBy("order").desc();
+        example.orderBy("sort").desc();
         return select(commentMapper, example, page, size);
     }
 
@@ -125,17 +125,17 @@ public class CommentService extends AbstractService {
      */
     @Transactional
     public void updateOrder(Integer[] ids){
-        int order = ids.length;
+        int sort = ids.length;
         List<Comment> commentList = select(commentMapper, ids);
         Map commentMap = Transform.getMap(commentList, Comment.class, "id");
         for (Integer id : ids){
-            order -= 1;
+            sort -= 1;
             Comment comment = (Comment)commentMap.get(id);
             if (comment == null) continue;
-            if (comment.getOrder() == order) continue;
+            if (comment.getSort() == sort) continue;
             update(commentMapper, Comment.builder()
                     .id(id)
-                    .order(order)
+                    .sort(sort)
                     .build()
             );
         }

+ 0 - 73
server/gateway-api/src/main/java/com/qxgmat/service/inline/ExerciseQuestionService.java

@@ -1,73 +0,0 @@
-package com.qxgmat.service.inline;
-
-import com.github.pagehelper.Page;
-import com.nuliji.tools.AbstractService;
-import com.nuliji.tools.exception.ParameterException;
-import com.nuliji.tools.exception.SystemException;
-import com.qxgmat.data.dao.ExercisePaperQuestionMapper;
-import com.qxgmat.data.dao.entity.ExercisePaperQuestion;
-import com.qxgmat.data.relation.QuestionNoRelationMapper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Service;
-
-import javax.annotation.Resource;
-import java.util.Collection;
-import java.util.List;
-
-@Service
-public class ExerciseQuestionService extends AbstractService {
-    private static final Logger logger = LoggerFactory.getLogger(ExerciseQuestionService.class);
-
-    @Resource
-    private ExercisePaperQuestionMapper exerciseQuestionMapper;
-
-    public ExercisePaperQuestion add(ExercisePaperQuestion question){
-        int result = insert(exerciseQuestionMapper, question);
-        question = one(exerciseQuestionMapper, question.getId());
-        if(question == null){
-            throw new SystemException("题目添加失败");
-        }
-        return question;
-    }
-
-    public ExercisePaperQuestion edit(ExercisePaperQuestion question){
-        ExercisePaperQuestion in = one(exerciseQuestionMapper, question.getId());
-        if(in == null){
-            throw new ParameterException("题目不存在");
-        }
-        int result = update(exerciseQuestionMapper, question);
-        return question;
-    }
-
-    public boolean delete(Number id){
-        ExercisePaperQuestion in = one(exerciseQuestionMapper, id);
-        if(in == null){
-            throw new ParameterException("题目不存在");
-        }
-        int result = delete(exerciseQuestionMapper, id);
-        return result > 0;
-    }
-
-    public ExercisePaperQuestion get(Number id){
-        ExercisePaperQuestion in = one(exerciseQuestionMapper, id);
-
-        if(in == null){
-            throw new ParameterException("题目不存在");
-        }
-        return in;
-    }
-
-    public Page<ExercisePaperQuestion> select(int page, int pageSize){
-        return select(exerciseQuestionMapper, page, pageSize);
-    }
-
-    public Page<ExercisePaperQuestion> select(Integer[] ids){
-        return page(()->select(exerciseQuestionMapper, ids), 1, ids.length);
-    }
-
-    public List<ExercisePaperQuestion> select(Collection ids){
-        return select(exerciseQuestionMapper, ids);
-    }
-
-}

+ 5 - 5
server/gateway-api/src/main/java/com/qxgmat/service/inline/FaqService.java

@@ -77,7 +77,7 @@ public class FaqService extends AbstractService {
                 example.createCriteria()
                         .orEqualTo("isShow", 1)
         );
-        example.orderBy("order").desc();
+        example.orderBy("sort").desc();
         return select(faqMapper, example, page, size);
     }
 
@@ -104,17 +104,17 @@ public class FaqService extends AbstractService {
      */
     @Transactional
     public void updateOrder(Integer[] ids){
-        int order = ids.length;
+        int sort = ids.length;
         List<Faq> faqList = select(faqMapper, ids);
         Map faqMap = Transform.getMap(faqList, Faq.class, "id");
         for (Integer id : ids){
-            order -= 1;
+            sort -= 1;
             Faq faq = (Faq)faqMap.get(id);
             if (faq == null) continue;
-            if (faq.getOrder() == order) continue;
+            if (faq.getSort() == sort) continue;
             update(faqMapper, Faq.builder()
                     .id(id)
-                    .order(order)
+                    .sort(sort)
                     .build()
             );
         }

+ 5 - 5
server/gateway-api/src/main/java/com/qxgmat/service/inline/UserAskCourseService.java

@@ -79,7 +79,7 @@ public class UserAskCourseService extends AbstractService {
                             .andEqualTo("answerStatus", 1)
 
             );
-        example.orderBy("order").desc();
+        example.orderBy("sort").desc();
         return select(userAskCourseMapper, example);
     }
 
@@ -89,17 +89,17 @@ public class UserAskCourseService extends AbstractService {
      */
     @Transactional
     public void updateOrder(Integer[] ids){
-        int order = ids.length;
+        int sort = ids.length;
         List<UserAskCourse> userAskCourseList = select(userAskCourseMapper, ids);
         Map userAskCourseMap = Transform.getMap(userAskCourseList, UserAskCourse.class, "id");
         for (Integer id : ids){
-            order -= 1;
+            sort -= 1;
             UserAskCourse userAskCourse = (UserAskCourse)userAskCourseMap.get(id);
             if (userAskCourse == null) continue;
-            if (userAskCourse.getOrder() == order) continue;
+            if (userAskCourse.getSort() == sort) continue;
             update(userAskCourseMapper, UserAskCourse.builder()
                     .id(id)
-                    .order(order)
+                    .sort(sort)
                     .showStatus(1)
                     .build()
             );

+ 5 - 5
server/gateway-api/src/main/java/com/qxgmat/service/inline/UserAskQuestionService.java

@@ -100,7 +100,7 @@ public class UserAskQuestionService extends AbstractService {
                             .andEqualTo("answerStatus", 1)
 
             );
-        example.orderBy("order").desc();
+        example.orderBy("sort").desc();
         return select(userAskQuestionMapper, example);
     }
 
@@ -110,17 +110,17 @@ public class UserAskQuestionService extends AbstractService {
      */
     @Transactional
     public void updateOrder(Integer[] ids){
-        int order = ids.length;
+        int sort = ids.length;
         List<UserAskQuestion> userAskQuestionList = select(userAskQuestionMapper, ids);
         Map userAskQuestionMap = Transform.getMap(userAskQuestionList, UserAskQuestion.class, "id");
         for (Integer id : ids){
-            order -= 1;
+            sort -= 1;
             UserAskQuestion userAskQuestion = (UserAskQuestion)userAskQuestionMap.get(id);
             if (userAskQuestion == null) continue;
-            if (userAskQuestion.getOrder() == order) continue;
+            if (userAskQuestion.getSort() == sort) continue;
             update(userAskQuestionMapper, UserAskQuestion.builder()
                     .id(id)
-                    .order(order)
+                    .sort(sort)
                     .showStatus(1)
                     .build()
             );

+ 2 - 2
server/gateway-api/src/main/profile/dev/application-runtime.yml

@@ -84,7 +84,7 @@ spring:
     timeout: 5000
 
 upload:
-  local_path: ./upload/
+  local_path: ../upload/
   web_url: /upload/
 
 third:
@@ -110,4 +110,4 @@ video:
 
 url:
   pc: http://www.qianxing.com
-  h5: http://m.qianxing.com
+  h5: http://h5.qianxing.com

+ 9 - 5
server/gateway-api/src/main/profile/prod/application-runtime.yml

@@ -1,5 +1,5 @@
 server:
-  port: 8080
+  port: 8888
   tomcat:
     uri-encoding: utf-8
 
@@ -84,7 +84,7 @@ spring:
     timeout: 0
 
 upload:
-  local_path: ./upload/
+  local_path: ../upload/
   web_url: /upload/
 
 third:
@@ -101,10 +101,14 @@ third:
     courseTemplate: 1312
 
 
-  redirectUrl: http://www.qianxing.com/gateway/oauth
+  redirectUrl: http://www.duoshaojiaoyu.com/gateway/oauth
 
 pay:
-  notifyUrl: http://www.qianxing.com/gateway/pay
+  notifyUrl: http://www.duoshaojiaoyu.com/gateway/pay
 
 video:
-  ffmpeg: ffmpeg
+  ffmpeg: ffmpeg
+
+url:
+  pc: http://www.duoshaojiaoyu.com
+  h5: http://h5.duoshaojiaoyu.com

+ 11 - 7
server/gateway-api/src/main/profile/test/application-runtime.yml

@@ -1,5 +1,5 @@
 server:
-  port: 8080
+  port: 8888
   tomcat:
     uri-encoding: utf-8
 
@@ -84,7 +84,7 @@ spring:
     timeout: 0
 
 upload:
-  local_path: ./upload/
+  local_path: ../upload/
   web_url: /upload/
 
 third:
@@ -94,17 +94,21 @@ third:
       appSecret: 51b8bf5029502d8eccb7a658529b1372
 
     native:
-      appId: wxbee75af2ece94ed7
-      appSecret: efdef63acfae765b0b890072e12a0198
+      appId: wx65c7d378b4184bcc
+      appSecret: 1c14eb97a156863770e115463c44a83f
 
     questionTemplate: 123123
     courseTemplate: 1312
 
 
-  redirectUrl: http://www.qianxing.com/gateway/oauth
+  redirectUrl: http://test.duoshaojiaoyu.com/gateway/oauth
 
 pay:
-  notifyUrl: http://www.qianxing.com/gateway/pay
+  notifyUrl: http://test.duoshaojiaoyu.com/gateway/pay
 
 video:
-  ffmpeg: ffmpeg
+  ffmpeg: ffmpeg
+
+url:
+  pc: http://test.duoshaojiaoyu.com
+  h5: http://mobiletest.duoshaojiaoyu.com