tony001 发布系统代码 [TrainSys，网页端]

config.xml

@@ -55,12 +55,6 @@
 	  git clone -b master $para2 trainsys/
       export NODE_OPTIONS=--max-old-space-size=4096
       cd trainsys/
-      mvn clean package -Ptrainsys
-      mvn install -Ptrainsys
-      cd trainsys-provider
-      mvn -Ptrainsys docker:build
-      mvn -Ptrainsys docker:push
-      docker -H $para1 stack deploy --compose-file=src/main/docker/trainsys-provider-trainsys.yaml ebsx --with-registry-auth      
       </command>
     </hudson.tasks.Shell>
   </builders>

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/TemplatePublish/PSAPPDEVIEWS/bookUsr08126702EditView.json

@@ -16,10 +16,6 @@
   "getPSDEViewCodeName" : "Usr08126702EditView",
   "getPSDEViewId" : "182871AB-0C16-4789-B7C8-A9E1CFEA75ED",
   "getPSViewLayoutPanel" : {
-    "getAllPSPanelFields" : [ {
-      "id" : "bookname",
-      "viewFieldName" : "bookname"
-    } ],
     "codeName" : "Usr0225119621",
     "controlType" : "VIEWLAYOUTPANEL",
     "layoutMode" : "FLEX",
@@ -152,19 +148,41 @@
         "layout" : "FLEX"
       },
       "getPSPanelItems" : [ {
-        "caption" : "文本(动态)",
+        "caption" : "文本",
+        "contentType" : "HTML",
+        "htmlContent" : "<div>\n<div>&lt;!DOCTYPE html&gt;</div>\n<div>&lt;html lang=\"en\"&gt;</div>\n<div>&lt;head&gt;</div>\n<div>&nbsp; &lt;meta charset=\"UTF-8\"&gt;</div>\n<div>&nbsp; &lt;meta name=\"viewport\" content=\"width=device-width, initial-scale=1.0\"&gt;</div>\n<div>&nbsp; &lt;title&gt;HTML Template with Features&lt;/title&gt;</div>\n<div>&nbsp; &lt;style&gt;</div>\n<div>&nbsp; &nbsp; /* 外部样式 */</div>\n<div>&nbsp; &nbsp; button {</div>\n<div>&nbsp; &nbsp; &nbsp; padding: 10px 20px;</div>\n<div>&nbsp; &nbsp; &nbsp; background-color: #007BFF;</div>\n<div>&nbsp; &nbsp; &nbsp; color: white;</div>\n<div>&nbsp; &nbsp; &nbsp; border: none;</div>\n<div>&nbsp; &nbsp; &nbsp; border-radius: 5px;</div>\n<div>&nbsp; &nbsp; &nbsp; cursor: pointer;</div>\n<div>&nbsp; &nbsp; &nbsp; transition: background-color 0.3s ease;</div>\n<div>&nbsp; &nbsp; }</div>\n<br /><br />\n<div>&nbsp; &nbsp; button:hover {</div>\n<div>&nbsp; &nbsp; &nbsp; background-color: #0056b3;</div>\n<div>&nbsp; &nbsp; }</div>\n<br /><br />\n<div>&nbsp; &nbsp; .book-info {</div>\n<div>&nbsp; &nbsp; &nbsp; border: 1px solid #ccc;</div>\n<div>&nbsp; &nbsp; &nbsp; width: 300px;</div>\n<div>&nbsp; &nbsp; &nbsp; height: auto;</div>\n<div>&nbsp; &nbsp; &nbsp; padding: 20px;</div>\n<div>&nbsp; &nbsp; &nbsp; margin-top: 20px;</div>\n<div>&nbsp; &nbsp; &nbsp; border-radius: 5px;</div>\n<div>&nbsp; &nbsp; &nbsp; animation: fadeIn 1s ease;</div>\n<div>&nbsp; &nbsp; }</div>\n<br /><br />\n<div>&nbsp; &nbsp; @keyframes fadeIn {</div>\n<div>&nbsp; &nbsp; &nbsp; from {</div>\n<div>&nbsp; &nbsp; &nbsp; &nbsp; opacity: 0;</div>\n<div>&nbsp; &nbsp; &nbsp; }</div>\n<br /><br />\n<div>&nbsp; &nbsp; &nbsp; to {</div>\n<div>&nbsp; &nbsp; &nbsp; &nbsp; opacity: 1;</div>\n<div>&nbsp; &nbsp; &nbsp; }</div>\n<div>&nbsp; &nbsp; }</div>\n<div>&nbsp; &lt;/style&gt;</div>\n<br />\n<div>&lt;/head&gt;</div>\n<br /><br /><br /><br />\n<div>&lt;body&gt;</div>\n<div>&nbsp; &lt;!-- 按钮，带有点击事件 --&gt;</div>\n<div>&nbsp; &lt;button id=\"myButton\" onclick=\"handleClick()\"&gt;test&lt;/button&gt;</div>\n<div>&nbsp; &lt;!-- 书籍信息容器 --&gt;</div>\n<div>&nbsp; &lt;div id=\"bookInfo\" class=\"book-info\" draggable=\"true\" ondragstart=\"dragStart(event)\" ondragover=\"dragOver(event)\"</div>\n<div>&nbsp; &nbsp; ondrop=\"drop(event)\"&gt;</div>\n<div>&nbsp; &nbsp; &lt;div&gt;名称：{{data.bookname}}&lt;/div&gt;</div>\n<div>&nbsp; &nbsp; &lt;div&gt;更新时间：{{data.updatedate}}&lt;/div&gt;</div>\n<div>&nbsp; &lt;/div&gt;</div>\n<br /><br /><br />\n<div>&nbsp; &lt;script&gt;</div>\n<div>&nbsp; &nbsp; // 模拟数据</div>\n<div>&nbsp; &nbsp; const data = {</div>\n<div>&nbsp; &nbsp; &nbsp; bookname: '{{data.bookname}}',</div>\n<div>&nbsp; &nbsp; &nbsp; updatedate: '{{data.updatedate}}'</div>\n<div>&nbsp; &nbsp; };</div>\n<br /><br />\n<div>&nbsp; &nbsp; // 处理按钮点击事件</div>\n<div>&nbsp; &nbsp; function handleClick() {</div>\n<div>&nbsp; &nbsp; &nbsp; // 获取书籍信息元素</div>\n<div>&nbsp; &nbsp; &nbsp; const bookInfo = document.getElementById('bookInfo');</div>\n<div>&nbsp; &nbsp; &nbsp; if (bookInfo) {</div>\n<div>&nbsp; &nbsp; &nbsp; &nbsp; // 移除元素</div>\n<div>&nbsp; &nbsp; &nbsp; &nbsp; bookInfo.remove();</div>\n<div>&nbsp; &nbsp; &nbsp; }</div>\n<div>&nbsp; &nbsp; }</div>\n<br /><br />\n<div>&nbsp; &nbsp; // 拖拽开始事件处理函数</div>\n<div>&nbsp; &nbsp; function dragStart(event) {</div>\n<div>&nbsp; &nbsp; &nbsp; event.dataTransfer.setData('text/plain', event.target.id);</div>\n<div>&nbsp; &nbsp; &nbsp; // 添加内联样式，改变透明度</div>\n<div>&nbsp; &nbsp; &nbsp; event.target.style.opacity = '0.5';</div>\n<div>&nbsp; &nbsp; }</div>\n<br /><br />\n<div>&nbsp; &nbsp; // 拖拽经过事件处理函数</div>\n<div>&nbsp; &nbsp; function dragOver(event) {</div>\n<div>&nbsp; &nbsp; &nbsp; event.preventDefault();</div>\n<div>&nbsp; &nbsp; }</div>\n<br /><br />\n<div>&nbsp; &nbsp; // 拖拽放下事件处理函数</div>\n<div>&nbsp; &nbsp; function drop(event) {</div>\n<div>&nbsp; &nbsp; &nbsp; event.preventDefault();</div>\n<div>&nbsp; &nbsp; &nbsp; const data = event.dataTransfer.getData('text/plain');</div>\n<div>&nbsp; &nbsp; &nbsp; const draggedElement = document.getElementById(data);</div>\n<div>&nbsp; &nbsp; &nbsp; // 移除内联样式</div>\n<div>&nbsp; &nbsp; &nbsp; draggedElement.style.opacity = '1';</div>\n<div>&nbsp; &nbsp; &nbsp; // 将拖拽元素移动到新位置</div>\n<div>&nbsp; &nbsp; &nbsp; event.target.appendChild(draggedElement);</div>\n<div>&nbsp; &nbsp; }</div>\n<div>&nbsp; &lt;/script&gt;</div>\n<div>&lt;/body&gt;</div>\n<div>&lt;/html&gt;</div>\n</div>",
         "itemStyle" : "DEFAULT",
-        "itemType" : "FIELD",
-        "name" : "bookname",
-        "getPSEditor" : {
-          "editorType" : "TEXTBOX",
-          "name" : "bookname"
+        "itemType" : "RAWITEM",
+        "name" : "static_text1",
+        "getPSLayoutPos" : {
+          "grow" : -1,
+          "layout" : "FLEX"
+        },
+        "getPSRawItem" : {
+          "content" : "<div>\n<div>&lt;!DOCTYPE html&gt;</div>\n<div>&lt;html lang=\"en\"&gt;</div>\n<div>&lt;head&gt;</div>\n<div>&nbsp; &lt;meta charset=\"UTF-8\"&gt;</div>\n<div>&nbsp; &lt;meta name=\"viewport\" content=\"width=device-width, initial-scale=1.0\"&gt;</div>\n<div>&nbsp; &lt;title&gt;HTML Template with Features&lt;/title&gt;</div>\n<div>&nbsp; &lt;style&gt;</div>\n<div>&nbsp; &nbsp; /* 外部样式 */</div>\n<div>&nbsp; &nbsp; button {</div>\n<div>&nbsp; &nbsp; &nbsp; padding: 10px 20px;</div>\n<div>&nbsp; &nbsp; &nbsp; background-color: #007BFF;</div>\n<div>&nbsp; &nbsp; &nbsp; color: white;</div>\n<div>&nbsp; &nbsp; &nbsp; border: none;</div>\n<div>&nbsp; &nbsp; &nbsp; border-radius: 5px;</div>\n<div>&nbsp; &nbsp; &nbsp; cursor: pointer;</div>\n<div>&nbsp; &nbsp; &nbsp; transition: background-color 0.3s ease;</div>\n<div>&nbsp; &nbsp; }</div>\n<br /><br />\n<div>&nbsp; &nbsp; button:hover {</div>\n<div>&nbsp; &nbsp; &nbsp; background-color: #0056b3;</div>\n<div>&nbsp; &nbsp; }</div>\n<br /><br />\n<div>&nbsp; &nbsp; .book-info {</div>\n<div>&nbsp; &nbsp; &nbsp; border: 1px solid #ccc;</div>\n<div>&nbsp; &nbsp; &nbsp; width: 300px;</div>\n<div>&nbsp; &nbsp; &nbsp; height: auto;</div>\n<div>&nbsp; &nbsp; &nbsp; padding: 20px;</div>\n<div>&nbsp; &nbsp; &nbsp; margin-top: 20px;</div>\n<div>&nbsp; &nbsp; &nbsp; border-radius: 5px;</div>\n<div>&nbsp; &nbsp; &nbsp; animation: fadeIn 1s ease;</div>\n<div>&nbsp; &nbsp; }</div>\n<br /><br />\n<div>&nbsp; &nbsp; @keyframes fadeIn {</div>\n<div>&nbsp; &nbsp; &nbsp; from {</div>\n<div>&nbsp; &nbsp; &nbsp; &nbsp; opacity: 0;</div>\n<div>&nbsp; &nbsp; &nbsp; }</div>\n<br /><br />\n<div>&nbsp; &nbsp; &nbsp; to {</div>\n<div>&nbsp; &nbsp; &nbsp; &nbsp; opacity: 1;</div>\n<div>&nbsp; &nbsp; &nbsp; }</div>\n<div>&nbsp; &nbsp; }</div>\n<div>&nbsp; &lt;/style&gt;</div>\n<br />\n<div>&lt;/head&gt;</div>\n<br /><br /><br /><br />\n<div>&lt;body&gt;</div>\n<div>&nbsp; &lt;!-- 按钮，带有点击事件 --&gt;</div>\n<div>&nbsp; &lt;button id=\"myButton\" onclick=\"handleClick()\"&gt;test&lt;/button&gt;</div>\n<div>&nbsp; &lt;!-- 书籍信息容器 --&gt;</div>\n<div>&nbsp; &lt;div id=\"bookInfo\" class=\"book-info\" draggable=\"true\" ondragstart=\"dragStart(event)\" ondragover=\"dragOver(event)\"</div>\n<div>&nbsp; &nbsp; ondrop=\"drop(event)\"&gt;</div>\n<div>&nbsp; &nbsp; &lt;div&gt;名称：{{data.bookname}}&lt;/div&gt;</div>\n<div>&nbsp; &nbsp; &lt;div&gt;更新时间：{{data.updatedate}}&lt;/div&gt;</div>\n<div>&nbsp; &lt;/div&gt;</div>\n<br /><br /><br />\n<div>&nbsp; &lt;script&gt;</div>\n<div>&nbsp; &nbsp; // 模拟数据</div>\n<div>&nbsp; &nbsp; const data = {</div>\n<div>&nbsp; &nbsp; &nbsp; bookname: '{{data.bookname}}',</div>\n<div>&nbsp; &nbsp; &nbsp; updatedate: '{{data.updatedate}}'</div>\n<div>&nbsp; &nbsp; };</div>\n<br /><br />\n<div>&nbsp; &nbsp; // 处理按钮点击事件</div>\n<div>&nbsp; &nbsp; function handleClick() {</div>\n<div>&nbsp; &nbsp; &nbsp; // 获取书籍信息元素</div>\n<div>&nbsp; &nbsp; &nbsp; const bookInfo = document.getElementById('bookInfo');</div>\n<div>&nbsp; &nbsp; &nbsp; if (bookInfo) {</div>\n<div>&nbsp; &nbsp; &nbsp; &nbsp; // 移除元素</div>\n<div>&nbsp; &nbsp; &nbsp; &nbsp; bookInfo.remove();</div>\n<div>&nbsp; &nbsp; &nbsp; }</div>\n<div>&nbsp; &nbsp; }</div>\n<br /><br />\n<div>&nbsp; &nbsp; // 拖拽开始事件处理函数</div>\n<div>&nbsp; &nbsp; function dragStart(event) {</div>\n<div>&nbsp; &nbsp; &nbsp; event.dataTransfer.setData('text/plain', event.target.id);</div>\n<div>&nbsp; &nbsp; &nbsp; // 添加内联样式，改变透明度</div>\n<div>&nbsp; &nbsp; &nbsp; event.target.style.opacity = '0.5';</div>\n<div>&nbsp; &nbsp; }</div>\n<br /><br />\n<div>&nbsp; &nbsp; // 拖拽经过事件处理函数</div>\n<div>&nbsp; &nbsp; function dragOver(event) {</div>\n<div>&nbsp; &nbsp; &nbsp; event.preventDefault();</div>\n<div>&nbsp; &nbsp; }</div>\n<br /><br />\n<div>&nbsp; &nbsp; // 拖拽放下事件处理函数</div>\n<div>&nbsp; &nbsp; function drop(event) {</div>\n<div>&nbsp; &nbsp; &nbsp; event.preventDefault();</div>\n<div>&nbsp; &nbsp; &nbsp; const data = event.dataTransfer.getData('text/plain');</div>\n<div>&nbsp; &nbsp; &nbsp; const draggedElement = document.getElementById(data);</div>\n<div>&nbsp; &nbsp; &nbsp; // 移除内联样式</div>\n<div>&nbsp; &nbsp; &nbsp; draggedElement.style.opacity = '1';</div>\n<div>&nbsp; &nbsp; &nbsp; // 将拖拽元素移动到新位置</div>\n<div>&nbsp; &nbsp; &nbsp; event.target.appendChild(draggedElement);</div>\n<div>&nbsp; &nbsp; }</div>\n<div>&nbsp; &lt;/script&gt;</div>\n<div>&lt;/body&gt;</div>\n<div>&lt;/html&gt;</div>\n</div>",
+          "contentType" : "HTML",
+          "name" : "static_text1",
+          "predefinedType" : "HTML_PREVIEW"
         },
+        "showCaption" : true
+      }, {
+        "caption" : "文本",
+        "contentType" : "HTML",
+        "htmlContent" : "<div>\n<div>&lt;body&gt;</div>\n<div>&nbsp; &lt;!-- 按钮，带有点击事件 --&gt;</div>\n<div>&nbsp; &lt;button id=\"myButton\" onclick=\"handleClick()\"&gt;test&lt;/button&gt;</div>\n<div>&nbsp; &lt;!-- 书籍信息容器 --&gt;</div>\n<div>&nbsp; &lt;div id=\"bookInfo\" class=\"book-info\" draggable=\"true\" ondragstart=\"dragStart(event)\" ondragover=\"dragOver(event)\"</div>\n<div>&nbsp; &nbsp; ondrop=\"drop(event)\"&gt;</div>\n<div>&nbsp; &nbsp; &lt;div&gt;名称：{{data.bookname}}&lt;/div&gt;</div>\n<div>&nbsp; &nbsp; &lt;div&gt;更新时间：{{data.updatedate}}&lt;/div&gt;</div>\n<div>&nbsp; &lt;/div&gt;</div>\n<br />\n<div>&lt;/body&gt;</div>\n</div>",
+        "itemStyle" : "DEFAULT",
+        "itemType" : "RAWITEM",
+        "name" : "static_text",
         "getPSLayoutPos" : {
           "grow" : -1,
           "layout" : "FLEX"
         },
-        "viewFieldName" : "bookname"
+        "getPSRawItem" : {
+          "content" : "<div>\n<div>&lt;body&gt;</div>\n<div>&nbsp; &lt;!-- 按钮，带有点击事件 --&gt;</div>\n<div>&nbsp; &lt;button id=\"myButton\" onclick=\"handleClick()\"&gt;test&lt;/button&gt;</div>\n<div>&nbsp; &lt;!-- 书籍信息容器 --&gt;</div>\n<div>&nbsp; &lt;div id=\"bookInfo\" class=\"book-info\" draggable=\"true\" ondragstart=\"dragStart(event)\" ondragover=\"dragOver(event)\"</div>\n<div>&nbsp; &nbsp; ondrop=\"drop(event)\"&gt;</div>\n<div>&nbsp; &nbsp; &lt;div&gt;名称：{{data.bookname}}&lt;/div&gt;</div>\n<div>&nbsp; &nbsp; &lt;div&gt;更新时间：{{data.updatedate}}&lt;/div&gt;</div>\n<div>&nbsp; &lt;/div&gt;</div>\n<br />\n<div>&lt;/body&gt;</div>\n</div>",
+          "contentType" : "HTML",
+          "name" : "static_text",
+          "predefinedType" : "HTML_PREVIEW"
+        },
+        "showCaption" : true
       } ],
       "predefinedType" : "CONTAINER_SINGLEDATA"
     }, {

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/bookUsr08126702EditView.json

@@ -15,10 +15,6 @@
   "getPSDEViewCodeName" : "Usr08126702EditView",
   "getPSDEViewId" : "182871AB-0C16-4789-B7C8-A9E1CFEA75ED",
   "getPSViewLayoutPanel" : {
-    "getAllPSPanelFields" : [ {
-      "id" : "bookname",
-      "viewFieldName" : "bookname"
-    } ],
     "codeName" : "Usr0225119621",
     "controlType" : "VIEWLAYOUTPANEL",
     "layoutMode" : "FLEX",
@@ -151,19 +147,41 @@
         "layout" : "FLEX"
       },
       "getPSPanelItems" : [ {
-        "caption" : "文本(动态)",
+        "caption" : "文本",
+        "contentType" : "HTML",
+        "htmlContent" : "<div>\n<div>&lt;!DOCTYPE html&gt;</div>\n<div>&lt;html lang=\"en\"&gt;</div>\n<div>&lt;head&gt;</div>\n<div>&nbsp; &lt;meta charset=\"UTF-8\"&gt;</div>\n<div>&nbsp; &lt;meta name=\"viewport\" content=\"width=device-width, initial-scale=1.0\"&gt;</div>\n<div>&nbsp; &lt;title&gt;HTML Template with Features&lt;/title&gt;</div>\n<div>&nbsp; &lt;style&gt;</div>\n<div>&nbsp; &nbsp; /* 外部样式 */</div>\n<div>&nbsp; &nbsp; button {</div>\n<div>&nbsp; &nbsp; &nbsp; padding: 10px 20px;</div>\n<div>&nbsp; &nbsp; &nbsp; background-color: #007BFF;</div>\n<div>&nbsp; &nbsp; &nbsp; color: white;</div>\n<div>&nbsp; &nbsp; &nbsp; border: none;</div>\n<div>&nbsp; &nbsp; &nbsp; border-radius: 5px;</div>\n<div>&nbsp; &nbsp; &nbsp; cursor: pointer;</div>\n<div>&nbsp; &nbsp; &nbsp; transition: background-color 0.3s ease;</div>\n<div>&nbsp; &nbsp; }</div>\n<br /><br />\n<div>&nbsp; &nbsp; button:hover {</div>\n<div>&nbsp; &nbsp; &nbsp; background-color: #0056b3;</div>\n<div>&nbsp; &nbsp; }</div>\n<br /><br />\n<div>&nbsp; &nbsp; .book-info {</div>\n<div>&nbsp; &nbsp; &nbsp; border: 1px solid #ccc;</div>\n<div>&nbsp; &nbsp; &nbsp; width: 300px;</div>\n<div>&nbsp; &nbsp; &nbsp; height: auto;</div>\n<div>&nbsp; &nbsp; &nbsp; padding: 20px;</div>\n<div>&nbsp; &nbsp; &nbsp; margin-top: 20px;</div>\n<div>&nbsp; &nbsp; &nbsp; border-radius: 5px;</div>\n<div>&nbsp; &nbsp; &nbsp; animation: fadeIn 1s ease;</div>\n<div>&nbsp; &nbsp; }</div>\n<br /><br />\n<div>&nbsp; &nbsp; @keyframes fadeIn {</div>\n<div>&nbsp; &nbsp; &nbsp; from {</div>\n<div>&nbsp; &nbsp; &nbsp; &nbsp; opacity: 0;</div>\n<div>&nbsp; &nbsp; &nbsp; }</div>\n<br /><br />\n<div>&nbsp; &nbsp; &nbsp; to {</div>\n<div>&nbsp; &nbsp; &nbsp; &nbsp; opacity: 1;</div>\n<div>&nbsp; &nbsp; &nbsp; }</div>\n<div>&nbsp; &nbsp; }</div>\n<div>&nbsp; &lt;/style&gt;</div>\n<br />\n<div>&lt;/head&gt;</div>\n<br /><br /><br /><br />\n<div>&lt;body&gt;</div>\n<div>&nbsp; &lt;!-- 按钮，带有点击事件 --&gt;</div>\n<div>&nbsp; &lt;button id=\"myButton\" onclick=\"handleClick()\"&gt;test&lt;/button&gt;</div>\n<div>&nbsp; &lt;!-- 书籍信息容器 --&gt;</div>\n<div>&nbsp; &lt;div id=\"bookInfo\" class=\"book-info\" draggable=\"true\" ondragstart=\"dragStart(event)\" ondragover=\"dragOver(event)\"</div>\n<div>&nbsp; &nbsp; ondrop=\"drop(event)\"&gt;</div>\n<div>&nbsp; &nbsp; &lt;div&gt;名称：{{data.bookname}}&lt;/div&gt;</div>\n<div>&nbsp; &nbsp; &lt;div&gt;更新时间：{{data.updatedate}}&lt;/div&gt;</div>\n<div>&nbsp; &lt;/div&gt;</div>\n<br /><br /><br />\n<div>&nbsp; &lt;script&gt;</div>\n<div>&nbsp; &nbsp; // 模拟数据</div>\n<div>&nbsp; &nbsp; const data = {</div>\n<div>&nbsp; &nbsp; &nbsp; bookname: '{{data.bookname}}',</div>\n<div>&nbsp; &nbsp; &nbsp; updatedate: '{{data.updatedate}}'</div>\n<div>&nbsp; &nbsp; };</div>\n<br /><br />\n<div>&nbsp; &nbsp; // 处理按钮点击事件</div>\n<div>&nbsp; &nbsp; function handleClick() {</div>\n<div>&nbsp; &nbsp; &nbsp; // 获取书籍信息元素</div>\n<div>&nbsp; &nbsp; &nbsp; const bookInfo = document.getElementById('bookInfo');</div>\n<div>&nbsp; &nbsp; &nbsp; if (bookInfo) {</div>\n<div>&nbsp; &nbsp; &nbsp; &nbsp; // 移除元素</div>\n<div>&nbsp; &nbsp; &nbsp; &nbsp; bookInfo.remove();</div>\n<div>&nbsp; &nbsp; &nbsp; }</div>\n<div>&nbsp; &nbsp; }</div>\n<br /><br />\n<div>&nbsp; &nbsp; // 拖拽开始事件处理函数</div>\n<div>&nbsp; &nbsp; function dragStart(event) {</div>\n<div>&nbsp; &nbsp; &nbsp; event.dataTransfer.setData('text/plain', event.target.id);</div>\n<div>&nbsp; &nbsp; &nbsp; // 添加内联样式，改变透明度</div>\n<div>&nbsp; &nbsp; &nbsp; event.target.style.opacity = '0.5';</div>\n<div>&nbsp; &nbsp; }</div>\n<br /><br />\n<div>&nbsp; &nbsp; // 拖拽经过事件处理函数</div>\n<div>&nbsp; &nbsp; function dragOver(event) {</div>\n<div>&nbsp; &nbsp; &nbsp; event.preventDefault();</div>\n<div>&nbsp; &nbsp; }</div>\n<br /><br />\n<div>&nbsp; &nbsp; // 拖拽放下事件处理函数</div>\n<div>&nbsp; &nbsp; function drop(event) {</div>\n<div>&nbsp; &nbsp; &nbsp; event.preventDefault();</div>\n<div>&nbsp; &nbsp; &nbsp; const data = event.dataTransfer.getData('text/plain');</div>\n<div>&nbsp; &nbsp; &nbsp; const draggedElement = document.getElementById(data);</div>\n<div>&nbsp; &nbsp; &nbsp; // 移除内联样式</div>\n<div>&nbsp; &nbsp; &nbsp; draggedElement.style.opacity = '1';</div>\n<div>&nbsp; &nbsp; &nbsp; // 将拖拽元素移动到新位置</div>\n<div>&nbsp; &nbsp; &nbsp; event.target.appendChild(draggedElement);</div>\n<div>&nbsp; &nbsp; }</div>\n<div>&nbsp; &lt;/script&gt;</div>\n<div>&lt;/body&gt;</div>\n<div>&lt;/html&gt;</div>\n</div>",
         "itemStyle" : "DEFAULT",
-        "itemType" : "FIELD",
-        "name" : "bookname",
-        "getPSEditor" : {
-          "editorType" : "TEXTBOX",
-          "name" : "bookname"
+        "itemType" : "RAWITEM",
+        "name" : "static_text1",
+        "getPSLayoutPos" : {
+          "grow" : -1,
+          "layout" : "FLEX"
+        },
+        "getPSRawItem" : {
+          "content" : "<div>\n<div>&lt;!DOCTYPE html&gt;</div>\n<div>&lt;html lang=\"en\"&gt;</div>\n<div>&lt;head&gt;</div>\n<div>&nbsp; &lt;meta charset=\"UTF-8\"&gt;</div>\n<div>&nbsp; &lt;meta name=\"viewport\" content=\"width=device-width, initial-scale=1.0\"&gt;</div>\n<div>&nbsp; &lt;title&gt;HTML Template with Features&lt;/title&gt;</div>\n<div>&nbsp; &lt;style&gt;</div>\n<div>&nbsp; &nbsp; /* 外部样式 */</div>\n<div>&nbsp; &nbsp; button {</div>\n<div>&nbsp; &nbsp; &nbsp; padding: 10px 20px;</div>\n<div>&nbsp; &nbsp; &nbsp; background-color: #007BFF;</div>\n<div>&nbsp; &nbsp; &nbsp; color: white;</div>\n<div>&nbsp; &nbsp; &nbsp; border: none;</div>\n<div>&nbsp; &nbsp; &nbsp; border-radius: 5px;</div>\n<div>&nbsp; &nbsp; &nbsp; cursor: pointer;</div>\n<div>&nbsp; &nbsp; &nbsp; transition: background-color 0.3s ease;</div>\n<div>&nbsp; &nbsp; }</div>\n<br /><br />\n<div>&nbsp; &nbsp; button:hover {</div>\n<div>&nbsp; &nbsp; &nbsp; background-color: #0056b3;</div>\n<div>&nbsp; &nbsp; }</div>\n<br /><br />\n<div>&nbsp; &nbsp; .book-info {</div>\n<div>&nbsp; &nbsp; &nbsp; border: 1px solid #ccc;</div>\n<div>&nbsp; &nbsp; &nbsp; width: 300px;</div>\n<div>&nbsp; &nbsp; &nbsp; height: auto;</div>\n<div>&nbsp; &nbsp; &nbsp; padding: 20px;</div>\n<div>&nbsp; &nbsp; &nbsp; margin-top: 20px;</div>\n<div>&nbsp; &nbsp; &nbsp; border-radius: 5px;</div>\n<div>&nbsp; &nbsp; &nbsp; animation: fadeIn 1s ease;</div>\n<div>&nbsp; &nbsp; }</div>\n<br /><br />\n<div>&nbsp; &nbsp; @keyframes fadeIn {</div>\n<div>&nbsp; &nbsp; &nbsp; from {</div>\n<div>&nbsp; &nbsp; &nbsp; &nbsp; opacity: 0;</div>\n<div>&nbsp; &nbsp; &nbsp; }</div>\n<br /><br />\n<div>&nbsp; &nbsp; &nbsp; to {</div>\n<div>&nbsp; &nbsp; &nbsp; &nbsp; opacity: 1;</div>\n<div>&nbsp; &nbsp; &nbsp; }</div>\n<div>&nbsp; &nbsp; }</div>\n<div>&nbsp; &lt;/style&gt;</div>\n<br />\n<div>&lt;/head&gt;</div>\n<br /><br /><br /><br />\n<div>&lt;body&gt;</div>\n<div>&nbsp; &lt;!-- 按钮，带有点击事件 --&gt;</div>\n<div>&nbsp; &lt;button id=\"myButton\" onclick=\"handleClick()\"&gt;test&lt;/button&gt;</div>\n<div>&nbsp; &lt;!-- 书籍信息容器 --&gt;</div>\n<div>&nbsp; &lt;div id=\"bookInfo\" class=\"book-info\" draggable=\"true\" ondragstart=\"dragStart(event)\" ondragover=\"dragOver(event)\"</div>\n<div>&nbsp; &nbsp; ondrop=\"drop(event)\"&gt;</div>\n<div>&nbsp; &nbsp; &lt;div&gt;名称：{{data.bookname}}&lt;/div&gt;</div>\n<div>&nbsp; &nbsp; &lt;div&gt;更新时间：{{data.updatedate}}&lt;/div&gt;</div>\n<div>&nbsp; &lt;/div&gt;</div>\n<br /><br /><br />\n<div>&nbsp; &lt;script&gt;</div>\n<div>&nbsp; &nbsp; // 模拟数据</div>\n<div>&nbsp; &nbsp; const data = {</div>\n<div>&nbsp; &nbsp; &nbsp; bookname: '{{data.bookname}}',</div>\n<div>&nbsp; &nbsp; &nbsp; updatedate: '{{data.updatedate}}'</div>\n<div>&nbsp; &nbsp; };</div>\n<br /><br />\n<div>&nbsp; &nbsp; // 处理按钮点击事件</div>\n<div>&nbsp; &nbsp; function handleClick() {</div>\n<div>&nbsp; &nbsp; &nbsp; // 获取书籍信息元素</div>\n<div>&nbsp; &nbsp; &nbsp; const bookInfo = document.getElementById('bookInfo');</div>\n<div>&nbsp; &nbsp; &nbsp; if (bookInfo) {</div>\n<div>&nbsp; &nbsp; &nbsp; &nbsp; // 移除元素</div>\n<div>&nbsp; &nbsp; &nbsp; &nbsp; bookInfo.remove();</div>\n<div>&nbsp; &nbsp; &nbsp; }</div>\n<div>&nbsp; &nbsp; }</div>\n<br /><br />\n<div>&nbsp; &nbsp; // 拖拽开始事件处理函数</div>\n<div>&nbsp; &nbsp; function dragStart(event) {</div>\n<div>&nbsp; &nbsp; &nbsp; event.dataTransfer.setData('text/plain', event.target.id);</div>\n<div>&nbsp; &nbsp; &nbsp; // 添加内联样式，改变透明度</div>\n<div>&nbsp; &nbsp; &nbsp; event.target.style.opacity = '0.5';</div>\n<div>&nbsp; &nbsp; }</div>\n<br /><br />\n<div>&nbsp; &nbsp; // 拖拽经过事件处理函数</div>\n<div>&nbsp; &nbsp; function dragOver(event) {</div>\n<div>&nbsp; &nbsp; &nbsp; event.preventDefault();</div>\n<div>&nbsp; &nbsp; }</div>\n<br /><br />\n<div>&nbsp; &nbsp; // 拖拽放下事件处理函数</div>\n<div>&nbsp; &nbsp; function drop(event) {</div>\n<div>&nbsp; &nbsp; &nbsp; event.preventDefault();</div>\n<div>&nbsp; &nbsp; &nbsp; const data = event.dataTransfer.getData('text/plain');</div>\n<div>&nbsp; &nbsp; &nbsp; const draggedElement = document.getElementById(data);</div>\n<div>&nbsp; &nbsp; &nbsp; // 移除内联样式</div>\n<div>&nbsp; &nbsp; &nbsp; draggedElement.style.opacity = '1';</div>\n<div>&nbsp; &nbsp; &nbsp; // 将拖拽元素移动到新位置</div>\n<div>&nbsp; &nbsp; &nbsp; event.target.appendChild(draggedElement);</div>\n<div>&nbsp; &nbsp; }</div>\n<div>&nbsp; &lt;/script&gt;</div>\n<div>&lt;/body&gt;</div>\n<div>&lt;/html&gt;</div>\n</div>",
+          "contentType" : "HTML",
+          "name" : "static_text1",
+          "predefinedType" : "HTML_PREVIEW"
         },
+        "showCaption" : true
+      }, {
+        "caption" : "文本",
+        "contentType" : "HTML",
+        "htmlContent" : "<div>\n<div>&lt;body&gt;</div>\n<div>&nbsp; &lt;!-- 按钮，带有点击事件 --&gt;</div>\n<div>&nbsp; &lt;button id=\"myButton\" onclick=\"handleClick()\"&gt;test&lt;/button&gt;</div>\n<div>&nbsp; &lt;!-- 书籍信息容器 --&gt;</div>\n<div>&nbsp; &lt;div id=\"bookInfo\" class=\"book-info\" draggable=\"true\" ondragstart=\"dragStart(event)\" ondragover=\"dragOver(event)\"</div>\n<div>&nbsp; &nbsp; ondrop=\"drop(event)\"&gt;</div>\n<div>&nbsp; &nbsp; &lt;div&gt;名称：{{data.bookname}}&lt;/div&gt;</div>\n<div>&nbsp; &nbsp; &lt;div&gt;更新时间：{{data.updatedate}}&lt;/div&gt;</div>\n<div>&nbsp; &lt;/div&gt;</div>\n<br />\n<div>&lt;/body&gt;</div>\n</div>",
+        "itemStyle" : "DEFAULT",
+        "itemType" : "RAWITEM",
+        "name" : "static_text",
         "getPSLayoutPos" : {
           "grow" : -1,
           "layout" : "FLEX"
         },
-        "viewFieldName" : "bookname"
+        "getPSRawItem" : {
+          "content" : "<div>\n<div>&lt;body&gt;</div>\n<div>&nbsp; &lt;!-- 按钮，带有点击事件 --&gt;</div>\n<div>&nbsp; &lt;button id=\"myButton\" onclick=\"handleClick()\"&gt;test&lt;/button&gt;</div>\n<div>&nbsp; &lt;!-- 书籍信息容器 --&gt;</div>\n<div>&nbsp; &lt;div id=\"bookInfo\" class=\"book-info\" draggable=\"true\" ondragstart=\"dragStart(event)\" ondragover=\"dragOver(event)\"</div>\n<div>&nbsp; &nbsp; ondrop=\"drop(event)\"&gt;</div>\n<div>&nbsp; &nbsp; &lt;div&gt;名称：{{data.bookname}}&lt;/div&gt;</div>\n<div>&nbsp; &nbsp; &lt;div&gt;更新时间：{{data.updatedate}}&lt;/div&gt;</div>\n<div>&nbsp; &lt;/div&gt;</div>\n<br />\n<div>&lt;/body&gt;</div>\n</div>",
+          "contentType" : "HTML",
+          "name" : "static_text",
+          "predefinedType" : "HTML_PREVIEW"
+        },
+        "showCaption" : true
       } ],
       "predefinedType" : "CONTAINER_SINGLEDATA"
     }, {

trainsys-provider/pom.xml

@@ -33,7 +33,7 @@
 
     <profiles>
         <profile>
-            <id>trainsys</id>
+            <id>runtime</id>
             <build>
                 <resources>
                     <resource>

trainsys-provider/src/main/docker/Dockerfile

@@ -10,6 +10,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
     sleep ${IBIZ_SLEEP} && \
     java ${JAVA_OPTS} -Duser.timezone=$TZ -Djava.security.egd=file:/dev/./urandom -jar /trainsys-provider.jar
 
-EXPOSE 50000
+EXPOSE 8081
 
 ADD trainsys-provider.jar /trainsys-provider.jar

trainsys-provider/src/main/docker/trainsys-provider-trainsys-k8s.yaml

@@ -22,32 +22,7 @@ spec:
         image: registry.cn-shanghai.aliyuncs.com/ibizsys/trainsys-provider:latest
         imagePullPolicy: Always
         ports:
-        - containerPort: 50000
-        env:
-        - name: SPRING_CLOUD_NACOS_DISCOVERY_IP
-          value: "172.16.240.140"      
-        - name: SERVER_PORT
-          value: "50000"
-        - name: SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR
-          value: "172.16.240.140:8848"
-        - name: SPRING_REDIS_HOST
-          value: "127.0.0.1"
-        - name: SPRING_REDIS_PORT
-          value: "6379"
-        - name: SPRING_REDIS_DATABASE
-          value: "0"
-        - name: SPRING_DATASOURCE_USERNAME
-          value: "a_LAB01_d23cc850e"
-        - name: SPRING_DATASOURCE_PASSWORD
-          value: "f9Df4556"
-        - name: SPRING_DATASOURCE_URL
-          value: "jdbc:mysql://172.16.186.185:3306/a_LAB01_d23cc850e?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&serverTimezone=Asia/Shanghai&allowMultiQueries=true&serverTimezone=GMT%2B8"
-        - name: SPRING_DATASOURCE_DRIVER-CLASS-NAME
-          value: "com.mysql.jdbc.Driver"
-        - name: SPRING_DATASOURCE_DEFAULTSCHEMA
-          value: "a_LAB01_d23cc850e"
-        - name: NACOS
-          value: "172.16.240.140:8848"      
+        - containerPort: 8081
 
 ---
 apiVersion: v1
@@ -60,9 +35,9 @@ spec:
   type: NodePort
   ports:
   - name: http
-    port: 50000
-    targetPort: 50000
-    nodePort: 50000
+    port: 8081
+    targetPort: 8081
+    nodePort: 8081
     protocol: TCP
   selector:
     app: trainsys-provider

trainsys-provider/src/main/docker/trainsys-provider-trainsys.yaml

@@ -3,23 +3,9 @@ services:
   trainsys-provider:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/trainsys-provider:latest
     ports:
-      - "50000:50000"
+      - "8081:8081"
     networks:
       - agent_network
-    environment:
-      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.240.140
-      - SERVER_PORT=50000
-      - SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.240.140:8848
-      - SPRING_CLOUD_NACOS_CONFIG_SERVER-ADDR=172.16.240.140:8848
-      - SPRING_REDIS_HOST=127.0.0.1
-      - SPRING_REDIS_PORT=6379
-      - SPRING_REDIS_DATABASE=0
-      - SPRING_DATASOURCE_USERNAME=a_LAB01_d23cc850e
-      - SPRING_DATASOURCE_PASSWORD=f9Df4556
-      - SPRING_DATASOURCE_URL=jdbc:mysql://172.16.186.185:3306/a_LAB01_d23cc850e?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&serverTimezone=Asia/Shanghai&allowMultiQueries=true&serverTimezone=GMT%2B8
-      - SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
-      - SPRING_DATASOURCE_DEFAULTSCHEMA=a_LAB01_d23cc850e
-      - NACOS=172.16.240.140:8848
     deploy:
       resources:
            limits: