比较文本

查找两个文本文件之间的差异

实时编辑器

折叠未更改行

关闭换行

视图

比对精度

语法高亮

Diffchecker Desktop 运行Diffchecker最安全的方式。获取Diffchecker桌面应用：您的差异永远不会离开您的电脑！获取桌面版

Untitled diff

创建于 8年前差异永不过期

26 删除

行
总计
删除

字符
总计
删除

要继续使用此功能，请升级到 Diffchecker Pro 查看价格

19 行

25 添加

行
总计
添加

字符
总计
添加

要继续使用此功能，请升级到 Diffchecker Pro 查看价格

16 行

Started POST "/api/general/v1/members/2128879/attachments" for XXXXXXXXXX at 2018-10-09 15:24:38 +0000

Started POST "/api/general/v1/members/2128879/attachments" for XXXXXXXXXX at 2018-10-09 15:24:53 +0000

Processing by Api::General::V1::AttachmentsController#create as */*

Parameters: {"file"=>#<ActionDispatch::Http::UploadedFile:0x000055bcaac519c8 @tempfile=#<Tempfile:/tmp/RackMultipart20181009-27203-fv6c5l.png>, @original_filename="Happy_smiley_face.png", @content_type="image/png", @headers="Content-Disposition: form-data; name=\"file\"; filename=\"Happy_smiley_face.png\"\r\nContent-Type: image/png\r\n">, "member_id"=>"2128879"}

Parameters: {"file"=>#<ActionDispatch::Http::UploadedFile:0x000055bca5447408 @tempfile=#<Tempfile:/tmp/RackMultipart20181009-27203-9acl9e.png>, @original_filename="Happy_smiley_face.png", @content_type="image/png", @headers="Content-Disposition: form-data; name=\"file\"; filename=\"Happy_smiley_face.png\"\r\nContent-Type: image/png\r\n">, "member_id"=>"2128879"}

API KEY: 685cXXXXXXXXXX

Tablet Load (0.8ms) SELECT `user_sessions`.* FROM `user_sessions` WHERE `user_sessions`.`session_id` = '685cXXXXXXXXXX' LIMIT 1

Tablet Load (0.9ms) SELECT `user_sessions`.* FROM `user_sessions` WHERE `user_sessions`.`session_id` = '685cXXXXXXXXXX' LIMIT 1

upload_attachment_api_general_v1

{"file"=>#<ActionDispatch::Http::UploadedFile:0x000055bcaac519c8 @tempfile=#<Tempfile:/tmp/RackMultipart20181009-27203-fv6c5l.png>, @original_filename="Happy_smiley_face.png", @content_type="image/png", @headers="Content-Disposition: form-data; name=\"file\"; filename=\"Happy_smiley_face.png\"\r\nContent-Type: image/png\r\n">, "controller"=>"api/general/v1/attachments", "action"=>"create", "member_id"=>"2128879"}

{"file"=>#<ActionDispatch::Http::UploadedFile:0x000055bca5447408 @tempfile=#<Tempfile:/tmp/RackMultipart20181009-27203-9acl9e.png>, @original_filename="Happy_smiley_face.png", @content_type="image/png", @headers="Content-Disposition: form-data; name=\"file\"; filename=\"Happy_smiley_face.png\"\r\nContent-Type: image/png\r\n">, "controller"=>"api/general/v1/attachments", "action"=>"create", "member_id"=>"2128879"}

{"HTTP_AUTH_TOKEN"=>"XXXXXXXXXX", "HTTP_ACCEPT"=>"*/*", "HTTP_X_FORWARDED_PORT"=>"443", "HTTP_USER_AGENT"=>"insomnia/6.0.2", "SERVER_PROTOCOL"=>"HTTP/1.1", "SERVER_SOFTWARE"=>"nginx/1.12.1", "HTTP_COOKIE"=>"XXXXXXXXXX"

{"HTTP_AUTH_TOKEN"=>"XXXXXXXXXX", "HTTP_ACCEPT"=>"*/*", "HTTP_VIA"=>"1.1 XXXXXXXXXX.cloudfront.net (CloudFront)", "HTTP_X_FORWARDED_PORT"=>"443", "HTTP_USER_AGENT"=>"insomnia/6.0.2", "HTTP_CLOUDFRONT_IS_SMARTTV_VIEWER"=>"false", "SERVER_PROTOCOL"=>"HTTP/1.1", "SERVER_SOFTWARE"=>"nginx/1.12.1", "HTTP_COOKIE"=>"XXXXXXXXXX", "HTTP_X_AMZN_TRACE_ID"=>"XXXXXXXXXX", "PATH_INFO"=>"/api/general/v1/members/2128879/attachments", "HTTP_X_FORWARDED_PROTO"=>"https", "SCGI"=>"1", "DOCUMENT_ROOT"=>"/var/app/current/public", "HTTP_CLOUDFRONT_IS_DESKTOP_VIEWER"=>"true", "HTTP_CLOUDFRONT_VIEWER_COUNTRY"=>"US", "QUERY_STRING"=>"", "HTTP_X_AMZ_CF_ID"=>"XXXXXXXXXX"

Merchant Load (0.9ms) SELECT `merchants`.* FROM `merchants` WHERE `merchants`.`id` = 1556 LIMIT 1

Merchant Load (1.0ms) SELECT `merchants`.* FROM `merchants` WHERE `merchants`.`id` = 1556 LIMIT 1

Member Load (0.8ms) SELECT `members`.* FROM `members` WHERE `members`.`merchant_id` = 1556 AND `members`.`id` = 2128879 LIMIT 1

Member Load (0.7ms) SELECT `members`.* FROM `members` WHERE `members`.`merchant_id` = 1556 AND `members`.`id` = 2128879 LIMIT 1

Command :: identify -format '%wx%h,%[exif:orientation]' '/tmp/c959886795d921745160f91b55949f4d20181009-27203-3cibun.png[0]' 2>/dev/null

Command :: file -b --mime '/tmp/RackMultipart20181009-27203-9acl9e.png'

Command :: identify -format %m '/tmp/c959886795d921745160f91b55949f4d20181009-27203-3cibun.png[0]'

(0.7ms) BEGIN

Command :: convert '/tmp/c959886795d921745160f91b55949f4d20181009-27203-3cibun.png[0]' -auto-orient -resize "150x" -crop "150x150+0+0" +repage '/tmp/8f2b87707f1c1224079e3f5c5046ea0620181009-27203-113v7bq'

SQL (0.8ms) INSERT INTO `attachments` (`file_file_name`, `file_content_type`, `file_file_size`, `file_updated_at`, `owner_id`, `owner_type`, `uuid`, `created_at`, `updated_at`) VALUES ('Happy_smiley_face.png', 'application/octet-stream', 123931, '2018-10-09 15:24:53', 2128879, 'Member', '50ab8c32-8249-4560-96da-1f7b8577fa08', '2018-10-09 15:24:53', '2018-10-09 15:24:53')

(4.7ms) BEGIN

[paperclip] saving staging/member/50ab8c32/8249/4560/96da/1f7b8577fa08/original/Happy_smiley_face.png

SQL (0.9ms) INSERT INTO `attachments` (`file_file_name`, `file_content_type`, `file_file_size`, `file_updated_at`, `owner_id`, `owner_type`, `uuid`, `created_at`, `updated_at`) VALUES ('Happy_smiley_face.png', 'image/png', 68858, '2018-10-09 15:24:38', 2128879, 'Member', '5c563811-bbcf-482e-bbb0-1fb0bb1fb754', '2018-10-09 15:24:39', '2018-10-09 15:24:39')

(3.4ms) COMMIT

[paperclip] saving staging/member/5c563811/bbcf/482e/bbb0/1fb0bb1fb754/original/Happy_smiley_face.png

Completed 200 OK in 149ms (Views: 0.5ms | ActiveRecord: 7.5ms)

[paperclip] saving staging/member/5c563811/bbcf/482e/bbb0/1fb0bb1fb754/thumb/Happy_smiley_face.png

(3.3ms) COMMIT

Completed 200 OK in 472ms (Views: 0.7ms | ActiveRecord: 20.0ms)

已保存差异

原始文本

打开文件

Started POST "/api/general/v1/members/2128879/attachments" for XXXXXXXXXX at 2018-10-09 15:24:38 +0000
Processing by Api::General::V1::AttachmentsController#create as */*
Parameters: {"file"=>#<ActionDispatch::Http::UploadedFile:0x000055bcaac519c8 @tempfile=#<Tempfile:/tmp/RackMultipart20181009-27203-fv6c5l.png>, @original_filename="Happy_smiley_face.png", @content_type="image/png", @headers="Content-Disposition: form-data; name=\"file\"; filename=\"Happy_smiley_face.png\"\r\nContent-Type: image/png\r\n">, "member_id"=>"2128879"}
API KEY: 685cXXXXXXXXXX
Tablet Load (0.8ms)  SELECT  `user_sessions`.* FROM `user_sessions` WHERE `user_sessions`.`session_id` = '685cXXXXXXXXXX' LIMIT 1
upload_attachment_api_general_v1
{"file"=>#<ActionDispatch::Http::UploadedFile:0x000055bcaac519c8 @tempfile=#<Tempfile:/tmp/RackMultipart20181009-27203-fv6c5l.png>, @original_filename="Happy_smiley_face.png", @content_type="image/png", @headers="Content-Disposition: form-data; name=\"file\"; filename=\"Happy_smiley_face.png\"\r\nContent-Type: image/png\r\n">, "controller"=>"api/general/v1/attachments", "action"=>"create", "member_id"=>"2128879"}
{"HTTP_AUTH_TOKEN"=>"XXXXXXXXXX", "HTTP_ACCEPT"=>"*/*", "HTTP_X_FORWARDED_PORT"=>"443", "HTTP_USER_AGENT"=>"insomnia/6.0.2", "SERVER_PROTOCOL"=>"HTTP/1.1", "SERVER_SOFTWARE"=>"nginx/1.12.1", "HTTP_COOKIE"=>"XXXXXXXXXX"
Merchant Load (0.9ms)  SELECT  `merchants`.* FROM `merchants` WHERE `merchants`.`id` = 1556 LIMIT 1
Member Load (0.8ms)  SELECT  `members`.* FROM `members` WHERE `members`.`merchant_id` = 1556 AND `members`.`id` = 2128879 LIMIT 1
Command :: identify -format '%wx%h,%[exif:orientation]' '/tmp/c959886795d921745160f91b55949f4d20181009-27203-3cibun.png[0]' 2>/dev/null
Command :: identify -format %m '/tmp/c959886795d921745160f91b55949f4d20181009-27203-3cibun.png[0]'
Command :: convert '/tmp/c959886795d921745160f91b55949f4d20181009-27203-3cibun.png[0]' -auto-orient -resize "150x" -crop "150x150+0+0" +repage '/tmp/8f2b87707f1c1224079e3f5c5046ea0620181009-27203-113v7bq'
(4.7ms)  BEGIN
SQL (0.9ms)  INSERT INTO `attachments` (`file_file_name`, `file_content_type`, `file_file_size`, `file_updated_at`, `owner_id`, `owner_type`, `uuid`, `created_at`, `updated_at`) VALUES ('Happy_smiley_face.png', 'image/png', 68858, '2018-10-09 15:24:38', 2128879, 'Member', '5c563811-bbcf-482e-bbb0-1fb0bb1fb754', '2018-10-09 15:24:39', '2018-10-09 15:24:39')
[paperclip] saving staging/member/5c563811/bbcf/482e/bbb0/1fb0bb1fb754/original/Happy_smiley_face.png
[paperclip] saving staging/member/5c563811/bbcf/482e/bbb0/1fb0bb1fb754/thumb/Happy_smiley_face.png
(3.3ms)  COMMIT
Completed 200 OK in 472ms (Views: 0.7ms | ActiveRecord: 20.0ms)

更改后文本

打开文件

Started POST "/api/general/v1/members/2128879/attachments" for XXXXXXXXXX at 2018-10-09 15:24:53 +0000
Processing by Api::General::V1::AttachmentsController#create as */*
Parameters: {"file"=>#<ActionDispatch::Http::UploadedFile:0x000055bca5447408 @tempfile=#<Tempfile:/tmp/RackMultipart20181009-27203-9acl9e.png>, @original_filename="Happy_smiley_face.png", @content_type="image/png", @headers="Content-Disposition: form-data; name=\"file\"; filename=\"Happy_smiley_face.png\"\r\nContent-Type: image/png\r\n">, "member_id"=>"2128879"}
API KEY: 685cXXXXXXXXXX
Tablet Load (0.9ms)  SELECT  `user_sessions`.* FROM `user_sessions` WHERE `user_sessions`.`session_id` = '685cXXXXXXXXXX' LIMIT 1
upload_attachment_api_general_v1
{"file"=>#<ActionDispatch::Http::UploadedFile:0x000055bca5447408 @tempfile=#<Tempfile:/tmp/RackMultipart20181009-27203-9acl9e.png>, @original_filename="Happy_smiley_face.png", @content_type="image/png", @headers="Content-Disposition: form-data; name=\"file\"; filename=\"Happy_smiley_face.png\"\r\nContent-Type: image/png\r\n">, "controller"=>"api/general/v1/attachments", "action"=>"create", "member_id"=>"2128879"}
{"HTTP_AUTH_TOKEN"=>"XXXXXXXXXX", "HTTP_ACCEPT"=>"*/*", "HTTP_VIA"=>"1.1 XXXXXXXXXX.cloudfront.net (CloudFront)", "HTTP_X_FORWARDED_PORT"=>"443", "HTTP_USER_AGENT"=>"insomnia/6.0.2", "HTTP_CLOUDFRONT_IS_SMARTTV_VIEWER"=>"false", "SERVER_PROTOCOL"=>"HTTP/1.1", "SERVER_SOFTWARE"=>"nginx/1.12.1", "HTTP_COOKIE"=>"XXXXXXXXXX", "HTTP_X_AMZN_TRACE_ID"=>"XXXXXXXXXX", "PATH_INFO"=>"/api/general/v1/members/2128879/attachments", "HTTP_X_FORWARDED_PROTO"=>"https", "SCGI"=>"1", "DOCUMENT_ROOT"=>"/var/app/current/public", "HTTP_CLOUDFRONT_IS_DESKTOP_VIEWER"=>"true", "HTTP_CLOUDFRONT_VIEWER_COUNTRY"=>"US", "QUERY_STRING"=>"", "HTTP_X_AMZ_CF_ID"=>"XXXXXXXXXX"
Merchant Load (1.0ms)  SELECT  `merchants`.* FROM `merchants` WHERE `merchants`.`id` = 1556 LIMIT 1
Member Load (0.7ms)  SELECT  `members`.* FROM `members` WHERE `members`.`merchant_id` = 1556 AND `members`.`id` = 2128879 LIMIT 1
Command :: file -b --mime '/tmp/RackMultipart20181009-27203-9acl9e.png'
(0.7ms)  BEGIN
SQL (0.8ms)  INSERT INTO `attachments` (`file_file_name`, `file_content_type`, `file_file_size`, `file_updated_at`, `owner_id`, `owner_type`, `uuid`, `created_at`, `updated_at`) VALUES ('Happy_smiley_face.png', 'application/octet-stream', 123931, '2018-10-09 15:24:53', 2128879, 'Member', '50ab8c32-8249-4560-96da-1f7b8577fa08', '2018-10-09 15:24:53', '2018-10-09 15:24:53')
[paperclip] saving staging/member/50ab8c32/8249/4560/96da/1f7b8577fa08/original/Happy_smiley_face.png
(3.4ms)  COMMIT
Completed 200 OK in 149ms (Views: 0.5ms | ActiveRecord: 7.5ms)