Răsfoiți Sursa

修改拦截器配置

ting.yin 6 ani în urmă
părinte
comite
5e61bab9bd

+ 2 - 2
stmms-ms-accesscontrol/src/main/java/cn/com/qmth/stmms/ms/accesscontrol/config/AccessConfig.java

@@ -12,7 +12,7 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter
  * Created by zhengmin on 2017/3/2.
  */
 @Configuration
-@Profile(value = "prod")
+//@Profile(value = "dev")
 public class AccessConfig extends WebMvcConfigurerAdapter {
 
     @Override
@@ -32,6 +32,6 @@ public class AccessConfig extends WebMvcConfigurerAdapter {
     @Override
     public void addInterceptors(InterceptorRegistry registry) {
         registry.addInterceptor( loginInterceptor()).addPathPatterns("/api/**").excludePathPatterns("/api/admin/users/login",
-                "/api/user/login","/api/exam/students","/api/upload/student/*","/api/file/ms-slice/**","/api/subject/collect-config");
+                "/api/user/login","/api/exam/students","/api/upload/student/*","/api/file/ms-slice/**","/api/subject/collect-config","/api/file/ms-sheet/**");
     }
 }

+ 7 - 10
stmms-ms-main/src/main/resources/application-dev.properties

@@ -1,11 +1,6 @@
 spring.datasource.url=jdbc:mysql://localhost:3306/stmms-ms-2?useUnicode=true&characterEncoding=UTF-8
 spring.datasource.username=root
-spring.datasource.password=1234
-
-#spring.datasource.url=jdbc:mysql://192.168.1.74:3306/stmms-ms-2?useUnicode=true&characterEncoding=UTF-8
-#spring.datasource.username=root
-#spring.datasource.password=root
-
+spring.datasource.password=123456
 
 spring.datasource.validation-query=SELECT 1 FROM DUAL
 spring.datasource.test-on-borrow=true
@@ -13,6 +8,7 @@ spring.datasource.test-on-borrow=true
 #redis
 #spring.redis.host=192.168.199.102
 #spring.redis.port=32768
+
 server.port=9000
 server.compression.enabled=true
 server.compression.mime-types: application/json,application/xml,text/html,text/xml,text/plain,text/css,application/javascript
@@ -32,8 +28,9 @@ app.config.deviation=2
 app.admin.loginName=admin-cy
 app.admin.password=123456
 
-sys.config.imageDir=/Users/yuanpan/tmp/stmms-ms/static/images
-sys.config.thumbDir=/Users/yuanpan/tmp/stmms-ms/static/thumbs
+sys.config.imageDir=/Users/ting.yin/Downloads/meishu/images
+sys.config.thumbDir=/Users/ting.yin/Downloads/meishu/thumbs
+sys.config.sheetDir=/Users/ting.yin/Downloads/meishu/sheet
 sys.config.watermark=/Users/yuanpan/tmp/stmms-ms/static/watermark
 #sys.config.imageDir=.\\static\\images
 #sys.config.thumbDir=.\\static\\thumbs
@@ -43,8 +40,8 @@ sys.config.imageServer.port=9000
 sys.config.imageServer.ip=localhost
 
 
-#前端静态资源目录
-web.upload-path=/Users/yuanpan/tmp/stmms-ms/static/
+#\u524d\u7aef\u9759\u6001\u8d44\u6e90\u76ee\u5f55
+web.upload-path=/Users/ting.yin/Downloads/meishu
 spring.mvc.static-path-pattern=/**
 spring.resources.static-locations=classpath:/META-INF/resources/,classpath:/resources/,classpath:/static/,classpath:/public/,file:${web.upload-path}
 

+ 21 - 21
stmms-ms-main/src/main/resources/application.properties

@@ -1,15 +1,15 @@
-spring.profiles.active=qmth
-spring.datasource.url=jdbc:mysql://localhost:3306/stmms-ms-2?useUnicode=true&characterEncoding=UTF-8
+#spring.profiles.active=dev
+spring.datasource.url=jdbc:mysql://127.0.0.1:3306/stmms-ms-2?useUnicode=true&characterEncoding=UTF-8
 spring.datasource.username=root
-spring.datasource.password=1234
-#spring.datasource.url=jdbc:mysql://192.168.1.74:3306/stmms-ms-2?useUnicode=true&characterEncoding=UTF-8
-#spring.datasource.username=root
-#spring.datasource.password=root
+spring.datasource.password=root
+
 spring.datasource.validation-query=SELECT 1 FROM DUAL
 spring.datasource.test-on-borrow=true
+
 #redis
 #spring.redis.host=192.168.199.102
 #spring.redis.port=32768
+
 server.tomcat.max-threads=256
 server.port=8080
 server.compression.enabled=true
@@ -20,33 +20,33 @@ logging.level.org.hibernate=ERROR
 spring.jpa.show-sql=true
 spring.jpa.hibernate.ddl-auto=update
 spring.http.multipart.max-file-size=10Mb
-#表示隔多少档位才会出现仲裁
+#\u8868\u793a\u9694\u591a\u5c11\u6863\u4f4d\u624d\u4f1a\u51fa\u73b0\u4ef2\u88c1
 app.config.deviation=2
-#表示是否启用定档时数量大于半数,直接定档(半数定档)
+#\u8868\u793a\u662f\u5426\u542f\u7528\u5b9a\u6863\u65f6\u6570\u91cf\u5927\u4e8e\u534a\u6570\uff0c\u76f4\u63a5\u5b9a\u6863(\u534a\u6570\u5b9a\u6863)
 app.config.majority = true
-#超级管理员账号
+#\u8d85\u7ea7\u7ba1\u7406\u5458\u8d26\u53f7
 app.admin.loginName=admin-cy
-#超级管理员密码
+#\u8d85\u7ea7\u7ba1\u7406\u5458\u5bc6\u7801
 app.admin.password=123456
-#大图存放目录
-sys.config.imageDir=/home/xuhuaq/stmms-ms/images
-#缩略图存放目录
-sys.config.thumbDir=/home/xuhuaq/stmms-ms/thumbs
-#分数水印图存放目录
+#\u5927\u56fe\u5b58\u653e\u76ee\u5f55
+sys.config.imageDir=/Users/ting.yin/Downloads/meishu/images
+#\u7f29\u7565\u56fe\u5b58\u653e\u76ee\u5f55
+sys.config.thumbDir=/Users/ting.yin/Downloads/meishu/thumbs
+#\u5206\u6570\u6c34\u5370\u56fe\u5b58\u653e\u76ee\u5f55
 sys.config.watermark=/home/xuhuaq/stmms-ms/watermark
 #sys.config.imageDir=.\\static\\images
 #sys.config.thumbDir=.\\static\\thumbs
-#图片压缩比
+#\u56fe\u7247\u538b\u7f29\u6bd4
 sys.config.compression.percent=60
 #sys.config.imageServer.port=3000
-#图片服务器端口
+#\u56fe\u7247\u670d\u52a1\u5668\u7aef\u53e3
 sys.config.imageServer.port=8080
-#图片服务器ip
+#\u56fe\u7247\u670d\u52a1\u5668ip
 sys.config.imageServer.ip=118.122.113.10
 sys.config.yangjuan=false
-#分档的试卷随机捆大小
+#\u5206\u6863\u7684\u8bd5\u5377\u968f\u673a\u6346\u5927\u5c0f
 sys.config.random-bundle-size=50
-#前端部署目录
-web.upload-path=/home/xuhuaq/stmms-ms/
+#\u524d\u7aef\u90e8\u7f72\u76ee\u5f55
+web.upload-path=/Users/ting.yin/Downloads/meishu
 spring.mvc.static-path-pattern=/**
 spring.resources.static-locations=classpath:/META-INF/resources/,classpath:/resources/,classpath:/static/,classpath:/public/,file:${web.upload-path}