修复

.env.example

@@ -9,11 +9,17 @@ DEBUG_JAVASCRIPT = true
 
 # Encryption key
 AUTH_KEY = 7becb888f518b20224a988906df51e05
+JWT_AUTH_KEY = 7becb888f518b20224a988906df51e05
+AUTH_RSA_PUBLIC_KEY = null
+AUTH_RSA_PRIVATE_KEY = null
+APP_SECRET_RSA_PUBLIC_KEY = 'LS0tLS1CRUdJTiBQVUJMSUMgS0VZLS0tLS0KTUlJQklqQU5CZ2txaGtpRzl3MEJBUUVGQUFPQ0FROEFNSUlCQ2dLQ0FRRUExY3hVcnA2bmNvckRtUmhnTStLRwp3YS9uQzdkWGQ1OWRiRWxVWXdOL25JUk5VZUF1UzN4RzRHM2gzK1BBVG9Dem1ocnNlMUJrb1pTQ3BKMlh0dnF4ClVodkxySHZZTzRLWGlBeVlmdEp3dTd2L0doREFaY0JabkpqY3hnOGowK1ZLTkVPdXlMSXFucTZ6eVlHTlZ1b20KU2xnOWJpOEFyNHROZTlqVjMybU1jWGJxSm02QWFkTzZqTTZNVHRMLzJPazNjR2ZWZFJWR1FMMWhBUHV1ZWV5UApWNlZqaWhnWkE3anpkcGdWSEVXemFyTG5BZ25WSlJ4VDNFeXFja0NxSE0rYmVQejNaaHpuUVlpaVNOUUs0bnF2CnR5dWFYM2l0d01MbW80MVk2UEZSbzBPOGx3Z1dEdjd6ZzFSN0IvQ1VWdUdTdnV5S0hobC96Z01aeW5URi8zQnoKdndJREFRQUIKLS0tLS1FTkQgUFVCTElDIEtFWS0tLS0t'
+APP_SECRET_RSA_PRIVATE_KEY = 'LS0tLS1CRUdJTiBQUklWQVRFIEtFWS0tLS0tCk1JSUV2d0lCQURBTkJna3Foa2lHOXcwQkFRRUZBQVNDQktrd2dnU2xBZ0VBQW9JQkFRRFZ6RlN1bnFkeWlzT1oKR0dBejRvYkJyK2NMdDFkM24xMXNTVlJqQTMrY2hFMVI0QzVMZkViZ2JlSGY0OEJPZ0xPYUd1eDdVR1NobElLawpuWmUyK3JGU0c4dXNlOWc3Z3BlSURKaCswbkM3dS84YUVNQmx3Rm1jbU56R0R5UFQ1VW8wUTY3SXNpcWVyclBKCmdZMVc2aVpLV0QxdUx3Q3ZpMDE3Mk5YZmFZeHhkdW9tYm9CcDA3cU16b3hPMHYvWTZUZHdaOVYxRlVaQXZXRUEKKzY1NTdJOVhwV09LR0JrRHVQTjJtQlVjUmJOcXN1Y0NDZFVsSEZQY1RLcHlRS29jejV0NC9QZG1IT2RCaUtKSQoxQXJpZXErM0s1cGZlSzNBd3VhampWam84VkdqUTd5WENCWU8vdk9EVkhzSDhKUlc0WksrN0lvZUdYL09BeG5LCmRNWC9jSE8vQWdNQkFBRUNnZ0VCQUtZclZ4SVZlNzM1L2thcWZITTNPRmVvR1NLeEVFbUlVcnRNVDB0WnQ4QjEKMEFhNEFDTnBaMGtkL25YZWRXUk9nY2xmN2JkMlo1QnlkZ3Z0OUxJaUxObk5nc0wveXJPT0w2cHRaOFVDV042QgpJcWdtcHZNdXlqZDlVL0tZWjlkVW1oVC9HZ1VnL1NFeVZjaGphZkJJc3hRTGUwdDlPc0kxdWpaczlPWGRDbXhRCmZIWTlDRXJTWUtjQTVqV3djaW1tVDEvTVNsTno1THp0WmJCclNlcE9od1luVnV3c0NrdjJreHRTUlVPd1dubWoKRVpMcjhscXMwaXVnd1FVUEFOclZ4dzl4ODAxaWIyQ3RYZTZkZzBBdmFDcDBxRUJSVGVENFJxdmYwWEJZbnltMwpLQ2swODEwY2tmNHBkNUtIZlpHd3lza0pNMnhZRUp6dnlqRDVSOGlxWUFrQ2dZRUEvcjNkVkVuZzJBa1RpbTRwCkttMUVKaDl1dlFnSW94aFpiZWdlOEpxeU5kR2c4TkYrcjNqdWxZeHNJWnpRemJXN3hTeVZlalRReUh5Yk5kLzUKS3RacTh1MWNnSGJyTTM0elVJa1ZESTMwZXhVYTdacndyRXNvNmM4eHNmaVJwQUxNS3RpcmNINnVMNDQrWThSZgp3UHMrK216cTJZaXMzZmVPQzZXRDBZdTJuOFVDZ1lFQTF0cXcyam1PbFF5OGkwNDZXZzBoeHpNMk9wUGpSTldMClVFL1ZzdWNVdi9uemViNmUwVlNNS1hkQkp2S0dUUVhNUURjRW4vcnR5SmlWOTBZU25hL2ZNWDRsdy8wTk9KTWQKNi9ZVDgxY1pZOCtqMzFqL0FZaU1UZHJmd1ExaDZEbmt3WHRrY0Z3eGJkRDBFVU5iL21YcjBabTF3ZWVxRXEvNAorT1F0R3VaYW1iTUNnWUVBdmxTUnQ5WnpIamE1Mk9ZeDc3Y3dBZVBlVTNKYk1iQ1JzT0tMcTIySjFWaEpEV1VaCmFIWE1uUVFNRHBraUVYREZXSzdWQ0RmSi91SEsvZGZZVFQ5akxScFgwTXdKTTdJSkdSVXpHdXc5VEhFYWE0a20KWlRUSzN0YWw1TGs1NS9jSElNUStZNURqQ0RrWk9HV1N2WmQ3R0pTa2ErQUllTmZyMDV2WS80bUo2NWtDZ1lBeApOdjd6dmVOdk9PK25hVS9zZUwyWUI1OFFZL2ZYT0tNa3ptVEJDald5aytxMXBIaDBzczA0WWx6R014K1lYUStnClZmbjFPMkZrWmE5VWFQU3lzaXFLQjc5VzJZeEJ2VkZKVDZEYVNNVkVHN2dKM1RUc2dQN0NoclJpWUZKaEE0SG0KNEFEdHkvQjJtenFOQ2NUMHpSdnJjeTR6TUlIQXJoWjF6SzZZVHRQS0NRS0JnUURGQnkvbCt2UmNCY0VVL2N3UQpKTHdBV0E1SEhwWU1mazJ3TkhKSTF0TWVxdHBTcElaTk9sZHpHQUhoZWt3WkxnOEdJNmhTcUVRNWhJOE8ra2V1CmltVVo1RmFkMnQyZXB1eXI5RTdMMEpEbW13ZENEOEErOFE0bTlWeUZWTDRNUTRRRzM2R1lZWDlVeUlBRzI2UTIKSThGN1p3RTFlNis5M0RSWmlOWTlxTnpNNkE9PQotLS0tLUVORCBQUklWQVRFIEtFWS0tLS0t'
 
 # Resource `php leevel link:[public|storage]`
 DOMAIN = 
 PUBLIC = http://127.0.0.1:9527/public
 STORAGE = http://127.0.0.1:9527/storage
+ATTACHMENTS_URL = http://127.0.0.1:9527/attachments
 
 # Lang
 I18N = zh-CN
@@ -22,11 +28,19 @@ I18N = zh-CN
 DATABASE_DRIVER = mysql
 DATABASE_HOST = 127.0.0.1
 DATABASE_PORT = 3306
-DATABASE_NAME = queryphp_development_db
+DATABASE_NAME = apiql_data1
+DATABASE_NAME_PREFIX = apiql_data
 DATABASE_USER = root
 DATABASE_PASSWORD =
-DATABASE_MYSQL_POOL_MAX_IDLE_CONNECTIONS = 30
-DATABASE_MYSQL_POOL_MIN_IDLE_CONNECTIONS = 10
+
+# Common database
+DATABASE_COMMON_DRIVER = mysql
+DATABASE_COMMON_HOST = 127.0.0.1
+DATABASE_COMMON_PORT = 3306
+DATABASE_COMMON_NAME = apiql_common
+DATABASE_COMMON_NAME_PREFIX = apiql_common
+DATABASE_COMMON_USER = root
+DATABASE_COMMON_PASSWORD =
 
 # AUTH
 AUTH_EXPIRE = 2592000
@@ -37,8 +51,6 @@ CACHE_EXPIRE = 86400
 CACHE_REDIS_HOST = 127.0.0.1
 CACHE_REDIS_PORT = 6379
 CACHE_REDIS_PASSWORD = null
-CACHE_REDIS_POOL_MAX_IDLE_CONNECTIONS = 30
-CACHE_REDIS_POOL_MIN_IDLE_CONNECTIONS = 10
 
 # Session
 SESSION_DRIVER = file

.env.phpunit.example

@@ -9,11 +9,17 @@ DEBUG_JAVASCRIPT = true
 
 # Encryption key
 AUTH_KEY = 7becb888f518b20224a988906df51e05
+JWT_AUTH_KEY = 7becb888f518b20224a988906df51e05
+AUTH_RSA_PUBLIC_KEY = null
+AUTH_RSA_PRIVATE_KEY = null
+APP_SECRET_RSA_PUBLIC_KEY = 'LS0tLS1CRUdJTiBQVUJMSUMgS0VZLS0tLS0KTUlJQklqQU5CZ2txaGtpRzl3MEJBUUVGQUFPQ0FROEFNSUlCQ2dLQ0FRRUExY3hVcnA2bmNvckRtUmhnTStLRwp3YS9uQzdkWGQ1OWRiRWxVWXdOL25JUk5VZUF1UzN4RzRHM2gzK1BBVG9Dem1ocnNlMUJrb1pTQ3BKMlh0dnF4ClVodkxySHZZTzRLWGlBeVlmdEp3dTd2L0doREFaY0JabkpqY3hnOGowK1ZLTkVPdXlMSXFucTZ6eVlHTlZ1b20KU2xnOWJpOEFyNHROZTlqVjMybU1jWGJxSm02QWFkTzZqTTZNVHRMLzJPazNjR2ZWZFJWR1FMMWhBUHV1ZWV5UApWNlZqaWhnWkE3anpkcGdWSEVXemFyTG5BZ25WSlJ4VDNFeXFja0NxSE0rYmVQejNaaHpuUVlpaVNOUUs0bnF2CnR5dWFYM2l0d01MbW80MVk2UEZSbzBPOGx3Z1dEdjd6ZzFSN0IvQ1VWdUdTdnV5S0hobC96Z01aeW5URi8zQnoKdndJREFRQUIKLS0tLS1FTkQgUFVCTElDIEtFWS0tLS0t'
+APP_SECRET_RSA_PRIVATE_KEY = 'LS0tLS1CRUdJTiBQUklWQVRFIEtFWS0tLS0tCk1JSUV2d0lCQURBTkJna3Foa2lHOXcwQkFRRUZBQVNDQktrd2dnU2xBZ0VBQW9JQkFRRFZ6RlN1bnFkeWlzT1oKR0dBejRvYkJyK2NMdDFkM24xMXNTVlJqQTMrY2hFMVI0QzVMZkViZ2JlSGY0OEJPZ0xPYUd1eDdVR1NobElLawpuWmUyK3JGU0c4dXNlOWc3Z3BlSURKaCswbkM3dS84YUVNQmx3Rm1jbU56R0R5UFQ1VW8wUTY3SXNpcWVyclBKCmdZMVc2aVpLV0QxdUx3Q3ZpMDE3Mk5YZmFZeHhkdW9tYm9CcDA3cU16b3hPMHYvWTZUZHdaOVYxRlVaQXZXRUEKKzY1NTdJOVhwV09LR0JrRHVQTjJtQlVjUmJOcXN1Y0NDZFVsSEZQY1RLcHlRS29jejV0NC9QZG1IT2RCaUtKSQoxQXJpZXErM0s1cGZlSzNBd3VhampWam84VkdqUTd5WENCWU8vdk9EVkhzSDhKUlc0WksrN0lvZUdYL09BeG5LCmRNWC9jSE8vQWdNQkFBRUNnZ0VCQUtZclZ4SVZlNzM1L2thcWZITTNPRmVvR1NLeEVFbUlVcnRNVDB0WnQ4QjEKMEFhNEFDTnBaMGtkL25YZWRXUk9nY2xmN2JkMlo1QnlkZ3Z0OUxJaUxObk5nc0wveXJPT0w2cHRaOFVDV042QgpJcWdtcHZNdXlqZDlVL0tZWjlkVW1oVC9HZ1VnL1NFeVZjaGphZkJJc3hRTGUwdDlPc0kxdWpaczlPWGRDbXhRCmZIWTlDRXJTWUtjQTVqV3djaW1tVDEvTVNsTno1THp0WmJCclNlcE9od1luVnV3c0NrdjJreHRTUlVPd1dubWoKRVpMcjhscXMwaXVnd1FVUEFOclZ4dzl4ODAxaWIyQ3RYZTZkZzBBdmFDcDBxRUJSVGVENFJxdmYwWEJZbnltMwpLQ2swODEwY2tmNHBkNUtIZlpHd3lza0pNMnhZRUp6dnlqRDVSOGlxWUFrQ2dZRUEvcjNkVkVuZzJBa1RpbTRwCkttMUVKaDl1dlFnSW94aFpiZWdlOEpxeU5kR2c4TkYrcjNqdWxZeHNJWnpRemJXN3hTeVZlalRReUh5Yk5kLzUKS3RacTh1MWNnSGJyTTM0elVJa1ZESTMwZXhVYTdacndyRXNvNmM4eHNmaVJwQUxNS3RpcmNINnVMNDQrWThSZgp3UHMrK216cTJZaXMzZmVPQzZXRDBZdTJuOFVDZ1lFQTF0cXcyam1PbFF5OGkwNDZXZzBoeHpNMk9wUGpSTldMClVFL1ZzdWNVdi9uemViNmUwVlNNS1hkQkp2S0dUUVhNUURjRW4vcnR5SmlWOTBZU25hL2ZNWDRsdy8wTk9KTWQKNi9ZVDgxY1pZOCtqMzFqL0FZaU1UZHJmd1ExaDZEbmt3WHRrY0Z3eGJkRDBFVU5iL21YcjBabTF3ZWVxRXEvNAorT1F0R3VaYW1iTUNnWUVBdmxTUnQ5WnpIamE1Mk9ZeDc3Y3dBZVBlVTNKYk1iQ1JzT0tMcTIySjFWaEpEV1VaCmFIWE1uUVFNRHBraUVYREZXSzdWQ0RmSi91SEsvZGZZVFQ5akxScFgwTXdKTTdJSkdSVXpHdXc5VEhFYWE0a20KWlRUSzN0YWw1TGs1NS9jSElNUStZNURqQ0RrWk9HV1N2WmQ3R0pTa2ErQUllTmZyMDV2WS80bUo2NWtDZ1lBeApOdjd6dmVOdk9PK25hVS9zZUwyWUI1OFFZL2ZYT0tNa3ptVEJDald5aytxMXBIaDBzczA0WWx6R014K1lYUStnClZmbjFPMkZrWmE5VWFQU3lzaXFLQjc5VzJZeEJ2VkZKVDZEYVNNVkVHN2dKM1RUc2dQN0NoclJpWUZKaEE0SG0KNEFEdHkvQjJtenFOQ2NUMHpSdnJjeTR6TUlIQXJoWjF6SzZZVHRQS0NRS0JnUURGQnkvbCt2UmNCY0VVL2N3UQpKTHdBV0E1SEhwWU1mazJ3TkhKSTF0TWVxdHBTcElaTk9sZHpHQUhoZWt3WkxnOEdJNmhTcUVRNWhJOE8ra2V1CmltVVo1RmFkMnQyZXB1eXI5RTdMMEpEbW13ZENEOEErOFE0bTlWeUZWTDRNUTRRRzM2R1lZWDlVeUlBRzI2UTIKSThGN1p3RTFlNis5M0RSWmlOWTlxTnpNNkE9PQotLS0tLUVORCBQUklWQVRFIEtFWS0tLS0t'
 
 # Resource `php leevel link:[public|storage]`
 DOMAIN =
 PUBLIC = http://127.0.0.1:9527/public
 STORAGE = http://127.0.0.1:9527/storage
+ATTACHMENTS_URL = http://127.0.0.1:9527/attachments
 
 # Lang
 I18N = zh-CN
@@ -22,7 +28,7 @@ I18N = zh-CN
 DATABASE_DRIVER = mysql
 DATABASE_HOST = 127.0.0.1
 DATABASE_PORT = 3306
-DATABASE_NAME = test
+DATABASE_NAME = test1
 DATABASE_NAME_PREFIX = test
 DATABASE_USER = root
 DATABASE_PASSWORD =
@@ -31,8 +37,8 @@ DATABASE_PASSWORD =
 DATABASE_COMMON_DRIVER = mysql
 DATABASE_COMMON_HOST = 127.0.0.1
 DATABASE_COMMON_PORT = 3306
-DATABASE_COMMON_NAME = test
-DATABASE_COMMON_NAME_PREFIX = test
+DATABASE_COMMON_NAME = test1
+DATABASE_COMMON_NAME_PREFIX = test1
 DATABASE_COMMON_USER = root
 DATABASE_COMMON_PASSWORD =
 

.example.rr.yaml

@@ -0,0 +1,51 @@
+# configuration version: https://roadrunner.dev/docs/intro-config/2.x/en
+version: '2.7'
+
+server:
+  command: "php rr.php"
+
+http:
+  address: "0.0.0.0:9529"
+  middleware: [ "static", "gzip"]
+  static:
+    # root directory for static file (HTTP would not serve .php and .htaccess files).
+    dir:   "."
+    # list of extensions for forbid for serving.
+    forbid: [".php", ".htaccess"]
+  # Workers pool settings.
+  pool:
+    # Debug mode for the pool. In this mode, pool will not pre-allocate the worker. Worker (only 1, num_workers ignored) will be allocated right after the request arrived.
+    #
+    # Default: false
+    debug: false
+
+    # How many worker processes will be started. Zero (or nothing) means the number of logical CPUs.
+    #
+    # Default: 0
+    num_workers: 1
+
+    # Maximal count of worker executions. Zero (or nothing) means no limit.
+    #
+    # Default: 0
+    max_jobs: 0
+
+reload:
+  # sync interval
+  interval: 1s
+  # global patterns to sync
+  patterns: [".php"]
+  # list of included for sync services
+  services:
+    http:
+      # recursive search for file patterns to add
+      recursive: true
+      # ignored folders
+      ignore: ["vendor", "storage", "tests"]
+      # service specific file pattens to sync
+      patterns: [".php", ".env"]
+      # directories to sync. If recursive is set to true,
+      # recursive sync will be applied only to the directories in `dirs` section
+      dirs:     ["."]
+
+logs:
+  level: debug

.gitignore

@@ -25,4 +25,7 @@ www/debugbar
 /apis
 /attachments
 .php-cs-fixer.cache
-storage/phpstan
+.rr.yaml
+storage/phpstan
+workflow.svg
+/temp-app

.php-cs-fixer.dist.php

@@ -19,17 +19,17 @@
         'use_arrow_functions' => false, // TODO switch on when # of PR's is lower
         'php_unit_strict' => false,
         'php_unit_test_class_requires_covers' => false,
+        'strict_comparison' => false,
+        'strict_param' => false,
     ])
     ->setRiskyAllowed(true)
     ->setFinder(
         PhpCsFixer\Finder::create()
-            ->in(__DIR__.'/app')
             ->append([__FILE__])
+            ->in(__DIR__.'/app')
             ->in(__DIR__.'/tests')
             ->in(__DIR__.'/www')
             ->in(__DIR__.'/option')
             ->in(__DIR__.'/assets/database')
-            ->exclude(__DIR__.'/vendor')
-            ->exclude(__DIR__.'/storage')
     )
 ;

.rr.yaml

@@ -5,7 +5,7 @@ server:
   command: "php rr.php"
 
 http:
-  address: "0.0.0.0:9527"
+  address: "0.0.0.0:9529"
   middleware: [ "static", "gzip"]
   static:
     # root directory for static file (HTTP would not serve .php and .htaccess files).