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

.gitignore

@@ -46,3 +46,7 @@ config/oneapm.yml
 /public/npm-debug.log
 /vendor
 /workspace/*
+
+
+.ruby-gemset
+.rvmrc

app/api/mobile/apis/ecloud.rb

@@ -10,7 +10,7 @@ module Mobile
         desc "ecloud接口测试"
 
         post 'list' do
-          EcloudService.new.list
+          EcloudService.new.list(params)
         end
       end
 

app/assets/javascripts/ecloud.js.coffee

@@ -0,0 +1,3 @@
+# Place all the behaviors and hooks related to the matching controller here.
+# All this logic will automatically be available in application.js.
+# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/

app/assets/stylesheets/ecloud.css.scss

@@ -0,0 +1,3 @@
+// Place all the styles related to the ecloud controller here.
+// They will automatically be included in application.css.
+// You can use Sass (SCSS) here: http://sass-lang.com/

app/controllers/ecloud_controller.rb

@@ -0,0 +1,177 @@
+#encoding=utf-8
+require 'net/http'
+require 'digest'
+
+class EcloudController < ApplicationController
+  skip_before_filter :verify_authenticity_token
+
+  before_filter :user_setup
+  before_filter :require_login, only: [:authorize]
+
+
+  skip_before_filter :verify_authenticity_token, only: [:ps_new, :ps_edit, :ecloud_login_callback]
+
+  def index
+
+    render file: 'public/react-oschina/build/index.html', :layout => false
+  end
+
+  def trustie_login
+  end
+
+  CLIENT_ID = '1022'
+  CLIENT_SECRET = '2112037a-6d7a-432b-9081-feb1153d8668'
+  ROOT_URl = 'http://localhost:3000'
+  SERVER_URL = "https://221.176.54.92:9081/restful/services/"
+
+
+
+  ## 签名
+  def sign(timestamp)
+    Digest::MD5.hexdigest("client_id=#{CLIENT_ID}client_key=#{CLIENT_SECRET}timestamp=#{timestamp}")
+  end
+
+
+  # 企业开通
+  # ecordercode 唯一标志一个企业的订购关系
+  def bs_new
+    begin
+      ecloud = Ecloud.create!(applyno: params['applyno'], ecordercode: params['ecordercode'], opttype: params['opttype'],
+                              trial: params['trial'], bossorderid: params['bossorderid'], custid: params['custid'],
+                              custcode: params['custcode'], registersource: params['registersource'], custname: params['custname'],
+                              userid: params['userid'], username: params['username'], useralias: params['useralias'], mobile: params['mobile'],
+                              email: params['email'], productcode: params['productcode'], begintime: params['begintime'],
+                              endtime: params['endtime'])
+      EcloudService.create(opttype: params['services']['opttype'], code: params['services']['code'], begintime: params['services']['begintime'],
+                           endtime: params['services']['endtime'], ecloud_id: ecloud.try(:id))
+
+      render :json => {result: true, errmsg: ""}
+    rescue Exception => e
+      logger.error(e.message)
+      render :json => {code: 500, msg: "#{e.message}"}
+    end
+  end
+
+  # 企业更新
+  def bs_update
+    ecloud = Ecloud.where(custid: params['custid']).first
+    ecloud.update_attribute(applyno: params['applyno'], ecordercode: params['ecordercode'], opttype: params['opttype'],
+                            custid: params['custid'], custcode: params['custcode'], productcode: params['productcode'],
+                            operatime: params['operatime'], effecttime: params['effecttime'])
+    ecloud.ecloud_services.update_attributes(packagecode: params['services']['packagecode'], bossorderid:  params['services']['bossorderid'])
+
+  end
+
+  # 用户业务开通接口
+  def ps_new
+    begin
+      logger.info("11111######params")
+      ecloud_user = EcloudUser.where(:custid => params['custid'], :user_id => params['users']['userid']).first
+      if ecloud_user.present?
+        render :json => {code: 501, msg: "你已开通过该业务"}
+      else
+        EcloudUser.create!(custid: params['custid'], opttype: params['users']['opttype'], userid: params['users']['userid'],
+                           username: params['users']['username'], useralias: params['users']['useralias'],
+                           mobile: params['users']['mobile'],  email: params['users']['email'],  begintime: params['users']['begintime'].to_s,
+                           endtime: params['users']['endtime'].to_s)
+        render :json => {success: true, errmsg: ""}
+      end
+    rescue Exception => e
+      logger.error(e.message)
+      render :json => {code: 500, msg: "#{e.message}"}
+    end
+  end
+
+  # 用户业务变更、销毁接口
+  def ps_update
+    begin
+      ecloud_user = EcloudUser.where(:custid => params['custid'], :user_id => params['users']['userid']).first
+      if ecloud_user.present?
+        ecloud_user.update_attributes(opttype: params['users']['opttype'])
+        render :json => {code: 501, msg: "你已开通过该业务"}
+      else
+        render :json => {code: 404, errmsg: ""}
+      end
+    rescue Exception => e
+      logger.error(e.message)
+      render :json => {code: 500, msg: "#{e.message}"}
+    end
+  end
+
+  def ecloud_login_callback
+    #获取code
+    logger.info "oauth2 login_callback: #{params}"
+
+    raise "没有code" unless params[:code]
+
+    url = "#{SERVER_URL}/oauth2/authorization?grant_type=authorization_code" +
+        "&client_id=#{CLIENT_ID}&scope=&redirect_uri=&code=#{params[:code]}"
+
+    res = post(url)
+    logger.info "oauth2 authorization resp: #{res}"
+
+    body = decode(res)
+    #{"access_token":"21a80f20ff736b54aecd002b60210943","token_type":"bearer","expires_in":86400,"refresh_token":"be92e2c137a8c6dd22f0d8c4a622b3aeceb054087a95d293130f04ec60fd3e3f","scope":"user_info","created_at":1542684088}
+
+    raise '登录失败' unless body["access_token"]
+
+    #获取此用户信息
+
+    # res = get("https://gitee.com/api/v5/user?access_token=#{body["access_token"]}")
+    res = get("#{SERVER_URL}/user/info?access_token=#{body['access_token']}&userid=#{body['uid']}")
+    logger.info "oauth2 get user info: #{res}"
+
+    # 同步用户
+    # info = decode(res)
+    #
+    # user =  User.find_by_oschina_user_id(info["id"])
+    # unless user
+    #   user = User.create_with_oschina!(info)
+    # end
+    #
+    # @current_user = user
+
+    render :index
+  end
+
+
+  private
+  def get(url)
+    uri = URI(url)
+    res = Net::HTTP.start(uri.host, uri.port, use_ssl: url.start_with?('https')) do |http|
+      req = Net::HTTP::Get.new(uri)
+      #req['Content-Type'] = 'application/json'
+      # The body needs to be a JSON string, use whatever you know to parse Hash to JSON
+      #req.body = {a: 1}.to_json
+      http.request(req)
+    end
+
+    res.body
+  end
+
+  def post(url)
+    uri = URI(url)
+    res = Net::HTTP.start(uri.host, uri.port, use_ssl: url.start_with?('https')) do |http|
+      req = Net::HTTP::Post.new(uri)
+      #req['Content-Type'] = 'application/json'
+      # The body needs to be a JSON string, use whatever you know to parse Hash to JSON
+      #req.body = {a: 1}.to_json
+      http.request(req)
+    end
+
+    res.body
+  end
+
+  def decode(s)
+    begin
+      obj = ActiveSupport::JSON.decode(s)
+    rescue ActiveSupport::JSON.parse_error
+      logger.error("Attempted to decode invalid JSON: #{s}")
+    end
+  end
+
+  private
+  def ecloudeuser_params
+    {}
+  end
+end

app/helpers/ecloud_helper.rb

@@ -0,0 +1,2 @@
+module EcloudHelper
+end

app/models/ecloud.rb

@@ -0,0 +1,6 @@
+class Ecloud < ActiveRecord::Base
+  attr_accessible :applyno, :begintime, :bossorderid, :custcode, :custid, :custname, :custtype, :ecordercode, :endtime,
+                  :mobile, :opttype, :productcode, :registersource, :string, :trial, :useralias, :userid, :username, :email
+  has_one :ecloud_users
+  has_one :ecloud_services
+end

app/models/ecloud_service.rb

@@ -0,0 +1,3 @@
+class EcloudService < ActiveRecord::Base
+  attr_accessible :begintime, :code, :endtime, :opttype
+end

app/models/ecloud_user.rb

@@ -0,0 +1,3 @@
+class EcloudUser < ActiveRecord::Base
+  attr_accessible :begintime, :email, :endtime, :mobile, :opttype, :paras, :useralias, :userid, :username, :custid
+end

app/models/ecloud_users.rb

@@ -0,0 +1,3 @@
+class EcloudUser < ActiveRecord::Base
+  attr_accessible :begintime, :email, :endtime, :mobile, :opttype, :paras, :useralias, :userid, :username, :custid
+end

app/services/ecloud_service.rb

@@ -1,6 +1,7 @@
 class EcloudService
 
-  def list
-    return {status: 0, message: "test"}
+  def list params
+
+    return {status: 0, message: "test", code: params[:code], params: params}
   end
 end

app/views/common/index.html.erb

@@ -1 +1 @@
-<!doctype html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no"><meta name="theme-color" content="#000000"><meta name="renderer" content="webkit"/><meta name="force-rendering" content="webkit"/><meta http-equiv="X-UA-Compatible" content="IE=edge"/><link rel="manifest" href="/manifest.json"><link rel="shortcut icon" href="/favicon.ico"><title>Educoder</title><script type="text/javascript">window.__isR=!0</script><link rel="stylesheet" href="/react/build/css/css_min_all.css"><link rel="stylesheet" href="/assets/iconfont/iconfont.css"><link href="/react/build/./static/css/main.3274c43b.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="md_div" style="display:none"></div><div id="root" class="page -layout-v -fit"></div><div id="picture_display" style="display:none"></div><script type="text/javascript" src="/react/build/js/js_min_all.js"></script><script type="text/javascript" src="/assets/kindeditor/kindeditor.js"></script><script type="text/javascript" src="/react/build/js/create_kindeditor.js"></script><script type="text/javascript" src="/javascripts/educoder/edu_application.js"></script><script type="text/javascript" src="/react/build/./static/js/main.9f01900e.js"></script></body></html>
+<!doctype html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no"><meta name="theme-color" content="#000000"><meta name="renderer" content="webkit"/><meta name="force-rendering" content="webkit"/><meta http-equiv="X-UA-Compatible" content="IE=edge"/><link rel="manifest" href="/manifest.json"><link rel="shortcut icon" href="/favicon.ico"><title>Educoder</title><script type="text/javascript">window.__isR=!0</script><link rel="stylesheet" href="/react/build/css/css_min_all.css"><link rel="stylesheet" href="/assets/iconfont/iconfont.css"><link href="/react/build/./static/css/main.80b6ec5e.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="md_div" style="display:none"></div><div id="root" class="page -layout-v -fit"></div><div id="picture_display" style="display:none"></div><script type="text/javascript" src="/react/build/js/js_min_all.js"></script><script type="text/javascript" src="/assets/kindeditor/kindeditor.js"></script><script type="text/javascript" src="/react/build/js/create_kindeditor.js"></script><script type="text/javascript" src="/javascripts/educoder/edu_application.js"></script><script type="text/javascript" src="/react/build/./static/js/main.60c226df.js"></script></body></html>

app/views/ec_years/_course_lists.html.erb

@@ -46,13 +46,16 @@
         </label>
       </span>
       <span class="column-11 edu-txt-center">
-        <label class="color-red-dd">
           <% if course.ec_course_targets.count == 0 %>
             --
           <% else %>
-            <%= course.complete_target_count == course.ec_course_targets.count ? "达成" : "未达成" %>
+            <% if course.complete_target_count == course.ec_course_targets.count %>
+                <label class="color-green">达成</label>
+            <% else %>
+                <label class="color-red-dd">未达成</label>
+            <% end %>
+            <%#= course.complete_target_count == course.ec_course_targets.count ? "达成" : "未达成" %>
           <% end %>
-        </label>
       </span>
       <span class="column-10 fl edu-txt-left">
           <% if course_manager || @template_major %>

app/views/ecs/_department_list.html.erb

@@ -9,7 +9,7 @@
   <li class="clearfix">
     <span class="column-No">0</span>
     <span class="column-2">000000</span>
-    <span class="column-3 task-hide"><a href="javascript:void(0)"><%= @template_major.name %>(示例)</a></span>
+    <span class="column-3 task-hide"><a href="<%= ec_major_school_path(@template_major) %>"><%= @template_major.name %>(示例)</a></span>
     <span class="column-5">
       <a href="<%= ec_major_school_path(@template_major) %>" class="color-blue" target="_blank"><%= User.current.admin? ? "配置" : "查看" %></a>
     </span>
@@ -19,7 +19,7 @@
     <li class="clearfix" id="major_list_<%= major_school.id %>">
       <span class="column-No major_index"><%= index + 1 %></span>
       <span class="column-2"><%= major_school.code %></span>
-      <span class="column-3 task-hide"><a href="javascript:void(0)"><%= major_school.name %></a></span>
+      <span class="column-3 task-hide"><a href="<%= ec_major_school_path(major_school) %>"><%= major_school.name %></a></span>
       <span class="column-4">
       <% if major_manager %>
           <a href="javascript:void(0)" data-major-id="<%= major_school.id %>" class="color-blue mr5 mt-3 fl addMajorManager"><i class="iconfont icon-tianjiafangda"></i></a>

config/gitlab_config.rb

@@ -0,0 +1,9 @@
+Gitlab.configure do |config|
+  # config.endpoint       = 'http://192.168.41.130:3000/trustie/api/v3' # API endpoint URL, default: ENV['GITLAB_API_ENDPOINT']
+  # config.private_token  = 'cK15gUDwvt8EEkzwQ_63'       # user's private token, default: ENV['GITLAB_API_PRIVATE_TOKEN']
+  config.endpoint       = 'http://testbdgit.trustie.net/api/v3' # API endpoint URL, default: ENV['GITLAB_API_ENDPOINT']
+  config.private_token  = 's89kqsMPtF8YLZSLyVmF'       # user's private token, default: ENV['GITLAB_API_PRIVATE_TOKEN']
+  # Optional
+  # config.user_agent   = 'Custom User Agent'          # user agent, default: 'Gitlab Ruby Gem [version]'
+  # config.sudo         = 'user'                       # username for sudo mode, default: nil
+end

config/routes.rb

@@ -26,12 +26,19 @@
 # Example: :via =>  :get ====> :via => :get
 
 RedmineApp::Application.routes.draw do ## oauth相关
+
   match 'oauth', to: 'oauth#index'
   match 'oauth/authorize', to: 'oauth#authorize', :via => [:get, :post]
   match 'oauth/token', to: 'oauth#token', :via => :post
   match 'oauth/cb', to: 'oauth#test_callback', :via => :get
   match 'oauth/userinfo', to: 'oauth#get_userinfo', :via => :get
 
+  get 'ecloud/ecloud_login', to: 'ecloud#ecloud_login_callback'
+  post 'ecloud/bs_new', to: 'ecloud#bs_new'
+  post 'ecloud/bs_edit', to: 'ecloud#bs_update'
+  post 'ecloud/ps_new', to: 'ecloud#ps_new'
+  post 'ecloud/ps_edit', to: 'ecloud#ps_update'
+
 
   resources :ec_course_evaluations do
     member do

db/migrate/20190311082918_create_ecloudusers.rb

@@ -0,0 +1,30 @@
+class CreateEcloudusers < ActiveRecord::Migration
+  def change
+    create_table :ecloudusers do |t|
+      t.string :applyno
+      t.string :ecordercoder
+      t.string :string
+      t.integer :opttype
+      t.boolean :trial
+      t.string :bossorderid
+      t.integer :custid
+      t.string :custcod
+      t.string :string
+      t.integer :custtype
+      t.integer :registersource
+      t.string :custname
+      t.integer :userid
+      t.string :username
+      t.string :useralias
+      t.string :moblile
+      t.string :email
+      t.string :productcode
+      t.datetime :begintime
+      t.datetime :endtime
+      t.string :productparas
+      t.string :services
+
+      t.timestamps
+    end
+  end
+end

db/migrate/20190312021600_create_ecloud_user.rb

@@ -0,0 +1,18 @@
+class CreateEcloudUser < ActiveRecord::Migration
+  def change
+    create_table :ecloud_users do |t|
+      t.integer :opttype
+      t.integer :userid
+      t.string :username
+      t.string :useralias
+      t.string :mobile
+      t.string :email
+      t.string :begintime
+      t.string :endtime
+      t.string :paras
+      t.integer :custid
+
+      t.timestamps
+    end
+  end
+end

db/migrate/20190312030525_create_eclouds.rb

@@ -0,0 +1,25 @@
+class CreateEclouds < ActiveRecord::Migration
+  def change
+    create_table :eclouds do |t|
+      t.string :applyno
+      t.string :ecordercode
+      t.integer :opttype
+      t.boolean :trial
+      t.string :bossorderid
+      t.integer :custid
+      t.string :custcode
+      t.integer :registersource
+      t.integer :custtype
+      t.string :custname
+      t.integer :userid
+      t.string :username
+      t.string :useralias
+      t.string :mobile
+      t.string :productcode
+      t.string :begintime
+      t.string :endtime
+
+      t.timestamps
+    end
+  end
+end

db/migrate/20190312030722_create_ecloud_services.rb

@@ -0,0 +1,13 @@
+class CreateEcloudServices < ActiveRecord::Migration
+  def change
+    create_table :ecloud_services do |t|
+      t.integer :opttype
+      t.string :code
+      t.string :begintime
+      t.string :endtime
+      t.integer :ecloud_id
+
+      t.timestamps
+    end
+  end
+end

db/migrate/20190312060516_add_index_to_ecloud.rb

@@ -0,0 +1,5 @@
+class AddIndexToEcloud < ActiveRecord::Migration
+  def change
+    add_index :eclouds, [:ecordercode, :custcode], :unique => true, :name => 'ecorder_cust_code'
+  end
+end

db/migrate/20190312075525_add_email_to_ecloud.rb

@@ -0,0 +1,5 @@
+class AddEmailToEcloud < ActiveRecord::Migration
+  def change
+    add_column :eclouds, :email, :string
+  end
+end

db/migrate/20190312091254_add_packagecode_to_ecloud_services.rb

@@ -0,0 +1,6 @@
+class AddPackagecodeToEcloudServices < ActiveRecord::Migration
+  def change
+    add_column :ecloud_services, :packagecode, :string
+    add_column :ecloud_services, :bossorderid, :string
+  end
+end

lib/trustie/http/http.rb

@@ -0,0 +1,46 @@
+#coding=utf-8
+
+require 'net/http'
+require 'uri'
+
+
+module Trustie
+  module Http
+
+    def get(url)
+      uri = URI(url)
+      res = Net::HTTP.start(uri.host, uri.port, use_ssl: url.start_with?('https')) do |http|
+        req = Net::HTTP::Get.new(uri)
+        #req['Content-Type'] = 'application/json'
+        # The body needs to be a JSON string, use whatever you know to parse Hash to JSON
+        #req.body = {a: 1}.to_json
+        http.request(req)
+      end
+
+      res.body
+    end
+
+    def post(url, data=nil)
+      uri = URI(url)
+      res = Net::HTTP.start(uri.host, uri.port, use_ssl: url.start_with?('https')) do |http|
+        req = Net::HTTP::Post.new(uri)
+        #req['Content-Type'] = 'application/json'
+        # The body needs to be a JSON string, use whatever you know to parse Hash to JSON
+        req.body = data if data
+        http.request(req)
+      end
+
+      res.body
+    end
+
+    def decode(s)
+      begin
+        obj = ActiveSupport::JSON.decode(s)
+      rescue ActiveSupport::JSON.parse_error
+        logger.error("Attempted to decode invalid JSON: #{s}")
+      end
+    end
+
+
+  end
+end

public/react/build/asset-manifest.json

@@ -1,88 +1,88 @@
 {
-  "./static/js/0.d15cdb8c.chunk.js": "./static/js/0.d15cdb8c.chunk.js",
-  "./static/js/0.d15cdb8c.chunk.js.map": "./static/js/0.d15cdb8c.chunk.js.map",
-  "./static/js/1.b37de40f.chunk.js": "./static/js/1.b37de40f.chunk.js",
-  "./static/js/1.b37de40f.chunk.js.map": "./static/js/1.b37de40f.chunk.js.map",
-  "./static/js/10.0b59b6d9.chunk.js": "./static/js/10.0b59b6d9.chunk.js",
-  "./static/js/10.0b59b6d9.chunk.js.map": "./static/js/10.0b59b6d9.chunk.js.map",
-  "./static/js/11.03d0c22e.chunk.js": "./static/js/11.03d0c22e.chunk.js",
-  "./static/js/11.03d0c22e.chunk.js.map": "./static/js/11.03d0c22e.chunk.js.map",
-  "./static/js/12.33ef9274.chunk.js": "./static/js/12.33ef9274.chunk.js",
-  "./static/js/12.33ef9274.chunk.js.map": "./static/js/12.33ef9274.chunk.js.map",
-  "./static/js/13.84649bc7.chunk.js": "./static/js/13.84649bc7.chunk.js",
-  "./static/js/13.84649bc7.chunk.js.map": "./static/js/13.84649bc7.chunk.js.map",
-  "./static/js/14.57622e23.chunk.js": "./static/js/14.57622e23.chunk.js",
-  "./static/js/14.57622e23.chunk.js.map": "./static/js/14.57622e23.chunk.js.map",
-  "./static/js/15.cd2747c4.chunk.js": "./static/js/15.cd2747c4.chunk.js",
-  "./static/js/15.cd2747c4.chunk.js.map": "./static/js/15.cd2747c4.chunk.js.map",
-  "./static/js/16.e8e3aa00.chunk.js": "./static/js/16.e8e3aa00.chunk.js",
-  "./static/js/16.e8e3aa00.chunk.js.map": "./static/js/16.e8e3aa00.chunk.js.map",
-  "./static/js/17.db50ac9a.chunk.js": "./static/js/17.db50ac9a.chunk.js",
-  "./static/js/17.db50ac9a.chunk.js.map": "./static/js/17.db50ac9a.chunk.js.map",
-  "./static/js/18.e8b5b490.chunk.js": "./static/js/18.e8b5b490.chunk.js",
-  "./static/js/18.e8b5b490.chunk.js.map": "./static/js/18.e8b5b490.chunk.js.map",
-  "./static/js/19.5f9a9263.chunk.js": "./static/js/19.5f9a9263.chunk.js",
-  "./static/js/19.5f9a9263.chunk.js.map": "./static/js/19.5f9a9263.chunk.js.map",
-  "./static/js/2.48f59130.chunk.js": "./static/js/2.48f59130.chunk.js",
-  "./static/js/2.48f59130.chunk.js.map": "./static/js/2.48f59130.chunk.js.map",
-  "./static/js/20.6efcbe58.chunk.js": "./static/js/20.6efcbe58.chunk.js",
-  "./static/js/20.6efcbe58.chunk.js.map": "./static/js/20.6efcbe58.chunk.js.map",
-  "./static/js/21.6e5a22af.chunk.js": "./static/js/21.6e5a22af.chunk.js",
-  "./static/js/21.6e5a22af.chunk.js.map": "./static/js/21.6e5a22af.chunk.js.map",
-  "./static/js/22.7c073e45.chunk.js": "./static/js/22.7c073e45.chunk.js",
-  "./static/js/22.7c073e45.chunk.js.map": "./static/js/22.7c073e45.chunk.js.map",
-  "./static/js/23.0abe5b59.chunk.js": "./static/js/23.0abe5b59.chunk.js",
-  "./static/js/23.0abe5b59.chunk.js.map": "./static/js/23.0abe5b59.chunk.js.map",
-  "./static/js/24.e1553222.chunk.js": "./static/js/24.e1553222.chunk.js",
-  "./static/js/24.e1553222.chunk.js.map": "./static/js/24.e1553222.chunk.js.map",
-  "./static/js/25.7f05ced8.chunk.js": "./static/js/25.7f05ced8.chunk.js",
-  "./static/js/25.7f05ced8.chunk.js.map": "./static/js/25.7f05ced8.chunk.js.map",
-  "./static/js/26.00916fb9.chunk.js": "./static/js/26.00916fb9.chunk.js",
-  "./static/js/26.00916fb9.chunk.js.map": "./static/js/26.00916fb9.chunk.js.map",
-  "./static/js/27.85a886e8.chunk.js": "./static/js/27.85a886e8.chunk.js",
-  "./static/js/27.85a886e8.chunk.js.map": "./static/js/27.85a886e8.chunk.js.map",
-  "./static/js/28.db5cbded.chunk.js": "./static/js/28.db5cbded.chunk.js",
-  "./static/js/28.db5cbded.chunk.js.map": "./static/js/28.db5cbded.chunk.js.map",
-  "./static/js/29.95e5a009.chunk.js": "./static/js/29.95e5a009.chunk.js",
-  "./static/js/29.95e5a009.chunk.js.map": "./static/js/29.95e5a009.chunk.js.map",
-  "./static/js/3.a357162e.chunk.js": "./static/js/3.a357162e.chunk.js",
-  "./static/js/3.a357162e.chunk.js.map": "./static/js/3.a357162e.chunk.js.map",
-  "./static/js/30.3482c43d.chunk.js": "./static/js/30.3482c43d.chunk.js",
-  "./static/js/30.3482c43d.chunk.js.map": "./static/js/30.3482c43d.chunk.js.map",
-  "./static/js/31.3edb9173.chunk.js": "./static/js/31.3edb9173.chunk.js",
-  "./static/js/31.3edb9173.chunk.js.map": "./static/js/31.3edb9173.chunk.js.map",
-  "./static/js/32.23fc5ec4.chunk.js": "./static/js/32.23fc5ec4.chunk.js",
-  "./static/js/32.23fc5ec4.chunk.js.map": "./static/js/32.23fc5ec4.chunk.js.map",
-  "./static/js/4.a72da972.chunk.js": "./static/js/4.a72da972.chunk.js",
-  "./static/js/4.a72da972.chunk.js.map": "./static/js/4.a72da972.chunk.js.map",
-  "./static/js/5.1853fe23.chunk.js": "./static/js/5.1853fe23.chunk.js",
-  "./static/js/5.1853fe23.chunk.js.map": "./static/js/5.1853fe23.chunk.js.map",
-  "./static/js/6.070d1eab.chunk.js": "./static/js/6.070d1eab.chunk.js",
-  "./static/js/6.070d1eab.chunk.js.map": "./static/js/6.070d1eab.chunk.js.map",
-  "./static/js/7.1ad7321f.chunk.js": "./static/js/7.1ad7321f.chunk.js",
-  "./static/js/7.1ad7321f.chunk.js.map": "./static/js/7.1ad7321f.chunk.js.map",
-  "./static/js/8.d5642b7b.chunk.js": "./static/js/8.d5642b7b.chunk.js",
-  "./static/js/8.d5642b7b.chunk.js.map": "./static/js/8.d5642b7b.chunk.js.map",
-  "./static/js/9.c6b81c3d.chunk.js": "./static/js/9.c6b81c3d.chunk.js",
-  "./static/js/9.c6b81c3d.chunk.js.map": "./static/js/9.c6b81c3d.chunk.js.map",
-  "main.css": "./static/css/main.3274c43b.css",
-  "main.css.map": "./static/css/main.3274c43b.css.map",
-  "main.js": "./static/js/main.9f01900e.js",
-  "main.js.map": "./static/js/main.9f01900e.js.map",
-  "static/media/ERASBD.ttf": "static/media/ERASBD.d5213044.ttf",
-  "static/media/background1.png": "static/media/background1.a34df396.png",
-  "static/media/background2.png": "static/media/background2.22ee659e.png",
-  "static/media/courses.jpg": "static/media/courses.7b27495b.jpg",
-  "static/media/group.png": "static/media/group.2f91e9cd.png",
-  "static/media/introduceback.jpg": "static/media/introduceback.3d75d3db.jpg",
-  "static/media/logo.svg": "static/media/logo.5d5d9eef.svg",
-  "static/media/match_ad.jpg": "static/media/match_ad.4e957369.jpg",
-  "static/media/message.svg": "static/media/message.c4f86b97.svg",
-  "static/media/messagegrey.svg": "static/media/messagegrey.31dd74f4.svg",
-  "static/media/nodata.png": "static/media/nodata.cde5b659.png",
-  "static/media/passall.png": "static/media/passall.46817e26.png",
-  "static/media/passpart.png": "static/media/passpart.4aaf3e6b.png",
-  "static/media/rc-tree.png": "static/media/rc-tree.776c7fe6.png",
-  "static/media/search.svg": "static/media/search.0e1dcc19.svg",
-  "static/media/vedio.png": "static/media/vedio.6a98b4f1.png"
+  "./static/js/0.f26528b1.chunk.js": "./static/js/0.f26528b1.chunk.js",
+  "./static/js/0.f26528b1.chunk.js.map": "./static/js/0.f26528b1.chunk.js.map",
+  "./static/js/1.cc33d6fc.chunk.js": "./static/js/1.cc33d6fc.chunk.js",
+  "./static/js/1.cc33d6fc.chunk.js.map": "./static/js/1.cc33d6fc.chunk.js.map",
+  "./static/js/10.ab08ae3d.chunk.js": "./static/js/10.ab08ae3d.chunk.js",
+  "./static/js/10.ab08ae3d.chunk.js.map": "./static/js/10.ab08ae3d.chunk.js.map",
+  "./static/js/11.c1a78f08.chunk.js": "./static/js/11.c1a78f08.chunk.js",
+  "./static/js/11.c1a78f08.chunk.js.map": "./static/js/11.c1a78f08.chunk.js.map",
+  "./static/js/12.fedd75c3.chunk.js": "./static/js/12.fedd75c3.chunk.js",
+  "./static/js/12.fedd75c3.chunk.js.map": "./static/js/12.fedd75c3.chunk.js.map",
+  "./static/js/13.03b8ecf4.chunk.js": "./static/js/13.03b8ecf4.chunk.js",
+  "./static/js/13.03b8ecf4.chunk.js.map": "./static/js/13.03b8ecf4.chunk.js.map",
+  "./static/js/14.97e6fd74.chunk.js": "./static/js/14.97e6fd74.chunk.js",
+  "./static/js/14.97e6fd74.chunk.js.map": "./static/js/14.97e6fd74.chunk.js.map",
+  "./static/js/15.05fc7db4.chunk.js": "./static/js/15.05fc7db4.chunk.js",
+  "./static/js/15.05fc7db4.chunk.js.map": "./static/js/15.05fc7db4.chunk.js.map",
+  "./static/js/16.efbbac6a.chunk.js": "./static/js/16.efbbac6a.chunk.js",
+  "./static/js/16.efbbac6a.chunk.js.map": "./static/js/16.efbbac6a.chunk.js.map",
+  "./static/js/17.6e20f18f.chunk.js": "./static/js/17.6e20f18f.chunk.js",
+  "./static/js/17.6e20f18f.chunk.js.map": "./static/js/17.6e20f18f.chunk.js.map",
+  "./static/js/18.ee48530e.chunk.js": "./static/js/18.ee48530e.chunk.js",
+  "./static/js/18.ee48530e.chunk.js.map": "./static/js/18.ee48530e.chunk.js.map",
+  "./static/js/19.cadd2a48.chunk.js": "./static/js/19.cadd2a48.chunk.js",
+  "./static/js/19.cadd2a48.chunk.js.map": "./static/js/19.cadd2a48.chunk.js.map",
+  "./static/js/2.9a1bdcfa.chunk.js": "./static/js/2.9a1bdcfa.chunk.js",
+  "./static/js/2.9a1bdcfa.chunk.js.map": "./static/js/2.9a1bdcfa.chunk.js.map",
+  "./static/js/20.5086cbe2.chunk.js": "./static/js/20.5086cbe2.chunk.js",
+  "./static/js/20.5086cbe2.chunk.js.map": "./static/js/20.5086cbe2.chunk.js.map",
+  "./static/js/21.d3d939d5.chunk.js": "./static/js/21.d3d939d5.chunk.js",
+  "./static/js/21.d3d939d5.chunk.js.map": "./static/js/21.d3d939d5.chunk.js.map",
+  "./static/js/22.234575f5.chunk.js": "./static/js/22.234575f5.chunk.js",
+  "./static/js/22.234575f5.chunk.js.map": "./static/js/22.234575f5.chunk.js.map",
+  "./static/js/23.67ab77f0.chunk.js": "./static/js/23.67ab77f0.chunk.js",
+  "./static/js/23.67ab77f0.chunk.js.map": "./static/js/23.67ab77f0.chunk.js.map",
+  "./static/js/24.27d7be07.chunk.js": "./static/js/24.27d7be07.chunk.js",
+  "./static/js/24.27d7be07.chunk.js.map": "./static/js/24.27d7be07.chunk.js.map",
+  "./static/js/25.c8a915ae.chunk.js": "./static/js/25.c8a915ae.chunk.js",
+  "./static/js/25.c8a915ae.chunk.js.map": "./static/js/25.c8a915ae.chunk.js.map",
+  "./static/js/26.488c5233.chunk.js": "./static/js/26.488c5233.chunk.js",
+  "./static/js/26.488c5233.chunk.js.map": "./static/js/26.488c5233.chunk.js.map",
+  "./static/js/27.ba45f1d3.chunk.js": "./static/js/27.ba45f1d3.chunk.js",
+  "./static/js/27.ba45f1d3.chunk.js.map": "./static/js/27.ba45f1d3.chunk.js.map",
+  "./static/js/28.8071de5d.chunk.js": "./static/js/28.8071de5d.chunk.js",
+  "./static/js/28.8071de5d.chunk.js.map": "./static/js/28.8071de5d.chunk.js.map",
+  "./static/js/29.67275bf0.chunk.js": "./static/js/29.67275bf0.chunk.js",
+  "./static/js/29.67275bf0.chunk.js.map": "./static/js/29.67275bf0.chunk.js.map",
+  "./static/js/3.935bae8c.chunk.js": "./static/js/3.935bae8c.chunk.js",
+  "./static/js/3.935bae8c.chunk.js.map": "./static/js/3.935bae8c.chunk.js.map",
+  "./static/js/30.4964944f.chunk.js": "./static/js/30.4964944f.chunk.js",
+  "./static/js/30.4964944f.chunk.js.map": "./static/js/30.4964944f.chunk.js.map",
+  "./static/js/31.5a1072f1.chunk.js": "./static/js/31.5a1072f1.chunk.js",
+  "./static/js/31.5a1072f1.chunk.js.map": "./static/js/31.5a1072f1.chunk.js.map",
+  "./static/js/32.2ff1fc95.chunk.js": "./static/js/32.2ff1fc95.chunk.js",
+  "./static/js/32.2ff1fc95.chunk.js.map": "./static/js/32.2ff1fc95.chunk.js.map",
+  "./static/js/4.017bf48d.chunk.js": "./static/js/4.017bf48d.chunk.js",
+  "./static/js/4.017bf48d.chunk.js.map": "./static/js/4.017bf48d.chunk.js.map",
+  "./static/js/5.27b42764.chunk.js": "./static/js/5.27b42764.chunk.js",
+  "./static/js/5.27b42764.chunk.js.map": "./static/js/5.27b42764.chunk.js.map",
+  "./static/js/6.1d80a66b.chunk.js": "./static/js/6.1d80a66b.chunk.js",
+  "./static/js/6.1d80a66b.chunk.js.map": "./static/js/6.1d80a66b.chunk.js.map",
+  "./static/js/7.03d1beb1.chunk.js": "./static/js/7.03d1beb1.chunk.js",
+  "./static/js/7.03d1beb1.chunk.js.map": "./static/js/7.03d1beb1.chunk.js.map",
+  "./static/js/8.ea688812.chunk.js": "./static/js/8.ea688812.chunk.js",
+  "./static/js/8.ea688812.chunk.js.map": "./static/js/8.ea688812.chunk.js.map",
+  "./static/js/9.2971266e.chunk.js": "./static/js/9.2971266e.chunk.js",
+  "./static/js/9.2971266e.chunk.js.map": "./static/js/9.2971266e.chunk.js.map",
+  "main.css": "./static/css/main.80b6ec5e.css",
+  "main.css.map": "./static/css/main.80b6ec5e.css.map",
+  "main.js": "./static/js/main.60c226df.js",
+  "main.js.map": "./static/js/main.60c226df.js.map",
+  "static\\media\\ERASBD.ttf": "static/media/ERASBD.d5213044.ttf",
+  "static\\media\\background1.png": "static/media/background1.a34df396.png",
+  "static\\media\\background2.png": "static/media/background2.22ee659e.png",
+  "static\\media\\courses.jpg": "static/media/courses.7b27495b.jpg",
+  "static\\media\\group.png": "static/media/group.2f91e9cd.png",
+  "static\\media\\introduceback.jpg": "static/media/introduceback.3d75d3db.jpg",
+  "static\\media\\logo.svg": "static/media/logo.ee7cd8ed.svg",
+  "static\\media\\match_ad.jpg": "static/media/match_ad.4e957369.jpg",
+  "static\\media\\message.svg": "static/media/message.a7af2a8f.svg",
+  "static\\media\\messagegrey.svg": "static/media/messagegrey.8c1dff55.svg",
+  "static\\media\\nodata.png": "static/media/nodata.cde5b659.png",
+  "static\\media\\passall.png": "static/media/passall.46817e26.png",
+  "static\\media\\passpart.png": "static/media/passpart.4aaf3e6b.png",
+  "static\\media\\rc-tree.png": "static/media/rc-tree.776c7fe6.png",
+  "static\\media\\search.svg": "static/media/search.0e1dcc19.svg",
+  "static\\media\\vedio.png": "static/media/vedio.6a98b4f1.png"
 }

public/react/build/index.html

@@ -1 +1 @@
-<!doctype html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no"><meta name="theme-color" content="#000000"><meta name="renderer" content="webkit"/><meta name="force-rendering" content="webkit"/><meta http-equiv="X-UA-Compatible" content="IE=edge"/><link rel="manifest" href="/manifest.json"><link rel="shortcut icon" href="/favicon.ico"><title>Educoder</title><script type="text/javascript">window.__isR=!0</script><link rel="stylesheet" href="/css/css_min_all.css"><link rel="stylesheet" href="http://testbdweb.educoder.net/assets/iconfont/iconfont.css"><link href="/react/build/./static/css/main.3274c43b.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="md_div" style="display:none"></div><div id="root" class="page -layout-v -fit"></div><div id="picture_display" style="display:none"></div><script type="text/javascript" src="/js/js_min_all.js"></script><script type="text/javascript" src="http://testbdweb.educoder.net/assets/kindeditor/kindeditor.js"></script><script type="text/javascript" src="/js/create_kindeditor.js"></script><script type="text/javascript" src="http://testbdweb.educoder.net/javascripts/educoder/edu_application.js"></script><script type="text/javascript" src="/react/build/./static/js/main.9f01900e.js"></script></body></html>
+<!doctype html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no"><meta name="theme-color" content="#000000"><meta name="renderer" content="webkit"/><meta name="force-rendering" content="webkit"/><meta http-equiv="X-UA-Compatible" content="IE=edge"/><link rel="manifest" href="/manifest.json"><link rel="shortcut icon" href="/favicon.ico"><title>Educoder</title><script type="text/javascript">window.__isR=!0</script><link rel="stylesheet" href="/css/css_min_all.css"><link rel="stylesheet" href="http://testbdweb.educoder.net/assets/iconfont/iconfont.css"><link href="/react/build/./static/css/main.80b6ec5e.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="md_div" style="display:none"></div><div id="root" class="page -layout-v -fit"></div><div id="picture_display" style="display:none"></div><script type="text/javascript" src="/js/js_min_all.js"></script><script type="text/javascript" src="http://testbdweb.educoder.net/assets/kindeditor/kindeditor.js"></script><script type="text/javascript" src="/js/create_kindeditor.js"></script><script type="text/javascript" src="http://testbdweb.educoder.net/javascripts/educoder/edu_application.js"></script><script type="text/javascript" src="/react/build/./static/js/main.60c226df.js"></script></body></html>