struggle 2.3.3 → 2.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 112fe0ea89b9a5f002aa3d780d3637933d4a2313
-  data.tar.gz: ccceb9879d2754c82643f645af84742b89c50e46
+  metadata.gz: 749a77542911c479181cf568360ff7be79bc7d58
+  data.tar.gz: e4c3a65526d87b6f5d636f0982e199f138f1e16e
 SHA512:
-  metadata.gz: 032b8457a94a02fb429930123806d725ceb7d2e9fcfd760e03b32a4a7d68c077f4a4fe42cfc46b3e0792696bdb456f0c4fe6e8c2778f0227491cd425662293b1
-  data.tar.gz: f8bef5338fa75ff7ca93d9864ad9e1aa431056a2e5ee898df6f0a221697dda4030c68a81709ae2ac978e54a7efca4fc4aff2997040547ce6807a7cdf8f161d3d
+  metadata.gz: 2b56a9fce16105a8e0829f8f0536852f72831e7246d322562e59ff6db25f4b351048fc71d897d31fd6870cacb74e03a7200b25ec49ace34ead2674bee7615c05
+  data.tar.gz: 50709d9201c4d1183fcdd0c8518b11abfdb8eb586c2b1746120a4917865efec4b2ea307bbbf4ab1be0c952295c87437f3f37e689216fbf34ec263c4f734a9d5d

data/README.md

@@ -1,2 +1,27 @@
-# tool-libs
-tool-libs
+功能描述：
+一、工具包
+1.AES：加密、解密、文件加密、解密等。
+2.code：验证码
+3.ftp_tool：ftp工具
+4.getui：个推，手机推送功能。
+5.http：http请求工具
+6.logistic：物流码查询插件。
+7.pager：分页插件。
+8.rsa：加密、解密、签名
+9.sms：短信平台。
+10.tfile：文件上传、压缩、格式验证、图片上传、图片剪切、目录算法等。
+11.tmagick：画图工具，图片水印、叠加等功能。
+12.zip_tool：zip压缩工具，压缩文件和目录。
+13.sql：sql导出插件，导出成insert语句的sql文件。
+二、重构
+1.decimal：钱格式重构，如果小数点后是零则舍掉。
+2.int：整数型重构，整数转换大写钱格式。
+3.string：文本型重构，判断中英文，字符串截取，html清除。
+三、支付
+1.微信支付
+2.京东支付
+四、授权登录
+1.微信授权登录。
+2.微信企业授权登录。
+升级说明：
+2.3.4：增加sql导出功能，修改验证码的字体。

data/lib/generators/struggle/sql_config_generator.rb

@@ -0,0 +1,14 @@
+require 'rails'
+
+module Struggle
+  module Generators
+    class SqlConfigGenerator < Rails::Generators::Base
+      desc "create sql export config file"
+      def create_sql_config
+        libdir = File.expand_path(File.dirname(__FILE__))
+        sqlconfig = File.expand_path("../../templates/tsql_config.yml", libdir)
+        FileUtils.cp(sqlconfig, "config/tsql_config.yml")
+      end
+    end
+  end
+end

data/lib/struggle/code.rb

@@ -21,7 +21,9 @@ module Struggle
       text= Magick::Draw.new
       text.pointsize = fontsize
       text.kerning = -1
-      text.font("/font/ARIALNBI.TTF")
+      filePath = File.expand_path(File.dirname(File.dirname(__FILE__)))
+      fontPath = File.expand_path("struggle/font/ARIALNBI.TTF", filePath)
+      text.font(fontPath)
       text.font_weight(200)
       text.fill('blue')
       # 随机文字

data/lib/struggle/sql.rb

@@ -0,0 +1,54 @@
+# 导出sql文件，生成insert语句
+module Struggle
+  class Sql
+    class << self
+      # 按配置文件导出sql文件。
+      # yaml_file 配置文件yml位置。
+      def dump_yaml(yaml_file = "config/tsql_config.yml")
+        config = YAML.load_file(yaml_file)
+        config.each do |k, v|
+          self.dump(v)
+        end
+      end
+
+      # config => {"class_name": ["Member"], "file": "1.sql","adapter": "oracle"}
+      # class_name is ActiveRecord; file is backup sql file
+      def dump(config)
+        sqlinsert = ""
+        config["class_name"].each do |class_name|
+          obj = eval(class_name)
+          obj.all.each do |o|
+            attrs = o.attributes
+            names = []
+            values = []
+            attrs.each do |k, v|
+              names << k
+              value = v
+              if v.class == Date
+                value = v.strftime("%Y-%m-%d")
+                value = "TO_DATE('#{value}', 'YYYY-MM-DD')" if config["adapter"] && config["adapter"].downcase == "oracle"
+              elsif v.class == ActiveSupport::TimeWithZone
+                value = v.strftime("%Y-%m-%d %H:%M:%S")
+                value = "TO_TIMESTAMP('#{value}', 'YYYY-MM-DD HH24:MI:SS.FF6')" if config["adapter"] && config["adapter"].downcase == "oracle"
+              else
+                value = "'#{v}'"
+              end
+              values << value
+            end
+            sqlinsert += "INSERT INTO #{obj.table_name} (#{names.join(',')}) VALUES (#{values.join(',')});\r\n"
+          end
+        end
+        unless sqlinsert.blank?
+          config["file"] = config["file"].blank? ? "db.sql" : config["file"]
+          begin
+            f = File.new(config["file"], "w+")
+            f.write(sqlinsert)
+            f.close
+          rescue
+            return "#{$!}:#{config["file"]}"
+          end
+        end
+      end
+    end
+  end
+end

data/lib/struggle.rb

@@ -21,6 +21,7 @@ require 'struggle/concerns/int_extend'
 require 'struggle/concerns/decimal_extend'
 require "struggle/ftp_tool"
 require "struggle/zip_tool"
+require 'struggle/sql'
 require 'pay/jd_gateway'
 String.send :include, Struggle::StringExtend
 Integer.send :include, Struggle::IntExtend

data/lib/templates/tsql_config.yml

@@ -0,0 +1,14 @@
+admin:
+  adapter: oracle
+  class_name: [Function, Role, Member, Routepath, Group, Menu, RouteGroup, Organization, SystemLog]
+  file: admin.sql
+
+business:
+  adapter: oracle
+  class_name: []
+  file: business.sql
+
+report:
+  adapter: oracle
+  class_name: [Connect, Report, Requirement, Map, MapRequirement]
+  file: report.sql

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: struggle
 version: !ruby/object:Gem::Version
-  version: 2.3.3
+  version: 2.3.4
 platform: ruby
 authors:
 - lean
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-18 00:00:00.000000000 Z
+date: 2018-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: iconv
@@ -52,7 +52,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: code,tfile,pager,http,logistic,pay,tmagick,class_extend,aes,rsa,ftp_tool,zip_tool;
+description: code,tfile,pager,http,logistic,pay,tmagick,class_extend,aes,rsa,ftp_tool,zip_tool,sql;
 email: 54850915@qq.com
 executables: []
 extensions: []
@@ -60,6 +60,7 @@ extra_rdoc_files:
 - README.md
 files:
 - README.md
+- lib/generators/struggle/sql_config_generator.rb
 - lib/pay/jd_gateway.rb
 - lib/struggle.rb
 - lib/struggle/aes.rb
@@ -67,6 +68,7 @@ files:
 - lib/struggle/concerns/decimal_extend.rb
 - lib/struggle/concerns/int_extend.rb
 - lib/struggle/concerns/string_extend.rb
+- lib/struggle/font/ARIALNBI.TTF
 - lib/struggle/font/font.ttf
 - lib/struggle/ftp_tool.rb
 - lib/struggle/getui.rb
@@ -75,9 +77,11 @@ files:
 - lib/struggle/pager.rb
 - lib/struggle/rsa.rb
 - lib/struggle/sms.rb
+- lib/struggle/sql.rb
 - lib/struggle/tfile.rb
 - lib/struggle/tmagick.rb
 - lib/struggle/zip_tool.rb
+- lib/templates/tsql_config.yml
 homepage: http://rubygems.org/gems/struggle
 licenses:
 - struggle