合并解决冲突

servers/boe-server-all/src/main/java/com/xboe/UrlSecurityFilterImpl.java

@@ -31,6 +31,7 @@ public class UrlSecurityFilterImpl implements IUrlSecurityFilter{
 		noLoginUrls.add("/xboe/system/logout");
 		noLoginUrls.add("/xboe/sys/user/sync-all");
 		//noLoginUrls.add("");
+		noLoginUrls.add("/xboe/m/exam/alone-extend/save");
 	}
 
 	@Override

servers/boe-server-all/src/main/resources/application-pro.properties

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 
 
 
@@ -5,7 +6,7 @@
 
 
 # cloud nacos config
-spring.cloud.nacos.discovery.server-addr=10.251.181.11:8848
+spring.cloud.nacos.discovery.server-addr=10.251.129.51:8848
 
 ## redis
 spring.redis.database=1
@@ -14,7 +15,6 @@ spring.redis.password=qwert!W588
 spring.redis.port=6379
 
 
-
 ## datasource config
 spring.jpa.hibernate.ddl-auto=none
 spring.datasource.driverClassName=com.mysql.jdbc.Driver
@@ -23,6 +23,7 @@ spring.datasource.driverClassName=com.mysql.jdbc.Driver
 spring.datasource.url=jdbc:mysql://10.251.129.126:3306/boe_base?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull
 spring.datasource.username=admin
 spring.datasource.password=boeRds01
+
 ## 使用 hikari 连接池
 spring.datasource.type=com.zaxxer.hikari.HikariDataSource
 spring.datasource.hikari.auto-commit: true
@@ -39,7 +40,7 @@ logging.level.org.hibernate.SQL=ERROR
 # 设置logback.xml位置
 logging.config=classpath:log/logback-dev.xml
 
-## 静态文件目录，默认是在static下面，以后独立到nginx下面配置
+## ???????????static????????nginx????
 spring.web.resources.static-locations=file:E:/Projects/BOE/java/static
 
 ## xboe config
@@ -53,14 +54,14 @@ xboe.upload.file.http_path=https://u.boe.com/upload
 ## 外部接口调用地址 旧系统机构及用户数据接口
 xboe.externalinterface.url.system=http://127.0.0.1:9091
 
-## 新增加的教师的内部调用接口
+## ?????????????
 xboe.old.base.url=https://u.boe.com
 
-## 用户统计接口的api地址
+## ???????api??
 xboe.stat.base.url=http://127.0.0.1:9080
 xboe.server.userbasic.url=https://u.boe.com/userbasic
 
-#加密盐
+#???
 #jasypt.encryptor.password=jasypt
 jasypt.encryptor.algorithm=PBEWithMD5AndDES
 jasypt.encryptor.iv-generator-classname=org.jasypt.iv.NoIvGenerator
@@ -71,7 +72,7 @@ xboe.elasticsearch.server.port=9200
 xboe.elasticsearch.server.user=
 xboe.elasticsearch.server.password=
 
-## 邮件的配置
+## ?????
 xboe.email.url=https://u.boe.com/api/b1/email/send
 xboe.email.from=boeu_learning@boe.com.cn
 xboe.email.user=