ccj 3 år sedan
förälder
incheckning
c26c3d787a

+ 3 - 3
pom.xml

@@ -184,9 +184,6 @@
             <properties>
                 <env>local</env>
             </properties>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
 
         </profile>
         <profile>
@@ -206,6 +203,9 @@
             <properties>
                 <env>prod</env>
             </properties>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
 
         </profile>
     </profiles>

+ 2 - 2
winsea-haixin-platform-backend/src/main/resources/application.yml

@@ -81,10 +81,10 @@ auth:
     - /noticeTask/**/*
     - /notice/*
     - /notice/**/*
-  expire-in: 36000
+  expire-in: 2592000
   login-url: /login.html
   logout-url: /auth/api/logout
-  session-timeout: 36000000
+  session-timeout: 2592000
   success-url: ''
   unauthorized-url: ''
 

+ 1 - 0
winsea-haixin-plugin-base/src/main/java/com/winsea/svc/common/config/WebConfig.java

@@ -37,6 +37,7 @@ public class WebConfig {
 				HttpServletResponse res = (HttpServletResponse) response;
 				if ("*".equals(allowedOrigins) || allowedOrigins.contains(req.getHeader("Origin"))) {
 					res.setHeader("Access-Control-Allow-Origin", req.getHeader("Origin"));
+//					res.setHeader("Access-Control-Allow-Origin", allowedOrigins);
 				}
 
 				res.setHeader("Access-Control-Allow-Credentials", "true");

+ 1 - 1
winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/SettledCompanyInfoMapper.xml

@@ -76,7 +76,7 @@
         status_flag AS statusFlag,
         show_flag AS showFlag,
         update_date AS updateDate,
-        case when city like CONCAT('%',#{location},'%')) then 1 else 0 end AS flag
+        case when city like CONCAT('%',#{location},'%') then 1 else 0 end AS flag
         FROM
         settled_company_info a
         WHERE