闵教院更新内容, 测试删除, module恢复

mjava-minjiaoyuan/src/main/java/com/malk/minjiaoyuan/controller/MJYController.java

@@ -489,7 +489,7 @@ public class MJYController {
         ydParam.setFormInstanceId("");
         // 删除评选汇总
         ydParam.setFormUuid("FORM-AC666081555ANZAZ6D4IVCQLY5Y12P4ZSRTGLWD");
-        ydParam.setSearchFieldJson(JSON.toJSONString(UtilMap.map("selectField_lgi7oaqo, selectField_lggd61a7", new Object[]{data.get("schoolShort"), data.get("period")})));
+        ydParam.setSearchFieldJson(JSON.toJSONString(UtilMap.map("selectField_lgi7oaqo, selectField_lggd61a7", data.get("schoolShort"), data.get("period"))));
         String processInstanceId = ((List<String>) ydClient.queryData(ydParam, YDConf.FORM_QUERY.retrieve_search_process_id).getData()).get(0);
         List<Map> details = mjyService.getCollectData(processInstanceId);
         Optional optional = details.stream().filter(item -> item.get("textField_lhxaovhb").equals(data.get("serialNumber"))).findAny();

mjava-minjiaoyuan/target/classes/application-dev.yml

@@ -0,0 +1,65 @@
+# 环境配置
+server:
+  port: 9001
+  servlet:
+    context-path: /api
+
+# condition
+spel:
+  scheduling: false        # 定时任务是否执行
+  multiSource: false       # 是否多数据源配置
+
+spring:
+  # database
+  datasource:
+    driver-class-name: com.mysql.cj.jdbc.Driver
+    username: root
+    password: mu123
+    url: jdbc:mysql://127.0.0.1:3306/mjava?serverTimezone=Asia/Shanghai&useUnicode=yes&characterEncoding=UTF-8&useSSL=true
+  jpa:
+    hibernate:
+      ddl-auto: none      # JPA对表没有任何操作
+    show-sql: true
+    database: MYSQL
+    database-platform: org.hibernate.dialect.MySQL57Dialect
+
+# filepath
+file:
+  path:
+    file: /Users/malk/service/_Tool/var/mjava/tmp//file/
+    image: /Users/malk/service/_Tool/var/mjava/tmp//image/
+    tmp: /Users/malk/service/_Tool/var/mjava/tmp/
+  source:
+    fonts: /Users/malk/service/_Tool/fonts/simsun.ttc
+logging:
+  file:
+    path: /Users/malk/service/_Tool/var/mjava/log
+
+## dingtalk
+#dingtalk:
+#  agentId: 2550726809
+#  appKey: dingtift81fcga4rmrmk
+#  appSecret: Oa_S7CYYAfa3CurDbaTk1CBlSvfpcFs6ROjt8OTS8fDsjnS45X1CmxGgWbpJ8lI0
+#  corpId: dingcc1b1ffad0d5ca1d
+#  aesKey:
+#  token:
+#
+## aliwork
+#aliwork:
+#  appType: APP_GHMWTMHNZFEX24QOUC63
+#  systemToken: 4A9667B1NXM9XUSBDNR208ZMA2UQ20A99XEGLIC
+
+
+# dingtalk
+dingtalk:
+  agentId: 2559056539
+  appKey: dingpd6ukkzzcbsczp0n
+  appSecret: 7tTurS8akT9OYegOIe9sBpqdLXOxNCtlNgIwqdolH3VkTxupXzN_fQwASzBQHE6A
+  corpId: ding0f12f2ed788f674ef5bf40eda33b7ba0
+  aesKey:
+  token:
+
+# aliwork
+aliwork:
+  appType: APP_AD5T4ITVLW40MKR7V3LM
+  systemToken: 7N5664D1GX5A9VWICV06RCOARNMW273ZSRTGL7N7

mjava-minjiaoyuan/target/classes/application-prod.yml

@@ -0,0 +1,47 @@
+# 环境配置
+server:
+  port: 9007
+
+# condition
+spel:
+  scheduling: true        # 定时任务是否执行
+  multiSource: false      # 是否多数据源配置
+
+spring:
+  # database
+  datasource:
+    driver-class-name: com.mysql.cj.jdbc.Driver
+    username: root
+    password: cp-root@2022++
+    url: jdbc:mysql://47.97.181.40:3306/mjava?serverTimezone=Asia/Shanghai&useUnicode=yes&characterEncoding=UTF-8&useSSL=true
+  jpa:
+    database: MYSQL
+    database-platform: org.hibernate.dialect.MySQL57Dialect
+
+## dingtalk
+#dingtalk:
+#  agentId: 2550726809
+#  appKey: dingtift81fcga4rmrmk
+#  appSecret: Oa_S7CYYAfa3CurDbaTk1CBlSvfpcFs6ROjt8OTS8fDsjnS45X1CmxGgWbpJ8lI0
+#  corpId: dingcc1b1ffad0d5ca1d
+#  aesKey:
+#  token:
+#
+## aliwork
+#aliwork:
+#  appType: APP_GHMWTMHNZFEX24QOUC63
+#  systemToken: 4A9667B1NXM9XUSBDNR208ZMA2UQ20A99XEGLIC
+
+# dingtalk
+dingtalk:
+  agentId: 2559056539
+  appKey: dingpd6ukkzzcbsczp0n
+  appSecret: 7tTurS8akT9OYegOIe9sBpqdLXOxNCtlNgIwqdolH3VkTxupXzN_fQwASzBQHE6A
+  corpId: ding0f12f2ed788f674ef5bf40eda33b7ba0
+  aesKey:
+  token:
+
+# aliwork
+aliwork:
+  appType: APP_AD5T4ITVLW40MKR7V3LM
+  systemToken: 7N5664D1GX5A9VWICV06RCOARNMW273ZSRTGL7N7

mjava-minjiaoyuan/target/test-classes/server.sh

@@ -0,0 +1,35 @@
+#!/bin/bash
+appname='mjava-minjiaoyuan'
+if [ "$1" == "dev" ]; then
+  java -Xms256m -Xmx256m -jar $appname.jar --spring.profiles.active=dev
+else
+  if [ "$1" == "start" ]; then
+    nohup java -Xms256m -Xmx256m -jar $appname.jar &
+    echo "server prod is starting"
+  else
+    if [ "$1" == "test" ]; then
+      nohup java -Xms256m -Xmx256m -jar $appname.jar --spring.profiles.active=test &
+      echo "server test is starting"
+    else
+      if [ "$1" == "stop" ]; then
+        PID=$(ps -ef | grep $appname.jar | grep -v grep | awk '{ print $2 }')
+        if [ -z "$PID" ]; then
+          echo "server is already stopped"
+        else
+          echo kill $PID
+          kill $PID
+        fi
+      else
+        if [ "$1" == "status" ]; then
+          PID=$(ps -ef | grep $appname.jar | grep -v grep | awk '{ print $2 }')
+          if [ -z "$PID" ]; then
+            echo "server is stopped"
+          else
+            echo "server is running"
+            echo $PID
+          fi
+        fi
+      fi
+    fi
+  fi
+fi