Add GBK support. Add iconv to gbk buildscript

ganlvtech · Nov 29, 2018 · ca1a99e · ca1a99e
1 parent c1a5a15
commit ca1a99e
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/build/build_release.sh b/build/build_release.sh
@@ -12,12 +12,14 @@ cp    README.md                           dist/
 cp    admin_fingerprint.inc.php           dist/
 cp    admin_sid.inc.php                   dist/
 cp    admin_user.inc.php                  dist/
-cp    discuz_plugin_user_fingerprint.xml  dist/
+cp    discuz_plugin_user_fingerprint.xml  dist/discuz_plugin_user_fingerprint_SC_UTF8.xml
 cp    install.php                         dist/
 cp    uninstall.php                       dist/
 cp    user_fingerprint.class.php          dist/
 cp    user_fingerprint.inc.php            dist/
 
+iconv -f utf-8 -t gbk dist/discuz_plugin_user_fingerprint_SC_UTF8.xml > dist/discuz_plugin_user_fingerprint_SC_GBK.xml
+
 zip dist.zip -r dist
 rm -rf dist/
 

diff --git a/discuz_plugin_user_fingerprint.xml b/discuz_plugin_user_fingerprint.xml
@@ -14,7 +14,7 @@
 			<item id="datatables"><![CDATA[]]></item>
 			<item id="directory"><![CDATA[user_fingerprint/]]></item>
 			<item id="copyright"><![CDATA[Ganlv (https://github.com/ganlvtech)]]></item>
-			<item id="version"><![CDATA[1.0.0.0]]></item>
+			<item id="version"><![CDATA[1.0.1.0]]></item>
 			<item id="__modules">
 				<item id="0">
 					<item id="name"><![CDATA[user_fingerprint]]></item>

diff --git a/function/function_main.php b/function/function_main.php
@@ -32,6 +32,9 @@ function delete_rotated()
 
 function build_response($msg = 'OK', $code = 0, $data = null)
 {
+    if (CHARSET !== 'utf-8') {
+        $msg = iconv(CHARSET, 'utf-8', $msg);
+    }
     return [
         'code' => $code,
         'msg' => $msg,