浏览代码

增加前端自动打包的脚本,增加dockerfile配置和nginx配置,统一修改后台package名

Feick 5 年之前
父节点
当前提交
5f8ca67a00
共有 100 个文件被更改,包括 309 次插入201 次删除
  1. 5 0
      src/main/frontend/Dockerfile
  2. 18 0
      src/main/frontend/README.md
  3. 7 0
      src/main/frontend/buildAndRun.sh
  4. 34 0
      src/main/frontend/nginx.conf
  5. 38 14
      src/main/frontend/package-lock.json
  6. 0 0
      src/main/frontend/static/css/app.6bf83fdc.css
  7. 0 0
      src/main/frontend/static/css/chunk-vendors.c2bd9410.css
  8. 二进制
      src/main/frontend/static/favicon.ico
  9. 二进制
      src/main/frontend/static/fonts/element-icons.535877f5.woff
  10. 二进制
      src/main/frontend/static/fonts/element-icons.732389de.ttf
  11. 二进制
      src/main/frontend/static/img/3.ba189079.png
  12. 二进制
      src/main/frontend/static/img/BANNER.29b119c5.jpg
  13. 二进制
      src/main/frontend/static/img/LOGO.6977afc0.png
  14. 二进制
      src/main/frontend/static/img/boatman.cd2ba757.png
  15. 二进制
      src/main/frontend/static/img/calculate.12141d19.png
  16. 二进制
      src/main/frontend/static/img/card1.51086fa1.png
  17. 二进制
      src/main/frontend/static/img/card2.1e9b8f21.png
  18. 二进制
      src/main/frontend/static/img/card3.9aa2ff77.png
  19. 二进制
      src/main/frontend/static/img/card4.4e4b82a1.png
  20. 二进制
      src/main/frontend/static/img/elephant.568d921d.png
  21. 二进制
      src/main/frontend/static/img/gradeBack.184cc5c5.png
  22. 二进制
      src/main/frontend/static/img/icon1.bdc4fc1a.png
  23. 二进制
      src/main/frontend/static/img/iconUser.e47ece08.png
  24. 二进制
      src/main/frontend/static/img/loginBack.6704bf2a.jpg
  25. 二进制
      src/main/frontend/static/img/next.dd00c850.png
  26. 二进制
      src/main/frontend/static/img/pic1.c98afab0.png
  27. 二进制
      src/main/frontend/static/img/pic2.c95d88ec.png
  28. 二进制
      src/main/frontend/static/img/pic3.a3674c60.png
  29. 二进制
      src/main/frontend/static/img/pre.e3983079.png
  30. 二进制
      src/main/frontend/static/img/restBack.6e0001ec.jpg
  31. 二进制
      src/main/frontend/static/img/resultPageLeft.6cfb02f5.png
  32. 二进制
      src/main/frontend/static/img/title.1951c4c5.png
  33. 二进制
      src/main/frontend/static/img/top-back.d2b53773.png
  34. 二进制
      src/main/frontend/static/img/words.6e416c35.png
  35. 34 0
      src/main/frontend/static/index.html
  36. 0 0
      src/main/frontend/static/js/app.924f4d90.js
  37. 0 0
      src/main/frontend/static/js/app.924f4d90.js.map
  38. 0 0
      src/main/frontend/static/js/chunk-vendors.5c10d657.js
  39. 0 0
      src/main/frontend/static/js/chunk-vendors.5c10d657.js.map
  40. 1 1
      src/main/java/com/yaoxiang/diagnosis/BootApplication.java
  41. 1 1
      src/main/java/com/yaoxiang/diagnosis/cache/DbCache.java
  42. 2 2
      src/main/java/com/yaoxiang/diagnosis/cache/DbCacheFactory.java
  43. 2 2
      src/main/java/com/yaoxiang/diagnosis/cache/instance/DbCacheDemo.java
  44. 5 5
      src/main/java/com/yaoxiang/diagnosis/cache/instance/OptionCache.java
  45. 5 5
      src/main/java/com/yaoxiang/diagnosis/cache/instance/PaperCache.java
  46. 5 5
      src/main/java/com/yaoxiang/diagnosis/cache/instance/QuestionCache.java
  47. 1 1
      src/main/java/com/yaoxiang/diagnosis/config/AnyTrustManager.java
  48. 1 1
      src/main/java/com/yaoxiang/diagnosis/config/Constants.java
  49. 1 1
      src/main/java/com/yaoxiang/diagnosis/config/DiagnosisConfig.java
  50. 2 2
      src/main/java/com/yaoxiang/diagnosis/config/LogOperator.java
  51. 2 2
      src/main/java/com/yaoxiang/diagnosis/config/LoginSuccessHandler.java
  52. 3 3
      src/main/java/com/yaoxiang/diagnosis/config/MinioConfig.java
  53. 1 1
      src/main/java/com/yaoxiang/diagnosis/config/MinioProperties.java
  54. 1 4
      src/main/java/com/yaoxiang/diagnosis/config/MvcConfig.java
  55. 1 1
      src/main/java/com/yaoxiang/diagnosis/config/RedisConfig.java
  56. 2 2
      src/main/java/com/yaoxiang/diagnosis/config/StartUpWork.java
  57. 1 1
      src/main/java/com/yaoxiang/diagnosis/config/Swagger2Config.java
  58. 1 1
      src/main/java/com/yaoxiang/diagnosis/config/UploadProperties.java
  59. 5 5
      src/main/java/com/yaoxiang/diagnosis/config/WebSecurityConfig.java
  60. 9 9
      src/main/java/com/yaoxiang/diagnosis/controller/ExcelController.java
  61. 4 4
      src/main/java/com/yaoxiang/diagnosis/controller/FileController.java
  62. 4 4
      src/main/java/com/yaoxiang/diagnosis/controller/OpenController.java
  63. 4 4
      src/main/java/com/yaoxiang/diagnosis/controller/OptionController.java
  64. 5 5
      src/main/java/com/yaoxiang/diagnosis/controller/PaperCommitController.java
  65. 8 8
      src/main/java/com/yaoxiang/diagnosis/controller/PaperController.java
  66. 9 12
      src/main/java/com/yaoxiang/diagnosis/controller/PaperResultController.java
  67. 5 9
      src/main/java/com/yaoxiang/diagnosis/controller/QuestionController.java
  68. 3 3
      src/main/java/com/yaoxiang/diagnosis/controller/RemarkTemplateController.java
  69. 9 11
      src/main/java/com/yaoxiang/diagnosis/controller/ReportController.java
  70. 8 9
      src/main/java/com/yaoxiang/diagnosis/controller/TestController.java
  71. 4 4
      src/main/java/com/yaoxiang/diagnosis/controller/UserInfoController.java
  72. 7 7
      src/main/java/com/yaoxiang/diagnosis/controller/UserManagerController.java
  73. 2 2
      src/main/java/com/yaoxiang/diagnosis/dao/AbilityScoreRepo.java
  74. 2 2
      src/main/java/com/yaoxiang/diagnosis/dao/AuthorityRepo.java
  75. 2 2
      src/main/java/com/yaoxiang/diagnosis/dao/BaseMatterRepo.java
  76. 2 2
      src/main/java/com/yaoxiang/diagnosis/dao/ChapterRepo.java
  77. 2 2
      src/main/java/com/yaoxiang/diagnosis/dao/CommonMatterRepo.java
  78. 2 2
      src/main/java/com/yaoxiang/diagnosis/dao/KnowledgeMatterRepo.java
  79. 2 2
      src/main/java/com/yaoxiang/diagnosis/dao/MistakeMatterRepo.java
  80. 2 3
      src/main/java/com/yaoxiang/diagnosis/dao/OptionRepo.java
  81. 2 2
      src/main/java/com/yaoxiang/diagnosis/dao/PaperCommitRepo.java
  82. 2 2
      src/main/java/com/yaoxiang/diagnosis/dao/PaperCountRepo.java
  83. 2 2
      src/main/java/com/yaoxiang/diagnosis/dao/PaperRepo.java
  84. 2 2
      src/main/java/com/yaoxiang/diagnosis/dao/PaperResultRepo.java
  85. 2 2
      src/main/java/com/yaoxiang/diagnosis/dao/PaperTemplateRepo.java
  86. 2 2
      src/main/java/com/yaoxiang/diagnosis/dao/QuestionRepo.java
  87. 2 2
      src/main/java/com/yaoxiang/diagnosis/dao/RemarkTemplateRepo.java
  88. 2 2
      src/main/java/com/yaoxiang/diagnosis/dao/ReportRepo.java
  89. 2 2
      src/main/java/com/yaoxiang/diagnosis/dao/RoleRepo.java
  90. 2 2
      src/main/java/com/yaoxiang/diagnosis/dao/ScoreSegmentRepo.java
  91. 2 2
      src/main/java/com/yaoxiang/diagnosis/dao/SectionRepo.java
  92. 2 2
      src/main/java/com/yaoxiang/diagnosis/dao/SubjectAbilityRepo.java
  93. 2 2
      src/main/java/com/yaoxiang/diagnosis/dao/SubjectKnowledgeRepo.java
  94. 2 2
      src/main/java/com/yaoxiang/diagnosis/dao/SubjectRepo.java
  95. 2 2
      src/main/java/com/yaoxiang/diagnosis/dao/UserRepo.java
  96. 1 1
      src/main/java/com/yaoxiang/diagnosis/entity/AbilityScore.java
  97. 1 1
      src/main/java/com/yaoxiang/diagnosis/entity/Authority.java
  98. 1 1
      src/main/java/com/yaoxiang/diagnosis/entity/BaseMatter.java
  99. 1 1
      src/main/java/com/yaoxiang/diagnosis/entity/Chapter.java
  100. 1 1
      src/main/java/com/yaoxiang/diagnosis/entity/CommentAfterExam.java

+ 5 - 0
src/main/frontend/Dockerfile

@@ -0,0 +1,5 @@
+FROM nginx:alpine
+VOLUME /usr/share/nginx/html
+COPY static /usr/share/nginx/html
+COPY nginx.conf /etc/nginx/nginx.conf
+EXPOSE 80

+ 18 - 0
src/main/frontend/README.md

@@ -0,0 +1,18 @@
+### platform config
+#### download node
+```
+https://nodejs.org/en/
+```
+#### install useful components
+* @vue/cli
+* webpack
+
+#### project init
+```
+npm install
+```
+
+#### project build
+```
+npm run build
+```

+ 7 - 0
src/main/frontend/buildAndRun.sh

@@ -0,0 +1,7 @@
+set -e
+echo "build and run frontend"
+npm run build
+date=`date +%Y%m%d`
+
+docker build -t feick/diagnosis-frontend:$date .
+docker run --rm -p 9091:80 feick/diagnosis-frontend:$date

+ 34 - 0
src/main/frontend/nginx.conf

@@ -0,0 +1,34 @@
+#user  nobody;
+worker_processes  1;
+
+events {
+    worker_connections  1024;
+}
+
+http {
+    include       mime.types;
+    default_type  application/octet-stream;
+    sendfile        on;
+    #tcp_nopush     on;
+    keepalive_timeout  65;
+    #gzip  on;
+
+    server {
+        listen       80;
+        server_name  localhost;
+
+        charset utf-8;
+        access_log  /usr/share/nginx/logs/host.access.log;
+
+    	location /rest/diagnosis {
+    	    proxy_pass http://diagnosis:8080/;
+    	}
+
+    	location / {
+    	    root /usr/share/nginx/html;
+    	    index index.html;
+    	}
+
+    }
+
+}

+ 38 - 14
src/main/frontend/package-lock.json

@@ -2873,7 +2873,8 @@
       "version": "4.6.0",
       "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
       "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "coa": {
       "version": "2.0.2",
@@ -5003,7 +5004,8 @@
         "ansi-regex": {
           "version": "2.1.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "aproba": {
           "version": "1.2.0",
@@ -5024,12 +5026,14 @@
         "balanced-match": {
           "version": "1.0.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -5044,17 +5048,20 @@
         "code-point-at": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "concat-map": {
           "version": "0.0.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "console-control-strings": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -5171,7 +5178,8 @@
         "inherits": {
           "version": "2.0.3",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "ini": {
           "version": "1.3.5",
@@ -5183,6 +5191,7 @@
           "version": "1.0.0",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -5197,6 +5206,7 @@
           "version": "3.0.4",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
@@ -5204,12 +5214,14 @@
         "minimist": {
           "version": "0.0.8",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "minipass": {
           "version": "2.3.5",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "safe-buffer": "^5.1.2",
             "yallist": "^3.0.0"
@@ -5228,6 +5240,7 @@
           "version": "0.5.1",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
@@ -5308,7 +5321,8 @@
         "number-is-nan": {
           "version": "1.0.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -5320,6 +5334,7 @@
           "version": "1.4.0",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -5405,7 +5420,8 @@
         "safe-buffer": {
           "version": "5.1.2",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "safer-buffer": {
           "version": "2.1.2",
@@ -5441,6 +5457,7 @@
           "version": "1.0.2",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
@@ -5460,6 +5477,7 @@
           "version": "3.0.1",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "ansi-regex": "^2.0.0"
           }
@@ -5503,12 +5521,14 @@
         "wrappy": {
           "version": "1.0.2",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "yallist": {
           "version": "3.0.3",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         }
       }
     },
@@ -6888,6 +6908,7 @@
       "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
       "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
       "dev": true,
+      "optional": true,
       "requires": {
         "prelude-ls": "~1.1.2",
         "type-check": "~0.3.2"
@@ -8937,7 +8958,8 @@
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
       "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "prepend-http": {
       "version": "2.0.0",
@@ -9662,7 +9684,8 @@
       "version": "4.0.8",
       "resolved": "https://registry.npmjs.org/rx-lite/-/rx-lite-4.0.8.tgz",
       "integrity": "sha1-Cx4Rr4vESDbwSmQH6S2kJGe3lEQ=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "rx-lite-aggregates": {
       "version": "4.0.8",
@@ -11222,6 +11245,7 @@
       "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
       "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
       "dev": true,
+      "optional": true,
       "requires": {
         "prelude-ls": "~1.1.2"
       }

文件差异内容过多而无法显示
+ 0 - 0
src/main/frontend/static/css/app.6bf83fdc.css


文件差异内容过多而无法显示
+ 0 - 0
src/main/frontend/static/css/chunk-vendors.c2bd9410.css


二进制
src/main/frontend/static/favicon.ico


二进制
src/main/frontend/static/fonts/element-icons.535877f5.woff


二进制
src/main/frontend/static/fonts/element-icons.732389de.ttf


二进制
src/main/frontend/static/img/3.ba189079.png


二进制
src/main/frontend/static/img/BANNER.29b119c5.jpg


二进制
src/main/frontend/static/img/LOGO.6977afc0.png


二进制
src/main/frontend/static/img/boatman.cd2ba757.png


二进制
src/main/frontend/static/img/calculate.12141d19.png


二进制
src/main/frontend/static/img/card1.51086fa1.png


二进制
src/main/frontend/static/img/card2.1e9b8f21.png


二进制
src/main/frontend/static/img/card3.9aa2ff77.png


二进制
src/main/frontend/static/img/card4.4e4b82a1.png


二进制
src/main/frontend/static/img/elephant.568d921d.png


二进制
src/main/frontend/static/img/gradeBack.184cc5c5.png


二进制
src/main/frontend/static/img/icon1.bdc4fc1a.png


二进制
src/main/frontend/static/img/iconUser.e47ece08.png


二进制
src/main/frontend/static/img/loginBack.6704bf2a.jpg


二进制
src/main/frontend/static/img/next.dd00c850.png


二进制
src/main/frontend/static/img/pic1.c98afab0.png


二进制
src/main/frontend/static/img/pic2.c95d88ec.png


二进制
src/main/frontend/static/img/pic3.a3674c60.png


二进制
src/main/frontend/static/img/pre.e3983079.png


二进制
src/main/frontend/static/img/restBack.6e0001ec.jpg


二进制
src/main/frontend/static/img/resultPageLeft.6cfb02f5.png


二进制
src/main/frontend/static/img/title.1951c4c5.png


二进制
src/main/frontend/static/img/top-back.d2b53773.png


二进制
src/main/frontend/static/img/words.6e416c35.png


+ 34 - 0
src/main/frontend/static/index.html

@@ -0,0 +1,34 @@
+<!DOCTYPE html><html><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=/favicon.ico><title>测试</title><script src="http://cdn.bootcss.com/mathjax/2.7.1/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script><script>function IEVersion() {
+          var userAgent = navigator.userAgent; //取得浏览器的userAgent字符串  
+          var isIE = userAgent.indexOf("compatible") > -1 && userAgent.indexOf("MSIE") > -1; //判断是否IE<11浏览器  
+          var isEdge = userAgent.indexOf("Edge") > -1 && !isIE; //判断是否IE的Edge浏览器  
+          var isIE11 = userAgent.indexOf('Trident') > -1 && userAgent.indexOf("rv:11.0") > -1;
+          if(isIE) {
+              var reIE = new RegExp("MSIE (\\d+\\.\\d+);");
+              reIE.test(userAgent);
+              var fIEVersion = parseFloat(RegExp["$1"]);
+              if(fIEVersion == 7) {
+                  return 7;
+              } else if(fIEVersion == 8) {
+                  return 8;
+              } else if(fIEVersion == 9) {
+                  return 9;
+              } else if(fIEVersion == 10) {
+                  return 10;
+              } else {
+                  return 6;//IE版本<=7
+              }   
+          } else if(isEdge) {
+              return 12;//edge
+          } else if(isIE11) {
+              return 11; //IE11  
+          }else{
+              return -1;//不是ie浏览器
+          }
+      }
+      var version = IEVersion();
+      if(version != -1 && version < 10) {
+          if(window.confirm("您的浏览器版本过低,推荐使用IE10及以上浏览器或者chrome浏览器,点击确定下载chrome安装浏览器。若是360等浏览器,开启兼容模式")){
+              window.open("/download/44.0.2403.89_chrome_installer.exe", "_blank");
+          }
+      }</script><link href=/css/app.6bf83fdc.css rel=preload as=style><link href=/css/chunk-vendors.c2bd9410.css rel=preload as=style><link href=/js/app.924f4d90.js rel=preload as=script><link href=/js/chunk-vendors.5c10d657.js rel=preload as=script><link href=/css/chunk-vendors.c2bd9410.css rel=stylesheet><link href=/css/app.6bf83fdc.css rel=stylesheet></head><body><noscript><strong>We're sorry but my-project doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=/js/chunk-vendors.5c10d657.js></script><script src=/js/app.924f4d90.js></script></body></html>

文件差异内容过多而无法显示
+ 0 - 0
src/main/frontend/static/js/app.924f4d90.js


文件差异内容过多而无法显示
+ 0 - 0
src/main/frontend/static/js/app.924f4d90.js.map


文件差异内容过多而无法显示
+ 0 - 0
src/main/frontend/static/js/chunk-vendors.5c10d657.js


文件差异内容过多而无法显示
+ 0 - 0
src/main/frontend/static/js/chunk-vendors.5c10d657.js.map


+ 1 - 1
src/main/java/edu/math/diagnosis/BootApplication.java → src/main/java/com/yaoxiang/diagnosis/BootApplication.java

@@ -1,4 +1,4 @@
-package edu.math.diagnosis;
+package com.yaoxiang.diagnosis;
 
 
 import org.springframework.boot.SpringApplication;

+ 1 - 1
src/main/java/edu/math/diagnosis/cache/DbCache.java → src/main/java/com/yaoxiang/diagnosis/cache/DbCache.java

@@ -1,4 +1,4 @@
-package edu.math.diagnosis.cache;
+package com.yaoxiang.diagnosis.cache;
 
 
 import java.util.Date;

+ 2 - 2
src/main/java/edu/math/diagnosis/cache/DbCacheFactory.java → src/main/java/com/yaoxiang/diagnosis/cache/DbCacheFactory.java

@@ -1,7 +1,7 @@
-package edu.math.diagnosis.cache;
+package com.yaoxiang.diagnosis.cache;
 
 
-import edu.math.diagnosis.util.ReflectorUtil;
+import com.yaoxiang.diagnosis.util.ReflectorUtil;
 
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;

+ 2 - 2
src/main/java/edu/math/diagnosis/cache/instance/DbCacheDemo.java → src/main/java/com/yaoxiang/diagnosis/cache/instance/DbCacheDemo.java

@@ -1,6 +1,6 @@
-package edu.math.diagnosis.cache.instance;
+package com.yaoxiang.diagnosis.cache.instance;
 
-import edu.math.diagnosis.cache.DbCache;
+import com.yaoxiang.diagnosis.cache.DbCache;
 
 /**
  * @AUTHOR: DaiFengWen

+ 5 - 5
src/main/java/edu/math/diagnosis/cache/instance/OptionCache.java → src/main/java/com/yaoxiang/diagnosis/cache/instance/OptionCache.java

@@ -1,9 +1,9 @@
-package edu.math.diagnosis.cache.instance;
+package com.yaoxiang.diagnosis.cache.instance;
 
-import edu.math.diagnosis.cache.DbCache;
-import edu.math.diagnosis.config.StartUpWork;
-import edu.math.diagnosis.dao.OptionRepo;
-import edu.math.diagnosis.entity.QuestionOption;
+import com.yaoxiang.diagnosis.config.StartUpWork;
+import com.yaoxiang.diagnosis.dao.OptionRepo;
+import com.yaoxiang.diagnosis.entity.QuestionOption;
+import com.yaoxiang.diagnosis.cache.DbCache;
 
 import java.util.ArrayList;
 import java.util.HashMap;

+ 5 - 5
src/main/java/edu/math/diagnosis/cache/instance/PaperCache.java → src/main/java/com/yaoxiang/diagnosis/cache/instance/PaperCache.java

@@ -1,9 +1,9 @@
-package edu.math.diagnosis.cache.instance;
+package com.yaoxiang.diagnosis.cache.instance;
 
-import edu.math.diagnosis.cache.DbCache;
-import edu.math.diagnosis.config.StartUpWork;
-import edu.math.diagnosis.dao.PaperRepo;
-import edu.math.diagnosis.entity.Paper;
+import com.yaoxiang.diagnosis.config.StartUpWork;
+import com.yaoxiang.diagnosis.dao.PaperRepo;
+import com.yaoxiang.diagnosis.entity.Paper;
+import com.yaoxiang.diagnosis.cache.DbCache;
 
 import java.util.HashMap;
 import java.util.List;

+ 5 - 5
src/main/java/edu/math/diagnosis/cache/instance/QuestionCache.java → src/main/java/com/yaoxiang/diagnosis/cache/instance/QuestionCache.java

@@ -1,9 +1,9 @@
-package edu.math.diagnosis.cache.instance;
+package com.yaoxiang.diagnosis.cache.instance;
 
-import edu.math.diagnosis.cache.DbCache;
-import edu.math.diagnosis.config.StartUpWork;
-import edu.math.diagnosis.dao.QuestionRepo;
-import edu.math.diagnosis.entity.Question;
+import com.yaoxiang.diagnosis.config.StartUpWork;
+import com.yaoxiang.diagnosis.dao.QuestionRepo;
+import com.yaoxiang.diagnosis.entity.Question;
+import com.yaoxiang.diagnosis.cache.DbCache;
 
 import java.util.ArrayList;
 import java.util.HashMap;

+ 1 - 1
src/main/java/edu/math/diagnosis/config/AnyTrustManager.java → src/main/java/com/yaoxiang/diagnosis/config/AnyTrustManager.java

@@ -1,4 +1,4 @@
-package edu.math.diagnosis.config;
+package com.yaoxiang.diagnosis.config;
 
 import javax.net.ssl.X509TrustManager;
 import java.security.cert.CertificateException;

+ 1 - 1
src/main/java/edu/math/diagnosis/config/Constants.java → src/main/java/com/yaoxiang/diagnosis/config/Constants.java

@@ -1,4 +1,4 @@
-package edu.math.diagnosis.config;
+package com.yaoxiang.diagnosis.config;
 
 
 import org.springframework.security.core.authority.SimpleGrantedAuthority;

+ 1 - 1
src/main/java/edu/math/diagnosis/config/DiagnosisConfig.java → src/main/java/com/yaoxiang/diagnosis/config/DiagnosisConfig.java

@@ -1,4 +1,4 @@
-package edu.math.diagnosis.config;
+package com.yaoxiang.diagnosis.config;
 
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;

+ 2 - 2
src/main/java/edu/math/diagnosis/config/LogOperator.java → src/main/java/com/yaoxiang/diagnosis/config/LogOperator.java

@@ -1,7 +1,7 @@
-package edu.math.diagnosis.config;
+package com.yaoxiang.diagnosis.config;
 
 
-import edu.math.diagnosis.util.SecurityUtil;
+import com.yaoxiang.diagnosis.util.SecurityUtil;
 import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.annotation.Aspect;
 import org.slf4j.Logger;

+ 2 - 2
src/main/java/edu/math/diagnosis/config/LoginSuccessHandler.java → src/main/java/com/yaoxiang/diagnosis/config/LoginSuccessHandler.java

@@ -1,6 +1,6 @@
-package edu.math.diagnosis.config;
+package com.yaoxiang.diagnosis.config;
 
-import edu.math.diagnosis.model.AuthUser;
+import com.yaoxiang.diagnosis.model.AuthUser;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;

+ 3 - 3
src/main/java/edu/math/diagnosis/config/MinioConfig.java → src/main/java/com/yaoxiang/diagnosis/config/MinioConfig.java

@@ -1,7 +1,7 @@
-package edu.math.diagnosis.config;
+package com.yaoxiang.diagnosis.config;
 
-import edu.math.diagnosis.file.FileService;
-import edu.math.diagnosis.file.MinioFileService;
+import com.yaoxiang.diagnosis.file.FileService;
+import com.yaoxiang.diagnosis.file.MinioFileService;
 import io.minio.MinioClient;
 import okhttp3.OkHttpClient;
 import okhttp3.Protocol;

+ 1 - 1
src/main/java/edu/math/diagnosis/config/MinioProperties.java → src/main/java/com/yaoxiang/diagnosis/config/MinioProperties.java

@@ -1,4 +1,4 @@
-package edu.math.diagnosis.config;
+package com.yaoxiang.diagnosis.config;
 
 import org.springframework.boot.context.properties.ConfigurationProperties;
 

+ 1 - 4
src/main/java/edu/math/diagnosis/config/MvcConfig.java → src/main/java/com/yaoxiang/diagnosis/config/MvcConfig.java

@@ -1,14 +1,11 @@
-package edu.math.diagnosis.config;
+package com.yaoxiang.diagnosis.config;
 
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
 import org.springframework.web.servlet.config.annotation.ViewControllerRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
-import javax.annotation.Resource;
-
 @Configuration
 public class MvcConfig {
 

+ 1 - 1
src/main/java/edu/math/diagnosis/config/RedisConfig.java → src/main/java/com/yaoxiang/diagnosis/config/RedisConfig.java

@@ -1,4 +1,4 @@
-package edu.math.diagnosis.config;
+package com.yaoxiang.diagnosis.config;
 
 import com.fasterxml.jackson.annotation.JsonAutoDetect;
 import com.fasterxml.jackson.annotation.PropertyAccessor;

+ 2 - 2
src/main/java/edu/math/diagnosis/config/StartUpWork.java → src/main/java/com/yaoxiang/diagnosis/config/StartUpWork.java

@@ -1,6 +1,6 @@
-package edu.math.diagnosis.config;
+package com.yaoxiang.diagnosis.config;
 
-import edu.math.diagnosis.cache.DbCacheFactory;
+import com.yaoxiang.diagnosis.cache.DbCacheFactory;
 import org.springframework.beans.BeansException;
 import org.springframework.boot.ApplicationArguments;
 import org.springframework.boot.ApplicationRunner;

+ 1 - 1
src/main/java/edu/math/diagnosis/config/Swagger2Config.java → src/main/java/com/yaoxiang/diagnosis/config/Swagger2Config.java

@@ -1,4 +1,4 @@
-package edu.math.diagnosis.config;
+package com.yaoxiang.diagnosis.config;
 
 import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
 import org.springframework.context.annotation.Bean;

+ 1 - 1
src/main/java/edu/math/diagnosis/config/UploadProperties.java → src/main/java/com/yaoxiang/diagnosis/config/UploadProperties.java

@@ -1,4 +1,4 @@
-package edu.math.diagnosis.config;
+package com.yaoxiang.diagnosis.config;
 
 public class UploadProperties {
 

+ 5 - 5
src/main/java/edu/math/diagnosis/config/WebSecurityConfig.java → src/main/java/com/yaoxiang/diagnosis/config/WebSecurityConfig.java

@@ -1,9 +1,9 @@
-package edu.math.diagnosis.config;
+package com.yaoxiang.diagnosis.config;
 
-import edu.math.diagnosis.entity.UserInfo;
-import edu.math.diagnosis.model.AuthUser;
-import edu.math.diagnosis.service.UserService;
-import edu.math.diagnosis.util.MD5Util;
+import com.yaoxiang.diagnosis.entity.UserInfo;
+import com.yaoxiang.diagnosis.service.UserService;
+import com.yaoxiang.diagnosis.util.MD5Util;
+import com.yaoxiang.diagnosis.model.AuthUser;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

+ 9 - 9
src/main/java/edu/math/diagnosis/controller/ExcelController.java → src/main/java/com/yaoxiang/diagnosis/controller/ExcelController.java

@@ -1,12 +1,12 @@
-package edu.math.diagnosis.controller;
-
-import edu.math.diagnosis.config.Constants;
-import edu.math.diagnosis.entity.SubjectKnowledge;
-import edu.math.diagnosis.model.MatterVo;
-import edu.math.diagnosis.model.Result;
-import edu.math.diagnosis.service.KnowledgeService;
-import edu.math.diagnosis.service.MatterService;
-import edu.math.diagnosis.word.KnowledgeUtil;
+package com.yaoxiang.diagnosis.controller;
+
+import com.yaoxiang.diagnosis.config.Constants;
+import com.yaoxiang.diagnosis.entity.SubjectKnowledge;
+import com.yaoxiang.diagnosis.model.MatterVo;
+import com.yaoxiang.diagnosis.model.Result;
+import com.yaoxiang.diagnosis.service.KnowledgeService;
+import com.yaoxiang.diagnosis.service.MatterService;
+import com.yaoxiang.diagnosis.word.KnowledgeUtil;
 import io.swagger.annotations.Api;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;

+ 4 - 4
src/main/java/edu/math/diagnosis/controller/FileController.java → src/main/java/com/yaoxiang/diagnosis/controller/FileController.java

@@ -1,8 +1,8 @@
-package edu.math.diagnosis.controller;
+package com.yaoxiang.diagnosis.controller;
 
-import edu.math.diagnosis.file.FileService;
-import edu.math.diagnosis.model.ResponseMessage;
-import edu.math.diagnosis.util.OSSUtil;
+import com.yaoxiang.diagnosis.file.FileService;
+import com.yaoxiang.diagnosis.util.OSSUtil;
+import com.yaoxiang.diagnosis.model.ResponseMessage;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;

+ 4 - 4
src/main/java/edu/math/diagnosis/controller/OpenController.java → src/main/java/com/yaoxiang/diagnosis/controller/OpenController.java

@@ -1,8 +1,8 @@
-package edu.math.diagnosis.controller;
+package com.yaoxiang.diagnosis.controller;
 
-import edu.math.diagnosis.entity.UserInfo;
-import edu.math.diagnosis.config.Constants;
-import edu.math.diagnosis.service.UserService;
+import com.yaoxiang.diagnosis.entity.UserInfo;
+import com.yaoxiang.diagnosis.config.Constants;
+import com.yaoxiang.diagnosis.service.UserService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.*;

+ 4 - 4
src/main/java/edu/math/diagnosis/controller/OptionController.java → src/main/java/com/yaoxiang/diagnosis/controller/OptionController.java

@@ -1,8 +1,8 @@
-package edu.math.diagnosis.controller;
+package com.yaoxiang.diagnosis.controller;
 
-import edu.math.diagnosis.entity.Question;
-import edu.math.diagnosis.entity.QuestionOption;
-import edu.math.diagnosis.service.OptionService;
+import com.yaoxiang.diagnosis.entity.Question;
+import com.yaoxiang.diagnosis.entity.QuestionOption;
+import com.yaoxiang.diagnosis.service.OptionService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.security.access.prepost.PreAuthorize;

+ 5 - 5
src/main/java/edu/math/diagnosis/controller/PaperCommitController.java → src/main/java/com/yaoxiang/diagnosis/controller/PaperCommitController.java

@@ -1,9 +1,9 @@
-package edu.math.diagnosis.controller;
+package com.yaoxiang.diagnosis.controller;
 
-import edu.math.diagnosis.entity.PaperCommit;
-import edu.math.diagnosis.config.Constants;
-import edu.math.diagnosis.model.Result;
-import edu.math.diagnosis.service.CommitService;
+import com.yaoxiang.diagnosis.entity.PaperCommit;
+import com.yaoxiang.diagnosis.config.Constants;
+import com.yaoxiang.diagnosis.model.Result;
+import com.yaoxiang.diagnosis.service.CommitService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;

+ 8 - 8
src/main/java/edu/math/diagnosis/controller/PaperController.java → src/main/java/com/yaoxiang/diagnosis/controller/PaperController.java

@@ -1,12 +1,12 @@
-package edu.math.diagnosis.controller;
+package com.yaoxiang.diagnosis.controller;
 
-import edu.math.diagnosis.config.Constants;
-import edu.math.diagnosis.entity.Paper;
-import edu.math.diagnosis.file.FileService;
-import edu.math.diagnosis.model.PaperVo;
-import edu.math.diagnosis.model.Result;
-import edu.math.diagnosis.service.PaperService;
-import edu.math.diagnosis.util.CommonUtil;
+import com.yaoxiang.diagnosis.file.FileService;
+import com.yaoxiang.diagnosis.util.CommonUtil;
+import com.yaoxiang.diagnosis.config.Constants;
+import com.yaoxiang.diagnosis.entity.Paper;
+import com.yaoxiang.diagnosis.model.PaperVo;
+import com.yaoxiang.diagnosis.model.Result;
+import com.yaoxiang.diagnosis.service.PaperService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;

+ 9 - 12
src/main/java/edu/math/diagnosis/controller/PaperResultController.java → src/main/java/com/yaoxiang/diagnosis/controller/PaperResultController.java

@@ -1,14 +1,13 @@
-package edu.math.diagnosis.controller;
+package com.yaoxiang.diagnosis.controller;
 
-import edu.math.diagnosis.dao.PaperCommitRepo;
-import edu.math.diagnosis.entity.Paper;
-import edu.math.diagnosis.entity.PaperCommit;
-import edu.math.diagnosis.entity.PaperResult;
-import edu.math.diagnosis.model.PaperResultVo;
-import edu.math.diagnosis.model.Result;
-import edu.math.diagnosis.service.PaperResultService;
-import edu.math.diagnosis.service.PaperService;
-import edu.math.diagnosis.util.ObjectUtil;
+import com.yaoxiang.diagnosis.dao.PaperCommitRepo;
+import com.yaoxiang.diagnosis.entity.Paper;
+import com.yaoxiang.diagnosis.entity.PaperCommit;
+import com.yaoxiang.diagnosis.entity.PaperResult;
+import com.yaoxiang.diagnosis.model.PaperResultVo;
+import com.yaoxiang.diagnosis.model.Result;
+import com.yaoxiang.diagnosis.service.PaperResultService;
+import com.yaoxiang.diagnosis.service.PaperService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
@@ -19,8 +18,6 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
 import java.util.List;
-import java.util.Set;
-import java.util.stream.Collectors;
 
 @Api(tags = "试卷提交后结果生成")
 @RestController

+ 5 - 9
src/main/java/edu/math/diagnosis/controller/QuestionController.java → src/main/java/com/yaoxiang/diagnosis/controller/QuestionController.java

@@ -1,10 +1,9 @@
-package edu.math.diagnosis.controller;
+package com.yaoxiang.diagnosis.controller;
 
-import edu.math.diagnosis.config.UploadProperties;
-import edu.math.diagnosis.entity.Question;
-import edu.math.diagnosis.model.Result;
-import edu.math.diagnosis.service.QuestionService;
-import edu.math.diagnosis.util.DateUtil;
+import com.yaoxiang.diagnosis.config.UploadProperties;
+import com.yaoxiang.diagnosis.entity.Question;
+import com.yaoxiang.diagnosis.model.Result;
+import com.yaoxiang.diagnosis.service.QuestionService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -15,9 +14,6 @@ import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
 import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.IOException;
-import java.util.Date;
 import java.util.concurrent.ExecutorService;
 
 /**

+ 3 - 3
src/main/java/edu/math/diagnosis/controller/RemarkTemplateController.java → src/main/java/com/yaoxiang/diagnosis/controller/RemarkTemplateController.java

@@ -1,8 +1,8 @@
-package edu.math.diagnosis.controller;
+package com.yaoxiang.diagnosis.controller;
 
 
-import edu.math.diagnosis.dao.RemarkTemplateRepo;
-import edu.math.diagnosis.entity.RemarkTemplate;
+import com.yaoxiang.diagnosis.dao.RemarkTemplateRepo;
+import com.yaoxiang.diagnosis.entity.RemarkTemplate;
 import io.swagger.annotations.Api;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;

+ 9 - 11
src/main/java/edu/math/diagnosis/controller/ReportController.java → src/main/java/com/yaoxiang/diagnosis/controller/ReportController.java

@@ -1,14 +1,13 @@
-package edu.math.diagnosis.controller;
+package com.yaoxiang.diagnosis.controller;
 
-import edu.math.diagnosis.entity.Paper;
-import edu.math.diagnosis.entity.PaperResult;
-import edu.math.diagnosis.entity.UserInfo;
-import edu.math.diagnosis.model.Result;
-import edu.math.diagnosis.service.PaperResultService;
-import edu.math.diagnosis.service.PaperService;
-import edu.math.diagnosis.service.SubjectService;
-import edu.math.diagnosis.service.UserService;
-import edu.math.diagnosis.util.CommonUtil;
+import com.yaoxiang.diagnosis.entity.Paper;
+import com.yaoxiang.diagnosis.entity.PaperResult;
+import com.yaoxiang.diagnosis.entity.UserInfo;
+import com.yaoxiang.diagnosis.model.Result;
+import com.yaoxiang.diagnosis.service.PaperResultService;
+import com.yaoxiang.diagnosis.service.PaperService;
+import com.yaoxiang.diagnosis.service.SubjectService;
+import com.yaoxiang.diagnosis.service.UserService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
@@ -19,7 +18,6 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
 @Api(tags = "报告管理")

+ 8 - 9
src/main/java/edu/math/diagnosis/controller/TestController.java → src/main/java/com/yaoxiang/diagnosis/controller/TestController.java

@@ -1,13 +1,12 @@
-package edu.math.diagnosis.controller;
+package com.yaoxiang.diagnosis.controller;
 
-import edu.math.diagnosis.dao.OptionRepo;
-import edu.math.diagnosis.dao.QuestionRepo;
-import edu.math.diagnosis.entity.Question;
-import edu.math.diagnosis.file.FileService;
-import edu.math.diagnosis.model.AuthUser;
-import edu.math.diagnosis.model.Result;
-import edu.math.diagnosis.file.MinioFileService;
-import edu.math.diagnosis.util.SecurityUtil;
+import com.yaoxiang.diagnosis.dao.OptionRepo;
+import com.yaoxiang.diagnosis.dao.QuestionRepo;
+import com.yaoxiang.diagnosis.file.FileService;
+import com.yaoxiang.diagnosis.entity.Question;
+import com.yaoxiang.diagnosis.model.AuthUser;
+import com.yaoxiang.diagnosis.model.Result;
+import com.yaoxiang.diagnosis.util.SecurityUtil;
 import io.swagger.annotations.Api;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

+ 4 - 4
src/main/java/edu/math/diagnosis/controller/UserInfoController.java → src/main/java/com/yaoxiang/diagnosis/controller/UserInfoController.java

@@ -1,8 +1,8 @@
-package edu.math.diagnosis.controller;
+package com.yaoxiang.diagnosis.controller;
 
-import edu.math.diagnosis.entity.UserInfo;
-import edu.math.diagnosis.model.AuthUser;
-import edu.math.diagnosis.util.SecurityUtil;
+import com.yaoxiang.diagnosis.entity.UserInfo;
+import com.yaoxiang.diagnosis.model.AuthUser;
+import com.yaoxiang.diagnosis.util.SecurityUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.GetMapping;

+ 7 - 7
src/main/java/edu/math/diagnosis/controller/UserManagerController.java → src/main/java/com/yaoxiang/diagnosis/controller/UserManagerController.java

@@ -1,11 +1,11 @@
-package edu.math.diagnosis.controller;
+package com.yaoxiang.diagnosis.controller;
 
-import edu.math.diagnosis.entity.UserInfo;
-import edu.math.diagnosis.config.Constants;
-import edu.math.diagnosis.model.AuthUser;
-import edu.math.diagnosis.service.UserService;
-import edu.math.diagnosis.util.MD5Util;
-import edu.math.diagnosis.util.SecurityUtil;
+import com.yaoxiang.diagnosis.util.MD5Util;
+import com.yaoxiang.diagnosis.entity.UserInfo;
+import com.yaoxiang.diagnosis.config.Constants;
+import com.yaoxiang.diagnosis.model.AuthUser;
+import com.yaoxiang.diagnosis.service.UserService;
+import com.yaoxiang.diagnosis.util.SecurityUtil;
 import io.swagger.annotations.Api;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.web.bind.annotation.*;

+ 2 - 2
src/main/java/edu/math/diagnosis/dao/AbilityScoreRepo.java → src/main/java/com/yaoxiang/diagnosis/dao/AbilityScoreRepo.java

@@ -1,6 +1,6 @@
-package edu.math.diagnosis.dao;
+package com.yaoxiang.diagnosis.dao;
 
-import edu.math.diagnosis.entity.AbilityScore;
+import com.yaoxiang.diagnosis.entity.AbilityScore;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 import java.util.List;

+ 2 - 2
src/main/java/edu/math/diagnosis/dao/AuthorityRepo.java → src/main/java/com/yaoxiang/diagnosis/dao/AuthorityRepo.java

@@ -1,6 +1,6 @@
-package edu.math.diagnosis.dao;
+package com.yaoxiang.diagnosis.dao;
 
-import edu.math.diagnosis.entity.Authority;
+import com.yaoxiang.diagnosis.entity.Authority;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 public interface AuthorityRepo extends JpaRepository<Authority, Long> {

+ 2 - 2
src/main/java/edu/math/diagnosis/dao/BaseMatterRepo.java → src/main/java/com/yaoxiang/diagnosis/dao/BaseMatterRepo.java

@@ -1,6 +1,6 @@
-package edu.math.diagnosis.dao;
+package com.yaoxiang.diagnosis.dao;
 
-import edu.math.diagnosis.entity.BaseMatter;
+import com.yaoxiang.diagnosis.entity.BaseMatter;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 public interface BaseMatterRepo  extends JpaRepository<BaseMatter, Long> {

+ 2 - 2
src/main/java/edu/math/diagnosis/dao/ChapterRepo.java → src/main/java/com/yaoxiang/diagnosis/dao/ChapterRepo.java

@@ -1,6 +1,6 @@
-package edu.math.diagnosis.dao;
+package com.yaoxiang.diagnosis.dao;
 
-import edu.math.diagnosis.entity.Chapter;
+import com.yaoxiang.diagnosis.entity.Chapter;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 import java.util.List;

+ 2 - 2
src/main/java/edu/math/diagnosis/dao/CommonMatterRepo.java → src/main/java/com/yaoxiang/diagnosis/dao/CommonMatterRepo.java

@@ -1,6 +1,6 @@
-package edu.math.diagnosis.dao;
+package com.yaoxiang.diagnosis.dao;
 
-import edu.math.diagnosis.entity.CommonMatter;
+import com.yaoxiang.diagnosis.entity.CommonMatter;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 public interface CommonMatterRepo extends JpaRepository<CommonMatter,Long> {

+ 2 - 2
src/main/java/edu/math/diagnosis/dao/KnowledgeMatterRepo.java → src/main/java/com/yaoxiang/diagnosis/dao/KnowledgeMatterRepo.java

@@ -1,6 +1,6 @@
-package edu.math.diagnosis.dao;
+package com.yaoxiang.diagnosis.dao;
 
-import edu.math.diagnosis.entity.KnowledgeMatter;
+import com.yaoxiang.diagnosis.entity.KnowledgeMatter;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 import java.util.List;

+ 2 - 2
src/main/java/edu/math/diagnosis/dao/MistakeMatterRepo.java → src/main/java/com/yaoxiang/diagnosis/dao/MistakeMatterRepo.java

@@ -1,6 +1,6 @@
-package edu.math.diagnosis.dao;
+package com.yaoxiang.diagnosis.dao;
 
-import edu.math.diagnosis.entity.MistakeMatter;
+import com.yaoxiang.diagnosis.entity.MistakeMatter;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 public interface MistakeMatterRepo extends JpaRepository<MistakeMatter,Long> {

+ 2 - 3
src/main/java/edu/math/diagnosis/dao/OptionRepo.java → src/main/java/com/yaoxiang/diagnosis/dao/OptionRepo.java

@@ -1,11 +1,10 @@
-package edu.math.diagnosis.dao;
+package com.yaoxiang.diagnosis.dao;
 
-import edu.math.diagnosis.entity.QuestionOption;
+import com.yaoxiang.diagnosis.entity.QuestionOption;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * @AUTHOR: DaiFengWen

+ 2 - 2
src/main/java/edu/math/diagnosis/dao/PaperCommitRepo.java → src/main/java/com/yaoxiang/diagnosis/dao/PaperCommitRepo.java

@@ -1,6 +1,6 @@
-package edu.math.diagnosis.dao;
+package com.yaoxiang.diagnosis.dao;
 
-import edu.math.diagnosis.entity.PaperCommit;
+import com.yaoxiang.diagnosis.entity.PaperCommit;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 import java.util.List;

+ 2 - 2
src/main/java/edu/math/diagnosis/dao/PaperCountRepo.java → src/main/java/com/yaoxiang/diagnosis/dao/PaperCountRepo.java

@@ -1,6 +1,6 @@
-package edu.math.diagnosis.dao;
+package com.yaoxiang.diagnosis.dao;
 
-import edu.math.diagnosis.entity.PaperCount;
+import com.yaoxiang.diagnosis.entity.PaperCount;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 public interface PaperCountRepo extends JpaRepository<PaperCount, Long> {

+ 2 - 2
src/main/java/edu/math/diagnosis/dao/PaperRepo.java → src/main/java/com/yaoxiang/diagnosis/dao/PaperRepo.java

@@ -1,6 +1,6 @@
-package edu.math.diagnosis.dao;
+package com.yaoxiang.diagnosis.dao;
 
-import edu.math.diagnosis.entity.Paper;
+import com.yaoxiang.diagnosis.entity.Paper;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 

+ 2 - 2
src/main/java/edu/math/diagnosis/dao/PaperResultRepo.java → src/main/java/com/yaoxiang/diagnosis/dao/PaperResultRepo.java

@@ -1,6 +1,6 @@
-package edu.math.diagnosis.dao;
+package com.yaoxiang.diagnosis.dao;
 
-import edu.math.diagnosis.entity.PaperResult;
+import com.yaoxiang.diagnosis.entity.PaperResult;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 

+ 2 - 2
src/main/java/edu/math/diagnosis/dao/PaperTemplateRepo.java → src/main/java/com/yaoxiang/diagnosis/dao/PaperTemplateRepo.java

@@ -1,6 +1,6 @@
-package edu.math.diagnosis.dao;
+package com.yaoxiang.diagnosis.dao;
 
-import edu.math.diagnosis.entity.PaperTemplate;
+import com.yaoxiang.diagnosis.entity.PaperTemplate;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 

+ 2 - 2
src/main/java/edu/math/diagnosis/dao/QuestionRepo.java → src/main/java/com/yaoxiang/diagnosis/dao/QuestionRepo.java

@@ -1,6 +1,6 @@
-package edu.math.diagnosis.dao;
+package com.yaoxiang.diagnosis.dao;
 
-import edu.math.diagnosis.entity.Question;
+import com.yaoxiang.diagnosis.entity.Question;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 

+ 2 - 2
src/main/java/edu/math/diagnosis/dao/RemarkTemplateRepo.java → src/main/java/com/yaoxiang/diagnosis/dao/RemarkTemplateRepo.java

@@ -1,6 +1,6 @@
-package edu.math.diagnosis.dao;
+package com.yaoxiang.diagnosis.dao;
 
-import edu.math.diagnosis.entity.RemarkTemplate;
+import com.yaoxiang.diagnosis.entity.RemarkTemplate;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 public interface RemarkTemplateRepo extends JpaRepository<RemarkTemplate, Long> {

+ 2 - 2
src/main/java/edu/math/diagnosis/dao/ReportRepo.java → src/main/java/com/yaoxiang/diagnosis/dao/ReportRepo.java

@@ -1,6 +1,6 @@
-package edu.math.diagnosis.dao;
+package com.yaoxiang.diagnosis.dao;
 
-import edu.math.diagnosis.entity.DiagnosisReport;
+import com.yaoxiang.diagnosis.entity.DiagnosisReport;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 /**

+ 2 - 2
src/main/java/edu/math/diagnosis/dao/RoleRepo.java → src/main/java/com/yaoxiang/diagnosis/dao/RoleRepo.java

@@ -1,6 +1,6 @@
-package edu.math.diagnosis.dao;
+package com.yaoxiang.diagnosis.dao;
 
-import edu.math.diagnosis.entity.Role;
+import com.yaoxiang.diagnosis.entity.Role;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 public interface RoleRepo extends JpaRepository<Role, Long> {

+ 2 - 2
src/main/java/edu/math/diagnosis/dao/ScoreSegmentRepo.java → src/main/java/com/yaoxiang/diagnosis/dao/ScoreSegmentRepo.java

@@ -1,6 +1,6 @@
-package edu.math.diagnosis.dao;
+package com.yaoxiang.diagnosis.dao;
 
-import edu.math.diagnosis.entity.ScoreSegment;
+import com.yaoxiang.diagnosis.entity.ScoreSegment;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 import java.util.List;

+ 2 - 2
src/main/java/edu/math/diagnosis/dao/SectionRepo.java → src/main/java/com/yaoxiang/diagnosis/dao/SectionRepo.java

@@ -1,6 +1,6 @@
-package edu.math.diagnosis.dao;
+package com.yaoxiang.diagnosis.dao;
 
-import edu.math.diagnosis.entity.Section;
+import com.yaoxiang.diagnosis.entity.Section;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 import java.util.List;

+ 2 - 2
src/main/java/edu/math/diagnosis/dao/SubjectAbilityRepo.java → src/main/java/com/yaoxiang/diagnosis/dao/SubjectAbilityRepo.java

@@ -1,6 +1,6 @@
-package edu.math.diagnosis.dao;
+package com.yaoxiang.diagnosis.dao;
 
-import edu.math.diagnosis.entity.SubjectAbility;
+import com.yaoxiang.diagnosis.entity.SubjectAbility;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 import java.util.List;

+ 2 - 2
src/main/java/edu/math/diagnosis/dao/SubjectKnowledgeRepo.java → src/main/java/com/yaoxiang/diagnosis/dao/SubjectKnowledgeRepo.java

@@ -1,6 +1,6 @@
-package edu.math.diagnosis.dao;
+package com.yaoxiang.diagnosis.dao;
 
-import edu.math.diagnosis.entity.SubjectKnowledge;
+import com.yaoxiang.diagnosis.entity.SubjectKnowledge;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 import java.util.List;

+ 2 - 2
src/main/java/edu/math/diagnosis/dao/SubjectRepo.java → src/main/java/com/yaoxiang/diagnosis/dao/SubjectRepo.java

@@ -1,6 +1,6 @@
-package edu.math.diagnosis.dao;
+package com.yaoxiang.diagnosis.dao;
 
-import edu.math.diagnosis.entity.Subject;
+import com.yaoxiang.diagnosis.entity.Subject;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 

+ 2 - 2
src/main/java/edu/math/diagnosis/dao/UserRepo.java → src/main/java/com/yaoxiang/diagnosis/dao/UserRepo.java

@@ -1,6 +1,6 @@
-package edu.math.diagnosis.dao;
+package com.yaoxiang.diagnosis.dao;
 
-import edu.math.diagnosis.entity.UserInfo;
+import com.yaoxiang.diagnosis.entity.UserInfo;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 /**

+ 1 - 1
src/main/java/edu/math/diagnosis/entity/AbilityScore.java → src/main/java/com/yaoxiang/diagnosis/entity/AbilityScore.java

@@ -1,4 +1,4 @@
-package edu.math.diagnosis.entity;
+package com.yaoxiang.diagnosis.entity;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

+ 1 - 1
src/main/java/edu/math/diagnosis/entity/Authority.java → src/main/java/com/yaoxiang/diagnosis/entity/Authority.java

@@ -1,4 +1,4 @@
-package edu.math.diagnosis.entity;
+package com.yaoxiang.diagnosis.entity;
 
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;

+ 1 - 1
src/main/java/edu/math/diagnosis/entity/BaseMatter.java → src/main/java/com/yaoxiang/diagnosis/entity/BaseMatter.java

@@ -1,4 +1,4 @@
-package edu.math.diagnosis.entity;
+package com.yaoxiang.diagnosis.entity;
 
 
 import io.swagger.annotations.ApiModel;

+ 1 - 1
src/main/java/edu/math/diagnosis/entity/Chapter.java → src/main/java/com/yaoxiang/diagnosis/entity/Chapter.java

@@ -1,4 +1,4 @@
-package edu.math.diagnosis.entity;
+package com.yaoxiang.diagnosis.entity;
 
 import io.swagger.annotations.ApiModel;
 

+ 1 - 1
src/main/java/edu/math/diagnosis/entity/CommentAfterExam.java → src/main/java/com/yaoxiang/diagnosis/entity/CommentAfterExam.java

@@ -1,4 +1,4 @@
-package edu.math.diagnosis.entity;
+package com.yaoxiang.diagnosis.entity;
 
 import io.swagger.annotations.ApiModel;
 import org.hibernate.annotations.CreationTimestamp;

部分文件因为文件数量过多而无法显示