Bläddra i källkod

应用日志管理-调用日志管理 1.调用日志数、2.操作 隐藏掉
接口管理 数据接口管理 操作区,设置参数按钮隐藏

liuhaonan 1 år sedan
förälder
incheckning
ef1fc00a57

+ 3 - 1
.idea/misc.xml

@@ -13,5 +13,7 @@
       </list>
       </list>
     </option>
     </option>
   </component>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_9" default="false" project-jdk-name="1.8" project-jdk-type="JavaSDK" />
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_9" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/out" />
+  </component>
 </project>
 </project>

+ 0 - 15
.idea/modules.xml

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/leiSP-admin/leisp-admin.iml" filepath="$PROJECT_DIR$/leiSP-admin/leisp-admin.iml" />
-      <module fileurl="file://$PROJECT_DIR$/leiSP-common/leisp-common.iml" filepath="$PROJECT_DIR$/leiSP-common/leisp-common.iml" />
-      <module fileurl="file://$PROJECT_DIR$/leiSP-framework/leisp-framework.iml" filepath="$PROJECT_DIR$/leiSP-framework/leisp-framework.iml" />
-      <module fileurl="file://$PROJECT_DIR$/leiSP-generator/leisp-generator.iml" filepath="$PROJECT_DIR$/leiSP-generator/leisp-generator.iml" />
-      <module fileurl="file://$PROJECT_DIR$/leiSP-quartz/leisp-quartz.iml" filepath="$PROJECT_DIR$/leiSP-quartz/leisp-quartz.iml" />
-      <module fileurl="file://$PROJECT_DIR$/leiSP-system/leisp-system.iml" filepath="$PROJECT_DIR$/leiSP-system/leisp-system.iml" />
-      <module fileurl="file://$PROJECT_DIR$/mybusiness/mybusiness.iml" filepath="$PROJECT_DIR$/mybusiness/mybusiness.iml" />
-      <module fileurl="file://$PROJECT_DIR$/.idea/thsjzt_show.iml" filepath="$PROJECT_DIR$/.idea/thsjzt_show.iml" />
-    </modules>
-  </component>
-</project>

+ 8 - 5
leiSP-admin/leisp-admin.iml

@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml version="1.0" encoding="UTF-8"?>
-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="$MODULE_DIR$/pom.xml" external.system.module.type="SINGLE_MODULE" external.system.module.version="223-2" org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
   <component name="FacetManager">
-    <facet type="Spring" name="Spring">
-      <configuration />
-    </facet>
-    <facet type="web" name="Web">
+    <facet external-system-id="Maven" type="web" name="Web">
       <configuration>
       <configuration>
         <webroots>
         <webroots>
           <root url="file://$MODULE_DIR$/src/main/webapp" relative="/" />
           <root url="file://$MODULE_DIR$/src/main/webapp" relative="/" />
         </webroots>
         </webroots>
+        <sourceRoots>
+          <root url="file://$MODULE_DIR$/src/main/java" />
+          <root url="file://$MODULE_DIR$/src/main/resources" />
+        </sourceRoots>
       </configuration>
       </configuration>
     </facet>
     </facet>
   </component>
   </component>
@@ -18,6 +19,8 @@
     <content url="file://$MODULE_DIR$">
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="inheritedJdk" />

+ 6 - 15
leiSP-admin/src/main/resources/templates/monitor/operlog/operlog.html

@@ -42,7 +42,7 @@
 					</div>
 					</div>
 				</form>
 				</form>
 			</div>
 			</div>
-			
+
 			<div class="btn-group-sm" id="toolbar" role="group">
 			<div class="btn-group-sm" id="toolbar" role="group">
 				<a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="monitor:operlog:remove">
 				<a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="monitor:operlog:remove">
 		            <i class="fa fa-remove"></i> 删除
 		            <i class="fa fa-remove"></i> 删除
@@ -54,13 +54,13 @@
 		            <i class="fa fa-download"></i> 导出
 		            <i class="fa fa-download"></i> 导出
 		        </a>
 		        </a>
 	        </div>
 	        </div>
-	        
+
 			<div class="col-sm-12 select-table table-striped">
 			<div class="col-sm-12 select-table table-striped">
 				<table id="bootstrap-table"></table>
 				<table id="bootstrap-table"></table>
 			</div>
 			</div>
 		</div>
 		</div>
 	</div>
 	</div>
-	
+
 	<th:block th:include="include :: footer" />
 	<th:block th:include="include :: footer" />
 	<th:block th:include="include :: bootstrap-select-js" />
 	<th:block th:include="include :: bootstrap-select-js" />
 	<script th:inline="javascript">
 	<script th:inline="javascript">
@@ -134,26 +134,17 @@
 		            field: 'operTime',
 		            field: 'operTime',
 		            title: '操作时间',
 		            title: '操作时间',
 		            sortable: true
 		            sortable: true
-		        },
-		        {
-		            title: '操作',
-		            align: 'center',
-		            formatter: function(value, row, index) {
-		                var actions = [];
-		                actions.push('<a class="btn btn-warning btn-xs ' + detailFlag + '" href="javascript:void(0)" onclick="$.operate.detail(\'' + row.operId + '\')"><i class="fa fa-search"></i>详细</a>');
-		                return actions.join('');
-		            }
 		        }]
 		        }]
 		    };
 		    };
 		    $.table.init(options);
 		    $.table.init(options);
 		});
 		});
-		
+
 		function searchPre() {
 		function searchPre() {
 		    var data = {};
 		    var data = {};
 		    data.businessTypes = $.common.join($('#businessTypes').selectpicker('val'));
 		    data.businessTypes = $.common.join($('#businessTypes').selectpicker('val'));
 		    $.table.search('operlog-form', 'bootstrap-table', data);
 		    $.table.search('operlog-form', 'bootstrap-table', data);
 		}
 		}
-		
+
 		function resetPre() {
 		function resetPre() {
 			$("#operlog-form")[0].reset();
 			$("#operlog-form")[0].reset();
 			$("#businessTypes").selectpicker('refresh');
 			$("#businessTypes").selectpicker('refresh');
@@ -161,4 +152,4 @@
 		}
 		}
 	</script>
 	</script>
 </body>
 </body>
-</html>
+</html>

BIN
leiSP-admin/target/classes/com/sooka/web/controller/system/SysCaptchaController.class


+ 5 - 6
leiSP-common/leisp-common.iml

@@ -1,15 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml version="1.0" encoding="UTF-8"?>
-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="Spring" name="Spring">
-      <configuration />
-    </facet>
-  </component>
+<module external.linked.project.id="$MODULE_DIR$/pom.xml" external.system.module.type="SINGLE_MODULE" external.system.module.version="223-2" org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/target/generated-sources/annotations" isTestSource="false" generated="true" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="inheritedJdk" />

BIN
leiSP-common/target/classes/com/sooka/common/utils/file/FileUtils.class


BIN
leiSP-common/target/classes/com/sooka/common/utils/http/HttpUtils.class


BIN
leiSP-common/target/classes/com/sooka/common/utils/poi/ExcelUtil.class


+ 11 - 5
leiSP-framework/leisp-framework.iml

@@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml version="1.0" encoding="UTF-8"?>
-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="$MODULE_DIR$/pom.xml" external.system.module.type="SINGLE_MODULE" external.system.module.version="223-2" org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
   <component name="FacetManager">
-    <facet type="Spring" name="Spring">
-      <configuration />
-    </facet>
-    <facet type="web" name="Web">
+    <facet external-system-id="Maven" type="web" name="Web">
       <configuration>
       <configuration>
         <webroots />
         <webroots />
+        <sourceRoots>
+          <root url="file://$MODULE_DIR$/src/main/java" />
+          <root url="file://$MODULE_DIR$/src/main/resources" />
+          <root url="file://$MODULE_DIR$/target/generated-sources/annotations" />
+        </sourceRoots>
       </configuration>
       </configuration>
     </facet>
     </facet>
   </component>
   </component>
@@ -15,6 +17,10 @@
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/target/generated-sources/annotations" isTestSource="false" generated="true" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="inheritedJdk" />

BIN
leiSP-framework/target/classes/com/sooka/framework/aspectj/DataSourceAspect.class


BIN
leiSP-framework/target/classes/com/sooka/framework/config/ShiroConfig.class


+ 4 - 6
leiSP-generator/leisp-generator.iml

@@ -1,16 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml version="1.0" encoding="UTF-8"?>
-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="Spring" name="Spring">
-      <configuration />
-    </facet>
-  </component>
+<module external.linked.project.id="$MODULE_DIR$/pom.xml" external.system.module.type="SINGLE_MODULE" external.system.module.version="223-2" org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/target/generated-sources/annotations" isTestSource="false" generated="true" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="inheritedJdk" />

+ 10 - 9
leiSP-generator/src/main/resources/templates/tool/gen/gen.html

@@ -30,7 +30,7 @@
 					</div>
 					</div>
 				</form>
 				</form>
 			</div>
 			</div>
-			
+
 			<div class="btn-group-sm" id="toolbar" role="group">
 			<div class="btn-group-sm" id="toolbar" role="group">
 			     <a class="btn btn-success multiple disabled" onclick="javascript:batchGenCode()" shiro:hasPermission="tool:gen:code">
 			     <a class="btn btn-success multiple disabled" onclick="javascript:batchGenCode()" shiro:hasPermission="tool:gen:code">
 			        <i class="fa fa-download"></i> 生成
 			        <i class="fa fa-download"></i> 生成
@@ -45,7 +45,7 @@
 		            <i class="fa fa-remove"></i> 删除
 		            <i class="fa fa-remove"></i> 删除
 		        </a>
 		        </a>
 		    </div>
 		    </div>
-		
+
 		    <div class="col-sm-12 select-table table-striped">
 		    <div class="col-sm-12 select-table table-striped">
 			    <table id="bootstrap-table"></table>
 			    <table id="bootstrap-table"></table>
 			</div>
 			</div>
@@ -59,7 +59,7 @@
 		var removeFlag = [[${@permission.hasPermi('tool:gen:remove')}]];
 		var removeFlag = [[${@permission.hasPermi('tool:gen:remove')}]];
 		var previewFlag = [[${@permission.hasPermi('tool:gen:preview')}]];
 		var previewFlag = [[${@permission.hasPermi('tool:gen:preview')}]];
 		var codeFlag = [[${@permission.hasPermi('tool:gen:code')}]];
 		var codeFlag = [[${@permission.hasPermi('tool:gen:code')}]];
-	
+
 		$(function() {
 		$(function() {
 		    var options = {
 		    var options = {
 		        url: prefix + "/list",
 		        url: prefix + "/list",
@@ -128,11 +128,12 @@
 		                actions.push('<a class="btn btn-primary btn-xs ' + codeFlag + '" href="javascript:void(0)" onclick="genCode(\'' + row.tableName + '\',\'' + row.genType + '\')"><i class="fa fa-bug"></i>生成代码</a> ');
 		                actions.push('<a class="btn btn-primary btn-xs ' + codeFlag + '" href="javascript:void(0)" onclick="genCode(\'' + row.tableName + '\',\'' + row.genType + '\')"><i class="fa fa-bug"></i>生成代码</a> ');
 		                return actions.join('');
 		                return actions.join('');
 		            }
 		            }
-		        }]
+		        }
+				]
 		    };
 		    };
 		    $.table.init(options);
 		    $.table.init(options);
 		});
 		});
-		
+
 		// 预览代码
 		// 预览代码
 		function preview(tableId) {
 		function preview(tableId) {
 			var preViewUrl = prefix + "/preview/" + tableId;
 			var preViewUrl = prefix + "/preview/" + tableId;
@@ -161,7 +162,7 @@
 				$.modal.closeLoading();
 				$.modal.closeLoading();
 			});
 			});
 		}
 		}
-	
+
 		// 生成代码
 		// 生成代码
 		function genCode(tableName, genType) {
 		function genCode(tableName, genType) {
 		    $.modal.confirm("确定要生成" + tableName + "表代码吗?", function() {
 		    $.modal.confirm("确定要生成" + tableName + "表代码吗?", function() {
@@ -173,7 +174,7 @@
 				}
 				}
 		    })
 		    })
 		}
 		}
-	
+
 		// 批量生成代码
 		// 批量生成代码
 		function batchGenCode() {
 		function batchGenCode() {
 		    var rows = $.table.selectColumns("tableName");
 		    var rows = $.table.selectColumns("tableName");
@@ -186,7 +187,7 @@
 		        layer.msg('执行成功,正在生成代码请稍后…', { icon: 1 });
 		        layer.msg('执行成功,正在生成代码请稍后…', { icon: 1 });
 		    });
 		    });
 		}
 		}
-		
+
 		// 导入表结构
 		// 导入表结构
 		function importTable() {
 		function importTable() {
 			var importTableUrl = prefix + "/importTable";
 			var importTableUrl = prefix + "/importTable";
@@ -194,4 +195,4 @@
 		}
 		}
 	</script>
 	</script>
 </body>
 </body>
-</html>
+</html>

+ 8 - 8
leiSP-generator/target/classes/templates/tool/gen/gen.html

@@ -30,7 +30,7 @@
 					</div>
 					</div>
 				</form>
 				</form>
 			</div>
 			</div>
-			
+
 			<div class="btn-group-sm" id="toolbar" role="group">
 			<div class="btn-group-sm" id="toolbar" role="group">
 			     <a class="btn btn-success multiple disabled" onclick="javascript:batchGenCode()" shiro:hasPermission="tool:gen:code">
 			     <a class="btn btn-success multiple disabled" onclick="javascript:batchGenCode()" shiro:hasPermission="tool:gen:code">
 			        <i class="fa fa-download"></i> 生成
 			        <i class="fa fa-download"></i> 生成
@@ -45,7 +45,7 @@
 		            <i class="fa fa-remove"></i> 删除
 		            <i class="fa fa-remove"></i> 删除
 		        </a>
 		        </a>
 		    </div>
 		    </div>
-		
+
 		    <div class="col-sm-12 select-table table-striped">
 		    <div class="col-sm-12 select-table table-striped">
 			    <table id="bootstrap-table"></table>
 			    <table id="bootstrap-table"></table>
 			</div>
 			</div>
@@ -59,7 +59,7 @@
 		var removeFlag = [[${@permission.hasPermi('tool:gen:remove')}]];
 		var removeFlag = [[${@permission.hasPermi('tool:gen:remove')}]];
 		var previewFlag = [[${@permission.hasPermi('tool:gen:preview')}]];
 		var previewFlag = [[${@permission.hasPermi('tool:gen:preview')}]];
 		var codeFlag = [[${@permission.hasPermi('tool:gen:code')}]];
 		var codeFlag = [[${@permission.hasPermi('tool:gen:code')}]];
-	
+
 		$(function() {
 		$(function() {
 		    var options = {
 		    var options = {
 		        url: prefix + "/list",
 		        url: prefix + "/list",
@@ -132,7 +132,7 @@
 		    };
 		    };
 		    $.table.init(options);
 		    $.table.init(options);
 		});
 		});
-		
+
 		// 预览代码
 		// 预览代码
 		function preview(tableId) {
 		function preview(tableId) {
 			var preViewUrl = prefix + "/preview/" + tableId;
 			var preViewUrl = prefix + "/preview/" + tableId;
@@ -161,7 +161,7 @@
 				$.modal.closeLoading();
 				$.modal.closeLoading();
 			});
 			});
 		}
 		}
-	
+
 		// 生成代码
 		// 生成代码
 		function genCode(tableName, genType) {
 		function genCode(tableName, genType) {
 		    $.modal.confirm("确定要生成" + tableName + "表代码吗?", function() {
 		    $.modal.confirm("确定要生成" + tableName + "表代码吗?", function() {
@@ -173,7 +173,7 @@
 				}
 				}
 		    })
 		    })
 		}
 		}
-	
+
 		// 批量生成代码
 		// 批量生成代码
 		function batchGenCode() {
 		function batchGenCode() {
 		    var rows = $.table.selectColumns("tableName");
 		    var rows = $.table.selectColumns("tableName");
@@ -186,7 +186,7 @@
 		        layer.msg('执行成功,正在生成代码请稍后…', { icon: 1 });
 		        layer.msg('执行成功,正在生成代码请稍后…', { icon: 1 });
 		    });
 		    });
 		}
 		}
-		
+
 		// 导入表结构
 		// 导入表结构
 		function importTable() {
 		function importTable() {
 			var importTableUrl = prefix + "/importTable";
 			var importTableUrl = prefix + "/importTable";
@@ -194,4 +194,4 @@
 		}
 		}
 	</script>
 	</script>
 </body>
 </body>
-</html>
+</html>

+ 4 - 6
leiSP-quartz/leisp-quartz.iml

@@ -1,16 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml version="1.0" encoding="UTF-8"?>
-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="Spring" name="Spring">
-      <configuration />
-    </facet>
-  </component>
+<module external.linked.project.id="$MODULE_DIR$/pom.xml" external.system.module.type="SINGLE_MODULE" external.system.module.version="223-2" org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/target/generated-sources/annotations" isTestSource="false" generated="true" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="inheritedJdk" />

+ 4 - 6
leiSP-system/leisp-system.iml

@@ -1,16 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml version="1.0" encoding="UTF-8"?>
-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="Spring" name="Spring">
-      <configuration />
-    </facet>
-  </component>
+<module external.linked.project.id="$MODULE_DIR$/pom.xml" external.system.module.type="SINGLE_MODULE" external.system.module.version="223-2" org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/target/generated-sources/annotations" isTestSource="false" generated="true" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="inheritedJdk" />

+ 10 - 5
mybusiness/mybusiness.iml

@@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml version="1.0" encoding="UTF-8"?>
-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="$MODULE_DIR$/pom.xml" external.system.module.type="SINGLE_MODULE" external.system.module.version="223-2" org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
   <component name="FacetManager">
-    <facet type="Spring" name="Spring">
-      <configuration />
-    </facet>
-    <facet type="web" name="Web">
+    <facet external-system-id="Maven" type="web" name="Web">
       <configuration>
       <configuration>
         <webroots />
         <webroots />
+        <sourceRoots>
+          <root url="file://$MODULE_DIR$/src/main/java" />
+          <root url="file://$MODULE_DIR$/src/main/resources" />
+          <root url="file://$MODULE_DIR$/target/generated-sources/annotations" />
+        </sourceRoots>
       </configuration>
       </configuration>
     </facet>
     </facet>
   </component>
   </component>
@@ -16,6 +18,9 @@
     <content url="file://$MODULE_DIR$">
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/target/generated-sources/annotations" isTestSource="false" generated="true" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="inheritedJdk" />

+ 1 - 1
mybusiness/src/main/java/com/business/controller/VisualizationController.java

@@ -21,7 +21,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.*;
-import sun.plugin2.util.SystemUtil;
+//import sun.plugin2.util.SystemUtil;
 
 
 import javax.annotation.Resource;
 import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.math.BigDecimal;

BIN
mybusiness/target/classes/com/sooka/system/medicine/plant/service/impl/TGuijiMedicinePlantServiceImpl.class


BIN
mybusiness/target/classes/com/util/HttpUtil.class


+ 3 - 32
mybusiness/target/classes/templates/system/peoplemarryinfodouble/peoplemarryinfodouble.html

@@ -79,21 +79,7 @@
             columns: [{
             columns: [{
                 checkbox: true
                 checkbox: true
             },
             },
-                {
-                    field: 'id',
-                    title: '主键ID',
-                    visible: false
-                },
-                {
-                    field: 'status',
-                    title: '状态',
-                    visible: false
-                },
-                {
-                    field: 'remark',
-                    title: '注释',
-                    visible: false
-                },
+
                 {
                 {
                     field: 'nameman',
                     field: 'nameman',
                     title: '男方姓名'
                     title: '男方姓名'
@@ -111,12 +97,6 @@
                     title: '女方身份号码'
                     title: '女方身份号码'
                 },
                 },
 
 
-
-                {
-                    field: 'code',
-                    title: '返回码',
-                    visible: false
-                },
                 {
                 {
                     field: 'message',
                     field: 'message',
                     title: '返回信息',
                     title: '返回信息',
@@ -125,17 +105,8 @@
                 {
                 {
                     field: 'result',
                     field: 'result',
                     title: '结果信息'
                     title: '结果信息'
-                },
-                {
-                    title: '操作',
-                    align: 'center',
-                    formatter: function (value, row, index) {
-                        var actions = [];
-                        // actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
-                        // actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>删除</a>');
-                        return actions.join('');
-                    }
-                }]
+                }
+              ]
         };
         };
         $.table.init(options);
         $.table.init(options);
     });
     });