第一期

.env

@@ -1,6 +1,6 @@
 APP_NAME=user_producer
 APP_ENV=dev
-HOST = http://127.0.0.1:9501/
+HOST = http://192.168.1.201:9501/
 DB_DRIVER=mysql
 DB_HOST=127.0.0.1
 DB_PORT=3306

app/Controller/LoginController.php

@@ -78,7 +78,7 @@ class LoginController extends AbstractController
             'user_name' => $userInfos['data']['user_name'],
             'mobile' => $userInfos['data']['mobile'],
             'email' => $userInfos['data']['email'],
-            'rong_token' => $userInfos['data']['rong_token'],
+//            'rong_token' => $userInfos['data']['rong_token'],
             'level_id' => $userInfos['data']['level_id'],
             'type_id' => $userInfos['data']['type_id'],
         ];

app/Controller/UserController.php

@@ -32,19 +32,22 @@ class UserController extends AbstractController
         $validator = $this->validationFactory->make(
             $requireData,
             [
-                'user_name' => 'required',
-                'password' => 'required|min:6',
+                'user_name' => 'required',//登陆账号
+                'type_id'=> 'required',//用户类型
+                'password' => 'required|min:6',//密码
                 'confirm_password' => 'required',
-                'email' => 'email',
+                'real_name' => 'required',
                 'mobile' =>'required'
             ],
             [
-                'usernuser_name.required' => '用户名不能为空',
+                'user_name.required' => '用户名不能为空',
                 'password.required' => '密码不能为空',
-                'email.email' => '请填写一个有效的邮箱',
+//                'email.email' => '请填写一个有效的邮箱',
                 'mobile.required' => '手机号码必填',
 //                'mobile.telephone_number' => '请填写一个有效的手机号',
                 'confirm_password.required' =>"确认密码不能为空",
+                'type_id.required' =>"用户类型不能为空",
+                'real_name.required' =>"姓名不能为空",
                 'password.min' =>"密码长度不能低于6位数",
             ]
         );
@@ -59,10 +62,22 @@ class UserController extends AbstractController
         $requireData['salt'] = $salt;
         $loginIp = $this->request->getHeader('x-forwarded-for')[0] ?? $this->request->getHeader('x-real-ip')[0] ?? $this->request->getServerParams()['remote_addr'] ?? '0.0.0.0';
         $requireData['last_login_ip'] = $loginIp;
+        $requireData['admin_id'] = Context::get("UserId");
 
-//        $this->logger->info("创建用户入参：", $requireData);
+        $requireData['administrative_unit_id'] = isset($requireData['administrative_unit_arr_id'])?end($requireData['administrative_unit_arr_id']):0;
+        $requireData['administrative_unit_arr_id'] = isset($requireData['administrative_unit_arr_id'])?json_encode($requireData['administrative_unit_arr_id']):'';
+
+        $requireData['address_id'] = isset($requireData['address_arr_id'])?end($requireData['address_arr_id']):0;
+        $requireData['address_arr_id'] = isset($requireData['address_arr_id'])?json_encode($requireData['address_arr_id']):'';
+
+        $requireData['native_place_id'] = isset($requireData['native_place_arr_id'])?end($requireData['native_place_arr_id']):0;
+        $requireData['native_place_arr_id'] = isset($requireData['native_place_arr_id'])?json_encode($requireData['native_place_arr_id']):'';
+
+        $requireData['city_id'] = isset($requireData['city_arr_id'])?end($requireData['city_arr_id']):0;
+        $requireData['city_arr_id'] = isset($requireData['city_arr_id'])?json_encode($requireData['city_arr_id']):'';
+
+        $requireData['other'] = isset($requireData['other'])?json_encode($requireData['other']):'';
         $result =  $this->userServiceClient->createUser($requireData);
-//        $this->logger->info("创建用户返回值：", $result);
         return $result['code']==200?Result::success($result['data']):Result::error($result['message']);
     }
 
@@ -76,78 +91,101 @@ class UserController extends AbstractController
         $validator = $this->validationFactory->make(
             $requireData,
             [
-                'user_name' => 'required',
-                'email' => 'email',
-                'mobile' =>'required'
+                'user_name' => 'required',//登陆账号
+                'type_id'=> 'required',//用户类型
+                'real_name' => 'required',
+                'mobile' =>'required',
+                'id'=>'required'
             ],
             [
-                'usernuser_name.required' => '用户名不能为空',
-                'email.email' => '请填写一个有效的邮箱',
+                'user_name.required' => '用户名不能为空',
                 'mobile.required' => '手机号码必填',
+                'type_id.required' =>"用户类型不能为空",
+                'real_name.required' =>"姓名不能为空",
+                'id.required' =>"id不能为空",
             ]
         );
         if ($validator->fails()){
             $errorMessage = $validator->errors()->first();
             return Result::error($errorMessage);
         }
-        if($requireData['password'] && $requireData['confirm_password']){
-            if($requireData['password'] != $requireData['confirm_password']){
-                return Result::error("两次密码不一致");
-            }
-        }
-
-        $salt = rand(1, 999999);
-        $requireData['salt'] = $salt;
         $loginIp = $this->request->getHeader('x-forwarded-for')[0] ?? $this->request->getHeader('x-real-ip')[0] ?? $this->request->getServerParams()['remote_addr'] ?? '0.0.0.0';
         $requireData['last_login_ip'] = $loginIp;
+        $requireData['administrative_unit_id'] = isset($requireData['administrative_unit_arr_id'])?end($requireData['administrative_unit_arr_id']):0;
+        $requireData['administrative_unit_arr_id'] = isset($requireData['administrative_unit_arr_id'])?json_encode($requireData['administrative_unit_arr_id']):'';
+
+        $requireData['address_id'] = isset($requireData['address_arr_id'])?end($requireData['address_arr_id']):0;
+        $requireData['address_arr_id'] = isset($requireData['address_arr_id'])?json_encode($requireData['address_arr_id']):'';
+
+        $requireData['native_place_id'] = isset($requireData['native_place_arr_id'])?end($requireData['native_place_arr_id']):0;
+        $requireData['native_place_arr_id'] = isset($requireData['native_place_arr_id'])?json_encode($requireData['native_place_arr_id']):'';
+
+
+        $requireData['city_id'] = isset($requireData['city_arr_id'])?end($requireData['city_arr_id']):0;
+        $requireData['city_arr_id'] = isset($requireData['city_arr_id'])?json_encode($requireData['city_arr_id']):'';
+
+        $requireData['other'] = isset($requireData['other'])?json_encode($requireData['other']):'';
+        $requireData['admin_id'] = Context::get("UserId");
 
         $result =  $this->userServiceClient->updateUser($requireData);
-//        $this->logger->info("修改用户返回值：", $result);
         return $result?Result::success($result['data']):Result::error($result['message']);
     }
 
     /**
-     * 获取用户信息
-     * @return array|void
+     * 获取用户信息内容
+     * @return void
      */
-    public function getUserInfo()
+    public function getUser()
     {
-
-        $result =  $this->userServiceClient->getUserInfo((int)Context::get("UserId"));
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'id'=>'required'
+            ],
+            [
+                'id.required' =>"id不能为空",
+            ]
+        );
+        if ($validator->fails()){
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        $result =  $this->userServiceClient->getUserInfo((int)$requireData['id']);
         if ($result['code'] != ErrorCode::SUCCESS) {
             return Result::error($result['message'],0,[]);
         }
         return Result::success($result['data']);
     }
-
     /**
-     * 获取用户列表
-     * @return array
+     * 获取用户信息
+     * @return array|void
      */
-    public function getUserList(){
-        $requireData = $this->request->all();
-        $requireData['keyword'] = $requireData['keyword']??'';
-        $result =  $this->userServiceClient->getUserList($requireData);
+    public function getUserInfo()
+    {
 
+        $result =  $this->userServiceClient->getUserInfo((int)Context::get("UserId"));
         if ($result['code'] != ErrorCode::SUCCESS) {
             return Result::error($result['message'],0,[]);
         }
         return Result::success($result['data']);
     }
+
     /**
-     * 删除用户
+     * 获取用户列表
      * @return array
      */
-    public function delUser()
-    {
+    public function getUserList(){
         $requireData = $this->request->all();
         $validator = $this->validationFactory->make(
             $requireData,
             [
-                'id' => 'required'
+                'page' => 'required',
+                'pageSize' => 'required',
             ],
             [
-                'id.required' => '用户ID不能为空'
+                'page.required' => '页码不能为空',
+                'pageSize.required' => '每页显示条数不能为空',
             ]
         );
         if ($validator->fails()){
@@ -155,12 +193,40 @@ class UserController extends AbstractController
             return Result::error($errorMessage);
         }
 
-        $result =  $this->userServiceClient->delUser($requireData['id']);
+        $result =  $this->userServiceClient->getUserList($requireData);
+
         if ($result['code'] != ErrorCode::SUCCESS) {
             return Result::error($result['message'],0,[]);
         }
         return Result::success($result['data']);
     }
+    /**
+     * 删除用户
+     * @return array
+     */
+//    public function delUser()
+//    {
+//        $requireData = $this->request->all();
+//        $validator = $this->validationFactory->make(
+//            $requireData,
+//            [
+//                'id' => 'required'
+//            ],
+//            [
+//                'id.required' => '用户ID不能为空'
+//            ]
+//        );
+//        if ($validator->fails()){
+//            $errorMessage = $validator->errors()->first();
+//            return Result::error($errorMessage);
+//        }
+//
+//        $result =  $this->userServiceClient->delUser($requireData['id']);
+//        if ($result['code'] != ErrorCode::SUCCESS) {
+//            return Result::error($result['message'],0,[]);
+//        }
+//        return Result::success($result['data']);
+//    }
 
     /**
      * 查看角色信息
@@ -317,6 +383,30 @@ class UserController extends AbstractController
         return Result::success($result['data']);
     }
 
+     public function upUserStatus()
+     {
+         $requireData = $this->request->all();
+         $validator = $this->validationFactory->make(
+             $requireData,
+             [
+                 'status' => 'required',
+                 'id' => 'required'
+             ],
+             [
+                 'id.required' => 'ID不能为空',
+                 'status.required' => '状态不能为空',
+             ]
+         );
+         if ($validator->fails()){
+             $errorMessage = $validator->errors()->first();
+             return Result::error($errorMessage);
+         }
+         $result =  $this->userServiceClient->upUserStatus($requireData);
+         if ($result['code'] != ErrorCode::SUCCESS) {
+             return Result::error($result['message'],0,[]);
+         }
+         return Result::success($result['data']);
+     }
 
 
 

app/Controller/WebsiteController.php

@@ -753,6 +753,7 @@ class WebsiteController extends AbstractController
                         '3'=>'企业会员',
                         '4'=>'调研员',
                         '10000'=>'管理员',
+                        '20000'=>'游客',
                     ];
                     if($result['data']['userType']){
                         foreach ($result['data']['userType'] as $k=>$v){
@@ -1019,6 +1020,54 @@ class WebsiteController extends AbstractController
         return $result['code']==200?Result::success($result['data']):Result::error($result['message']);
     }
 
+    /**
+     * 检测网站名称是否存在
+     * @return array
+     */
+    public function checkWebsiteName()
+    {
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'website_name' => 'required'
+            ],
+            [
+                'website_name.required' => '网站名称不能为空'
+            ]
+        );
+        if ($validator->fails()){
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+
+        $result = $this->websiteServiceClient->checkWebsiteName($requireData);
+        return $result['code']==200?Result::success($result['data']):Result::error($result['message']);
+    }
 
+    /**
+     * 检测网站网址是否存在
+     * @return array
+     */
+    public function checkWebsiteUrl()
+    {
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make(
+            $requireData,
+            [
+                'website_url' => 'required'
+            ],
+            [
+                'website_url.required' => '网站网址不能为空'
+            ]
+        );
+        if ($validator->fails()){
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+
+        $result = $this->websiteServiceClient->checkWebsiteUrl($requireData);
+        return $result['code']==200?Result::success($result['data']):Result::error($result['message']);
+    }
 
 }

app/JsonRpc/UserService.php

@@ -140,4 +140,12 @@ class UserService extends AbstractServiceClient implements UserServiceInterface
     public function addWechatInfo(array $data){
         return $this->__request(__FUNCTION__, $data);
     }
+
+    /**
+     * @param array $data
+     * @return array|mixed
+     */
+    public function upUserStatus(array $data){
+        return $this->__request(__FUNCTION__, $data);
+    }
 }

app/JsonRpc/UserServiceInterface.php

@@ -98,4 +98,10 @@ interface UserServiceInterface
      * @return mixed
      */
     public function addWechatInfo(array $data);
+
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function upUserStatus(array $data);
 }

app/JsonRpc/WebsiteService.php

@@ -380,4 +380,22 @@ class WebsiteService extends AbstractServiceClient implements WebsiteServiceInte
     {
         return $this->__request(__FUNCTION__, $data);
     }
+
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function checkWebsiteName(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
+
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function checkWebsiteUrl(array $data)
+    {
+        return $this->__request(__FUNCTION__, $data);
+    }
 }

app/JsonRpc/WebsiteServiceInterface.php

@@ -244,4 +244,17 @@ interface WebsiteServiceInterface
      * @return mixed
      */
     public function getWebsiteAllCategory(array $data);
+
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function checkWebsiteName(array $data);
+
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function checkWebsiteUrl(array $data);
+
 }

config/api/public.php

@@ -28,9 +28,9 @@ Router::addGroup(
         //获取类型
         Router::get('/getLetterType', [PublicController::class, 'getLetterType']);
         //下载文件
-        Router::post('/downloadFile', [PublicController::class, 'downloadFile']);
+        Router::addRoute(['GET', 'POST'],'/downloadFile', [PublicController::class, 'downloadFile']);
         //检测是否已经被审核
-        Router::post('/checkMeasure', [PublicController::class, 'checkMeasure']);
+        Router::addRoute(['GET', 'POST'],'/checkMeasure', [PublicController::class, 'checkMeasure']);
         //获取职能部门
         Router::get('/getDepartment', [PublicController::class, 'getDepartment']);
 

config/api/user.php

@@ -9,7 +9,10 @@ Router::addGroup(
     '/user', function () {
         Router::post('/createUser', [UserController::class, 'createUser']);
         Router::post('/updateUser', [UserController::class, 'updateUser']);
+        //通过token获取用户信息
         Router::get('/getUserInfo', [UserController::class, 'getUserInfo']);
+        //获取用户信息
+        Router::get('/getUser', [UserController::class, 'getUser']);
         Router::get('/getUserList', [UserController::class, 'getUserList']);
         Router::post('/delUser', [UserController::class, 'delUser']);
         Router::post('/verifyUserInfo', [UserController::class, 'verifyUserInfo']);
@@ -23,6 +26,9 @@ Router::addGroup(
         Router::post('/delRole', [UserController::class, 'delRole']);
         //更新角色
         Router::post('/updateRole', [UserController::class, 'updateRole']);
+        //修改用户状态
+        Router::post('/upUserStatus', [UserController::class, 'upUserStatus']);
+
 
     },
     ['middleware' => [FooMiddleware::class]]

config/api/website.php

@@ -75,6 +75,10 @@ Router::addGroup(
 
         //搜索网站列表
         Router::get('/websiteList', [WebsiteController::class, 'websiteList']);
+        //检测网站名称是否存在
+        Router::post('/checkWebsiteName', [WebsiteController::class, 'checkWebsiteName']);
+        //检测域名是否被重复解析
+        Router::post('/checkWebsiteUrl', [WebsiteController::class, 'checkWebsiteUrl']);
 
 
     },

runtime/container/proxy/App_Controller_LoginController.proxy.php

@@ -74,7 +74,7 @@ class LoginController extends AbstractController
             'user_name' => $userInfos['data']['user_name'],
             'mobile' => $userInfos['data']['mobile'],
             'email' => $userInfos['data']['email'],
-            'rong_token' => $userInfos['data']['rong_token'],
+            //            'rong_token' => $userInfos['data']['rong_token'],
             'level_id' => $userInfos['data']['level_id'],
             'type_id' => $userInfos['data']['type_id'],
         ];

runtime/container/proxy/App_Controller_UserController.proxy.php

@@ -36,13 +36,25 @@ class UserController extends AbstractController
     public function createUser()
     {
         $requireData = $this->request->all();
-        $validator = $this->validationFactory->make($requireData, ['user_name' => 'required', 'password' => 'required|min:6', 'confirm_password' => 'required', 'email' => 'email', 'mobile' => 'required'], [
-            'usernuser_name.required' => '用户名不能为空',
+        $validator = $this->validationFactory->make($requireData, [
+            'user_name' => 'required',
+            //登陆账号
+            'type_id' => 'required',
+            //用户类型
+            'password' => 'required|min:6',
+            //密码
+            'confirm_password' => 'required',
+            'real_name' => 'required',
+            'mobile' => 'required',
+        ], [
+            'user_name.required' => '用户名不能为空',
             'password.required' => '密码不能为空',
-            'email.email' => '请填写一个有效的邮箱',
+            //                'email.email' => '请填写一个有效的邮箱',
             'mobile.required' => '手机号码必填',
             //                'mobile.telephone_number' => '请填写一个有效的手机号',
             'confirm_password.required' => "确认密码不能为空",
+            'type_id.required' => "用户类型不能为空",
+            'real_name.required' => "姓名不能为空",
             'password.min' => "密码长度不能低于6位数",
         ]);
         if ($validator->fails()) {
@@ -56,9 +68,17 @@ class UserController extends AbstractController
         $requireData['salt'] = $salt;
         $loginIp = $this->request->getHeader('x-forwarded-for')[0] ?? $this->request->getHeader('x-real-ip')[0] ?? $this->request->getServerParams()['remote_addr'] ?? '0.0.0.0';
         $requireData['last_login_ip'] = $loginIp;
-        //        $this->logger->info("创建用户入参：", $requireData);
+        $requireData['admin_id'] = Context::get("UserId");
+        $requireData['administrative_unit_id'] = isset($requireData['administrative_unit_arr_id']) ? end($requireData['administrative_unit_arr_id']) : 0;
+        $requireData['administrative_unit_arr_id'] = isset($requireData['administrative_unit_arr_id']) ? json_encode($requireData['administrative_unit_arr_id']) : '';
+        $requireData['address_id'] = isset($requireData['address_arr_id']) ? end($requireData['address_arr_id']) : 0;
+        $requireData['address_arr_id'] = isset($requireData['address_arr_id']) ? json_encode($requireData['address_arr_id']) : '';
+        $requireData['native_place_id'] = isset($requireData['native_place_arr_id']) ? end($requireData['native_place_arr_id']) : 0;
+        $requireData['native_place_arr_id'] = isset($requireData['native_place_arr_id']) ? json_encode($requireData['native_place_arr_id']) : '';
+        $requireData['city_id'] = isset($requireData['city_arr_id']) ? end($requireData['city_arr_id']) : 0;
+        $requireData['city_arr_id'] = isset($requireData['city_arr_id']) ? json_encode($requireData['city_arr_id']) : '';
+        $requireData['other'] = isset($requireData['other']) ? json_encode($requireData['other']) : '';
         $result = $this->userServiceClient->createUser($requireData);
-        //        $this->logger->info("创建用户返回值：", $result);
         return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
     }
     /**
@@ -68,68 +88,109 @@ class UserController extends AbstractController
     public function updateUser()
     {
         $requireData = $this->request->all();
-        $validator = $this->validationFactory->make($requireData, ['user_name' => 'required', 'email' => 'email', 'mobile' => 'required'], ['usernuser_name.required' => '用户名不能为空', 'email.email' => '请填写一个有效的邮箱', 'mobile.required' => '手机号码必填']);
+        $validator = $this->validationFactory->make($requireData, [
+            'user_name' => 'required',
+            //登陆账号
+            'type_id' => 'required',
+            //用户类型
+            'real_name' => 'required',
+            'mobile' => 'required',
+            'id' => 'required',
+        ], ['user_name.required' => '用户名不能为空', 'mobile.required' => '手机号码必填', 'type_id.required' => "用户类型不能为空", 'real_name.required' => "姓名不能为空", 'id.required' => "id不能为空"]);
         if ($validator->fails()) {
             $errorMessage = $validator->errors()->first();
             return Result::error($errorMessage);
         }
-        if ($requireData['password'] && $requireData['confirm_password']) {
-            if ($requireData['password'] != $requireData['confirm_password']) {
-                return Result::error("两次密码不一致");
-            }
-        }
-        $salt = rand(1, 999999);
-        $requireData['salt'] = $salt;
         $loginIp = $this->request->getHeader('x-forwarded-for')[0] ?? $this->request->getHeader('x-real-ip')[0] ?? $this->request->getServerParams()['remote_addr'] ?? '0.0.0.0';
         $requireData['last_login_ip'] = $loginIp;
+        $requireData['administrative_unit_id'] = isset($requireData['administrative_unit_arr_id']) ? end($requireData['administrative_unit_arr_id']) : 0;
+        $requireData['administrative_unit_arr_id'] = isset($requireData['administrative_unit_arr_id']) ? json_encode($requireData['administrative_unit_arr_id']) : '';
+        $requireData['address_id'] = isset($requireData['address_arr_id']) ? end($requireData['address_arr_id']) : 0;
+        $requireData['address_arr_id'] = isset($requireData['address_arr_id']) ? json_encode($requireData['address_arr_id']) : '';
+        $requireData['native_place_id'] = isset($requireData['native_place_arr_id']) ? end($requireData['native_place_arr_id']) : 0;
+        $requireData['native_place_arr_id'] = isset($requireData['native_place_arr_id']) ? json_encode($requireData['native_place_arr_id']) : '';
+        $requireData['city_id'] = isset($requireData['city_arr_id']) ? end($requireData['city_arr_id']) : 0;
+        $requireData['city_arr_id'] = isset($requireData['city_arr_id']) ? json_encode($requireData['city_arr_id']) : '';
+        $requireData['other'] = isset($requireData['other']) ? json_encode($requireData['other']) : '';
+        $requireData['admin_id'] = Context::get("UserId");
         $result = $this->userServiceClient->updateUser($requireData);
-        //        $this->logger->info("修改用户返回值：", $result);
         return $result ? Result::success($result['data']) : Result::error($result['message']);
     }
     /**
-     * 获取用户信息
-     * @return array|void
+     * 获取用户信息内容
+     * @return void
      */
-    public function getUserInfo()
+    public function getUser()
     {
-        $result = $this->userServiceClient->getUserInfo((int) Context::get("UserId"));
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make($requireData, ['id' => 'required'], ['id.required' => "id不能为空"]);
+        if ($validator->fails()) {
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        $result = $this->userServiceClient->getUserInfo((int) $requireData['id']);
         if ($result['code'] != ErrorCode::SUCCESS) {
             return Result::error($result['message'], 0, []);
         }
         return Result::success($result['data']);
     }
     /**
-     * 获取用户列表
-     * @return array
+     * 获取用户信息
+     * @return array|void
      */
-    public function getUserList()
+    public function getUserInfo()
     {
-        $requireData = $this->request->all();
-        $requireData['keyword'] = $requireData['keyword'] ?? '';
-        $result = $this->userServiceClient->getUserList($requireData);
+        $result = $this->userServiceClient->getUserInfo((int) Context::get("UserId"));
         if ($result['code'] != ErrorCode::SUCCESS) {
             return Result::error($result['message'], 0, []);
         }
         return Result::success($result['data']);
     }
     /**
-     * 删除用户
+     * 获取用户列表
      * @return array
      */
-    public function delUser()
+    public function getUserList()
     {
         $requireData = $this->request->all();
-        $validator = $this->validationFactory->make($requireData, ['id' => 'required'], ['id.required' => '用户ID不能为空']);
+        $validator = $this->validationFactory->make($requireData, ['page' => 'required', 'pageSize' => 'required'], ['page.required' => '页码不能为空', 'pageSize.required' => '每页显示条数不能为空']);
         if ($validator->fails()) {
             $errorMessage = $validator->errors()->first();
             return Result::error($errorMessage);
         }
-        $result = $this->userServiceClient->delUser($requireData['id']);
+        $result = $this->userServiceClient->getUserList($requireData);
         if ($result['code'] != ErrorCode::SUCCESS) {
             return Result::error($result['message'], 0, []);
         }
         return Result::success($result['data']);
     }
+    /**
+     * 删除用户
+     * @return array
+     */
+    //    public function delUser()
+    //    {
+    //        $requireData = $this->request->all();
+    //        $validator = $this->validationFactory->make(
+    //            $requireData,
+    //            [
+    //                'id' => 'required'
+    //            ],
+    //            [
+    //                'id.required' => '用户ID不能为空'
+    //            ]
+    //        );
+    //        if ($validator->fails()){
+    //            $errorMessage = $validator->errors()->first();
+    //            return Result::error($errorMessage);
+    //        }
+    //
+    //        $result =  $this->userServiceClient->delUser($requireData['id']);
+    //        if ($result['code'] != ErrorCode::SUCCESS) {
+    //            return Result::error($result['message'],0,[]);
+    //        }
+    //        return Result::success($result['data']);
+    //    }
     /**
      * 查看角色信息
      * @return array
@@ -239,4 +300,18 @@ class UserController extends AbstractController
         }
         return Result::success($result['data']);
     }
+    public function upUserStatus()
+    {
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make($requireData, ['status' => 'required', 'id' => 'required'], ['id.required' => 'ID不能为空', 'status.required' => '状态不能为空']);
+        if ($validator->fails()) {
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        $result = $this->userServiceClient->upUserStatus($requireData);
+        if ($result['code'] != ErrorCode::SUCCESS) {
+            return Result::error($result['message'], 0, []);
+        }
+        return Result::success($result['data']);
+    }
 }

runtime/container/proxy/App_Controller_WebsiteController.proxy.php

@@ -505,7 +505,7 @@ class WebsiteController extends AbstractController
                         }
                     }
                     //1:个人会员 2：政务会员 3：企业会员 4:调研员 10000：管理员
-                    $userType = ['1' => '个人会员', '2' => '政务会员', '3' => '企业会员', '4' => '调研员', '10000' => '管理员'];
+                    $userType = ['1' => '个人会员', '2' => '政务会员', '3' => '企业会员', '4' => '调研员', '10000' => '管理员', '20000' => '游客'];
                     if ($result['data']['userType']) {
                         foreach ($result['data']['userType'] as $k => $v) {
                             $result['data']['userType'][$k]['typeName'] = $userType[$v['type_id']];
@@ -668,4 +668,34 @@ class WebsiteController extends AbstractController
         $result = $this->websiteServiceClient->websiteList($requireData);
         return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
     }
+    /**
+     * 检测网站名称是否存在
+     * @return array
+     */
+    public function checkWebsiteName()
+    {
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make($requireData, ['website_name' => 'required'], ['website_name.required' => '网站名称不能为空']);
+        if ($validator->fails()) {
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        $result = $this->websiteServiceClient->checkWebsiteName($requireData);
+        return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
+    }
+    /**
+     * 检测网站网址是否存在
+     * @return array
+     */
+    public function checkWebsiteUrl()
+    {
+        $requireData = $this->request->all();
+        $validator = $this->validationFactory->make($requireData, ['website_url' => 'required'], ['website_url.required' => '网站网址不能为空']);
+        if ($validator->fails()) {
+            $errorMessage = $validator->errors()->first();
+            return Result::error($errorMessage);
+        }
+        $result = $this->websiteServiceClient->checkWebsiteUrl($requireData);
+        return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
+    }
 }

runtime/container/proxy/App_JsonRpc_UserServiceInterface.rpc-client.proxy.php

@@ -2,7 +2,7 @@
 
 namespace App\JsonRpc;
 
-class UserServiceInterface_c87d81348545884dd699f8f3dd42aaf4 extends \Hyperf\RpcClient\Proxy\AbstractProxyService implements UserServiceInterface
+class UserServiceInterface_58514cdf534488b8a614616f987f126f extends \Hyperf\RpcClient\Proxy\AbstractProxyService implements UserServiceInterface
 {
     /**
      * @param array $data
@@ -130,4 +130,12 @@ class UserServiceInterface_c87d81348545884dd699f8f3dd42aaf4 extends \Hyperf\RpcC
     {
         return $this->client->__call(__FUNCTION__, func_get_args());
     }
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function upUserStatus(array $data)
+    {
+        return $this->client->__call(__FUNCTION__, func_get_args());
+    }
 }

runtime/container/proxy/App_JsonRpc_WebsiteServiceInterface.rpc-client.proxy.php

@@ -2,7 +2,7 @@
 
 namespace App\JsonRpc;
 
-class WebsiteServiceInterface_a6099ced51bfe0de46ae02499a201262 extends \Hyperf\RpcClient\Proxy\AbstractProxyService implements WebsiteServiceInterface
+class WebsiteServiceInterface_62dc58b55414b1e3772feedb1ff0f561 extends \Hyperf\RpcClient\Proxy\AbstractProxyService implements WebsiteServiceInterface
 {
     /**
      * @param string $keyword
@@ -326,4 +326,20 @@ class WebsiteServiceInterface_a6099ced51bfe0de46ae02499a201262 extends \Hyperf\R
     {
         return $this->client->__call(__FUNCTION__, func_get_args());
     }
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function checkWebsiteName(array $data)
+    {
+        return $this->client->__call(__FUNCTION__, func_get_args());
+    }
+    /**
+     * @param array $data
+     * @return mixed
+     */
+    public function checkWebsiteUrl(array $data)
+    {
+        return $this->client->__call(__FUNCTION__, func_get_args());
+    }
 }