edit

config/base.php

@@ -5,6 +5,14 @@ $config['base'] = array
 (
 	# 站点使用邮箱还是手机作为主账号，如果是手机，请填写手机验证码的配置接口
 	'account' => 'email',
+	# 性别转换 passport里1为男、2为女 3为未知，如果前端定义与这个不同，请做好转换
+	'sex' => array
+	(
+		# 前面的索引为前端传过来的值
+		1 => 1,
+		2 => 2,
+		3 => 3,
+	),
 	'mobileCode' => array
 	(
 		# debug模式

src/Lib/Base.php

@@ -2,7 +2,7 @@
 namespace Passport\Src\Lib;
 
 use Dever;
-use Dever\Img\Handle;
+use Upload\Src\Lib\Img;
 use Dever\Routing\Uri;
 use Dever\Session\Oper as Save;
 use Dever\String\Encrypt;
@@ -181,7 +181,8 @@ class Base
 
     protected function saveAvatar($value)
     {
-        $base = DEVER_PATH . 'data/upload/';
+        $value = Dever::pic($value);
+        $base = Dever::data();
         $date = explode('-', date("Y-m-d"));
         if (is_array($value)) {
             $user = $value[1];
@@ -198,10 +199,10 @@ class Base
                 $value = $temp;
             }
         }
-        $result = Dever::$global['host']['img'] . 'chead.jpg';
+        //$result = Dever::$global['host']['img'] . 'chead.jpg';
         if ($value) {
             # 裁图
-            $handle = new Handle();
+            $handle = new Img();
 
             $size = '200_200_2';
 
@@ -221,9 +222,8 @@ class Base
             //file_put_contents($temp, file_get_contents($value));
 
             $file = $handle->thumb($value, $size, true, $file);
-            //print_r($file);die;
             if ($file) {
-                $result = Dever::$global['host']['image'] . $path . $name . $ext;
+                $result = str_replace('/upload/', '/', Dever::config('host')->uploadRes . $path . $name . $ext);
             } else {
                 $result = $value;
             }

src/Reg.php

@@ -171,6 +171,21 @@ class Reg extends Base
                 Dever::alert('确认密码不正确');
             }
 
+            if ($param['add_sex']) {
+                $config_sex = Dever::config('base', 'project')->sex;
+                if (isset($config_sex[$param['add_sex']])) {
+                    $param['add_sex'] = $config_sex[$param['add_sex']];
+                } else {
+                    if ($sex == '男') {
+                        $param['add_sex'] = 1;
+                    } elseif ($sex == '女') {
+                        $param['add_sex'] = 2;
+                    } elseif ($sex == '未知') {
+                        $param['add_sex'] = 3;
+                    }
+                }
+            }
+
             if ($param['add_username'] == $param['add_' . $account]) {
                 $param['add_username'] = substr_replace($param['add_username'],'****',3,4);
             }

src/User.php

@@ -48,12 +48,19 @@ class User extends Base
         $update['where_id'] = $this->user['id'];
         $sex = Dever::input('sex');
 
-        if ($sex == '男') {
-            $update['set_sex'] = 1;
-        } elseif ($sex == '女') {
-            $update['set_sex'] = 2;
-        } elseif ($sex == '未知') {
-            $update['set_sex'] = 3;
+        if ($sex) {
+            $config_sex = Dever::config('base', 'project')->sex;
+            if (isset($config_sex[$sex])) {
+                $update['set_sex'] = $config_sex[$sex];
+            } else {
+                if ($sex == '男') {
+                    $update['set_sex'] = 1;
+                } elseif ($sex == '女') {
+                    $update['set_sex'] = 2;
+                } elseif ($sex == '未知') {
+                    $update['set_sex'] = 3;
+                }
+            }
         }
 
         if ($update['set_avatar']) {