merge V5 some code

sanluan · sanluan · commit ea01fc4bc595 · 2026-01-09T18:09:17.000+08:00
diff --git a/publiccms-parent/publiccms/src/main/resources/language/config_en.properties b/publiccms-parent/publiccms/src/main/resources/language/config_en.properties
@@ -1,3 +1,8 @@
+config.ai=AI
+config.ai.chat.api.key=Chat API Key
+config.ai.chat.api.model=Chat API Model
+config.ai.chat.api.url.description=\u4F8B\u5982: https://api.deepseek.com/chat/completions
+config.ai.chat.api.url=Chat API Full URL
 config.alipay.alipayPublicKey.description=Interface sign-up mode: public key; sign-up mode: RSA256withRsa
 config.alipay.alipayPublicKey=Alipay public key
 config.alipay.appId.description=Alipay APP ID(<a href\="https\://open.alipay.com/" target\="_blank">obtain</a>)
diff --git a/publiccms-parent/publiccms/src/main/resources/language/config_ja.properties b/publiccms-parent/publiccms/src/main/resources/language/config_ja.properties
@@ -1,3 +1,8 @@
+config.ai=AI
+config.ai.chat.api.key=Chat API Key
+config.ai.chat.api.model=Chat API Model
+config.ai.chat.api.url.description=Demo: https://api.deepseek.com/chat/completions
+config.ai.chat.api.url=Chat API Full URL
 config.alipay.alipayPublicKey.description=\u63A5\u53E3\u52A0\u7B7E\u65B9\u5F0F\uFF1A\u516C\u94A5,\u52A0\u7B7E\u65B9\u5F0F\uFF1ARSA256withRsa
 config.alipay.alipayPublicKey=Alipay public key
 config.alipay.appId.description=Alipay APP ID(<a href\="https\://open.alipay.com/" target\="_blank">\u53D6\u5F97</a>)
diff --git a/publiccms-parent/publiccms/src/main/resources/language/config_zh.properties b/publiccms-parent/publiccms/src/main/resources/language/config_zh.properties
@@ -1,3 +1,8 @@
+config.ai=AI
+config.ai.chat.api.key=\u5BF9\u8BDDAPI Key
+config.ai.chat.api.model=\u5BF9\u8BDDAPI\u6A21\u578B
+config.ai.chat.api.url.description=\u4F8B\u5982: https://api.deepseek.com/chat/completions
+config.ai.chat.api.url=\u5BF9\u8BDDAPI\u5B8C\u6574\u5730\u5740
 config.alipay.alipayPublicKey.description=\u63A5\u53E3\u52A0\u7B7E\u65B9\u5F0F\uFF1A\u516C\u94A5,\u52A0\u7B7E\u65B9\u5F0F\uFF1ARSA256withRsa
 config.alipay.alipayPublicKey=\u652F\u4ED8\u5B9D\u516C\u94A5
 config.alipay.appId.description=\u652F\u4ED8\u5B9D\u5F00\u653E\u5E73\u53F0\u5E94\u7528APPID(<a href\="https\://open.alipay.com/" target\="_blank">\u83B7\u53D6</a>)
diff --git a/publiccms-parent/publiccms/src/main/resources/language/operate_en.properties b/publiccms-parent/publiccms/src/main/resources/language/operate_en.properties
@@ -1,3 +1,5 @@
+operate.ai.chat.html=AI-generated web pages
+operate.ai.chat.text=AI-generated text
 operate.changeModel.content=Modify the model
 operate.changeType.category=Modify the category type
 operate.changepassword=Change password
diff --git a/publiccms-parent/publiccms/src/main/resources/language/operate_ja.properties b/publiccms-parent/publiccms/src/main/resources/language/operate_ja.properties
@@ -1,3 +1,5 @@
+operate.ai.chat.html=AI\u751F\u6210\u30A6\u30A7\u30D6\u30DA\u30FC\u30B8
+operate.ai.chat.text=AI\u751F\u6210\u6587\u5B57
 operate.changeModel.content=\u30B3\u30F3\u30C6\u30F3\u30C4\u30E2\u30C7\u30EB\u3092\u5909\u66F4
 operate.changeType.category=\u5206\u985E\u30BF\u30A4\u30D7\u3092\u5909\u66F4
 operate.changepassword=\u30D1\u30B9\u30EF\u30FC\u30C9\u3092\u5909\u66F4
diff --git a/publiccms-parent/publiccms/src/main/resources/language/operate_zh.properties b/publiccms-parent/publiccms/src/main/resources/language/operate_zh.properties
@@ -1,3 +1,5 @@
+operate.ai.chat.html=AI\u751F\u6210\u9875\u9762
+operate.ai.chat.text=AI\u751F\u6210\u6587\u5B57
 operate.changeModel.content=\u4FEE\u6539\u5185\u5BB9\u6A21\u578B
 operate.changeType.category=\u4FEE\u6539\u5206\u7C7B\u7C7B\u578B
 operate.changepassword=\u4FEE\u6539\u5BC6\u7801
diff --git a/publiccms-parent/publiccms/src/main/resources/language/page_en.properties b/publiccms-parent/publiccms/src/main/resources/language/page_en.properties
@@ -102,6 +102,7 @@ page.button.resume=Resume
 page.button.return=Return to the superior
 page.button.save=Save
 page.button.search=Search
+page.button.send=Send
 page.button.show=Show
 page.button.unbind=Unbind
 page.button.uncheck=Uncheck
diff --git a/publiccms-parent/publiccms/src/main/resources/language/page_ja.properties b/publiccms-parent/publiccms/src/main/resources/language/page_ja.properties
@@ -102,6 +102,7 @@ page.button.resume=\u53D6\u308A\u623B\u3057
 page.button.return=\u4E0A\u7D1A\u306B\u623B\u308B
 page.button.save=\u4FDD\u5B58
 page.button.search=\u691C\u7D22
+page.button.send=\u9001\u308B
 page.button.show=\u8868\u793A
 page.button.unbind=\u89E3\u9664
 page.button.uncheck=\u5BE9\u67FB\u3092\u53D6\u308A\u6D88\u3057
diff --git a/publiccms-parent/publiccms/src/main/resources/language/page_zh.properties b/publiccms-parent/publiccms/src/main/resources/language/page_zh.properties
@@ -102,6 +102,7 @@ page.button.resume=\u6062\u590D
 page.button.return=\u8FD4\u56DE\u4E0A\u7EA7
 page.button.save=\u4FDD\u5B58
 page.button.search=\u641C\u7D22
+page.button.send=\u53D1\u9001
 page.button.show=\u663E\u793A
 page.button.unbind=\u89E3\u7ED1
 page.button.uncheck=\u64A4\u9500\u5BA1\u6838
diff --git a/publiccms-parent/publiccms/src/main/resources/templates/admin/cmsContent/add.html b/publiccms-parent/publiccms/src/main/resources/templates/admin/cmsContent/add.html
@@ -205,6 +205,9 @@
                     <dd>
                         <div>
                             <a class="button" href="common/import.html" lookupGroup="" width="600" height="400"><@t.page 'import_doc'/></a>
+                        <#if getAiChatEnable?? && getDictEnable?is_method && getAiChatEnable()>
+                            <a class="button" href="simpleAi/chat.html" lookupGroup="" width="800" height="500">AI</a>
+                        </#if>
                         <#if a?has_content>
                             <a class="button" href="cmsEditorHistory/lookup.html?itemType=content&itemId=${a.id}&fieldName=text" lookupGroup=""><@t.page 'history'/></a>
                         </#if>
diff --git a/publiccms-parent/publiccms/src/main/resources/templates/admin/cmsTemplate/content.html b/publiccms-parent/publiccms/src/main/resources/templates/admin/cmsTemplate/content.html
@@ -28,6 +28,9 @@ <h2 class="contentTitle">
                 </#list>
                 </select>
              </div>
+             <#if getAiChatEnable?? && getDictEnable?is_method && getAiChatEnable()>
+                <a class="button" href="simpleAi/chat.html?field=content&scene=html" lookupGroup="" width="800" height="500">AI</a>
+            </#if>
         </h2>
         <div class="pageFormContent" layoutH>
             <div class="exclude-translate">
diff --git a/publiccms-parent/publiccms/src/main/resources/templates/admin/cmsWebFile/content.html b/publiccms-parent/publiccms/src/main/resources/templates/admin/cmsWebFile/content.html
@@ -20,6 +20,9 @@
         <h2 class="contentTitle">
             <a class="button" href="cmsWebFile/lookup.html?fullPath=true" target="dialog" mask="true"><@t.page 'webfile'/></a>
             <a class="button" href="cmsFileHistory/list.html?type=file&path=${(path?url)!}" lookupGroup=""><@t.page 'history'/></a>
+            <#if getAiChatEnable?? && getDictEnable?is_method && getAiChatEnable()>
+                <a class="button" href="simpleAi/chat.html?field=content&scene=html" lookupGroup="" width="800" height="500">AI</a>
+            </#if>
             <div class="float-right">
                 <select class="combox codeTheme">
                 <#list codeTheme as k,a>
diff --git a/publiccms-parent/publiccms/src/main/resources/templates/admin/include_page/extend/editor.html b/publiccms-parent/publiccms/src/main/resources/templates/admin/include_page/extend/editor.html
@@ -4,6 +4,9 @@
     <#if 'customform'!=type>
         <div>
             <a class="button" href="common/import.html?field=${inputName?url}" lookupGroup="" width="600" height="400"><@t.page 'import_doc'/></a>
+            <#if getAiChatEnable?? && getDictEnable?is_method && getAiChatEnable()>
+                <a class="button" href="simpleAi/chat.html?field=${inputName?url}" lookupGroup="" width="800" height="500">AI</a>
+            </#if>
             <#if itemType?has_content && itemId?has_content>
                 <a class="button" href="cmsEditorHistory/lookup.html?itemType=${itemType?url}&itemId=${itemId?url}&fieldName=${extend.id.code?url}" lookupGroup=""><@t.page 'history'/></a>
             </#if>
diff --git a/publiccms-parent/publiccms/src/main/resources/templates/admin/log/operateView.html b/publiccms-parent/publiccms/src/main/resources/templates/admin/log/operateView.html
@@ -37,7 +37,7 @@
     <dl class="nowrap">
         <dt><@t.page 'log.content'/>:</dt>
         <dd>
-            <textarea name="content" cols="80" rows="20">${(a.content)!}</textarea>
+            <textarea name="content" style="width:80%;" rows="20">${(a.content)!}</textarea>
         </dd>
     </dl>
 </div>
diff --git a/publiccms-parent/publiccms/src/main/resources/templates/admin/log/taskView.html b/publiccms-parent/publiccms/src/main/resources/templates/admin/log/taskView.html
@@ -25,7 +25,7 @@
     <dl class="nowrap">
         <dt><@t.page 'result'/>:</dt>
         <dd>
-            <textarea name="description" cols="80" rows="20">${(a.result)!}</textarea>
+            <textarea name="description" style="width:80%;" rows="20">${(a.result)!}</textarea>
         </dd>
     </dl>
 </div>

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+operate.ai.chat.html=AI-generated web pages`
	`2`	`+operate.ai.chat.text=AI-generated text`
`1`	`3`	`operate.changeModel.content=Modify the model`
`2`	`4`	`operate.changeType.category=Modify the category type`
`3`	`5`	`operate.changepassword=Change password`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+operate.ai.chat.html=AI\u751F\u6210\u30A6\u30A7\u30D6\u30DA\u30FC\u30B8`
	`2`	`+operate.ai.chat.text=AI\u751F\u6210\u6587\u5B57`
`1`	`3`	`operate.changeModel.content=\u30B3\u30F3\u30C6\u30F3\u30C4\u30E2\u30C7\u30EB\u3092\u5909\u66F4`
`2`	`4`	`operate.changeType.category=\u5206\u985E\u30BF\u30A4\u30D7\u3092\u5909\u66F4`
`3`	`5`	`operate.changepassword=\u30D1\u30B9\u30EF\u30FC\u30C9\u3092\u5909\u66F4`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+operate.ai.chat.html=AI\u751F\u6210\u9875\u9762`
	`2`	`+operate.ai.chat.text=AI\u751F\u6210\u6587\u5B57`
`1`	`3`	`operate.changeModel.content=\u4FEE\u6539\u5185\u5BB9\u6A21\u578B`
`2`	`4`	`operate.changeType.category=\u4FEE\u6539\u5206\u7C7B\u7C7B\u578B`
`3`	`5`	`operate.changepassword=\u4FEE\u6539\u5BC6\u7801`