接入统一登陆平台

yiming
1 parent 99e42dcd
Showing 18 changed files with 238 additions and 136 deletions
pom.xml
src/main/java/com/bsth/XDApplication.java
src/main/java/com/bsth/controller/sys/UserController.java
src/main/java/com/bsth/data/commonData/SyncData.java
src/main/java/com/bsth/data/forecast/ArrivalDataLoader.java
src/main/java/com/bsth/service/schedule/datasync/VehicleDataSyncTaskServiceImpl.java
src/main/java/com/bsth/service/sys/SysUserService.java
src/main/java/com/bsth/service/sys/impl/SysUserServiceImpl.java
src/main/resources/application-dev.properties
src/main/resources/application-prod.properties
src/main/resources/application-test.properties
src/main/resources/application.properties
src/main/resources/fatso/handle_real_ctl.js
src/main/resources/fatso/start.js
src/main/resources/jiaDingBus-jdbc.properties
src/main/resources/ms-jdbc.properties
src/main/resources/static/index.html
src/main/resources/traffic-jdbc.properties
@@ -464,6 +464,12 @@
 			<version>4.3.2-1.5.5</version>
 			<classifier>${javacpp.platform}</classifier>
 		</dependency>
+
+		<dependency>
+			<groupId>cn.hutool</groupId>
+			<artifactId>hutool-all</artifactId>
+			<version>4.6.3</version>
+		</dependency>
 	</dependencies>
 	<dependencyManagement>
@@ -187,10 +187,10 @@ public class XDApplication implements CommandLineRunner {
         //log.info(timeDiff / 1000 / 60 + "分钟之后提交到运管处");
         //sexec.scheduleAtFixedRate(submitToTrafficManage, timeDiffTraffic / 1000, 60 * 60 * 24, TimeUnit.SECONDS);
         //计算油、公里加注
-        sexec.scheduleAtFixedRate(calcOilThread, timeDiff / 1000, 60 * 60 * 24, TimeUnit.SECONDS);
+        //scheduleAtFixedRate(calcOilThread, timeDiff / 1000, 60 * 60 * 24, TimeUnit.SECONDS);
         //线路版本更新
-        sexec.scheduleWithFixedDelay(lineVersionsData, 60 * 5, 60 * 15, TimeUnit.SECONDS);
+        //sexec.scheduleWithFixedDelay(lineVersionsData, 60 * 5, 60 * 15, TimeUnit.SECONDS);
         //线路版本更新
         //sexec.scheduleWithFixedDelay(fixedEnableVerionsThread, 60 * 4, 60 * 2 , TimeUnit.SECONDS);
@@ -201,12 +201,12 @@ public class XDApplication implements CommandLineRunner {
         ScheduledExecutorService sexec = Application.mainServices;
-        //安全驾驶
+/*        //安全驾驶
         sexec.scheduleWithFixedDelay(safeDrivDataLoadThread, 180, 10, TimeUnit.SECONDS);
         //智能调度
         sexec.scheduleWithFixedDelay(znddThread, 30, 30, TimeUnit.SECONDS);
         //智能调度
-        sexec.scheduleWithFixedDelay(ZnddtwoThread, 30, 60, TimeUnit.SECONDS);
+        sexec.scheduleWithFixedDelay(ZnddtwoThread, 30, 60, TimeUnit.SECONDS);*/
         //响应式公交自动对接订单 --暂时关闭等待博协调整后再开启
         //sexec.scheduleWithFixedDelay(orderListThread, 120, 60 * 30, TimeUnit.SECONDS);
         GpsDataLoaderThread.setFlag(-1);
@@ -236,12 +236,12 @@ public class XDApplication implements CommandLineRunner {
         //运管处静态数据提交
         log.info(timeDiff / 1000 / 60 + "分钟之后提交到运管处");
-        sexec.scheduleAtFixedRate(submitToTrafficManage, timeDiffTraffic / 1000, 60 * 60 * 24, TimeUnit.SECONDS);
+        //sexec.scheduleAtFixedRate(submitToTrafficManage, timeDiffTraffic / 1000, 60 * 60 * 24, TimeUnit.SECONDS);
         //计算油、公里加注
-        sexec.scheduleAtFixedRate(calcOilThread, timeDiff / 1000, 60 * 60 * 24, TimeUnit.SECONDS);
+        //.scheduleAtFixedRate(calcOilThread, timeDiff / 1000, 60 * 60 * 24, TimeUnit.SECONDS);
         //线路版本更新
-        sexec.scheduleWithFixedDelay(lineVersionsData, 60 * 5, 60 * 15, TimeUnit.SECONDS);
+       // sexec.scheduleWithFixedDelay(lineVersionsData, 60 * 5, 60 * 15, TimeUnit.SECONDS);
         //线路版本更新
         //sexec.scheduleWithFixedDelay(fixedEnableVerionsThread, 60 * 4, 60 * 2 , TimeUnit.SECONDS);
@@ -251,14 +251,14 @@ public class XDApplication implements CommandLineRunner {
         log.info("testInit...");
         ScheduledExecutorService sexec = Application.mainServices;
         //安全驾驶
-        sexec.scheduleWithFixedDelay(safeDrivDataLoadThread, 180, 10, TimeUnit.SECONDS);
+        /*sexec.scheduleWithFixedDelay(safeDrivDataLoadThread, 180, 10, TimeUnit.SECONDS);
         //智能调度
         sexec.scheduleWithFixedDelay(znddThread, 30, 30, TimeUnit.SECONDS);
         //智能调度
         sexec.scheduleWithFixedDelay(ZnddtwoThread, 30, 60, TimeUnit.SECONDS);
         //响应式公交自动对接订单
-        sexec.scheduleWithFixedDelay(orderListThread, 120, 60 * 30, TimeUnit.SECONDS);
+        sexec.scheduleWithFixedDelay(orderListThread, 120, 60 * 30, TimeUnit.SECONDS);*/
         GpsDataLoaderThread.setFlag(-1);
         //dayOfSchedule.dataRecovery();
@@ -290,10 +290,10 @@ public class XDApplication implements CommandLineRunner {
         //log.info(timeDiff / 1000 / 60 + "分钟之后提交到运管处");
         //sexec.scheduleAtFixedRate(submitToTrafficManage, timeDiffTraffic / 1000, 60 * 60 * 24, TimeUnit.SECONDS);
         //计算油、公里加注
-        sexec.scheduleAtFixedRate(calcOilThread, timeDiff / 1000, 60 * 60 * 24, TimeUnit.SECONDS);
+        //sexec.scheduleAtFixedRate(calcOilThread, timeDiff / 1000, 60 * 60 * 24, TimeUnit.SECONDS);
         //线路版本更新
-        sexec.scheduleWithFixedDelay(lineVersionsData, 60 * 5, 60 * 15, TimeUnit.SECONDS);
+        //sexec.scheduleWithFixedDelay(lineVersionsData, 60 * 5, 60 * 15, TimeUnit.SECONDS);
         //线路版本更新
         //sexec.scheduleWithFixedDelay(fixedEnableVerionsThread, 60 * 4, 60 * 2 , TimeUnit.SECONDS);
@@ -334,12 +334,12 @@ public class XDApplication implements CommandLineRunner {
         //运管处静态数据提交
         log.info(timeDiff / 1000 / 60 + "分钟之后提交到运管处");
-        sexec.scheduleAtFixedRate(submitToTrafficManage, timeDiffTraffic / 1000, 60 * 60 * 24, TimeUnit.SECONDS);
+        //sexec.scheduleAtFixedRate(submitToTrafficManage, timeDiffTraffic / 1000, 60 * 60 * 24, TimeUnit.SECONDS);
         //计算油、公里加注
-        sexec.scheduleAtFixedRate(calcOilThread, timeDiff / 1000, 60 * 60 * 24, TimeUnit.SECONDS);
+        //sexec.scheduleAtFixedRate(calcOilThread, timeDiff / 1000, 60 * 60 * 24, TimeUnit.SECONDS);
         //线路版本更新
-        sexec.scheduleWithFixedDelay(lineVersionsData, 60 * 5, 60 * 15, TimeUnit.SECONDS);
+        //sexec.scheduleWithFixedDelay(lineVersionsData, 60 * 5, 60 * 15, TimeUnit.SECONDS);
         //线路版本更新
         //sexec.scheduleWithFixedDelay(fixedEnableVerionsThread, 60 * 4, 60 * 2 , TimeUnit.SECONDS);
 package com.bsth.controller.sys;
+import cn.hutool.http.HttpRequest;
+import cn.hutool.http.HttpResponse;
+import com.alibaba.fastjson.JSONObject;
 import com.bsth.common.Constants;
 import com.bsth.common.ResponseCode;
 import com.bsth.controller.BaseController;
@@ -12,7 +15,6 @@ import com.bsth.security.SsoConfig;
 import com.bsth.security.util.SecurityUtils;
 import com.bsth.service.sys.CompanyAuthorityService;
 import com.bsth.service.sys.SysUserService;
-import com.bsth.util.HttpClientUtils;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.collect.ArrayListMultimap;
 import org.apache.commons.lang3.StringUtils;
@@ -25,7 +27,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.authentication.BadCredentialsException;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.security.web.authentication.session.SessionAuthenticationException;
-import org.springframework.util.Assert;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -76,54 +77,70 @@ public class UserController extends BaseController&lt;SysUser, Integer&gt; {
     public static Map<String, Long> USER_LOCKTIME = new HashMap<>();
     @RequestMapping(value = "/login/token")
-    public void login(@RequestParam String token, HttpServletRequest request, HttpServletResponse response) throws Exception {
-        response.addHeader("Content-Type", "text/html;charset=UTF-8");
-        if (!ssoConfig.isSsoEnabled()) {
-            response.getWriter().write("系统未开启统一登录配置，请联系管理员");
-            return;
-        }
-        if (token == null) {
-            throw new IllegalArgumentException("请检查参数");
-        }
+    public void login(@RequestParam String satoken, HttpServletRequest request, HttpServletResponse response) throws Exception {
+        try {
+            response.addHeader("Content-Type", "text/html;charset=UTF-8");
+            if (!ssoConfig.isSsoEnabled()) {
+                response.getWriter().write("系统未开启统一登录配置，请联系管理员");
+                return;
+            }
+            if (satoken == null) {
+                throw new IllegalArgumentException("请检查参数");
+            }
-        Map<String, Object> param = new HashMap<>(), user = new HashMap<>();
-        param.put("token", token);
-        param.put("sysCode", ssoConfig.getSystemCode());
-        StringBuilder sb = HttpClientUtils.post(ssoConfig.getSsoAuthUrl(), HttpClientUtils.createFormEntity(param), HttpClientUtils.createFormHeader());
-
-        Assert.notNull(sb, "统一登录平台验证数据不为空");
-        logger.info(String.format("统一登录平台：%s", sb.toString()));
-        param = mapper.readValue(sb.toString(), Map.class);
-        if (200 == (int) param.get("code")) {
-            param = mapper.readValue(mapper.writeValueAsString(param.get("data")), Map.class);
-            if ("9999".equals(param.get("code")) || "9998".equals(param.get("code"))) {
-                response.getWriter().write(param.get("msg").toString());
+            logger.info(">>>>>>>>>>>>>>>>>>>>>>>"+satoken);
+            logger.info(">>>>>>>>>>>>>>>>>>>>>>>"+ssoConfig.getSsoAuthUrl());
+/*
+            Map<String, Object> requestBody = new HashMap<>();
+
+            JSONObject userInfoJSON = Forest.post(ssoConfig.getSsoAuthUrl())
+                    .contentType("application/json")
+                    .addHeader("Content-Type", "application/json")
+                    .addHeader("Satoken", satoken) // 增加请求头信息
+                    .addBody(requestBody) // 增加请求荷载
+                    .execute(JSONObject.class);
+*/
+
+            JSONObject json = new JSONObject();
+            HttpResponse resp = HttpRequest.post(ssoConfig.getSsoAuthUrl())
+                    .header("Content-Type", "application/json")
+                    .header("Satoken", satoken)
+                    .body(json.toString()) // 将JSON对象转为字符串
+                    .execute();
+            JSONObject userInfoJSON=JSONObject.parseObject(resp.body());
+            logger.info(">>>>>>>>>>>>>>>>>>>>>>>"+resp.body());
+            if (!userInfoJSON.getBoolean("success")) {
+                response.getWriter().write("用户验证失败，请联系管理员");
                 return;
-            } else {
-                param = mapper.readValue(mapper.writeValueAsString(param.get("data")), Map.class);
             }
-        } else {
-            response.getWriter().write(param.get("msg").toString());
-            return;
-        }
-        String userName = (String) param.get("userName");
-        user.put("userName_eq", userName);
-        user.put("enabled", true);
-
-        Iterator<SysUser> userIterator = sysUserService.list(user).iterator();
-        SysUser sysUser = null;
-        while (userIterator.hasNext()) {
-            sysUser = userIterator.next();
-            break;
-        }
+            String userName = userInfoJSON.getJSONObject("result").getString("userid");
+            Map<String, Object> user = new HashMap<>();
+            user.put("userName_eq", userName);
+            user.put("enabled", true);
+
+            Iterator<SysUser> userIterator = sysUserService.list(user).iterator();
+            SysUser sysUser = null;
+            while (userIterator.hasNext()) {
+                sysUser = userIterator.next();
+                break;
+            }
-        if (sysUser != null) {
+            if(sysUser==null){
+                sysUser=new SysUser();
+                sysUser.setUserName(userName);
+                sysUser.setName(userName);
+                Map<String, Object> map=sysUserService.createUser(sysUser);
+                if(!"200".equals(((ResponseCode) map.get("status")).toString())){
+                    response.getWriter().write("用户创建失败，请联系管理员");
+                    return;
+                }
+            }
             HttpSession session = request.getSession();
             // 登录
             SecurityUtils.login(sysUser, request);
             sysUserService.recordLoginDate(sysUser.getUserName());
             //session里写入用户名，webSocket连接时标识身份用
-            session.setAttribute(Constants.SSO_TOKEN, token);
+            session.setAttribute(Constants.SSO_TOKEN, satoken);
             session.setAttribute(Constants.SESSION_USERNAME, sysUser.getUserName());
             //session.setAttribute(Constants.RESOURCE_AUTHORITYS, sysUser.getLinks());
             //获取公司权限数据
@@ -131,10 +148,12 @@ public class UserController extends BaseController&lt;SysUser, Integer&gt; {
             session.setAttribute(Constants.COMPANY_AUTHORITYS, cmyAuths);
             USER_ERRTIMES.remove(sysUser.getUserName());
-            logger.error(String.format("用户: %s登录, token: %s",sysUser.getUserName(), token));
+            logger.error(String.format("用户: %s登录, token: %s",sysUser.getUserName(), satoken));
             response.sendRedirect("/pages/home.html");
-        } else {
-            response.getWriter().write("未找到有效的用户，请联系管理员");
+        } catch (Exception e) {
+            logger.error("", e);
+            response.getWriter().write("服务器出现异常，请联系管理员");
+            return;
         }
     }
@@ -26,7 +26,7 @@ public class SyncData  extends Thread{
     Logger logger = LoggerFactory.getLogger(this.getClass());
-    JdbcTemplate jdbcTemp = new JdbcTemplate(DBUtils_jiaDingBus.getDataSource());
+
     @Autowired
     private BusinessService businessService;
@@ -92,7 +92,6 @@ public class SyncData  extends Thread{
     BasicData.BasicDataLoader basicDataLoader;
     @Scheduled(cron = "0 1 * * * ?")
-    @Transactional()
     public void SyncData(){
         syncBusiness();
         syncCarPark();
@@ -112,6 +111,7 @@ public class SyncData  extends Thread{
     public void syncBusiness(){
         try {
+            JdbcTemplate jdbcTemp = new JdbcTemplate(DBUtils_jiaDingBus.getDataSource());
             String sql = "select * from common_bus_company";
             List<BusCompany> list = jdbcTemp.query(sql, new BeanPropertyRowMapper(BusCompany.class));
             List<Business> businesses=BusCompany.convert(list);
@@ -131,6 +131,7 @@ public class SyncData  extends Thread{
     public void syncCarPark(){
         try {
+            JdbcTemplate jdbcTemp = new JdbcTemplate(DBUtils_jiaDingBus.getDataSource());
             String sql2 = "select *,ST_AsText(b_park_point) b_park_point_wkt,ST_AsText(g_park_point) g_park_point_wkt from common_bus_park";
             List<BusPark> list2 = jdbcTemp.query(sql2, new BeanPropertyRowMapper(BusPark.class));
             List<CarPark> carParks=BusPark.convert(list2);
@@ -150,6 +151,7 @@ public class SyncData  extends Thread{
     public void syncLine(){
         try {
+            JdbcTemplate jdbcTemp = new JdbcTemplate(DBUtils_jiaDingBus.getDataSource());
             String sql = "select * from common_bus_line_base";
             List<BusLineBase> list = jdbcTemp.query(sql, new BeanPropertyRowMapper(BusLineBase.class));
             List<Line> lines=BusLineBase.convert(list);
@@ -200,6 +202,7 @@ public class SyncData  extends Thread{
     public void syncLineInformation(){
         try {
+            JdbcTemplate jdbcTemp = new JdbcTemplate(DBUtils_jiaDingBus.getDataSource());
             String sql = "select * from common_bus_line_operations";
             List<BusLineOperations> list = jdbcTemp.query(sql, new BeanPropertyRowMapper(BusLineOperations.class));
             List<LineInformation> lineInformations=BusLineOperations.convert(list);
@@ -219,6 +222,7 @@ public class SyncData  extends Thread{
     public void syncCar(){
         try {
+            JdbcTemplate jdbcTemp = new JdbcTemplate(DBUtils_jiaDingBus.getDataSource());
             String sql = "select * from common_bus_veh";
             List<BusVeh> list = jdbcTemp.query(sql, new BeanPropertyRowMapper(BusVeh.class));
             List<Cars> cars=BusVeh.convert(list);
@@ -238,6 +242,7 @@ public class SyncData  extends Thread{
     public void syncPersonnel(){
         try {
+            JdbcTemplate jdbcTemp = new JdbcTemplate(DBUtils_jiaDingBus.getDataSource());
             String sql = "select * from common_bus_staff";
             List<BusStaff> list = jdbcTemp.query(sql, new BeanPropertyRowMapper(BusStaff.class));
             List<Personnel> personnels=BusStaff.convert(list);
@@ -257,6 +262,7 @@ public class SyncData  extends Thread{
     public void syncStation(){
         try {
+            JdbcTemplate jdbcTemp = new JdbcTemplate(DBUtils_jiaDingBus.getDataSource());
             String sql = "select *,ST_AsText(center_point) center_point_wkt from common_bus_stop";
             List<BusStop> list = jdbcTemp.query(sql, new BeanPropertyRowMapper(BusStop.class));
             List<Station> stations=BusStop.convert(list);
@@ -277,6 +283,7 @@ public class SyncData  extends Thread{
     public void syncStationRoute(){
         try {
+            JdbcTemplate jdbcTemp = new JdbcTemplate(DBUtils_jiaDingBus.getDataSource());
             String sql = "select *,ST_AsText(center_point) center_point_wkt,ST_AsText(buffer_polygon) buffer_polygon_wkt from common_bus_stoplevel";
             List<BusStopLevel> list = jdbcTemp.query(sql, new BeanPropertyRowMapper(BusStopLevel.class));
             List<StationRoute> stationRoutes=BusStopLevel.convert(list);
@@ -296,6 +303,7 @@ public class SyncData  extends Thread{
     private void syncSection(){
         try {
+            JdbcTemplate jdbcTemp = new JdbcTemplate(DBUtils_jiaDingBus.getDataSource());
             String sql = "select *,ST_AsText(bsection_vector) bsectionVectorWkt from common_road_section";
             List<RoadSection> list = jdbcTemp.query(sql, new BeanPropertyRowMapper(RoadSection.class));
             List<Section> sections=RoadSection.convert(list);
@@ -315,6 +323,7 @@ public class SyncData  extends Thread{
     private void syncSectionRoute(){
         try {
+            JdbcTemplate jdbcTemp = new JdbcTemplate(DBUtils_jiaDingBus.getDataSource());
             String sql = "select * from common_road_sectionlevel where destroy=0";
             List<RoadSectionLevel> list = jdbcTemp.query(sql, new BeanPropertyRowMapper(RoadSectionLevel.class));
             List<SectionRoute> sectionRoutes=RoadSectionLevel.convert(list);
@@ -4,6 +4,7 @@ import com.bsth.data.BasicData;
 import com.bsth.data.LineConfigData;
 import com.bsth.data.forecast.entity.ArrivalEntity;
 import com.bsth.util.db.DBUtils_MS;
+import org.joda.time.DateTime;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -145,24 +146,32 @@ public class ArrivalDataLoader {
 	 * @Description: TODO(根据线路，走向和时间戳加载数据) 
 	 */
 	public List<ArrivalEntity> loadByLineAndTime(String lineCode, int updown, long st, long et){
+		DateTime start = new DateTime(st), end = new DateTime(et);
+		if (start.getYear() != end.getYear()) {
+			throw new IllegalArgumentException("请选择同一年");
+		}
+		if (et - st > 14 * 24 * 60 * 60 * 1000) {
+			throw new IllegalArgumentException("时间区间过长");
+		}
 		Calendar cal = Calendar.getInstance();
 		cal.setTimeInMillis(st);
-		int weeks_year = cal.get(Calendar.WEEK_OF_YEAR);
+		int weeksYear1 = cal.get(Calendar.WEEK_OF_YEAR), weeksYear2 = cal.get(Calendar.WEEK_OF_YEAR);
 		Connection conn = null;
 		PreparedStatement ps = null;
 		ResultSet rs = null;
 		List<ArrivalEntity> list = new ArrayList<>();
-		String sql = "select * from bsth_c_arrival_info where weeks_year=? and line_id=? and up_down=? and in_out=0 AND create_timestamp > ? AND create_timestamp <=? AND ABS(create_timestamp - ts) < 3600000 order by ts";
+		String sql = "select * from bsth_c_arrival_info_" + start.getYear() + " where weeks_year in (?, ?) and line_id=? and up_down=? and in_out=0 AND create_timestamp BETWEEN ? AND ? AND ABS(create_timestamp - ts) < 3600000 order by ts";
 		try{
 			conn = DBUtils_MS.getConnection();
 			ps = conn.prepareStatement(sql);
-			ps.setInt(1, weeks_year);
-			ps.setString(2, lineCode);
-			ps.setInt(3, updown);
-			ps.setLong(4, st);
-			ps.setLong(5, et);
+			ps.setInt(1, weeksYear1);
+			ps.setInt(2, weeksYear2);
+			ps.setString(3, lineCode);
+			ps.setInt(4, updown);
+			ps.setLong(5, st);
+			ps.setLong(6, et);
 			rs = ps.executeQuery();
 			list = resultSet2Set(rs);
@@ -46,7 +46,7 @@ public class VehicleDataSyncTaskServiceImpl extends BServiceImpl&lt;VehicleDataSync
     /** bean是否销毁（用于优雅退出） */
     private volatile boolean beanDestroy = false;
-    @PostConstruct
+    //@PostConstruct
     public void init() {
         LOG.info("车辆数据同步服务启动！");
         // 创建队列，指定长度100
@@ -27,4 +27,6 @@ public interface SysUserService extends BaseService&lt;SysUser, Integer&gt;{
 	Map<String, Object> resetPassword(Integer id, Integer pwdValidPeriod);
 	void recordLoginDate(String userName);
+
+	Map<String, Object> createUser(SysUser u);
 }
@@ -5,6 +5,7 @@ import com.bsth.controller.sys.util.RSAUtils;
 import com.bsth.email.entity.EmailBean;
 import com.bsth.entity.sys.Role;
 import com.bsth.entity.sys.SysUser;
+import com.bsth.repository.sys.RoleRepository;
 import com.bsth.repository.sys.SysUserRepository;
 import com.bsth.security.util.SecurityUtils;
 import com.bsth.service.impl.BaseServiceImpl;
@@ -23,11 +24,7 @@ import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 @Service
 public class SysUserServiceImpl extends BaseServiceImpl<SysUser, Integer> implements SysUserService{
@@ -42,6 +39,10 @@ public class SysUserServiceImpl extends BaseServiceImpl&lt;SysUser, Integer&gt; implem
 	@Autowired
 	private MailUtils mailUtils;
+	@Autowired
+	RoleRepository roleRepository;
+
+
 	Logger logger = LoggerFactory.getLogger(this.getClass());
 	@Override
@@ -232,4 +233,37 @@ public class SysUserServiceImpl extends BaseServiceImpl&lt;SysUser, Integer&gt; implem
 	public void recordLoginDate(String userName) {
 		sysUserRepository.recordLoginDate(userName);
 	}
+
+	@Override
+	public Map<String, Object> createUser(SysUser u) {
+		Map<String, Object> rs = new HashMap();
+		try {
+			Role role=roleService.findById(136);
+			if(role==null){
+				rs.put("status", ResponseCode.ERROR);
+				rs.put("msg", "用户权限不够，请联系管理员！");
+				return rs;
+			}
+			Set<Role> roleSet=new HashSet<>();
+			roleSet.add(role);
+			u.setRoles(roleSet);
+			u.setUserName(u.getUserName());
+			u.setPassword("Bsth#1234");
+			u.setCreateDate(new Date());
+			u.setUpdateDate(new Date());
+			u.setLastPwdDate(new Date());
+			u.setPwdValidPeriod(9999);
+			u.setAgencies("嘉定公交");
+			u.setEnabled(true);
+			u.setPassword(new BCryptPasswordEncoder(4).encode(u.getPassword()));
+			rs = super.save(u);
+			logger.info("首次登陆创建用户:"+u.getUserName());
+		} catch (Exception e) {
+			logger.error("", e);
+			rs.put("status", ResponseCode.ERROR);
+			rs.put("msg", e.getMessage());
+		}
+		return rs;
+	}
+
 }
 server.port=9088
-# dubbo服务化使用开关flag
+# dubbo\uFFFD\uFFFD\uFFFD\uFFFD\u02B9\uFFFD\u00FF\uFFFD\uFFFD\uFFFDflag
 dubbo.use=false
 #JPA
@@ -9,21 +9,17 @@ spring.jpa.hibernate.naming.implicit-strategy=org.hibernate.boot.model.naming.Im
 spring.jpa.hibernate.naming.physical-strategy=org.springframework.boot.orm.jpa.hibernate.SpringPhysicalNamingStrategy
 spring.jpa.database= MYSQL
 spring.jpa.properties.hibernate.enable_lazy_load_no_trans=true
-spring.jpa.show-sql= true
+spring.jpa.show-sql= false
 spring.jpa.properties.hibernate.dialect= org.hibernate.spatial.dialect.mysql.MySQL56InnoDBSpatialDialect
 #DATABASE
-spring.datasource.driver-class-name= com.mysql.jdbc.Driver
-#spring.datasource.url= jdbc:mysql://127.0.0.1/control?useUnicode=true&characterEncoding=utf-8&useSSL=false
-##spring.datasource.url= jdbc:mysql://192.168.168.222/control?useUnicode=true&characterEncoding=utf-8&useSSL=false
+spring.datasource.driver-class-name= com.mysql.cj.jdbc.Driver
+#spring.datasource.url= jdbc:mysql://10.10.150.101/lg_control?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=Asia/Shanghai
 #spring.datasource.username= root
-#spring.datasource.password=
-spring.datasource.url= jdbc:mysql://127.0.0.1/control?useUnicode=true&characterEncoding=utf-8&useSSL=false
-spring.datasource.username= root
-spring.datasource.password= root
-#spring.datasource.url= jdbc:mysql://192.168.168.117/pd_control?useUnicode=true&characterEncoding=utf-8&useSSL=false
-#spring.datasource.username= root
-#spring.datasource.password= root
+#spring.datasource.password= A123456ab
+spring.datasource.url= jdbc:mysql://192.168.9.210:3307/control?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
+spring.datasource.username= tuohua
+spring.datasource.password= )eE6E5B-
 spring.datasource.type= com.zaxxer.hikari.HikariDataSource
 #DATASOURCE SETTING
@@ -40,9 +36,19 @@ spring.datasource.hikari.register-mbeans=true
 sso.enabled= true
 sso.systemcode = SYSUS023
-sso.http.url.login= http://10.10.200.142:9112/login?redirect=%2Findex
-sso.http.url.logout= http://10.10.200.142:9112/login?redirect=%2Findex
-sso.http.url.auth= http://10.10.200.142:9112/prod-api/system/utilitySystem/checkToken
+sso.http.url.login= http://192.168.9.71:8080/workbench
+sso.http.url.logout= http://192.168.9.71:9999/sso/logout
+sso.http.url.auth= http://192.168.9.71:9109/user-server/auth/getUserInfo
+
+dc.imgurl= /home/control/klimg
+dc.profile= profile
+
+baidu.ak=YIT2mnCsfWkpbYnlLLqJ18ravGLs3OJS
+passengerFlow.url = http://127.0.0.1:9999/images/
+baidu.akyd=WnSDHZgtPbSbw2LfsH3KO3DDKWONmlYK
+electricity.importFile.path= E:/elecImportFile
+
+report_register.complaint.url= http://192.168.168.172:8080/complaint/TsReport/input.do
-path.speech.common = D:/speech/common/
-path.speech.line = D:/speech/%s/
 \ No newline at end of file
+path.speech.common = /home/control/speech/common/
+path.speech.line = /home/control/speech/%s/
 \ No newline at end of file
@@ -13,10 +13,13 @@ spring.jpa.show-sql= false
 spring.jpa.properties.hibernate.dialect= org.hibernate.spatial.dialect.mysql.MySQL56InnoDBSpatialDialect
 #DATABASE
-spring.datasource.driver-class-name= com.mysql.jdbc.Driver
-spring.datasource.url= jdbc:mysql://10.10.150.103:3306/control?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai
-spring.datasource.username= root
-spring.datasource.password= fsodlgjiuigAQF2$9fs9
+#spring.datasource.driver-class-name= com.mysql.cj.jdbc.Driver
+#spring.datasource.url= jdbc:mysql://127.0.0.1/lg_control?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=Asia/Shanghai
+#spring.datasource.username= root
+#spring.datasource.password= 123456
+spring.datasource.url= jdbc:mysql://192.168.9.210:3307/control?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
+spring.datasource.username= tuohua
+spring.datasource.password= )eE6E5B-
 spring.datasource.type= com.zaxxer.hikari.HikariDataSource
 #DATASOURCE SETTING
@@ -33,19 +36,19 @@ spring.datasource.hikari.register-mbeans=true
 sso.enabled= true
 sso.systemcode = SYSUS023
-sso.http.url.login= http://10.10.200.142:9112/login?redirect=%2Findex
-sso.http.url.logout= http://10.10.200.142:9112/login?redirect=%2Findex
-sso.http.url.auth= http://10.10.200.142:9112/prod-api/system/utilitySystem/checkToken
+sso.http.url.login= http://192.168.9.71:8080/workbench
+sso.http.url.logout= http://192.168.9.71:9999/sso/logout
+sso.http.url.auth= http://192.168.9.71:9109/user-server/auth/getUserInfo
 dc.imgurl= /home/control/klimg
 dc.profile= profile
-baidu.ak=AYiBOs3f9qBQFhdKFsaboX6CfObmKwRP
-passengerFlow.url = http://192.168.168.32:9999/images/
-
-electricity.importFile.path= /home/control/elecImportFile
+baidu.ak=YIT2mnCsfWkpbYnlLLqJ18ravGLs3OJS
+passengerFlow.url = http://127.0.0.1:9999/images/
 baidu.akyd=WnSDHZgtPbSbw2LfsH3KO3DDKWONmlYK
-report_register.complaint.url= http://10.10.200.113:8060/complaint/TsReport/input.do
+electricity.importFile.path= E:/elecImportFile
+
+report_register.complaint.url= http://192.168.168.172:8080/complaint/TsReport/input.do
 path.speech.common = /home/control/speech/common/
 path.speech.line = /home/control/speech/%s/
@@ -14,9 +14,9 @@ spring.jpa.properties.hibernate.dialect= org.hibernate.spatial.dialect.mysql.MyS
 #DATABASE
 spring.datasource.driver-class-name= com.mysql.cj.jdbc.Driver
-spring.datasource.url= jdbc:mysql://10.10.150.101/lg_control?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=Asia/Shanghai
+spring.datasource.url= jdbc:mysql://127.0.0.1/lg_control?useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=Asia/Shanghai
 spring.datasource.username= root
-spring.datasource.password= A123456ab
+spring.datasource.password= 123456
 spring.datasource.type= com.zaxxer.hikari.HikariDataSource
 #DATASOURCE SETTING
@@ -33,14 +33,14 @@ spring.datasource.hikari.register-mbeans=true
 sso.enabled= true
 sso.systemcode = SYSUS023
-sso.http.url.login= http://10.10.200.142:9112/login?redirect=%2Findex
-sso.http.url.logout= http://10.10.200.142:9112/login?redirect=%2Findex
-sso.http.url.auth= http://10.10.200.142:9112/prod-api/system/utilitySystem/checkToken
+sso.http.url.login= http://192.168.9.71:8080/workbench
+sso.http.url.logout= http://192.168.9.71:9999/sso/logout
+sso.http.url.auth= http://192.168.9.71:9109/user-server/auth/getUserInfo
 dc.imgurl= E:/klimg
 dc.profile= profile
-baidu.ak=AYiBOs3f9qBQFhdKFsaboX6CfObmKwRP
+baidu.ak=YIT2mnCsfWkpbYnlLLqJ18ravGLs3OJS
 passengerFlow.url = http://127.0.0.1:9999/images/
 baidu.akyd=WnSDHZgtPbSbw2LfsH3KO3DDKWONmlYK
 electricity.importFile.path= E:/elecImportFile
-spring.profiles.active = test
+spring.profiles.active = prod
 spring.view.suffix=.html
 server.session-timeout=-1
@@ -34,9 +34,7 @@ var realCtl = {
         //处理main.html
         var data = fs.readFileSync(mainFile, 'utf-8'),
             $ = cheerio.load(data);
-        handleCss($, function () {
-            handleJs($, mainFile, cb);
-        });
+        handleJs($, mainFile, cb);
     },
@@ -49,9 +47,7 @@ var realCtl = {
         var data = fs.readFileSync(mapFile, 'utf-8')
             , $ = cheerio.load(data);
-        handleCss($, function () {
-            handleJs($, mapFile, cb);
-        });
+        handleJs($, mapFile, cb);
     },
     /**
      * 处理单屏地图页面
@@ -60,9 +56,7 @@ var realCtl = {
     handleAlonePage: function (cb) {
         var data = fs.readFileSync(aloneMapWrapFile, 'utf-8');
         var $ = cheerio.load(data);
-        handleCss($, function () {
-            handleJs($, aloneMapWrapFile, cb);
-        });
+        handleJs($, aloneMapWrapFile, cb);
     },
     /**
      * 处理单屏主页
@@ -71,9 +65,7 @@ var realCtl = {
     handleAloneHomePage: function (cb) {
         var data = fs.readFileSync(aloneHomeWrapFile, 'utf-8');
         var $ = cheerio.load(data);
-        handleCss($, function () {
-            handleJs($, aloneHomeWrapFile, cb);
-        });
+        handleJs($, aloneHomeWrapFile, cb);
     }
 };
@@ -16,7 +16,7 @@ var platform = process.platform;
 var iswin = platform == 'win32';
 var sp = platform == 'win32' ? '\\' : '/';
 //不参与的目录
-var excludes = ['scheduleApp', 'trafficManage', 'control', 'permission' + sp + 'authorize_all','permission' + sp + 'user', 'summary', 'history_sch', 'report' + sp + 'oil', 'base' + sp + 'geo_data_edit', 'base' + sp + 'carpark', 'forms', 'mforms', 'report', 'punctual', 'base' + sp + 'timesmodel', 'base' + sp + 'stationroute']
+var excludes = ['scheduleApp', 'trafficManage', 'control', 'permission' + sp + 'authorize_all','permission' + sp + 'user', 'summary', 'history_sch', 'report' + sp + 'oil', 'base' + sp + 'geo_data_edit', 'base' + sp + 'carpark', 'forms', 'mforms', 'report', 'punctual', 'base' + sp + 'timesmodel', 'base' + sp + 'stationroute','zndd_yuan','call','base' + sp + 'region',]
     , ep = new EventProxy()
     , pName = 'bsth_control'
     , path = process.cwd()
 jiaDingBus.mysql.driver= com.mysql.jdbc.Driver
-jiaDingBus.mysql.url= jdbc:mysql://127.0.0.1/jiading_bus?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
-jiaDingBus.mysql.username= root
-jiaDingBus.mysql.password= 123456
 \ No newline at end of file
+#jiaDingBus.mysql.url= jdbc:mysql://127.0.0.1/jiading_bus?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
+#jiaDingBus.mysql.username= root
+#jiaDingBus.mysql.password= 123456
+jiaDingBus.mysql.url= jdbc:mysql://192.168.9.210:3307/jiading_bus?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
+jiaDingBus.mysql.username= tuohua
+jiaDingBus.mysql.password= )eE6E5B-
 \ No newline at end of file
@@ -4,6 +4,9 @@
 #ms.mysql.password= 123456
 ms.mysql.driver= com.mysql.jdbc.Driver
-ms.mysql.url= jdbc:mysql://10.10.150.103/ms?useUnicode=true&characterEncoding=utf-8
-ms.mysql.username= root
-ms.mysql.password= fsodlgjiuigAQF2$9fs9
 \ No newline at end of file
+#ms.mysql.url= jdbc:mysql://127.0.0.1/ms?useUnicode=true&characterEncoding=utf-8
+#ms.mysql.username= root
+#ms.mysql.password= 123456
+ms.mysql.url= jdbc:mysql://192.168.9.210:3307/ms?useUnicode=true&characterEncoding=utf-8
+ms.mysql.username= tuohua
+ms.mysql.password= )eE6E5B-
 \ No newline at end of file
@@ -579,7 +579,25 @@
 	function setTitle(menuItem){
 		document.title = $('span.title', menuItem).text();
 	}
-	getCSS();
+	if(window.localStorage.getItem('system_style')=='dark'){
+		var elements = document.getElementsByName("default");
+		for (var i = 0; i < elements.length; i++) {
+			elements[i].disabled = true;
+		}
+		elements = document.getElementsByName("dark");
+		for (var i = 0; i < elements.length; i++) {
+			elements[i].disabled = false;
+		}
+	}else {
+		var elements = document.getElementsByName("dark");
+		for (var i = 0; i < elements.length; i++) {
+			elements[i].disabled = true;
+		}
+		elements = document.getElementsByName("default");
+		for (var i = 0; i < elements.length; i++) {
+			elements[i].disabled = false;
+		}
+	}
 	//切换主题
 	$('#changeStyle').on('click', function () {
 		if(window.localStorage.getItem('system_style')=='dark'){
-#ms.mysql.driver= com.mysql.jdbc.Driver
-#ms.mysql.url= jdbc:mysql://127.0.0.1/pd_control?useUnicode=true&characterEncoding=utf-8&useSSL=false
+ms.mysql.driver= com.mysql.jdbc.Driver
+#ms.mysql.url= jdbc:mysql://127.0.0.1/ms?useUnicode=true&characterEncoding=utf-8
 #ms.mysql.username= root
 #ms.mysql.password= 123456
-
-ms.mysql.driver= com.mysql.jdbc.Driver
-ms.mysql.url= jdbc:mysql://10.10.150.103/ms?useUnicode=true&characterEncoding=utf-8
-ms.mysql.username= root
-ms.mysql.password= fsodlgjiuigAQF2$9fs9
 \ No newline at end of file
+ms.mysql.url= jdbc:mysql://192.168.9.210:3307/ms?useUnicode=true&characterEncoding=utf-8
+ms.mysql.username= tuohua
+ms.mysql.password= )eE6E5B-
 \ No newline at end of file