Browse Source

完善功能

gorden 10 months ago
parent
commit
7e42eb6fc6
47 changed files with 106 additions and 47 deletions
  1. 2 2
      app/admin/validate/asset/HouseTypeValidate.php
  2. 1 1
      app/admin/validate/at_home/GoodsValidate.php
  3. 1 1
      app/admin/validate/auth/AuthValidate.php
  4. 1 1
      app/admin/validate/coupon/CouponValidate.php
  5. 1 1
      app/admin/validate/device/DeviceValidate.php
  6. 1 1
      app/admin/validate/device/LedgerValidate.php
  7. 1 1
      app/admin/validate/goods/GoodsValidate.php
  8. 1 1
      app/admin/validate/healthy/ProductValidate.php
  9. 1 1
      app/admin/validate/life/CinemaIlkValidate.php
  10. 1 1
      app/admin/validate/life/CinemaPerformersValidate.php
  11. 1 1
      app/admin/validate/life/CinemaValidate.php
  12. 1 1
      app/admin/validate/life/CollegeCoursesValidate.php
  13. 1 1
      app/admin/validate/life/CollegeTeacherValidate.php
  14. 1 1
      app/admin/validate/life/CollegeTeachingValidate.php
  15. 1 1
      app/admin/validate/life/FarmGoodsValidate.php
  16. 1 1
      app/admin/validate/life/FarmLandValidate.php
  17. 1 1
      app/admin/validate/life/FarmPackageGoodsValidate.php
  18. 1 1
      app/admin/validate/life/FarmPackageValidate.php
  19. 1 1
      app/admin/validate/life/HealthyFoodValidate.php
  20. 1 1
      app/admin/validate/life/TravelLineValidate.php
  21. 1 1
      app/admin/validate/life/TravelSchedulingValidate.php
  22. 1 1
      app/admin/validate/marketing/PremisesValidate.php
  23. 1 1
      app/admin/validate/medical/DeptValidate.php
  24. 1 1
      app/admin/validate/medical/DoctorValidate.php
  25. 1 1
      app/admin/validate/medical/ReservationServiceValidate.php
  26. 1 1
      app/admin/validate/medical/SalesmanValidate.php
  27. 1 1
      app/admin/validate/medical/ShopValidate.php
  28. 1 1
      app/admin/validate/member/MemberValidate.php
  29. 1 1
      app/admin/validate/member/WellnessRecordValidate.php
  30. 1 1
      app/admin/validate/order/OrderExpressValidate.php
  31. 1 1
      app/admin/validate/order/OrderValidate.php
  32. 1 1
      app/admin/validate/order/ReturnValidate.php
  33. 1 1
      app/admin/validate/sys_manage/AdvValidate.php
  34. 1 1
      app/admin/validate/sys_manage/ApiValidate.php
  35. 1 1
      app/admin/validate/sys_manage/ArticleValidate.php
  36. 1 1
      app/admin/validate/sys_manage/CategoryValidate.php
  37. 1 1
      app/admin/validate/sys_manage/ConfigValidate.php
  38. 1 1
      app/admin/validate/sys_manage/ContentValidate.php
  39. 1 1
      app/admin/validate/sys_manage/DeptValidate.php
  40. 1 1
      app/admin/validate/sys_manage/FieldValidate.php
  41. 1 1
      app/admin/validate/sys_manage/MenuValidate.php
  42. 1 1
      app/admin/validate/sys_manage/PostageTemplateValidate.php
  43. 1 1
      app/admin/validate/sys_manage/RoleValidate.php
  44. 1 1
      app/admin/validate/sys_manage/SupplierValidate.php
  45. 1 1
      app/admin/validate/sys_manage/TaskValidate.php
  46. 1 1
      app/admin/validate/sys_manage/UserValidate.php
  47. 59 0
      support/Validate.php

+ 2 - 2
app/admin/validate/asset/HouseTypeValidate.php

@@ -2,13 +2,13 @@
 
 namespace app\admin\validate\asset;
 
-use think\Validate;
+use support\Validate;
 
 class HouseTypeValidate extends Validate
 {
     protected $rule = [
         'asset_id' => 'require',
-        'join_asset_category_id' => 'integer',
+        'join_asset_category_id|所属分类' => 'integer',
         'asset_key|资产标识' => 'require|alphaDash',
         'asset_classify|归类' => 'max:32',
         'asset_status|状态' => 'require|in:ACTIVED,DISABLED',

+ 1 - 1
app/admin/validate/at_home/GoodsValidate.php

@@ -2,7 +2,7 @@
 
 namespace app\admin\validate\at_home;
 
-use think\Validate;
+use support\Validate;
 
 class GoodsValidate extends Validate
 {

+ 1 - 1
app/admin/validate/auth/AuthValidate.php

@@ -3,7 +3,7 @@
 
 namespace app\admin\validate\auth;
 
-use think\Validate;
+use support\Validate;
 
 class AuthValidate extends Validate
 {

+ 1 - 1
app/admin/validate/coupon/CouponValidate.php

@@ -2,7 +2,7 @@
 
 namespace app\admin\validate\coupon;
 
-use think\Validate;
+use support\Validate;
 
 class CouponValidate extends Validate
 {

+ 1 - 1
app/admin/validate/device/DeviceValidate.php

@@ -2,7 +2,7 @@
 
 namespace app\admin\validate\device;
 
-use think\Validate;
+use support\Validate;
 
 class DeviceValidate extends Validate
 {

+ 1 - 1
app/admin/validate/device/LedgerValidate.php

@@ -2,7 +2,7 @@
 
 namespace app\admin\validate\device;
 
-use think\Validate;
+use support\Validate;
 
 class LedgerValidate extends Validate
 {

+ 1 - 1
app/admin/validate/goods/GoodsValidate.php

@@ -2,7 +2,7 @@
 
 namespace app\admin\validate\goods;
 
-use think\Validate;
+use support\Validate;
 
 class GoodsValidate extends Validate
 {

+ 1 - 1
app/admin/validate/healthy/ProductValidate.php

@@ -2,7 +2,7 @@
 
 namespace app\admin\validate\healthy;
 
-use think\Validate;
+use support\Validate;
 
 class ProductValidate extends Validate
 {

+ 1 - 1
app/admin/validate/life/CinemaIlkValidate.php

@@ -2,7 +2,7 @@
 
 namespace app\admin\validate\life;
 
-use think\Validate;
+use support\Validate;
 
 class CinemaIlkValidate extends Validate
 {

+ 1 - 1
app/admin/validate/life/CinemaPerformersValidate.php

@@ -2,7 +2,7 @@
 
 namespace app\admin\validate\life;
 
-use think\Validate;
+use support\Validate;
 
 class CinemaPerformersValidate extends Validate
 {

+ 1 - 1
app/admin/validate/life/CinemaValidate.php

@@ -2,7 +2,7 @@
 
 namespace app\admin\validate\life;
 
-use think\Validate;
+use support\Validate;
 
 class CinemaValidate extends Validate
 {

+ 1 - 1
app/admin/validate/life/CollegeCoursesValidate.php

@@ -2,7 +2,7 @@
 
 namespace app\admin\validate\life;
 
-use think\Validate;
+use support\Validate;
 
 class CollegeCoursesValidate extends Validate
 {

+ 1 - 1
app/admin/validate/life/CollegeTeacherValidate.php

@@ -2,7 +2,7 @@
 
 namespace app\admin\validate\life;
 
-use think\Validate;
+use support\Validate;
 
 class CollegeTeacherValidate extends Validate
 {

+ 1 - 1
app/admin/validate/life/CollegeTeachingValidate.php

@@ -2,7 +2,7 @@
 
 namespace app\admin\validate\life;
 
-use think\Validate;
+use support\Validate;
 
 class CollegeTeachingValidate extends Validate
 {

+ 1 - 1
app/admin/validate/life/FarmGoodsValidate.php

@@ -2,7 +2,7 @@
 
 namespace app\admin\validate\life;
 
-use think\Validate;
+use support\Validate;
 
 class FarmGoodsValidate extends Validate
 {

+ 1 - 1
app/admin/validate/life/FarmLandValidate.php

@@ -2,7 +2,7 @@
 
 namespace app\admin\validate\life;
 
-use think\Validate;
+use support\Validate;
 
 class FarmLandValidate extends Validate
 {

+ 1 - 1
app/admin/validate/life/FarmPackageGoodsValidate.php

@@ -2,7 +2,7 @@
 
 namespace app\admin\validate\life;
 
-use think\Validate;
+use support\Validate;
 
 class FarmPackageGoodsValidate extends Validate
 {

+ 1 - 1
app/admin/validate/life/FarmPackageValidate.php

@@ -2,7 +2,7 @@
 
 namespace app\admin\validate\life;
 
-use think\Validate;
+use support\Validate;
 
 class FarmPackageValidate extends Validate
 {

+ 1 - 1
app/admin/validate/life/HealthyFoodValidate.php

@@ -2,7 +2,7 @@
 
 namespace app\admin\validate\life;
 
-use think\Validate;
+use support\Validate;
 
 class HealthyFoodValidate extends Validate
 {

+ 1 - 1
app/admin/validate/life/TravelLineValidate.php

@@ -2,7 +2,7 @@
 
 namespace app\admin\validate\life;
 
-use think\Validate;
+use support\Validate;
 
 class TravelLineValidate extends Validate
 {

+ 1 - 1
app/admin/validate/life/TravelSchedulingValidate.php

@@ -2,7 +2,7 @@
 
 namespace app\admin\validate\life;
 
-use think\Validate;
+use support\Validate;
 
 class TravelSchedulingValidate extends Validate
 {

+ 1 - 1
app/admin/validate/marketing/PremisesValidate.php

@@ -2,7 +2,7 @@
 
 namespace app\admin\validate\marketing;
 
-use think\Validate;
+use support\Validate;
 
 class PremisesValidate extends Validate
 {

+ 1 - 1
app/admin/validate/medical/DeptValidate.php

@@ -2,7 +2,7 @@
 
 namespace app\admin\validate\medical;
 
-use think\Validate;
+use support\Validate;
 
 class DeptValidate extends Validate
 {

+ 1 - 1
app/admin/validate/medical/DoctorValidate.php

@@ -2,7 +2,7 @@
 
 namespace app\admin\validate\medical;
 
-use think\Validate;
+use support\Validate;
 
 class DoctorValidate extends Validate
 {

+ 1 - 1
app/admin/validate/medical/ReservationServiceValidate.php

@@ -2,7 +2,7 @@
 
 namespace app\admin\validate\medical;
 
-use think\Validate;
+use support\Validate;
 
 class ReservationServiceValidate extends Validate
 {

+ 1 - 1
app/admin/validate/medical/SalesmanValidate.php

@@ -2,7 +2,7 @@
 
 namespace app\admin\validate\medical;
 
-use think\Validate;
+use support\Validate;
 
 class SalesmanValidate extends Validate
 {

+ 1 - 1
app/admin/validate/medical/ShopValidate.php

@@ -2,7 +2,7 @@
 
 namespace app\admin\validate\medical;
 
-use think\Validate;
+use support\Validate;
 
 class ShopValidate extends Validate
 {

+ 1 - 1
app/admin/validate/member/MemberValidate.php

@@ -2,7 +2,7 @@
 
 namespace app\admin\validate\member;
 
-use think\Validate;
+use support\Validate;
 
 class MemberValidate extends Validate
 {

+ 1 - 1
app/admin/validate/member/WellnessRecordValidate.php

@@ -2,7 +2,7 @@
 
 namespace app\admin\validate\member;
 
-use think\Validate;
+use support\Validate;
 
 class WellnessRecordValidate extends Validate
 {

+ 1 - 1
app/admin/validate/order/OrderExpressValidate.php

@@ -2,7 +2,7 @@
 
 namespace app\admin\validate\order;
 
-use think\Validate;
+use support\Validate;
 
 class OrderExpressValidate extends Validate
 {

+ 1 - 1
app/admin/validate/order/OrderValidate.php

@@ -2,7 +2,7 @@
 
 namespace app\admin\validate\order;
 
-use think\Validate;
+use support\Validate;
 
 class OrderValidate extends Validate
 {

+ 1 - 1
app/admin/validate/order/ReturnValidate.php

@@ -2,7 +2,7 @@
 
 namespace app\admin\validate\order;
 
-use think\Validate;
+use support\Validate;
 
 class ReturnValidate extends Validate
 {

+ 1 - 1
app/admin/validate/sys_manage/AdvValidate.php

@@ -2,7 +2,7 @@
 
 namespace app\admin\validate\sys_manage;
 
-use think\Validate;
+use support\Validate;
 
 class AdvValidate extends Validate
 {

+ 1 - 1
app/admin/validate/sys_manage/ApiValidate.php

@@ -2,7 +2,7 @@
 
 namespace app\admin\validate\sys_manage;
 
-use think\Validate;
+use support\Validate;
 
 class ApiValidate extends Validate
 {

+ 1 - 1
app/admin/validate/sys_manage/ArticleValidate.php

@@ -2,7 +2,7 @@
 
 namespace app\admin\validate\sys_manage;
 
-use think\Validate;
+use support\Validate;
 
 class ArticleValidate extends Validate
 {

+ 1 - 1
app/admin/validate/sys_manage/CategoryValidate.php

@@ -2,7 +2,7 @@
 
 namespace app\admin\validate\sys_manage;
 
-use think\Validate;
+use support\Validate;
 
 class CategoryValidate extends Validate
 {

+ 1 - 1
app/admin/validate/sys_manage/ConfigValidate.php

@@ -2,7 +2,7 @@
 
 namespace app\admin\validate\sys_manage;
 
-use think\Validate;
+use support\Validate;
 
 class ConfigValidate extends Validate
 {

+ 1 - 1
app/admin/validate/sys_manage/ContentValidate.php

@@ -2,7 +2,7 @@
 
 namespace app\admin\validate\sys_manage;
 
-use think\Validate;
+use support\Validate;
 
 class ContentValidate extends Validate
 {

+ 1 - 1
app/admin/validate/sys_manage/DeptValidate.php

@@ -2,7 +2,7 @@
 
 namespace app\admin\validate\sys_manage;
 
-use think\Validate;
+use support\Validate;
 
 class DeptValidate extends Validate
 {

+ 1 - 1
app/admin/validate/sys_manage/FieldValidate.php

@@ -2,7 +2,7 @@
 
 namespace app\admin\validate\sys_manage;
 
-use think\Validate;
+use support\Validate;
 
 class FieldValidate extends Validate
 {

+ 1 - 1
app/admin/validate/sys_manage/MenuValidate.php

@@ -2,7 +2,7 @@
 
 namespace app\admin\validate\sys_manage;
 
-use think\Validate;
+use support\Validate;
 
 class MenuValidate extends Validate
 {

+ 1 - 1
app/admin/validate/sys_manage/PostageTemplateValidate.php

@@ -2,7 +2,7 @@
 
 namespace app\admin\validate\sys_manage;
 
-use think\Validate;
+use support\Validate;
 
 class PostageTemplateValidate extends Validate
 {

+ 1 - 1
app/admin/validate/sys_manage/RoleValidate.php

@@ -2,7 +2,7 @@
 
 namespace app\admin\validate\sys_manage;
 
-use think\Validate;
+use support\Validate;
 
 class RoleValidate extends Validate
 {

+ 1 - 1
app/admin/validate/sys_manage/SupplierValidate.php

@@ -2,7 +2,7 @@
 
 namespace app\admin\validate\sys_manage;
 
-use think\Validate;
+use support\Validate;
 
 class SupplierValidate extends Validate
 {

+ 1 - 1
app/admin/validate/sys_manage/TaskValidate.php

@@ -2,7 +2,7 @@
 
 namespace app\admin\validate\sys_manage;
 
-use think\Validate;
+use support\Validate;
 
 class TaskValidate extends Validate
 {

+ 1 - 1
app/admin/validate/sys_manage/UserValidate.php

@@ -2,7 +2,7 @@
 
 namespace app\admin\validate\sys_manage;
 
-use think\Validate;
+use support\Validate;
 
 class UserValidate extends Validate
 {

+ 59 - 0
support/Validate.php

@@ -0,0 +1,59 @@
+<?php
+
+namespace support;
+
+class Validate extends \think\Validate
+{
+    protected $typeMsg = [
+        'require'     => ':attribute 必填',
+        'must'        => ':attribute 必须',
+        'number'      => ':attribute 必须是数字',
+        'integer'     => ':attribute 必须是整数',
+        'float'       => ':attribute 必须是小数',
+        'boolean'     => ':attribute 必须是布尔型',
+        'email'       => ':attribute 必须是邮箱格式',
+        'mobile'      => ':attribute 必须是手机号码格式',
+        'array'       => ':attribute 必须是数组',
+        'accepted'    => ':attribute 必须同意',
+        'date'        => ':attribute 必须是时间格式',
+        'file'        => ':attribute 必须是文件',
+        'image'       => ':attribute 必须是图片',
+        'alpha'       => ':attribute 必须是字母',
+        'alphaNum'    => ':attribute 必须是字母和数字组合',
+        'alphaDash'   => ':attribute 必须是字母和下划线组合',
+        'activeUrl'   => ':attribute 必须是域或IP地址',
+        'chs'         => ':attribute 必须是汉字',
+        'chsAlpha'    => ':attribute 格式错误',
+        'chsAlphaNum' => ':attribute 必须是汉字,字母,下划线',
+        'chsDash'     => ':attribute 必须是汉字,数字,字母,下划线',
+        'url'         => ':attribute 必须是链接格式',
+        'ip'          => ':attribute 必须是IP格式',
+        'dateFormat'  => ':attribute 必须是时间格式 :rule',
+        'in'          => ':attribute 必须在 :rule 之中',
+        'notIn'       => ':attribute 不在 :rule 之中',
+        'between'     => ':attribute 必须在 :1 - :2 之间',
+        'notBetween'  => ':attribute 不在 :1 - :2 之间',
+        'length'      => ':attribute 长度必须小于 :rule',
+        'max'         => ':attribute 长度必须小于 :rule ',
+        'min'         => ':attribute 必须大于 :rule',
+        'after'       => ':attribute 不能小于 :rule',
+        'before'      => ':attribute 不能超过 :rule',
+        'expire'      => ':attribute 不在有效期内 :rule',
+        'allowIp'     => '当前IP不允许访问',
+        'denyIp'      => '访问IP被拒绝',
+        'confirm'     => ':attribute out of accord with :2',
+        'different'   => ':attribute cannot be same with :2',
+        'egt'         => ':attribute 必须大于或等于:rule',
+        'gt'          => ':attribute 必须大于 :rule',
+        'elt'         => ':attribute 必须小于或等于 :rule',
+        'lt'          => ':attribute 必须小于 :rule',
+        'eq'          => ':attribute 必须等于 :rule',
+        'unique'      => ':attribute 已存在',
+        'regex'       => ':attribute 不符合规则',
+        'method'      => '无效的请求方法',
+        'token'       => '无效的令牌',
+        'fileSize'    => '文件大小不匹配',
+        'fileExt'     => '文件类型不允许上传',
+        'fileMime'    => '文件类型不允许上传',
+    ];
+}