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

config.xml

@@ -55,14 +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
-      sed -i "s#dstimage#$para5#g" pom.xml 
-      sed -i "s#dstimage#$para5#g" src/main/docker/trainsys-provider-trainsys.yaml 
-      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/liquibase/cn/ibizlab/trainsys/DEFAULT/h2_table.xml

@@ -238,6 +238,8 @@
             </column>
             <column name="REGINFONAME" remarks="学员登记信息名称" type="VARCHAR(200)">
             </column>
+            <column name="STUDENTID" remarks="学生标识" type="VARCHAR(100)">
+            </column>
             <column name="STUNO" remarks="学员编号" type="VARCHAR(100)">
             </column>
             <column name="UPDATEDATE" remarks="更新时间" type="DATETIME">

trainsys-core/src/main/resources/liquibase/h2_table.xml

@@ -194,7 +194,7 @@
     </changeSet>
 
     <!--输出实体[REGINFO]数据结构 -->
-    <changeSet author="root" id="tab-reginfo-65-8">
+    <changeSet author="root" id="tab-reginfo-69-8">
         <createTable tableName="T_REGINFO">
                 <column name="UPDATEDATE" remarks="" type="DATETIME">
                 </column>
@@ -225,6 +225,8 @@
                 </column>
                 <column name="ADDRESS" remarks="" type="VARCHAR(100)">
                 </column>
+                <column name="STUDENTID" remarks="" type="VARCHAR(100)">
+                </column>
         </createTable>
     </changeSet>
 
@@ -262,7 +264,7 @@
     </changeSet>
 
     <!--输出实体[STUDENT]数据结构 -->
-    <changeSet author="root" id="tab-student-28-10">
+    <changeSet author="root" id="tab-student-34-10">
         <createTable tableName="T_STUDENT">
                 <column name="CREATEMAN" remarks="" type="VARCHAR(60)">
                 </column>
@@ -300,4 +302,9 @@
        <addForeignKeyConstraint baseColumnNames="BXDID" baseTableName="T_BXDMX" constraintName="F821DB7B87E31B879F" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="BXDID" referencedTableName="T_BXD" validate="true"/>
     </changeSet>
 
+    <!--输出实体[REGINFO]外键关系 -->
+    <changeSet author="root" id="fk-reginfo-69-12">
+       <addForeignKeyConstraint baseColumnNames="STUDENTID" baseTableName="T_REGINFO" constraintName="F328B6E61632896255" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="STUDENTID" referencedTableName="T_STUDENT" validate="true"/>
+    </changeSet>
+
 </databaseChangeLog>

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/common/PSDATAENTITIES/Reginfo.json

@@ -225,6 +225,9 @@
     }, {
       "name" : "ADDRESS",
       "codeName" : "Address"
+    }, {
+      "name" : "STUDENTID",
+      "codeName" : "StudentId"
     } ],
     "codeName" : "Table",
     "dynaModelFilePath" : "PSMODULES/common/PSDATAENTITIES/Reginfo/PSDETABLES/Table.json",
@@ -1563,6 +1566,117 @@
     "stdDataType" : 25,
     "stringLength" : 100,
     "valueFormat" : "%1$s"
+  }, {
+    "getAllPSDEFDTColumns" : [ {
+      "columnName" : "STUDENTID",
+      "dBType" : "MYSQL5",
+      "name" : "STUDENTID",
+      "queryCodeExp" : "t1.`STUDENTID`",
+      "standardColumnName" : "`STUDENTID`"
+    } ],
+    "getAllPSDEFSearchModes" : [ {
+      "codeName" : "N_STUDENTID_EQ",
+      "name" : "N_STUDENTID_EQ",
+      "stdDataType" : 25,
+      "valueOP" : "EQ"
+    } ],
+    "getAllPSDEFUIModes" : [ {
+      "codeName" : "MobileDefault",
+      "name" : "[STUDENTID][学生标识]移动端默认",
+      "getPSDEFFormItem" : {
+        "codeName" : "MobileDefault",
+        "editorType" : "HIDDEN",
+        "name" : "[STUDENTID][学生标识]移动端默认",
+        "getRefPSDataEntity" : {
+          "modelref" : true,
+          "path" : "PSMODULES/common/PSDATAENTITIES/Student.json"
+        },
+        "stringLength" : 100,
+        "uIMode" : "MOBILEDEFAULT",
+        "mobileMode" : true
+      },
+      "type" : "MOBILEDEFAULT",
+      "mobileMode" : true
+    }, {
+      "codeName" : "Default",
+      "name" : "[STUDENTID][学生标识]",
+      "getPSDEFFormItem" : {
+        "codeName" : "Default",
+        "editorType" : "HIDDEN",
+        "name" : "[STUDENTID][学生标识]",
+        "getRefPSDataEntity" : {
+          "modelref" : true,
+          "path" : "PSMODULES/common/PSDATAENTITIES/Student.json"
+        },
+        "stringLength" : 100,
+        "uIMode" : "DEFAULT"
+      },
+      "type" : "DEFAULT"
+    } ],
+    "getAllPSDEFValueRules" : [ {
+      "codeName" : "Default",
+      "name" : "默认规则",
+      "getPSDEFVRGroupCondition" : {
+        "condOp" : "AND",
+        "condType" : "GROUP",
+        "name" : "默认组",
+        "getPSDEFVRConditions" : [ {
+          "condType" : "STRINGLENGTH",
+          "dEFName" : "STUDENTID",
+          "maxValue" : 100,
+          "name" : "默认字符串长度",
+          "ruleInfo" : "内容长度必须小于等于[100]",
+          "includeMaxValue" : true,
+          "includeMinValue" : false,
+          "keyCond" : true
+        } ],
+        "ruleInfo" : "内容长度必须小于等于[100]"
+      },
+      "ruleInfo" : "内容长度必须小于等于[100]",
+      "checkDefault" : true,
+      "defaultMode" : true,
+      "enableBackend" : true,
+      "enableFront" : true
+    } ],
+    "codeName" : "StudentId",
+    "dEFType" : 1,
+    "dataType" : "PICKUP",
+    "importOrder" : 1000,
+    "length" : 100,
+    "logicName" : "学生标识",
+    "name" : "STUDENTID",
+    "getPSDEDBTable" : {
+      "modelref" : true,
+      "path" : "PSMODULES/common/PSDATAENTITIES/Reginfo/PSDETABLES/Table.json"
+    },
+    "getPSDER" : {
+      "modelref" : true,
+      "path" : "PSMODULES/common/PSDATAENTITIES/Reginfo/PSDERS/DER1N_REGINFO_STUDENT_STUDENTID.json"
+    },
+    "getPSSysDBColumn" : {
+      "modelref" : true,
+      "id" : "STUDENTID"
+    },
+    "getRealPSDEField" : {
+      "name" : "STUDENTID",
+      "codeName" : "StudentId"
+    },
+    "getRealPSDataEntity" : {
+      "modelref" : true,
+      "path" : "PSMODULES/common/PSDATAENTITIES/Student.json"
+    },
+    "getRelatedPSDEField" : {
+      "name" : "STUDENTID",
+      "codeName" : "StudentId"
+    },
+    "getRelatedPSDataEntity" : {
+      "modelref" : true,
+      "path" : "PSMODULES/common/PSDATAENTITIES/Student.json"
+    },
+    "stdDataType" : 25,
+    "stringLength" : 100,
+    "valueFormat" : "%1$s",
+    "linkDEField" : true
   } ],
   "getAllPSDEMethodDTOs" : [ {
     "name" : "ReginfoDTO",
@@ -1701,6 +1815,17 @@
       "stdDataType" : 25,
       "stringLength" : 100,
       "type" : "SIMPLE"
+    }, {
+      "logicName" : "学生标识",
+      "name" : "StudentId",
+      "getPSDEField" : {
+        "name" : "STUDENTID",
+        "codeName" : "StudentId"
+      },
+      "sourceType" : "DEFIELD",
+      "stdDataType" : 25,
+      "stringLength" : 100,
+      "type" : "SIMPLE"
     }, {
       "logicName" : "更新时间",
       "name" : "UpdateDate",
@@ -1762,6 +1887,21 @@
       "stdDataType" : 25,
       "stringLength" : 200,
       "type" : "SIMPLE"
+    }, {
+      "logicName" : "学生标识",
+      "name" : "N_STUDENTID_EQ",
+      "getPSDEFSearchMode" : {
+        "modelref" : true,
+        "id" : "N_STUDENTID_EQ"
+      },
+      "getPSDEField" : {
+        "name" : "STUDENTID",
+        "codeName" : "StudentId"
+      },
+      "sourceType" : "DEFSEARCHMODE",
+      "stdDataType" : 25,
+      "stringLength" : 100,
+      "type" : "SIMPLE"
     } ],
     "sourceType" : "DE",
     "type" : "DEFILTER",
@@ -2119,6 +2259,32 @@
     "name" : "REGINFONAME",
     "codeName" : "ReginfoName"
   },
+  "getMinorPSDERs" : [ {
+    "codeName" : "StudentToReginfo",
+    "dERType" : "DER1N",
+    "dynaModelFilePath" : "PSMODULES/common/PSDATAENTITIES/Reginfo/PSDERS/DER1N_REGINFO_STUDENT_STUDENTID.json",
+    "fKeyName" : "F328B6E61632896255",
+    "getMajorPSDataEntity" : {
+      "modelref" : true,
+      "path" : "PSMODULES/common/PSDATAENTITIES/Student.json"
+    },
+    "masterOrder" : -1,
+    "masterRS" : 0,
+    "getMinorPSDataEntity" : {
+      "modelref" : true,
+      "path" : "PSMODULES/common/PSDATAENTITIES/Reginfo.json"
+    },
+    "name" : "DER1N_REGINFO_STUDENT_STUDENTID",
+    "orderValue" : 100,
+    "getPSPickupDEField" : {
+      "name" : "STUDENTID",
+      "codeName" : "StudentId"
+    },
+    "pickupDEFName" : "STUDENTID",
+    "removeActionType" : -1,
+    "removeOrder" : 0,
+    "enableFKey" : true
+  } ],
   "name" : "REGINFO",
   "getOrgIdPSDEField" : {
     "name" : "ORGID",

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/common/PSDATAENTITIES/Reginfo/PSDEDATAQUERIES/Default/PSDEDQCODES/MYSQL5.json

@@ -34,6 +34,9 @@
   }, {
     "expression" : "t1.`REGINFONAME`",
     "name" : "REGINFONAME"
+  }, {
+    "expression" : "t1.`STUDENTID`",
+    "name" : "STUDENTID"
   }, {
     "expression" : "t1.`STUNO`",
     "name" : "STUNO"
@@ -44,6 +47,6 @@
     "expression" : "t1.`UPDATEMAN`",
     "name" : "UPDATEMAN"
   } ],
-  "queryCode" : "SELECT\nt1.`ADDRESS`,\nt1.`AGE`,\nt1.`CREATEDATE`,\nt1.`CREATEMAN`,\nt1.`DEPARTMENT`,\nt1.`DEPTID`,\nt1.`FIELD`,\nt1.`NAME`,\nt1.`ORGID`,\nt1.`REGINFOID`,\nt1.`REGINFONAME`,\nt1.`STUNO`,\nt1.`UPDATEDATE`,\nt1.`UPDATEMAN`\nFROM `T_REGINFO` t1 \n",
+  "queryCode" : "SELECT\nt1.`ADDRESS`,\nt1.`AGE`,\nt1.`CREATEDATE`,\nt1.`CREATEMAN`,\nt1.`DEPARTMENT`,\nt1.`DEPTID`,\nt1.`FIELD`,\nt1.`NAME`,\nt1.`ORGID`,\nt1.`REGINFOID`,\nt1.`REGINFONAME`,\nt1.`STUDENTID`,\nt1.`STUNO`,\nt1.`UPDATEDATE`,\nt1.`UPDATEMAN`\nFROM `T_REGINFO` t1 \n",
   "id" : "PSMODULES/common/PSDATAENTITIES/Reginfo/PSDEDATAQUERIES/Default/PSDEDQCODES/MYSQL5.json"
 }
\ No newline at end of file

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/common/PSDATAENTITIES/Reginfo/PSDEDATAQUERIES/View/PSDEDQCODES/MYSQL5.json

@@ -34,6 +34,9 @@
   }, {
     "expression" : "t1.`REGINFONAME`",
     "name" : "REGINFONAME"
+  }, {
+    "expression" : "t1.`STUDENTID`",
+    "name" : "STUDENTID"
   }, {
     "expression" : "t1.`STUNO`",
     "name" : "STUNO"
@@ -44,6 +47,6 @@
     "expression" : "t1.`UPDATEMAN`",
     "name" : "UPDATEMAN"
   } ],
-  "queryCode" : "SELECT\nt1.`ADDRESS`,\nt1.`AGE`,\nt1.`CREATEDATE`,\nt1.`CREATEMAN`,\nt1.`DEPARTMENT`,\nt1.`DEPTID`,\nt1.`FIELD`,\nt1.`NAME`,\nt1.`ORGID`,\nt1.`REGINFOID`,\nt1.`REGINFONAME`,\nt1.`STUNO`,\nt1.`UPDATEDATE`,\nt1.`UPDATEMAN`\nFROM `T_REGINFO` t1 \n",
+  "queryCode" : "SELECT\nt1.`ADDRESS`,\nt1.`AGE`,\nt1.`CREATEDATE`,\nt1.`CREATEMAN`,\nt1.`DEPARTMENT`,\nt1.`DEPTID`,\nt1.`FIELD`,\nt1.`NAME`,\nt1.`ORGID`,\nt1.`REGINFOID`,\nt1.`REGINFONAME`,\nt1.`STUDENTID`,\nt1.`STUNO`,\nt1.`UPDATEDATE`,\nt1.`UPDATEMAN`\nFROM `T_REGINFO` t1 \n",
   "id" : "PSMODULES/common/PSDATAENTITIES/Reginfo/PSDEDATAQUERIES/View/PSDEDQCODES/MYSQL5.json"
 }
\ No newline at end of file

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/common/PSDATAENTITIES/Reginfo/PSDERS/DER1N_REGINFO_STUDENT_STUDENTID.json

+{
+  "codeName" : "StudentToReginfo",
+  "dERType" : "DER1N",
+  "dynaModelFilePath" : "PSMODULES/common/PSDATAENTITIES/Reginfo/PSDERS/DER1N_REGINFO_STUDENT_STUDENTID.json",
+  "fKeyName" : "F328B6E61632896255",
+  "getMajorPSDataEntity" : {
+    "modelref" : true,
+    "path" : "PSMODULES/common/PSDATAENTITIES/Student.json"
+  },
+  "masterOrder" : -1,
+  "masterRS" : 0,
+  "getMinorPSDataEntity" : {
+    "modelref" : true,
+    "path" : "PSMODULES/common/PSDATAENTITIES/Reginfo.json"
+  },
+  "name" : "DER1N_REGINFO_STUDENT_STUDENTID",
+  "orderValue" : 100,
+  "getPSPickupDEField" : {
+    "name" : "STUDENTID",
+    "codeName" : "StudentId"
+  },
+  "pickupDEFName" : "STUDENTID",
+  "removeActionType" : -1,
+  "removeOrder" : 0,
+  "enableFKey" : true
+}
\ No newline at end of file

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/common/PSDATAENTITIES/Student.json

@@ -1982,6 +1982,32 @@
     "name" : "STUDENTNAME",
     "codeName" : "StudentName"
   },
+  "getMajorPSDERs" : [ {
+    "codeName" : "StudentToReginfo",
+    "dERType" : "DER1N",
+    "dynaModelFilePath" : "PSMODULES/common/PSDATAENTITIES/Reginfo/PSDERS/DER1N_REGINFO_STUDENT_STUDENTID.json",
+    "fKeyName" : "F328B6E61632896255",
+    "getMajorPSDataEntity" : {
+      "modelref" : true,
+      "path" : "PSMODULES/common/PSDATAENTITIES/Student.json"
+    },
+    "masterOrder" : -1,
+    "masterRS" : 0,
+    "getMinorPSDataEntity" : {
+      "modelref" : true,
+      "path" : "PSMODULES/common/PSDATAENTITIES/Reginfo.json"
+    },
+    "name" : "DER1N_REGINFO_STUDENT_STUDENTID",
+    "orderValue" : 100,
+    "getPSPickupDEField" : {
+      "name" : "STUDENTID",
+      "codeName" : "StudentId"
+    },
+    "pickupDEFName" : "STUDENTID",
+    "removeActionType" : -1,
+    "removeOrder" : 0,
+    "enableFKey" : true
+  } ],
   "name" : "STUDENT",
   "getOrgIdPSDEField" : {
     "name" : "ORGID",

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo.json

@@ -316,6 +316,12 @@
     "name" : "ADDRESS",
     "stdDataType" : 25,
     "stringLength" : 100
+  }, {
+    "codeName" : "StudentId",
+    "logicName" : "学生标识",
+    "name" : "STUDENTID",
+    "stdDataType" : 25,
+    "stringLength" : 100
   } ],
   "getAllPSAppDEMethodDTOs" : [ {
     "codeName" : "ReginfoDTO",
@@ -467,6 +473,18 @@
       "sourceType" : "DEFIELD",
       "stdDataType" : 25,
       "type" : "SIMPLE"
+    }, {
+      "codeName" : "StudentId",
+      "logicName" : "学生标识",
+      "name" : "StudentId",
+      "orderValue" : 1000,
+      "getPSAppDEField" : {
+        "name" : "STUDENTID",
+        "codeName" : "StudentId"
+      },
+      "sourceType" : "DEFIELD",
+      "stdDataType" : 25,
+      "type" : "SIMPLE"
     }, {
       "codeName" : "UpdateDate",
       "logicName" : "更新时间",
@@ -523,6 +541,18 @@
       "sourceType" : "DEFSEARCHMODE",
       "stdDataType" : 25,
       "type" : "SIMPLE"
+    }, {
+      "codeName" : "N_STUDENTID_EQ",
+      "logicName" : "学生标识",
+      "name" : "N_STUDENTID_EQ",
+      "orderValue" : 99999,
+      "getPSAppDEField" : {
+        "name" : "STUDENTID",
+        "codeName" : "StudentId"
+      },
+      "sourceType" : "DEFSEARCHMODE",
+      "stdDataType" : 25,
+      "type" : "SIMPLE"
     } ],
     "sourceType" : "DE",
     "type" : "DEFILTER"

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo/PSGRIDS/Main.json

@@ -3,53 +3,11 @@
   "codeName" : "Main",
   "columnEnableLink" : 2,
   "controlType" : "GRID",
-  "getCreatePSControlAction" : {
-    "actionName" : "Create",
-    "actionType" : "DEACTION",
-    "dataAccessAction" : "CREATE",
-    "name" : "create",
-    "getPSAppDEMethod" : {
-      "modelref" : true,
-      "id" : "Create"
-    },
-    "getPSAppDataEntity" : {
-      "modelref" : true,
-      "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo.json"
-    }
-  },
   "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo/PSGRIDS/Main.json",
   "getFetchPSControlAction" : {
     "modelref" : true,
     "id" : "fetch"
   },
-  "getGetDraftPSControlAction" : {
-    "actionName" : "GetDraft",
-    "actionType" : "DEACTION",
-    "dataAccessAction" : "CREATE",
-    "name" : "loaddraft",
-    "getPSAppDEMethod" : {
-      "modelref" : true,
-      "id" : "GetDraft"
-    },
-    "getPSAppDataEntity" : {
-      "modelref" : true,
-      "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo.json"
-    }
-  },
-  "getGetPSControlAction" : {
-    "actionName" : "Get",
-    "actionType" : "DEACTION",
-    "dataAccessAction" : "READ",
-    "name" : "load",
-    "getPSAppDEMethod" : {
-      "modelref" : true,
-      "id" : "Get"
-    },
-    "getPSAppDataEntity" : {
-      "modelref" : true,
-      "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo.json"
-    }
-  },
   "groupMode" : "NONE",
   "hookEventNames" : [ "ROWDBLCLICK", "SELECTIONCHANGE", "REMOVE", "LOAD", "BEFORELOAD" ],
   "logicName" : "主表格",
@@ -329,6 +287,13 @@
       "codeName" : "ReginfoId"
     },
     "dataAccessAction" : true
+  }, {
+    "dataType" : 25,
+    "name" : "studentid",
+    "getPSAppDEField" : {
+      "name" : "STUDENTID",
+      "codeName" : "StudentId"
+    }
   }, {
     "dataType" : 25,
     "name" : "srfmajortext",
@@ -493,28 +458,14 @@
     }
   },
   "sortMode" : "REMOTE",
-  "getUpdatePSControlAction" : {
-    "actionName" : "Update",
-    "actionType" : "DEACTION",
-    "dataAccessAction" : "UPDATE",
-    "name" : "update",
-    "getPSAppDEMethod" : {
-      "modelref" : true,
-      "id" : "Update"
-    },
-    "getPSAppDataEntity" : {
-      "modelref" : true,
-      "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo.json"
-    }
-  },
   "hasWFDataItems" : false,
   "enableColFilter" : false,
   "enableCustomized" : true,
   "enableGroup" : false,
   "enablePagingBar" : true,
-  "enableRowEdit" : true,
+  "enableRowEdit" : false,
   "enableRowEditOrder" : false,
-  "enableRowNew" : true,
+  "enableRowNew" : false,
   "forceFit" : false,
   "hideHeader" : false,
   "noSort" : false,

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

@@ -758,6 +758,13 @@
         "codeName" : "ReginfoId"
       },
       "dataAccessAction" : true
+    }, {
+      "dataType" : 25,
+      "name" : "studentid",
+      "getPSAppDEField" : {
+        "name" : "STUDENTID",
+        "codeName" : "StudentId"
+      }
     }, {
       "dataType" : 25,
       "name" : "srfmajortext",

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

@@ -1188,6 +1188,12 @@
     "viewType" : "DEGRIDVIEW",
     "resource" : "BXDMX",
     "view" : "GridView"
+  }, {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/ReginfoGridView.json",
+    "viewType" : "DEGRIDVIEW",
+    "resource" : "Reginfo",
+    "view" : "GridView"
   }, {
     "modelref" : true,
     "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/BookTypeEditView.json",
@@ -2299,6 +2305,13 @@
             "codeName" : "ReginfoId"
           },
           "dataAccessAction" : true
+        }, {
+          "dataType" : 25,
+          "name" : "studentid",
+          "getPSAppDEField" : {
+            "name" : "STUDENTID",
+            "codeName" : "StudentId"
+          }
         }, {
           "dataType" : 25,
           "name" : "srfmajortext",
@@ -12330,6 +12343,12 @@
         "name" : "ADDRESS",
         "stdDataType" : 25,
         "stringLength" : 100
+      }, {
+        "codeName" : "StudentId",
+        "logicName" : "学生标识",
+        "name" : "STUDENTID",
+        "stdDataType" : 25,
+        "stringLength" : 100
       } ],
       "getAllPSAppDEMethodDTOs" : [ {
         "codeName" : "ReginfoDTO",
@@ -12481,6 +12500,18 @@
           "sourceType" : "DEFIELD",
           "stdDataType" : 25,
           "type" : "SIMPLE"
+        }, {
+          "codeName" : "StudentId",
+          "logicName" : "学生标识",
+          "name" : "StudentId",
+          "orderValue" : 1000,
+          "getPSAppDEField" : {
+            "name" : "STUDENTID",
+            "codeName" : "StudentId"
+          },
+          "sourceType" : "DEFIELD",
+          "stdDataType" : 25,
+          "type" : "SIMPLE"
         }, {
           "codeName" : "UpdateDate",
           "logicName" : "更新时间",
@@ -12537,6 +12568,18 @@
           "sourceType" : "DEFSEARCHMODE",
           "stdDataType" : 25,
           "type" : "SIMPLE"
+        }, {
+          "codeName" : "N_STUDENTID_EQ",
+          "logicName" : "学生标识",
+          "name" : "N_STUDENTID_EQ",
+          "orderValue" : 99999,
+          "getPSAppDEField" : {
+            "name" : "STUDENTID",
+            "codeName" : "StudentId"
+          },
+          "sourceType" : "DEFSEARCHMODE",
+          "stdDataType" : 25,
+          "type" : "SIMPLE"
         } ],
         "sourceType" : "DE",
         "type" : "DEFILTER"

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSDBSCHEMES/DEFAULT.json

@@ -703,6 +703,13 @@
       "name" : "REGINFONAME",
       "stdDataType" : 25,
       "nullable" : true
+    }, {
+      "codeName" : "STUDENTID",
+      "length" : 100,
+      "logicName" : "学生标识",
+      "name" : "STUDENTID",
+      "stdDataType" : 25,
+      "nullable" : true
     }, {
       "codeName" : "STUNO",
       "length" : 100,
@@ -725,6 +732,19 @@
       "stdDataType" : 25,
       "nullable" : true
     } ],
+    "getAllPSSysDBIndices" : [ {
+      "getAllPSSysDBIndexColumns" : [ {
+        "name" : "STUDENTID",
+        "getPSSysDBColumn" : {
+          "modelref" : true,
+          "id" : "STUDENTID"
+        }
+      } ],
+      "codeName" : "IF_F328B6E61632896",
+      "indexType" : "NORMAL",
+      "name" : "DER1N_REGINFO_STUDENT_STUDENTID",
+      "sourceType" : "DER"
+    } ],
     "codeName" : "T_REGINFO",
     "logicName" : "学员登记信息",
     "name" : "T_REGINFO",

trainsys-provider/pom.xml

@@ -34,7 +34,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: dstimage
     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: