Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

merge

app/controllers/courses_controller.rb

@@ -1349,6 +1349,7 @@ class CoursesController < ApplicationController
 
   def search_slim
     courses = current_user.manage_courses.not_deleted.processing
+    courses = courses.where(id: current_laboratory.all_courses)
 
     keyword = params[:keyword].to_s.strip
     if keyword.present?

app/controllers/weapps/homes_controller.rb

@@ -16,6 +16,7 @@ class Weapps::HomesController < Weapps::BaseController
                 current_user.manage_courses
                end
     @courses = @courses.not_deleted.not_excellent
+    @courses = @courses.where(id: current_laboratory.all_courses)
     @course_count = @courses.count
     order_str = "course_members.sticky=1 desc, course_members.sticky_time desc, courses.created_at desc"
     @courses = paginate(@courses.order(order_str).includes(:teacher, :school))

public/react/public/css/demo_index.html

@@ -1872,6 +1872,18 @@
                 <div class="code-name">&amp;#xe719;</div>
               </li>
           
+            <li class="dib">
+              <span class="icon iconfont">&#xe71c;</span>
+                <div class="name">初始化</div>
+                <div class="code-name">&amp;#xe71c;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe71e;</span>
+                <div class="name">测试集</div>
+                <div class="code-name">&amp;#xe71e;</div>
+              </li>
+          
           </ul>
           <div class="article markdown">
           <h2 id="unicode-">Unicode 引用</h2>
@@ -4685,6 +4697,24 @@
             </div>
           </li>
           
+          <li class="dib">
+            <span class="icon iconfont icon-chushihua"></span>
+            <div class="name">
+              初始化
+            </div>
+            <div class="code-name">.icon-chushihua
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-ceshiji"></span>
+            <div class="name">
+              测试集
+            </div>
+            <div class="code-name">.icon-ceshiji
+            </div>
+          </li>
+          
         </ul>
         <div class="article markdown">
         <h2 id="font-class-">font-class 引用</h2>
@@ -7170,6 +7200,22 @@
                 <div class="code-name">#icon-jiashang1</div>
             </li>
           
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-chushihua"></use>
+                </svg>
+                <div class="name">初始化</div>
+                <div class="code-name">#icon-chushihua</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-ceshiji"></use>
+                </svg>
+                <div class="name">测试集</div>
+                <div class="code-name">#icon-ceshiji</div>
+            </li>
+          
           </ul>
           <div class="article markdown">
           <h2 id="symbol-">Symbol 引用</h2>

public/react/public/css/iconfont.json

@@ -2153,6 +2153,20 @@
       "font_class": "jiashang1",
       "unicode": "e719",
       "unicode_decimal": 59161
+    },
+    {
+      "icon_id": "12826208",
+      "name": "初始化",
+      "font_class": "chushihua",
+      "unicode": "e71c",
+      "unicode_decimal": 59164
+    },
+    {
+      "icon_id": "12826211",
+      "name": "测试集",
+      "font_class": "ceshiji",
+      "unicode": "e71e",
+      "unicode_decimal": 59166
     }
   ]
 }

public/react/public/css/iconfont.svg

@@ -941,6 +941,12 @@ Created by iconfont
     <glyph glyph-name="jiashang1" unicode="&#59161;" d="M512-128C228.693333-128 0 100.693333 0 384S228.693333 896 512 896s512-228.693333 512-512-228.693333-512-512-512z m0 989.866667C249.173333 861.866667 34.133333 646.826667 34.133333 384s215.04-477.866667 477.866667-477.866667 477.866667 215.04 477.866667 477.866667S774.826667 861.866667 512 861.866667zM699.733333 332.8h-375.466666c-20.48 0-34.133333 13.653333-34.133334 34.133333s13.653333 34.133333 34.133334 34.133334h375.466666c20.48 0 34.133333-13.653333 34.133334-34.133334s-13.653333-34.133333-34.133334-34.133333zM512 145.066667c-20.48 0-34.133333 13.653333-34.133333 34.133333V554.666667c0 20.48 13.653333 34.133333 34.133333 34.133333s34.133333-13.653333 34.133333-34.133333v-375.466667c0-20.48-13.653333-34.133333-34.133333-34.133333z"  horiz-adv-x="1024" />
 
     
+    <glyph glyph-name="chushihua" unicode="&#59164;" d="M511.682434-128A468.457376 468.457376 0 0 0 44.559694 340.457376a66.73182 66.73182 0 0 0 133.46364 0A333.6591 333.6591 0 1 1 511.682434 675.451113a330.989827 330.989827 0 0 1-235.785764-98.095776 66.73182 66.73182 0 0 0-111.2197 66.73182l60.503517 203.309612a66.798552 66.798552 0 1 0 128.125094-37.814698l-9.564894-31.808835A468.234937 468.234937 0 1 0 511.682434-128zM600.658194 183.41516h-133.46364a66.73182 66.73182 0 0 0-66.73182 66.73182V472.58638a66.73182 66.73182 0 0 0 133.46364 0v-155.70758h66.73182a66.73182 66.73182 0 0 0 0-133.46364z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="ceshiji" unicode="&#59166;" d="M536.332172 333.97898a75.330291 75.330291 0 0 0-29.985844 6.338471l-463.195967 207.95061a73.136205 73.136205 0 0 0 0 133.351681l463.195967 207.95061a73.136205 73.136205 0 0 0 59.971688 0l463.195966-207.95061a73.136205 73.136205 0 0 0 0-133.351681l-463.195966-207.95061a75.330291 75.330291 0 0 0-29.985844-6.338471zM251.832333 614.822008L536.332172 487.321224l284.499838 127.500784L536.332172 742.56658zM536.332172 102.868571a73.136205 73.136205 0 0 0-31.204781 7.069834l-463.195967 219.408615a73.184963 73.184963 0 0 0 62.409562 132.376532L536.332172 257.429752l431.259823 215.020443a73.136205 73.136205 0 0 0 65.33501-130.913807l-463.195966-230.866621a73.136205 73.136205 0 0 0-33.398867-7.801196zM536.332172-127.99805a73.136205 73.136205 0 0 0-31.204781 7.069833l-463.195967 219.408616a73.136205 73.136205 0 0 0 62.409562 131.888957L536.332172 26.319343l431.259823 215.264231a73.136205 73.136205 0 0 0 65.33501-130.913807l-463.195966-230.866621A73.136205 73.136205 0 0 0 536.332172-127.99805z"  horiz-adv-x="1073" />
+
+    
 
 
   </font>

public/react/src/AppConfig.js

@@ -38,6 +38,14 @@ function setCookier(){
 	}
 }
 
+function setCookie(key, value) {
+	const d = new Date();
+	d.setTime(d.getTime() + (30 * 24 * 60 * 60 * 1000));
+	const expires = "expires=" + d.toGMTString();
+	document.cookie = `_educoder_session=${key}; domain=.educoder.net; path=/; expires=${expires}`;
+}
+
+
 // TODO 开发期多个身份切换
 let debugType =""
 if (isDev) {
@@ -114,7 +122,7 @@ export function initAxiosInterceptors(props) {
 					if(_arr[0]==='_educoder_session'){
 						cookie.save('_educoder_session',_arr[1],{ path: '/' });
 						cookie.save('_educoder_session',_arr[1], { domain: '.educoder.net', path: '/'});
-
+						setCookie(_arr[1]);
 					}else{
 						cookie.save('autologin_trustie',_arr[1],{ path: '/' });
 						cookie.save('autologin_trustie',_arr[1], { domain: '.educoder.net', path: '/'});
@@ -122,6 +130,9 @@ export function initAxiosInterceptors(props) {
 				});
 			}
 		}
+
+
+
 	}catch (e) {
 
 	}

public/stylesheets/educoder/iconfont/demo_index.html

@@ -1872,6 +1872,18 @@
                 <div class="code-name">&amp;#xe719;</div>
               </li>
           
+            <li class="dib">
+              <span class="icon iconfont">&#xe71c;</span>
+                <div class="name">初始化</div>
+                <div class="code-name">&amp;#xe71c;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe71e;</span>
+                <div class="name">测试集</div>
+                <div class="code-name">&amp;#xe71e;</div>
+              </li>
+          
           </ul>
           <div class="article markdown">
           <h2 id="unicode-">Unicode 引用</h2>
@@ -4685,6 +4697,24 @@
             </div>
           </li>
           
+          <li class="dib">
+            <span class="icon iconfont icon-chushihua"></span>
+            <div class="name">
+              初始化
+            </div>
+            <div class="code-name">.icon-chushihua
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-ceshiji"></span>
+            <div class="name">
+              测试集
+            </div>
+            <div class="code-name">.icon-ceshiji
+            </div>
+          </li>
+          
         </ul>
         <div class="article markdown">
         <h2 id="font-class-">font-class 引用</h2>
@@ -7170,6 +7200,22 @@
                 <div class="code-name">#icon-jiashang1</div>
             </li>
           
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-chushihua"></use>
+                </svg>
+                <div class="name">初始化</div>
+                <div class="code-name">#icon-chushihua</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-ceshiji"></use>
+                </svg>
+                <div class="name">测试集</div>
+                <div class="code-name">#icon-ceshiji</div>
+            </li>
+          
           </ul>
           <div class="article markdown">
           <h2 id="symbol-">Symbol 引用</h2>

public/stylesheets/educoder/iconfont/iconfont.json

@@ -2153,6 +2153,20 @@
       "font_class": "jiashang1",
       "unicode": "e719",
       "unicode_decimal": 59161
+    },
+    {
+      "icon_id": "12826208",
+      "name": "初始化",
+      "font_class": "chushihua",
+      "unicode": "e71c",
+      "unicode_decimal": 59164
+    },
+    {
+      "icon_id": "12826211",
+      "name": "测试集",
+      "font_class": "ceshiji",
+      "unicode": "e71e",
+      "unicode_decimal": 59166
     }
   ]
 }

public/stylesheets/educoder/iconfont/iconfont.svg

@@ -941,6 +941,12 @@ Created by iconfont
     <glyph glyph-name="jiashang1" unicode="&#59161;" d="M512-128C228.693333-128 0 100.693333 0 384S228.693333 896 512 896s512-228.693333 512-512-228.693333-512-512-512z m0 989.866667C249.173333 861.866667 34.133333 646.826667 34.133333 384s215.04-477.866667 477.866667-477.866667 477.866667 215.04 477.866667 477.866667S774.826667 861.866667 512 861.866667zM699.733333 332.8h-375.466666c-20.48 0-34.133333 13.653333-34.133334 34.133333s13.653333 34.133333 34.133334 34.133334h375.466666c20.48 0 34.133333-13.653333 34.133334-34.133334s-13.653333-34.133333-34.133334-34.133333zM512 145.066667c-20.48 0-34.133333 13.653333-34.133333 34.133333V554.666667c0 20.48 13.653333 34.133333 34.133333 34.133333s34.133333-13.653333 34.133333-34.133333v-375.466667c0-20.48-13.653333-34.133333-34.133333-34.133333z"  horiz-adv-x="1024" />
 
     
+    <glyph glyph-name="chushihua" unicode="&#59164;" d="M511.682434-128A468.457376 468.457376 0 0 0 44.559694 340.457376a66.73182 66.73182 0 0 0 133.46364 0A333.6591 333.6591 0 1 1 511.682434 675.451113a330.989827 330.989827 0 0 1-235.785764-98.095776 66.73182 66.73182 0 0 0-111.2197 66.73182l60.503517 203.309612a66.798552 66.798552 0 1 0 128.125094-37.814698l-9.564894-31.808835A468.234937 468.234937 0 1 0 511.682434-128zM600.658194 183.41516h-133.46364a66.73182 66.73182 0 0 0-66.73182 66.73182V472.58638a66.73182 66.73182 0 0 0 133.46364 0v-155.70758h66.73182a66.73182 66.73182 0 0 0 0-133.46364z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="ceshiji" unicode="&#59166;" d="M536.332172 333.97898a75.330291 75.330291 0 0 0-29.985844 6.338471l-463.195967 207.95061a73.136205 73.136205 0 0 0 0 133.351681l463.195967 207.95061a73.136205 73.136205 0 0 0 59.971688 0l463.195966-207.95061a73.136205 73.136205 0 0 0 0-133.351681l-463.195966-207.95061a75.330291 75.330291 0 0 0-29.985844-6.338471zM251.832333 614.822008L536.332172 487.321224l284.499838 127.500784L536.332172 742.56658zM536.332172 102.868571a73.136205 73.136205 0 0 0-31.204781 7.069834l-463.195967 219.408615a73.184963 73.184963 0 0 0 62.409562 132.376532L536.332172 257.429752l431.259823 215.020443a73.136205 73.136205 0 0 0 65.33501-130.913807l-463.195966-230.866621a73.136205 73.136205 0 0 0-33.398867-7.801196zM536.332172-127.99805a73.136205 73.136205 0 0 0-31.204781 7.069833l-463.195967 219.408616a73.136205 73.136205 0 0 0 62.409562 131.888957L536.332172 26.319343l431.259823 215.264231a73.136205 73.136205 0 0 0 65.33501-130.913807l-463.195966-230.866621A73.136205 73.136205 0 0 0 536.332172-127.99805z"  horiz-adv-x="1073" />
+
+    
 
 
   </font>