From 332c3ab95fe132ebc313d9c88d64e27ca00d3b73 Mon Sep 17 00:00:00 2001
From: wxy <14293288+zysysys@user.noreply.gitee.com>
Date: Tue, 3 Sep 2024 10:36:10 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E6=94=AF=E4=BB=98?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2URL=E4=B8=AD=E7=9A=84=E5=8D=8F=E8=AE=AE?=
 =?UTF-8?q?=E6=8B=BC=E5=86=99=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

在支付页面的同步跳转地址中，协议部分从"http://"错误地写为了"http//"。此提交已修正该错误，确保跳转地址正确格式化为"http://172.13.1.1/money/money"。
---
 src/views/money/pay/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/money/pay/index.vue b/src/views/money/pay/index.vue
index e9bd4b7..ba0c9fd 100644
--- a/src/views/money/pay/index.vue
+++ b/src/views/money/pay/index.vue
@@ -44,7 +44,7 @@ export default {
       addSysUser: {},
       disabled: false,
       // 同步跳转页面地址
-      returnUrl:'http://172.13.1.1//money/money',
+      returnUrl:'http://172.13.1.1/money/money',
       //充值参数
       rechargeParams: {
         "totalAmt": '', //金额

From e99340608ad556f79d4ce72f115640288ce62d18 Mon Sep 17 00:00:00 2001
From: Qin Dong Ming <2720806930@qq.com>
Date: Tue, 3 Sep 2024 15:08:15 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E7=94=9F=E6=88=90=E5=BC=95=E6=93=8E?=
 =?UTF-8?q?=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/engine/engine.js          |  2 +-
 src/views/engine/engine/index.vue |  3 +-
 src/views/engine/engine/list.vue  | 96 ++++++-------------------------
 3 files changed, 22 insertions(+), 79 deletions(-)

diff --git a/src/api/engine/engine.js b/src/api/engine/engine.js
index 1c3b1d6..e7ce071 100644
--- a/src/api/engine/engine.js
+++ b/src/api/engine/engine.js
@@ -122,7 +122,7 @@ export  function sel(id){
 //根据版本id查询版本信息
 export  function generate(data){
   return request({
-    url: "/engine/version/generate",
+    url: "/engine/engine/generate",
     method: "post",
     data:data
   })
diff --git a/src/views/engine/engine/index.vue b/src/views/engine/engine/index.vue
index c70cef2..6765d46 100644
--- a/src/views/engine/engine/index.vue
+++ b/src/views/engine/engine/index.vue
@@ -628,11 +628,12 @@ export default {
 
     engineRuleMaintenance(row) {
 
+
       this.$router.push({
 
         path: 'list',
 
-        query: {id: row.id}
+        query: {"id": row.id}
 
       })
 
diff --git a/src/views/engine/engine/list.vue b/src/views/engine/engine/list.vue
index 35c5848..62cbcd8 100644
--- a/src/views/engine/engine/list.vue
+++ b/src/views/engine/engine/list.vue
@@ -5,7 +5,7 @@
     <el-button type="text" @click="addVersion()">新增</el-button>
 
     <el-dialog title="添加版本信息" :visible.sync="dialogFormVisible">
-
+          {{versions}}
       <el-form :model="versions">
 
         <el-form-item label="版本类名" :label-width="formLabelWidth">
@@ -51,7 +51,7 @@
         </el-form-item>
         <!--        ref="mycode" "  class="code"-->
         <div v-show="opens">
-          <codemirror :value="this.javaClass" :options="cmOptions" >
+          <codemirror v-model="versions.ruleContent"   :value="this.versions.ruleContent" :options="cmOptions" >
           </codemirror>
         </div>
 
@@ -120,12 +120,6 @@
 
         <template slot-scope="scope">
 
-          <el-button @click.native.prevent="del(scope.row.id)" type="text" size="small">
-
-            删除
-
-          </el-button>
-
           <el-button v-show="scope.row.isActivate==1" @click="forbiddenEngines(scope.row.id)" type="text" size="small">
 
             关闭引擎
@@ -260,48 +254,6 @@ export default {
       },
 
       opens: false,
-      //
-      // javaClass: "package com.muyu.rule.engine.custom;\n" +
-      //
-      //   "\n" +
-      //
-      //   "import com.muyu.engine.action.ActionDiscard;\n" +
-      //
-      //   "import com.muyu.engine.scope.DataModelEngine;\n" +
-      //
-      //   "\n" +
-      //
-      //   "/**\n" +
-      //
-      //   " * @Author: qdm\n" +
-      //
-      //   new Date+
-      //
-      //   "\n * @Description: 没有描述\n" +
-      //
-      //   " * @Version: 2.2\n" +
-      //
-      //   " */\n" +
-      //
-      //   "public class engine_80 extends DataModelEngine {\n" +
-      //
-      //   "    @Override\n" +
-      //
-      //   "    public void execution () {\n" +
-      //
-      //   "        Object value = getValue();\n" +
-      //
-      //   "\n" +
-      //
-      //   "        if (value == null || \"\".equals(value) || \"null\".equals(value)) {\n" +
-      //
-      //   "            throw new ActionDiscard();\n" +
-      //
-      //   "        }\n" +
-      //
-      //   "    }\n" +
-      //
-      //   "}",
 
       title: "",
 
@@ -315,37 +267,14 @@ export default {
 
         testStatus: '未测试',
 
-        status: '初始化'
+        status: '初始化',
+
+        ruleContent:''
+
       },
 
       cmOptions: {
 
-        // autorefresh: true,
-
-        // tabSize: 4,
-
-        // mode: 'text/x-properties',
-
-        // theme: 'ayu-mirage',
-
-        // line: true,
-
-        // viewportMargin: Infinity, //处理高度自适应时搭配使用
-
-        // highlightDifferences: true,
-
-        // autofocus: false,
-
-        // indentUnit: 2,
-
-        // smartIndent: true,
-
-        // readOnly: true, // 只读
-
-        // showCursorWhenSelecting: true,
-
-        // firstLineNumber: 1
-
         lineNumbers: true, // 显示行号
 
         mode: 'text/x-yaml', // 语法model
@@ -374,12 +303,25 @@ export default {
 
     showCode() {
 
+      this.versions.isActivate = 1
+
+      this.versions.testStatus = 1
+
+      this.versions.status = 1
+
+      this.versions.id = this.$route.query.id
+
+
       generate(this.versions).then(res =>{
 
+        this.versions.ruleContent = res.ruleContent;
+
         this.$message.success(res.msg || "成功");
 
       })
 
+      this.opens=true
+
     },
 
     //添加弹窗