diff --git a/dsBaseWeb/ds-base/html/pages/test/test4.html b/dsBaseWeb/ds-base/html/pages/test/test4.html new file mode 100644 index 00000000..1ac37e57 --- /dev/null +++ b/dsBaseWeb/ds-base/html/pages/test/test4.html @@ -0,0 +1,410 @@ + + + + + + + + + Error + + + + +
+

An error occurred.

+

Sorry, the page you are looking for is currently unavailable. Please try again later.

+

If you are the system administrator of this resource then you should check the error log for details.

+

Commercial support is available at openresty.com.

+
+
+ +
+
+

OpenResty Inc. Products

+

We solve your unique and complex web problems with our layers of solutions and expertise from over a decade + of experience.

+
+ + OpenResty XRay +

OpenResty XRay

+

Troubleshooting and profiling tool

+ + + OpenResty Edge +

OpenResty Edge

+

Modern web application server

+ +
+
+
+

OpenResty's Official Blog for Technologies & Products.

+
+
+
+ +
+ +
+

How to deploy the on-premises version of OpenResty XRay on Microsoft's Azure cloud

+ +
+
+ +
+ +
+

Real-Time Request Counting against Nginx Processes via YSQL

+ +
+
+ +
+ +
+

High-Performance Web Application Firewall (WAF) in OpenResty Edge

+ +
+
+ +
+ +
+

The EdgeLang DSL in OpenResty Edge

+ +
+
+ +
+ +
+

How to pass the real client IP addresses to backend servers via special request headers

+ +
+
+
+
+ + + \ No newline at end of file diff --git a/dsBaseWeb/ds-base/html/pages/ylt/knowledge/index.html b/dsBaseWeb/ds-base/html/pages/ylt/knowledge/index.html index 733a7731..93170d28 100644 --- a/dsBaseWeb/ds-base/html/pages/ylt/knowledge/index.html +++ b/dsBaseWeb/ds-base/html/pages/ylt/knowledge/index.html @@ -144,7 +144,7 @@ } else { layer.msg(result.msg, { icon: 2, - time: 1000 + time: 2000 }); } } diff --git a/dsRes/src/main/resources/Sql/base.sql b/dsRes/src/main/resources/Sql/base.sql index 814fe069..f9a4ec05 100644 --- a/dsRes/src/main/resources/Sql/base.sql +++ b/dsRes/src/main/resources/Sql/base.sql @@ -2,13 +2,16 @@ #namespace("Base") #sql("listScheme") - select * from t_resource_scheme where b_use=1 + select t1.*,t2.subject_name,t3.stage_name from t_resource_scheme as t1 + inner join t_dm_subject as t2 on t1.subject_id=t2.subject_id + inner join t_dm_stage as t3 on t1.stage_id=t3.stage_id + where t1.b_use=1 #if(stage_id) - and stage_id=#para(stage_id) + and t1.stage_id=#para(stage_id) #end #if(subject_id) - and subject_id=#para(subject_id) + and t1.subject_id=#para(subject_id) #end - order by stage_id,sort_id + order by t1.stage_id,t1.sort_id #end #end \ No newline at end of file