From 3820771a86930ff5c47c0c2e5993d44467d1396c Mon Sep 17 00:00:00 2001
From: sgjj <995959152@qq.com>
Date: Mon, 14 Sep 2020 14:03:35 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4sql=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 assembly.xml               | 56 ++++++++++++++++++++++++++++++++++++++
 doc/5.0.0-to-5.1-mysql.sql |  2 +-
 2 files changed, 57 insertions(+), 1 deletion(-)
 create mode 100644 assembly.xml

diff --git a/assembly.xml b/assembly.xml
new file mode 100644
index 00000000..fa7844df
--- /dev/null
+++ b/assembly.xml
@@ -0,0 +1,56 @@
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 http://maven.apache.org/xsd/assembly-1.1.3.xsd">
+    <id>bin</id>
+    <formats>
+        <format>zip</format>
+        <format>tar.gz</format>
+    </formats>
+
+    <fileSets>
+        <!-- 从目标目录拷贝文件去压缩 -->
+        <fileSet>
+            <directory>target</directory>
+            <includes>
+                <include>*.jar</include>
+            </includes>
+            <outputDirectory>./</outputDirectory>
+        </fileSet>
+        <fileSet>
+            <directory>target/lib</directory>
+            <outputDirectory>./lib</outputDirectory>
+        </fileSet>
+        <fileSet>
+            <directory>src/main/resources</directory>
+            <outputDirectory>./config</outputDirectory>
+        </fileSet>
+        <fileSet>
+            <directory>src/main/webapp/static</directory>
+            <outputDirectory>./static</outputDirectory>
+        </fileSet>
+        <fileSet>
+            <directory>src/main/webapp/html</directory>
+            <outputDirectory>./html</outputDirectory>
+        </fileSet>
+        <fileSet>
+            <directory>src/main/webapp/templets</directory>
+            <outputDirectory>./templets</outputDirectory>
+        </fileSet>
+        <fileSet>
+            <directory>src/main/webapp/upload</directory>
+            <outputDirectory>./upload</outputDirectory>
+        </fileSet>
+        <fileSet>
+            <directory>src/main/webapp/WEB-INF</directory>
+            <outputDirectory>./lib/WEB-INF</outputDirectory>
+        </fileSet>
+        <fileSet>
+            <directory>./bin</directory>
+            <includes>
+                <include>*.sh</include>
+                <include>*.cmd</include>
+                <include>*.bat</include>
+            </includes>
+            <outputDirectory>./</outputDirectory>
+        </fileSet>
+    </fileSets>
+</assembly>
diff --git a/doc/5.0.0-to-5.1-mysql.sql b/doc/5.0.0-to-5.1-mysql.sql
index 324e4622..347a338f 100644
--- a/doc/5.0.0-to-5.1-mysql.sql
+++ b/doc/5.0.0-to-5.1-mysql.sql
@@ -56,6 +56,6 @@ UPDATE `mdiy_tag_sql` SET `tag_id` = 8, `tag_sql` = '<#assign select=\"(SELECT \
 UPDATE `mdiy_tag_sql` SET `tag_id` = 9, `tag_sql` = '  select\r\n	<#if !(pageTag.indexUrl??)>\r\n	<#--判断是否有栏目对象，用于搜索不传栏目-->\r\n	<#if column??>\r\n		<#assign path=column.categoryPath/>\r\n	<#else>\r\n		<#assign path=\"\"/>\r\n	</#if>\r\n  <#--总记录数、总页数-->\r\n	(SELECT ${pageTag.total}) as total,\r\n	<#--记录总数-->\r\n	(SELECT ${pageTag.size}) as rcount,\r\n	<#--当前页码-->\r\n	(SELECT ${pageTag.pageNo}) as cur,\r\n	<#--首页-->\r\n  CONCAT(\"${path}\", \"/index.html\") as `index`,\r\n	<#--上一页-->\r\n	<#if (pageTag.pageNo?eval-1) gt 1>\r\n	CONCAT(\"${path}\",\"/list-${pageTag.pageNo?eval-1}.html\") as pre,\r\n	<#else>\r\n	CONCAT(\"${path}\",\"/index.html\") as pre,\r\n	</#if>\r\n	<#--下一页-->\r\n	<#if pageTag.total==1>\r\n		CONCAT(\"${path}\", \"/index.html\") as `next`,\r\n		CONCAT(\"${path}\", \"/index.html\") as `last`\r\n	<#else>\r\n		<#if pageTag.pageNo?eval gte pageTag.total>\r\n		CONCAT(\"${path}\",\"/list-${pageTag.total}.html\") as next,\r\n		<#else>\r\n		CONCAT(\"${path}\",\"/list-${pageTag.pageNo?eval+1}.html\") as next,\r\n		</#if>\r\n		<#--最后一页-->\r\n		CONCAT(\"${path}\",\"/list-${pageTag.total}.html\") as last\r\n		</#if>\r\n<#else><#--判断是否是搜索页面-->\r\n \"${pageTag.indexUrl}\" as `index`,\"${pageTag.lastUrl}\" as `last`,\"${pageTag.preUrl}\" as `pre`,\"${pageTag.nextUrl}\" as `next`,\'${pageTag.total}\' as total,\'${pageTag.size}\' as rcount,\'${pageTag.pageNo}\' as cur\r\n</#if>', `sort` = NULL WHERE `id` = 10;
 UPDATE `mdiy_tag_sql` SET `tag_id` = 10, `tag_sql` = '<#assign select=\"(SELECT \'\')\"/>\r\n<#if orderby?? >\r\n      <#if orderby==\"date\"> \r\n	   <#assign  _orderby=\"content_datetime\">\r\n      <#elseif orderby==\"updatedate\">\r\n <#assign  _orderby=\"content_updatetime\">\r\n      <#elseif orderby==\"hit\"> \r\n	  <#assign  _orderby=\"content_hit\">\r\n      <#elseif orderby==\"sort\">\r\n	   <#assign  _orderby=\"content_sort\">\r\n      <#else><#assign  _orderby=\"cms_content.id\"></#if>\r\n   <#else>\r\n   <#assign  _orderby=\"cms_content.id\">\r\n  </#if>\r\n<#if (pageTag.nextId) gt 0>\r\nSELECT \r\ncms_content.id as id,\r\nleft(content_title,${titlelen?default(40)}) as title,\r\ncontent_title as fulltitle,\r\ncontent_author as author, \r\ncontent_source as source, \r\ncontent_details as content,\r\ncategory.category_title as typename,\r\ncategory.category_id as typeid,\r\n(SELECT \"index.html\") as typelink,\r\ncontent_img as litpic,\r\n<#--内容页动态链接-->\r\n  <#if isDo?? && isDo>\r\n   CONCAT(\"/${modelName}/view.do?id=\", cms_content.id,\"&orderby=${_orderby}\",\"&order=${order!\'ASC\'}\",\"&typeid=${typeid}\") as link,\r\n  <#else>\r\n  CONCAT(category_path,\"/\",cms_content.id,\".html\") AS link,\r\n  </#if>\r\ncontent_datetime as date,\r\ncontent_description as descrip,\r\ncontent_hit as hit,\r\ncontent_type as flag,\r\ncontent_keyword as keyword \r\nFROM cms_content \r\nLEFT JOIN cms_category as category ON content_category_id=category.id \r\nWHERE cms_content.id=${pageTag.nextId}\r\n<#else>\r\nSELECT \r\n${select} as id,\r\n${select} as title,\r\n${select} as fulltitle,\r\n${select} as author, \r\n${select} as source, \r\n${select} as content,\r\n${select} as typename,\r\n${select} as typeid,\r\n${select} as typelink,\r\n${select} as litpic,\r\n${select} as link,\r\n${select} as date,\r\n${select} as descrip,\r\n${select} as hit,\r\n${select} as flag,\r\n${select} as keyword FROM cms_content\r\n</#if>', `sort` = NULL WHERE `id` = 11;
 
-UPDATE `app` SET `app_logo`='[{\"path\":\"/upload/1/appLogo/1578375538540.jpg\"}]' WHERE (`id`='1');
+UPDATE `app` SET `app_logo`= CONCAT('[{\"path\":\"',app_logo,'\"}]')  WHERE (`id`='1');