路径修改

pom.xml

@@ -44,6 +44,7 @@
         <commons.version>3.10</commons.version>
         <jackson.version>2.11.0</jackson.version>
         <ehcache.version>2.10.6</ehcache.version>
+        <swagger2-bootstrap.version>1.9.6</swagger2-bootstrap.version>
     </properties>
 
     <dependencyManagement>
@@ -96,9 +97,9 @@
                 <version>${swagger2.version}</version>
             </dependency>
             <dependency>
-                <groupId>io.springfox</groupId>
-                <artifactId>springfox-swagger-ui</artifactId>
-                <version>${swagger2.version}</version>
+                <groupId>com.github.xiaoymin</groupId>
+                <artifactId>swagger-bootstrap-ui</artifactId>
+                <version>${swagger2-bootstrap.version}</version>
             </dependency>
             <dependency>
                 <groupId>com.alibaba</groupId>

themis-business/pom.xml

@@ -79,7 +79,6 @@
 		<dependency>
 			<groupId>com.github.xiaoymin</groupId>
 			<artifactId>swagger-bootstrap-ui</artifactId>
-			<version>1.9.6</version>
 		</dependency>
 		<dependency>
 			<groupId>com.alibaba</groupId>

themis-business/src/main/java/com/qmth/themis/business/dto/response/TBUserDto.java

@@ -20,6 +20,24 @@ public class TBUserDto implements Serializable {
     private Date updateTime;//更新时间
     private String loginName;//登录名
     private String orgName;//机构名称
+    private String mobileNumber;//手机号
+    private String roleCode;//角色编码
+
+    public String getMobileNumber() {
+        return mobileNumber;
+    }
+
+    public void setMobileNumber(String mobileNumber) {
+        this.mobileNumber = mobileNumber;
+    }
+
+    public String getRoleCode() {
+        return roleCode;
+    }
+
+    public void setRoleCode(String roleCode) {
+        this.roleCode = roleCode;
+    }
 
     public String getLoginName() {
         return loginName;

themis-business/src/main/resources/mapper/TBUserMapper.xml

@@ -10,12 +10,14 @@
             t.orgName,
             t.roleName,
             t.enable,
+            t.mobileNumber,
+            t.roleCode,
             if(t.updateName is not null, t.updateName, t.createName) as updateName,
             if(t.updateTime is not null, t.updateTime, t.createTime) as updateTime
             from
             (
             select
-            tbu.id, tbu.login_name as loginName, tbu.name, tbr.role_name as roleName, tbu.enable,(
+            tbu.id, tbu.mobile_number as mobileNumber, tbu.login_name as loginName, tbu.name, tbr.role_code as roleCode, tbr.role_name as roleName, tbu.enable,(
             select
             t.name
             from

themis-exam/src/main/java/com/qmth/themis/exam/api/SysController.java

@@ -1,14 +1,5 @@
 package com.qmth.themis.exam.api;
 
-import java.util.Date;
-
-import javax.annotation.Resource;
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
 import com.qmth.themis.business.bean.exam.EnvBean;
 import com.qmth.themis.business.bean.exam.OrgInfoBean;
 import com.qmth.themis.business.bean.exam.VersionBean;
@@ -16,43 +7,43 @@ import com.qmth.themis.business.entity.TBOrg;
 import com.qmth.themis.business.service.TBOrgService;
 import com.qmth.themis.common.util.Result;
 import com.qmth.themis.common.util.ResultUtil;
+import io.swagger.annotations.*;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import io.swagger.annotations.ApiResponse;
-import io.swagger.annotations.ApiResponses;
+import javax.annotation.Resource;
 
 @Api(tags = "系统信息Controller")
 @RestController
 @RequestMapping("/${prefix.url.exam}/sys")
 public class SysController {
-	
-	@Resource
-	private TBOrgService orgService;
+
+    @Resource
+    private TBOrgService orgService;
 
     @ApiOperation(value = "获取环境接口")
-    @RequestMapping(value = "/env", method = RequestMethod.POST)
+    @RequestMapping(value = "/env", method = RequestMethod.GET)
     @ApiResponses({@ApiResponse(code = 200, message = "环境信息", response = Result.class)})
     public Result env(@ApiParam(value = "机构id", required = false) @RequestParam(required = false) Long orgId) {
-    	EnvBean env=new EnvBean();
-    	if(orgId!=null) {
-    		TBOrg org=orgService.getById(orgId);
-    		if(org!=null) {
-    			OrgInfoBean orgInfo=new OrgInfoBean();
-    			orgInfo.setLogo(org.getLogo());
-    			orgInfo.setName(org.getName());
-    			orgInfo.setUpdateTime((org.getUpdateTime()==null?null:org.getUpdateTime().getTime()));
-    			env.setOrgInfo(orgInfo);
-    		}
-    	}
-    	env.setCurrentTime(new Date().getTime());
-    	VersionBean v=new VersionBean();
-    	v.setName("1.2.0");
-    	v.setValue(12);
-    	v.setUrl("xxxxxx");
-    	env.setVersion(v);
-
+        EnvBean env = new EnvBean();
+        if (orgId != null) {
+            TBOrg org = orgService.getById(orgId);
+            if (org != null) {
+                OrgInfoBean orgInfo = new OrgInfoBean();
+                orgInfo.setLogo(org.getLogo());
+                orgInfo.setName(org.getName());
+                orgInfo.setUpdateTime((org.getUpdateTime() == null ? null : org.getUpdateTime().getTime()));
+                env.setOrgInfo(orgInfo);
+            }
+        }
+        env.setCurrentTime(System.currentTimeMillis());
+        VersionBean v = new VersionBean();
+        v.setName("1.2.0");
+        v.setValue(12);
+        v.setUrl("xxxxxx");
+        env.setVersion(v);
         return ResultUtil.ok(env);
     }
 }