Merge remote-tracking branch 'lis8.0/master'

lis-system/src/main/java/com/czlis/system/config/SecurityConfig.java

@@ -108,7 +108,7 @@ public class SecurityConfig {
                 .authorizeHttpRequests((requests) -> {
                     permitAllUrl.getUrls().forEach(url -> requests.antMatchers(url).permitAll());
                     // 对于登录login 注册register 验证码captchaImage 允许匿名访问
-                    requests.antMatchers("/login", "/register", "/captchaImage","/loginAnonymous").permitAll()
+                    requests.antMatchers("/login", "/register", "/captchaImage","/loginAnonymous","/getLocalconfig").permitAll()
                             // 静态资源，可匿名访问
                             .antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll()
                             .antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**","/printPDF/**","/graphs/**").permitAll()

lis-system/src/main/java/com/czlis/system/web/controller/system/SysLoginController.java

@@ -7,6 +7,7 @@ import com.czlis.common.core.domain.entity.SysUser;
 import com.czlis.common.core.domain.model.LoginBody;
 import com.czlis.common.core.domain.model.LoginUser;
 import com.czlis.common.utils.SecurityUtils;
+import com.czlis.interfaceCommon.mapper.ComDictMapper;
 import com.czlis.system.service.ISysMenuService;
 import com.czlis.system.web.service.SysLoginService;
 import com.czlis.system.web.service.SysPermissionService;
@@ -19,7 +20,9 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 
 /**
@@ -41,7 +44,6 @@ public class SysLoginController {
 
     @Autowired
     private TokenService tokenService;
-
     /**
      * 登录方法
      *
@@ -119,8 +121,9 @@ public class SysLoginController {
     @GetMapping("/getLocalconfig")
     public AjaxResult getLocalconfig(String localid) {
         AjaxResult ajax = AjaxResult.success();
-        String data=loginService.getLocalconfig(localid);
+        ajax.put("localconfig", loginService.getLocalconfig(localid));
-        ajax.put("data", data);
+        ajax.put("oem", loginService.getOEM());
+        ajax.put("hosplist", loginService.gethospList());
         return ajax;
     }
 }

lis-system/src/main/java/com/czlis/system/web/service/SysLoginService.java

@@ -5,6 +5,7 @@ import com.czlis.common.constant.Constants;
 import com.czlis.common.constant.UserConstants;
 import com.czlis.common.core.domain.entity.SysLoginParam;
 import com.czlis.common.core.domain.entity.SysUser;
+import com.czlis.common.core.domain.entity.lis.ComDict;
 import com.czlis.common.core.domain.model.LoginBody;
 import com.czlis.common.core.domain.model.LoginUser;
 import com.czlis.common.core.redis.RedisCache;
@@ -31,6 +32,9 @@ import org.springframework.security.core.Authentication;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.Random;
 
 /**
@@ -63,6 +67,19 @@ public class SysLoginService {
     public String getLocalconfig(String smac){
         return commonUtil.getLocalconfig(smac);
     }
+    public String getOEM(){
+        Map<String,String> oem=new HashMap<>();
+        oem.put("compay","武汉创智天地信息技术有限公司");
+        oem.put("version","区域版LIMS V8.001");
+        oem.put("phone","027-67849602");
+        oem.put("E-mail","czlis@163.com");
+        oem.put("appname","实验室管理系统");
+        return oem.toString();
+    }
+    public String gethospList(){
+        List<ComDict> comDictlist=commonUtil.getComDictList("HOS");
+        return comDictlist.toString();
+    }
     /**
      * 登录验证
      * @return 结果