作者 lyh

gx

@@ -106,9 +106,10 @@ class FileManageController extends BaseController @@ -106,9 +106,10 @@ class FileManageController extends BaseController
106 public function getOnlyFilename($name,$project_id = 0){ 106 public function getOnlyFilename($name,$project_id = 0){
107 $nameArr = explode('.',$name); 107 $nameArr = explode('.',$name);
108 $enName = generateRoute(Translate::tran($nameArr[0], 'en')); 108 $enName = generateRoute(Translate::tran($nameArr[0], 'en'));
  109 + $fileName = $enName;
109 $i=1; 110 $i=1;
110 while($this->onlyName($enName.'.'.$nameArr[1],$project_id)){ 111 while($this->onlyName($enName.'.'.$nameArr[1],$project_id)){
111 - $enName = $enName .'-'.$i; 112 + $enName = $fileName .'_'.$i;
112 $i++; 113 $i++;
113 } 114 }
114 return $enName.'.'.$nameArr[1]; 115 return $enName.'.'.$nameArr[1];
@@ -131,6 +132,7 @@ class FileManageController extends BaseController @@ -131,6 +132,7 @@ class FileManageController extends BaseController
131 } 132 }
132 133
133 134
  135 +
134 protected function checkFile($file){ 136 protected function checkFile($file){
135 $count = FileManage::where('project_id', $this->user['project_id'])->count(); 137 $count = FileManage::where('project_id', $this->user['project_id'])->count();
136 if($count >= $this->upload_config['upload_max_num']){ 138 if($count >= $this->upload_config['upload_max_num']){