作者 李美松

Merge branch 'master' into lms

# Conflicts:
#	app/Models/RouteMap/RouteMap.php
@@ -109,6 +109,13 @@ class RouteMap extends Base @@ -109,6 +109,13 @@ class RouteMap extends Base
109 } 109 }
110 try { 110 try {
111 $route_map = self::where('project_id', $project_id)->where('source_id', $source_id)->where('source', $source)->first(); 111 $route_map = self::where('project_id', $project_id)->where('source_id', $source_id)->where('source', $source)->first();
  112 + //上线项目 不能修改链接了
  113 +// if($route_map){
  114 +// $project = ProjectLogic::instance()->getInfo($project_id);
  115 +// if($project['type'] !== Project::STATUS_ONE){
  116 +// return $route_map->route;
  117 +// }
  118 +// }
112 if(!$route_map){ 119 if(!$route_map){
113 $route_map = new self(); 120 $route_map = new self();
114 $route_map->source = $source; 121 $route_map->source = $source;