部署文件优化

mtaDeploy.sh

@@ -138,6 +138,39 @@ progressBar(){
   printf "\n"
 }
 
+#部署文件添加模块
+addMtaModules(){
+  # 要操作的文件名
+  file="mta.yaml"
+
+  # 指定目录
+  # 获取当前脚本的完整路径
+  SCRIPT_PATH=$(readlink -f "$0")
+  # java根目录
+  directory=$(dirname ${SCRIPT_PATH})/app
+  insert_text="#modules name\n"
+  insert_text2="#requires name\n"
+  routeStr="router"
+  for item in "$directory"/*; do
+    name=$(basename "$item")
+      if [ -d "$item" ]; then
+      # 使用 if 语句判断字符串是否与变量相等
+      if [ "$name" = "$routeStr" ]; then
+        echo "$name 相等"
+      else
+        echo "$name 不相等"
+        insert_text="$insert_text  - name: $name\n    type: html5\n    path: app/$name\n    build-parameters:\n      builder: custom\n      commands:\n        - npm run build\n      supported-platforms:\n        [ ]\n      build-result: .\n"
+        insert_text2="$insert_text2        - name: $name\n          artifacts:\n            - './*'\n          target-path: $name\n"
+      fi
+      fi
+  done
+
+  # 要插入的文本
+  # 使用sed命令进行插入操作
+  sed -i "/insert_modules_name/a ${insert_text}" $file
+  sed -i "/insert_requires_name/a ${insert_text2}" $file
+}
+
 #公共接口
 common(){
   logo #logo加载
@@ -211,6 +244,11 @@ common(){
   cat ${xsSecurityFrom} > ${xsSecurity}
   cat ${cdsrcPrivateFrom} > ${cdsrcPrivate}
 
+  echo -e "\033[30;42m 添加模块中，请稍后。。。 \033[0m"
+  starttime101=`date +%s`
+  secondsToTime ${starttime} ${starttime101}
+  addMtaModules
+
   #删除部署文件
   echo -e "\033[30;42m rm -rf gen/mta.mtar 部署文件删除中，请稍后。。。 \033[0m"
   starttime10=`date +%s`

srv/src/main/java/customer/lianchuangjie/common/filter/OperateAuthFilter.java

@@ -212,7 +212,7 @@ public class OperateAuthFilter implements Filter {
             writeResult(response, wrapResult);
             return;
         }
-        /*if (request.getMethod().equals("GET") && ("/index.html".equals(uri))) {// "/index.html"跳转到"/"
+        if (request.getMethod().equals("GET") && ("/index.html".equals(uri))) {// "/index.html"跳转到"/"
             response.setHeader("Cache-Control", "no-cache, no-store, must-revalidate");
             response.setHeader("Pragma", "no-cache");
             response.setHeader("Expires", "0");
@@ -225,7 +225,7 @@ public class OperateAuthFilter implements Filter {
             response.setHeader("Expires", "0");
             request.getServletContext().getRequestDispatcher("/index.html").forward(request, response);//重定向
             return;
-        }*/
+        }
         boolean allowUri = Pattern.matches("(.*/login/.*|.*/odata/v4/.*)", uri);
         //排除用户登录和非Post请求
         if (!allowUri && request.getMethod().equals("POST")) {

tools/mtaFile/pre/mta-from.yaml

@@ -52,17 +52,7 @@ modules:
     requires:
       - name: lianchuangjie-pre-db
 
-  - name: orders
-    type: html5
-    path: app/orders
-    build-parameters:
-      builder: custom
-      commands:
-        - npm run build
-      supported-platforms:
-        [ ]
-      build-result: .
-
+  #insert_modules_name
   - name: lianchuangjie-pre
     type: approuter.nodejs
     path: app\router
@@ -82,10 +72,7 @@ modules:
       - name: lianchuangjie-pre-auth
     build-parameters:
       requires:
-        - name: orders
-          artifacts:
-            - './*'
-          target-path: orders
+        #insert_requires_name
     provides:
       - name: app-api
         properties: