jiangjiazhi / center

Authored by fangcheng almost 9 years ago

Exists in master

Showing 6 changed files with 15 additions and 11 deletions

...	...	@@ -6,7 +6,6 @@
6	6	<artifactId>parent</artifactId>
7	7	<version>0.0.1-SNAPSHOT</version>
8	8	</parent>
9		- <groupId>com.lyms.base.common</groupId>
10	9	<artifactId>base.common</artifactId>
11	10
12	11	<properties>
...	...	@@ -18,7 +17,7 @@
18	17	<dependency>
19	18	<groupId>com.lyms</groupId>
20	19	<artifactId>core.sdk</artifactId>
21		- <version>core.sdk-1.0</version>
	20	+ <version>1.0</version>
22	21	</dependency>
23	22	</dependencies>
24	23
...	...	@@ -37,6 +36,6 @@
37	36	</plugins>
38	37	</build>
39	38
40		- <version>base.common-1.0</version>
	39	+ <version>1.0</version>
41	40	</project>

...	...	@@ -20,15 +20,15 @@
20	20	<dependencies>
21	21
22	22	<dependency>
23		- <groupId>com.lyms.base.common</groupId>
	23	+ <groupId>com.lyms</groupId>
24	24	<artifactId>base.common</artifactId>
25		- <version>base.common-1.0</version>
	25	+ <version>1.0</version>
26	26	</dependency>
27	27
28	28	<dependency>
29	29	<groupId>com.lyms</groupId>
30	30	<artifactId>core.sdk</artifactId>
31		- <version>core.sdk-1.0</version>
	31	+ <version>1.0</version>
32	32	</dependency>
33	33
34	34	<!-- swagger2 need begin -->

...	...	@@ -12,14 +12,19 @@
12	12	import org.springframework.beans.factory.annotation.Autowired;
13	13	import org.springframework.stereotype.Controller;
14	14	import org.springframework.ui.Model;
	15	+import org.springframework.web.bind.annotation.RequestBody;
15	16	import org.springframework.web.bind.annotation.RequestMapping;
16	17	import org.springframework.web.bind.annotation.RequestMethod;
17	18	import org.springframework.web.bind.annotation.RequestParam;
	19	+import org.springframework.web.bind.annotation.ResponseBody;
18	20
	21	+import com.alibaba.fastjson.JSON;
	22	+import com.alibaba.fastjson.JSONObject;
19	23	import com.lyms.base.common.entity.role.TreeNode;
20	24	import com.lyms.base.common.entity.user.Users;
21	25	import com.lyms.base.common.enums.PermissionEnum;
22	26	import com.lyms.base.common.service.role.PermissionsService;
	27	+import com.lyms.cm.controller.sys.SysUsersController;
23	28	import com.lyms.constants.Constants;
24	29	import com.lyms.shiro.ShiroWebUtils;
25	30	import com.lyms.util.StrUtils;

...	...	@@ -17,7 +17,7 @@
17	17	<dependency>
18	18	<groupId>com.lyms</groupId>
19	19	<artifactId>core.sdk</artifactId>
20		- <version>core.sdk-1.0</version>
	20	+ <version>1.0</version>
21	21	</dependency>
22	22	</dependencies>
23	23

...	...	@@ -19,12 +19,12 @@
19	19	<dependency>
20	20	<groupId>com.lyms</groupId>
21	21	<artifactId>core.sdk</artifactId>
22		- <version>core.sdk-1.0</version>
	22	+ <version>1.0</version>
23	23	</dependency>
24	24	<dependency>
25		- <groupId>com.lyms.base.common</groupId>
	25	+ <groupId>com.lyms</groupId>
26	26	<artifactId>base.common</artifactId>
27		- <version>base.common-1.0</version>
	27	+ <version>1.0</version>
28	28	</dependency>
29	29	<dependency>
30	30	<groupId>com.lyms</groupId>