wuxw7 лет назад: 9
Родитель
Сommit
4c0a2a66fe
2 измененных файлов с 25 добавлено и 20 удалено
  1. 11 19
      .idea/workspace.xml
  2. 14 1
      config/db/rule.db

+ 11 - 19
.idea/workspace.xml

@@ -2,15 +2,7 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="a191bf23-5de1-438a-810e-95cec23d6b25" name="Default" comment="change fastjson dependenciy">
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/RuleService/README.md" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/RuleService/RuleService.iml" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/RuleService/pom.xml" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/config/db/rule.db" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/compiler.xml" afterPath="$PROJECT_DIR$/.idea/compiler.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/encodings.xml" afterPath="$PROJECT_DIR$/.idea/encodings.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/modules.xml" afterPath="$PROJECT_DIR$/.idea/modules.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/pom.xml" afterPath="$PROJECT_DIR$/pom.xml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/config/db/rule.db" afterPath="$PROJECT_DIR$/config/db/rule.db" />
     </list>
     <ignored path="$PROJECT_DIR$/out/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -67,7 +59,7 @@
         <entry file="file://$PROJECT_DIR$/UserService/pom.xml">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="-187">
-              <caret line="19" column="18" lean-forward="true" selection-start-line="19" selection-start-column="18" selection-end-line="19" selection-end-column="18" />
+              <caret line="19" column="18" lean-forward="false" selection-start-line="19" selection-start-column="18" selection-end-line="19" selection-end-column="18" />
               <folding />
             </state>
           </provider>
@@ -89,8 +81,8 @@
       <file leaf-file-name="rule.db" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/config/db/rule.db">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="108">
-              <caret line="50" column="26" lean-forward="false" selection-start-line="50" selection-start-column="26" selection-end-line="50" selection-end-column="26" />
+            <state relative-caret-position="272">
+              <caret line="73" column="21" lean-forward="true" selection-start-line="73" selection-start-column="21" selection-end-line="73" selection-end-column="21" />
               <folding />
             </state>
           </provider>
@@ -100,7 +92,7 @@
         <entry file="file://$PROJECT_DIR$/config/db/orders.db">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="408">
-              <caret line="69" column="46" lean-forward="true" selection-start-line="69" selection-start-column="46" selection-end-line="69" selection-end-column="47" />
+              <caret line="69" column="46" lean-forward="false" selection-start-line="69" selection-start-column="46" selection-end-line="69" selection-end-column="47" />
               <folding />
             </state>
           </provider>
@@ -110,7 +102,7 @@
         <entry file="file://$PROJECT_DIR$/config/db/cust.db">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="-609">
-              <caret line="30" column="73" lean-forward="true" selection-start-line="30" selection-start-column="4" selection-end-line="30" selection-end-column="73" />
+              <caret line="30" column="73" lean-forward="false" selection-start-line="30" selection-start-column="4" selection-end-line="30" selection-end-column="73" />
               <folding />
             </state>
           </provider>
@@ -1298,7 +1290,7 @@
     <entry file="file://$PROJECT_DIR$/config/db/orders.db">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="408">
-          <caret line="69" column="46" lean-forward="true" selection-start-line="69" selection-start-column="46" selection-end-line="69" selection-end-column="47" />
+          <caret line="69" column="46" lean-forward="false" selection-start-line="69" selection-start-column="46" selection-end-line="69" selection-end-column="47" />
           <folding />
         </state>
       </provider>
@@ -1328,7 +1320,7 @@
     <entry file="file://$PROJECT_DIR$/UserService/pom.xml">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-187">
-          <caret line="19" column="18" lean-forward="true" selection-start-line="19" selection-start-column="18" selection-end-line="19" selection-end-column="18" />
+          <caret line="19" column="18" lean-forward="false" selection-start-line="19" selection-start-column="18" selection-end-line="19" selection-end-column="18" />
           <folding />
         </state>
       </provider>
@@ -1344,15 +1336,15 @@
     <entry file="file://$PROJECT_DIR$/config/db/cust.db">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-609">
-          <caret line="30" column="73" lean-forward="true" selection-start-line="30" selection-start-column="4" selection-end-line="30" selection-end-column="73" />
+          <caret line="30" column="73" lean-forward="false" selection-start-line="30" selection-start-column="4" selection-end-line="30" selection-end-column="73" />
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/config/db/rule.db">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="108">
-          <caret line="50" column="26" lean-forward="false" selection-start-line="50" selection-start-column="26" selection-end-line="50" selection-end-column="26" />
+        <state relative-caret-position="272">
+          <caret line="73" column="21" lean-forward="true" selection-start-line="73" selection-start-column="21" selection-end-line="73" selection-end-column="21" />
           <folding />
         </state>
       </provider>

+ 14 - 1
config/db/rule.db

@@ -36,7 +36,7 @@ create table rule
 create table rule_entrance
 (
 
-  rule_id           VARCHAR(20) not null comment '规则ID',
+  rule_id           varchar(20) not null comment '规则ID',
   rule_level        varchar(2) not null comment '规则级别,1 限制性 2 提示性',
   rule_condition    varchar(200) not null comment '校验条件 jpath 语句,如果有值则走这个规则,没有值则不走这个规则,如果所有业务都走,写*号',
   rule_type         varchar(2) not null comment '规则实现方式,1 反射调用java 方法实现,2 通过 rule_cond_cfg 配置逻辑实现 3 调用存储过程实现,存储过程入参可以在rule_cond_cfg 表中配置'
@@ -69,6 +69,19 @@ create table rule_cond_cfg
   create_dt timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间'
 );
 
+-- 规则日志表
+
+create table rule_log
+(
+  transactionId varchar(50) comment '交易流水号',
+  rule_id        varchar(20) comment '规则ID',
+  param     varchar(2000) comment '规则运行入参',
+  retval        varchar(2000) comment '规则返回接口',
+  state     varchar(2) comment '规则运行状态 0 表示规则运行成功 1 表示规则运行异常 异常信息error_info 字段',
+  error_info varchar(2000) comment '规则异常信息'
+  create_dt timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间'
+)
+